[java-opensaml COMMIT] in /trunk: opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.jav...

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Apr  2 21:13:57 2012
New Revision: 3012

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3012&view=rev
Log:
Rename Assert to Constraint and have it thrown ConstraintViolationException
Replace use of assert keyword with Constraint

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingCriterion.java
    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
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/EntityIdCriterion.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-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java?rev=3012&r1=3011&r2=3012&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BaseContext.java Mon Apr  2 21:13:57 2012
@@ -24,7 +24,7 @@
 
 import net.shibboleth.utilities.java.support.collection.ClassIndexedSet;
 import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
-import net.shibboleth.utilities.java.support.logic.Assert;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.joda.time.DateTime;
@@ -96,7 +96,7 @@
      * @param newId the new context id
      */
     protected void setId(final String newId) {
-        id = Assert.isNotNull(StringSupport.trimOrNull(newId), "Context ID can not be null or empty");
+        id = Constraint.isNotNull(StringSupport.trimOrNull(newId), "Context ID can not be null or empty");
     }
     
     /**

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=3012&r1=3011&r2=3012&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 Apr  2 21:13:57 2012
@@ -17,7 +17,7 @@
 
 package org.opensaml.saml.criterion;
 
-import net.shibboleth.utilities.java.support.logic.Assert;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resolver.Criterion;
 
@@ -33,7 +33,7 @@
      * @param bindingUri the SAML binding URI, never null or empty
      */
     public BindingCriterion(String bindingUri) {
-        binding = Assert.isNotNull(StringSupport.trimOrNull(bindingUri), "Binding URI can not be null or empty");
+        binding = Constraint.isNotNull(StringSupport.trimOrNull(bindingUri), "Binding URI can not be null or empty");
     }
 
     /**

Modified: 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/BindingLocation.java?rev=3012&r1=3011&r2=3012&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/BindingLocation.java Mon Apr  2 21:13:57 2012
@@ -17,7 +17,7 @@
 
 package org.opensaml.saml.criterion;
 
-import net.shibboleth.utilities.java.support.logic.Assert;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resolver.Criterion;
 
@@ -33,7 +33,7 @@
      * @param locationUri the binding location URI, never null or empty
      */
     public BindingLocation(String locationUri) {
-        location = Assert.isNotNull(StringSupport.trimOrNull(locationUri), "Location can not be null or empty");
+        location = Constraint.isNotNull(StringSupport.trimOrNull(locationUri), "Location can not be null or empty");
     }
 
     /**

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/criterion/BindingResponseLocation.java

[... 95 lines stripped ...]