[java-metadata-aggregator COMMIT] in /trunk: aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java ag...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Oct  9 23:07:24 2014
New Revision: 383

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=383&view=rev
Log:
Replace deprecated and unneeded Guava Objects methods.

Modified:
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
    trunk/aggregator-web-service/.project

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java?rev=383&r1=382&r2=383&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java Thu Oct  9 23:07:24 2014
@@ -17,14 +17,14 @@
 
 package net.shibboleth.metadata;
 
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-import com.google.common.base.Objects;
 
 /**
  * Carries a unique identifier for the data carried by an {@link net.shibboleth.metadata.Item}.
@@ -78,7 +78,7 @@
         }
 
         ItemId other = (ItemId) obj;
-        return Objects.equal(id, other.id);
+        return Objects.equals(id, other.id);
     }
 
     /** {@inheritDoc} */

Modified: trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java?rev=383&r1=382&r2=383&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java (original)
+++ trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/EntityRoleFilterStage.java Thu Oct  9 23:07:24 2014
@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
@@ -42,7 +43,6 @@
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
 
-import com.google.common.base.Objects;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -304,7 +304,7 @@
             childQName = QNameSupport.getNodeQName(child);
             roleIdentifier = null;
 
-            if (Objects.equal(childQName, ROLE_DESCRIPTOR_NAME)) {
+            if (Objects.equals(childQName, ROLE_DESCRIPTOR_NAME)) {
                 roleIdentifier = DOMTypeSupport.getXSIType(child);
             } else if (namedRoles.contains(childQName)) {
                 roleIdentifier = childQName;

Modified: trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java?rev=383&r1=382&r2=383&view=diff
==============================================================================
--- trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java (original)
+++ trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java Thu Oct  9 23:07:24 2014
@@ -17,10 +17,10 @@
 
 package net.shibboleth.metadata;
 
+import java.util.Objects;
+
 import net.shibboleth.metadata.util.ItemMetadataSupport;
 import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
-
-import com.google.common.base.Objects;
 
 /** A mock implementation of {@link Item}. */
 public class MockItem extends AbstractItem<String> {
@@ -75,8 +75,8 @@
         }
 
         if (obj instanceof MockItem) {
-            MockItem other = (MockItem) obj;
-            return Objects.equal(unwrap(), other.unwrap());
+            final MockItem other = (MockItem) obj;
+            return Objects.equals(unwrap(), other.unwrap());
         }
         return false;
     }

Modified: trunk/aggregator-web-service/.project
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-web-service/.project?rev=383&r1=382&r2=383&view=diff
==============================================================================
--- trunk/aggregator-web-service/.project (original)
+++ trunk/aggregator-web-service/.project Thu Oct  9 23:07:24 2014
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>

[... 10 lines stripped ...]