From fea1b6bf8a2775b63b642e5664fbfbd9823f1856 Mon Sep 17 00:00:00 2001 From: sandip singh Date: Mon, 18 Nov 2019 19:36:11 +0530 Subject: [PATCH] BAEL-3283 - Refactored the code as per review comments. --- pom.xml | 4 ++-- {spring-mvc-themes => spring-mvc-views}/pom.xml | 3 ++- .../src/main/java/com/baeldung/config/DataSourceConfig.java | 0 .../src/main/java/com/baeldung/config/InitSecurity.java | 0 .../src/main/java/com/baeldung/config/SecurityConfig.java | 0 .../src/main/java/com/baeldung/config/ThemeMVCConfig.java | 0 .../src/main/java/com/baeldung/config/WebInitializer.java | 0 .../src/main/java/com/baeldung/controllers/AppController.java | 0 .../src/main/java/com/baeldung/domain/UserPreference.java | 0 .../com/baeldung/repository/UserPreferenceRepository.java | 0 .../baeldung/theme/resolver/UserPreferenceThemeResolver.java | 0 .../src/main/resources/dark.properties | 0 .../src/main/resources/dark_en_US.properties | 0 .../src/main/resources/db/sql/create-db.sql | 0 .../src/main/resources/db/sql/insert-data.sql | 0 .../src/main/resources/light.properties | 0 .../src/main/resources/light_en_US.properties | 0 .../src/main/resources/themes/black.css | 0 .../src/main/resources/themes/white.css | 0 .../src/main/webapp/WEB-INF/index.jsp | 0 20 files changed, 4 insertions(+), 3 deletions(-) rename {spring-mvc-themes => spring-mvc-views}/pom.xml (97%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/config/DataSourceConfig.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/config/InitSecurity.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/config/SecurityConfig.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/config/ThemeMVCConfig.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/config/WebInitializer.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/controllers/AppController.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/domain/UserPreference.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/repository/UserPreferenceRepository.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/java/com/baeldung/theme/resolver/UserPreferenceThemeResolver.java (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/resources/dark.properties (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/resources/dark_en_US.properties (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/resources/db/sql/create-db.sql (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/resources/db/sql/insert-data.sql (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/resources/light.properties (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/resources/light_en_US.properties (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/resources/themes/black.css (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/resources/themes/white.css (100%) rename {spring-mvc-themes => spring-mvc-views}/src/main/webapp/WEB-INF/index.jsp (100%) diff --git a/pom.xml b/pom.xml index 948164973d..b5867cecb6 100644 --- a/pom.xml +++ b/pom.xml @@ -773,7 +773,7 @@ spring-mvc-kotlin spring-mvc-simple spring-mvc-simple-2 - spring-mvc-themes + spring-mvc-views spring-mvc-velocity spring-mvc-webflow spring-mvc-xml @@ -1514,7 +1514,7 @@ spring-mvc-kotlin spring-mvc-simple spring-mvc-simple-2 - spring-mvc-themes + spring-mvc-views spring-mvc-velocity spring-mvc-webflow spring-mvc-xml diff --git a/spring-mvc-themes/pom.xml b/spring-mvc-views/pom.xml similarity index 97% rename from spring-mvc-themes/pom.xml rename to spring-mvc-views/pom.xml index 450e44b1d8..60ba41f534 100644 --- a/spring-mvc-themes/pom.xml +++ b/spring-mvc-views/pom.xml @@ -19,7 +19,8 @@ 1.8 2.3.2-b02 4.0.0 - 5.1.6.RELEASE + 5.2.1.RELEASE + 5.2.1.RELEASE 2.1.10.RELEASE 2.2.2 2.5.0 diff --git a/spring-mvc-themes/src/main/java/com/baeldung/config/DataSourceConfig.java b/spring-mvc-views/src/main/java/com/baeldung/config/DataSourceConfig.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/config/DataSourceConfig.java rename to spring-mvc-views/src/main/java/com/baeldung/config/DataSourceConfig.java diff --git a/spring-mvc-themes/src/main/java/com/baeldung/config/InitSecurity.java b/spring-mvc-views/src/main/java/com/baeldung/config/InitSecurity.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/config/InitSecurity.java rename to spring-mvc-views/src/main/java/com/baeldung/config/InitSecurity.java diff --git a/spring-mvc-themes/src/main/java/com/baeldung/config/SecurityConfig.java b/spring-mvc-views/src/main/java/com/baeldung/config/SecurityConfig.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/config/SecurityConfig.java rename to spring-mvc-views/src/main/java/com/baeldung/config/SecurityConfig.java diff --git a/spring-mvc-themes/src/main/java/com/baeldung/config/ThemeMVCConfig.java b/spring-mvc-views/src/main/java/com/baeldung/config/ThemeMVCConfig.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/config/ThemeMVCConfig.java rename to spring-mvc-views/src/main/java/com/baeldung/config/ThemeMVCConfig.java diff --git a/spring-mvc-themes/src/main/java/com/baeldung/config/WebInitializer.java b/spring-mvc-views/src/main/java/com/baeldung/config/WebInitializer.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/config/WebInitializer.java rename to spring-mvc-views/src/main/java/com/baeldung/config/WebInitializer.java diff --git a/spring-mvc-themes/src/main/java/com/baeldung/controllers/AppController.java b/spring-mvc-views/src/main/java/com/baeldung/controllers/AppController.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/controllers/AppController.java rename to spring-mvc-views/src/main/java/com/baeldung/controllers/AppController.java diff --git a/spring-mvc-themes/src/main/java/com/baeldung/domain/UserPreference.java b/spring-mvc-views/src/main/java/com/baeldung/domain/UserPreference.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/domain/UserPreference.java rename to spring-mvc-views/src/main/java/com/baeldung/domain/UserPreference.java diff --git a/spring-mvc-themes/src/main/java/com/baeldung/repository/UserPreferenceRepository.java b/spring-mvc-views/src/main/java/com/baeldung/repository/UserPreferenceRepository.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/repository/UserPreferenceRepository.java rename to spring-mvc-views/src/main/java/com/baeldung/repository/UserPreferenceRepository.java diff --git a/spring-mvc-themes/src/main/java/com/baeldung/theme/resolver/UserPreferenceThemeResolver.java b/spring-mvc-views/src/main/java/com/baeldung/theme/resolver/UserPreferenceThemeResolver.java similarity index 100% rename from spring-mvc-themes/src/main/java/com/baeldung/theme/resolver/UserPreferenceThemeResolver.java rename to spring-mvc-views/src/main/java/com/baeldung/theme/resolver/UserPreferenceThemeResolver.java diff --git a/spring-mvc-themes/src/main/resources/dark.properties b/spring-mvc-views/src/main/resources/dark.properties similarity index 100% rename from spring-mvc-themes/src/main/resources/dark.properties rename to spring-mvc-views/src/main/resources/dark.properties diff --git a/spring-mvc-themes/src/main/resources/dark_en_US.properties b/spring-mvc-views/src/main/resources/dark_en_US.properties similarity index 100% rename from spring-mvc-themes/src/main/resources/dark_en_US.properties rename to spring-mvc-views/src/main/resources/dark_en_US.properties diff --git a/spring-mvc-themes/src/main/resources/db/sql/create-db.sql b/spring-mvc-views/src/main/resources/db/sql/create-db.sql similarity index 100% rename from spring-mvc-themes/src/main/resources/db/sql/create-db.sql rename to spring-mvc-views/src/main/resources/db/sql/create-db.sql diff --git a/spring-mvc-themes/src/main/resources/db/sql/insert-data.sql b/spring-mvc-views/src/main/resources/db/sql/insert-data.sql similarity index 100% rename from spring-mvc-themes/src/main/resources/db/sql/insert-data.sql rename to spring-mvc-views/src/main/resources/db/sql/insert-data.sql diff --git a/spring-mvc-themes/src/main/resources/light.properties b/spring-mvc-views/src/main/resources/light.properties similarity index 100% rename from spring-mvc-themes/src/main/resources/light.properties rename to spring-mvc-views/src/main/resources/light.properties diff --git a/spring-mvc-themes/src/main/resources/light_en_US.properties b/spring-mvc-views/src/main/resources/light_en_US.properties similarity index 100% rename from spring-mvc-themes/src/main/resources/light_en_US.properties rename to spring-mvc-views/src/main/resources/light_en_US.properties diff --git a/spring-mvc-themes/src/main/resources/themes/black.css b/spring-mvc-views/src/main/resources/themes/black.css similarity index 100% rename from spring-mvc-themes/src/main/resources/themes/black.css rename to spring-mvc-views/src/main/resources/themes/black.css diff --git a/spring-mvc-themes/src/main/resources/themes/white.css b/spring-mvc-views/src/main/resources/themes/white.css similarity index 100% rename from spring-mvc-themes/src/main/resources/themes/white.css rename to spring-mvc-views/src/main/resources/themes/white.css diff --git a/spring-mvc-themes/src/main/webapp/WEB-INF/index.jsp b/spring-mvc-views/src/main/webapp/WEB-INF/index.jsp similarity index 100% rename from spring-mvc-themes/src/main/webapp/WEB-INF/index.jsp rename to spring-mvc-views/src/main/webapp/WEB-INF/index.jsp