[utilities COMMIT] in /spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory: DomDocumentFactoryBea...

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Apr  2 21:17:40 2012
New Revision: 266

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

Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java?rev=266&r1=265&r2=266&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java Mon Apr  2 21:17:40 2012
@@ -19,7 +19,7 @@
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.utilities.java.support.logic.Assert;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.resource.Resource;
 import net.shibboleth.utilities.java.support.xml.BasicParserPool;
 
@@ -45,7 +45,7 @@
      * @param resource resource, never null
      */
     public void setDocumentResource(@Nonnull final Resource resource) {
-        documentResource = Assert.isNull(resource, "XML Resource can not be null");
+        documentResource = Constraint.isNull(resource, "XML Resource can not be null");
     }
 
     /**

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java?rev=266&r1=265&r2=266&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java Mon Apr  2 21:17:40 2012
@@ -25,7 +25,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-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.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -56,7 +56,7 @@
      * @param file private key file, never null
      */
     public void setPrivateKeyFile(@Nonnull final File file) {
-        keyFile = Assert.isNotNull(file, "Private key file can not be null");
+        keyFile = Constraint.isNotNull(file, "Private key file can not be null");
     }
 
     /**

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java?rev=266&r1=265&r2=266&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java Mon Apr  2 21:17:40 2012
@@ -24,7 +24,7 @@
 
 import javax.annotation.Nonnull;
 
-import net.shibboleth.utilities.java.support.logic.Assert;
+import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.springframework.beans.factory.BeanCreationException;
@@ -51,7 +51,7 @@
      * @param file public key file
      */
     public void setPublicKeyFile(@Nonnull final File file) {
-        keyFile = Assert.isNotNull(file, "Public key file can not be null");
+        keyFile = Constraint.isNotNull(file, "Public key file can not be null");
     }
 
     /** {@inheritDoc} */

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java?rev=266&r1=265&r2=266&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java (original)

[... 44 lines stripped ...]