Skip to content
Snippets Groups Projects
Commit 28f7e720 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into OZG-4994-fix-icon-height

parents f8c36c21 6bc103f7
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,7 @@ import lombok.Getter; ...@@ -30,7 +30,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;
......
...@@ -48,8 +48,8 @@ public class EnvironmentController { ...@@ -48,8 +48,8 @@ public class EnvironmentController {
private VorgangProcessorProperties vorgangProcessorProperties; private VorgangProcessorProperties vorgangProcessorProperties;
@GetMapping @GetMapping
public FrontendEnvironment getFrontendEnvironment() { public Environment getEnvironment() {
return FrontendEnvironment.builder() return Environment.builder()
.production(productionProperties.isProduction()) .production(productionProperties.isProduction())
.remoteHost(linkTo(RootController.class).toUri().toString()) .remoteHost(linkTo(RootController.class).toUri().toString())
.authServer(oAuth2Properties.getAuthServerUrl()) .authServer(oAuth2Properties.getAuthServerUrl())
......
...@@ -62,9 +62,9 @@ class EnvironmentControllerTest { ...@@ -62,9 +62,9 @@ class EnvironmentControllerTest {
mockMvc = MockMvcBuilders.standaloneSetup(controller).build(); mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
} }
@DisplayName("Get frontend environment") @DisplayName("Get environment")
@Nested @Nested
class TestGetFrontendEnvironment { class TestGetEnvironment {
private static final String CLIENT = LoremIpsum.getInstance().getFirstName() + "Client"; private static final String CLIENT = LoremIpsum.getInstance().getFirstName() + "Client";
private static final boolean PRODUCTION = true; private static final boolean PRODUCTION = true;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment