Merge pull request #8125 from eugenp/revert-8119-BAEL-3275-2

Revert "BAEL-3275: Using blocking queue for pub-sub"

spring-boot/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.diagnostics.FailureAnalyzer=com.baeldung.failureanalyzer.MyBeanNotOfRequiredTypeFailureAnalyzer
+

spring-boot/src/main/resources/application-errorhandling.properties

@@ -0,0 +1,10 @@
+#server
+server.port=9000
+server.servlet-path=/
+server.context-path=/
+#server.error.whitelabel.enabled=false
+
+#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.ErrorMvcAutoConfiguration
+
+#for Spring Boot 2.0+
+#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration

spring-boot/src/main/resources/application.properties

@@ -0,0 +1,74 @@
+server.port=9090
+server.servlet.contextPath=/springbootapp
+management.server.port=8081
+management.server.address=127.0.0.1
+#debug=true
+spring.jpa.show-sql=true
+spring.jpa.hibernate.ddl-auto = update
+
+management.endpoints.jmx.domain=Spring Sample Application
+spring.jmx.unique-names=true
+
+management.endpoints.web.exposure.include=*
+management.endpoint.shutdown.enabled=true
+
+##jolokia.config.debug=true
+##endpoints.jolokia.enabled=true
+##endpoints.jolokia.path=jolokia
+
+spring.jmx.enabled=true
+
+## for pretty printing of json when endpoints accessed over HTTP
+http.mappers.jsonPrettyPrint=true
+
+## Configuring info endpoint
+info.app.name=Spring Sample Application
+info.app.description=This is my first spring boot application G1
+info.app.version=1.0.0
+info.java-vendor = ${java.specification.vendor}
+
+logging.level.org.springframework=INFO
+
+#Servlet Configuration
+servlet.name=dispatcherExample
+servlet.mapping=/dispatcherExampleURL
+
+#spring.banner.charset=UTF-8
+#spring.banner.location=classpath:banner.txt
+#spring.banner.image.location=classpath:banner.gif
+#spring.banner.image.width= //TODO
+#spring.banner.image.height= //TODO
+#spring.banner.image.margin= //TODO
+#spring.banner.image.invert= //TODO
+
+contactInfoType=email
+
+#chaos monkey for spring boot props
+management.endpoint.chaosmonkey.enabled=true
+management.endpoint.chaosmonkeyjmx.enabled=true
+
+spring.profiles.active=chaos-monkey
+#Determine whether should execute or not
+chaos.monkey.enabled=true
+#How many requests are to be attacked. 1: attack each request; 5: each 5th request is attacked
+chaos.monkey.assaults.level=1
+#Minimum latency in ms added to the request
+chaos.monkey.assaults.latencyRangeStart=3000
+#Maximum latency in ms added to the request
+chaos.monkey.assaults.latencyRangeEnd=15000
+#Latency assault active
+chaos.monkey.assaults.latencyActive=true
+#Exception assault active
+chaos.monkey.assaults.exceptionsActive=false
+#AppKiller assault active
+chaos.monkey.assaults.killApplicationActive=false
+#Controller watcher active
+chaos.monkey.watcher.controller=false
+#RestController watcher active
+chaos.monkey.watcher.restController=false
+#Service watcher active
+chaos.monkey.watcher.service=true
+#Repository watcher active
+chaos.monkey.watcher.repository=false
+#Component watcher active
+chaos.monkey.watcher.component=false

spring-boot/src/main/resources/banner.txt

@@ -0,0 +1,14 @@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@#@@@@@########@@@@@@@@@@@@@@@@@@@@@@@@...@@@@@@@@@:..@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@#.  @@@@@*         *@@@@@@@@@@@@@@@@@@@@@   @@@@@@@@@.  @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@#o       @@@@@*  @@@@@*  @@@:*.*@@@@@@@: *8@@@   @@@@&:.#@.  @o**@@@@**:@o*o@@:.:@@@@@:.o#@&*:@@@@
+@@@@@@@@@@@@*             @@@@@*  8888   8@  @@@8  #@o  8@#  .@   @@*   :.    @*  @@@@   @.    :   &@   **    .@@@@
+@@@@@@@@@@.         @    o@@@@@*         *@@@o::&  .*  8@@@@.     @@  8@@@@.  @*  @@@@   @.  @@@&  *   @@@@#  .@@@@
+@@@@@@@@@&         @     @@@@@@*  @@@@@@  8  @@@@  ..  o&&&&&&&   @@  #@@@@.  @*  @@@@   @.  @@@#  *   @@@@@  .@@@@
+@@@@@@@@@        @@o    @@@@@@@*  oooo*   8  @@@&   @*  @@@   #   88.   88.   *&  o#:    @.  @@@#  *@   &#&   .@@@@
+@@@@@@@@#      @@@8     @@@@@@@*      .*@@@#.  *@@  @@@&   :#@@@o  .@@:  *&@8  @o   o@@: @.  @@@#  *@@#. :8#  .@@@@
+@@@@@@@@@    @@@@     &@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@# o@@@@   @@@@@
+@@@@@&    &@@@@      8@@@@@@@@@8&8@@@@@#8#@@@o8@#&@@o&@@@&@@8@@&@@@@88@@8#@8&@@##@@@@@@#8@@#8@@88@@@@@     *@@@@@@@
+@@@#  #@@@@#.      @@@@@@@@@@@@@8@@8#o@&#@@@@o.@o*@@*.@@@.@&:8o8*@@@8&@@#@@@8@@@@8@#@@@8&@@@@@@#@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@

spring-boot/src/main/resources/custom.properties

@@ -0,0 +1,4 @@
+dispatcher.servlet.name=dispatcherExample
+dispatcher.servlet.mapping=/dispatcherExampleURL
+example.servlet.name=dispatcherExample
+example.servlet.mapping=/dispatcherExampleURL

spring-boot/src/main/resources/data-expressions.sql

@@ -0,0 +1,3 @@
+insert into contact_info_expression values ('email','[a-z0-9!#$%&*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?')
+insert into contact_info_expression values ('phone','^([0-9]( |-)?)?(\(?[0-9]{3}\)?|[0-9]{3})( |-)?([0-9]{3}( |-)?[0-9]{4}|[a-zA-Z0-9]{7})$')
+insert into contact_info_expression values ('website','^(http:\/\/www\.|https:\/\/www\.|http:\/\/|https:\/\/)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$')

spring-boot/src/main/resources/data.sql

@@ -0,0 +1,5 @@
+insert into users values (1, 'Alex', 1);
+insert into users values (2, 'Bob', 1);
+insert into users values (3, 'John', 0);
+insert into users values (4, 'Harry', 0);
+insert into users values (5, 'Smith', 1);

spring-boot/src/main/resources/demo.properties

@@ -0,0 +1,2 @@
+spring.output.ansi.enabled=never
+server.port=7070

spring-boot/src/main/resources/graphql/blog.graphqls

@@ -0,0 +1,24 @@
+type Post {
+    id: ID!
+    title: String!
+    text: String!
+    category: String
+    author: Author
+}
+
+type Author {
+    id: ID!
+    name: String!
+    thumbnail: String
+    posts: [Post]!
+}
+
+# The Root Query for the application
+type Query {
+    recentPosts(count: Int, offset: Int): [Post]!
+}
+
+# The Root Mutation for the application
+type Mutation {
+    writePost(title: String!, text: String!, category: String, author: String!) : Post!
+}

spring-boot/src/main/resources/logback.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework.transaction" level="WARN" />
+
+    <!-- in order to debug some marshalling issues, this needs to be TRACE -->
+    <logger name="org.springframework.web.servlet.mvc" level="WARN" />
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

spring-boot/src/main/resources/messages.properties

@@ -0,0 +1,4 @@
+greeting=Hello! Welcome to our website!
+lang.change=Change the language
+lang.eng=English
+lang.fr=French

spring-boot/src/main/resources/messages_fr.properties

@@ -0,0 +1,4 @@
+greeting=Bonjour! Bienvenue sur notre site!
+lang.change=Changez la langue
+lang.eng=Anglais
+lang.fr=Francais

spring-boot/src/main/resources/persistence-generic-entity.properties

@@ -0,0 +1,8 @@
+jdbc.driverClassName=org.h2.Driver
+jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+jdbc.user=sa
+jdbc.pass=sa
+
+hibernate.dialect=org.hibernate.dialect.H2Dialect
+hibernate.show_sql=true
+hibernate.hbm2ddl.auto=create-drop

spring-boot/src/main/resources/public/error/404.html

@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>RESOURCE NOT FOUND</title>
+	</head>
+	<body>
+		<h1>404 RESOURCE NOT FOUND</h1>
+	</body>
+</html>

spring-boot/src/main/resources/schema-expressions.sql

@@ -0,0 +1,5 @@
+create table contact_info_expression(
+  expression_type varchar(50) not null,
+  pattern varchar(500) not null,
+  PRIMARY KEY ( expression_type )
+);

spring-boot/src/main/resources/schema.sql

@@ -0,0 +1,8 @@
+drop table if exists USERS;
+
+create table USERS(
+  ID int not null AUTO_INCREMENT,
+  NAME varchar(100) not null,
+  STATUS int,
+  PRIMARY KEY ( ID )
+);

spring-boot/src/main/resources/shutdown/shutdown.bat

@@ -0,0 +1 @@
+kill $(cat ./bin/shutdown.pid)

spring-boot/src/main/resources/static/internationalization.js

@@ -0,0 +1,8 @@
+$(document).ready(function() {
+    $("#locales").change(function () {
+        var selectedOption = $('#locales').val();
+        if (selectedOption != ''){
+            window.location.replace('international?lang=' + selectedOption);
+        }
+    });
+});

spring-boot/src/main/resources/templates/customer.html

@@ -0,0 +1,16 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Customer Page</title>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.0/jquery.min.js"></script>
+</head>
+<body>
+<br />
+<form action="customer" method="POST">
+Contact Info: <input type="text" name="contactInfo" /> <br />
+<input type="submit" value="Submit" />
+</form>
+<br /><br />
+<span th:text="${message}"></span><br />
+</body>
+</html>

spring-boot/src/main/resources/templates/customers.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:include="layout :: headerFragment">
+</head>
+<body>
+	<div id="container">
+		<h1>
+			Hello, <span th:text="${username}">--name--</span>.
+		</h1>
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th>ID</th>
+					<th>Name</th>
+					<th>Address</th>
+					<th>Service Rendered</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr th:each="customer : ${customers}">
+					<td th:text="${customer.id}">Text ...</td>
+					<td th:text="${customer.name}">Text ...</td>
+					<td th:text="${customer.address}">Text ...</td>
+					<td th:text="${customer.serviceRendered}">Text...</td>
+				</tr>
+			</tbody>
+		</table>
+		<div id="pagefoot" th:include="layout :: footerFragment">Footer
+		</div>
+	</div>
+	<!-- container -->
+</body>
+</html>

spring-boot/src/main/resources/templates/displayallbeans.html

@@ -0,0 +1,10 @@
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+        <title>Baeldung</title>
+    </head>
+    <body>
+        <h2 th:text="${header}"></h2>
+        <p th:text="${message}"></p>
+    </body>
+</html>

spring-boot/src/main/resources/templates/error-404.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous" />
+	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+</head>
+<body>
+<div class="container">
+<div class="jumbotron" >
+<h1 class="text-center"><i class="fa fa-frown-o"> </i>   Sorry, we couldn't find the page you were looking for. </h1>
+<p class="text-center"><a class="btn btn-primary" href="/"><i class="fa fa-home"></i>Go Home</a></p>
+</div></div>
+</body>
+</html>

spring-boot/src/main/resources/templates/error-500.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous" />
+	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+</head>
+<body>
+<div class="container">
+<div class="jumbotron" >
+<h1 class="text-center"><i class="fa fa-frown-o"> </i>   Sorry, something went wrong! </h1>
+
+<h2 class="text-center">We're fixing it.</h2>
+<p class="text-center"><a class="btn btn-primary" href="/"><i class="fa fa-home"></i>Go Home</a></p>
+</div></div>
+</body>
+</html>

spring-boot/src/main/resources/templates/error.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous" />
+	<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+</head>
+<body>
+<div class="container">
+<div class="jumbotron" >
+<h1 class="text-center"><i class="fa fa-frown-o"> </i>   Something went wrong! </h1>
+
+<h2 class="text-center">Our Engineers are on it.</h2>
+<p class="text-center"><a class="btn btn-primary" href="/"><i class="fa fa-home"></i>Go Home</a></p>
+</div></div>
+</body>
+</html>

spring-boot/src/main/resources/templates/error/404.html

@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>RESOURCE NOT FOUND</title>
+	</head>
+	<body>
+		<h1>404 RESOURCE NOT FOUND</h1>
+	</body>
+</html>

spring-boot/src/main/resources/templates/external.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head th:include="layout :: headerFragment">
+</head>
+<body>
+	<div class="container">
+		<div class="jumbotron text-center">
+			<h1>Customer Portal</h1>
+		</div>
+		<div>
+			<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam
+				erat lectus, vehicula feugiat ultricies at, tempus sed ante. Cras
+				arcu erat, lobortis vitae quam et, mollis pharetra odio. Nullam sit
+				amet congue ipsum. Nunc dapibus odio ut ligula venenatis porta non
+				id dui. Duis nec tempor tellus. Suspendisse id blandit ligula, sit
+				amet varius mauris. Nulla eu eros pharetra, tristique dui quis,
+				vehicula libero. Aenean a neque sit amet tellus porttitor rutrum nec
+				at leo.</p>
+
+			<h2>Existing Customers</h2>
+			<div class="well">
+				<b>Enter the intranet: </b><a th:href="@{/customers}">customers</a>
+			</div>
+		</div>
+		<div id="pagefoot" th:include="layout :: footerFragment">Footer
+		</div>
+	</div>
+	<!-- container -->
+
+</body>
+</html>

spring-boot/src/main/resources/templates/index.html

@@ -0,0 +1,19 @@
+<html>
+<head>
+	<title>WebJars Demo</title>
+	<link rel="stylesheet" href="/webjars/bootstrap/3.3.7-1/css/bootstrap.min.css" />
+</head>
+<body>
+	<h1>Welcome Home</h1>
+	<div class="container"><br/>
+		<div class="alert alert-success">
+		  <a href="#" class="close" data-dismiss="alert" aria-label="close">×</a>
+		  <strong>Success!</strong> It is working as we expected.
+		</div>
+	</div>
+
+<script src="/webjars/jquery/3.1.1/jquery.min.js"></script>
+<script src="/webjars/bootstrap/3.3.7-1/js/bootstrap.min.js"></script>
+
+</body>
+</html>

spring-boot/src/main/resources/templates/international.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="ISO-8859-1" />
+<title>Home</title>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+<script src="internationalization.js"></script>
+</head>
+<body>
+<h1 th:text="#{greeting}"></h1>
+
+<br /><br />
+<span th:text="#{lang.change}"></span>:
+<select id="locales">
+    <option value=""></option>
+    <option value="en" th:text="#{lang.eng}"></option>
+    <option value="fr" th:text="#{lang.fr}"></option>
+</select>
+</body>
+</html>

spring-boot/src/main/resources/templates/layout.html

@@ -0,0 +1,18 @@
+
+<head th:fragment="headerFragment">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Customer Portal</title>
+<link
+	href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet"
+	integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
+	crossorigin="anonymous"></link>
+<link
+	href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
+	rel="stylesheet"></link>
+</head>
+
+<div id="pagefoot" th:fragment="footerFragment">
+	<p>Document last modified 2017/10/23.</p>
+	<p>Copyright: Lorem Ipsum</p>
+</div>

spring-boot/src/main/resources/templates/other.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8"/>
+<title>Spring Utils Demo</title>
+<style type="text/css">
+.param{
+	color:green;
+	font-style: italic;
+}
+</style>
+</head>
+<body>
+	Parameter set by you: <p th:text="${parameter}" class="param"/>
+</body>
+</html>

spring-boot/src/main/resources/templates/utils.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8"/>
+<title>Spring Utils Demo</title>
+<style type="text/css">
+.param{
+	color:green;
+	font-style: italic;
+}
+</style>
+</head>
+<body>
+<form action="setParam" method="POST">
+	<h3>Set Parameter:  </h3>
+	<p th:text="${parameter}" class="param"/>
+	<input type="text" name="param" id="param"/>
+	<input type="submit" value="SET"/>
+</form>
+<br/>
+<a href="other">Another Page</a>
+</body>
+</html>