[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml: common/binding/EndpointResolver.j...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 10 23:02:57 2014
New Revision: 3609

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3609&view=rev
Log:
OSJ-61 - New EndpointResolver API and criterion objects

Added:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/EndpointResolver.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/EndpointTypeCriterion.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/RoleDescriptorCriterion.java   (with props)
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/SignedRequestCriterion.java   (with props)
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/EntityRoleCriterion.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/ProtocolCriterion.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java?rev=3609&r1=3608&r2=3609&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java Mon Feb 10 23:02:57 2014
@@ -17,6 +17,9 @@
 
 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;
@@ -25,27 +28,28 @@
 public final class BindingCriterion implements Criterion {
 
     /** The SAML binding URI. */
-    private final String binding;
+    @Nonnull @NotEmpty private final String binding;
 
     /**
      * Constructor.
      * 
-     * @param bindingUri the SAML binding URI, never null or empty
+     * @param bindingUri the SAML binding URI
      */
-    public BindingCriterion(String bindingUri) {
-        binding = Constraint.isNotNull(StringSupport.trimOrNull(bindingUri), "Binding URI can not be null or empty");
+    public BindingCriterion(@Nonnull @NotEmpty final String bindingUri) {
+        binding = Constraint.isNotNull(StringSupport.trimOrNull(bindingUri), "Binding URI cannot be null or empty");
     }
 
     /**
-     * Gets the SAML binding URI.
+     * Get the SAML binding URI.
      * 
-     * @return the SAML binding URI, never null or empty
+     * @return the SAML binding URI
      */
-    public String getBinding() {
+    @Nonnull @NotEmpty public String getBinding() {
         return binding;
     }
 
     /** {@inheritDoc} */
+    @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append("BindingCriterion [binding=");
@@ -55,11 +59,13 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public int hashCode() {
         return binding.hashCode();
     }
 
     /** {@inheritDoc} */
+    @Override
     public boolean equals(Object obj) {
         if (this == obj) {
             return true;

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java?rev=3609&r1=3608&r2=3609&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingLocationCriterion.java Mon Feb 10 23:02:57 2014
@@ -33,14 +33,14 @@
     /**
      * Constructor.
      * 
-     * @param locationUri the binding location URI, never null or empty
+     * @param locationUri the binding location URI
      */
     public BindingLocationCriterion(@Nonnull @NotEmpty final String locationUri) {
         location = Constraint.isNotNull(StringSupport.trimOrNull(locationUri), "Location cannot be null or empty");
     }
 
     /**
-     * Gets the binding location URI.
+     * Get the binding location URI.
      * 
      * @return the binding location URI
      */

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocationCriterion.java?rev=3609&r1=3608&r2=3609&view=diff

[... 155 lines stripped ...]