Merge branch 'master' into JAVA-3533

pom.xml

@@ -664,14 +664,12 @@
                 <module>spring-mvc-java-2</module>
 
                 <module>spring-mvc-velocity</module>
-                <module>spring-mvc-xml</module>
 
                 <module>spring-protobuf</module>
                 <module>spring-quartz</module>
 
                 <module>spring-reactor</module>
                 <module>spring-remoting</module>
-                <module>spring-rest-query-language</module>
                 <module>spring-rest-shell</module>
                 <module>spring-rest-simple</module>
                 <module>spring-resttemplate</module>
@@ -1129,14 +1127,12 @@
                 <module>spring-mvc-java-2</module>
 
                 <module>spring-mvc-velocity</module>
-                <module>spring-mvc-xml</module>
 
                 <module>spring-protobuf</module>
                 <module>spring-quartz</module>
 
                 <module>spring-reactor</module>
                 <module>spring-remoting</module>
-                <module>spring-rest-query-language</module>
                 <module>spring-rest-shell</module>
                 <module>spring-rest-simple</module>
                 <module>spring-resttemplate</module>

spring-boot-modules/pom.xml

@@ -24,6 +24,7 @@
         <module>spring-boot-angular</module>
         <module>spring-boot-annotations</module>
         <module>spring-boot-artifacts</module>
+        <module>spring-boot-artifacts-2</module>
         <module>spring-boot-autoconfiguration</module>
         <module>spring-boot-basic-customization</module>
         <module>spring-boot-basic-customization-2</module>

spring-boot-modules/spring-boot-artifacts-2/README.md

@@ -0,0 +1,7 @@
+## Spring Boot Artifacts 2
+
+This module contains articles about configuring the Spring Boot build process 2.
+
+### Relevant Articles:			
+
+TBD

spring-boot-modules/spring-boot-artifacts-2/pom.xml

@@ -0,0 +1,48 @@
+<?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>
+
+    <parent>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <artifactId>spring-boot-artifacts-2</artifactId>
+    <packaging>jar</packaging>
+
+    <name>spring-boot-artifacts-2</name>
+    <description>Demo project for Spring Boot</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- The main class to start by executing java -jar -->
+        <start-class>com.baeldung.demo.DemoApplication</start-class>
+    </properties>
+
+</project>

spring-boot-modules/spring-boot-artifacts-2/src/main/java/com/baeldung/demo/DemoApplication.java

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

spring-boot-modules/spring-boot-artifacts-2/src/main/java/com/baeldung/demo/DemoRestController.java

@@ -0,0 +1,15 @@
+package com.baeldung.demo;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class DemoRestController {
+
+    @GetMapping(value = "/welcome")
+    public ResponseEntity<String> welcomeEndpoint() {
+        return ResponseEntity.ok("Welcome to Baeldung Spring Boot Demo!");
+    }
+
+}

spring-boot-modules/spring-boot-artifacts-2/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  application:
+    name: Baeldung_SpringBoot_Demo

spring-web-modules/pom.xml

@@ -22,9 +22,11 @@
         <module>spring-mvc-forms-jsp</module>
         <module>spring-mvc-views</module>
         <module>spring-mvc-webflow</module>
+        <module>spring-mvc-xml</module>
         <module>spring-rest-angular</module>
         <module>spring-rest-http</module>
         <module>spring-rest-http-2</module>
+        <module>spring-rest-query-language</module>
         <module>spring-resttemplate-2</module>
         <module>spring-thymeleaf</module>
         <module>spring-thymeleaf-2</module>

spring-web-modules/spring-mvc-xml/src/main/java/com/baeldung/spring/controller/ImageController.java

@@ -1,61 +1,61 @@
-package com.baeldung.spring.controller;
-
-import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.http.*;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.context.support.ServletContextResource;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-
-@Controller
-public class ImageController {
-
-    @Autowired
-    private ServletContext servletContext;
-
-    @RequestMapping(value = "/image-view", method = RequestMethod.GET)
-    public String imageView() throws IOException {
-        return "image-download";
-    }
-
-    @RequestMapping(value = "/image-manual-response", method = RequestMethod.GET)
-    public void getImageAsByteArray(HttpServletResponse response) throws IOException {
-        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
-        response.setContentType(MediaType.IMAGE_JPEG_VALUE);
-        IOUtils.copy(in, response.getOutputStream());
-    }
-
-    @RequestMapping(value = "/image-byte-array", method = RequestMethod.GET)
-    @ResponseBody
-    public byte[] getImageAsByteArray() throws IOException {
-        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
-        return IOUtils.toByteArray(in);
-    }
-
-    @RequestMapping(value = "/image-response-entity", method = RequestMethod.GET)
-    public ResponseEntity<byte[]> getImageAsResponseEntity() throws IOException {
-        ResponseEntity<byte[]> responseEntity;
-        final HttpHeaders headers = new HttpHeaders();
-        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
-        byte[] media = IOUtils.toByteArray(in);
-        headers.setCacheControl(CacheControl.noCache().getHeaderValue());
-        responseEntity = new ResponseEntity<>(media, headers, HttpStatus.OK);
-        return responseEntity;
-    }
-
-    @RequestMapping(value = "/image-resource", method = RequestMethod.GET)
-    @ResponseBody
-    public ResponseEntity<Resource> getImageAsResource() {
-        final HttpHeaders headers = new HttpHeaders();
-        Resource resource = new ServletContextResource(servletContext, "/WEB-INF/images/image-example.jpg");
-        return new ResponseEntity<>(resource, headers, HttpStatus.OK);
-    }
-}
+package com.baeldung.spring.controller;
+
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.http.*;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.context.support.ServletContextResource;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+
+@Controller
+public class ImageController {
+
+    @Autowired
+    private ServletContext servletContext;
+
+    @RequestMapping(value = "/image-view", method = RequestMethod.GET)
+    public String imageView() throws IOException {
+        return "image-download";
+    }
+
+    @RequestMapping(value = "/image-manual-response", method = RequestMethod.GET)
+    public void getImageAsByteArray(HttpServletResponse response) throws IOException {
+        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
+        response.setContentType(MediaType.IMAGE_JPEG_VALUE);
+        IOUtils.copy(in, response.getOutputStream());
+    }
+
+    @RequestMapping(value = "/image-byte-array", method = RequestMethod.GET)
+    @ResponseBody
+    public byte[] getImageAsByteArray() throws IOException {
+        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
+        return IOUtils.toByteArray(in);
+    }
+
+    @RequestMapping(value = "/image-response-entity", method = RequestMethod.GET)
+    public ResponseEntity<byte[]> getImageAsResponseEntity() throws IOException {
+        ResponseEntity<byte[]> responseEntity;
+        final HttpHeaders headers = new HttpHeaders();
+        final InputStream in = servletContext.getResourceAsStream("/WEB-INF/images/image-example.jpg");
+        byte[] media = IOUtils.toByteArray(in);
+        headers.setCacheControl(CacheControl.noCache().getHeaderValue());
+        responseEntity = new ResponseEntity<>(media, headers, HttpStatus.OK);
+        return responseEntity;
+    }
+
+    @RequestMapping(value = "/image-resource", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseEntity<Resource> getImageAsResource() {
+        final HttpHeaders headers = new HttpHeaders();
+        Resource resource = new ServletContextResource(servletContext, "/WEB-INF/images/image-example.jpg");
+        return new ResponseEntity<>(resource, headers, HttpStatus.OK);
+    }
+}

spring-web-modules/spring-mvc-xml/src/main/java/com/baeldung/spring/validator/PersonValidator.java

@@ -1,22 +1,22 @@
-package com.baeldung.spring.validator;
-
-import com.baeldung.spring.form.Person;
-import org.springframework.stereotype.Component;
-import org.springframework.validation.Errors;
-import org.springframework.validation.ValidationUtils;
-import org.springframework.validation.Validator;
-
-@Component
-public class PersonValidator implements Validator {
-
-    @Override
-    public boolean supports(final Class calzz) {
-        return Person.class.isAssignableFrom(calzz);
-    }
-
-    @Override
-    public void validate(final Object obj, final Errors errors) {
-
-        ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "required.name");
-    }
+package com.baeldung.spring.validator;
+
+import com.baeldung.spring.form.Person;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.Errors;
+import org.springframework.validation.ValidationUtils;
+import org.springframework.validation.Validator;
+
+@Component
+public class PersonValidator implements Validator {
+
+    @Override
+    public boolean supports(final Class calzz) {
+        return Person.class.isAssignableFrom(calzz);
+    }
+
+    @Override
+    public void validate(final Object obj, final Errors errors) {
+
+        ValidationUtils.rejectIfEmptyOrWhitespace(errors, "name", "required.name");
+    }
 }