(#918) Code review fixes, attempt 3

yegor256 · Nov 20, 2019 · 5a70417 · 5a70417 · 0pdd · Nov 25, 2019
1 parent 39a6c72
commit 5a70417
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 151 deletions.
diff --git a/src/main/java/org/takes/misc/InputStreamsEqual.java b/src/main/java/org/takes/misc/InputStreamsEqual.java
diff --git a/src/main/java/org/takes/rq/RequestOf.java b/src/main/java/org/takes/rq/RequestOf.java
@@ -27,13 +27,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
+import org.cactoos.io.BytesOf;
 import org.cactoos.scalar.And;
+import org.cactoos.scalar.Equality;
 import org.cactoos.scalar.HashCode;
 import org.cactoos.scalar.Or;
 import org.cactoos.scalar.Unchecked;
 import org.takes.Request;
 import org.takes.Scalar;
-import org.takes.misc.InputStreamsEqual;
 
 /**
  * This {@link Request} implementation provides a way to build a request
@@ -103,7 +104,10 @@ public boolean equals(final Object that) {
                                     this.head()
                                 ).value();
                             },
-                            new InputStreamsEqual(this.body(), other.body())
+                            () -> new Equality<>(
+                                new BytesOf(this.body()),
+                                new BytesOf(other.body())
+                            ).value() == 0
                         ).value();
                     }
                 )

diff --git a/src/main/java/org/takes/rs/ResponseOf.java b/src/main/java/org/takes/rs/ResponseOf.java
@@ -27,13 +27,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
+import org.cactoos.io.BytesOf;
 import org.cactoos.scalar.And;
+import org.cactoos.scalar.Equality;
 import org.cactoos.scalar.HashCode;
 import org.cactoos.scalar.Or;
 import org.cactoos.scalar.Unchecked;
 import org.takes.Response;
 import org.takes.Scalar;
-import org.takes.misc.InputStreamsEqual;
 
 /**
  * Response of head and body.
@@ -104,7 +105,10 @@ public boolean equals(final Object that) {
                                     this.head()
                                 ).value();
                             },
-                            new InputStreamsEqual(this.body(), other.body())
+                            () -> new Equality<>(
+                                new BytesOf(this.body()),
+                                new BytesOf(other.body())
+                            ).value() == 0
                         ).value();
                     }
                 )

diff --git a/src/test/java/org/takes/rs/RsPrettyJsonTest.java b/src/test/java/org/takes/rs/RsPrettyJsonTest.java
@@ -98,14 +98,15 @@ public void reportsCorrectContentLength() throws Exception {
      */
     @Test
     public void mustEvaluateTrueEquality() throws Exception {
+        final String body = "{\"person\":{\"name\":\"John\"}}";
         new Assertion<>(
             "Must evaluate true equality",
             new RsPrettyJson(
-                new RsWithBody("{\"person\":{\"name\":\"John\"}}")
+                new RsWithBody(body)
             ),
             new IsEqual<>(
                 new RsPrettyJson(
-                    new RsWithBody("{\"person\":{\"name\":\"John\"}}")
+                    new RsWithBody(body)
                 )
             )
         ).affirm();