EA-3619 - move model from web to definitions

europeana · Dec 4, 2023 · 1db76ff · 1db76ff
1 parent 6edd012
commit 1db76ff
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 60 deletions.
diff --git a/translation-client/pom.xml b/translation-client/pom.xml
@@ -17,13 +17,6 @@
     </properties>
 
     <dependencies>
-
-        <dependency>
-            <groupId>eu.europeana.api</groupId>
-            <artifactId>translation-web</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webflux</artifactId>
@@ -35,16 +28,11 @@
             <artifactId>reactor-netty-http</artifactId>
             <version>1.0.16</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>eu.europeana.api</groupId>-->
-<!--            <artifactId>translation-definitions</artifactId>-->
-<!--            <version>0.0.1-SNAPSHOT</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>eu.europeana.api</groupId>-->
-<!--            <artifactId>translation-service-common</artifactId>-->
-<!--            <version>0.0.1-SNAPSHOT</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>eu.europeana.api</groupId>
+            <artifactId>translation-definitions</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
@@ -55,12 +43,6 @@
             <artifactId>corelib-definitions</artifactId>
             <version>${corelib.version}</version>
         </dependency>
-<!--        test-->
-        <dependency>
-            <groupId>eu.europeana.corelib</groupId>
-            <artifactId>corelib-storage</artifactId>
-            <version>${corelib.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/...lation-client/src/main/java/eu/europeana/api/translation/client/model/TranslationMap.java b/...lation-client/src/main/java/eu/europeana/api/translation/client/model/TranslationMap.java
@@ -3,13 +3,13 @@
 import eu.europeana.api.commons.error.EuropeanaApiException;
 import eu.europeana.api.translation.client.utils.LanguageDetectionUtils;
 import eu.europeana.api.translation.client.web.TranslationApiClient;
-import eu.europeana.api.translation.model.TranslationRequest;
-import eu.europeana.api.translation.model.TranslationResponse;
+import eu.europeana.api.translation.definitions.model.TranslationRequest;
+import eu.europeana.api.translation.definitions.model.TranslationResponse;
 import eu.europeana.corelib.utils.ComparatorUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import javax.annotation.Nonnull;
+import javax.validation.constraints.NotNull;
 import java.util.*;
 
 public class TranslationMap extends LinkedHashMap<String, List<String>> {
@@ -18,14 +18,14 @@ public class TranslationMap extends LinkedHashMap<String, List<String>> {
 
     private static final Logger LOG = LogManager.getLogger(TranslationMap.class);
 
-    @Nonnull
+    @NotNull
     private final String sourceLanguage;
 
-    public TranslationMap(@Nonnull String sourceLanguage) {
+    public TranslationMap(@NotNull String sourceLanguage) {
         this.sourceLanguage = sourceLanguage;
     }
 
-    public TranslationMap(@Nonnull String sourceLanguage, String fieldName, List<String> values) {
+    public TranslationMap(@NotNull String sourceLanguage, String fieldName, List<String> values) {
         this.sourceLanguage = sourceLanguage;
         add(fieldName, values);
     }
@@ -124,7 +124,7 @@ private List<String> getTranslationsToAdd(List<String> translationsForField) {
         return translationsForField;
     }
 
-    @Nonnull
+    @NotNull
     public String getSourceLanguage() {
         return sourceLanguage;
     }

diff --git a/...slation-client/src/main/java/eu/europeana/api/translation/client/service/BaseService.java b/...slation-client/src/main/java/eu/europeana/api/translation/client/service/BaseService.java
@@ -3,7 +3,6 @@
 import eu.europeana.api.commons.error.EuropeanaApiException;
 import eu.europeana.api.translation.client.exception.InvalidParamValueException;
 import eu.europeana.api.translation.client.web.TranslationApiClient;
-import eu.europeana.api.translation.service.exception.TranslationException;
 import eu.europeana.corelib.definitions.edm.beans.FullBean;
 import eu.europeana.corelib.definitions.edm.entity.ContextualClass;
 import eu.europeana.corelib.definitions.edm.entity.Proxy;

diff --git a/...c/main/java/eu/europeana/api/translation/client/service/MetadataLangDetectionService.java b/...c/main/java/eu/europeana/api/translation/client/service/MetadataLangDetectionService.java
@@ -5,8 +5,7 @@
 import eu.europeana.api.translation.definitions.language.Language;
 import eu.europeana.api.translation.definitions.language.LanguageValueFieldMap;
 import eu.europeana.api.translation.client.utils.LanguageDetectionUtils;
-import eu.europeana.api.translation.model.LangDetectRequest;
-import eu.europeana.api.translation.service.exception.LanguageDetectionException;
+import eu.europeana.api.translation.definitions.model.LangDetectRequest;
 import eu.europeana.corelib.definitions.edm.beans.FullBean;
 import eu.europeana.corelib.definitions.edm.entity.Proxy;
 import org.apache.commons.lang3.SerializationUtils;
@@ -63,7 +62,6 @@ private String getHintForLanguageDetect(FullBean bean) {
      *
      * @param bean
      * @throws EuropeanaApiException
-     * @throws LanguageDetectionException
      */
     public FullBean detectLanguageForProxy(FullBean bean) throws EuropeanaApiException {
         long start = System.currentTimeMillis();

diff --git a/...t/src/main/java/eu/europeana/api/translation/client/service/TranslationApiRestClient.java b/...t/src/main/java/eu/europeana/api/translation/client/service/TranslationApiRestClient.java
@@ -1,10 +1,10 @@
 package eu.europeana.api.translation.client.service;
 
+import eu.europeana.api.translation.client.exception.InvalidParamValueException;
 import eu.europeana.api.translation.client.exception.TechnicalRuntimeException;
 import eu.europeana.api.translation.client.utils.TranslationClientUtils;
-import eu.europeana.api.translation.model.LangDetectResponse;
-import eu.europeana.api.translation.model.TranslationResponse;
-import eu.europeana.api.translation.web.exception.ParamValidationException;
+import eu.europeana.api.translation.definitions.model.LangDetectResponse;
+import eu.europeana.api.translation.definitions.model.TranslationResponse;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.http.HttpStatus;
@@ -77,7 +77,7 @@ public <T> T getTranslationApiResponse(WebClient webClient, Function<UriBuilder,
             if (t instanceof TechnicalRuntimeException) {
                 throw new TechnicalRuntimeException("User is not authorised to perform this action");
             }
-            if (t instanceof ParamValidationException) {
+            if (t instanceof InvalidParamValueException) {
                 LOGGER.debug("Invalid request body - {} ", e.getMessage());
                 return null ;
             }
@@ -94,12 +94,14 @@ private WebClient.ResponseSpec executePost(WebClient webClient, Function<UriBuil
                 .uri(uriBuilderURIFunction)
                 .contentType(MediaType.APPLICATION_JSON)
                 // TODO need to figure out how we will pass token across API's
-                .header("Authorization", " ")
+                .header("Authorization", "Bearer eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICI1SW55MldXRkhZQ1YxcFNNc0NKXzl2LVhaUUgwUk84c05KNUxLd2JHcmk0In0.eyJleHAiOjE3MDE0NDU3NTgsImlhdCI6MTcwMTQ0MjE1OCwianRpIjoiYjA4MDA2ZTUtNGFmNy00ZmI3LTg2NTYtZWU5YzY3NThjMWQzIiwiaXNzIjoiaHR0cHM6Ly9hdXRoLmV1cm9wZWFuYS5ldS9hdXRoL3JlYWxtcy9ldXJvcGVhbmEiLCJhdWQiOlsiZW50aXRpZXMiLCJ1c2Vyc2V0cyIsImFjY291bnQiXSwic3ViIjoiMThjNTY1ZDMtNmYzZS00NmViLTlkMmYtOTU0ODI5ZGVlYjkyIiwidHlwIjoiQmVhcmVyIiwiYXpwIjoidGVzdF9jbGllbnRfdHJhbnNsYXRpb25zIiwic2Vzc2lvbl9zdGF0ZSI6IjFlMmVlZGMxLTVlZTMtNDRhYi04MjYzLTgwODJiYjI1MDc0MyIsImFjciI6IjEiLCJyZWFsbV9hY2Nlc3MiOnsicm9sZXMiOlsib2ZmbGluZV9hY2Nlc3MiLCJ1bWFfYXV0aG9yaXphdGlvbiJdfSwicmVzb3VyY2VfYWNjZXNzIjp7ImVudGl0aWVzIjp7InJvbGVzIjpbImVkaXRvciJdfSwidXNlcnNldHMiOnsicm9sZXMiOlsidXNlciJdfSwiYWNjb3VudCI6eyJyb2xlcyI6WyJtYW5hZ2UtYWNjb3VudCIsIm1hbmFnZS1hY2NvdW50LWxpbmtzIiwiZGVsZXRlLWFjY291bnQiLCJ2aWV3LXByb2ZpbGUiXX19LCJzY29wZSI6ImNsaWVudF9pbmZvIHByb2ZpbGUgdHJhbnNsYXRpb25zIGVtYWlsIiwic2lkIjoiMWUyZWVkYzEtNWVlMy00NGFiLTgyNjMtODA4MmJiMjUwNzQzIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsIm5hbWUiOiJFbnRpdHkgRWRpdG9yIFJ1bnNjb3BlIFRlc3QiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJ0ZXN0X2VudGl0eV9lZGl0b3IiLCJnaXZlbl9uYW1lIjoiRW50aXR5IEVkaXRvciIsImZhbWlseV9uYW1lIjoiUnVuc2NvcGUgVGVzdCIsImVtYWlsIjoidGVzdF9lbnRpdHlfZWRpdG9yQGV1cm9wZWFuYS5ldSJ9.Wk60gb_4rl7fiHhgRBIKxrvMZpvbC0H9g_Iq6w6sHXudl8I_rsLhQMRkfvTpXxubkJcTt6rFVQAOtfpnVc_4LhVIuCD7KwkihTSvhzbdvP29K7jH3-VoG63wZPnk666OsHd4h98P7UlIetBKixVHb13CuctIVZ5LdjPuNfe4eFWO491GjiE58cLh8JNe7Z2AdR2NWDWLugIU5yrvMkwl-Ono4PjnWycX8r7SfB7XaXbnvjTBtn8SiiM5EUi9MWxrkyynCFvlXsikKypsQgNVYNgITTGPvRQrdOY6ls6mBAajpjWSd0nq2XOYX19SXIM2zJ5va58OIWAI4K9XaFS8tw")
                 .body(BodyInserters.fromValue(jsonBody))
                 .retrieve()
                 .onStatus(
                         HttpStatus.UNAUTHORIZED::equals,
-                        response -> response.bodyToMono(String.class).map(TechnicalRuntimeException::new));
+                        response -> response.bodyToMono(String.class).map(TechnicalRuntimeException::new))
+                .onStatus(HttpStatus.BAD_REQUEST:: equals,
+                        response -> response.bodyToMono(String.class).map(InvalidParamValueException::new));
 
     }
 }
diff --git a/...on-client/src/main/java/eu/europeana/api/translation/client/web/TranslationApiClient.java b/...on-client/src/main/java/eu/europeana/api/translation/client/web/TranslationApiClient.java
@@ -4,10 +4,10 @@
 import eu.europeana.api.commons.error.EuropeanaApiException;
 import eu.europeana.api.translation.client.BaseTranslationApiClient;
 import eu.europeana.api.translation.client.config.TranslationClientConfiguration;
-import eu.europeana.api.translation.model.LangDetectRequest;
-import eu.europeana.api.translation.model.LangDetectResponse;
-import eu.europeana.api.translation.model.TranslationRequest;
-import eu.europeana.api.translation.model.TranslationResponse;
+import eu.europeana.api.translation.definitions.model.LangDetectRequest;
+import eu.europeana.api.translation.definitions.model.LangDetectResponse;
+import eu.europeana.api.translation.definitions.model.TranslationRequest;
+import eu.europeana.api.translation.definitions.model.TranslationResponse;
 
 public class TranslationApiClient extends BaseTranslationApiClient {
 

diff --git a/.../translation/model/CachedTranslation.java → .../definitions/model/CachedTranslation.java b/.../translation/model/CachedTranslation.java → .../definitions/model/CachedTranslation.java
@@ -1,4 +1,4 @@
-package eu.europeana.api.translation.model;
+package eu.europeana.api.translation.definitions.model;
 
 /**
  * object model for the cached translations 

diff --git a/.../translation/model/LangDetectRequest.java → .../definitions/model/LangDetectRequest.java b/.../translation/model/LangDetectRequest.java → .../definitions/model/LangDetectRequest.java
@@ -1,4 +1,4 @@
-package eu.europeana.api.translation.model;
+package eu.europeana.api.translation.definitions.model;
 
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

diff --git a/...translation/model/LangDetectResponse.java → ...definitions/model/LangDetectResponse.java b/...translation/model/LangDetectResponse.java → ...definitions/model/LangDetectResponse.java
@@ -1,4 +1,4 @@
-package eu.europeana.api.translation.model;
+package eu.europeana.api.translation.definitions.model;
 
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonGetter;

diff --git a/...translation/model/TranslationRequest.java → ...definitions/model/TranslationRequest.java b/...translation/model/TranslationRequest.java → ...definitions/model/TranslationRequest.java
@@ -1,4 +1,4 @@
-package eu.europeana.api.translation.model;
+package eu.europeana.api.translation.definitions.model;
 
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

diff --git a/...ranslation/model/TranslationResponse.java → ...efinitions/model/TranslationResponse.java b/...ranslation/model/TranslationResponse.java → ...efinitions/model/TranslationResponse.java
@@ -1,4 +1,4 @@
-package eu.europeana.api.translation.model;
+package eu.europeana.api.translation.definitions.model;
 
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonGetter;

diff --git a/...ation-web/src/main/java/eu/europeana/api/translation/config/TranslationApiAutoconfig.java b/...ation-web/src/main/java/eu/europeana/api/translation/config/TranslationApiAutoconfig.java
@@ -31,7 +31,7 @@
 import eu.europeana.api.commons.config.i18n.I18nService;
 import eu.europeana.api.commons.config.i18n.I18nServiceImpl;
 import eu.europeana.api.commons.oauth2.service.impl.EuropeanaClientDetailsService;
-import eu.europeana.api.translation.model.CachedTranslation;
+import eu.europeana.api.translation.definitions.model.CachedTranslation;
 import eu.europeana.api.translation.serialization.JsonRedisSerializer;
 import eu.europeana.api.translation.service.exception.LangDetectionServiceConfigurationException;
 import eu.europeana.api.translation.service.exception.TranslationServiceConfigurationException;

diff --git a/...ion-web/src/main/java/eu/europeana/api/translation/serialization/JsonRedisSerializer.java b/...ion-web/src/main/java/eu/europeana/api/translation/serialization/JsonRedisSerializer.java
@@ -5,7 +5,7 @@
 import org.springframework.data.redis.serializer.SerializationException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import eu.europeana.api.translation.model.CachedTranslation;
+import eu.europeana.api.translation.definitions.model.CachedTranslation;
 
 /**
  * Json Serializer for objects managed with redis cache  

diff --git a/translation-web/src/main/java/eu/europeana/api/translation/web/LangDetectionController.java b/translation-web/src/main/java/eu/europeana/api/translation/web/LangDetectionController.java
@@ -13,8 +13,8 @@
 import org.springframework.web.bind.annotation.RestController;
 import eu.europeana.api.commons.web.http.HttpHeaders;
 import eu.europeana.api.commons.web.model.vocabulary.Operations;
-import eu.europeana.api.translation.model.LangDetectRequest;
-import eu.europeana.api.translation.model.LangDetectResponse;
+import eu.europeana.api.translation.definitions.model.LangDetectRequest;
+import eu.europeana.api.translation.definitions.model.LangDetectResponse;
 import eu.europeana.api.translation.web.exception.ParamValidationException;
 import eu.europeana.api.translation.web.service.LangDetectionWebService;
 import io.swagger.v3.oas.annotations.tags.Tag;

diff --git a/translation-web/src/main/java/eu/europeana/api/translation/web/TranslationController.java b/translation-web/src/main/java/eu/europeana/api/translation/web/TranslationController.java
@@ -14,8 +14,8 @@
 import eu.europeana.api.commons.web.model.vocabulary.Operations;
 import eu.europeana.api.translation.definitions.language.LanguagePair;
 import eu.europeana.api.translation.definitions.vocabulary.TranslationAppConstants;
-import eu.europeana.api.translation.model.TranslationRequest;
-import eu.europeana.api.translation.model.TranslationResponse;
+import eu.europeana.api.translation.definitions.model.TranslationRequest;
+import eu.europeana.api.translation.definitions.model.TranslationResponse;
 import eu.europeana.api.translation.web.exception.ParamValidationException;
 import eu.europeana.api.translation.web.service.TranslationWebService;
 import io.swagger.v3.oas.annotations.tags.Tag;

diff --git a/...n-web/src/main/java/eu/europeana/api/translation/web/service/LangDetectionWebService.java b/...n-web/src/main/java/eu/europeana/api/translation/web/service/LangDetectionWebService.java
@@ -13,8 +13,8 @@
 import eu.europeana.api.commons.error.EuropeanaI18nApiException;
 import eu.europeana.api.translation.config.TranslationServiceProvider;
 import eu.europeana.api.translation.definitions.vocabulary.TranslationAppConstants;
-import eu.europeana.api.translation.model.LangDetectRequest;
-import eu.europeana.api.translation.model.LangDetectResponse;
+import eu.europeana.api.translation.definitions.model.LangDetectRequest;
+import eu.europeana.api.translation.definitions.model.LangDetectResponse;
 import eu.europeana.api.translation.service.LanguageDetectionService;
 import eu.europeana.api.translation.service.exception.LanguageDetectionException;
 import eu.europeana.api.translation.web.exception.ParamValidationException;

diff --git a/...slation-web/src/main/java/eu/europeana/api/translation/web/service/RedisCacheService.java b/...slation-web/src/main/java/eu/europeana/api/translation/web/service/RedisCacheService.java
@@ -9,7 +9,7 @@
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import eu.europeana.api.translation.definitions.model.TranslationObj;
-import eu.europeana.api.translation.model.CachedTranslation;
+import eu.europeana.api.translation.definitions.model.CachedTranslation;
 import io.micrometer.core.instrument.util.StringUtils;
 
 public class RedisCacheService {

diff --git a/...ion-web/src/main/java/eu/europeana/api/translation/web/service/TranslationWebService.java b/...ion-web/src/main/java/eu/europeana/api/translation/web/service/TranslationWebService.java
@@ -15,8 +15,8 @@
 import eu.europeana.api.translation.definitions.language.LanguagePair;
 import eu.europeana.api.translation.definitions.model.TranslationObj;
 import eu.europeana.api.translation.definitions.vocabulary.TranslationAppConstants;
-import eu.europeana.api.translation.model.TranslationRequest;
-import eu.europeana.api.translation.model.TranslationResponse;
+import eu.europeana.api.translation.definitions.model.TranslationRequest;
+import eu.europeana.api.translation.definitions.model.TranslationResponse;
 import eu.europeana.api.translation.service.TranslationService;
 import eu.europeana.api.translation.service.exception.TranslationException;
 import eu.europeana.api.translation.web.exception.ParamValidationException;