Debt/met 6032 Refactoring metis common library (#681)

* MET-6032 Code refactoring

* MET-6032 Fixing code in Country class

metis-core/metis-core-common/src/main/java/eu/europeana/metis/core/common/Country.java → metis-common/metis-common-utils/src/main/java/eu/europeana/metis/utils/Country.java

@@ -1,4 +1,4 @@
-package eu.europeana.metis.core.common;
+package eu.europeana.metis.utils;
 
 import java.util.Arrays;
 import java.util.Comparator;
@@ -120,6 +120,28 @@ public static Country getCountryFromIsoCode(String isoCode) {
     return null;
   }
 
+  /**
+   * Method that returns the enum with the corresponding given string value
+   * @param countryName The string value to match the enum values with
+   * @return The enum country values that matches the given string value
+   */
+  public static Country fromCountryNameToIsoCode(String countryName){
+    Country result = null;
+    for(Country country : values()){
+      if(country.getName().equals(countryName)){
+        result = country;
+        break;
+      }
+    }
+
+    if(result == null){
+      throw new IllegalArgumentException("Country name "+countryName+" not found");
+    }
+
+    return result;
+
+  }
+
   /**
    * Provides the countries sorted by the {@link #getName()} field
    *

metis-core/metis-core-common/src/main/java/eu/europeana/metis/core/common/CountryDeserializer.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import eu.europeana.metis.utils.Country;
 import java.io.IOException;
 
 /**

metis-core/metis-core-common/src/main/java/eu/europeana/metis/core/common/CountrySerializer.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+import eu.europeana.metis.utils.Country;
 import java.io.IOException;
 
 /**

metis-core/metis-core-common/src/main/java/eu/europeana/metis/core/dataset/Dataset.java

@@ -9,7 +9,7 @@
 import dev.morphia.annotations.Index;
 import dev.morphia.annotations.IndexOptions;
 import dev.morphia.annotations.Indexes;
-import eu.europeana.metis.core.common.Country;
+import eu.europeana.metis.utils.Country;
 import eu.europeana.metis.core.common.CountryDeserializer;
 import eu.europeana.metis.core.common.CountrySerializer;
 import eu.europeana.metis.core.common.Language;

metis-core/metis-core-common/src/test/java/eu/europeana/metis/core/common/TransformationParametersTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import eu.europeana.metis.core.dataset.Dataset;
+import eu.europeana.metis.utils.Country;
 import java.util.Locale;
 import org.junit.jupiter.api.Test;
 
@@ -20,4 +21,4 @@ void testTransformationParametersConstruction() {
     assertEquals(dataset.getCountry().getName(), transformationParameters.getEdmCountry());
     assertEquals(dataset.getLanguage().name().toLowerCase(Locale.US), transformationParameters.getEdmLanguage());
   }
-}
+}

metis-core/metis-core-rest/src/main/java/eu/europeana/metis/core/rest/controller/DatasetController.java

@@ -5,7 +5,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import eu.europeana.metis.authentication.rest.client.AuthenticationClient;
 import eu.europeana.metis.authentication.user.MetisUserView;
-import eu.europeana.metis.core.common.Country;
+import eu.europeana.metis.core.common.CountrySerializer;
+import eu.europeana.metis.utils.Country;
 import eu.europeana.metis.core.common.Language;
 import eu.europeana.metis.core.dataset.Dataset;
 import eu.europeana.metis.core.dataset.DatasetSearchView;
@@ -585,7 +586,7 @@ public ResponseListWrapper<Dataset> getAllDatasetsByOrganizationName(
    *
    * @param authorization the String provided by an HTTP Authorization header <p> The expected input should follow the rule Bearer
    * accessTokenHere </p>
-   * @return The list of countries that are serialized based on {@link eu.europeana.metis.core.common.CountrySerializer}
+   * @return The list of countries that are serialized based on {@link CountrySerializer}
    * @throws GenericMetisException which can be one of:
    * <ul>
    * <li>{@link UserUnauthorizedException} if the user is unauthorized.</li>

metis-core/metis-core-rest/src/test/java/eu/europeana/metis/core/rest/controller/TestDatasetController.java

@@ -27,7 +27,7 @@
 import eu.europeana.metis.authentication.rest.client.AuthenticationClient;
 import eu.europeana.metis.authentication.user.AccountRole;
 import eu.europeana.metis.authentication.user.MetisUserView;
-import eu.europeana.metis.core.common.Country;
+import eu.europeana.metis.utils.Country;
 import eu.europeana.metis.core.common.Language;
 import eu.europeana.metis.core.dataset.Dataset;
 import eu.europeana.metis.core.dataset.DatasetSearchView;
@@ -1143,4 +1143,4 @@ private List<Dataset> getDatasets() {
   }
 
 
-}
+}

metis-core/metis-core-rest/src/test/java/eu/europeana/metis/core/rest/utils/TestObjectFactory.java

@@ -10,7 +10,7 @@
 import eu.europeana.cloud.common.model.dps.TaskErrorsInfo;
 import eu.europeana.metis.authentication.user.AccountRole;
 import eu.europeana.metis.authentication.user.MetisUserView;
-import eu.europeana.metis.core.common.Country;
+import eu.europeana.metis.utils.Country;
 import eu.europeana.metis.core.common.Language;
 import eu.europeana.metis.core.dao.WorkflowExecutionDao.ExecutionDatasetPair;
 import eu.europeana.metis.core.dataset.Dataset;

metis-core/metis-core-service/src/test/java/eu/europeana/metis/core/service/TestRedirectionBase.java

@@ -1,7 +1,7 @@
 package eu.europeana.metis.core.service;
 
 import eu.europeana.cloud.common.model.dps.TaskState;
-import eu.europeana.metis.core.common.Country;
+import eu.europeana.metis.utils.Country;
 import eu.europeana.metis.core.common.Language;
 import eu.europeana.metis.core.dataset.Dataset;
 import eu.europeana.metis.core.dataset.Dataset.PublicationFitness;
@@ -17,9 +17,7 @@
 import eu.europeana.metis.core.workflow.plugins.ExecutablePluginType;
 import eu.europeana.metis.core.workflow.plugins.ExecutionProgress;
 import eu.europeana.metis.core.workflow.plugins.HTTPHarvestPluginMetadata;
-import eu.europeana.metis.core.workflow.plugins.IndexToPreviewPlugin;
 import eu.europeana.metis.core.workflow.plugins.IndexToPreviewPluginMetadata;
-import eu.europeana.metis.core.workflow.plugins.IndexToPublishPlugin;
 import eu.europeana.metis.core.workflow.plugins.IndexToPublishPluginMetadata;
 import eu.europeana.metis.core.workflow.plugins.MediaProcessPluginMetadata;
 import eu.europeana.metis.core.workflow.plugins.NormalizationPluginMetadata;

metis-core/metis-core-service/src/test/java/eu/europeana/metis/core/utils/TestObjectFactory.java

@@ -12,7 +12,7 @@
 import eu.europeana.cloud.common.model.dps.TaskErrorsInfo;
 import eu.europeana.metis.authentication.user.AccountRole;
 import eu.europeana.metis.authentication.user.MetisUserView;
-import eu.europeana.metis.core.common.Country;
+import eu.europeana.metis.utils.Country;
 import eu.europeana.metis.core.common.Language;
 import eu.europeana.metis.core.dao.WorkflowExecutionDao.ExecutionDatasetPair;
 import eu.europeana.metis.core.dataset.Dataset;