From 73dafd20306a598e27696e2f4a213d08f3e84046 Mon Sep 17 00:00:00 2001 From: GordeaS Date: Tue, 6 Feb 2024 18:07:42 +0100 Subject: [PATCH 1/2] remove redundant configurations after adding default values #EA-3641 #EA-3702 --- .../src/main/resources/entitymanagement.properties | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/entity-management-web/src/main/resources/entitymanagement.properties b/entity-management-web/src/main/resources/entitymanagement.properties index a21f91cf..78ba0ce3 100644 --- a/entity-management-web/src/main/resources/entitymanagement.properties +++ b/entity-management-web/src/main/resources/entitymanagement.properties @@ -74,7 +74,4 @@ zoho.sync.filter.owner = DPS Team zoho.sync.batch.size = 200 zoho.sync.register.deprecated = false #disable generation of entity ids -#zoho.generate.organization.europeanaid=: false - -zoho.country.mapping=/zoho_country_mapping.json -zoho.role.mapping=/zoho_role_mapping.json \ No newline at end of file +#zoho.generate.organization.europeanaid=: false \ No newline at end of file From 2e453597f75a1cc66eef569f157fd641f7fe6d3f Mon Sep 17 00:00:00 2001 From: GordeaS Date: Wed, 7 Feb 2024 10:00:48 +0100 Subject: [PATCH 2/2] move config resources to common project, fix unit testss #EA-3641 #EA-3702 --- .../config/EntityManagementConfiguration.java | 1 - .../src/main/resources/role_vocabulary.xml | 0 .../src/main/resources/zoho_country_mapping.json | 0 .../main/resources/zoho_country_mapping_local.json | 0 .../src/main/resources/zoho_role_mapping.json | 0 .../definitions/batch/model/ScheduledTask.java | 1 + .../entitymanagement/web/xml/model/RdfXmlUtils.java | 2 +- .../entitymanagement/web/EntityRetrievalIT.java | 2 -- .../entitymanagement/EntityManagementAppTest.java | 2 ++ .../entitymanagement/config/DataSourcesTest.java | 2 ++ .../entitymanagement/config/LanguageCodesTest.java | 2 ++ .../entitymanagement/config/SwaggerConfigTest.java | 2 ++ .../scoring/ScoringComputationTest.java | 2 ++ .../validation/EntityFieldsCleanerTest.java | 13 +++++++------ .../validation/EntityFieldsValidatorTest.java | 2 ++ .../entitymanagement/web/UtilityTests.java | 2 ++ .../src/test/resources/application-test.yml | 6 ++++++ .../src/test/resources/application.properties | 1 - 18 files changed, 29 insertions(+), 11 deletions(-) rename {entity-management-web => entity-management-common}/src/main/resources/role_vocabulary.xml (100%) rename {entity-management-web => entity-management-common}/src/main/resources/zoho_country_mapping.json (100%) rename {entity-management-web => entity-management-common}/src/main/resources/zoho_country_mapping_local.json (100%) rename {entity-management-web => entity-management-common}/src/main/resources/zoho_role_mapping.json (100%) diff --git a/entity-management-common/src/main/java/eu/europeana/entitymanagement/common/config/EntityManagementConfiguration.java b/entity-management-common/src/main/java/eu/europeana/entitymanagement/common/config/EntityManagementConfiguration.java index 7af3f875..8646bdf4 100644 --- a/entity-management-common/src/main/java/eu/europeana/entitymanagement/common/config/EntityManagementConfiguration.java +++ b/entity-management-common/src/main/java/eu/europeana/entitymanagement/common/config/EntityManagementConfiguration.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/entity-management-web/src/main/resources/role_vocabulary.xml b/entity-management-common/src/main/resources/role_vocabulary.xml similarity index 100% rename from entity-management-web/src/main/resources/role_vocabulary.xml rename to entity-management-common/src/main/resources/role_vocabulary.xml diff --git a/entity-management-web/src/main/resources/zoho_country_mapping.json b/entity-management-common/src/main/resources/zoho_country_mapping.json similarity index 100% rename from entity-management-web/src/main/resources/zoho_country_mapping.json rename to entity-management-common/src/main/resources/zoho_country_mapping.json diff --git a/entity-management-web/src/main/resources/zoho_country_mapping_local.json b/entity-management-common/src/main/resources/zoho_country_mapping_local.json similarity index 100% rename from entity-management-web/src/main/resources/zoho_country_mapping_local.json rename to entity-management-common/src/main/resources/zoho_country_mapping_local.json diff --git a/entity-management-web/src/main/resources/zoho_role_mapping.json b/entity-management-common/src/main/resources/zoho_role_mapping.json similarity index 100% rename from entity-management-web/src/main/resources/zoho_role_mapping.json rename to entity-management-common/src/main/resources/zoho_role_mapping.json diff --git a/entity-management-definitions/src/main/java/eu/europeana/entitymanagement/definitions/batch/model/ScheduledTask.java b/entity-management-definitions/src/main/java/eu/europeana/entitymanagement/definitions/batch/model/ScheduledTask.java index 48ed3ab6..f7fa27e0 100644 --- a/entity-management-definitions/src/main/java/eu/europeana/entitymanagement/definitions/batch/model/ScheduledTask.java +++ b/entity-management-definitions/src/main/java/eu/europeana/entitymanagement/definitions/batch/model/ScheduledTask.java @@ -31,6 +31,7 @@ public class ScheduledTask { private ScheduledTaskType updateType; private boolean hasBeenProcessed; + @SuppressWarnings("unused") private ScheduledTask() { // private constructor } diff --git a/entity-management-definitions/src/main/java/eu/europeana/entitymanagement/web/xml/model/RdfXmlUtils.java b/entity-management-definitions/src/main/java/eu/europeana/entitymanagement/web/xml/model/RdfXmlUtils.java index 722b425e..663be920 100644 --- a/entity-management-definitions/src/main/java/eu/europeana/entitymanagement/web/xml/model/RdfXmlUtils.java +++ b/entity-management-definitions/src/main/java/eu/europeana/entitymanagement/web/xml/model/RdfXmlUtils.java @@ -1,12 +1,12 @@ package eu.europeana.entitymanagement.web.xml.model; -import eu.europeana.entitymanagement.utils.UriValidator; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; import org.apache.commons.lang3.StringEscapeUtils; +import eu.europeana.entitymanagement.utils.UriValidator; public class RdfXmlUtils { diff --git a/entity-management-tests/src/integration-test/java/eu/europeana/entitymanagement/web/EntityRetrievalIT.java b/entity-management-tests/src/integration-test/java/eu/europeana/entitymanagement/web/EntityRetrievalIT.java index d547cc3a..7d2de0a7 100644 --- a/entity-management-tests/src/integration-test/java/eu/europeana/entitymanagement/web/EntityRetrievalIT.java +++ b/entity-management-tests/src/integration-test/java/eu/europeana/entitymanagement/web/EntityRetrievalIT.java @@ -14,7 +14,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.xpath; -import java.util.List; import java.util.Map; import java.util.Optional; import org.hamcrest.Matchers; @@ -29,7 +28,6 @@ import eu.europeana.entitymanagement.batch.service.FailedTaskService; import eu.europeana.entitymanagement.definitions.batch.model.ScheduledUpdateType; import eu.europeana.entitymanagement.definitions.model.EntityRecord; -import eu.europeana.entitymanagement.definitions.model.Vocabulary; import eu.europeana.entitymanagement.testutils.IntegrationTestUtils; import eu.europeana.entitymanagement.vocabulary.EntityTypes; import eu.europeana.entitymanagement.vocabulary.FailedTaskJsonFields; diff --git a/entity-management-web/src/test/java/eu/europeana/entitymanagement/EntityManagementAppTest.java b/entity-management-web/src/test/java/eu/europeana/entitymanagement/EntityManagementAppTest.java index 02985648..5f7dff04 100644 --- a/entity-management-web/src/test/java/eu/europeana/entitymanagement/EntityManagementAppTest.java +++ b/entity-management-web/src/test/java/eu/europeana/entitymanagement/EntityManagementAppTest.java @@ -3,10 +3,12 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; /** Basic test for loading context */ @SpringBootTest @Disabled("Excluded from automated runs") +@ActiveProfiles("test")//enable application-test.yml class EntityManagementAppTest { @SuppressWarnings("squid:S2699") // we are aware that this test doesn't have any assertion diff --git a/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/DataSourcesTest.java b/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/DataSourcesTest.java index 23f3c9cd..672c04b0 100644 --- a/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/DataSourcesTest.java +++ b/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/DataSourcesTest.java @@ -11,9 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; /** JUnit test to check if DataSources are properly deserialized from XML */ @SpringBootTest(classes = SerializationConfig.class) +@ActiveProfiles("test")//enable application-test.yml public class DataSourcesTest { @Autowired diff --git a/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/LanguageCodesTest.java b/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/LanguageCodesTest.java index 5b973a84..d97b4813 100644 --- a/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/LanguageCodesTest.java +++ b/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/LanguageCodesTest.java @@ -13,9 +13,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; /** JUnit test to check if DataSources are properly deserialized from XML */ @SpringBootTest(classes = SerializationConfig.class) +@ActiveProfiles("test")//enable application-test.yml public class LanguageCodesTest { @Autowired diff --git a/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/SwaggerConfigTest.java b/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/SwaggerConfigTest.java index 740f8ee9..fa54fab0 100644 --- a/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/SwaggerConfigTest.java +++ b/entity-management-web/src/test/java/eu/europeana/entitymanagement/config/SwaggerConfigTest.java @@ -12,12 +12,14 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; /** JUnit test to check if Swagger is setup fine */ @SpringBootTest @AutoConfigureMockMvc @Disabled("Disabled temporarily") +@ActiveProfiles("test")//enable application-test.yml public class SwaggerConfigTest { @Autowired private MockMvc mockMvc; diff --git a/entity-management-web/src/test/java/eu/europeana/entitymanagement/scoring/ScoringComputationTest.java b/entity-management-web/src/test/java/eu/europeana/entitymanagement/scoring/ScoringComputationTest.java index dce4037c..299c67dc 100644 --- a/entity-management-web/src/test/java/eu/europeana/entitymanagement/scoring/ScoringComputationTest.java +++ b/entity-management-web/src/test/java/eu/europeana/entitymanagement/scoring/ScoringComputationTest.java @@ -12,9 +12,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; /** JUnit test for testing the EMControllerTest class */ @SpringBootTest(classes = SerializationConfig.class) +@ActiveProfiles("test")//enable application-test.yml public class ScoringComputationTest { /** Use configured ObjectMapper so we know the output from this test matches the real thing */ diff --git a/entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsCleanerTest.java b/entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsCleanerTest.java index 45a379ce..1355bd02 100644 --- a/entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsCleanerTest.java +++ b/entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsCleanerTest.java @@ -2,7 +2,12 @@ import static eu.europeana.entitymanagement.testutils.UnitTestUtils.loadFile; import static org.junit.jupiter.api.Assertions.assertEquals; - +import javax.xml.bind.JAXBContext; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; import eu.europeana.entitymanagement.common.config.EntityManagementConfiguration; import eu.europeana.entitymanagement.config.SerializationConfig; import eu.europeana.entitymanagement.config.ValidatorConfig; @@ -12,11 +17,6 @@ import eu.europeana.entitymanagement.normalization.EntityFieldsCleaner; import eu.europeana.entitymanagement.web.MetisDereferenceUtils; import eu.europeana.entitymanagement.web.xml.model.XmlBaseEntityImpl; -import javax.xml.bind.JAXBContext; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest( classes = { @@ -24,6 +24,7 @@ SerializationConfig.class, EntityManagementConfiguration.class }) +@ActiveProfiles("test")//enable application-test.yml public class EntityFieldsCleanerTest { private static final String AGENT_STALIN_CLEANING_XML = diff --git a/entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsValidatorTest.java b/entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsValidatorTest.java index 7d579b8e..b892d0a3 100644 --- a/entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsValidatorTest.java +++ b/entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsValidatorTest.java @@ -26,6 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; @SpringBootTest( classes = { @@ -33,6 +34,7 @@ EntityManagementConfiguration.class, SerializationConfig.class }) +@ActiveProfiles("test")//enable application-test.yml public class EntityFieldsValidatorTest { @Qualifier(AppConfigConstants.BEAN_JSON_MAPPER) diff --git a/entity-management-web/src/test/java/eu/europeana/entitymanagement/web/UtilityTests.java b/entity-management-web/src/test/java/eu/europeana/entitymanagement/web/UtilityTests.java index 3de59b95..1744a725 100644 --- a/entity-management-web/src/test/java/eu/europeana/entitymanagement/web/UtilityTests.java +++ b/entity-management-web/src/test/java/eu/europeana/entitymanagement/web/UtilityTests.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; import eu.europeana.entitymanagement.config.AppAutoconfig; import eu.europeana.entitymanagement.definitions.model.Concept; import eu.europeana.entitymanagement.definitions.model.EntityRecord; @@ -22,6 +23,7 @@ @SpringBootTest @Disabled("Excluded from automated runs") +@ActiveProfiles("test")//enable application-test.yml public class UtilityTests { @Qualifier(AppAutoconfig.BEAN_EM_SOLR_SERVICE) diff --git a/entity-management-web/src/test/resources/application-test.yml b/entity-management-web/src/test/resources/application-test.yml index 8517381d..f07873a2 100644 --- a/entity-management-web/src/test/resources/application-test.yml +++ b/entity-management-web/src/test/resources/application-test.yml @@ -3,3 +3,9 @@ server: include-message: on_param include-stacktrace: on_param include-exception: true + port: 8080 +#spring: +# config: +# activate: +# on-profile: test + \ No newline at end of file diff --git a/entity-management-web/src/test/resources/application.properties b/entity-management-web/src/test/resources/application.properties index cf45e460..4688e827 100644 --- a/entity-management-web/src/test/resources/application.properties +++ b/entity-management-web/src/test/resources/application.properties @@ -1,3 +1,2 @@ -server.port = 8080 # explicitly set profile for testing spring.profiles.active=test \ No newline at end of file