Merge pull request #2 from wego/fix-body

Fix duplicated responseId with different body

Author: tamnguyenit

src/main/java/com/wego/httpcache/services/impl/AsyncHttpCacheServiceImpl.java

@@ -17,9 +17,11 @@
 
 public class AsyncHttpCacheServiceImpl implements AsyncHttpCacheService {
 
-  @Inject private CachedResponseService cachedResponseService;
+  @Inject
+  private CachedResponseService cachedResponseService;
 
-  @Inject private AsyncHttpClient asyncHttpClient;
+  @Inject
+  private AsyncHttpClient asyncHttpClient;
 
   private long ttl;
 
@@ -59,7 +61,7 @@ private String buildResponseId(Request request) {
     String requestStringId =
         StringUtils.join(
             request,
-            request.getBodyEncoding(),
+            request.getStringData(),
             Lists.newArrayList(request.getCookies()).toString());
     return String.valueOf(MurmurHash.hash64A(requestStringId.getBytes(), 0));
   }

src/test/java/com/wego/httpcache/dao/impl/guava/TestGuavaCachedResponseImpl.java

@@ -0,0 +1,16 @@
+package com.wego.httpcache.dao.impl.guava;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestGuavaCachedResponseImpl {
+
+  @Before
+  public void setUp() throws Exception {}
+
+  @Test
+  public void save() throws Exception {}
+
+  @Test
+  public void findById() throws Exception {}
+}

src/test/java/com/wego/httpcache/fixtures/RequestFixture.java

@@ -6,6 +6,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 public class RequestFixture {
+
   public static Request create(String method, String url) {
     return new RequestBuilder().setMethod(method).setUrl(url).build();
   }
@@ -27,6 +28,10 @@ public static Request createWithParams(String method, String url, String key, St
     return new RequestBuilder().setMethod(method).setUrl(url).addParameter(key, value).build();
   }
 
+  public static Request createWithBody(String method, String url, String body) {
+    return new RequestBuilder().setMethod(method).setUrl(url).setBody(body).build();
+  }
+
   public static Request createWithFullParams() {
     return new RequestBuilder()
         .setMethod("GET")
@@ -35,6 +40,7 @@ public static Request createWithFullParams() {
         .addQueryParameter("queryParam", "test")
         .addParameter("param", "test")
         .addCookie(new Cookie("cookie", "test", "", "", "", 1, 2, true, true))
+        .setBody("test")
         .build();
   }
 }

src/test/java/com/wego/httpcache/services/impl/TestAsyncHttpCachedServiceImpl.java renamed to src/test/java/com/wego/httpcache/services/impl/TestAsyncHttpCacheServiceImpl.java

@@ -42,18 +42,23 @@
 import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public class TestAsyncHttpCachedServiceImpl {
+public class TestAsyncHttpCacheServiceImpl {
+
   private static long CACHING_TTL = 60;
-  @Rule public WireMockRule wireMockRule = new WireMockRule(8089);
+  @Rule
+  public WireMockRule wireMockRule = new WireMockRule(8089);
 
-  @Spy private AsyncHttpClient asyncHttpClient = new AsyncHttpClient();
+  @Spy
+  private AsyncHttpClient asyncHttpClient = new AsyncHttpClient();
 
   @InjectMocks
   private AsyncHttpCacheService asyncHttpCacheService =
       new AsyncHttpCacheServiceImpl(asyncHttpClient, CACHING_TTL);
 
-  @Mock private CachedResponseService cachedResponseService;
-  @Mock private Request request;
+  @Mock
+  private CachedResponseService cachedResponseService;
+  @Mock
+  private Request request;
 
   @Test
   public void executeRequest_whenWasCached_getResponseFromCacheAndCallOnComplete()
@@ -155,11 +160,11 @@ public void buildResponseId_returnsDifferentIdsForDifferentRequest() throws Exce
     Request requestWithDifferentUrl =
         RequestFixture.create("GET", "http://localhost:8089/resources/2");
 
-    Request requestWithParams =
+    Request requestWithQueryParams =
         RequestFixture.createWithQueryParam(
             "GET", "http://localhost:8089/resources/2", "queryParam", "test1");
 
-    Request requestWithDifferentParams =
+    Request requestWithDifferentQueryParams =
         RequestFixture.createWithQueryParam(
             "GET", "http://localhost:8089/resources/2", "queryParam", "test2");
 
@@ -182,31 +187,41 @@ public void buildResponseId_returnsDifferentIdsForDifferentRequest() throws Exce
     Request requestWithDifferentMethod =
         RequestFixture.create("POST", "http://localhost:8089/resources/");
 
-    Request requestWithBody =
+    Request requestWithParams =
         RequestFixture.createWithParams(
             "POST", "http://localhost:8089/resources/", "param", "test1");
 
-    Request requestWithDifferentBody =
+    Request requestWithDifferentParams =
         RequestFixture.createWithParams(
             "POST", "http://localhost:8089/resources/", "param", "test2");
 
+    Request requestWithBody =
+        RequestFixture.createWithBody(
+            "POST", "http://localhost:8089/resources/", "test1");
+
+    Request requestWithDifferentBody =
+        RequestFixture.createWithBody(
+            "POST", "http://localhost:8089/resources/", "test2");
+
     Method method =
         AsyncHttpCacheServiceImpl.class.getDeclaredMethod("buildResponseId", Request.class);
     method.setAccessible(true);
 
     final List<String> responseIds =
         Stream.of(
-                request,
-                requestWithDifferentUrl,
-                requestWithDifferentMethod,
-                requestWithBody,
-                requestWithDifferentBody,
-                requestWithCookie,
-                requestWithDifferentCookie,
-                requestWithHeader,
-                requestWithDifferentHeader,
-                requestWithParams,
-                requestWithDifferentParams)
+            request,
+            requestWithDifferentUrl,
+            requestWithDifferentMethod,
+            requestWithParams,
+            requestWithDifferentParams,
+            requestWithCookie,
+            requestWithDifferentCookie,
+            requestWithHeader,
+            requestWithDifferentHeader,
+            requestWithQueryParams,
+            requestWithDifferentQueryParams,
+            requestWithBody,
+            requestWithDifferentBody)
             .map(
                 rq -> {
                   try {
@@ -219,7 +234,7 @@ public void buildResponseId_returnsDifferentIdsForDifferentRequest() throws Exce
             .filter(Objects::nonNull)
             .collect(Collectors.toList());
 
-    assertThat(Sets.newHashSet(responseIds).size()).isEqualTo(11);
+    assertThat(Sets.newHashSet(responseIds).size()).isEqualTo(13);
   }
 
   @Test