fix null id, refactor and add test

Author: tamnguyenit

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

@@ -6,13 +6,20 @@
 public class CachedResponseEntityToCachedResponse {
 
   public CachedResponse transform(CachedResponseEntity cachedResponseEntity) {
-    return new CachedResponse.Builder()
-        .setId(cachedResponseEntity.getId())
-        .setStatusCode(cachedResponseEntity.getStatusCode())
-        .setStatusText(cachedResponseEntity.getStatusText())
-        .setHeaders(cachedResponseEntity.getHeaders())
-        .setCookies(cachedResponseEntity.getCookies())
-        .setResponseBody(cachedResponseEntity.getResponseBody())
-        .build();
+    CachedResponse cachedResponse = null;
+
+    if (cachedResponseEntity != null) {
+      cachedResponse =
+          new CachedResponse.Builder()
+              .setId(cachedResponseEntity.getId())
+              .setStatusCode(cachedResponseEntity.getStatusCode())
+              .setStatusText(cachedResponseEntity.getStatusText())
+              .setHeaders(cachedResponseEntity.getHeaders())
+              .setCookies(cachedResponseEntity.getCookies())
+              .setResponseBody(cachedResponseEntity.getResponseBody())
+              .build();
+    }
+
+    return cachedResponse;
   }
 }

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

@@ -6,26 +6,21 @@
 
 public class CachedResponseToCachedResponseEntity {
 
-  public CachedResponseEntity transform(CachedResponse cachedResponse) {
+  public CachedResponseEntity transform(CachedResponse cachedResponse) throws IOException {
     CachedResponseEntity cachedResponseEntity = null;
-    String responseBody = null;
 
-    try {
-      responseBody = cachedResponse.getResponseBody();
-    } catch (IOException e) {
-      e.printStackTrace();
+    if (cachedResponse != null) {
+      cachedResponseEntity =
+          new CachedResponseEntity.Builder()
+              .setId(cachedResponse.getId())
+              .setResponseBody(cachedResponse.getResponseBody())
+              .setCookies(cachedResponse.getCookies())
+              .setHeaders(cachedResponse.getHeaders())
+              .setStatusText(cachedResponse.getStatusText())
+              .setStatusCode(cachedResponse.getStatusCode())
+              .build();
     }
 
-    cachedResponseEntity =
-        new CachedResponseEntity.Builder()
-            .setResponseBody(cachedResponse.getId())
-            .setResponseBody(responseBody)
-            .setCookies(cachedResponse.getCookies())
-            .setHeaders(cachedResponse.getHeaders())
-            .setStatusText(cachedResponse.getStatusText())
-            .setStatusCode(cachedResponse.getStatusCode())
-            .build();
-
     return cachedResponseEntity;
   }
 }

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

@@ -0,0 +1,34 @@
+package com.wego.httpcache.dao.mappers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.wego.httpcache.dao.entities.CachedResponseEntity;
+import com.wego.httpcache.dao.models.CachedResponse;
+import com.wego.httpcache.fixtures.CachedResponseEntityFixture;
+import org.junit.Test;
+
+public class TestCachedResponseEntityToCachedResponse {
+  private CachedResponseEntityToCachedResponse cachedResponseEntityToCachedResponse =
+      new CachedResponseEntityToCachedResponse();
+
+  @Test
+  public void transform_whenInputParamIsNull_returnsNull() throws Exception {
+    assertThat(cachedResponseEntityToCachedResponse.transform(null)).isNull();
+  }
+
+  @Test
+  public void transform_whenValidInputParam_returnsCachedResponse() throws Exception {
+    CachedResponseEntity cachedResponseEntity = CachedResponseEntityFixture.create();
+
+    CachedResponse cachedResponse =
+        cachedResponseEntityToCachedResponse.transform(cachedResponseEntity);
+
+    assertThat(cachedResponse.getId()).isEqualTo(cachedResponseEntity.getId());
+    assertThat(cachedResponse.getCookies()).isEqualTo(cachedResponseEntity.getCookies());
+    assertThat(cachedResponse.getHeaders().toString())
+        .contains(cachedResponseEntity.getHeaders().toString());
+    assertThat(cachedResponse.getResponseBody()).isEqualTo(cachedResponseEntity.getResponseBody());
+    assertThat(cachedResponse.getStatusCode()).isEqualTo(cachedResponseEntity.getStatusCode());
+    assertThat(cachedResponse.getStatusText()).isEqualTo(cachedResponseEntity.getStatusText());
+  }
+}

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

@@ -0,0 +1,34 @@
+package com.wego.httpcache.dao.mappers;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.wego.httpcache.dao.entities.CachedResponseEntity;
+import com.wego.httpcache.dao.models.CachedResponse;
+import com.wego.httpcache.fixtures.CachedResponseFixture;
+import org.junit.Test;
+
+public class TestCachedResponseToCachedResponseEntity {
+  private CachedResponseToCachedResponseEntity cachedResponseToCachedResponseEntity =
+      new CachedResponseToCachedResponseEntity();
+
+  @Test
+  public void transform_whenInputParamIsNull_returnsNull() throws Exception {
+    assertThat(cachedResponseToCachedResponseEntity.transform(null)).isNull();
+  }
+
+  @Test
+  public void transform_whenValidInputParam_returnsCachedResponseEntity() throws Exception {
+    CachedResponse cachedResponse = CachedResponseFixture.create();
+
+    CachedResponseEntity cachedResponseEntity =
+        cachedResponseToCachedResponseEntity.transform(cachedResponse);
+
+    assertThat(cachedResponseEntity.getId()).isEqualTo(cachedResponse.getId());
+    assertThat(cachedResponseEntity.getCookies()).isEqualTo(cachedResponse.getCookies());
+    assertThat(cachedResponseEntity.getHeaders().toString())
+        .contains(cachedResponse.getHeaders().toString());
+    assertThat(cachedResponseEntity.getResponseBody()).isEqualTo(cachedResponse.getResponseBody());
+    assertThat(cachedResponseEntity.getStatusCode()).isEqualTo(cachedResponse.getStatusCode());
+    assertThat(cachedResponseEntity.getStatusText()).isEqualTo(cachedResponse.getStatusText());
+  }
+}