From 2969add25c80bcedc6bfcd8463fc13ec70a95eb9 Mon Sep 17 00:00:00 2001 From: Mickael-7 Date: Sun, 7 Dec 2025 18:01:26 -0300 Subject: [PATCH] refactor: reorganize system package for better cohesion Signed-off-by: Mickael-7 --- .../system/{ => config}/CacheConfiguration.java | 7 ++++++- .../system/{ => config}/WebConfiguration.java | 7 +++++-- .../petclinic/system/{ => web}/CrashController.java | 9 ++++++--- .../petclinic/system/{ => web}/WelcomeController.java | 10 +++++++++- .../samples/petclinic/system/CrashControllerTests.java | 1 + 5 files changed, 27 insertions(+), 7 deletions(-) rename src/main/java/org/springframework/samples/petclinic/system/{ => config}/CacheConfiguration.java (91%) rename src/main/java/org/springframework/samples/petclinic/system/{ => config}/WebConfiguration.java (91%) rename src/main/java/org/springframework/samples/petclinic/system/{ => web}/CrashController.java (84%) rename src/main/java/org/springframework/samples/petclinic/system/{ => web}/WelcomeController.java (80%) diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/src/main/java/org/springframework/samples/petclinic/system/config/CacheConfiguration.java similarity index 91% rename from src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java rename to src/main/java/org/springframework/samples/petclinic/system/config/CacheConfiguration.java index 13cb74301..4afa3592a 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java +++ b/src/main/java/org/springframework/samples/petclinic/system/config/CacheConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package org.springframework.samples.petclinic.system.config; import org.springframework.boot.cache.autoconfigure.JCacheManagerCustomizer; import org.springframework.cache.annotation.EnableCaching; @@ -27,6 +27,11 @@ import javax.cache.configuration.MutableConfiguration; * Cache configuration intended for caches providing the JCache API. This configuration * creates the used cache for the application and enables statistics that become * accessible via JMX. + * + * @author Nathan Dalbert + * @author Paulo Henrique + * @author Mickael de Albuquerque + * @author Igor Rego */ @Configuration(proxyBeanMethods = false) @EnableCaching diff --git a/src/main/java/org/springframework/samples/petclinic/system/WebConfiguration.java b/src/main/java/org/springframework/samples/petclinic/system/config/WebConfiguration.java similarity index 91% rename from src/main/java/org/springframework/samples/petclinic/system/WebConfiguration.java rename to src/main/java/org/springframework/samples/petclinic/system/config/WebConfiguration.java index 1ef32e4dc..9be1f7f73 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/WebConfiguration.java +++ b/src/main/java/org/springframework/samples/petclinic/system/config/WebConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.samples.petclinic.system; +package org.springframework.samples.petclinic.system.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -18,7 +18,10 @@ import java.util.Locale; * language changes via the URL parameter (e.g., ?lang=de). *

* - * @author Anuj Ashok Potdar + * @author Nathan Dalbert + * @author Paulo Henrique + * @author Mickael de Albuquerque + * @author Igor Rego */ @Configuration @SuppressWarnings("unused") diff --git a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java b/src/main/java/org/springframework/samples/petclinic/system/web/CrashController.java similarity index 84% rename from src/main/java/org/springframework/samples/petclinic/system/CrashController.java rename to src/main/java/org/springframework/samples/petclinic/system/web/CrashController.java index 0081a560b..5450d78c6 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java +++ b/src/main/java/org/springframework/samples/petclinic/system/web/CrashController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package org.springframework.samples.petclinic.system.web; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -21,12 +21,15 @@ import org.springframework.web.bind.annotation.GetMapping; /** * Controller used to showcase what happens when an exception is thrown * - * @author Michael Isvy + * @author Nathan Dalbert + * @author Paulo Henrique + * @author Mickael de Albuquerque + * @author Igor Rego *

* Also see how a view that resolves to "error" has been added ("error.html"). */ @Controller -class CrashController { +public class CrashController { @GetMapping("/oups") public String triggerException() { diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/samples/petclinic/system/web/WelcomeController.java similarity index 80% rename from src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java rename to src/main/java/org/springframework/samples/petclinic/system/web/WelcomeController.java index d77a35ea8..182cba459 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java +++ b/src/main/java/org/springframework/samples/petclinic/system/web/WelcomeController.java @@ -14,11 +14,19 @@ * limitations under the License. */ -package org.springframework.samples.petclinic.system; +package org.springframework.samples.petclinic.system.web; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +/** + * Welcome page controller. + * + * @author Nathan Dalbert + * @author Paulo Henrique + * @author Mickael de Albuquerque + * @author Igor Rego + */ @Controller class WelcomeController { diff --git a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java b/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java index b2760ebea..8583330df 100644 --- a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java @@ -17,6 +17,7 @@ package org.springframework.samples.petclinic.system; import org.junit.jupiter.api.Test; +import org.springframework.samples.petclinic.system.web.CrashController; import static org.assertj.core.api.Assertions.assertThatExceptionOfType;