Clean-up config-netconf-connector

- add final and/or this when possible
- remove infer generic type
- use method reference

Change-Id: I43d7a3f3cc0ec576dd6f44b0abc0c766e0003a6f
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Commit.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Commit.java
index d49bb901aadeea2d75b31a607454c10689e1c81f..176d3e26ec48ce2a342026550358fc08622434f6 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Commit.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Commit.java
@@ -54,7 +54,7 @@ public class Commit extends AbstractConfigNetconfOperation {
         }
         LOG.trace("Datastore {} committed successfully: {}", Datastore.candidate, status);
 
-        return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
+        return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent());
     }
 
 }

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/DiscardChanges.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/DiscardChanges.java
index 3b6cb0eb1ea0cc725bbdef7117e3dcba5a10ddb4..41492107c3cfdbcdbc8463e49ba0d84091b4e161 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/DiscardChanges.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/DiscardChanges.java
@@ -63,6 +63,6 @@ public class DiscardChanges extends AbstractConfigNetconfOperation {
         LOG.trace("Changes discarded successfully from datastore {}", Datastore.candidate);
 
 
-        return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
+        return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent());
     }
 }

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Lock.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Lock.java
index 505678995c010f581323e614d5a34298fee1f77b..d031c9e30c6df853ae63239814ffa05c9a6824fd 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Lock.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Lock.java
@@ -42,7 +42,7 @@ public class Lock extends AbstractLastNetconfOperation {
             // Since candidate datastore instances are allocated per session and not accessible anywhere else, no need to lock
             LOG.debug("Locking {} datastore on session: {}", targetDatastore, getNetconfSessionIdForReporting());
             // TODO should this fail if we are already locked ?
-            return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
+            return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent());
         }
 
         // Not supported running lock

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/UnLock.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/UnLock.java
index 987c3c166f872a9b1eea212260157253e7ad2633..e58a41abcb304e1e5a211b1e7cef05d9eccd2268 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/UnLock.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/UnLock.java
@@ -41,7 +41,7 @@ public class UnLock extends AbstractLastNetconfOperation {
             // Since candidate datastore instances are allocated per session and not accessible anywhere else, no need to lock
             LOG.debug("Unlocking {} datastore on session: {}", targetDatastore, getNetconfSessionIdForReporting());
             // TODO this should fail if we are not locked
-            return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
+            return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent());
         }
 
         // Not supported running lock

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Validate.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Validate.java
index 8a94fffd7f0b6dfadaa05faa06a2a5245fdbc9d4..c5fdcdaa61064264b6ef535eaa62d57416a67ee4 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Validate.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/Validate.java
@@ -80,6 +80,6 @@ public class Validate extends AbstractConfigNetconfOperation {
 
         LOG.trace("Datastore {} validated successfully", Datastore.candidate);
 
-        return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
+        return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent());
     }
 }

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfig.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfig.java
index e00f258630f63baef84b8adf51099684652a519b..851bce79d100da2be6af6aedc91de0183b6d26b8 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfig.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/editconfig/EditConfig.java
@@ -33,7 +33,7 @@ public class EditConfig extends AbstractConfigNetconfOperation {
 
     private static final Logger LOG = LoggerFactory.getLogger(EditConfig.class);
 
-    private EditConfigXmlParser editConfigXmlParser;
+    private final EditConfigXmlParser editConfigXmlParser;
 
     public EditConfig(final ConfigSubsystemFacade configSubsystemFacade, final String netconfSessionIdForReporting) {
         super(configSubsystemFacade, netconfSessionIdForReporting);
@@ -66,11 +66,10 @@ public class EditConfig extends AbstractConfigNetconfOperation {
 
     @Override
     protected Element handleWithNoSubsequentOperations(Document document, XmlElement xml) throws DocumentedException {
-        ConfigExecution configExecution;
         // FIXME config mapping getter works on dynamic yang store service and so does later executeConfigExecution method
         // They might have different view of current yangs in ODL and might cause race conditions
         Config cfg = getConfigSubsystemFacade().getConfigMapping();
-        configExecution = editConfigXmlParser.fromXml(xml, cfg);
+        ConfigExecution configExecution = editConfigXmlParser.fromXml(xml, cfg);
 
         return getResponseInternal(document, configExecution);
     }

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/getconfig/GetConfig.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/getconfig/GetConfig.java
index ac7d70ebeb39e1a86f4f7b5b17c5b0843c37d0c3..d7e3061cc37da0406b240fdd186cc7cdb0745381 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/getconfig/GetConfig.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/getconfig/GetConfig.java
@@ -43,11 +43,10 @@ public class GetConfig extends AbstractConfigNetconfOperation {
         XmlElement sourceNode = sourceElement.getOnlyChildElement();
         String sourceParsed = sourceNode.getName();
         LOG.debug("Setting source datastore to '{}'", sourceParsed);
-        Datastore sourceDatastore = Datastore.valueOf(sourceParsed);
 
         // Filter option: ignore for now, TODO only load modules specified by the filter
 
-        return sourceDatastore;
+        return Datastore.valueOf(sourceParsed);
 
     }
 

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java
index 2c6bdcbc9134a4a05bea0550ae5ff9b1a2a232c0..b8d5b58a2d4f55f7b4de8504a77fa2f72fd969bb 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/operations/runtimerpc/RuntimeRpc.java
@@ -38,8 +38,7 @@ public class RuntimeRpc extends AbstractConfigNetconfOperation {
 
     @Override
     public HandlingPriority canHandle(Document message) throws DocumentedException {
-        XmlElement requestElement = null;
-        requestElement = getRequestElementWithCheck(message);
+        XmlElement requestElement = getRequestElementWithCheck(message);
 
         XmlElement operationElement = requestElement.getOnlyChildElement();
         final String netconfOperationName = operationElement.getName();
@@ -102,7 +101,7 @@ public class RuntimeRpc extends AbstractConfigNetconfOperation {
                 execution.getOn(), execution.getAttributes(), result);
 
         if (execution.isVoid()) {
-            return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
+            return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.absent());
         } else {
             return getConfigSubsystemFacade().getRpcFacade().toXml(document, result, execution);
         }

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java
index 873d1a1a713c540f286dabe5a3e3634fe991c327..6f0a448dd213168e8a253ca833a30700c9c03514 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationProvider.java
@@ -39,7 +39,7 @@ final class NetconfOperationProvider {
             String netconfSessionIdForReporting) {
         Set<NetconfOperation> ops = Sets.newHashSet();
 
-        GetConfig getConfigOp = new GetConfig(configSubsystemFacade, Optional.<String> absent(), netconfSessionIdForReporting);
+        GetConfig getConfigOp = new GetConfig(configSubsystemFacade, Optional.absent(), netconfSessionIdForReporting);
 
         ops.add(getConfigOp);
         ops.add(new EditConfig(configSubsystemFacade, netconfSessionIdForReporting));

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java
index 5e3051274e3eaabfac19f8c2e04df379bec35bf1..01405d447ea046997753ea0df61507c8ed6b7557 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceFactoryImpl.java
@@ -11,7 +11,6 @@ package org.opendaylight.netconf.confignetconfconnector.osgi;
 import java.util.Set;
 import org.opendaylight.controller.config.facade.xml.ConfigSubsystemFacadeFactory;
 import org.opendaylight.controller.config.util.capability.Capability;
-import org.opendaylight.controller.config.util.capability.ModuleListener;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
 
@@ -35,11 +34,6 @@ public class NetconfOperationServiceFactoryImpl implements NetconfOperationServi
 
     @Override
     public AutoCloseable registerCapabilityListener(final CapabilityListener listener) {
-        return configFacadeFactory.getYangStoreService().registerModuleListener(new ModuleListener() {
-            @Override
-            public void onCapabilitiesChanged(Set<Capability> added, Set<Capability> removed) {
-                listener.onCapabilitiesChanged(added, removed);
-            }
-        });
+        return configFacadeFactory.getYangStoreService().registerModuleListener(listener::onCapabilitiesChanged);
     }
 }

diff --git a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java
index 602deae6b457f67ff87f4edc9b6728da46ffb263..37a744bff80e7f4aaf88f56676d319598e4bebb1 100644 (file)
--- a/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java
+++ b/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/osgi/NetconfOperationServiceImpl.java
@@ -16,12 +16,12 @@ import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 public class NetconfOperationServiceImpl implements NetconfOperationService {
 
     private final NetconfOperationProvider operationProvider;
-    private ConfigSubsystemFacade configSubsystemFacade;
+    private final ConfigSubsystemFacade configSubsystemFacade;
 
     public NetconfOperationServiceImpl(final ConfigSubsystemFacade configSubsystemFacade,
             final String netconfSessionIdForReporting) {
         this.configSubsystemFacade = configSubsystemFacade;
-        operationProvider = new NetconfOperationProvider(configSubsystemFacade, netconfSessionIdForReporting);
+        this.operationProvider = new NetconfOperationProvider(configSubsystemFacade, netconfSessionIdForReporting);
     }
 
     @Override