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

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Sep 25 17:48:01 2011
New Revision: 2909

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2909&view=rev
Log:
Have most methods of Assert return the input they are checking in order to allow check-and-assign and chaining usage patterns
Use new usage patterns where possible

Modified:
    trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageContext.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
    trunk/opensaml-util/src/main/java/org/opensaml/util/Assert.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/component/AbstractIdentifiableComponent.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/net/HttpClientBuilder.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/net/HttpResource.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/resource/ClasspathResource.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/resource/FilesystemResource.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/xml/AttributeSupport.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/xml/DomTypeSupport.java
    trunk/opensaml-util/src/main/java/org/opensaml/util/xml/ElementSupport.java

Modified: trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageContext.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageContext.java?rev=2909&r1=2908&r2=2909&view=diff
==============================================================================
--- trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageContext.java (original)
+++ trunk/opensaml-messaging-api/src/main/java/org/opensaml/messaging/context/BasicMessageContext.java Sun Sep 25 17:48:01 2011
@@ -52,9 +52,7 @@
      */
     public BasicMessageContext(String contextId) {
         creationTime = new DateTime();
-
-        id = StringSupport.trimOrNull(contextId);
-        Assert.isNotNull(id, "Context ID can not be null or empty");
+        id = Assert.isNotNull(StringSupport.trimOrNull(contextId), "Context ID can not be null or empty");
     }
 
     /** {@inheritDoc} */

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=2909&r1=2908&r2=2909&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 Sun Sep 25 17:48:01 2011
@@ -33,8 +33,7 @@
      * @param bindingUri the SAML binding URI, never null or empty
      */
     public BindingCriterion(String bindingUri) {
-        binding = StringSupport.trimOrNull(bindingUri);
-        Assert.isNotNull(binding, "Binding URI can not be null or empty");
+        binding = Assert.isNotNull(StringSupport.trimOrNull(bindingUri), "Binding URI can not be null or empty");
     }
 
     /**
@@ -45,7 +44,7 @@
     public String getBinding() {
         return binding;
     }
-    
+
     /** {@inheritDoc} */
     public String toString() {
         StringBuilder builder = new StringBuilder();
@@ -65,15 +64,15 @@
         if (this == obj) {
             return true;
         }
-        
+
         if (obj == null) {
             return false;
         }
-        
+
         if (obj instanceof BindingCriterion) {
-            return binding.equals(((BindingCriterion)obj).binding);
+            return binding.equals(((BindingCriterion) obj).binding);
         }
-        
+
         return false;
     }
 }

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=2909&r1=2908&r2=2909&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 Sun Sep 25 17:48:01 2011
@@ -33,8 +33,7 @@
      * @param locationUri the binding location URI, never null or empty
      */
     public BindingLocation(String locationUri) {
-        location = StringSupport.trimOrNull(locationUri);

[... 692 lines stripped ...]