From 05c5002b73ee5c5f93ac6f5e4b531471c9777d20 Mon Sep 17 00:00:00 2001
From: Sjmillington <sam@sbl-uk.org>
Date: Sun, 8 Dec 2019 10:42:40 +0000
Subject: [PATCH] [BAEL-18367] Moving articles from rest-spring-** pt 4

---
 pom.xml                                       |   4 +-
 spring-rest-http/README.md                    |  14 +
 spring-rest-http/pom.xml                      |  52 ++++
 .../java/com/baeldung/config/MvcConfig.java   |  51 ++++
 .../controllers/DeferredResultController.java |   0
 .../BarMappingExamplesController.java         |   0
 .../BazzNewMappingsExampleController.java     |   0
 .../FooMappingExamplesController.java         |   0
 .../controller/status/ExampleController.java  |   0
 .../controller/status/ForbiddenException.java |   0
 .../main/java/com/baeldung/web/dto/Bazz.java  |  22 ++
 .../main/java/com/baeldung/web/dto/Foo.java   |  45 ++++
 ...BazzNewMappingsExampleIntegrationTest.java |   0
 .../ResponseHeaderLiveTest.java               |   0
 .../SpringUriBuilderIntegrationTest.java      |   0
 .../ExampleControllerIntegrationTest.java     |   0
 spring-rest-simple/README.md                  |   4 +-
 spring-rest/.gitignore                        |  13 -
 spring-rest/README.md                         |  17 --
 spring-rest/pom.xml                           | 254 ------------------
 .../baeldung/controllers/ViewController.java  |  14 -
 .../src/main/resources/application.properties |   2 -
 .../com/baeldung/produceimage/data.txt        |   1 -
 .../com/baeldung/produceimage/image.jpg       | Bin 6170 -> 0 bytes
 .../baeldung/produceimage/images/favicon.ico  | Bin 15086 -> 0 bytes
 spring-rest/src/main/resources/logback.xml    |  23 --
 .../pacts/test_consumer-test_provider.json    |  61 -----
 spring-rest/src/test/resources/.gitignore     |  13 -
 .../cache/2d9345a30d2cc31bb3091d70a8ef6c18.0  |  24 --
 .../cache/2d9345a30d2cc31bb3091d70a8ef6c18.1  |  39 ---
 .../cache/4b217e04ba52215f3a6b64d28f6729c6.0  |  13 -
 .../cache/4b217e04ba52215f3a6b64d28f6729c6.1  |   7 -
 spring-rest/src/test/resources/cache/journal  |  75 ------
 spring-rest/src/test/resources/test.txt       |   1 -
 spring-resttemplate/README.md                 |   3 +
 35 files changed, 190 insertions(+), 562 deletions(-)
 create mode 100644 spring-rest-http/README.md
 create mode 100644 spring-rest-http/pom.xml
 create mode 100644 spring-rest-http/src/main/java/com/baeldung/config/MvcConfig.java
 rename {spring-rest => spring-rest-http}/src/main/java/com/baeldung/controllers/DeferredResultController.java (100%)
 rename {spring-rest-simple => spring-rest-http}/src/main/java/com/baeldung/requestmapping/BarMappingExamplesController.java (100%)
 rename {spring-rest-simple => spring-rest-http}/src/main/java/com/baeldung/requestmapping/BazzNewMappingsExampleController.java (100%)
 rename {spring-rest-simple => spring-rest-http}/src/main/java/com/baeldung/requestmapping/FooMappingExamplesController.java (100%)
 rename {spring-rest-simple => spring-rest-http}/src/main/java/com/baeldung/web/controller/status/ExampleController.java (100%)
 rename {spring-rest-simple => spring-rest-http}/src/main/java/com/baeldung/web/controller/status/ForbiddenException.java (100%)
 create mode 100644 spring-rest-http/src/main/java/com/baeldung/web/dto/Bazz.java
 create mode 100644 spring-rest-http/src/main/java/com/baeldung/web/dto/Foo.java
 rename {spring-rest-simple => spring-rest-http}/src/test/java/com/baeldung/requestmapping/BazzNewMappingsExampleIntegrationTest.java (100%)
 rename {spring-rest => spring-rest-http}/src/test/java/com/baeldung/responseheaders/ResponseHeaderLiveTest.java (100%)
 rename {spring-rest => spring-rest-http}/src/test/java/com/baeldung/uribuilder/SpringUriBuilderIntegrationTest.java (100%)
 rename {spring-rest-simple => spring-rest-http}/src/test/java/com/baeldung/web/controller/status/ExampleControllerIntegrationTest.java (100%)
 delete mode 100644 spring-rest/.gitignore
 delete mode 100644 spring-rest/README.md
 delete mode 100644 spring-rest/pom.xml
 delete mode 100644 spring-rest/src/main/java/com/baeldung/controllers/ViewController.java
 delete mode 100644 spring-rest/src/main/resources/application.properties
 delete mode 100644 spring-rest/src/main/resources/com/baeldung/produceimage/data.txt
 delete mode 100644 spring-rest/src/main/resources/com/baeldung/produceimage/image.jpg
 delete mode 100644 spring-rest/src/main/resources/com/baeldung/produceimage/images/favicon.ico
 delete mode 100644 spring-rest/src/main/resources/logback.xml
 delete mode 100644 spring-rest/src/main/resources/pacts/test_consumer-test_provider.json
 delete mode 100644 spring-rest/src/test/resources/.gitignore
 delete mode 100644 spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.0
 delete mode 100644 spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.1
 delete mode 100644 spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.0
 delete mode 100644 spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.1
 delete mode 100644 spring-rest/src/test/resources/cache/journal
 delete mode 100644 spring-rest/src/test/resources/test.txt

diff --git a/pom.xml b/pom.xml
index f29fe4f248..db7ec25a5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -805,7 +805,7 @@
                 <module>spring-reactive-kotlin</module>
                 <module>spring-reactor</module>
                 <module>spring-remoting</module>
-                <module>spring-rest</module>
+                <module>spring-rest-http</module>
                 <module>spring-rest-angular</module>
                 <module>spring-rest-compress</module>
                 <module>spring-rest-testing</module>
@@ -1411,7 +1411,7 @@
                 <module>spring-reactive-kotlin</module>
                 <module>spring-reactor</module>
                 <module>spring-remoting</module>
-                <module>spring-rest</module>
+                <module>spring-rest-http</module>
                 <module>spring-rest-angular</module>
                 <module>spring-rest-compress</module>
                 <module>spring-rest-testing</module>
diff --git a/spring-rest-http/README.md b/spring-rest-http/README.md
new file mode 100644
index 0000000000..51f5ed4000
--- /dev/null
+++ b/spring-rest-http/README.md
@@ -0,0 +1,14 @@
+## Spring REST HTTP
+
+This module contains articles about HTTP in REST APIs with Spring
+
+### The Course
+The "REST With Spring" Classes: http://bit.ly/restwithspring
+
+### Relevant Articles:
+
+- [Guide to UriComponentsBuilder in Spring](https://www.baeldung.com/spring-uricomponentsbuilder)
+- [How to Set a Header on a Response with Spring 5](https://www.baeldung.com/spring-response-header) - The tests contained for this article rely on the sample application within the [spring-resttemplate](/spring-resttemplate) module
+- [Returning Custom Status Codes from Spring Controllers](https://www.baeldung.com/spring-mvc-controller-custom-http-status-code)
+- [Spring @RequestMapping](https://www.baeldung.com/spring-requestmapping)
+- [Guide to DeferredResult in Spring](https://www.baeldung.com/spring-deferred-result)
\ No newline at end of file
diff --git a/spring-rest-http/pom.xml b/spring-rest-http/pom.xml
new file mode 100644
index 0000000000..c5c6b8d44c
--- /dev/null
+++ b/spring-rest-http/pom.xml
@@ -0,0 +1,52 @@
+<?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-rest-http</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-rest-http</name>
+    <packaging>war</packaging>
+
+    <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</groupId>
+            <artifactId>spring-oxm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+    </dependencies>
+
+
+    <properties>
+        <xstream.version>1.4.9</xstream.version>
+    </properties>
+
+</project>
diff --git a/spring-rest-http/src/main/java/com/baeldung/config/MvcConfig.java b/spring-rest-http/src/main/java/com/baeldung/config/MvcConfig.java
new file mode 100644
index 0000000000..ea2c536757
--- /dev/null
+++ b/spring-rest-http/src/main/java/com/baeldung/config/MvcConfig.java
@@ -0,0 +1,51 @@
+package com.baeldung.config;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+
+import org.springframework.oxm.xstream.XStreamMarshaller;
+import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+/*
+ * Please note that main web configuration is in src/main/webapp/WEB-INF/api-servlet.xml
+ */
+@Configuration
+@EnableWebMvc
+@ComponentScan({ "com.baeldung.web", "com.baeldung.requestmapping" })
+public class MvcConfig implements WebMvcConfigurer {
+
+    public MvcConfig() {
+        super();
+    }
+
+    //
+
+    @Override
+    public void configureMessageConverters(final List<HttpMessageConverter<?>> messageConverters) {
+        final Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
+        builder.indentOutput(true)
+            .dateFormat(new SimpleDateFormat("dd-MM-yyyy hh:mm"));
+
+    }
+
+
+    @Override
+    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.defaultContentType(MediaType.APPLICATION_JSON);
+    }
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**");
+    }
+}
diff --git a/spring-rest/src/main/java/com/baeldung/controllers/DeferredResultController.java b/spring-rest-http/src/main/java/com/baeldung/controllers/DeferredResultController.java
similarity index 100%
rename from spring-rest/src/main/java/com/baeldung/controllers/DeferredResultController.java
rename to spring-rest-http/src/main/java/com/baeldung/controllers/DeferredResultController.java
diff --git a/spring-rest-simple/src/main/java/com/baeldung/requestmapping/BarMappingExamplesController.java b/spring-rest-http/src/main/java/com/baeldung/requestmapping/BarMappingExamplesController.java
similarity index 100%
rename from spring-rest-simple/src/main/java/com/baeldung/requestmapping/BarMappingExamplesController.java
rename to spring-rest-http/src/main/java/com/baeldung/requestmapping/BarMappingExamplesController.java
diff --git a/spring-rest-simple/src/main/java/com/baeldung/requestmapping/BazzNewMappingsExampleController.java b/spring-rest-http/src/main/java/com/baeldung/requestmapping/BazzNewMappingsExampleController.java
similarity index 100%
rename from spring-rest-simple/src/main/java/com/baeldung/requestmapping/BazzNewMappingsExampleController.java
rename to spring-rest-http/src/main/java/com/baeldung/requestmapping/BazzNewMappingsExampleController.java
diff --git a/spring-rest-simple/src/main/java/com/baeldung/requestmapping/FooMappingExamplesController.java b/spring-rest-http/src/main/java/com/baeldung/requestmapping/FooMappingExamplesController.java
similarity index 100%
rename from spring-rest-simple/src/main/java/com/baeldung/requestmapping/FooMappingExamplesController.java
rename to spring-rest-http/src/main/java/com/baeldung/requestmapping/FooMappingExamplesController.java
diff --git a/spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ExampleController.java b/spring-rest-http/src/main/java/com/baeldung/web/controller/status/ExampleController.java
similarity index 100%
rename from spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ExampleController.java
rename to spring-rest-http/src/main/java/com/baeldung/web/controller/status/ExampleController.java
diff --git a/spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ForbiddenException.java b/spring-rest-http/src/main/java/com/baeldung/web/controller/status/ForbiddenException.java
similarity index 100%
rename from spring-rest-simple/src/main/java/com/baeldung/web/controller/status/ForbiddenException.java
rename to spring-rest-http/src/main/java/com/baeldung/web/controller/status/ForbiddenException.java
diff --git a/spring-rest-http/src/main/java/com/baeldung/web/dto/Bazz.java b/spring-rest-http/src/main/java/com/baeldung/web/dto/Bazz.java
new file mode 100644
index 0000000000..861b4009b5
--- /dev/null
+++ b/spring-rest-http/src/main/java/com/baeldung/web/dto/Bazz.java
@@ -0,0 +1,22 @@
+package com.baeldung.web.dto;
+
+public class Bazz {
+
+    
+    public String id;
+    public String name;
+
+    public Bazz(String id){
+        this.id = id;
+    }
+    public Bazz(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "Bazz [id=" + id + ", name=" + name + "]";
+    }
+    
+}
diff --git a/spring-rest-http/src/main/java/com/baeldung/web/dto/Foo.java b/spring-rest-http/src/main/java/com/baeldung/web/dto/Foo.java
new file mode 100644
index 0000000000..5a54539927
--- /dev/null
+++ b/spring-rest-http/src/main/java/com/baeldung/web/dto/Foo.java
@@ -0,0 +1,45 @@
+package com.baeldung.web.dto;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+@XStreamAlias("Foo")
+public class Foo {
+    private long id;
+    private String name;
+
+    public Foo() {
+        super();
+    }
+
+    public Foo(final String name) {
+        super();
+
+        this.name = name;
+    }
+
+    public Foo(final long id, final String name) {
+        super();
+
+        this.id = id;
+        this.name = name;
+    }
+
+    // API
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(final long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(final String name) {
+        this.name = name;
+    }
+
+}
\ No newline at end of file
diff --git a/spring-rest-simple/src/test/java/com/baeldung/requestmapping/BazzNewMappingsExampleIntegrationTest.java b/spring-rest-http/src/test/java/com/baeldung/requestmapping/BazzNewMappingsExampleIntegrationTest.java
similarity index 100%
rename from spring-rest-simple/src/test/java/com/baeldung/requestmapping/BazzNewMappingsExampleIntegrationTest.java
rename to spring-rest-http/src/test/java/com/baeldung/requestmapping/BazzNewMappingsExampleIntegrationTest.java
diff --git a/spring-rest/src/test/java/com/baeldung/responseheaders/ResponseHeaderLiveTest.java b/spring-rest-http/src/test/java/com/baeldung/responseheaders/ResponseHeaderLiveTest.java
similarity index 100%
rename from spring-rest/src/test/java/com/baeldung/responseheaders/ResponseHeaderLiveTest.java
rename to spring-rest-http/src/test/java/com/baeldung/responseheaders/ResponseHeaderLiveTest.java
diff --git a/spring-rest/src/test/java/com/baeldung/uribuilder/SpringUriBuilderIntegrationTest.java b/spring-rest-http/src/test/java/com/baeldung/uribuilder/SpringUriBuilderIntegrationTest.java
similarity index 100%
rename from spring-rest/src/test/java/com/baeldung/uribuilder/SpringUriBuilderIntegrationTest.java
rename to spring-rest-http/src/test/java/com/baeldung/uribuilder/SpringUriBuilderIntegrationTest.java
diff --git a/spring-rest-simple/src/test/java/com/baeldung/web/controller/status/ExampleControllerIntegrationTest.java b/spring-rest-http/src/test/java/com/baeldung/web/controller/status/ExampleControllerIntegrationTest.java
similarity index 100%
rename from spring-rest-simple/src/test/java/com/baeldung/web/controller/status/ExampleControllerIntegrationTest.java
rename to spring-rest-http/src/test/java/com/baeldung/web/controller/status/ExampleControllerIntegrationTest.java
diff --git a/spring-rest-simple/README.md b/spring-rest-simple/README.md
index 5e92865cfa..1ceb83b7a7 100644
--- a/spring-rest-simple/README.md
+++ b/spring-rest-simple/README.md
@@ -4,12 +4,10 @@ This module contains articles about REST APIs in Spring
 
 ## Relevant articles:
 
-- [Guide to UriComponentsBuilder in Spring](https://www.baeldung.com/spring-uricomponentsbuilder)
-- [Returning Custom Status Codes from Spring Controllers](https://www.baeldung.com/spring-mvc-controller-custom-http-status-code)
-- [Spring RequestMapping](https://www.baeldung.com/spring-requestmapping)
 - [Spring and Apache FileUpload](https://www.baeldung.com/spring-apache-file-upload)
 - [Test a REST API with curl](https://www.baeldung.com/curl-rest)
 - [Best Practices for REST API Error Handling](https://www.baeldung.com/rest-api-error-handling-best-practices)
+- [Binary Data Formats in a Spring REST API](https://www.baeldung.com/spring-rest-api-with-binary-data-formats)
 
 ### NOTE:
 
diff --git a/spring-rest/.gitignore b/spring-rest/.gitignore
deleted file mode 100644
index 2661c0de1e..0000000000
--- a/spring-rest/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/spring-boot-runtime/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear
\ No newline at end of file
diff --git a/spring-rest/README.md b/spring-rest/README.md
deleted file mode 100644
index 3ea9361169..0000000000
--- a/spring-rest/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-## Spring REST
-
-This module contains articles about REST APIs with Spring
-
-### The Course
-The "REST With Spring" Classes: http://bit.ly/restwithspring
-
-### Relevant Articles:
-- [Spring @RequestMapping](https://www.baeldung.com/spring-requestmapping)
-- [Returning Custom Status Codes from Spring Controllers](https://www.baeldung.com/spring-mvc-controller-custom-http-status-code)
-- [Binary Data Formats in a Spring REST API](https://www.baeldung.com/spring-rest-api-with-binary-data-formats)
-- [Guide to UriComponentsBuilder in Spring](https://www.baeldung.com/spring-uricomponentsbuilder)
-- [A Custom Media Type for a Spring REST API](https://www.baeldung.com/spring-rest-custom-media-type)
-- [HTTP PUT vs HTTP PATCH in a REST API](https://www.baeldung.com/http-put-patch-difference-spring)
-- [Guide to DeferredResult in Spring](https://www.baeldung.com/spring-deferred-result)
-- [How to Set a Header on a Response with Spring 5](https://www.baeldung.com/spring-response-header)
-- [Download an Image or a File with Spring MVC](https://www.baeldung.com/spring-controller-return-image-file)
diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml
deleted file mode 100644
index 0c3e5f399f..0000000000
--- a/spring-rest/pom.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?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-rest</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <name>spring-rest</name>
-    <packaging>war</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
-    </parent>
-
-    <dependencies>
-
-        <!-- Spring Boot Dependencies -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>${commons-fileupload.version}</version>
-        </dependency>
-
-        <!-- web -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- marshalling -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-        </dependency>
-
-        <!-- util -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <!-- test scoped -->
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
-
-        <!-- -->
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>${protobuf-java.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.protobuf-java-format</groupId>
-            <artifactId>protobuf-java-format</artifactId>
-            <version>${protobuf-java-format.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo</artifactId>
-            <version>${kryo.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-        </dependency>
-
-        <!-- Apache common IO for utility -->
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${commons-io.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.rest-assured</groupId>
-            <artifactId>rest-assured</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>${httpclient.version}</version>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>spring-rest</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>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>live</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.cargo</groupId>
-                        <artifactId>cargo-maven2-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>start-server</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>stop-server</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>none</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/*LiveTest.java</include>
-                                    </includes>
-                                    <systemPropertyVariables>
-                                        <webTarget>cargo</webTarget>
-                                    </systemPropertyVariables>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <properties>
-        <commons-fileupload.version>1.3.2</commons-fileupload.version>
-        <kryo.version>4.0.0</kryo.version>
-        <protobuf-java-format.version>1.4</protobuf-java-format.version>
-        <protobuf-java.version>3.1.0</protobuf-java.version>
-
-        <!-- util -->
-        <guava.version>20.0</guava.version>
-
-        <!-- Maven plugins -->
-        <cargo-maven2-plugin.version>1.6.0</cargo-maven2-plugin.version>
-        <findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
-
-        <dependency.locations.enabled>false</dependency.locations.enabled>
-
-        <json.path.version>2.2.0</json.path.version>
-        <pact.version>3.5.11</pact.version>
-        <rest-assured.version>3.1.0</rest-assured.version>
-        <httpclient.version>4.5.2</httpclient.version>
-        <start-class>com.baeldung.sampleapp.config.MainApplication</start-class>
-    </properties>
-
-</project>
diff --git a/spring-rest/src/main/java/com/baeldung/controllers/ViewController.java b/spring-rest/src/main/java/com/baeldung/controllers/ViewController.java
deleted file mode 100644
index 8eab0ce6da..0000000000
--- a/spring-rest/src/main/java/com/baeldung/controllers/ViewController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.controllers;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class ViewController {
-
-    @GetMapping("/")
-    public String welcome() {
-        return "index";
-    }
-
-}
diff --git a/spring-rest/src/main/resources/application.properties b/spring-rest/src/main/resources/application.properties
deleted file mode 100644
index dd7e4e2f2d..0000000000
--- a/spring-rest/src/main/resources/application.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-server.port= 8082
-server.servlet.context-path=/spring-rest
\ No newline at end of file
diff --git a/spring-rest/src/main/resources/com/baeldung/produceimage/data.txt b/spring-rest/src/main/resources/com/baeldung/produceimage/data.txt
deleted file mode 100644
index 3cd18170c0..0000000000
--- a/spring-rest/src/main/resources/com/baeldung/produceimage/data.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a sample file containing text data
\ No newline at end of file
diff --git a/spring-rest/src/main/resources/com/baeldung/produceimage/image.jpg b/spring-rest/src/main/resources/com/baeldung/produceimage/image.jpg
deleted file mode 100644
index 0262656a33a02978a6c4a4754856801a839fd597..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6170
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

diff --git a/spring-rest/src/main/resources/com/baeldung/produceimage/images/favicon.ico b/spring-rest/src/main/resources/com/baeldung/produceimage/images/favicon.ico
deleted file mode 100644
index 64105ac11c6186e380a724416ceb77ab5c263fef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15086
zcmeI33yf6N8OP5s)D;AFL7}u+*#$K|S}oXWX{A6BF!-qLwvyDOsBLZ4#$rp2QmZaB
zDMc+H+EzuWwblBlHY$b~O&EM6N;Jr;Vo@0)La}NWK^bJ(>F<B%obm4U&fR<O%#tzb
zO@8~GbME=R^PTsZGqc8IOx83t8Dy)usIM_68)I5qOYwV2UrO5O(KddRF;j;ca}0TS
zg+?hIVGQ}gp4K^L7z~FDWW(}ArJ-{!+yO&iHrxo;!2(zWzlE7F2^#&jh);(x@CP^p
zehi&Z4B>s!o&?#+$PV&lcoe<}Q{V*nJA~=Gv^RNwrqwUlyiXv{0{QS2SOqSBm|V^K
zQLxvS?=`|#!l^JBRzeqq>8p;)yEgECA92~92j{^Ocmu-PBuDxspmqtCp>qEVFM;g6
z3&A`)Nb3(OYfs4gVE$lypKZf~(VYR$L6|Q=Js00EefOZN@uR+-2@ByKP=BkBcZ1V&
za;MV`ljQFM^6k?gyLZAaaQZKV=~YTY?;z0l>;SdzoJx5srK6LD`LGc*O%p%p9R+QP
z6|Dlgn&*8KEf$U0H~|`r8OzLXW>yUXO|EuJ9@z;+0>uLCE$K;D6=;Qtp!LanwD8pF
zL%lx*!{PIA@PT%dGLMJnL2J+?m5&?%=R+Heh0&mOOj7IG$)NNv!-;S-s1E&-`j3w4
ze*<U^{8@49!}Wys!+Y=!ylth{ke#4(q4;*#2%4Lkr{99ZqI}`~KsX6BCx^mvklm@a
z{Lc~2gPWU4q}E`y=>;$_%n#DP4jaI&`|AJo@DvQQK3qds^Eye{{=D+zeqa~w{*b0M
zR(W3qW}MgW;|R}%kv6VAT?u}hX~JrYFZewm{*2G=D}>$H)B1k}oNImf8sV*wrd+?y
z)7Ti{d?5T*z~&a>=YZD3X`uXPTOYnp*uPHu?IsD|j2-XPgVeqn)YVx26$}E6htuI$
z=m)c54+M3R#I@(TzV57GOMWc_&GAFvV)zbdzFY;nAxW9RytksSIj1=teCLnv;Qe)=
zb~qBILNjQ;t7bg>3;iR&KmPpX2E$qd7QkdsUwjrOfz}JnuVDV3;_5@4Pt~85`XJ1P
z#>Nw%K9~Y(mmfe5lJ?1BbkwHnA*`&ZG_6NkC)dDVKz($ljemfQ(sl1v*m<SCEX34t
zx?xgnsxwerTd&*l`=fIcXrBqQ+goYnb0Xz7!HrPu+)m=Fj!)%>vbDZk2$~y7?4-@x
zRW95YplprFUxW6=G;=GiKOg#v?G~im3}}vj6Lbc79A1XE;C)CkXDj*hPPalMB9y1k
z3)+Wu9+?PQi?t@tf!jfA!mAK>?#ZVO5k<y+g&nn({A-5OK;t+MJ)Kz|j9o~AjFhW=
z<rvTzQ0rw_`>X$cp1^G4tk~}hZLk@FK5QjzOk$%c6ewpJYzz2sH}Qi~m`kNXS(kuY
zm$grwk;+g?CCbwo<{?l&`~&)@G?iM7GS39v#f(dBqzXmK)%tNZB)&_lqS&%3<!YVK
zNBFvViuT!#e8XglyV}jQkLOIw;W^XTm^Td#mziv~KznuK_jqVDnf7eXyMxG43y}w|
zA4+!-?d}euz#T?c2D5WurOaFQAj^;LDYzmv=R^6P;z%O@f9kdc>^N>f>U?kt99_50
zhB$`5I&0nnn?UCU-Dj5f0>T4eGH4GS47y*`p6bnANsH35pnXpFH$q{h_3Avw{!hT|
zCpweq>j&>4EI<APN`DcS!+oI7Df*0Z7ij-e+Jo>gEVC&504U$@;BuG_UxHy!leH5&
z{a^{WbHN||wh5mKJALn6zBE#29i4;Lf!bgOe8#m`T#3#QIMn4QJOZ8t`Sc$c?|Y~7
zpxQT$zdh;f!|qy`1;bsLJxTKZ4AkZWTwcPbz!p%MkH8?`yNSemx}WID*QodUytxYW
z8N<8pbY%x6?;BwS=uABq{PXp@#MQs*=UGmdu;$`oi1MKp?=((-0~K%BdG}S&7*Top
z{G`5fcVJpCE`{e|K9uiD36Fv`Pzyh!Y^d$DE_ipYt___eUF(4Ve&9XgKLu9@tvLfh
zYp2dx{yMY~?|`WCYw=EFLv{FAKal3mzW#DlhhG5SvXmaer-RyC>)&9dBGo?{b7~{M
zes6@;#u`gryIQy8gFbtQm8bn{9(eN>sde>g*abI%H`kHc^X`Q(8?{c;eDLm!ef~%F
zzt*$ALW^y0?Y9?!>ii?0jTYi7q1OI}+0(jSo(qKKV^}_an&z+etv;YJqy0f=h;iV3
z4};Ww<qP1~>y5C+>czgc^UvL=@^ogn2KcptH};1TUIh2RaW-u<VXfOyc53nN8Om^T
zP~$nSP1XHr_y*{lDs+aK0rFk(W8q1NYcowgt@EeZHhV2aS*o+<?0C@ns<ripa1I;-
zI)C2=dmxQ}add95{y$tr8QPog1Ffx1FbK3CYHl0`7s4ip<4@8&n#Y4-CTLtF)%WMu
zTB|XsJwxM2`&=_<j*Nj@q1NZ69oW>_TjMp&81nn?!d=+XJYNo1z!Vq>{a`FCfo-6C
zPA9GW5E~bO*2G0Muovcs_VIP_H<$&Q_c{|UhL=F|sG7Pguyf#e>}-ZGA8MJlmonaj
z7eVXTde{wV%Xm!w>%qpQAp2=;rPZsZ{nwVf_x#tor+HS5y|i^mtGCVhZ~H*&#oeEv
zI_&oQZ|iU<{{J4_9Yor;IS_i?zUOmw!FR29I%jT%1K~&7GD5#6wEd95cdbje!@G4_
zk8ZywbnWk#_^mVlIJgDWAJy*FY1=wX?*qTDQDOYnxqlSQfTge+-iA1zAHvG6McTik
ze6I8kpS5QX0iAW);BvSb9s-?%Ho#WU`A+LVZ>`DeEBTlv9Y6bm&eFQiJOWOHsqj7c
zCFuOK0=7Uc_R3{x{7kEZ&sr1u!${CsNavu9kakYZPwPu9^zd8tIUIC`UjzFg?!3@v
zqv^HqqZT&sr5Wae&fjtBpfmr+ez#Z)U((vZAFT`e%%HyLsSY}mN8atG^`lxn{5k<v
zMbtrSw)gwXYRl>^ef&EKUa3$A^-tpOIeN?2N_O$_+t3kGhpQ{;)KfZsYtO$v;QuD#
zbv19J+6-S?V4bal_VL+K`Rnl=KI<++>ygeTvA-9qm%8Ay?vVZo-ko8+_!ZX={BDA2
z(Cxd6xcc>w58r$Bd;5B*<0sLF(hr98+af(5$qpMYbeOEt3s)M`g6u>#AYbQ~W*Ou{
z{o?Fe<Wl4WW9E^jZ=15)k^0X^e)#0ct8yq3pO7!f5tosPctfEiGh8KjBLri}cGJ>c
zlG%Jonz7_IIsM_udw)NY9X5_N?{OdO<&K_W&J*7Mb9r%_KsEEFc+pc)wR4m&nYXfF
dWheeBz01lX^-;Vm7uxu0D>qw-6JEX$`9Ha#9tHpa

diff --git a/spring-rest/src/main/resources/logback.xml b/spring-rest/src/main/resources/logback.xml
deleted file mode 100644
index 9f48d36486..0000000000
--- a/spring-rest/src/main/resources/logback.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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.web.filter.CommonsRequestLoggingFilter">
-		<level value="DEBUG" />
-	</logger>
-
-    <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>
\ No newline at end of file
diff --git a/spring-rest/src/main/resources/pacts/test_consumer-test_provider.json b/spring-rest/src/main/resources/pacts/test_consumer-test_provider.json
deleted file mode 100644
index c8082798f4..0000000000
--- a/spring-rest/src/main/resources/pacts/test_consumer-test_provider.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-    "provider": {
-        "name": "test_provider"
-    },
-    "consumer": {
-        "name": "test_consumer"
-    },
-    "interactions": [
-        {
-            "description": "GET REQUEST",
-            "request": {
-                "method": "GET",
-                "path": "/pact"
-            },
-            "response": {
-                "status": 200,
-                "headers": {
-                    "Content-Type": "application/json"
-                },
-                "body": {
-                    "condition": true,
-                    "name": "tom"
-                }
-            },
-            "providerStates": [
-                {
-                    "name": "test GET"
-                }
-            ]
-        },
-        {
-            "description": "POST REQUEST",
-            "request": {
-                "method": "POST",
-                "path": "/pact",
-                "headers": {
-                    "Content-Type": "application/json"
-                },
-                "body": {
-                    "name": "Michael"
-                }
-            },
-            "response": {
-                "status": 201
-            },
-            "providerStates": [
-                {
-                    "name": "test POST"
-                }
-            ]
-        }
-    ],
-    "metadata": {
-        "pact-specification": {
-            "version": "3.0.0"
-        },
-        "pact-jvm": {
-            "version": "3.5.0"
-        }
-    }
-}
\ No newline at end of file
diff --git a/spring-rest/src/test/resources/.gitignore b/spring-rest/src/test/resources/.gitignore
deleted file mode 100644
index 83c05e60c8..0000000000
--- a/spring-rest/src/test/resources/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear
\ No newline at end of file
diff --git a/spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.0 b/spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.0
deleted file mode 100644
index e6cfcabe71..0000000000
--- a/spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.0
+++ /dev/null
@@ -1,24 +0,0 @@
-https://publicobject.com/helloworld.txt
-GET
-0
-HTTP/1.1 200 OK
-10
-Content-Type: text/plain
-Content-Length: 1759
-Connection: keep-alive
-Accept-Ranges: bytes
-Server: nginx/1.10.0 (Ubuntu)
-Date: Sat, 08 Dec 2018 13:02:07 GMT
-Last-Modified: Tue, 27 May 2014 02:35:47 GMT
-ETag: "5383fa03-6df"
-OkHttp-Sent-Millis: 1489054646765
-OkHttp-Received-Millis: 1489054646966
-
-TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-4
-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
-0
-TLSv1.2
diff --git a/spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.1 b/spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.1
deleted file mode 100644
index 83db2312f0..0000000000
--- a/spring-rest/src/test/resources/cache/2d9345a30d2cc31bb3091d70a8ef6c18.1
+++ /dev/null
@@ -1,39 +0,0 @@
-
-                         \\           //
-                          \\  .ooo.  //
-                           .@@@@@@@@@.
-                         :@@@@@@@@@@@@@:
-                        :@@. '@@@@@' .@@:
-                        @@@@@@@@@@@@@@@@@
-                        @@@@@@@@@@@@@@@@@
-
-                   :@@ :@@@@@@@@@@@@@@@@@. @@:
-                   @@@ '@@@@@@@@@@@@@@@@@, @@@
-                   @@@ '@@@@@@@@@@@@@@@@@, @@@
-                   @@@ '@@@@@@@@@@@@@@@@@, @@@
-                   @@@ '@@@@@@@@@@@@@@@@@, @@@
-                   @@@ '@@@@@@@@@@@@@@@@@, @@@
-                   @@@ '@@@@@@@@@@@@@@@@@, @@@
-                        @@@@@@@@@@@@@@@@@
-                        '@@@@@@@@@@@@@@@'
-                           @@@@   @@@@
-                           @@@@   @@@@
-                           @@@@   @@@@
-                           '@@'   '@@'
-
-     :@@@.
-   .@@@@@@@:   +@@       `@@      @@`   @@     @@
-  .@@@@'@@@@:  +@@       `@@      @@`   @@     @@
-  @@@     @@@  +@@       `@@      @@`   @@     @@
- .@@       @@: +@@   @@@ `@@      @@` @@@@@@ @@@@@@  @@;@@@@@
- @@@       @@@ +@@  @@@  `@@      @@` @@@@@@ @@@@@@  @@@@@@@@@
- @@@       @@@ +@@ @@@   `@@@@@@@@@@`   @@     @@    @@@   :@@
- @@@       @@@ +@@@@@    `@@@@@@@@@@`   @@     @@    @@#    @@+
- @@@       @@@ +@@@@@+   `@@      @@`   @@     @@    @@:    @@#
-  @@:     .@@` +@@@+@@   `@@      @@`   @@     @@    @@#    @@+
-  @@@.   .@@@  +@@  @@@  `@@      @@`   @@     @@    @@@   ,@@
-   @@@@@@@@@   +@@   @@@ `@@      @@`   @@@@   @@@@  @@@@#@@@@
-    @@@@@@@    +@@   #@@ `@@      @@`   @@@@:  @@@@: @@'@@@@@
-                                                     @@:
-                                                     @@:
-                                                     @@:
diff --git a/spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.0 b/spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.0
deleted file mode 100644
index 85fc22d658..0000000000
--- a/spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-http://publicobject.com/helloworld.txt
-GET
-0
-HTTP/1.1 301 Moved Permanently
-8
-Server: nginx/1.10.0 (Ubuntu)
-Date: Sat, 08 Dec 2018 13:02:04 GMT
-Content-Type: text/html
-Content-Length: 194
-Connection: keep-alive
-Location: https://publicobject.com/helloworld.txt
-OkHttp-Sent-Millis: 1544274128028
-OkHttp-Received-Millis: 1544274128386
diff --git a/spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.1 b/spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.1
deleted file mode 100644
index acf72eabe3..0000000000
--- a/spring-rest/src/test/resources/cache/4b217e04ba52215f3a6b64d28f6729c6.1
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head><title>301 Moved Permanently</title></head>
-<body bgcolor="white">
-<center><h1>301 Moved Permanently</h1></center>
-<hr><center>nginx/1.10.0 (Ubuntu)</center>
-</body>
-</html>
diff --git a/spring-rest/src/test/resources/cache/journal b/spring-rest/src/test/resources/cache/journal
deleted file mode 100644
index a139399103..0000000000
--- a/spring-rest/src/test/resources/cache/journal
+++ /dev/null
@@ -1,75 +0,0 @@
-libcore.io.DiskLruCache
-1
-201105
-2
-
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-DIRTY 2d9345a30d2cc31bb3091d70a8ef6c18
-CLEAN 2d9345a30d2cc31bb3091d70a8ef6c18 7618 1759
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-DIRTY 2d9345a30d2cc31bb3091d70a8ef6c18
-CLEAN 2d9345a30d2cc31bb3091d70a8ef6c18 7618 1759
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-DIRTY 2d9345a30d2cc31bb3091d70a8ef6c18
-CLEAN 2d9345a30d2cc31bb3091d70a8ef6c18 7618 1759
-READ 4b217e04ba52215f3a6b64d28f6729c6
-DIRTY 4b217e04ba52215f3a6b64d28f6729c6
-CLEAN 4b217e04ba52215f3a6b64d28f6729c6 333 194
-READ 2d9345a30d2cc31bb3091d70a8ef6c18
-DIRTY 2d9345a30d2cc31bb3091d70a8ef6c18
-CLEAN 2d9345a30d2cc31bb3091d70a8ef6c18 7618 1759
diff --git a/spring-rest/src/test/resources/test.txt b/spring-rest/src/test/resources/test.txt
deleted file mode 100644
index 95d09f2b10..0000000000
--- a/spring-rest/src/test/resources/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-hello world
\ No newline at end of file
diff --git a/spring-resttemplate/README.md b/spring-resttemplate/README.md
index aee02416f4..eef85792ce 100644
--- a/spring-resttemplate/README.md
+++ b/spring-resttemplate/README.md
@@ -17,6 +17,9 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
 - [Uploading MultipartFile with Spring RestTemplate](https://www.baeldung.com/spring-rest-template-multipart-upload)
 - [Get and Post Lists of Objects with RestTemplate](https://www.baeldung.com/spring-rest-template-list)
 - [Copy of RestTemplate Post Request with JSON](https://www.baeldung.com/spring-resttemplate-post-json-test)
+- [HTTP PUT vs HTTP PATCH in a REST API](https://www.baeldung.com/http-put-patch-difference-spring) 
+- [A Custom Media Type for a Spring REST API](https://www.baeldung.com/spring-rest-custom-media-type)
+- [Download an Image or a File with Spring MVC](https://www.baeldung.com/spring-controller-return-image-file)
 
 ### NOTE: