[java-identity-provider COMMIT] in /trunk: idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.jav...

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Sep 25 17:48:24 2011
New Revision: 4074

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4074&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/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/ScopedAttributeValue.java
    trunk/idp-attribute-filter-api/src/main/java/net/shibboleth/idp/attribute/filtering/AttributeFilterContext.java
    trunk/idp-attribute-filter-api/src/test/java/net/shibboleth/idp/attribute/filtering/MockAttributeValueMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeRegexMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeScopeStringMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValueRegexMatcher.java
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filtering/impl/matcher/AttributeValueStringMatcher.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedAttributeDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolvedDataConnector.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverPluginDependency.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/TemplateAttributeTest.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationWorkflowDescriptor.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/KerberosTicketSubcontext.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/UsernamePasswordSubcontext.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/UsernamePrincipal.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/X509CertificateSubcontext.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/AuthenticationEvent.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/IdPSession.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/session/ServiceSession.java
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/attribute/consent/ConsentContext.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/log/PerformanceEvent.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/SchemaTypeAwareXMLBeanDefinitionReader.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/ActionSupport.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/AbstractProfileConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartyConfiguration.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/RelyingPartySubcontext.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/relyingparty/SecurityConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/AbstractSAMLProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/idwsf/SsosProfileConfiguration.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/relyingparty/saml2/AbstractSAML2ProfileConfiguration.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/IdpInitatedSsoRequest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/xmlobject/ScopeMarshaller.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/xmlobject/ScopedValueMarshaller.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/xmlobject/ScopedValueUnmarshaller.java
    trunk/idp-tou-api/src/main/java/net/shibboleth/idp/tou/TermsOfUseContext.java

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java?rev=4074&r1=4073&r2=4074&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/Attribute.java Sun Sep 25 17:48:24 2011
@@ -67,8 +67,7 @@
      * @param attributeId unique identifier of the attribute
      */
     public Attribute(final String attributeId) {
-        id = StringSupport.trimOrNull(attributeId);
-        Assert.isNotNull(id, "Attribute ID may not be null");
+        id = Assert.isNotNull(StringSupport.trimOrNull(attributeId), "Attribute ID may not be null");
 

[... 835 lines stripped ...]