[utilities COMMIT] in /java-support/trunk/src/main/java/net/shibboleth/utilities/java/support: collection/Pair.java l...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct  9 23:06:33 2014
New Revision: 668

URL: http://svn.shibboleth.net/view/utilities?rev=668&view=rev
Log:
Replace deprecated and unneeded Guava Objects methods.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/velocity/Template.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/ElementSupport.java
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/xml/NamespaceSupport.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java?rev=668&r1=667&r2=668&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/collection/Pair.java Thu Oct  9 23:06:33 2014
@@ -22,6 +22,7 @@
 
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 
 /**
@@ -109,7 +110,8 @@
 
         if (o instanceof Pair) {
             final Pair<?,?> otherPair = (Pair<?,?>) o;
-            return Objects.equal(getFirst(), otherPair.getFirst()) && Objects.equal(getSecond(), otherPair.getSecond());
+            return java.util.Objects.equals(getFirst(), otherPair.getFirst())
+                    && java.util.Objects.equals(getSecond(), otherPair.getSecond());
         }
 
         return false;
@@ -122,6 +124,6 @@
 
     /** {@inheritDoc} */
     @Nonnull public String toString() {
-        return Objects.toStringHelper(this).add("first", first).add("second", second).toString();
+        return MoreObjects.toStringHelper(this).add("first", first).add("second", second).toString();
     }
 }

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java?rev=668&r1=667&r2=668&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TransformAndCheckFunction.java Thu Oct  9 23:06:33 2014
@@ -21,6 +21,7 @@
 import javax.annotation.concurrent.ThreadSafe;
 
 import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
@@ -88,9 +89,10 @@
         }
 
         if (obj instanceof TransformAndCheckFunction) {
-            TransformAndCheckFunction<T> other = (TransformAndCheckFunction<T>) obj;
-            return Objects.equal(preprocessor, other.preprocessor) && Objects.equal(constraint, other.constraint)
-                    && Objects.equal(failOnConstraintViolation, other.failOnConstraintViolation);
+            final TransformAndCheckFunction<T> other = (TransformAndCheckFunction<T>) obj;
+            return java.util.Objects.equals(preprocessor, other.preprocessor)
+                    && java.util.Objects.equals(constraint, other.constraint)
+                    && java.util.Objects.equals(failOnConstraintViolation, other.failOnConstraintViolation);
         }
 
         return false;
@@ -103,7 +105,7 @@
 
     /** {@inheritDoc} */
     public String toString() {
-        return Objects.toStringHelper(this).add("preprocessor", preprocessor).add("constraint", constraint)
+        return MoreObjects.toStringHelper(this).add("preprocessor", preprocessor).add("constraint", constraint)
                 .add("failOnConstraintViolation", failOnConstraintViolation).toString();
     }
 }

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java?rev=668&r1=667&r2=668&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/logic/TrimOrNullStringFunction.java Thu Oct  9 23:06:33 2014
@@ -24,7 +24,7 @@

[... 141 lines stripped ...]