use CookieEntity instead of Cookie in CachedResponseEntity

Author: tamnguyenit

src/main/java/com/wego/httpcache/dao/entities/CachedResponseEntity.java

@@ -1,19 +1,18 @@
 package com.wego.httpcache.dao.entities;
 
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
-import com.ning.http.client.cookie.Cookie;
 import java.util.List;
 
 public class CachedResponseEntity {
 
   private String id;
-  private List<Cookie> cookies;
+  private List<CookieEntity> cookies;
   private String responseBody;
   private FluentCaseInsensitiveStringsMap headers;
   private Integer statusCode;
   private String statusText;
 
-  public List<Cookie> getCookies() {
+  public List<CookieEntity> getCookies() {
     return cookies;
   }
 
@@ -40,7 +39,7 @@ public String getId() {
   public static final class Builder {
 
     private String id;
-    private List<Cookie> cookies;
+    private List<CookieEntity> cookies;
     private String responseBody;
     private FluentCaseInsensitiveStringsMap headers;
     private Integer statusCode;
@@ -53,7 +52,7 @@ public Builder setId(String id) {
       return this;
     }
 
-    public Builder setCookies(List<Cookie> cookies) {
+    public Builder setCookies(List<CookieEntity> cookies) {
       this.cookies = cookies;
       return this;
     }

src/main/java/com/wego/httpcache/dao/mappers/CachedResponseEntityToCachedResponse.java

@@ -1,10 +1,16 @@
 package com.wego.httpcache.dao.mappers;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import com.wego.httpcache.dao.entities.CachedResponseEntity;
 import com.wego.httpcache.dao.models.CachedResponse;
 
+@Singleton
 public class CachedResponseEntityToCachedResponse {
 
+  @Inject
+  private CookieEntityToCookie cookieEntityToCookie;
+
   public CachedResponse transform(CachedResponseEntity cachedResponseEntity) {
     CachedResponse cachedResponse = null;
 
@@ -15,7 +21,7 @@ public CachedResponse transform(CachedResponseEntity cachedResponseEntity) {
               .setStatusCode(cachedResponseEntity.getStatusCode())
               .setStatusText(cachedResponseEntity.getStatusText())
               .setHeaders(cachedResponseEntity.getHeaders())
-              .setCookies(cachedResponseEntity.getCookies())
+              .setCookies(cookieEntityToCookie.transform(cachedResponseEntity.getCookies()))
               .setResponseBody(cachedResponseEntity.getResponseBody())
               .build();
     }

src/main/java/com/wego/httpcache/dao/mappers/CachedResponseToCachedResponseEntity.java

@@ -1,11 +1,17 @@
 package com.wego.httpcache.dao.mappers;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import com.wego.httpcache.dao.entities.CachedResponseEntity;
 import com.wego.httpcache.dao.models.CachedResponse;
 import java.io.IOException;
 
+@Singleton
 public class CachedResponseToCachedResponseEntity {
 
+  @Inject
+  private CookieToCookieEntity cookieToCookieEntity;
+
   public CachedResponseEntity transform(CachedResponse cachedResponse) throws IOException {
     CachedResponseEntity cachedResponseEntity = null;
 
@@ -14,7 +20,7 @@ public CachedResponseEntity transform(CachedResponse cachedResponse) throws IOEx
           new CachedResponseEntity.Builder()
               .setId(cachedResponse.getId())
               .setResponseBody(cachedResponse.getResponseBody())
-              .setCookies(cachedResponse.getCookies())
+              .setCookies(cookieToCookieEntity.transform(cachedResponse.getCookies()))
               .setHeaders(cachedResponse.getHeaders())
               .setStatusText(cachedResponse.getStatusText())
               .setStatusCode(cachedResponse.getStatusCode())

src/test/java/com/wego/httpcache/dao/mappers/TestCachedResponseEntityToCachedResponse.java

@@ -1,13 +1,26 @@
 package com.wego.httpcache.dao.mappers;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.anyList;
+import static org.mockito.Mockito.when;
 
+import com.ning.http.client.cookie.Cookie;
 import com.wego.httpcache.dao.entities.CachedResponseEntity;
 import com.wego.httpcache.dao.models.CachedResponse;
 import com.wego.httpcache.fixtures.CachedResponseEntityFixture;
+import com.wego.httpcache.fixtures.CookieFixture;
+import java.util.Arrays;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class TestCachedResponseEntityToCachedResponse {
+  @Mock private CookieEntityToCookie cookieEntityToCookie;
+
+  @InjectMocks
   private CachedResponseEntityToCachedResponse cachedResponseEntityToCachedResponse =
       new CachedResponseEntityToCachedResponse();
 
@@ -18,17 +31,19 @@ public void transform_whenInputParamIsNull_returnsNull() throws Exception {
 
   @Test
   public void transform_whenValidInputParam_returnsCachedResponse() throws Exception {
-    CachedResponseEntity cachedResponseEntity = CachedResponseEntityFixture.create();
+    final CachedResponseEntity cachedResponseEntity = CachedResponseEntityFixture.create();
+    final Cookie cookie = CookieFixture.create();
+
+    when(cookieEntityToCookie.transform(anyList())).thenReturn(Arrays.asList(cookie));
 
-    CachedResponse cachedResponse =
-        cachedResponseEntityToCachedResponse.transform(cachedResponseEntity);
+    CachedResponse subject = cachedResponseEntityToCachedResponse.transform(cachedResponseEntity);
 
-    assertThat(cachedResponse.getId()).isEqualTo(cachedResponseEntity.getId());
-    assertThat(cachedResponse.getCookies()).isEqualTo(cachedResponseEntity.getCookies());
-    assertThat(cachedResponse.getHeaders().toString())
+    assertThat(subject.getId()).isEqualTo(cachedResponseEntity.getId());
+    assertThat(subject.getCookies()).contains(cookie);
+    assertThat(subject.getHeaders().toString())
         .contains(cachedResponseEntity.getHeaders().toString());
-    assertThat(cachedResponse.getResponseBody()).isEqualTo(cachedResponseEntity.getResponseBody());
-    assertThat(cachedResponse.getStatusCode()).isEqualTo(cachedResponseEntity.getStatusCode());
-    assertThat(cachedResponse.getStatusText()).isEqualTo(cachedResponseEntity.getStatusText());
+    assertThat(subject.getResponseBody()).isEqualTo(cachedResponseEntity.getResponseBody());
+    assertThat(subject.getStatusCode()).isEqualTo(cachedResponseEntity.getStatusCode());
+    assertThat(subject.getStatusText()).isEqualTo(cachedResponseEntity.getStatusText());
   }
 }

src/test/java/com/wego/httpcache/dao/mappers/TestCachedResponseToCachedResponseEntity.java

@@ -1,16 +1,29 @@
 package com.wego.httpcache.dao.mappers;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Matchers.anyList;
+import static org.mockito.Mockito.when;
 
 import com.wego.httpcache.dao.entities.CachedResponseEntity;
+import com.wego.httpcache.dao.entities.CookieEntity;
 import com.wego.httpcache.dao.models.CachedResponse;
 import com.wego.httpcache.fixtures.CachedResponseFixture;
+import com.wego.httpcache.fixtures.CookieEntityFixture;
+import java.util.Arrays;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class TestCachedResponseToCachedResponseEntity {
+  @InjectMocks
   private CachedResponseToCachedResponseEntity cachedResponseToCachedResponseEntity =
       new CachedResponseToCachedResponseEntity();
 
+  @Mock private CookieToCookieEntity cookieToCookieEntity;
+
   @Test
   public void transform_whenInputParamIsNull_returnsNull() throws Exception {
     assertThat(cachedResponseToCachedResponseEntity.transform(null)).isNull();
@@ -19,12 +32,15 @@ public void transform_whenInputParamIsNull_returnsNull() throws Exception {
   @Test
   public void transform_whenValidInputParam_returnsCachedResponseEntity() throws Exception {
     CachedResponse cachedResponse = CachedResponseFixture.create();
+    CookieEntity cookieEntity = CookieEntityFixture.create();
+
+    when(cookieToCookieEntity.transform(anyList())).thenReturn(Arrays.asList(cookieEntity));
 
     CachedResponseEntity cachedResponseEntity =
         cachedResponseToCachedResponseEntity.transform(cachedResponse);
 
     assertThat(cachedResponseEntity.getId()).isEqualTo(cachedResponse.getId());
-    assertThat(cachedResponseEntity.getCookies()).isEqualTo(cachedResponse.getCookies());
+    assertThat(cachedResponseEntity.getCookies()).contains(cookieEntity);
     assertThat(cachedResponseEntity.getHeaders().toString())
         .contains(cachedResponse.getHeaders().toString());
     assertThat(cachedResponseEntity.getResponseBody()).isEqualTo(cachedResponse.getResponseBody());

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

@@ -9,9 +9,9 @@ public static CachedResponseEntity create() {
         .setId("ID")
         .setResponseBody("Body")
         .setStatusCode(200)
-        .setStatusText("")
+        .setStatusText("Ok")
         .setHeaders(HeaderFixture.create())
-        .setCookies(Arrays.asList(CookieFixture.create()))
+        .setCookies(Arrays.asList(CookieEntityFixture.create()))
         .build();
   }
 }

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

@@ -9,7 +9,7 @@ public static CachedResponse create() {
         .setId("ID")
         .setResponseBody("Body")
         .setStatusCode(200)
-        .setStatusText("")
+        .setStatusText("Ok")
         .setHeaders(HeaderFixture.create())
         .setCookies(Arrays.asList(CookieFixture.create()))
         .build();