remove redundant configurations after adding default

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;

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
   }

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 {
 

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;

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
+#zoho.generate.organization.europeanaid=: false

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

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

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

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;

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 */

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,18 +17,14 @@
 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 = {
       ValidatorConfig.class,
       SerializationConfig.class,
       EntityManagementConfiguration.class
     })
+@ActiveProfiles("test")//enable application-test.yml
 public class EntityFieldsCleanerTest {
 
   private static final String AGENT_STALIN_CLEANING_XML =

entity-management-web/src/test/java/eu/europeana/entitymanagement/validation/EntityFieldsValidatorTest.java

@@ -26,13 +26,15 @@
 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 = {
       ValidatorConfig.class,
       EntityManagementConfiguration.class,
       SerializationConfig.class
     })
+@ActiveProfiles("test")//enable application-test.yml
 public class EntityFieldsValidatorTest {
 
   @Qualifier(AppConfigConstants.BEAN_JSON_MAPPER)

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)

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
+

entity-management-web/src/test/resources/application.properties

@@ -1,3 +1,2 @@
-server.port = 8080
 # explicitly set profile for testing
 spring.profiles.active=test