From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 11 May 2017 17:11:11 +0000 (+0200)
Subject: config-api: final parameters
X-Git-Tag: release/nitrogen~246
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=dd4468c48a1a0e807f4dffba879c939006c99086

config-api: final parameters

This automatically-generated patch flags all appropriate parameters as
final (including caught exceptions).

Change-Id: If0dfb559a3d27e6d54af29ad7f3f1796d5d4ffd4
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConflictingVersionException.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConflictingVersionException.java
index 2edf261499..bb0256174c 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConflictingVersionException.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ConflictingVersionException.java
@@ -21,15 +21,15 @@ public class ConflictingVersionException extends Exception {
         super();
     }
 
-    public ConflictingVersionException(String message, Throwable cause) {
+    public ConflictingVersionException(final String message, final Throwable cause) {
         super(message, cause);
     }
 
-    public ConflictingVersionException(String message) {
+    public ConflictingVersionException(final String message) {
         super(message);
     }
 
-    public ConflictingVersionException(Throwable cause) {
+    public ConflictingVersionException(final Throwable cause) {
         super(cause);
     }
 
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/IdentityAttributeRef.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/IdentityAttributeRef.java
index e1462b6b70..23d8691f54 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/IdentityAttributeRef.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/IdentityAttributeRef.java
@@ -17,7 +17,7 @@ public final class IdentityAttributeRef {
     private final String qNameOfIdentity;
 
     @ConstructorProperties(QNAME_ATTR_NAME)
-    public IdentityAttributeRef(String qNameOfIdentity) {
+    public IdentityAttributeRef(final String qNameOfIdentity) {
         if (qNameOfIdentity == null) {
             throw new NullPointerException("Parameter " + QNAME_ATTR_NAME + " is null");
         }
@@ -28,11 +28,11 @@ public final class IdentityAttributeRef {
         return qNameOfIdentity;
     }
 
-    public <T extends BaseIdentity> Class<? extends T> resolveIdentity(DependencyResolver resolver, Class<T> baseIdentity) {
+    public <T extends BaseIdentity> Class<? extends T> resolveIdentity(final DependencyResolver resolver, final Class<T> baseIdentity) {
         return resolver.resolveIdentity(this, baseIdentity);
     }
 
-    public <T extends BaseIdentity> void validateIdentity(DependencyResolver resolver, Class<T> baseIdentity, JmxAttribute jmxAttribute) {
+    public <T extends BaseIdentity> void validateIdentity(final DependencyResolver resolver, final Class<T> baseIdentity, final JmxAttribute jmxAttribute) {
         resolver.validateIdentity(this, baseIdentity, jmxAttribute);
     }
 
@@ -45,7 +45,7 @@ public final class IdentityAttributeRef {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttribute.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttribute.java
index 7ce602ae49..068322cc89 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttribute.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttribute.java
@@ -14,7 +14,7 @@ package org.opendaylight.controller.config.api;
 public class JmxAttribute {
     private final String attributeName;
 
-    public JmxAttribute(String attributeName) {
+    public JmxAttribute(final String attributeName) {
         if (attributeName == null) {
             throw new NullPointerException("Parameter 'attributeName' is null");
         }
@@ -29,7 +29,7 @@ public class JmxAttribute {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttributeValidationException.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttributeValidationException.java
index b09017fe55..c7b1ed3348 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttributeValidationException.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/JmxAttributeValidationException.java
@@ -20,32 +20,32 @@ public class JmxAttributeValidationException extends RuntimeException {
     private static final long serialVersionUID = 1L;
     private final List<JmxAttribute> attributeNames;
 
-    public JmxAttributeValidationException(JmxAttribute jmxAttribute) {
+    public JmxAttributeValidationException(final JmxAttribute jmxAttribute) {
         this(Arrays.asList(jmxAttribute));
     }
 
-    public JmxAttributeValidationException(List<JmxAttribute> jmxAttribute) {
+    public JmxAttributeValidationException(final List<JmxAttribute> jmxAttribute) {
         this.attributeNames = jmxAttribute;
     }
 
-    public JmxAttributeValidationException(String message,
-            JmxAttribute jmxAttribute) {
+    public JmxAttributeValidationException(final String message,
+            final JmxAttribute jmxAttribute) {
         this(message, Arrays.asList(jmxAttribute));
     }
 
-    public JmxAttributeValidationException(String message,
-            List<JmxAttribute> jmxAttributes) {
+    public JmxAttributeValidationException(final String message,
+            final List<JmxAttribute> jmxAttributes) {
         super(message);
         this.attributeNames = jmxAttributes;
     }
 
-    public JmxAttributeValidationException(String message, Throwable cause,
-            JmxAttribute jmxAttribute) {
+    public JmxAttributeValidationException(final String message, final Throwable cause,
+            final JmxAttribute jmxAttribute) {
         this(message, cause, Arrays.asList(jmxAttribute));
     }
 
-    public JmxAttributeValidationException(String message, Throwable cause,
-            List<JmxAttribute> jmxAttributes) {
+    public JmxAttributeValidationException(final String message, final Throwable cause,
+            final List<JmxAttribute> jmxAttributes) {
         super(message, cause);
         this.attributeNames = jmxAttributes;
     }
@@ -54,13 +54,13 @@ public class JmxAttributeValidationException extends RuntimeException {
         return attributeNames;
     }
 
-    public static <T> T checkNotNull(T param, JmxAttribute jmxAttribute) {
+    public static <T> T checkNotNull(final T param, final JmxAttribute jmxAttribute) {
         String message = "is null";
         return checkNotNull(param, message, jmxAttribute);
     }
 
-    public static <T> T checkNotNull(T param, String message,
-            JmxAttribute jmxAttribute) {
+    public static <T> T checkNotNull(final T param, final String message,
+            final JmxAttribute jmxAttribute) {
         if (param == null) {
             throw new JmxAttributeValidationException(
                     jmxAttribute.getAttributeName() + " " + message,
@@ -69,21 +69,21 @@ public class JmxAttributeValidationException extends RuntimeException {
         return param;
     }
 
-    public static JmxAttributeValidationException wrap(Throwable throwable,
-            JmxAttribute jmxAttribute) throws JmxAttributeValidationException {
+    public static JmxAttributeValidationException wrap(final Throwable throwable,
+            final JmxAttribute jmxAttribute) throws JmxAttributeValidationException {
         return wrap(throwable, throwable.getMessage(), jmxAttribute);
     }
 
-    public static JmxAttributeValidationException wrap(Throwable throwable,
-            String message, JmxAttribute jmxAttribute) {
+    public static JmxAttributeValidationException wrap(final Throwable throwable,
+            final String message, final JmxAttribute jmxAttribute) {
 
         throw new JmxAttributeValidationException(
                 jmxAttribute.getAttributeName() + " " + message, throwable,
                 jmxAttribute);
     }
 
-    public static void checkCondition(boolean condition, String message,
-            JmxAttribute jmxAttribute) throws JmxAttributeValidationException {
+    public static void checkCondition(final boolean condition, final String message,
+            final JmxAttribute jmxAttribute) throws JmxAttributeValidationException {
         if (!condition) {
             throw new JmxAttributeValidationException(
                     jmxAttribute.getAttributeName() + " " + message,
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleFactoryNotFoundException.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleFactoryNotFoundException.java
index 6d8f654463..029367ff1b 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleFactoryNotFoundException.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleFactoryNotFoundException.java
@@ -17,7 +17,7 @@ public class ModuleFactoryNotFoundException extends RuntimeException {
 
     private final String moduleName;
 
-    public ModuleFactoryNotFoundException(String moduleName) {
+    public ModuleFactoryNotFoundException(final String moduleName) {
         super("ModuleFactory not found for module name: " + moduleName);
         this.moduleName = moduleName;
     }
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleIdentifier.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleIdentifier.java
index 7baaf9f6e4..c7d1df895b 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleIdentifier.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ModuleIdentifier.java
@@ -13,7 +13,7 @@ public class ModuleIdentifier implements Identifier {
     private static final long serialVersionUID = 1L;
     private final String factoryName, instanceName;
 
-    public ModuleIdentifier(String factoryName, String instanceName) {
+    public ModuleIdentifier(final String factoryName, final String instanceName) {
         if (factoryName == null) {
             throw new IllegalArgumentException("Parameter 'factoryName' is null");
         }
@@ -33,7 +33,7 @@ public class ModuleIdentifier implements Identifier {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ValidationException.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ValidationException.java
index 82b73d419e..f1c90920be 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ValidationException.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/ValidationException.java
@@ -26,13 +26,13 @@ public class ValidationException extends Exception {
     private final Map<String/* module name */, Map<String/* instance name */, ExceptionMessageWithStackTrace>> failedValidations;
 
     public ValidationException(
-            Map<String /* module name */, Map<String /* instance name */, ExceptionMessageWithStackTrace>> failedValidations) {
+            final Map<String /* module name */, Map<String /* instance name */, ExceptionMessageWithStackTrace>> failedValidations) {
         super(failedValidations.toString());
         this.failedValidations = Collections.unmodifiableMap(failedValidations);
     }
 
     public static ValidationException createFromCollectedValidationExceptions(
-            List<ValidationException> collectedExceptions) {
+            final List<ValidationException> collectedExceptions) {
         Map<String, Map<String, ExceptionMessageWithStackTrace>> failedValidations = new HashMap<>();
         for (ValidationException ve : collectedExceptions) {
             for (Entry<String, Map<String, ExceptionMessageWithStackTrace>> outerEntry : ve
@@ -62,7 +62,7 @@ public class ValidationException extends Exception {
     }
 
     public static ValidationException createForSingleException(
-            ModuleIdentifier moduleIdentifier, Exception e) {
+            final ModuleIdentifier moduleIdentifier, final Exception e) {
         Map<String, Map<String, ExceptionMessageWithStackTrace>> failedValidations = new HashMap<>();
         Map<String, ExceptionMessageWithStackTrace> innerMap = new HashMap<>();
 
@@ -82,12 +82,12 @@ public class ValidationException extends Exception {
         public ExceptionMessageWithStackTrace() {
         }
 
-        public ExceptionMessageWithStackTrace(String message, String stackTrace) {
+        public ExceptionMessageWithStackTrace(final String message, final String stackTrace) {
             this.message = message;
             this.stackTrace = stackTrace;
         }
 
-        public ExceptionMessageWithStackTrace(Exception e) {
+        public ExceptionMessageWithStackTrace(final Exception e) {
             this(e.getMessage(), Arrays.toString(e.getStackTrace()));
         }
 
@@ -99,11 +99,11 @@ public class ValidationException extends Exception {
             return stackTrace;
         }
 
-        public void setMessage(String message) {
+        public void setMessage(final String message) {
             this.message = message;
         }
 
-        public void setTrace(String stackTrace) {
+        public void setTrace(final String stackTrace) {
             this.stackTrace = stackTrace;
         }
 
@@ -119,7 +119,7 @@ public class ValidationException extends Exception {
         }
 
         @Override
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             if (this == obj) {
                 return true;
             }
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/CommitStatus.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/CommitStatus.java
index 3fb0604f20..33f811c739 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/CommitStatus.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/CommitStatus.java
@@ -25,9 +25,9 @@ public class CommitStatus {
      */
     @ConstructorProperties({"newInstances", "reusedInstances",
             "recreatedInstances"})
-    public CommitStatus(List<ObjectName> newInstances,
-                        List<ObjectName> reusedInstances,
-                        List<ObjectName> recreatedInstances) {
+    public CommitStatus(final List<ObjectName> newInstances,
+                        final List<ObjectName> reusedInstances,
+                        final List<ObjectName> recreatedInstances) {
         this.newInstances = Collections.unmodifiableList(newInstances);
         this.reusedInstances = Collections.unmodifiableList(reusedInstances);
         this.recreatedInstances = Collections
@@ -71,7 +71,7 @@ public class CommitStatus {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java
index 0c7478dca0..1165d7a399 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtil.java
@@ -45,77 +45,77 @@ public class ObjectNameUtil {
     private static final String REPLACED_QUOTATION_MARK = "\\?";
     public static final String ON_WILDCARD = "*";
 
-    public static ObjectName createON(String on) {
+    public static ObjectName createON(final String on) {
         try {
             return new ObjectName(on);
-        } catch (MalformedObjectNameException e) {
+        } catch (final MalformedObjectNameException e) {
             throw new IllegalArgumentException(e);
         }
     }
 
-    public static ObjectName createONWithDomainAndType(String type) {
+    public static ObjectName createONWithDomainAndType(final String type) {
         return ConfigRegistryConstants.createONWithDomainAndType(type);
     }
 
-    public static ObjectName createON(String name, String key, String value) {
+    public static ObjectName createON(final String name, final String key, final String value) {
         return ConfigRegistryConstants.createON(name, key, value);
     }
 
-    public static ObjectName createON(String domain, Map<String, String> attribs) {
+    public static ObjectName createON(final String domain, final Map<String, String> attribs) {
         Hashtable<String, String> table = new Hashtable<>(attribs);
         try {
             return new ObjectName(domain, table);
-        } catch (MalformedObjectNameException e) {
+        } catch (final MalformedObjectNameException e) {
             throw new IllegalArgumentException(e);
         }
 
     }
 
     public static ObjectName createTransactionControllerON(
-            String transactionName) {
+            final String transactionName) {
         Map<String, String> onParams = new HashMap<>();
         onParams.put(TRANSACTION_NAME_KEY, transactionName);
         onParams.put(TYPE_KEY, TYPE_CONFIG_TRANSACTION);
         return createON(ON_DOMAIN, onParams);
     }
 
-    public static ObjectName createTransactionModuleON(String transactionName,
-                                                       ModuleIdentifier moduleIdentifier) {
+    public static ObjectName createTransactionModuleON(final String transactionName,
+                                                       final ModuleIdentifier moduleIdentifier) {
         return createTransactionModuleON(transactionName,
                 moduleIdentifier.getFactoryName(),
                 moduleIdentifier.getInstanceName());
     }
 
-    public static ObjectName createTransactionModuleON(String transactionName,
-                                                       String moduleName, String instanceName) {
+    public static ObjectName createTransactionModuleON(final String transactionName,
+                                                       final String moduleName, final String instanceName) {
         Map<String, String> onParams = createModuleMap(moduleName, instanceName);
         onParams.put(TRANSACTION_NAME_KEY, transactionName);
         return createON(ON_DOMAIN, onParams);
     }
 
-    public static ObjectName createTransactionModuleON(String transactionName,
-                                                       ObjectName on) {
+    public static ObjectName createTransactionModuleON(final String transactionName,
+                                                       final ObjectName on) {
         return createTransactionModuleON(transactionName, getFactoryName(on),
                 getInstanceName(on));
     }
 
     public static ObjectName createReadOnlyModuleON(
-            ModuleIdentifier moduleIdentifier) {
+            final ModuleIdentifier moduleIdentifier) {
         return createReadOnlyModuleON(moduleIdentifier.getFactoryName(),
                 moduleIdentifier.getInstanceName());
     }
 
-    public static ObjectName createReadOnlyServiceON(String serviceQName, String refName) {
+    public static ObjectName createReadOnlyServiceON(final String serviceQName, final String refName) {
         Map<String, String> onParams = createServiceMap(serviceQName, refName);
         return createON(ON_DOMAIN, onParams);
     }
 
-    public static ObjectName createTransactionServiceON(String transactionName, String serviceQName, String refName) {
+    public static ObjectName createTransactionServiceON(final String transactionName, final String serviceQName, final String refName) {
         Map<String, String> onParams = createServiceON(transactionName, serviceQName, refName);
         return createON(ON_DOMAIN, onParams);
     }
 
-    public static String getServiceQName(ObjectName objectName) {
+    public static String getServiceQName(final ObjectName objectName) {
         checkType(objectName, TYPE_SERVICE_REFERENCE);
         String quoted = objectName.getKeyProperty(SERVICE_QNAME_KEY);
         return unquoteAndUnescape(objectName, quoted);
@@ -124,7 +124,7 @@ public class ObjectNameUtil {
     // ObjectName supports quotation and ignores tokens like =, but fails to ignore ? sign.
     // It must be replaced with another character that hopefully does not collide
     // with actual value.
-    private static String unquoteAndUnescape(ObjectName objectName, String quoted) {
+    private static String unquoteAndUnescape(final ObjectName objectName, final String quoted) {
         if (quoted == null) {
             throw new IllegalArgumentException("Cannot find " + SERVICE_QNAME_KEY + " in " + objectName);
         }
@@ -137,24 +137,24 @@ public class ObjectNameUtil {
         return substring;
     }
 
-    private static String quoteAndEscapeValue(String serviceQName) {
+    private static String quoteAndEscapeValue(final String serviceQName) {
         return "\"" + serviceQName.replace("?", REPLACED_QUOTATION_MARK) + "\"";
     }
 
-    public static String getReferenceName(ObjectName objectName) {
+    public static String getReferenceName(final ObjectName objectName) {
         checkType(objectName, TYPE_SERVICE_REFERENCE);
         return objectName.getKeyProperty(REF_NAME_KEY);
     }
 
-    private static Map<String, String> createServiceON(String transactionName, String serviceQName,
-                                                       String refName) {
+    private static Map<String, String> createServiceON(final String transactionName, final String serviceQName,
+                                                       final String refName) {
         Map<String, String> result = new HashMap<>(createServiceMap(serviceQName, refName));
         result.put(TRANSACTION_NAME_KEY, transactionName);
         return result;
     }
 
-    private static Map<String, String> createServiceMap(String serviceQName,
-                                                        String refName) {
+    private static Map<String, String> createServiceMap(final String serviceQName,
+                                                        final String refName) {
         Map<String, String> onParams = new HashMap<>();
         onParams.put(TYPE_KEY, TYPE_SERVICE_REFERENCE);
         onParams.put(SERVICE_QNAME_KEY, quoteAndEscapeValue(serviceQName));
@@ -163,14 +163,14 @@ public class ObjectNameUtil {
     }
 
 
-    public static ObjectName createReadOnlyModuleON(String moduleName,
-                                                    String instanceName) {
+    public static ObjectName createReadOnlyModuleON(final String moduleName,
+                                                    final String instanceName) {
         Map<String, String> onParams = createModuleMap(moduleName, instanceName);
         return createON(ON_DOMAIN, onParams);
     }
 
-    private static Map<String, String> createModuleMap(String moduleName,
-                                                       String instanceName) {
+    private static Map<String, String> createModuleMap(final String moduleName,
+                                                       final String instanceName) {
         Map<String, String> onParams = new HashMap<>();
         onParams.put(TYPE_KEY, TYPE_MODULE);
         onParams.put(MODULE_FACTORY_NAME_KEY, moduleName);
@@ -178,24 +178,24 @@ public class ObjectNameUtil {
         return onParams;
     }
 
-    public static String getFactoryName(ObjectName objectName) {
+    public static String getFactoryName(final ObjectName objectName) {
         checkTypeOneOf(objectName, TYPE_MODULE, TYPE_RUNTIME_BEAN);
         return objectName.getKeyProperty(MODULE_FACTORY_NAME_KEY);
     }
 
-    public static String getInstanceName(ObjectName objectName) {
+    public static String getInstanceName(final ObjectName objectName) {
         checkTypeOneOf(objectName, TYPE_MODULE, TYPE_RUNTIME_BEAN);
         return objectName.getKeyProperty(INSTANCE_NAME_KEY);
     }
 
-    public static String getTransactionName(ObjectName objectName) {
+    public static String getTransactionName(final ObjectName objectName) {
         return objectName.getKeyProperty(TRANSACTION_NAME_KEY);
     }
 
     /**
      * Sanitize on: keep only mandatory attributes of module + metadata.
      */
-    public static ObjectName withoutTransactionName(ObjectName inputON) {
+    public static ObjectName withoutTransactionName(final ObjectName inputON) {
         checkTypeOneOf(inputON, TYPE_MODULE, TYPE_SERVICE_REFERENCE);
         if (getTransactionName(inputON) == null) {
             throw new IllegalArgumentException(
@@ -224,7 +224,7 @@ public class ObjectNameUtil {
         return createON(ON_DOMAIN, outputProperties);
     }
 
-    public static ObjectName withTransactionName(ObjectName inputON, String transactionName) {
+    public static ObjectName withTransactionName(final ObjectName inputON, final String transactionName) {
         Map<String, String> additionalProperties = getAdditionalProperties(inputON);
         additionalProperties.put(TRANSACTION_NAME_KEY, transactionName);
         return createON(inputON.getDomain(), additionalProperties);
@@ -232,7 +232,7 @@ public class ObjectNameUtil {
     }
 
     private static void assertDoesNotContain(
-            Map<String, String> additionalProperties, String key) {
+            final Map<String, String> additionalProperties, final String key) {
         if (additionalProperties.containsKey(key)) {
             throw new IllegalArgumentException(
                     "Map 'additionalProperties' cannot overwrite attribute "
@@ -240,8 +240,8 @@ public class ObjectNameUtil {
         }
     }
 
-    public static ObjectName createRuntimeBeanName(String moduleName,
-                                                   String instanceName, Map<String, String> additionalProperties) {
+    public static ObjectName createRuntimeBeanName(final String moduleName,
+                                                   final String instanceName, final Map<String, String> additionalProperties) {
         // check that there is no overwriting of default attributes
         assertDoesNotContain(additionalProperties, MODULE_FACTORY_NAME_KEY);
         assertDoesNotContain(additionalProperties, INSTANCE_NAME_KEY);
@@ -258,7 +258,7 @@ public class ObjectNameUtil {
             MODULE_FACTORY_NAME_KEY, INSTANCE_NAME_KEY, TYPE_KEY));
 
     public static Map<String, String> getAdditionalPropertiesOfRuntimeBeanName(
-            ObjectName on) {
+            final ObjectName on) {
         checkType(on, TYPE_RUNTIME_BEAN);
         Map<String, String> allProperties = getAdditionalProperties(on);
         Map<String, String> result = new HashMap<>();
@@ -270,7 +270,7 @@ public class ObjectNameUtil {
         return result;
     }
 
-    public static Map<String, String> getAdditionalProperties(ObjectName on) {
+    public static Map<String, String> getAdditionalProperties(final ObjectName on) {
         Map<String, String> keyPropertyList = on.getKeyPropertyList();
         Map<String, String> result = new HashMap<>();
         for (Entry<String, String> entry : keyPropertyList.entrySet()) {
@@ -279,21 +279,21 @@ public class ObjectNameUtil {
         return result;
     }
 
-    public static void checkDomain(ObjectName objectName) {
+    public static void checkDomain(final ObjectName objectName) {
         if (!ON_DOMAIN.equals(objectName.getDomain())) {
             throw new IllegalArgumentException("Wrong domain " + objectName);
         }
 
     }
 
-    public static void checkType(ObjectName objectName, String type) {
+    public static void checkType(final ObjectName objectName, final String type) {
         if (!type.equals(objectName.getKeyProperty(TYPE_KEY))) {
             throw new IllegalArgumentException("Wrong type, expected '" + type
                     + "', got " + objectName);
         }
     }
 
-    public static void checkTypeOneOf(ObjectName objectName, String... types) {
+    public static void checkTypeOneOf(final ObjectName objectName, final String... types) {
         for (String type : types) {
             if (type.equals(objectName.getKeyProperty(TYPE_KEY))) {
                 return;
@@ -303,8 +303,8 @@ public class ObjectNameUtil {
                 + ", got " + objectName);
     }
 
-    public static ObjectName createModulePattern(String moduleName,
-                                                 String instanceName) {
+    public static ObjectName createModulePattern(final String moduleName,
+                                                 final String instanceName) {
         String finalModuleName = moduleName == null ? ON_WILDCARD : moduleName;
         String finalInstanceName = instanceName == null ? ON_WILDCARD : instanceName;
 
@@ -319,8 +319,8 @@ public class ObjectNameUtil {
         return namePattern;
     }
 
-    public static ObjectName createModulePattern(String ifcName,
-                                                 String instanceName, String transactionName) {
+    public static ObjectName createModulePattern(final String ifcName,
+                                                 final String instanceName, final String transactionName) {
         String finalIfcName = ifcName == null ? ON_WILDCARD : ifcName;
         String finalInstanceName = instanceName == null ? ON_WILDCARD : instanceName;
         String finalTransactionName = transactionName == null ? ON_WILDCARD : transactionName;
@@ -332,8 +332,8 @@ public class ObjectNameUtil {
                 + "=" + finalTransactionName);
     }
 
-    public static ObjectName createRuntimeBeanPattern(String moduleName,
-                                                      String instanceName) {
+    public static ObjectName createRuntimeBeanPattern(final String moduleName,
+                                                      final String instanceName) {
         String finalModuleName = moduleName == null ? ON_WILDCARD : moduleName;
         String finalInstanceName = instanceName == null ? ON_WILDCARD : instanceName;
 
@@ -346,8 +346,8 @@ public class ObjectNameUtil {
 
     }
 
-    public static ModuleIdentifier fromON(ObjectName objectName,
-                                          String expectedType) {
+    public static ModuleIdentifier fromON(final ObjectName objectName,
+                                          final String expectedType) {
         checkType(objectName, expectedType);
         String factoryName = getFactoryName(objectName);
         if (factoryName == null) {
@@ -362,7 +362,7 @@ public class ObjectNameUtil {
         return new ModuleIdentifier(factoryName, instanceName);
     }
 
-    public static boolean isServiceReference(ObjectName objectName) {
+    public static boolean isServiceReference(final ObjectName objectName) {
         return TYPE_SERVICE_REFERENCE.equals(objectName.getKeyProperty(TYPE_KEY));
     }
 }
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/constants/ConfigRegistryConstants.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/constants/ConfigRegistryConstants.java
index bcac188ab3..eae93e4d56 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/constants/ConfigRegistryConstants.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/constants/ConfigRegistryConstants.java
@@ -29,14 +29,14 @@ public class ConfigRegistryConstants {
 
     public static final String GET_AVAILABLE_MODULE_NAMES_ATTRIBUT_NAME = "AvailableModuleNames";
 
-    public static ObjectName createONWithDomainAndType(String type) {
+    public static ObjectName createONWithDomainAndType(final String type) {
         return createON(ON_DOMAIN, TYPE_KEY, type);
     }
 
-    public static ObjectName createON(String name, String key, String value) {
+    public static ObjectName createON(final String name, final String key, final String value) {
         try {
             return new ObjectName(name, key, value);
-        } catch (MalformedObjectNameException e) {
+        } catch (final MalformedObjectNameException e) {
             throw new IllegalArgumentException(e);
         }
 
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/CommitJMXNotification.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/CommitJMXNotification.java
index 79c792945f..1a49b887c7 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/CommitJMXNotification.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/CommitJMXNotification.java
@@ -14,7 +14,7 @@ public class CommitJMXNotification extends ConfigJMXNotification {
 
     private static final String AFTER_COMMIT_MESSAGE_TEMPLATE = "Commit successful: %s";
 
-    CommitJMXNotification(NotificationBroadcasterSupport source, String message) {
+    CommitJMXNotification(final NotificationBroadcasterSupport source, final String message) {
         super(ConfigJMXNotification.NotificationType.COMMIT,  source, String.format(AFTER_COMMIT_MESSAGE_TEMPLATE, message));
     }
 
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/ConfigJMXNotification.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/ConfigJMXNotification.java
index 2548711aa2..842c30aaa5 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/ConfigJMXNotification.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/jmx/notifications/ConfigJMXNotification.java
@@ -27,8 +27,8 @@ public abstract class ConfigJMXNotification extends Notification {
 
     private final NotificationType type;
 
-    protected ConfigJMXNotification(NotificationType type,
-                                    NotificationBroadcasterSupport source, String message) {
+    protected ConfigJMXNotification(final NotificationType type,
+                                    final NotificationBroadcasterSupport source, final String message) {
         super(type.toString(), source, sequenceNumber++, System.nanoTime(), message);
         this.type = type;
     }
@@ -50,7 +50,7 @@ public abstract class ConfigJMXNotification extends Notification {
      *
      * Intended for config-persister.
      */
-    public static CommitJMXNotification afterCommit(NotificationBroadcasterSupport source, String messages) {
+    public static CommitJMXNotification afterCommit(final NotificationBroadcasterSupport source, final String messages) {
         return new CommitJMXNotification(source, messages);
     }
 
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/ServiceNotFoundException.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/ServiceNotFoundException.java
index 0d9e7f0a34..2c6d76a9d6 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/ServiceNotFoundException.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/ServiceNotFoundException.java
@@ -15,11 +15,11 @@ package org.opendaylight.controller.config.api.osgi;
 public class ServiceNotFoundException extends RuntimeException {
     private static final long serialVersionUID = 1L;
 
-    public ServiceNotFoundException(String message, Throwable cause) {
+    public ServiceNotFoundException(final String message, final Throwable cause) {
         super(message, cause);
     }
 
-    public ServiceNotFoundException(String message) {
+    public ServiceNotFoundException(final String message) {
         super(message);
     }
 }
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/WaitingServiceTracker.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/WaitingServiceTracker.java
index d6abc64dda..e06d7002dd 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/WaitingServiceTracker.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/api/osgi/WaitingServiceTracker.java
@@ -28,7 +28,7 @@ public final class WaitingServiceTracker<T> implements AutoCloseable {
     private final ServiceTracker<T, ?> tracker;
     private final Class<T> serviceInterface;
 
-    private WaitingServiceTracker(Class<T> serviceInterface, ServiceTracker<T, ?> tracker) {
+    private WaitingServiceTracker(final Class<T> serviceInterface, final ServiceTracker<T, ?> tracker) {
         this.tracker = tracker;
         this.serviceInterface = serviceInterface;
     }
@@ -41,7 +41,7 @@ public final class WaitingServiceTracker<T> implements AutoCloseable {
      * @throws ServiceNotFoundException if it times out or is interrupted
      */
     @SuppressWarnings("unchecked")
-    public T waitForService(long timeoutInMillis) throws ServiceNotFoundException {
+    public T waitForService(final long timeoutInMillis) throws ServiceNotFoundException {
         try {
             T service = (T) tracker.waitForService(timeoutInMillis);
             if(service == null) {
@@ -50,7 +50,7 @@ public final class WaitingServiceTracker<T> implements AutoCloseable {
             }
 
             return service;
-        } catch(InterruptedException e) {
+        } catch(final InterruptedException e) {
             throw new ServiceNotFoundException(String.format("Wait for OSGi service %s was interrrupted",
                     serviceInterface));
         }
@@ -63,7 +63,7 @@ public final class WaitingServiceTracker<T> implements AutoCloseable {
      * @param context the BundleContext
      * @return new WaitingServiceTracker instance
      */
-    public static <T> WaitingServiceTracker<T> create(@Nonnull Class<T> serviceInterface, @Nonnull BundleContext context) {
+    public static <T> WaitingServiceTracker<T> create(@Nonnull final Class<T> serviceInterface, @Nonnull final BundleContext context) {
         ServiceTracker<T, ?> tracker = new ServiceTracker<>(context, serviceInterface, null);
         tracker.open();
         return new WaitingServiceTracker<>(serviceInterface, tracker);
@@ -77,14 +77,14 @@ public final class WaitingServiceTracker<T> implements AutoCloseable {
      * @param filter the OSGi service filter
      * @return new WaitingServiceTracker instance
      */
-    public static <T> WaitingServiceTracker<T> create(@Nonnull Class<T> serviceInterface, @Nonnull BundleContext context,
-            @Nonnull String filter) {
+    public static <T> WaitingServiceTracker<T> create(@Nonnull final Class<T> serviceInterface, @Nonnull final BundleContext context,
+            @Nonnull final String filter) {
         String newFilter = String.format("(&(%s=%s)%s)", Constants.OBJECTCLASS, serviceInterface.getName(), filter);
         try {
             ServiceTracker<T, ?> tracker = new ServiceTracker<>(context, context.createFilter(newFilter), null);
             tracker.open();
             return new WaitingServiceTracker<>(serviceInterface, tracker);
-        } catch(InvalidSyntaxException e) {
+        } catch(final InvalidSyntaxException e) {
             throw new IllegalArgumentException(String.format("Invalid OSGi filter %s", newFilter), e);
         }
     }
@@ -93,7 +93,7 @@ public final class WaitingServiceTracker<T> implements AutoCloseable {
     public void close() {
         try {
             tracker.close();
-        } catch(RuntimeException e) {
+        } catch(final RuntimeException e) {
             // The ServiceTracker could throw IllegalStateException if the BundleContext is already closed.
             // This is benign so ignore it.
             LOG.debug("Error closing ServiceTracker", e);
diff --git a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/AbstractModule.java b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/AbstractModule.java
index 9f6a5512ca..b9addee952 100644
--- a/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/AbstractModule.java
+++ b/opendaylight/config/config-api/src/main/java/org/opendaylight/controller/config/spi/AbstractModule.java
@@ -59,7 +59,7 @@ public abstract class AbstractModule<M extends AbstractModule<M>> implements org
         return identifier;
     }
 
-    public final void setCanReuseInstance(boolean canReuseInstance) {
+    public final void setCanReuseInstance(final boolean canReuseInstance) {
         this.canReuseInstance = canReuseInstance;
     }
 
@@ -79,7 +79,7 @@ public abstract class AbstractModule<M extends AbstractModule<M>> implements org
                 if (oldInstance != null) {
                     try {
                         oldInstance.close();
-                    } catch (Exception e) {
+                    } catch (final Exception e) {
                         LOG.error("An error occurred while closing old instance {} for module {}", oldInstance, getIdentifier(), e);
                     }
                 }
diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeValidationExceptionTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeValidationExceptionTest.java
index 66c9f59013..4df59addc2 100644
--- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeValidationExceptionTest.java
+++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/JmxAttributeValidationExceptionTest.java
@@ -63,7 +63,7 @@ public class JmxAttributeValidationExceptionTest {
     public void testCheckNotNull() throws Exception {
         try {
             JmxAttributeValidationException.checkNotNull(false, jmxAttribute);
-        } catch (JmxAttributeValidationException e) {
+        } catch (final JmxAttributeValidationException e) {
             assertJmxEx(e, jmxAttribute.getAttributeName() + " " + "message", jmxAttribute);
         }
     }
diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ValidationExceptionTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ValidationExceptionTest.java
index 5ee537e17e..3f4bd85823 100644
--- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ValidationExceptionTest.java
+++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/ValidationExceptionTest.java
@@ -53,7 +53,7 @@ public class ValidationExceptionTest {
         ValidationException single2 = ValidationException.createForSingleException(mi, e);
         try {
             ValidationException.createFromCollectedValidationExceptions(Lists.newArrayList(single, single2));
-        } catch (IllegalArgumentException ex) {
+        } catch (final IllegalArgumentException ex) {
             // Duplicate exception
             assertThat(ex.getMessage(), containsString("Cannot merge"));
             return;
diff --git a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java
index ad1a53a543..a9be8e984a 100644
--- a/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java
+++ b/opendaylight/config/config-api/src/test/java/org/opendaylight/controller/config/api/jmx/ObjectNameUtilTest.java
@@ -151,7 +151,7 @@ public class ObjectNameUtilTest {
     private void assertFailure(final Runnable test, final Class<? extends Exception> ex) {
         try {
             test.run();
-        } catch(Exception e) {
+        } catch(final Exception e) {
             assertTrue("Failed with wrong exception: " + Throwables.getStackTraceAsString(e),
                     e.getClass().isAssignableFrom(ex));
             return;