fix batch 3

eclipse-vertx · Aug 8, 2024 · 14f25f5 · 14f25f5
1 parent 1d8e3c9
commit 14f25f5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/src/main/java/io/vertx/httpproxy/impl/CacheImpl.java b/src/main/java/io/vertx/httpproxy/impl/CacheImpl.java
@@ -6,27 +6,24 @@
 import io.vertx.httpproxy.spi.cache.Cache;
 import io.vertx.httpproxy.spi.cache.Resource;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Simplistic implementation.
  */
 public class CacheImpl implements Cache {
 
   private final int maxSize;
-  private final LinkedHashMap<String, Resource> data;
+  private final Map<String, Resource> data;
 
   public CacheImpl(CacheOptions options) {
     this.maxSize = options.getMaxSize();
-    this.data = new LinkedHashMap<>() {
+    this.data = Collections.synchronizedMap(new LinkedHashMap<>() {
       @Override
       protected boolean removeEldestEntry(Map.Entry<String, Resource> eldest) {
         return size() > maxSize;
       }
-    };
+    });
   }
 
 

diff --git a/src/main/java/io/vertx/httpproxy/impl/CachingFilter.java b/src/main/java/io/vertx/httpproxy/impl/CachingFilter.java
@@ -122,10 +122,8 @@ private Future<ProxyResponse> tryHandleProxyRequestFromCache(ProxyContext contex
             if (etag != null) {
               proxyRequest.headers().set(HttpHeaders.IF_NONE_MATCH, resource.getEtag());
               context.set("cached_resource", resource);
-              return context.sendRequest();
-            } else {
-              return context.sendRequest();
             }
+            return context.sendRequest();
           }
         }
       }

diff --git a/...o/vertx/tests/cache/spi/CacheSpiBase.java → ...rtx/tests/cache/spi/CacheSpiTestBase.java b/...o/vertx/tests/cache/spi/CacheSpiBase.java → ...rtx/tests/cache/spi/CacheSpiTestBase.java
@@ -16,7 +16,7 @@
 import java.time.Instant;
 
 @RunWith(VertxUnitRunner.class)
-public abstract class CacheSpiBase {
+public abstract class CacheSpiTestBase {
 
   protected Cache cache;
   protected CacheOptions cacheOptions;

diff --git a/src/test/java/io/vertx/tests/cache/spi/LocalCacheTest.java b/src/test/java/io/vertx/tests/cache/spi/LocalCacheTest.java
@@ -1,11 +1,8 @@
 package io.vertx.tests.cache.spi;
 
-import io.vertx.core.http.HttpClientOptions;
-import io.vertx.ext.unit.TestContext;
-import io.vertx.httpproxy.cache.CacheOptions;
 import io.vertx.httpproxy.impl.CacheImpl;
 
-public class LocalCacheTest extends CacheSpiBase {
+public class LocalCacheTest extends CacheSpiTestBase {
 
   @Override
   public void setUp() {