From f146230605b703e063c78c7a96b72bebc43ffb37 Mon Sep 17 00:00:00 2001
From: SrdjanStevanetic <srdjan.stevanetic@gmail.com>
Date: Tue, 31 Oct 2023 19:03:07 +0100
Subject: [PATCH] redis caching

---
 pom.xml                                       |  1 -
 .../vocabulary/TranslationAppConstants.java   |  1 +
 translation-tests/pom.xml                     |  7 +++
 .../tests/BaseTranslationTest.java            |  5 +-
 .../tests/IntegrationTestUtils.java           |  1 +
 .../tests/web/TranslationRestIT.java          | 54 ++++++++++++++++++
 .../content/translation_bad_request_1.json    |  3 +-
 .../content/translation_bad_request_2.json    |  3 +-
 .../content/translation_request.json          |  3 +-
 .../content/translation_request_2.json        |  3 +-
 .../content/translation_request_caching.json  | 11 ++++
 .../content/translation_with_fallback.json    |  3 +-
 translation-web/pom.xml                       |  5 ++
 .../config/TranslationApiAutoconfig.java      | 14 +++++
 .../translation/model/TranslationRequest.java | 29 ++++++++++
 .../web/TranslationController.java            | 57 ++++++++++++++++++-
 .../web/service/RedisCacheService.java        | 55 ++++++++++++++++++
 .../src/main/resources/application.properties |  2 +-
 .../src/main/resources/translation.properties |  7 ++-
 19 files changed, 252 insertions(+), 12 deletions(-)
 create mode 100644 translation-tests/src/integration-test/resources/content/translation_request_caching.json
 create mode 100644 translation-web/src/main/java/eu/europeana/api/translation/web/service/RedisCacheService.java

diff --git a/pom.xml b/pom.xml
index 4128b8a3..bd8ffdf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,6 @@
 		<sonar.cpd.exclusions>**/model/**/*</sonar.cpd.exclusions>
 		<aggregate.report.xml>translation-tests/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.xml>
 		<sonar.coverage.jacoco.xmlReportPaths>${aggregate.report.xml}</sonar.coverage.jacoco.xmlReportPaths>
-		
 
 	</properties>
 
diff --git a/translation-definitions/src/main/java/eu/europeana/api/translation/definitions/vocabulary/TranslationAppConstants.java b/translation-definitions/src/main/java/eu/europeana/api/translation/definitions/vocabulary/TranslationAppConstants.java
index 0277b970..ec9c6b8c 100644
--- a/translation-definitions/src/main/java/eu/europeana/api/translation/definitions/vocabulary/TranslationAppConstants.java
+++ b/translation-definitions/src/main/java/eu/europeana/api/translation/definitions/vocabulary/TranslationAppConstants.java
@@ -20,6 +20,7 @@ public class TranslationAppConstants {
   public static final String FALLBACK = "fallback";
   public static final String SOURCE_LANG = "source";
   public static final String TARGET_LANG = "target";
+  public static final String CACHING = "caching";
   public static final char LANG_DELIMITER = '-';
   
   //api request/response fields
diff --git a/translation-tests/pom.xml b/translation-tests/pom.xml
index 67fb16bc..8927a9f7 100644
--- a/translation-tests/pom.xml
+++ b/translation-tests/pom.xml
@@ -44,6 +44,13 @@
 			<artifactId>mockwebserver</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>it.ozimov</groupId>
+		  	<artifactId>embedded-redis</artifactId>
+		  	<version>0.7.2</version>
+		  	<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 
diff --git a/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/BaseTranslationTest.java b/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/BaseTranslationTest.java
index b4b84592..10680500 100644
--- a/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/BaseTranslationTest.java
+++ b/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/BaseTranslationTest.java
@@ -38,6 +38,7 @@
 public abstract class BaseTranslationTest extends IntegrationTestUtils {
 
   protected MockMvc mockMvc;
+  protected final static int redisPort=6370;
   protected static final Logger LOG = LogManager.getLogger(BaseTranslationTest.class);
   
   @Autowired
@@ -92,7 +93,7 @@ private void initServices() throws TranslationServiceConfigurationException, Lan
       this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build();
     }
   }
-
+  
   @AfterAll
   private void stopServices() {
     //cannot stop the mock server here as all test classes are run by the same runner and the server is static variable
@@ -125,6 +126,8 @@ static void setProperties(DynamicPropertyRegistry registry) {
 
     registry.add("translation.google.projectId", () -> "project-id-test");
     registry.add("translation.google.usehttpclient", () -> "true");
+    registry.add("spring.redis.host", () -> "localhost");
+    registry.add("spring.redis.port", () -> redisPort);
   }
 
   /**
diff --git a/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/IntegrationTestUtils.java b/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/IntegrationTestUtils.java
index 882da6bd..288f6a79 100644
--- a/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/IntegrationTestUtils.java
+++ b/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/IntegrationTestUtils.java
@@ -33,6 +33,7 @@ public abstract class IntegrationTestUtils {
   public static final String TRANSLATION_PANGEANIC_REQUEST_2 = "/content/pangeanic/translate/translate_pangeanic_request_2.json";
   public static final String TRANSLATION_PANGEANIC_RESPONSE_2 = "/content/pangeanic/translate/translate_pangeanic_response_2.json";
   
+  public static final String TRANSLATION_REQUEST_CACHING = "/content/translation_request_caching.json";
   
   public static final String TRANSLATION_WITH_FALLBACK = "/content/translation_with_fallback.json";
   public static final String TRANSLATION_BAD_REQUEST_1 = "/content/translation_bad_request_1.json";
diff --git a/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/web/TranslationRestIT.java b/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/web/TranslationRestIT.java
index be402082..549d89ce 100644
--- a/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/web/TranslationRestIT.java
+++ b/translation-tests/src/integration-test/java/eu/europeana/api/translation/tests/web/TranslationRestIT.java
@@ -5,8 +5,10 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -28,6 +30,8 @@
 import eu.europeana.api.translation.tests.BaseTranslationTest;
 import eu.europeana.api.translation.tests.web.mock.MockGClient;
 import eu.europeana.api.translation.tests.web.mock.MockGServiceStub;
+import eu.europeana.api.translation.web.service.RedisCacheService;
+import redis.embedded.RedisServer;
 
 @SpringBootTest
 @AutoConfigureMockMvc
@@ -37,6 +41,9 @@ public class TranslationRestIT extends BaseTranslationTest {
   
   @Autowired GoogleTranslationService googleTranslationService;  
   
+  @Autowired
+  RedisCacheService redisCacheService;
+  
   @Autowired 
   @Qualifier(BeanNames.BEAN_GOOGLE_TRANSLATION_CLIENT_WRAPPER)
   GoogleTranslationServiceClientWrapper clientWrapper;
@@ -92,6 +99,53 @@ void translationPangeanic() throws Exception {
     assertNotNull(serviceFieldValue);
   }
   
+  @Test
+  void translationWithCaching() throws Exception {
+    RedisServer redisServer = new RedisServer(redisPort);
+    redisServer.start();
+
+    String requestJson = getJsonStringInput(TRANSLATION_REQUEST_CACHING);
+    JSONObject reqJsonObj = new JSONObject(requestJson);
+    JSONArray inputTexts = (JSONArray) reqJsonObj.get(TranslationAppConstants.TEXT);
+    List<String> inputTextsList = new ArrayList<String>();
+    for(int i=0;i<inputTexts.length();i++) {
+      inputTextsList.add((String) inputTexts.get(i));
+    }    
+    String sourceLang=reqJsonObj.getString(TranslationAppConstants.SOURCE_LANG);
+    String targetLang=reqJsonObj.getString(TranslationAppConstants.TARGET_LANG);
+    
+    mockMvc
+        .perform(
+            post(BASE_URL_TRANSLATE)
+              .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
+              .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+              .content(requestJson))
+        .andExpect(status().isOk());
+    
+    //check that there are data in the cache
+    List<String> redisContent = redisCacheService.getRedisCache(sourceLang, targetLang, inputTextsList);
+    assertTrue(redisContent.size()==2 && Collections.frequency(redisContent, null)==0);
+    
+    String cachedResult = mockMvc
+        .perform(
+            post(BASE_URL_TRANSLATE)
+              .header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE)
+              .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+              .content(requestJson))
+        .andExpect(status().isOk())
+        .andReturn().getResponse().getContentAsString();
+    
+    assertNotNull(cachedResult);
+    JSONObject json = new JSONObject(cachedResult);
+    String langFieldValue = json.getString(TranslationAppConstants.LANG);
+    assertNotNull(langFieldValue);    
+    JSONArray translations = json.getJSONArray(TranslationAppConstants.TRANSLATIONS);
+    assertTrue(translations.length()>0);
+    
+    redisCacheService.deleteAll();
+    redisServer.stop();
+  }
+
   @Test
   void translationWithServiceParam() throws Exception {
     String requestJson = getJsonStringInput(TRANSLATION_REQUEST_2);
diff --git a/translation-tests/src/integration-test/resources/content/translation_bad_request_1.json b/translation-tests/src/integration-test/resources/content/translation_bad_request_1.json
index 50e1e584..4c672ece 100644
--- a/translation-tests/src/integration-test/resources/content/translation_bad_request_1.json
+++ b/translation-tests/src/integration-test/resources/content/translation_bad_request_1.json
@@ -5,5 +5,6 @@
   "text": [
     "eine Textzeile auf Deutsch",
     "eine zweite Textzeile auf Deutsch"
-  ]
+  ],
+  "caching": false
 }
\ No newline at end of file
diff --git a/translation-tests/src/integration-test/resources/content/translation_bad_request_2.json b/translation-tests/src/integration-test/resources/content/translation_bad_request_2.json
index 315c3a23..5df90b1e 100644
--- a/translation-tests/src/integration-test/resources/content/translation_bad_request_2.json
+++ b/translation-tests/src/integration-test/resources/content/translation_bad_request_2.json
@@ -6,5 +6,6 @@
     "eine Textzeile auf Deutsch",
     "eine zweite Textzeile auf Deutsch"
   ],
-  "service": "wrong-param"
+  "service": "wrong-param",
+  "caching": false
 }
\ No newline at end of file
diff --git a/translation-tests/src/integration-test/resources/content/translation_request.json b/translation-tests/src/integration-test/resources/content/translation_request.json
index 4f909d80..9a8e5032 100644
--- a/translation-tests/src/integration-test/resources/content/translation_request.json
+++ b/translation-tests/src/integration-test/resources/content/translation_request.json
@@ -6,5 +6,6 @@
     "eine Textzeile auf Deutsch",
     "eine zweite Textzeile auf Deutsch"
   ],
-  "service": "GOOGLE"
+  "service": "GOOGLE",
+  "caching": false
 }
\ No newline at end of file
diff --git a/translation-tests/src/integration-test/resources/content/translation_request_2.json b/translation-tests/src/integration-test/resources/content/translation_request_2.json
index 603c03c5..3c51a9e8 100644
--- a/translation-tests/src/integration-test/resources/content/translation_request_2.json
+++ b/translation-tests/src/integration-test/resources/content/translation_request_2.json
@@ -6,5 +6,6 @@
     "eine Textzeile auf Deutsch",
     "eine zweite Textzeile auf Deutsch"
   ],
-  "service": "PANGEANIC"
+  "service": "PANGEANIC",
+  "caching": false
 }
\ No newline at end of file
diff --git a/translation-tests/src/integration-test/resources/content/translation_request_caching.json b/translation-tests/src/integration-test/resources/content/translation_request_caching.json
new file mode 100644
index 00000000..cdb5b2e9
--- /dev/null
+++ b/translation-tests/src/integration-test/resources/content/translation_request_caching.json
@@ -0,0 +1,11 @@
+{
+  "source": "de",
+  "target": "en",
+  "detect": false,
+  "text": [
+    "eine Textzeile auf Deutsch",
+    "eine zweite Textzeile auf Deutsch"
+  ],
+  "service": "PANGEANIC",
+  "caching": true
+}
\ No newline at end of file
diff --git a/translation-tests/src/integration-test/resources/content/translation_with_fallback.json b/translation-tests/src/integration-test/resources/content/translation_with_fallback.json
index 8e9b267a..d43fde79 100644
--- a/translation-tests/src/integration-test/resources/content/translation_with_fallback.json
+++ b/translation-tests/src/integration-test/resources/content/translation_with_fallback.json
@@ -7,5 +7,6 @@
     "eine zweite Textzeile auf Deutsch"
   ],
   "service":"GOOGLE",
-  "fallback":"PANGEANIC"
+  "fallback":"PANGEANIC",
+  "caching": false
 }
\ No newline at end of file
diff --git a/translation-web/pom.xml b/translation-web/pom.xml
index 5b2ada37..3c3541d6 100644
--- a/translation-web/pom.xml
+++ b/translation-web/pom.xml
@@ -90,6 +90,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		
+		<dependency>
+		    <groupId>org.springframework.boot</groupId>
+		    <artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>		
 
 <!--
 		<dependency>
diff --git a/translation-web/src/main/java/eu/europeana/api/translation/config/TranslationApiAutoconfig.java b/translation-web/src/main/java/eu/europeana/api/translation/config/TranslationApiAutoconfig.java
index f29e396a..3cf8cf39 100644
--- a/translation-web/src/main/java/eu/europeana/api/translation/config/TranslationApiAutoconfig.java
+++ b/translation-web/src/main/java/eu/europeana/api/translation/config/TranslationApiAutoconfig.java
@@ -19,6 +19,8 @@
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
 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;
@@ -135,6 +137,18 @@ public TranslationServiceProvider getTranslationServiceProvider() {
     this.translationServiceConfigProvider = new TranslationServiceProvider();
     return this.translationServiceConfigProvider;
   }
+  
+  /*
+   * For windows use this link for help: https://www.baeldung.com/spring-data-redis-properties
+   * I.e. install the docker image for Redis (it can be without the password), and put the properties (e.g. spring.redis.host) 
+   * in the translation.(user.)properties file
+   */
+  @Bean
+  public RedisTemplate<?, ?> redisTemplate(RedisConnectionFactory connectionFactory) {
+    RedisTemplate<?, ?> template = new RedisTemplate<>();
+    template.setConnectionFactory(connectionFactory);
+    return template;
+  }
 
   @Override
   public void onApplicationEvent(ApplicationStartedEvent event) {
diff --git a/translation-web/src/main/java/eu/europeana/api/translation/model/TranslationRequest.java b/translation-web/src/main/java/eu/europeana/api/translation/model/TranslationRequest.java
index bac5f398..b60eaa2a 100644
--- a/translation-web/src/main/java/eu/europeana/api/translation/model/TranslationRequest.java
+++ b/translation-web/src/main/java/eu/europeana/api/translation/model/TranslationRequest.java
@@ -1,5 +1,6 @@
 package eu.europeana.api.translation.model;
 
+import java.util.ArrayList;
 import java.util.List;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -15,11 +16,21 @@ public class TranslationRequest {
   private String service;
   private String fallback;
   private List<String> text;
+  private Boolean caching;
 
   public TranslationRequest() {
     super();
   }
 
+  public TranslationRequest(TranslationRequest copy) {
+    this.source=copy.getSource();
+    this.target=copy.getTarget();
+    this.service=copy.getService();
+    this.fallback=copy.getFallback();
+    this.caching=copy.getCaching();
+    this.text=new ArrayList<String>(copy.getText());
+  }
+
   public String getSource() {
     return source;
   }
@@ -65,4 +76,22 @@ public void setText(List<String> text) {
     this.text = text;
   }
 
+  public boolean isCaching() {
+    if(caching==null || caching.booleanValue()) {
+      return true;
+    }
+    else {
+      return false;
+    }
+  }
+  
+  public Boolean getCaching() {
+    return caching;
+  }
+
+  @JsonSetter(TranslationAppConstants.CACHING)
+  public void setCaching(boolean caching) {
+    this.caching = caching;
+  }
+
 }
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
index f8b0db00..9c3de081 100644
--- 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
@@ -2,6 +2,9 @@
 
 import static eu.europeana.api.translation.web.I18nErrorMessageKeys.ERROR_INVALID_PARAM_VALUE;
 import static eu.europeana.api.translation.web.I18nErrorMessageKeys.ERROR_MANDATORY_PARAM_EMPTY;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +13,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
+import eu.europeana.api.commons.error.EuropeanaI18nApiException;
 import eu.europeana.api.commons.web.http.HttpHeaders;
 import eu.europeana.api.commons.web.model.vocabulary.Operations;
 import eu.europeana.api.translation.definitions.language.LanguagePair;
@@ -17,6 +21,7 @@
 import eu.europeana.api.translation.model.TranslationRequest;
 import eu.europeana.api.translation.model.TranslationResponse;
 import eu.europeana.api.translation.web.exception.ParamValidationException;
+import eu.europeana.api.translation.web.service.RedisCacheService;
 import eu.europeana.api.translation.web.service.TranslationWebService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 @RestController
@@ -24,10 +29,12 @@
 public class TranslationController extends BaseRest {
 
   private final TranslationWebService translationService;
+  private final RedisCacheService redisCacheService;
 
   @Autowired
-  public TranslationController(TranslationWebService translationService) {
+  public TranslationController(TranslationWebService translationService, RedisCacheService redisCacheService) {
     this.translationService = translationService;
+    this.redisCacheService = redisCacheService;
   }
 
   @Tag(description = "Translation", name = "translate")
@@ -39,8 +46,14 @@ public ResponseEntity<String> translate(@RequestBody TranslationRequest translRe
     verifyWriteAccess(Operations.CREATE, request);
 
     validateRequest(translRequest);
-
-    TranslationResponse result = translationService.translate(translRequest);
+    
+    TranslationResponse result = null;
+    if(translRequest.isCaching()) {
+      result = getCombinedCachedAndTranslatedResults(translRequest);
+    }
+    else {
+      result = translationService.translate(translRequest);
+    }
 
     String resultJson = serialize(result);
 
@@ -63,5 +76,43 @@ private void validateRequest(TranslationRequest translationRequest) throws Param
       throw new ParamValidationException(null, null, ERROR_INVALID_PARAM_VALUE, new String[] {LanguagePair.generateKey(TranslationAppConstants.SOURCE_LANG, TranslationAppConstants.TARGET_LANG) , languagePair.toString()});
     }
   }
+  
+  private TranslationResponse getCombinedCachedAndTranslatedResults(TranslationRequest translRequest) throws EuropeanaI18nApiException {
+    TranslationResponse result=null;
+    List<String> redisResp = redisCacheService.getRedisCache(translRequest.getSource(), translRequest.getTarget(), translRequest.getText());
+    if(Collections.frequency(redisResp, null)>0) {
+      TranslationRequest newTranslReq = new TranslationRequest(translRequest);
+      List<String> newText = new ArrayList<String>();
+      for(int i=0;i<redisResp.size();i++) {
+        if(redisResp.get(i)==null) {
+          newText.add(translRequest.getText().get(i));
+        }
+      }
+      newTranslReq.setText(newText);
+      result = translationService.translate(newTranslReq);
+      
+      //save the translations to the cache
+      redisCacheService.saveRedisCache(newTranslReq.getSource(), newTranslReq.getTarget(), newTranslReq.getText(), result.getTranslations());
+      
+      //aggregate the redis and translation responses
+      List<String> finalText=new ArrayList<String>(redisResp);
+      int counterTranslated = 0;
+      for(int i=0;i<finalText.size();i++) {
+        if(finalText.get(i)==null) {
+          finalText.set(i, result.getTranslations().get(counterTranslated));
+          counterTranslated++;
+        }
+      }
+      result.setService(null);
+      result.setTranslations(finalText);       
+    }
+    else {
+      result=new TranslationResponse();
+      result.setLang(translRequest.getTarget());
+      result.setTranslations(redisResp);
+    }
 
+    return result;
+  }
+  
 }
diff --git a/translation-web/src/main/java/eu/europeana/api/translation/web/service/RedisCacheService.java b/translation-web/src/main/java/eu/europeana/api/translation/web/service/RedisCacheService.java
new file mode 100644
index 00000000..f53f8b30
--- /dev/null
+++ b/translation-web/src/main/java/eu/europeana/api/translation/web/service/RedisCacheService.java
@@ -0,0 +1,55 @@
+package eu.europeana.api.translation.web.service;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RedisCacheService {
+
+  private RedisTemplate<Integer, String> redisTemplate;
+
+  @Autowired
+  public RedisCacheService(RedisTemplate<Integer, String> redisTemplate) {
+    this.redisTemplate = redisTemplate;
+  }
+
+  /**
+   * Returns a list of Objects (strings) that exist in the cache. If no cache is found for the given key,
+   * the corresponding element in the return list will be null.
+   * @param sourceLang
+   * @param targetLang
+   * @param texts
+   * @return
+   */
+  public List<String> getRedisCache(String sourceLang, String targetLang, List<String> texts) {
+    Collection<Integer> keys = new ArrayList<>();
+    texts.stream().forEach(text -> {
+      String key = text + sourceLang + targetLang;
+      keys.add(key.hashCode());
+    });
+            
+    List<String> redisResp = redisTemplate.opsForValue().multiGet(keys);
+    return redisResp;
+  }
+  
+  public void saveRedisCache(String sourceLang, String targetLang, List<String> inputText, List<String> translations) {
+    Map<Integer, String> valueMap = new HashMap<>();
+    for(int i=0;i<inputText.size();i++) {
+      String key = inputText.get(i) + sourceLang + targetLang;
+      valueMap.put(key.hashCode(), translations.get(i));
+    }
+   
+    redisTemplate.opsForValue().multiSet(valueMap);
+  }
+  
+  public void deleteAll() {
+    redisTemplate.getConnectionFactory().getConnection().flushAll();
+  }
+
+}
diff --git a/translation-web/src/main/resources/application.properties b/translation-web/src/main/resources/application.properties
index 9f1bea90..558acdce 100644
--- a/translation-web/src/main/resources/application.properties
+++ b/translation-web/src/main/resources/application.properties
@@ -34,4 +34,4 @@ server.error.see-also=https://pro.europeana.eu/page/apis
 #  compression:
 #    enabled: true
 #    min-response-size: 4096
-#    mime-types: application/json, application/ld+json, application/xml, text/html, text/xml, text/plain
\ No newline at end of file
+#    mime-types: application/json, application/ld+json, application/xml, text/html, text/xml, text/plain
diff --git a/translation-web/src/main/resources/translation.properties b/translation-web/src/main/resources/translation.properties
index df759cd4..181a0b5a 100644
--- a/translation-web/src/main/resources/translation.properties
+++ b/translation-web/src/main/resources/translation.properties
@@ -16,4 +16,9 @@ auth.write.enabled=true
 translation.google.usehttpclient=false
 
 # For using dummy services
-#use.dummy.services=true
\ No newline at end of file
+#use.dummy.services=true
+
+spring.redis.database=0
+spring.redis.host=localhost
+spring.redis.port=6379
+spring.redis.timeout=60000