Replaced deprecated Objects.toStringHelper with MoreObjects.toStringHelper.

Michal Gajdos · Michal Gajdos · commit 4ae7a89bfd3a · 2015-03-23T13:04:23.000+01:00
Change-Id: Ic554a5e5fed058727d6fbc6c90a4918c79a70818
Signed-off-by: Michal Gajdos &lt;michal.gajdos@oracle.com&gt;
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/ClientResponse.java b/core-client/src/main/java/org/glassfish/jersey/client/ClientResponse.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -68,7 +68,7 @@
 import org.glassfish.hk2.api.ServiceLocator;
 
 import jersey.repackaged.com.google.common.base.Function;
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 import jersey.repackaged.com.google.common.collect.Collections2;
 import jersey.repackaged.com.google.common.collect.Sets;
 
@@ -78,6 +78,7 @@
  * @author Marek Potociar (marek.potociar at oracle.com)
  */
 public class ClientResponse extends InboundMessageContext implements ClientResponseContext, ServiceLocatorSupplier {
+
     private Response.StatusType status;
     private final ClientRequest requestContext;
     private URI resolvedUri;
@@ -176,7 +177,6 @@ public Response.StatusType getStatusInfo() {
         return status;
     }
 
-
     /**
      * Get the absolute URI of the ultimate request made to receive this response.
      * <p>
@@ -255,7 +255,7 @@ public Link apply(Link link) {
 
     @Override
     public String toString() {
-        return Objects
+        return MoreObjects
                 .toStringHelper(this)
                 .add("method", requestContext.getMethod())
                 .add("uri", requestContext.getUri())
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/InboundJaxrsResponse.java b/core-client/src/main/java/org/glassfish/jersey/client/InboundJaxrsResponse.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -58,7 +58,7 @@
 import org.glassfish.jersey.internal.util.Producer;
 import org.glassfish.jersey.process.internal.RequestScope;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * Implementation of an inbound client-side JAX-RS {@link Response} message.
@@ -250,9 +250,9 @@ public MultivaluedMap<String, Object> getMetadata() {
 
     @Override
     public String toString() {
-        return Objects
+        return MoreObjects
                 .toStringHelper(this)
-                .addValue(context)
+                .add("context", context)
                 .toString();
     }
 }
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/util/collection/Refs.java b/core-common/src/main/java/org/glassfish/jersey/internal/util/collection/Refs.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -39,7 +39,7 @@
  */
 package org.glassfish.jersey.internal.util.collection;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * A collection of {@link Ref reference} factory & utility methods.
@@ -75,7 +75,7 @@ public void set(final T value) throws IllegalStateException {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("reference", reference).toString();
+            return MoreObjects.toStringHelper(this).add("reference", reference).toString();
         }
 
         @Override
@@ -126,7 +126,7 @@ public void set(final T value) throws IllegalStateException {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("reference", reference).toString();
+            return MoreObjects.toStringHelper(this).add("reference", reference).toString();
         }
 
         @Override
@@ -178,7 +178,7 @@ public void set(final T value) throws IllegalStateException {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("reference", reference).toString();
+            return MoreObjects.toStringHelper(this).add("reference", reference).toString();
         }
 
         @Override
diff --git a/core-common/src/main/java/org/glassfish/jersey/message/internal/OutboundJaxrsResponse.java b/core-common/src/main/java/org/glassfish/jersey/message/internal/OutboundJaxrsResponse.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -66,7 +66,7 @@
 
 import org.glassfish.jersey.internal.LocalizationMessages;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * An outbound JAX-RS response message.
@@ -304,7 +304,7 @@ public MultivaluedMap<String, Object> getMetadata() {
 
     @Override
     public String toString() {
-        return Objects
+        return MoreObjects
                 .toStringHelper(this)
                 .add("status", status.getStatusCode())
                 .add("reason", status.getReasonPhrase())
@@ -322,6 +322,7 @@ public String toString() {
      * a new instance of {@link OutboundJaxrsResponse} is produced.
      */
     public static class Builder extends ResponseBuilder {
+
         private StatusType status;
         private final OutboundMessageContext context;
 
@@ -526,7 +527,7 @@ public javax.ws.rs.core.Response.ResponseBuilder language(Locale language) {
         @Override
         public javax.ws.rs.core.Response.ResponseBuilder location(URI location) {
             URI locationUri = location;
-            if (location != null && !location.isAbsolute())  {
+            if (location != null && !location.isAbsolute()) {
                 URI baseUri = getBaseUri();
                 if (baseUri != null) {
                     locationUri = baseUri.resolve(location);
diff --git a/core-common/src/main/java/org/glassfish/jersey/process/internal/RequestScope.java b/core-common/src/main/java/org/glassfish/jersey/process/internal/RequestScope.java
@@ -60,7 +60,7 @@
 import org.glassfish.hk2.api.ServiceHandle;
 import org.glassfish.hk2.utilities.binding.AbstractBinder;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 import jersey.repackaged.com.google.common.collect.Sets;
 
 import static jersey.repackaged.com.google.common.base.Preconditions.checkState;
@@ -556,7 +556,7 @@ public void release() {
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(this).add("id", id.value()).add("referenceCounter", referenceCounter.get())
+            return MoreObjects.toStringHelper(this).add("id", id.value()).add("referenceCounter", referenceCounter.get())
                     .add("store size", store.size()).toString();
         }
     }
diff --git a/examples/bookmark-em/src/main/java/org/glassfish/jersey/examples/bookmark_em/entity/BookmarkEntity.java b/examples/bookmark-em/src/main/java/org/glassfish/jersey/examples/bookmark_em/entity/BookmarkEntity.java
@@ -54,7 +54,7 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * Entity class BookmarkEntity.
@@ -285,7 +285,7 @@ public boolean equals(Object object) {
      */
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("bookmarkEntityPK", bookmarkEntityPK).toString();
+        return MoreObjects.toStringHelper(this).add("bookmarkEntityPK", bookmarkEntityPK).toString();
     }
 
 }
diff --git a/examples/bookmark-em/src/main/java/org/glassfish/jersey/examples/bookmark_em/entity/BookmarkEntityPK.java b/examples/bookmark-em/src/main/java/org/glassfish/jersey/examples/bookmark_em/entity/BookmarkEntityPK.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -44,7 +44,7 @@
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * Primary Key class BookmarkEntityPK for entity class BookmarkEntity.
@@ -164,7 +164,7 @@ public boolean equals(Object object) {
      */
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("bmid", bmid).add("userid", userid).toString();
+        return MoreObjects.toStringHelper(this).add("bmid", bmid).add("userid", userid).toString();
     }
 
 }
diff --git a/examples/bookmark-em/src/main/java/org/glassfish/jersey/examples/bookmark_em/entity/UserEntity.java b/examples/bookmark-em/src/main/java/org/glassfish/jersey/examples/bookmark_em/entity/UserEntity.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -51,7 +51,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * Entity class UserEntity.
@@ -242,7 +242,7 @@ public boolean equals(Object object) {
      */
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("userid", userid).toString();
+        return MoreObjects.toStringHelper(this).add("userid", userid).toString();
     }
 
 }
diff --git a/examples/bookmark/src/main/java/org/glassfish/jersey/examples/bookmark/entity/BookmarkEntity.java b/examples/bookmark/src/main/java/org/glassfish/jersey/examples/bookmark/entity/BookmarkEntity.java
@@ -53,7 +53,7 @@
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * Entity class BookmarkEntity.
@@ -283,7 +283,7 @@ public boolean equals(Object object) {
      */
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("bookmarkEntityPK", bookmarkEntityPK).toString();
+        return MoreObjects.toStringHelper(this).add("bookmarkEntityPK", bookmarkEntityPK).toString();
     }
 
 }
diff --git a/examples/bookmark/src/main/java/org/glassfish/jersey/examples/bookmark/entity/BookmarkEntityPK.java b/examples/bookmark/src/main/java/org/glassfish/jersey/examples/bookmark/entity/BookmarkEntityPK.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -44,7 +44,7 @@
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * Primary Key class BookmarkEntityPK for entity class BookmarkEntity.
@@ -164,7 +164,7 @@ public boolean equals(Object object) {
      */
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("bmid", bmid).add("userid", userid).toString();
+        return MoreObjects.toStringHelper(this).add("bmid", bmid).add("userid", userid).toString();
     }
 
 }
diff --git a/examples/bookmark/src/main/java/org/glassfish/jersey/examples/bookmark/entity/UserEntity.java b/examples/bookmark/src/main/java/org/glassfish/jersey/examples/bookmark/entity/UserEntity.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -52,7 +52,7 @@
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * Entity class UserEntity.
@@ -245,7 +245,7 @@ public boolean equals(Object object) {
      */
     @Override
     public String toString() {
-        return Objects.toStringHelper(this).add("userid", userid).toString();
+        return MoreObjects.toStringHelper(this).add("userid", userid).toString();
     }
 
 }
diff --git a/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java b/examples/bookstore-webapp/src/main/java/org/glassfish/jersey/examples/bookstore/webapp/resource/Item.java
@@ -50,7 +50,7 @@
 
 import org.glassfish.jersey.server.mvc.Template;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 @Template
 @Produces(MediaType.TEXT_HTML)
@@ -85,7 +85,7 @@ public Item getXml() {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(Item.class)
+        return MoreObjects.toStringHelper(Item.class)
                 .add("title", title)
                 .add("author", author)
                 .toString();
diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/ContactBean.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/ContactBean.java
@@ -48,7 +48,7 @@
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotBlank;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * @author Michal Gajdos (michal.gajdos at oracle.com)
@@ -126,7 +126,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(ContactBean.class)
+        return MoreObjects.toStringHelper(ContactBean.class)
                 .add("email", email)
                 .add("phone", phone)
                 .add("name", name)
diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/validateonexecution/AnotherContactBean.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/validateonexecution/AnotherContactBean.java
@@ -53,7 +53,7 @@
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotBlank;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 /**
  * @author Michal Gajdos (michal.gajdos at oracle.com)
@@ -142,7 +142,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(AnotherContactBean.class)
+        return MoreObjects.toStringHelper(AnotherContactBean.class)
                 .add("email", email)
                 .add("phone", phone)
                 .add("name", name)
diff --git a/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Item.java b/tests/integration/servlet-2.5-mvc-1/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_1/resource/Item.java
@@ -49,7 +49,7 @@
 
 import org.glassfish.jersey.server.mvc.Template;
 
-import jersey.repackaged.com.google.common.base.Objects;
+import jersey.repackaged.com.google.common.base.MoreObjects;
 
 @Template
 @Produces("text/html")
@@ -84,7 +84,7 @@ public Item getXml() {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(Item.class)
+        return MoreObjects.toStringHelper(Item.class)
                 .add("title", title)
                 .add("author", author)
                 .toString();
diff --git a/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Item.java b/tests/integration/servlet-2.5-mvc-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_2/resource/Item.java
diff --git a/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Item.java b/tests/integration/servlet-2.5-mvc-3/src/main/java/org/glassfish/jersey/tests/integration/servlet_25_mvc_3/resource/Item.java

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@`
`60`	`60`	`import org.glassfish.hk2.api.ServiceHandle;`
`61`	`61`	`import org.glassfish.hk2.utilities.binding.AbstractBinder;`
`62`	`62`
`63`		`-import jersey.repackaged.com.google.common.base.Objects;`
	`63`	`+import jersey.repackaged.com.google.common.base.MoreObjects;`
`64`	`64`	`import jersey.repackaged.com.google.common.collect.Sets;`
`65`	`65`
`66`	`66`	`import static jersey.repackaged.com.google.common.base.Preconditions.checkState;`
`@@ -556,7 +556,7 @@ public void release() {`
`556`	`556`
`557`	`557`	`@Override`
`558`	`558`	`public String toString() {`
`559`		`- return Objects.toStringHelper(this).add("id", id.value()).add("referenceCounter", referenceCounter.get())`
	`559`	`+ return MoreObjects.toStringHelper(this).add("id", id.value()).add("referenceCounter", referenceCounter.get())`
`560`	`560`	`.add("store size", store.size()).toString();`
`561`	`561`	`}`
`562`	`562`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`import javax.persistence.Temporal;`
`55`	`55`	`import javax.persistence.TemporalType;`
`56`	`56`
`57`		`-import jersey.repackaged.com.google.common.base.Objects;`
	`57`	`+import jersey.repackaged.com.google.common.base.MoreObjects;`
`58`	`58`
`59`	`59`	`/**`
`60`	`60`	`* Entity class BookmarkEntity.`
`@@ -285,7 +285,7 @@ public boolean equals(Object object) {`
`285`	`285`	`*/`
`286`	`286`	`@Override`
`287`	`287`	`public String toString() {`
`288`		`- return Objects.toStringHelper(this).add("bookmarkEntityPK", bookmarkEntityPK).toString();`
	`288`	`+ return MoreObjects.toStringHelper(this).add("bookmarkEntityPK", bookmarkEntityPK).toString();`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.`
	`4`	`+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.`
`5`	`5`	`*`
`6`	`6`	`* The contents of this file are subject to the terms of either the GNU`
`7`	`7`	`* General Public License Version 2 only ("GPL") or the Common Development`
`@@ -44,7 +44,7 @@`
`44`	`44`	`import javax.persistence.Column;`
`45`	`45`	`import javax.persistence.Embeddable;`
`46`	`46`
`47`		`-import jersey.repackaged.com.google.common.base.Objects;`
	`47`	`+import jersey.repackaged.com.google.common.base.MoreObjects;`
`48`	`48`
`49`	`49`	`/**`
`50`	`50`	`* Primary Key class BookmarkEntityPK for entity class BookmarkEntity.`
`@@ -164,7 +164,7 @@ public boolean equals(Object object) {`
`164`	`164`	`*/`
`165`	`165`	`@Override`
`166`	`166`	`public String toString() {`
`167`		`- return Objects.toStringHelper(this).add("bmid", bmid).add("userid", userid).toString();`
	`167`	`+ return MoreObjects.toStringHelper(this).add("bmid", bmid).add("userid", userid).toString();`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`	`import javax.persistence.Temporal;`
`54`	`54`	`import javax.persistence.TemporalType;`
`55`	`55`
`56`		`-import jersey.repackaged.com.google.common.base.Objects;`
	`56`	`+import jersey.repackaged.com.google.common.base.MoreObjects;`
`57`	`57`
`58`	`58`	`/**`
`59`	`59`	`* Entity class BookmarkEntity.`
`@@ -283,7 +283,7 @@ public boolean equals(Object object) {`
`283`	`283`	`*/`
`284`	`284`	`@Override`
`285`	`285`	`public String toString() {`
`286`		`- return Objects.toStringHelper(this).add("bookmarkEntityPK", bookmarkEntityPK).toString();`
	`286`	`+ return MoreObjects.toStringHelper(this).add("bookmarkEntityPK", bookmarkEntityPK).toString();`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`}`