[jboss-cvs] JBossAS SVN: r79437 - in projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain: ejb/jboss and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-10-13 22:53:27 -0400 (Mon, 13 Oct 2008)
New Revision: 79437

Added:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain/ValidatorChainException.java
Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain/ejb/jboss/JBossMetaDataValidatorChain.java
Log:
[JBMETA-118] Add ValidatorChainException to report all ValidationExceptions at once, not fail-fast on the first encountered

Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain/ValidatorChainException.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain/ValidatorChainException.java	                        (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain/ValidatorChainException.java	2008-10-14 02:53:27 UTC (rev 79437)
@@ -0,0 +1,90 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+  *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.validation.chain;
+
+import java.util.Collection;
+
+import org.jboss.metadata.validation.ValidationException;
+
+/**
+ * ValidatorChainException
+ * 
+ * Represents an error in validation due to any N 
+ * single ValidationExceptions
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public class ValidatorChainException extends ValidationException
+{
+   // --------------------------------------------------------------------------------||
+   // Class Members ------------------------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   private static final long serialVersionUID = 1L;
+
+   // --------------------------------------------------------------------------------||
+   // Instance Members ---------------------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   private ValidationException[] causes;
+
+   // --------------------------------------------------------------------------------||
+   // Constructors -------------------------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   public ValidatorChainException(ValidationException[] validationExceptions)
+   {
+      this.causes = validationExceptions;
+   }
+
+   public ValidatorChainException(Collection<ValidationException> validationExceptions)
+   {
+      this(validationExceptions.toArray(new ValidationException[]
+      {}));
+   }
+
+   // --------------------------------------------------------------------------------||
+   // Overridden Implementations -----------------------------------------------------||
+   // --------------------------------------------------------------------------------||
+
+   @Override
+   public String getMessage()
+   {
+      // Initialize
+      StringBuffer sb = new StringBuffer("Validation has failed due to the following ");
+      sb.append(ValidationException.class.getSimpleName());
+      sb.append("(s) raised:\n");
+
+      /*
+       * Report each underlying exception
+       */
+      for (ValidationException ve : this.causes)
+      {
+         sb.append(ve.getMessage());
+         sb.append("\n");
+      }
+
+      // Return
+      return sb.toString();
+   }
+}

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain/ejb/jboss/JBossMetaDataValidatorChain.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain/ejb/jboss/JBossMetaDataValidatorChain.java	2008-10-14 02:18:45 UTC (rev 79436)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/validation/chain/ejb/jboss/JBossMetaDataValidatorChain.java	2008-10-14 02:53:27 UTC (rev 79437)
@@ -21,6 +21,8 @@
  */
 package org.jboss.metadata.validation.chain.ejb.jboss;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -29,7 +31,9 @@
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
 import org.jboss.metadata.validation.ValidationException;
 import org.jboss.metadata.validation.chain.ValidatorChain;
+import org.jboss.metadata.validation.chain.ValidatorChainException;
 import org.jboss.metadata.validation.validator.Validator;
+import org.jboss.metadata.validation.validator.ejb.jboss.RemoteBindingsWithNoRemoteBusinessInterfaceValidator;
 
 /**
  * JBossMetaDataValidatorChain
@@ -107,6 +111,9 @@
     */
    public void validate() throws ValidationException
    {
+      // Initialize
+      Collection<ValidationException> validationExceptions = new ArrayList<ValidationException>();
+      
       // Get the metadata
       JBossMetaData md = this.getMetadata();
 
@@ -117,9 +124,24 @@
       for (Validator validator : validators)
       {
          // Run validation
-         validator.validate(md);
+         try
+         {
+            validator.validate(md);
+         }
+         catch(ValidationException ve)
+         {
+            validationExceptions.add(ve);
+         }
       }
+      
+      // Check that we didn't run into any problems
+      if(validationExceptions.size()>0)
+      {
+         // Throw a new ValidationChainException from the causes
+         throw new ValidatorChainException(validationExceptions);
+      }
 
+      // We're here, so all's good
       log.debug("Passed Validation on all configured validators for " + metadata);
    }
 
@@ -159,8 +181,12 @@
       // Initialize
       Set<Validator> defaultValidators = new HashSet<Validator>();
 
-      // Add all default validators
-      //TODO Add Validators here
+      /*
+       * Add all default validators
+       */
+      
+      // JBMETA-117 No @RemoteBindings if there's no remote business interface
+      defaultValidators.add(RemoteBindingsWithNoRemoteBusinessInterfaceValidator.INSTANCE);
 
       // Return
       return defaultValidators;