enable mandatory fields

europeana · May 28, 2024 · 102c120 · 102c120
1 parent 5aafd81
commit 102c120
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/...ava/eu/europeana/api/translation/service/etranslation/ETranslationTranslationService.java b/...ava/eu/europeana/api/translation/service/etranslation/ETranslationTranslationService.java
@@ -34,7 +34,13 @@
 public class ETranslationTranslationService extends AbstractTranslationService {
 
   private static final Logger LOGGER = LogManager.getLogger(ETranslationTranslationService.class);
-
+  public static final String baseUrlTests="base-url-for-testing";
+  public static final String markupDelimiter="\ndeenPVsaOg\n";//base64 encoded string (as in generateRedisKey()) with new lines
+  public static final String markupDelimiterWithoutNewline="deenPVsaOg";
+  public static final String eTranslationErrorCallbackIndicator="eTranslationErrorCallback";
+  public static final String eTranslationCallbackRelativeUrl="/etranslation/callback";
+  public static final String eTranslationErrorCallbackRelativeUrl="/etranslation/error-callback";
+
   private String serviceId;
   private final String baseUrl;
   private final String domain;
@@ -43,12 +49,6 @@ public class ETranslationTranslationService extends AbstractTranslationService {
   private final String credentialPwd;
   private final int maxWaitMillisec;
   private final RedisMessageListenerContainer redisMessageListenerContainer;
-  public static final String baseUrlTests="base-url-for-testing";
-  public static final String markupDelimiter="\ndeenPVsaOg\n";//base64 encoded string (as in generateRedisKey()) with new lines
-  public static final String markupDelimiterWithoutNewline="deenPVsaOg";
-  public static final String eTranslationErrorCallbackIndicator="eTranslationErrorCallback";
-  public static final String eTranslationCallbackRelativeUrl="/etranslation/callback";
-  public static final String eTranslationErrorCallbackRelativeUrl="/etranslation/error-callback";
 
   public ETranslationTranslationService(String etranslationServiceBaseUrl, String domain, String translationApiBaseUrl, int maxWaitMillisec, 
       String username, String password, RedisMessageListenerContainer redisMessageListenerContainer) throws TranslationException {

diff --git a/...on-web/src/main/java/eu/europeana/api/translation/web/ETranslationCallbackController.java b/...on-web/src/main/java/eu/europeana/api/translation/web/ETranslationCallbackController.java
@@ -30,9 +30,9 @@ public ETranslationCallbackController(RedisTemplate<String, CachedTranslation> r
   @PostMapping(value = ETranslationTranslationService.eTranslationCallbackRelativeUrl)
   public void eTranslationCallbackPost(
       @RequestParam(value = "target-language", required = false) String targetLanguage,
-      @RequestParam(value = "translated-text", required = false) String translatedTextSnippet,
-      @RequestParam(value = "request-id", required = false) String requestId,
-      @RequestParam(value = "external-reference", required = false) String externalReference,
+      @RequestParam(value = "translated-text", required = true) String translatedTextSnippet,
+      @RequestParam(value = "request-id", required = true) String requestId,
+      @RequestParam(value = "external-reference", required = true) String externalReference,
       @RequestBody(required = false) String body) {
     if(LOGGER.isDebugEnabled()) {
       LOGGER.debug("eTranslation callback has been received with the request-id: {}, and the"
@@ -47,9 +47,9 @@ public void eTranslationCallbackPost(
   @GetMapping(value = ETranslationTranslationService.eTranslationCallbackRelativeUrl)
   public void eTranslationCallbackGet(
       @RequestParam(value = "target-language", required = false) String targetLanguage,
-      @RequestParam(value = "translated-text", required = false) String translatedTextSnippet,
-      @RequestParam(value = "request-id", required = false) String requestId,
-      @RequestParam(value = "external-reference", required = false) String externalReference) {
+      @RequestParam(value = "translated-text", required = true) String translatedTextSnippet,
+      @RequestParam(value = "request-id", required = true) String requestId,
+      @RequestParam(value = "external-reference", required = true) String externalReference) {
     if(LOGGER.isDebugEnabled()) {
       LOGGER.debug("eTranslation callback has been received with the request-id: {}, and the"
           + " external-reference: {}", LoggingUtils.sanitizeUserInput(requestId), LoggingUtils.sanitizeUserInput(externalReference));