#101: Added toString to Takes and Responses.

yegor256 · Sep 29, 2015 · d9a2c2f · d9a2c2f
1 parent e3f1155
commit d9a2c2f
Show file tree

Hide file tree

Showing 59 changed files with 120 additions and 5 deletions.
diff --git a/src/main/java/org/takes/facets/auth/RsLogout.java b/src/main/java/org/takes/facets/auth/RsLogout.java
@@ -24,6 +24,7 @@
 package org.takes.facets.auth;
 
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Response;
 import org.takes.rs.RsWithCookie;
 import org.takes.rs.RsWrap;
@@ -37,6 +38,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public final class RsLogout extends RsWrap {
 

diff --git a/src/main/java/org/takes/facets/auth/TkAuth.java b/src/main/java/org/takes/facets/auth/TkAuth.java
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
@@ -40,6 +41,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(of = { "origin", "pass", "header" })
 @EqualsAndHashCode(of = { "origin", "pass", "header" })
 public final class TkAuth implements Take {
 

diff --git a/src/main/java/org/takes/facets/auth/TkSecure.java b/src/main/java/org/takes/facets/auth/TkSecure.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.logging.Level;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
@@ -41,6 +42,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(of = { "origin", "loc" })
 @EqualsAndHashCode(of = { "origin", "loc" })
 public final class TkSecure implements Take {
 

diff --git a/src/main/java/org/takes/facets/fallback/TkFallback.java b/src/main/java/org/takes/facets/fallback/TkFallback.java
@@ -27,6 +27,7 @@
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.HttpException;
 import org.takes.Request;
 import org.takes.Response;
@@ -43,6 +44,7 @@
  * @since 0.1
  * @checkstyle IllegalCatchCheck (500 lines)
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @SuppressWarnings("PMD.AvoidCatchingThrowable")
 public final class TkFallback extends TkWrap {

diff --git a/src/main/java/org/takes/facets/flash/RsFlash.java b/src/main/java/org/takes/facets/flash/RsFlash.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Response;
 import org.takes.misc.Sprintf;
 import org.takes.rs.RsWithCookie;
@@ -87,12 +88,14 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(callSuper = true, of = "text")
 @EqualsAndHashCode(callSuper = true)
 public final class RsFlash extends RsWrap {
 
     /**
      * To string.
      */
+    @SuppressWarnings("unused")
     private final transient String text;
 
     /**
@@ -152,11 +155,6 @@ public RsFlash(final String msg, final Level level, final String cookie)
         this.text = String.format("%s/%s", level, msg);
     }
 
-    @Override
-    public String toString() {
-        return this.text;
-    }
-
     /**
      * Make a response.
      * @param msg Message

diff --git a/src/main/java/org/takes/facets/flash/TkFlash.java b/src/main/java/org/takes/facets/flash/TkFlash.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.Iterator;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
@@ -58,6 +59,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(of = { "origin", "cookie" })
 @EqualsAndHashCode(of = { "origin", "cookie" })
 public final class TkFlash implements Take {
 

diff --git a/src/main/java/org/takes/facets/fork/RsFork.java b/src/main/java/org/takes/facets/fork/RsFork.java
@@ -28,6 +28,7 @@
 import java.net.HttpURLConnection;
 import java.util.Arrays;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.HttpException;
 import org.takes.Request;
 import org.takes.Response;
@@ -43,6 +44,7 @@
  * @version $Id$
  * @since 0.6
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public final class RsFork extends RsWrap {
 

diff --git a/src/main/java/org/takes/facets/fork/TkConsumes.java b/src/main/java/org/takes/facets/fork/TkConsumes.java
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
@@ -39,6 +40,7 @@
  * @version $Id$
  * @since 1.0
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public final class TkConsumes extends TkWrap {
     /**

diff --git a/src/main/java/org/takes/facets/fork/TkFork.java b/src/main/java/org/takes/facets/fork/TkFork.java
@@ -29,6 +29,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.HttpException;
 import org.takes.Request;
 import org.takes.Response;
@@ -62,6 +63,7 @@
  * @see org.takes.facets.fork.FkRegex
  * @see org.takes.facets.fork.FkParams
  */
+@ToString(of = "forks")
 @EqualsAndHashCode(of = "forks")
 public final class TkFork implements Take {
 

diff --git a/src/main/java/org/takes/facets/fork/TkMethods.java b/src/main/java/org/takes/facets/fork/TkMethods.java
@@ -24,6 +24,7 @@
 package org.takes.facets.fork;
 
 import java.util.Arrays;
+import lombok.ToString;
 import org.takes.Take;
 import org.takes.tk.TkWrap;
 
@@ -34,6 +35,7 @@
  * @author Aleksey Popov ([email protected])
  * @version $Id$
  */
+@ToString(callSuper = true)
 public class TkMethods extends TkWrap {
     /**
      * Ctor.

diff --git a/src/main/java/org/takes/facets/fork/TkProduces.java b/src/main/java/org/takes/facets/fork/TkProduces.java
@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
@@ -39,6 +40,7 @@
  * @version $Id$
  * @since 0.14
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public final class TkProduces extends TkWrap {
 

diff --git a/src/main/java/org/takes/facets/forward/RsFailure.java b/src/main/java/org/takes/facets/forward/RsFailure.java
@@ -26,6 +26,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.facets.flash.RsFlash;
 
 /**
@@ -38,6 +39,7 @@
  * @version $Id$
  * @since 0.18
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class RsFailure extends RsForward {
 

diff --git a/src/main/java/org/takes/facets/forward/RsForward.java b/src/main/java/org/takes/facets/forward/RsForward.java
@@ -27,6 +27,7 @@
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.HttpException;
 import org.takes.Response;
 import org.takes.misc.Sprintf;
@@ -44,6 +45,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(callSuper = true, of = "origin")
 @EqualsAndHashCode(callSuper = true, of = "origin")
 public class RsForward extends HttpException implements Response {
 

diff --git a/src/main/java/org/takes/facets/forward/TkForward.java b/src/main/java/org/takes/facets/forward/TkForward.java
@@ -28,6 +28,7 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
@@ -43,6 +44,7 @@
  * @since 0.1
  * @see org.takes.facets.forward.TkForward
  */
+@ToString(of = "origin")
 @EqualsAndHashCode(of = "origin")
 public final class TkForward implements Take {
 
@@ -73,6 +75,7 @@ public Response act(final Request req) throws IOException {
     /**
      * Safe response.
      */
+    @ToString(of = { "origin", "saved" })
     private static final class Safe implements Response {
         /**
          * Original response.

diff --git a/src/main/java/org/takes/facets/ret/RsReturn.java b/src/main/java/org/takes/facets/ret/RsReturn.java
@@ -29,6 +29,7 @@
 import java.util.Date;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
+import lombok.ToString;
 import org.takes.Response;
 import org.takes.rs.RsWithCookie;
 import org.takes.rs.RsWrap;
@@ -40,6 +41,7 @@
  * @version $Id$
  * @since 0.20
  */
+@ToString(callSuper = true)
 public final class RsReturn extends RsWrap {
     /**
      * Ctor.

diff --git a/src/main/java/org/takes/facets/ret/TkReturn.java b/src/main/java/org/takes/facets/ret/TkReturn.java
@@ -28,6 +28,7 @@
 import java.nio.charset.Charset;
 import java.util.Iterator;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
@@ -44,6 +45,7 @@
  * @version $Id$
  * @since 0.20
  */
+@ToString(of = { "origin", "cookie" })
 @EqualsAndHashCode(of = { "origin", "cookie" })
 public final class TkReturn implements Take {
 

diff --git a/src/main/java/org/takes/facets/slf4j/TkLogged.java b/src/main/java/org/takes/facets/slf4j/TkLogged.java
@@ -26,6 +26,7 @@
 
 import java.io.IOException;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Request;
 import org.takes.Response;
 import org.takes.Take;
@@ -38,6 +39,7 @@
  * @version $Id$
  * @since 0.11.2
  */
+@ToString(of = { "origin", "target" })
 @EqualsAndHashCode(of = { "origin", "target" })
 public final class TkLogged implements Take {
 

diff --git a/src/main/java/org/takes/rs/RsBuffered.java b/src/main/java/org/takes/rs/RsBuffered.java
@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Response;
 
 /**
@@ -38,6 +39,7 @@
  * @version $Id$
  * @since 0.16
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public final class RsBuffered extends RsWrap {
 

diff --git a/src/main/java/org/takes/rs/RsEmpty.java b/src/main/java/org/takes/rs/RsEmpty.java
@@ -27,6 +27,7 @@
 import java.io.InputStream;
 import java.util.Collections;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Response;
 
 /**
@@ -38,6 +39,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString
 @EqualsAndHashCode
 public final class RsEmpty implements Response {
 

diff --git a/src/main/java/org/takes/rs/RsFluent.java b/src/main/java/org/takes/rs/RsFluent.java
@@ -25,6 +25,7 @@
 
 import java.io.InputStream;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Response;
 
 /**
@@ -36,6 +37,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public final class RsFluent extends RsWrap {
 

diff --git a/src/main/java/org/takes/rs/RsGzip.java b/src/main/java/org/takes/rs/RsGzip.java
@@ -31,6 +31,7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.zip.GZIPOutputStream;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Response;
 
 /**
@@ -42,6 +43,7 @@
  * @version $Id$
  * @since 0.10
  */
+@ToString(of = "origin")
 @EqualsAndHashCode(of = "origin")
 public final class RsGzip implements Response {
 

diff --git a/src/main/java/org/takes/rs/RsHTML.java b/src/main/java/org/takes/rs/RsHTML.java
@@ -27,6 +27,7 @@
 import java.net.HttpURLConnection;
 import java.net.URL;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Response;
 
 /**
@@ -38,6 +39,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public final class RsHTML extends RsWrap {
 

diff --git a/src/main/java/org/takes/rs/RsJSON.java b/src/main/java/org/takes/rs/RsJSON.java
@@ -30,6 +30,7 @@
 import javax.json.JsonStructure;
 import javax.json.JsonWriter;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.takes.Response;
 
 /**
@@ -41,6 +42,7 @@
  * @version $Id$
  * @since 0.1
  */
+@ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public final class RsJSON extends RsWrap {