Merge branch 'master' into BAEL-20863-move-spring-boot-ctx-fluent

spring-boot-modules/pom.xml

@@ -15,15 +15,18 @@
 
     <modules>
         <module>spring-boot-admin</module>
-        <module>spring-boot-custom-starter</module>
         <module>spring-boot-artifacts</module>
         <module>spring-boot-ctx-fluent</module>
         <module>spring-boot-autoconfiguration</module>
+        <module>spring-boot-camel</module>
+        <module>spring-boot-custom-starter</module>
+        <module>spring-boot-crud</module>
         <module>spring-boot-data</module>
         <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
         <module>spring-boot-keycloak</module>
+        <module>spring-boot-logging-log4j2</module>
         <module>spring-boot-mvc-birt</module>
-        <module>spring-boot-performance</module>
+        <module>spring-boot-nashorn</module>
         <module>spring-boot-properties</module>
         <module>spring-boot-springdoc</module>
         <module>spring-boot-testing</module>

spring-boot-modules/spring-boot-camel/README.md

@@ -0,0 +1,27 @@
+## Spring Boot Camel
+
+This module contains articles about Spring Boot with Apache Camel
+
+### Example for the Article on Camel API with SpringBoot
+
+To start, run:
+
+`mvn spring-boot:run`
+	
+Then, make a POST http request to:
+
+`http://localhost:8080/camel/api/bean` 
+
+Include the HEADER: Content-Type: application/json, 
+
+and a BODY Payload like:
+
+`{"id": 1,"name": "World"}`
+
+We will get a return code of 201 and the response: `Hello, World` - if the transform() method from Application class is uncommented and the process() method is commented
+
+or return code of 201 and the response: `{"id": 10,"name": "Hello, World"}` - if the transform() method from Application class is commented and the process() method is uncommented 
+
+## Relevant articles:
+
+- [Apache Camel with Spring Boot](https://www.baeldung.com/apache-camel-spring-boot)

spring-boot-modules/spring-boot-camel/pom.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.example</groupId>
+    <artifactId>spring-boot-camel</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+	<name>spring-boot-camel</name>
+	
+    <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-servlet-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jackson-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-swagger-java-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring-boot-starter</artifactId>
+            <version>${camel.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot-starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot-starter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <defaultGoal>spring-boot:run</defaultGoal>
+
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot-starter.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <camel.version>2.19.1</camel.version>
+        <spring-boot-starter.version>1.5.4.RELEASE</spring-boot-starter.version>
+    </properties>
+
+</project>

spring-boot-modules/spring-boot-camel/src/main/java/com/baeldung/camel/Application.java

@@ -0,0 +1,105 @@
+package com.baeldung.camel;
+
+import javax.ws.rs.core.MediaType;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.servlet.CamelHttpTransportServlet;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.model.rest.RestBindingMode;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.stereotype.Component;
+
+@SpringBootApplication
+@ComponentScan(basePackages="com.baeldung.camel")
+public class Application{
+
+    @Value("${server.port}")
+    String serverPort;
+    
+    @Value("${baeldung.api.path}")
+    String contextPath;
+    
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+    @Bean
+    ServletRegistrationBean servletRegistrationBean() {
+        ServletRegistrationBean servlet = new ServletRegistrationBean(new CamelHttpTransportServlet(), contextPath+"/*");
+        servlet.setName("CamelServlet");
+        return servlet;
+    }
+
+
+    @Component
+    class RestApi extends RouteBuilder {
+
+        @Override
+        public void configure() {
+
+            CamelContext context = new DefaultCamelContext();
+
+            
+            // http://localhost:8080/camel/api-doc
+            restConfiguration().contextPath(contextPath) //
+                .port(serverPort)
+                .enableCORS(true)
+                .apiContextPath("/api-doc")
+                .apiProperty("api.title", "Test REST API")
+                .apiProperty("api.version", "v1")
+                .apiProperty("cors", "true") // cross-site
+                .apiContextRouteId("doc-api")
+                .component("servlet")
+                .bindingMode(RestBindingMode.json)
+                .dataFormatProperty("prettyPrint", "true");
+/** 
+The Rest DSL supports automatic binding json/xml contents to/from 
+POJOs using Camels Data Format.
+By default the binding mode is off, meaning there is no automatic 
+binding happening for incoming and outgoing messages.
+You may want to use binding if you develop POJOs that maps to 
+your REST services request and response types. 
+*/         
+            
+            rest("/api/").description("Teste REST Service")
+                .id("api-route")
+                .post("/bean")
+                .produces(MediaType.APPLICATION_JSON)
+                .consumes(MediaType.APPLICATION_JSON)
+//                .get("/hello/{place}")
+                .bindingMode(RestBindingMode.auto)
+                .type(MyBean.class)
+                .enableCORS(true)
+//                .outType(OutBean.class)
+
+                .to("direct:remoteService");
+            
+       
+            from("direct:remoteService")
+                .routeId("direct-route")
+                .tracing()
+                .log(">>> ${body.id}")
+                .log(">>> ${body.name}")
+//                .transform().simple("blue ${in.body.name}")                
+                .process(new Processor() {
+                    @Override
+                    public void process(Exchange exchange) throws Exception {
+                        MyBean bodyIn = (MyBean) exchange.getIn().getBody();
+                        
+                        ExampleServices.example(bodyIn);
+
+                        exchange.getIn().setBody(bodyIn);
+                    }
+                })
+                .setHeader(Exchange.HTTP_RESPONSE_CODE, constant(201));
+        }
+    }
+}

spring-boot-modules/spring-boot-camel/src/main/java/com/baeldung/camel/ExampleServices.java

@@ -0,0 +1,15 @@
+package com.baeldung.camel;
+
+/**
+ * a Mock class to show how some other layer
+ * (a persistence layer, for instance)
+ * could be used insida a Camel
+ * 
+ */
+public class ExampleServices {
+
+    public static void example(MyBean bodyIn) {
+        bodyIn.setName( "Hello, " + bodyIn.getName() );
+        bodyIn.setId(bodyIn.getId()*10);
+    }
+}

spring-boot-modules/spring-boot-camel/src/main/java/com/baeldung/camel/MyBean.java

@@ -0,0 +1,18 @@
+package com.baeldung.camel;
+
+public class MyBean {
+    private Integer id;
+    private String name;
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+}

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

@@ -0,0 +1,15 @@
+logging.config=classpath:logback.xml
+
+# the options from org.apache.camel.spring.boot.CamelConfigurationProperties can be configured here
+camel.springboot.name=MyCamel
+
+# lets listen on all ports to ensure we can be invoked from the pod IP
+server.address=0.0.0.0
+management.address=0.0.0.0
+
+# lets use a different management port in case you need to listen to HTTP requests on 8080
+management.port=8081
+
+# disable all management enpoints except health
+endpoints.enabled = true
+endpoints.health.enabled = true

spring-boot-modules/spring-boot-camel/src/main/resources/application.yml

@@ -0,0 +1,27 @@
+server:
+  port: 8080
+
+# for example purposes of Camel version 2.18 and below
+baeldung:
+  api:
+    path: '/camel' 
+
+camel:
+  springboot:
+    # The Camel context name
+    name: ServicesRest
+
+# Binding health checks to a different port
+management:
+  port: 8081
+
+# disable all management enpoints except health
+endpoints:
+  enabled: false
+  health:
+    enabled: true
+
+# The application configuration properties
+quickstart:
+  generateOrderPeriod: 10s
+  processOrderPeriod: 30s

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="info">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>

spring-boot-modules/spring-boot-camel/src/test/java/org/baeldung/SpringContextTest.java

@@ -0,0 +1,17 @@
+package org.baeldung;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.baeldung.camel.Application;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = Application.class)
+public class SpringContextTest {
+
+    @Test
+    public void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}

spring-boot-modules/spring-boot-crud/README.md

@@ -0,0 +1,7 @@
+## Spring boot CRUD
+
+This module contains articles about Spring Boot CRUD Operations
+
+### Relevant Articles: 
+- [Spring Boot CRUD Application with Thymeleaf](https://www.baeldung.com/spring-boot-crud-thymeleaf)
+- [Using a Spring Boot Application as a Dependency](https://www.baeldung.com/spring-boot-dependency)

spring-boot-modules/spring-boot-crud/pom.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-crud</artifactId>
+    <name>spring-boot-crud</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-2</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>spring-boot-crud</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <classifier>exec</classifier>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/crud/Application.java

@@ -0,0 +1,23 @@
+package com.baeldung.crud;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+@SpringBootApplication 
+@EnableAutoConfiguration
+@ComponentScan(basePackages={"com.baeldung.crud"})
+@EnableJpaRepositories(basePackages="com.baeldung.crud.repositories")
+@EnableTransactionManagement
+@EntityScan(basePackages="com.baeldung.crud.entities")
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+    
+}

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/crud/controllers/UserController.java

@@ -0,0 +1,68 @@
+package com.baeldung.crud.controllers;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.baeldung.crud.entities.User;
+import com.baeldung.crud.repositories.UserRepository;
+
+@Controller
+public class UserController {
+    
+    private final UserRepository userRepository;
+
+    @Autowired
+    public UserController(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+    
+    @GetMapping("/signup")
+    public String showSignUpForm(User user) {
+        return "add-user";
+    }
+    
+    @PostMapping("/adduser")
+    public String addUser(@Valid User user, BindingResult result, Model model) {
+        if (result.hasErrors()) {
+            return "add-user";
+        }
+        
+        userRepository.save(user);
+        model.addAttribute("users", userRepository.findAll());
+        return "index";
+    }
+    
+    @GetMapping("/edit/{id}")
+    public String showUpdateForm(@PathVariable("id") long id, Model model) {
+        User user = userRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("Invalid user Id:" + id));
+        model.addAttribute("user", user);
+        return "update-user";
+    }
+    
+    @PostMapping("/update/{id}")
+    public String updateUser(@PathVariable("id") long id, @Valid User user, BindingResult result, Model model) {
+        if (result.hasErrors()) {
+            user.setId(id);
+            return "update-user";
+        }
+        
+        userRepository.save(user);
+        model.addAttribute("users", userRepository.findAll());
+        return "index";
+    }
+    
+    @GetMapping("/delete/{id}")
+    public String deleteUser(@PathVariable("id") long id, Model model) {
+        User user = userRepository.findById(id).orElseThrow(() -> new IllegalArgumentException("Invalid user Id:" + id));
+        userRepository.delete(user);
+        model.addAttribute("users", userRepository.findAll());
+        return "index";
+    }
+}

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/crud/entities/User.java

@@ -0,0 +1,56 @@
+package com.baeldung.crud.entities;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.validation.constraints.NotBlank;
+
+@Entity
+public class User {
+    
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+    @NotBlank(message = "Name is mandatory")
+    private String name;
+    
+    @NotBlank(message = "Email is mandatory")
+    private String email;
+
+    public User() {}
+
+    public User(String name, String email) {
+        this.name = name;
+        this.email = email;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+    
+    public long getId() {
+        return id;
+    }
+    
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    @Override
+    public String toString() {
+        return "User{" + "id=" + id + ", name=" + name + ", email=" + email + '}';
+    }
+}

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/crud/repositories/UserRepository.java

@@ -0,0 +1,13 @@
+package com.baeldung.crud.repositories;
+
+import com.baeldung.crud.entities.User;
+import java.util.List;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserRepository extends CrudRepository<User, Long> {
+    
+    List<User> findByName(String name);
+    
+}

spring-boot-modules/spring-boot-crud/src/main/resources/templates/add-user.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <title>Add User</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
+        <link rel="stylesheet" href="../css/shards.min.css">
+    </head>
+    <body>
+        <div class="container my-5">
+            <h2 class="mb-5">New User</h2>
+            <div class="row">
+                <div class="col-md-6">
+                    <form action="#" th:action="@{/adduser}" th:object="${user}" method="post">
+                        <div class="row">
+                            <div class="form-group col-md-6">
+                                <label for="name" class="col-form-label">Name</label>
+                                <input type="text" th:field="*{name}" class="form-control" id="name" placeholder="Name">
+                                <span th:if="${#fields.hasErrors('name')}" th:errors="*{name}" class="text-danger"></span>
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label for="email" class="col-form-label">Email</label>
+                                <input type="text" th:field="*{email}" class="form-control" id="email" placeholder="Email">
+                                <span th:if="${#fields.hasErrors('email')}" th:errors="*{email}" class="text-danger"></span>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-6 mt-5">
+                                <input type="submit" class="btn btn-primary" value="Add User">
+                            </div>
+                        </div>    
+                    </form>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>

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

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <title>Users</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
+        <link rel="stylesheet" href="../css/shards.min.css">
+    </head>
+    <body>
+        <div th:switch="${users}" class="container my-5">
+            <div class="row">
+                <div class="col-md-6">
+                    <h2 th:case="null">No users yet!</h2>
+                    <div th:case="*">
+                        <h2 class="my-5">Users</h2>
+                        <table class="table table-striped table-responsive-md">
+                            <thead>
+                                <tr>
+                                    <th>Name</th>
+                                    <th>Email</th>
+                                    <th>Edit</th>
+                                    <th>Delete</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr th:each="user : ${users}">
+                                    <td th:text="${user.name}"></td>
+                                    <td th:text="${user.email}"></td>
+                                    <td><a th:href="@{/edit/{id}(id=${user.id})}" class="btn btn-primary"><i class="fas fa-user-edit ml-2"></i></a></td>
+                                    <td><a th:href="@{/delete/{id}(id=${user.id})}" class="btn btn-primary"><i class="fas fa-user-times ml-2"></i></a></td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>      
+                    <p class="my-5"><a href="/signup" class="btn btn-primary"><i class="fas fa-user-plus ml-2"></i></a></p>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>

spring-boot-modules/spring-boot-crud/src/main/resources/templates/update-user.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <meta charset="utf-8">
+        <meta http-equiv="x-ua-compatible" content="ie=edge">
+        <title>Update User</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
+        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
+        <link rel="stylesheet" href="../css/shards.min.css">
+    </head>
+    <body>
+        <div class="container my-5">
+            <h2 class="mb-5">Update User</h2>
+            <div class="row">
+                <div class="col-md-6">
+                    <form action="#" th:action="@{/update/{id}(id=${user.id})}" th:object="${user}" method="post">
+                        <div class="row">
+                            <div class="form-group col-md-6">
+                                <label for="name" class="col-form-label">Name</label>
+                                <input type="text" th:field="*{name}" class="form-control" id="name" placeholder="Name">
+                                <span th:if="${#fields.hasErrors('name')}" th:errors="*{name}" class="text-danger"></span>
+                            </div>
+                            <div class="form-group col-md-6">
+                                <label for="email" class="col-form-label">Email</label>
+                                <input type="text" th:field="*{email}" class="form-control" id="email" placeholder="Email">
+                                <span th:if="${#fields.hasErrors('email')}" th:errors="*{email}" class="text-danger"></span>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-md-6 mt-5">
+                                <input type="submit" class="btn btn-primary" value="Update User">
+                            </div>
+                        </div>    
+                    </form>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>

spring-boot-modules/spring-boot-crud/src/test/java/com/baeldung/crud/UserControllerUnitTest.java

@@ -0,0 +1,83 @@
+package com.baeldung.crud;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.springframework.ui.Model;
+import org.springframework.validation.BindingResult;
+
+import com.baeldung.crud.controllers.UserController;
+import com.baeldung.crud.entities.User;
+import com.baeldung.crud.repositories.UserRepository;
+
+public class UserControllerUnitTest {
+
+    private static UserController userController;
+    private static UserRepository mockedUserRepository;
+    private static BindingResult mockedBindingResult;
+    private static Model mockedModel;
+
+    @BeforeClass
+    public static void setUpUserControllerInstance() {
+        mockedUserRepository = mock(UserRepository.class);
+        mockedBindingResult = mock(BindingResult.class);
+        mockedModel = mock(Model.class);
+        userController = new UserController(mockedUserRepository);
+    }
+
+    @Test
+    public void whenCalledshowSignUpForm_thenCorrect() {
+        User user = new User("John", "[email protected]");
+
+        assertThat(userController.showSignUpForm(user)).isEqualTo("add-user");
+    }
+    
+    @Test
+    public void whenCalledaddUserAndValidUser_thenCorrect() {
+        User user = new User("John", "[email protected]");
+
+        when(mockedBindingResult.hasErrors()).thenReturn(false);
+
+        assertThat(userController.addUser(user, mockedBindingResult, mockedModel)).isEqualTo("index");
+    }
+
+    @Test
+    public void whenCalledaddUserAndInValidUser_thenCorrect() {
+        User user = new User("John", "[email protected]");
+
+        when(mockedBindingResult.hasErrors()).thenReturn(true);
+
+        assertThat(userController.addUser(user, mockedBindingResult, mockedModel)).isEqualTo("add-user");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void whenCalledshowUpdateForm_thenIllegalArgumentException() {
+        assertThat(userController.showUpdateForm(0, mockedModel)).isEqualTo("update-user");
+    }
+    
+    @Test
+    public void whenCalledupdateUserAndValidUser_thenCorrect() {
+        User user = new User("John", "[email protected]");
+
+        when(mockedBindingResult.hasErrors()).thenReturn(false);
+
+        assertThat(userController.updateUser(1l, user, mockedBindingResult, mockedModel)).isEqualTo("index");
+    }
+
+    @Test
+    public void whenCalledupdateUserAndInValidUser_thenCorrect() {
+        User user = new User("John", "[email protected]");
+
+        when(mockedBindingResult.hasErrors()).thenReturn(true);
+
+        assertThat(userController.updateUser(1l, user, mockedBindingResult, mockedModel)).isEqualTo("update-user");
+    }
+    
+    @Test(expected = IllegalArgumentException.class)
+    public void whenCalleddeleteUser_thenIllegalArgumentException() {
+        assertThat(userController.deleteUser(1l, mockedModel)).isEqualTo("index");
+    }
+}

spring-boot-modules/spring-boot-crud/src/test/java/com/baeldung/crud/UserUnitTest.java

@@ -0,0 +1,48 @@
+package com.baeldung.crud;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+
+import com.baeldung.crud.entities.User;
+
+public class UserUnitTest {
+    
+    @Test
+    public void whenCalledGetName_thenCorrect() {
+        User user = new User("Julie", "[email protected]");
+        
+        assertThat(user.getName()).isEqualTo("Julie");
+    }
+    
+    @Test
+    public void whenCalledGetEmail_thenCorrect() {
+        User user = new User("Julie", "[email protected]");
+        
+        assertThat(user.getEmail()).isEqualTo("[email protected]");
+    }
+    
+    @Test
+    public void whenCalledSetName_thenCorrect() {
+        User user = new User("Julie", "[email protected]");
+        
+        user.setName("John");
+        
+        assertThat(user.getName()).isEqualTo("John");
+    }
+    
+    @Test
+    public void whenCalledSetEmail_thenCorrect() {
+        User user = new User("Julie", "[email protected]");
+        
+        user.setEmail("[email protected]");
+        
+        assertThat(user.getEmail()).isEqualTo("[email protected]");
+    }
+    
+    @Test
+    public void whenCalledtoString_thenCorrect() {
+        User user = new User("Julie", "[email protected]");
+        assertThat(user.toString()).isEqualTo("User{id=0, name=Julie, [email protected]}");
+    }
+}

spring-boot-modules/spring-boot-logging-log4j2/.gitignore

@@ -0,0 +1,29 @@
+/target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/build/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+/logs/
+/bin/
+/mvnw
+/mvnw.cmd

spring-boot-modules/spring-boot-logging-log4j2/README.md

@@ -0,0 +1,8 @@
+## Spring Boot Logging with Log4j 2
+
+This module contains articles about logging in Spring Boot projects with Log4j 2.
+
+### Relevant Articles: 
+- [Logging in Spring Boot](https://www.baeldung.com/spring-boot-logging)
+- [Logging to Graylog with Spring Boot](https://www.baeldung.com/graylog-with-spring-boot)
+

spring-boot-modules/spring-boot-logging-log4j2/pom.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-boot-logging-log4j2</artifactId>
+    <name>spring-boot-logging-log4j2</name>
+    <packaging>jar</packaging>
+    <description>Demo project for Spring Boot Logging with Log4J2</description>
+
+    <!-- this needs to use the boot parent directly in order to not inherit logback dependencies -->
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.2.RELEASE</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- for Graylog demo -->
+        <dependency>
+            <!-- forcing spring boot 1.x sing log4j was dropped in spring boot 1.4 and beyond -->
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j</artifactId>
+            <version>${spring-boot-starter-log4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.graylog2</groupId>
+            <artifactId>gelfj</artifactId>
+            <version>${gelfj.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <forkCount>3</forkCount>
+                    <reuseForks>true</reuseForks>
+                    <excludes>
+                        <exclude>**/*IntegrationTest.java</exclude>
+                        <exclude>**/*IntTest.java</exclude>
+                        <exclude>**/*ManualTest.java</exclude>
+                        <exclude>**/*LiveTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <start-class>com.baeldung.springbootlogging.SpringBootLoggingApplication</start-class>
+        <spring-boot-starter-log4j.version>1.3.8.RELEASE</spring-boot-starter-log4j.version>
+        <gelfj.version>1.1.16</gelfj.version>
+        <lombok.version>1.18.4</lombok.version>
+    </properties>
+
+</project>

spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/graylog/GraylogDemoApplication.java

@@ -0,0 +1,17 @@
+package com.baeldung.graylog;
+
+import org.apache.log4j.Logger;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class GraylogDemoApplication {
+
+    private final static Logger LOG =
+            Logger.getLogger(GraylogDemoApplication.class);
+
+    public static void main(String[] args) {
+        SpringApplication.run(GraylogDemoApplication.class, args);
+        LOG.info("Hello from Spring Boot");
+    }
+}

spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LoggingController.java

@@ -0,0 +1,37 @@
+package com.baeldung.springbootlogging;
+
+import org.apache.logging.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class LoggingController {
+
+    private final static Logger logger = LoggerFactory.getLogger(LoggingController.class);
+
+    @GetMapping("/")
+    public String index() {
+        logger.trace("A TRACE Message");
+        logger.debug("A DEBUG Message");
+        logger.info("An INFO Message");
+        logger.warn("A WARN Message");
+        logger.error("An ERROR Message");
+
+        return "Howdy! Check out the Logs to see the output...";
+    }
+
+    private static final org.apache.logging.log4j.Logger loggerNative = LogManager.getLogger(LoggingController.class);
+
+    @GetMapping("/native")
+    public String nativeLogging() {
+        loggerNative.trace("This TRACE message has been printed by Log4j2 without passing through SLF4J");
+        loggerNative.debug("This DEBUG message has been printed by Log4j2 without passing through SLF4J");
+        loggerNative.info("This INFO message has been printed by Log4j2 without passing through SLF4J");
+        loggerNative.warn("This WARN message been printed by Log4j2 without passing through SLF4J");
+        loggerNative.error("This ERROR message been printed by Log4j2 without passing through SLF4J");
+        loggerNative.fatal("This FATAL message been printed by Log4j2 without passing through SLF4J");
+        return "Howdy! Check out the Logs to see the output printed directly through Log4j2...";
+    }
+}

spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/LombokLoggingController.java

@@ -0,0 +1,28 @@
+package com.baeldung.springbootlogging;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.extern.slf4j.Slf4j;
+
+//import lombok.extern.log4j.Log4j2;
+//import lombok.extern.apachecommons.CommonsLog;
+
+@RestController("LombokLoggingController")
+@Slf4j
+// @CommonsLog (Comment any other Lombok logging annotation and uncomment this
+// to work with Apache Commons Logging)
+// @Log4j2 (Comment any other Lombok logging annotation and uncomment this to
+// work directly with Log4j2)
+public class LombokLoggingController {
+
+	@GetMapping("/lombok")
+	public String index() {
+		log.trace("A TRACE Message");
+		log.debug("A DEBUG Message");
+		log.info("An INFO Message");
+		log.warn("A WARN Message");
+		log.error("An ERROR Message");
+		return "Howdy! Check out the Logs to see the output...";
+	}
+}

spring-boot-modules/spring-boot-logging-log4j2/src/main/java/com/baeldung/springbootlogging/SpringBootLoggingApplication.java

@@ -0,0 +1,12 @@
+package com.baeldung.springbootlogging;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class SpringBootLoggingApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootLoggingApplication.class, args);
+    }
+}