From 2951610b58a7f6f029ee0d510aacb77daf75e97a Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Tue, 27 Feb 2024 12:00:19 +0100
Subject: [PATCH] OZG-4717 OZG-5110 Rename classes
---
.../{FrontendEnvironment.java => Environment.java} | 2 +-
...ironmentController.java => EnvironmentController.java} | 8 ++++----
...ControllerTest.java => EnvironmentControllerTest.java} | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
rename src/main/java/de/ozgcloud/admin/environment/{FrontendEnvironment.java => Environment.java} (87%)
rename src/main/java/de/ozgcloud/admin/environment/{FrontendEnvironmentController.java => EnvironmentController.java} (83%)
rename src/test/java/de/ozgcloud/admin/environment/{FrontendEnvironmentControllerTest.java => EnvironmentControllerTest.java} (94%)
diff --git a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironment.java b/src/main/java/de/ozgcloud/admin/environment/Environment.java
similarity index 87%
rename from src/main/java/de/ozgcloud/admin/environment/FrontendEnvironment.java
rename to src/main/java/de/ozgcloud/admin/environment/Environment.java
index 0f7ca897..e2bfb54b 100644
--- a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironment.java
+++ b/src/main/java/de/ozgcloud/admin/environment/Environment.java
@@ -5,7 +5,7 @@ import lombok.Getter;
@Getter
@Builder
-public class FrontendEnvironment {
+public class Environment {
private boolean production;
private String remoteHost;
private String authServer;
diff --git a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java b/src/main/java/de/ozgcloud/admin/environment/EnvironmentController.java
similarity index 83%
rename from src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java
rename to src/main/java/de/ozgcloud/admin/environment/EnvironmentController.java
index 41d9e4db..71cf34ce 100644
--- a/src/main/java/de/ozgcloud/admin/environment/FrontendEnvironmentController.java
+++ b/src/main/java/de/ozgcloud/admin/environment/EnvironmentController.java
@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor;
@RestController("ozgCloudEnvironmentController")
@RequiredArgsConstructor
-@RequestMapping(FrontendEnvironmentController.PATH)
-public class FrontendEnvironmentController {
+@RequestMapping(EnvironmentController.PATH)
+public class EnvironmentController {
static final String PATH = "/api/environment"; // NOSONAR
@@ -21,8 +21,8 @@ public class FrontendEnvironmentController {
private final OAuth2Properties oAuthProperties;
@GetMapping
- public FrontendEnvironment getEnvironment() {
- return FrontendEnvironment.builder()
+ public Environment getEnvironment() {
+ return Environment.builder()
.production(environmentProperties.isProduction())
.remoteHost(linkTo(RootController.class).toUri().toString())
.authServer(oAuthProperties.getAuthServerUrl())
diff --git a/src/test/java/de/ozgcloud/admin/environment/FrontendEnvironmentControllerTest.java b/src/test/java/de/ozgcloud/admin/environment/EnvironmentControllerTest.java
similarity index 94%
rename from src/test/java/de/ozgcloud/admin/environment/FrontendEnvironmentControllerTest.java
rename to src/test/java/de/ozgcloud/admin/environment/EnvironmentControllerTest.java
index 67d81f08..bdeaf83b 100644
--- a/src/test/java/de/ozgcloud/admin/environment/FrontendEnvironmentControllerTest.java
+++ b/src/test/java/de/ozgcloud/admin/environment/EnvironmentControllerTest.java
@@ -22,11 +22,11 @@ import de.ozgcloud.admin.RootController;
import lombok.SneakyThrows;
@ExtendWith(MockitoExtension.class)
-class FrontendEnvironmentControllerTest {
+class EnvironmentControllerTest {
@Spy
@InjectMocks
- private FrontendEnvironmentController controller;
+ private EnvironmentController controller;
@Mock
private ProductionProperties environmentProperties;
@@ -120,7 +120,7 @@ class FrontendEnvironmentControllerTest {
@SneakyThrows
private ResultActions doRequest() {
- return mockMvc.perform(get(FrontendEnvironmentController.PATH));
+ return mockMvc.perform(get(EnvironmentController.PATH));
}
}
--
GitLab