Skip to content
Snippets Groups Projects
Commit 2951610b authored by Lukas Malte Monnerjahn's avatar Lukas Malte Monnerjahn
Browse files

OZG-4717 OZG-5110 Rename classes

parent 0940fc51
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ import lombok.Getter; ...@@ -5,7 +5,7 @@ import lombok.Getter;
@Getter @Getter
@Builder @Builder
public class FrontendEnvironment { public class Environment {
private boolean production; private boolean production;
private String remoteHost; private String remoteHost;
private String authServer; private String authServer;
......
...@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor; ...@@ -11,8 +11,8 @@ import lombok.RequiredArgsConstructor;
@RestController("ozgCloudEnvironmentController") @RestController("ozgCloudEnvironmentController")
@RequiredArgsConstructor @RequiredArgsConstructor
@RequestMapping(FrontendEnvironmentController.PATH) @RequestMapping(EnvironmentController.PATH)
public class FrontendEnvironmentController { public class EnvironmentController {
static final String PATH = "/api/environment"; // NOSONAR static final String PATH = "/api/environment"; // NOSONAR
...@@ -21,8 +21,8 @@ public class FrontendEnvironmentController { ...@@ -21,8 +21,8 @@ public class FrontendEnvironmentController {
private final OAuth2Properties oAuthProperties; private final OAuth2Properties oAuthProperties;
@GetMapping @GetMapping
public FrontendEnvironment getEnvironment() { public Environment getEnvironment() {
return FrontendEnvironment.builder() return Environment.builder()
.production(environmentProperties.isProduction()) .production(environmentProperties.isProduction())
.remoteHost(linkTo(RootController.class).toUri().toString()) .remoteHost(linkTo(RootController.class).toUri().toString())
.authServer(oAuthProperties.getAuthServerUrl()) .authServer(oAuthProperties.getAuthServerUrl())
......
...@@ -22,11 +22,11 @@ import de.ozgcloud.admin.RootController; ...@@ -22,11 +22,11 @@ import de.ozgcloud.admin.RootController;
import lombok.SneakyThrows; import lombok.SneakyThrows;
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
class FrontendEnvironmentControllerTest { class EnvironmentControllerTest {
@Spy @Spy
@InjectMocks @InjectMocks
private FrontendEnvironmentController controller; private EnvironmentController controller;
@Mock @Mock
private ProductionProperties environmentProperties; private ProductionProperties environmentProperties;
...@@ -120,7 +120,7 @@ class FrontendEnvironmentControllerTest { ...@@ -120,7 +120,7 @@ class FrontendEnvironmentControllerTest {
@SneakyThrows @SneakyThrows
private ResultActions doRequest() { private ResultActions doRequest() {
return mockMvc.perform(get(FrontendEnvironmentController.PATH)); return mockMvc.perform(get(EnvironmentController.PATH));
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment