[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion: BindingLocation.java Bi...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 10 22:27:31 2014
New Revision: 3608

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3608&view=rev
Log:
Rename unused (so far) criterion classes.

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java
      - copied, changed from r3603, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocation.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java
      - copied, changed from r3603, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocation.java
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocation.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocation.java

Copied: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java (from r3603, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocation.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java?p2=trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java&p1=trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocation.java&r1=3603&r2=3608&rev=3608&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocation.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java Mon Feb 10 22:27:31 2014
@@ -17,35 +17,39 @@
 
 package org.opensaml.saml.criterion;
 
+import javax.annotation.Nonnull;
+
+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 net.shibboleth.utilities.java.support.resolver.Criterion;
 
 /** {@link Criterion} representing a SAML binding location. */
-public final class BindingLocation implements Criterion {
+public final class BindingLocationCriterion implements Criterion {
 
     /** The binding location URI. */
-    private final String location;
+    @Nonnull @NotEmpty private final String location;
 
     /**
      * Constructor.
      * 
      * @param locationUri the binding location URI, never null or empty
      */
-    public BindingLocation(String locationUri) {
-        location = Constraint.isNotNull(StringSupport.trimOrNull(locationUri), "Location can not be null or empty");
+    public BindingLocationCriterion(@Nonnull @NotEmpty final String locationUri) {
+        location = Constraint.isNotNull(StringSupport.trimOrNull(locationUri), "Location cannot be null or empty");
     }
 
     /**
      * Gets the binding location URI.
      * 
-     * @return the binding location URI, never null or empty
+     * @return the binding location URI
      */
-    public String getLocation() {
+    @Nonnull @NotEmpty public String getLocation() {
         return location;
     }
 
     /** {@inheritDoc} */
+    @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("BindingLocation [location=");
@@ -55,11 +59,13 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public int hashCode() {
         return location.hashCode();
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;
@@ -69,8 +75,8 @@
             return false;
         }
 
-        if (obj instanceof BindingLocation) {
-            return location.equals(((BindingLocation) obj).location);
+        if (obj instanceof BindingLocationCriterion) {
+            return location.equals(((BindingLocationCriterion) obj).location);
         }
 
         return false;

Copied: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java (from r3603, trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocation.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java?p2=trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java&p1=trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocation.java&r1=3603&r2=3608&rev=3608&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocation.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java Mon Feb 10 22:27:31 2014
@@ -17,25 +17,28 @@
 
 package org.opensaml.saml.criterion;
 
+import javax.annotation.Nonnull;
+

[... 67 lines stripped ...]