From d7ee1a96991f4f2854ed388861797f1a8f4765be Mon Sep 17 00:00:00 2001
From: Ankur Gupta <ankur.gupta@jda.com>
Date: Sat, 18 Apr 2020 15:52:19 +0530
Subject: [PATCH] Fixes as per editor Suggestions

---
 spring-caching/pom.xml                        | 101 +++++++++---------
 .../src/main/resources/application.properties |   2 -
 ...ltipleCacheManagerIntegrationUnitTest.java |   4 +-
 3 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/spring-caching/pom.xml b/spring-caching/pom.xml
index 11dd9a8873..f56d3cf328 100644
--- a/spring-caching/pom.xml
+++ b/spring-caching/pom.xml
@@ -1,54 +1,55 @@
 <?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-caching</artifactId>
-    <version>0.1-SNAPSHOT</version>
-    <name>spring-caching</name>
-    <packaging>war</packaging>
+<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-caching</artifactId>
+	<version>0.1-SNAPSHOT</version>
+	<name>spring-caching</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>
+	<parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>parent-boot-2</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../parent-boot-2</relativePath>
+	</parent>
 
-    <dependencies>
-    	<dependency>
+	<dependencies>
+		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-    		<groupId>com.github.ben-manes.caffeine</groupId>
-    		<artifactId>caffeine</artifactId>
-    	</dependency>
-    	<dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-cache</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ehcache</groupId>
+			<artifactId>ehcache</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.github.ben-manes.caffeine</groupId>
+			<artifactId>caffeine</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
@@ -57,10 +58,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
 		</dependency>
-    </dependencies>
+	</dependencies>
+
+	<properties>
+		<ehcache.version>3.5.2</ehcache.version>
+	</properties>
 
-    <properties>
-        <ehcache.version>3.5.2</ehcache.version>
-    </properties>
-    
 </project>
\ No newline at end of file
diff --git a/spring-caching/src/main/resources/application.properties b/spring-caching/src/main/resources/application.properties
index 53a3ac93b4..ee7b5e62c0 100644
--- a/spring-caching/src/main/resources/application.properties
+++ b/spring-caching/src/main/resources/application.properties
@@ -2,8 +2,6 @@ spring.datasource.url=jdbc:h2:mem:testdb
 spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=sa
 spring.datasource.password=
-#spring.h2.console.enabled=false
-
 
 # Enabling H2 Console
 spring.h2.console.enabled=true
diff --git a/spring-caching/src/test/java/com/baeldung/multiplecachemanager/MultipleCacheManagerIntegrationUnitTest.java b/spring-caching/src/test/java/com/baeldung/multiplecachemanager/MultipleCacheManagerIntegrationUnitTest.java
index 4bcbdb4d68..e02e5da246 100644
--- a/spring-caching/src/test/java/com/baeldung/multiplecachemanager/MultipleCacheManagerIntegrationUnitTest.java
+++ b/spring-caching/src/test/java/com/baeldung/multiplecachemanager/MultipleCacheManagerIntegrationUnitTest.java
@@ -32,7 +32,7 @@ public class MultipleCacheManagerIntegrationUnitTest {
     private CacheManager alternateCacheManager;
 
     @Test
-    public void whenCallGetOrderDetail_thenDataShouldBeInCaffieneCacheManager() {
+    public void givenCacheResolverIsConfigured_whenCallGetOrderDetail_thenDataShouldBeInCaffieneCacheManager() {
         Integer key = 30001;
         cacheManager.getCache("orders")
             .evict(key);
@@ -50,7 +50,7 @@ public class MultipleCacheManagerIntegrationUnitTest {
     }
 
     @Test
-    public void whenCallGetOrderPrice_thenDataShouldBeInAlternateCacheManager() {
+    public void givenCacheResolverIsConfigured_whenCallGetOrderPrice_thenDataShouldBeInAlternateCacheManager() {
         Integer key = 30001;
         alternateCacheManager.getCache("orderprice")
             .evict(key);