From 56102c9a519d54de3a25db1f568ec7478745f8c5 Mon Sep 17 00:00:00 2001 From: Denis Date: Sun, 6 Oct 2019 19:37:23 +0200 Subject: [PATCH] cleanup; fix code formatting --- .../src/main/resources/META-INF/kmodule.xml | 2 +- .../main/resources/employeeEmailReport.jrxml | 34 +++---- .../src/main/resources/employeeReport.jrxml | 11 ++- .../CacheEvictAnnotationIntegrationTest.java | 90 +++++++++---------- .../CacheManagerEvictIntegrationTest.java | 64 ++++++------- spring-core-2/pom.xml | 18 ---- .../resources/beanInjection-constructor.xml | 16 ++-- .../main/resources/beanInjection-setter.xml | 16 ++-- spring-core-2/src/main/resources/logback.xml | 8 +- spring-core-2/src/main/resources/scopes.xml | 8 +- .../main/resources/springProfiles-config.xml | 5 +- .../src/main/resources/test-mvc.xml | 32 +++---- .../src/main/webapp/WEB-INF/greeting.xml | 12 +-- .../webapp/WEB-INF/normal-webapp-servlet.xml | 18 ++-- .../webapp/WEB-INF/rootApplicationContext.xml | 12 +-- .../webapp/WEB-INF/secure-webapp-servlet.xml | 18 ++-- .../src/main/webapp/WEB-INF/view/sample.jsp | 2 +- .../webapp/WEB-INF/view/scopesExample.jsp | 8 +- .../src/main/webapp/WEB-INF/view/welcome.jsp | 10 +-- .../src/main/webapp/WEB-INF/web-old.xml | 12 +-- .../src/main/webapp/WEB-INF/welcome.jsp | 6 +- spring-scheduling/pom.xml | 9 ++ .../src/main/resources/springAsync-config.xml | 7 +- .../main/resources/springScheduled-config.xml | 16 ++-- .../META-INF/spring/spring-shell-plugin.xml | 5 +- 25 files changed, 223 insertions(+), 216 deletions(-) diff --git a/libraries-2/src/main/resources/META-INF/kmodule.xml b/libraries-2/src/main/resources/META-INF/kmodule.xml index 1b9ce1ce71..9e2597d5de 100644 --- a/libraries-2/src/main/resources/META-INF/kmodule.xml +++ b/libraries-2/src/main/resources/META-INF/kmodule.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/libraries-2/src/main/resources/employeeEmailReport.jrxml b/libraries-2/src/main/resources/employeeEmailReport.jrxml index ad4aaaac90..1e60344e47 100644 --- a/libraries-2/src/main/resources/employeeEmailReport.jrxml +++ b/libraries-2/src/main/resources/employeeEmailReport.jrxml @@ -1,17 +1,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/libraries-2/src/main/resources/employeeReport.jrxml b/libraries-2/src/main/resources/employeeReport.jrxml index 3d2be226fb..434c3e1338 100644 --- a/libraries-2/src/main/resources/employeeReport.jrxml +++ b/libraries-2/src/main/resources/employeeReport.jrxml @@ -1,12 +1,16 @@ - + - = $P{minSalary} AND $P!{condition}]]> + = $P{minSalary} AND $P!{condition}]]> @@ -44,7 +48,8 @@ - + + diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java b/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java index e00305d4a2..28b0d26bed 100644 --- a/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java +++ b/spring-caching/src/test/java/org/baeldung/caching/test/CacheEvictAnnotationIntegrationTest.java @@ -26,54 +26,54 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration public class CacheEvictAnnotationIntegrationTest { - @Configuration - @EnableCaching - static class ContextConfiguration { + @Configuration + @EnableCaching + static class ContextConfiguration { - @Bean - public CachingService cachingService() { - return new CachingService(); - } - - @Bean - public CacheManager cacheManager(){ - SimpleCacheManager cacheManager = new SimpleCacheManager(); - List caches = new ArrayList<>(); - caches.add(cacheBean().getObject()); - cacheManager.setCaches(caches ); - return cacheManager; - } - - @Bean - public ConcurrentMapCacheFactoryBean cacheBean(){ - ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean(); - cacheFactoryBean.setName("first"); - return cacheFactoryBean; - } - } + @Bean + public CachingService cachingService() { + return new CachingService(); + } - @Autowired - CachingService cachingService; + @Bean + public CacheManager cacheManager() { + SimpleCacheManager cacheManager = new SimpleCacheManager(); + List caches = new ArrayList<>(); + caches.add(cacheBean().getObject()); + cacheManager.setCaches(caches); + return cacheManager; + } - @Before - public void before() { - cachingService.putToCache("first", "key1", "Baeldung"); - cachingService.putToCache("first", "key2", "Article"); - } + @Bean + public ConcurrentMapCacheFactoryBean cacheBean() { + ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean(); + cacheFactoryBean.setName("first"); + return cacheFactoryBean; + } + } - @Test - public void givenFirstCache_whenSingleCacheValueEvictRequested_thenEmptyCacheValue() { - cachingService.evictSingleCacheValue("key1"); - String key1 = cachingService.getFromCache("first", "key1"); - assertThat(key1, is(nullValue())); - } + @Autowired + CachingService cachingService; - @Test - public void givenFirstCache_whenAllCacheValueEvictRequested_thenEmptyCache() { - cachingService.evictAllCacheValues(); - String key1 = cachingService.getFromCache("first", "key1"); - String key2 = cachingService.getFromCache("first", "key2"); - assertThat(key1, is(nullValue())); - assertThat(key2, is(nullValue())); - } + @Before + public void before() { + cachingService.putToCache("first", "key1", "Baeldung"); + cachingService.putToCache("first", "key2", "Article"); + } + + @Test + public void givenFirstCache_whenSingleCacheValueEvictRequested_thenEmptyCacheValue() { + cachingService.evictSingleCacheValue("key1"); + String key1 = cachingService.getFromCache("first", "key1"); + assertThat(key1, is(nullValue())); + } + + @Test + public void givenFirstCache_whenAllCacheValueEvictRequested_thenEmptyCache() { + cachingService.evictAllCacheValues(); + String key1 = cachingService.getFromCache("first", "key1"); + String key2 = cachingService.getFromCache("first", "key2"); + assertThat(key1, is(nullValue())); + assertThat(key2, is(nullValue())); + } } diff --git a/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java b/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java index 4b12ed60b6..ffcc88febc 100644 --- a/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java +++ b/spring-caching/src/test/java/org/baeldung/caching/test/CacheManagerEvictIntegrationTest.java @@ -24,39 +24,39 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration public class CacheManagerEvictIntegrationTest { - - @Configuration - static class ContextConfiguration { - @Bean - public CachingService cachingService() { - return new CachingService(); - } - - @Bean - public CacheManager cacheManager(){ - SimpleCacheManager cacheManager = new SimpleCacheManager(); - List caches = new ArrayList<>(); - caches.add(cacheBeanFirst().getObject()); - caches.add(cacheBeanSecond().getObject()); - cacheManager.setCaches(caches ); - return cacheManager; - } - - @Bean - public ConcurrentMapCacheFactoryBean cacheBeanFirst(){ - ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean(); - cacheFactoryBean.setName("first"); - return cacheFactoryBean; - } - - @Bean - public ConcurrentMapCacheFactoryBean cacheBeanSecond(){ - ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean(); - cacheFactoryBean.setName("second"); - return cacheFactoryBean; - } - } + @Configuration + static class ContextConfiguration { + + @Bean + public CachingService cachingService() { + return new CachingService(); + } + + @Bean + public CacheManager cacheManager() { + SimpleCacheManager cacheManager = new SimpleCacheManager(); + List caches = new ArrayList<>(); + caches.add(cacheBeanFirst().getObject()); + caches.add(cacheBeanSecond().getObject()); + cacheManager.setCaches(caches); + return cacheManager; + } + + @Bean + public ConcurrentMapCacheFactoryBean cacheBeanFirst() { + ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean(); + cacheFactoryBean.setName("first"); + return cacheFactoryBean; + } + + @Bean + public ConcurrentMapCacheFactoryBean cacheBeanSecond() { + ConcurrentMapCacheFactoryBean cacheFactoryBean = new ConcurrentMapCacheFactoryBean(); + cacheFactoryBean.setName("second"); + return cacheFactoryBean; + } + } @Autowired CachingService cachingService; diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml index f4132bfb35..032f6a05fc 100644 --- a/spring-core-2/pom.xml +++ b/spring-core-2/pom.xml @@ -39,11 +39,6 @@ org.springframework.retry spring-retry - - org.springframework.shell - spring-shell - ${org.springframework.shell.version} - org.springframework spring-websocket @@ -104,17 +99,6 @@ guava ${guava.version} - - net.sf.jasperreports - jasperreports - ${jasperreports.version} - - - commons-logging - commons-logging - - - org.springframework @@ -218,7 +202,6 @@ org.baeldung.sample.App 5.0.6.RELEASE - 1.2.0.RELEASE 1.3.2 5.2.5.Final @@ -227,7 +210,6 @@ 25.1-jre 3.6 3.6.1 - 6.6.0 2.1.0 3.22.0-GA diff --git a/spring-core-2/src/main/resources/beanInjection-constructor.xml b/spring-core-2/src/main/resources/beanInjection-constructor.xml index a0713fd9f8..5a2ffe767c 100644 --- a/spring-core-2/src/main/resources/beanInjection-constructor.xml +++ b/spring-core-2/src/main/resources/beanInjection-constructor.xml @@ -1,15 +1,15 @@ - - - - - + + + + + - + \ No newline at end of file diff --git a/spring-core-2/src/main/resources/beanInjection-setter.xml b/spring-core-2/src/main/resources/beanInjection-setter.xml index b2d3a05594..0e82e3be1c 100644 --- a/spring-core-2/src/main/resources/beanInjection-setter.xml +++ b/spring-core-2/src/main/resources/beanInjection-setter.xml @@ -1,14 +1,14 @@ - - - - - + + + + + - + \ No newline at end of file diff --git a/spring-core-2/src/main/resources/logback.xml b/spring-core-2/src/main/resources/logback.xml index 56af2d397e..7bd5154680 100644 --- a/spring-core-2/src/main/resources/logback.xml +++ b/spring-core-2/src/main/resources/logback.xml @@ -7,13 +7,13 @@ - - + + - + - + \ No newline at end of file diff --git a/spring-core-2/src/main/resources/scopes.xml b/spring-core-2/src/main/resources/scopes.xml index faecd727fa..8fdb186c28 100644 --- a/spring-core-2/src/main/resources/scopes.xml +++ b/spring-core-2/src/main/resources/scopes.xml @@ -1,10 +1,10 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + - + diff --git a/spring-core-2/src/main/resources/springProfiles-config.xml b/spring-core-2/src/main/resources/springProfiles-config.xml index 5f71c02e20..985ab6ba86 100644 --- a/spring-core-2/src/main/resources/springProfiles-config.xml +++ b/spring-core-2/src/main/resources/springProfiles-config.xml @@ -1,6 +1,7 @@ - diff --git a/spring-mvc-basics-2/src/main/resources/test-mvc.xml b/spring-mvc-basics-2/src/main/resources/test-mvc.xml index 15f950ed4f..8013170379 100644 --- a/spring-mvc-basics-2/src/main/resources/test-mvc.xml +++ b/spring-mvc-basics-2/src/main/resources/test-mvc.xml @@ -1,24 +1,24 @@ - - - - - - /WEB-INF/ - - - .jsp - - - \ No newline at end of file + + + + + + /WEB-INF/ + + + .jsp + + + \ No newline at end of file diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml index 3f0ae83455..1ad5484d80 100644 --- a/spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml +++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/greeting.xml @@ -1,11 +1,11 @@ - - - - + + + + \ No newline at end of file diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml index 0a7a0919a8..8addbe3cf3 100644 --- a/spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml +++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/normal-webapp-servlet.xml @@ -1,16 +1,16 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml index af03661ebc..12e5d8f161 100644 --- a/spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml +++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/rootApplicationContext.xml @@ -1,14 +1,14 @@ - - - + + + \ No newline at end of file diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml index 6cdd3971bf..86797ad081 100644 --- a/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml +++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/secure-webapp-servlet.xml @@ -1,16 +1,16 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp index 7cc14b5dcd..4c64bf97f2 100644 --- a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp +++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/sample.jsp @@ -2,6 +2,6 @@ -

This is the body of the sample view

+

This is the body of the sample view

\ No newline at end of file diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp index 0946f1b5ef..e9abcf194c 100644 --- a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp +++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/scopesExample.jsp @@ -2,9 +2,9 @@ -

Bean Scopes Examples

-
Previous Message: ${previousMessage } -
Current Message: ${currentMessage } -
+

Bean Scopes Examples

+
Previous Message: ${previousMessage } +
Current Message: ${currentMessage } +
\ No newline at end of file diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp index 6a82fb1d5a..4eda3c58e2 100644 --- a/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp +++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/view/welcome.jsp @@ -1,11 +1,11 @@ - Spring Web Contexts + Spring Web Contexts -
-
- Normal Web Application : ${message} -
+
+
+ Normal Web Application : ${message} +
\ No newline at end of file diff --git a/spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml b/spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml index 42020e75c4..03322279e2 100644 --- a/spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml +++ b/spring-mvc-basics-2/src/main/webapp/WEB-INF/web-old.xml @@ -15,10 +15,10 @@ org.springframework.web.context.ContextLoaderListener --> - + - + - +