Merge "Fix some sonar bugs in config-api and config-manager."
authorTony Tkacik <ttkacik@cisco.com>
Tue, 25 Feb 2014 11:10:25 +0000 (11:10 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 25 Feb 2014 11:10:25 +0000 (11:10 +0000)
1  2 
opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ValidationException.java

index 68cd58d3a2a0e3f55fa073c26a9672259f940f1a,a93d97c7ee50c8a28e2480c3756b5fc80761ecf7..82b73d419e402a31f85a4dfeba7266c26d86b802
@@@ -16,11 -16,9 +16,11 @@@ import java.util.Map.Entry
  
  /**
   * This exception is not intended to be used while implementing modules,
 - * itaggregates validation exceptions and sends them back to the user.
 + * it aggregates validation exceptions and sends them back to the user.
 + * Use {@link org.opendaylight.controller.config.api.JmxAttributeValidationException} for
 + * validating modules instead.
   */
 -public class ValidationException extends RuntimeException {
 +public class ValidationException extends Exception {
      private static final long serialVersionUID = -6072893219820274247L;
  
      private final Map<String/* module name */, Map<String/* instance name */, ExceptionMessageWithStackTrace>> failedValidations;
  
          @Override
          public boolean equals(Object obj) {
-             if (this == obj)
+             if (this == obj) {
                  return true;
-             if (obj == null)
+             }
+             if (obj == null) {
                  return false;
-             if (getClass() != obj.getClass())
+             }
+             if (getClass() != obj.getClass()) {
                  return false;
+             }
              ExceptionMessageWithStackTrace other = (ExceptionMessageWithStackTrace) obj;
              if (message == null) {
-                 if (other.message != null)
+                 if (other.message != null) {
                      return false;
-             } else if (!message.equals(other.message))
+                 }
+             } else if (!message.equals(other.message)) {
                  return false;
+             }
              if (stackTrace == null) {
-                 if (other.stackTrace != null)
+                 if (other.stackTrace != null) {
                      return false;
-             } else if (!stackTrace.equals(other.stackTrace))
+                 }
+             } else if (!stackTrace.equals(other.stackTrace)) {
                  return false;
+             }
              return true;
          }