diff --git a/src/main/java/de/ozgcloud/admin/settings/ConfigurationProperties.java b/src/main/java/de/ozgcloud/admin/settings/ConfigurationProperties.java deleted file mode 100644 index aec9487ddc5e61d46dc64ca82e6df0488981ca15..0000000000000000000000000000000000000000 --- a/src/main/java/de/ozgcloud/admin/settings/ConfigurationProperties.java +++ /dev/null @@ -1,20 +0,0 @@ -package de.ozgcloud.admin.settings; - -import java.util.Map; - -import org.springframework.data.mongodb.core.mapping.Document; - -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; - -@Getter -@Setter -@Builder -@Document(ConfigurationProperties.COLLECTION_NAME) -public class ConfigurationProperties { - public static final String COLLECTION_NAME = "configuration_properties"; - private String application; - private String profile; - private Map<String, Object> source; -} diff --git a/src/main/java/de/ozgcloud/admin/settings/PropertyRepository.java b/src/main/java/de/ozgcloud/admin/settings/PropertyRepository.java deleted file mode 100644 index 69b124411a0b340c7f2920705d3698390c46391b..0000000000000000000000000000000000000000 --- a/src/main/java/de/ozgcloud/admin/settings/PropertyRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package de.ozgcloud.admin.settings; - -import java.util.List; - -import org.springframework.data.mongodb.repository.MongoRepository; - -interface PropertyRepository extends MongoRepository<ConfigurationProperties, String> { - - List<ConfigurationProperties> findAllByApplication(String application); - -} \ No newline at end of file diff --git a/src/test/java/de/ozgcloud/admin/settings/ConfigurationPropertiesTestFactory.java b/src/test/java/de/ozgcloud/admin/settings/ConfigurationPropertiesTestFactory.java deleted file mode 100644 index c1db07dd6f33924272dae792d6cac31eed53dc6e..0000000000000000000000000000000000000000 --- a/src/test/java/de/ozgcloud/admin/settings/ConfigurationPropertiesTestFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.ozgcloud.admin.settings; - -import java.util.Map; - -public class ConfigurationPropertiesTestFactory { - public static final String APPNAME = "testapp"; - public static final String PROFILE = "testprofile"; - public static final String PROPERTY1 = "property1"; - public static final String VALUE1 = "value1"; - public static Map<String, Object> PROPERTIES = Map.of(PROPERTY1, VALUE1); - - public static ConfigurationProperties create() { - return createBuilder().build(); - } - - public static ConfigurationProperties.ConfigurationPropertiesBuilder createBuilder() { - return ConfigurationProperties.builder() - .application(APPNAME) - .profile(PROFILE) - .source(PROPERTIES); - } -} diff --git a/src/test/java/de/ozgcloud/admin/settings/SettingEnvironmentITCase.java b/src/test/java/de/ozgcloud/admin/settings/SettingEnvironmentITCase.java index 7493776b1de61fbb189d68ec4d94160c955044c4..7755810ffff7890b2f197ce0785754045f4c1546 100644 --- a/src/test/java/de/ozgcloud/admin/settings/SettingEnvironmentITCase.java +++ b/src/test/java/de/ozgcloud/admin/settings/SettingEnvironmentITCase.java @@ -1,12 +1,17 @@ package de.ozgcloud.admin.settings; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; + +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.web.servlet.MockMvc; import de.ozgcloud.common.test.DataITCase; +import lombok.SneakyThrows; @DataITCase @AutoConfigureMockMvc @@ -15,11 +20,11 @@ class SettingEnvironmentITCase { @Autowired private MockMvc mockMvc; - // @Test - // @SneakyThrows - // void shouldHaveHttpEndpoint() { - // var result = mockMvc.perform(get("/configserver/example/path")); + @Test + @SneakyThrows + void shouldHaveHttpEndpoint() { + var result = mockMvc.perform(get("/configserver/example/path")); - // result.andExpect(status().isOk()); - // } + result.andExpect(status().isOk()); + } } \ No newline at end of file diff --git a/src/test/java/de/ozgcloud/admin/settings/SettingEnvironmentRepositoryITCase.java b/src/test/java/de/ozgcloud/admin/settings/SettingEnvironmentRepositoryITCase.java deleted file mode 100644 index 9c37ac93eeb9a1b96f23baa39a239384ba0d10fe..0000000000000000000000000000000000000000 --- a/src/test/java/de/ozgcloud/admin/settings/SettingEnvironmentRepositoryITCase.java +++ /dev/null @@ -1,82 +0,0 @@ -package de.ozgcloud.admin.settings; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.config.server.environment.EnvironmentRepository; -import org.springframework.security.test.context.support.WithMockUser; - -import de.ozgcloud.common.test.DataITCase; - -@DataITCase -@WithMockUser -class SettingEnvironmentRepositoryITCase { - - @Autowired - private EnvironmentRepository repository; - @Autowired - private PropertyRepository propertyRepository; - - private ConfigurationProperties configurationProperties = ConfigurationPropertiesTestFactory.create(); - - // @AfterEach - // void clearData() { - // propertyRepository.deleteAll(); - // } - - // @Nested - // class TestFindOne { - // @BeforeEach - // void initDb() { - // saveMongoSource(configurationProperties); - // } - - // @Test - // void shouldFindEnvironmentWithOneCorrectPropertySource() { - - // var environment = findOneEnvironment(); - - // assertThat(environment.getPropertySources()).hasSize(1); - // } - - // @Test - // void shouldFindEnvironmentWithTwoCorrectPropertySources() { - // var configurationProperties2 = - // ConfigurationPropertiesTestFactory.createBuilder().profile("other").build(); - // saveMongoSource(configurationProperties2); - - // var environment = findOneEnvironment(); - - // assertThat(environment.getPropertySources()).hasSize(2); - // } - - // private void saveMongoSource(ConfigurationProperties configurationProperties) - // { - // propertyRepository.save(configurationProperties); - // } - - // @Test - // void shouldFindEnvironmentWithoutPropertySources() { - - // var environment = repository.findOne("FalseAppName", - // ConfigurationPropertiesTestFactory.PROFILE, null); - - // assertThat(environment.getPropertySources()).isEmpty(); - - // } - - // @Test - // void shouldFindCorrectEnvironment() { - - // var environment = findOneEnvironment(); - - // assertThat(environment.getPropertySources().getLast().getSource()).isEqualTo(ConfigurationPropertiesTestFactory.PROPERTIES); - // } - - // private Environment findOneEnvironment() { - // return repository.findOne(ConfigurationPropertiesTestFactory.APPNAME, - // ConfigurationPropertiesTestFactory.PROFILE, - // null); - // } - - // } - -}