X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fdynamicmbean%2FDynamicWritableWrapper.java;fp=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fdynamicmbean%2FDynamicWritableWrapper.java;h=1ac299bcbb37ad3090e4dedc8d55b871cb55ad2d;hb=2b78ca93f44c372fd72927db6cbd65f5d8387b49;hp=90cc62358a80d641d60871b0ba824c104ab96c00;hpb=c0e813ca83ce80d5f3fb340175ddaecd780c6aea;p=controller.git

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/DynamicWritableWrapper.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/DynamicWritableWrapper.java
index 90cc62358a..1ac299bcbb 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/DynamicWritableWrapper.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/dynamicmbean/DynamicWritableWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2013, 2017 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -47,31 +47,27 @@ import org.slf4j.LoggerFactory;
  */
 @ThreadSafe
 public class DynamicWritableWrapper extends AbstractDynamicWrapper {
-    private static final Logger LOG = LoggerFactory
-            .getLogger(DynamicWritableWrapper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DynamicWritableWrapper.class);
 
     private final ReadOnlyAtomicBoolean configBeanModificationDisabled;
 
-    public DynamicWritableWrapper(final Module module,
-                                  final ModuleIdentifier moduleIdentifier,
-                                  final String transactionIdentifier,
-                                  final ReadOnlyAtomicBoolean configBeanModificationDisabled,
-                                  final MBeanServer internalServer, final MBeanServer configMBeanServer) {
-        super(module, true, moduleIdentifier, ObjectNameUtil
-                        .createTransactionModuleON(transactionIdentifier, moduleIdentifier), getOperations(moduleIdentifier),
-                internalServer, configMBeanServer);
+    public DynamicWritableWrapper(final Module module, final ModuleIdentifier moduleIdentifier,
+            final String transactionIdentifier, final ReadOnlyAtomicBoolean configBeanModificationDisabled,
+            final MBeanServer internalServer, final MBeanServer configMBeanServer) {
+        super(module, true, moduleIdentifier,
+                ObjectNameUtil.createTransactionModuleON(transactionIdentifier, moduleIdentifier),
+                getOperations(moduleIdentifier), internalServer, configMBeanServer);
         this.configBeanModificationDisabled = configBeanModificationDisabled;
     }
 
-    private static MBeanOperationInfo[] getOperations(
-            final ModuleIdentifier moduleIdentifier) {
+    private static MBeanOperationInfo[] getOperations(final ModuleIdentifier moduleIdentifier) {
         Method validationMethod;
         try {
             validationMethod = DynamicWritableWrapper.class.getMethod("validate");
         } catch (final NoSuchMethodException e) {
             throw new IllegalStateException("No such method exception on " + moduleIdentifier, e);
         }
-        return new MBeanOperationInfo[]{new MBeanOperationInfo("Validation", validationMethod)};
+        return new MBeanOperationInfo[] { new MBeanOperationInfo("Validation", validationMethod) };
     }
 
     @Override
@@ -105,7 +101,8 @@ public class DynamicWritableWrapper extends AbstractDynamicWrapper {
         Attribute newAttribute = attribute;
         AttributeHolder attributeHolder = attributeHolderMap.get(newAttribute.getName());
         if (attributeHolder.getRequireInterfaceOrNull() != null) {
-            newAttribute = new Attribute(newAttribute.getName(), fixObjectNames((ObjectName[]) newAttribute.getValue()));
+            newAttribute = new Attribute(newAttribute.getName(),
+                    fixObjectNames((ObjectName[]) newAttribute.getValue()));
         }
         return newAttribute;
     }
@@ -122,10 +119,10 @@ public class DynamicWritableWrapper extends AbstractDynamicWrapper {
     }
 
     private ObjectName[] fixObjectNames(final ObjectName[] dependencies) {
-        int i = 0;
+        int index = 0;
 
         for (ObjectName dependencyOn : dependencies) {
-            dependencies[i++] = fixObjectName(dependencyOn);
+            dependencies[index++] = fixObjectName(dependencyOn);
         }
 
         return dependencies;
@@ -139,28 +136,26 @@ public class DynamicWritableWrapper extends AbstractDynamicWrapper {
             try {
                 setAttribute(attribute);
                 result.add(attribute);
-            } catch (final Exception e) {
+            } catch (final InvalidAttributeValueException | AttributeNotFoundException | MBeanException
+                    | ReflectionException e) {
                 LOG.warn("Setting attribute {} failed on {}", attribute.getName(), moduleIdentifier, e);
                 throw new IllegalArgumentException(
-                        "Setting attribute failed - " + attribute.getName()
-                                + " on " + moduleIdentifier, e);
+                        "Setting attribute failed - " + attribute.getName() + " on " + moduleIdentifier, e);
             }
         }
         return result;
     }
 
+    @SuppressWarnings("IllegalCatch")
     @Override
     public Object invoke(final String actionName, final Object[] params, final String[] signature)
             throws MBeanException, ReflectionException {
-        if ("validate".equals(actionName)
-                && (params == null || params.length == 0)
+        if ("validate".equals(actionName) && (params == null || params.length == 0)
                 && (signature == null || signature.length == 0)) {
             try {
                 validate();
             } catch (final Exception e) {
-
-                throw new MBeanException(ValidationException.createForSingleException(
-                        moduleIdentifier, e));
+                throw new MBeanException(ValidationException.createForSingleException(moduleIdentifier, e));
             }
             return Void.TYPE;
         }