yegor256#377: Some improvements of TkProxy class.

bdragan · Oct 31, 2015 · ee9ff32 · ee9ff32
1 parent 1faf827
commit ee9ff32
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/org/takes/tk/TkProxy.java b/src/main/java/org/takes/tk/TkProxy.java
@@ -50,7 +50,7 @@
  * @since 0.25
  */
 @ToString
-@EqualsAndHashCode
+@EqualsAndHashCode(of = { "origin", "rqtransformer", "rstransformer" })
 public final class TkProxy implements Take {
 
     /**
@@ -111,9 +111,11 @@ public Request transform(final Request request) {
 
     @Override
     public Response act(final Request req) throws IOException {
-        final Request transformed = this.rqtransformer.transform(req);
-        final Response response = this.origin.act(transformed);
-        return this.rstransformer.transform(response);
+        return this.rstransformer.transform(
+            this.origin.act(
+                this.rqtransformer.transform(req)
+            )
+        );
     }
 
     /**

diff --git a/src/test/java/org/takes/tk/TkProxyTest.java b/src/test/java/org/takes/tk/TkProxyTest.java
@@ -32,6 +32,7 @@
 import org.takes.Response;
 import org.takes.Take;
 import org.takes.rq.RqFake;
+import org.takes.rs.RsText;
 import org.takes.tk.TkProxy.RqTransformer;
 import org.takes.tk.TkProxy.RsTransformer;
 
@@ -50,8 +51,8 @@ public final class TkProxyTest {
     @Test
     public void proxiesRequest() throws IOException {
         final Take take = Mockito.mock(Take.class);
-        final Request transformed = Mockito.mock(Request.class);
-        final Response response = Mockito.mock(Response.class);
+        final Request transformed = new RqFake("transformed request");
+        final Response response = new RsText("response");
         Mockito.when(take.act(transformed)).thenReturn(response);
         final TkProxy tkProxy = new TkProxy(
             take,
@@ -76,8 +77,8 @@ public Request transform(final Request request) {
     @Test
     public void proxiesResponse() throws IOException {
         final Take take = Mockito.mock(Take.class);
-        final Request request = Mockito.mock(Request.class);
-        final Response transformed = Mockito.mock(Response.class);
+        final Request request = new RqFake("request");
+        final Response transformed = new RsText("transformed response");
         final TkProxy tkProxy = new TkProxy(
             take,
             new RsTransformer() {