Merge pull request #651 from swisspost/feature/issue650_replace_setex

Feature/issue650 replace deprecated redis commands

Author: mcweba

gateleen-cache/src/main/resources/cache_request.lua

@@ -7,7 +7,7 @@ local expireMillis = tonumber(ARGV[4])
 local resourceKey = cachePrefix..resourceName
 
 redis.call('sadd', cachedSet, resourceName)
-redis.call('psetex', resourceKey, expireMillis, resourceValue)
+redis.call('set', resourceKey, resourceValue, 'px', expireMillis)
 
 return "OK"
 

gateleen-delta/src/main/java/org/swisspush/gateleen/delta/DeltaHandler.java

@@ -37,7 +37,7 @@
  */
 public class DeltaHandler implements RuleProvider.RuleChangesObserver {
 
-    private Logger log = LoggerFactory.getLogger(DeltaHandler.class);
+    private final Logger log = LoggerFactory.getLogger(DeltaHandler.class);
 
     private static final String DELTA_PARAM = "delta";
     private static final String LIMIT_PARAM = "limit";
@@ -54,12 +54,12 @@ public class DeltaHandler implements RuleProvider.RuleChangesObserver {
     private static final String RESOURCE_KEY_PREFIX = "delta:resources";
     private static final String ETAG_KEY_PREFIX = "delta:etags";
 
-    private HttpClient httpClient;
-    private RedisProvider redisProvider;
+    private final HttpClient httpClient;
+    private final RedisProvider redisProvider;
 
-    private boolean rejectLimitOffsetRequests;
+    private final boolean rejectLimitOffsetRequests;
 
-    private RuleProvider ruleProvider;
+    private final RuleProvider ruleProvider;
 
     private final Vertx vertx;
     private final LoggingResourceManager loggingResourceManager;
@@ -109,7 +109,7 @@ private boolean isDeltaGETRequest(HttpServerRequest request) {
                 !isBackendDelta(request.uri())) {
             return true;
         }
-        // remove the delta backend header, its only a marker
+        // remove the delta backend header, it's only a marker
         if (request.headers().contains(DELTA_BACKEND_HEADER)) {
             request.headers().remove(DELTA_BACKEND_HEADER);
         }
@@ -156,7 +156,7 @@ private void handleResourcePUT(final HttpServerRequest request, final Router rou
                     // save to storage
                     saveDelta(resourceKey, updateId, expireAfter, event -> {
                         if (event.failed()) {
-                            log.error("setex command for redisKey {} failed with cause: {}", resourceKey, logCause(event));
+                            log.error("set command for redisKey {} failed with cause: {}", resourceKey, logCause(event));
                             handleError(request, "error saving delta information");
                             request.resume();
                         } else {
@@ -225,19 +225,19 @@ private void saveOrUpdateDeltaEtag(final String etagResourceKey, final HttpServe
         Long expireAfter = getExpireAfterValue(request, log);
         saveDelta(etagResourceKey, requestEtag, expireAfter, event -> {
             if (event.failed()) {
-                log.error("setex command for redisKey {} failed with cause: {}", etagResourceKey, logCause(event));
+                log.error("set command for redisKey {} failed with cause: {}", etagResourceKey, logCause(event));
             }
             updateCallback.handle(Boolean.TRUE);
         });
     }
 
     private void saveDelta(String deltaKey, String deltaValue, Long expireAfter, Handler<AsyncResult<Object>> handler) {
         redisProvider.redis().onSuccess(redisAPI -> {
-            if (expireAfter == null) {
-                redisAPI.set(Arrays.asList(deltaKey, deltaValue), (Handler) handler);
-            } else {
-                redisAPI.setex(deltaKey, String.valueOf(expireAfter), deltaValue, (Handler) handler);
+            List<String> options = new ArrayList<>(List.of(deltaKey, deltaValue));
+            if(expireAfter != null) {
+                options.addAll(List.of("EX", expireAfter.toString()));
             }
+            redisAPI.set(options, (Handler) handler);
         }).onFailure(throwable -> handler.handle(new FailedAsyncResult<>(throwable)));
     }
 
@@ -461,7 +461,7 @@ private Long getExpireAfterValue(HttpServerRequest request, Logger log) {
         try {
             long value = Long.parseLong(expireAfterHeaderValue);
 
-            // redis returns an error if setex is called with negativ values
+            // redis returns an error if set is called with negative values
             if (value < 0) {
                 log.warn("Setting NO expiry on delta key because because defined value for header {} is a negative number: {}",
                         EXPIRE_AFTER_HEADER, expireAfterHeaderValue);

gateleen-delta/src/test/java/org/swisspush/gateleen/delta/DeltaHandlerTest.java

@@ -161,7 +161,6 @@ public void testDeltaNoExpiry() {
         deltaHandler.handle(request, router);
 
         verify(redisAPI, times(1)).set(eq(Arrays.asList("delta:resources:a:b:c", "555")), any());
-        verify(redisAPI, never()).setex(any(), any(), any(), any());
     }
 
     @Test
@@ -171,8 +170,7 @@ public void testDeltaWithExpiry() {
         DeltaHandler deltaHandler = new DeltaHandler(vertx, redisProvider, null, ruleProvider, loggingResourceManager, logAppenderRepository);
         deltaHandler.handle(request, router);
 
-        verify(redisAPI, times(1)).setex(eq("delta:resources:a:b:c"), eq("123"), eq("555"), any());
-        verify(redisAPI, never()).set(any(), any());
+        verify(redisAPI, times(1)).set(eq(Arrays.asList("delta:resources:a:b:c", "555", "EX", "123")), any());
     }
 
     @Test