Fix warnings in mdsal-netconf-connector

[netconf.git] / netconf / mdsal-netconf-connector / src / main / java / org / opendaylight / netconf / mdsal / connector / OperationProvider.java

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java
index 5bf9fb15ad80d01ed55e0bdaeda50cdaeb504e0d..ddf713f6a4fb883a8cc0a363055279f53bbebb4d 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java
@@ -8,48 +8,45 @@
 
 package org.opendaylight.netconf.mdsal.connector;
 
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mdsal.connector.ops.Commit;
+import org.opendaylight.netconf.mdsal.connector.ops.CopyConfig;
 import org.opendaylight.netconf.mdsal.connector.ops.DiscardChanges;
 import org.opendaylight.netconf.mdsal.connector.ops.EditConfig;
 import org.opendaylight.netconf.mdsal.connector.ops.Lock;
 import org.opendaylight.netconf.mdsal.connector.ops.RuntimeRpc;
 import org.opendaylight.netconf.mdsal.connector.ops.Unlock;
+import org.opendaylight.netconf.mdsal.connector.ops.Validate;
 import org.opendaylight.netconf.mdsal.connector.ops.get.Get;
 import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig;
 
 final class OperationProvider {
 
-    private final String netconfSessionIdForReporting;
-    private final CurrentSchemaContext schemaContext;
-    private final DOMDataBroker dataBroker;
-    private final DOMRpcService rpcService;
-    private final TransactionProvider transactionProvider;
+    private final Set<NetconfOperation> operations;
 
-    public OperationProvider(final String netconfSessionIdForReporting, final CurrentSchemaContext schemaContext,
-                             final DOMDataBroker dataBroker, final DOMRpcService rpcService) {
-        this.netconfSessionIdForReporting = netconfSessionIdForReporting;
-        this.schemaContext = schemaContext;
-        this.dataBroker = dataBroker;
-        this.rpcService = rpcService;
-        this.transactionProvider = new TransactionProvider(this.dataBroker, netconfSessionIdForReporting);
+    OperationProvider(final String netconfSessionIdForReporting, final CurrentSchemaContext schemaContext,
+                      final DOMDataBroker dataBroker, final DOMRpcService rpcService) {
+        final TransactionProvider transactionProvider = new TransactionProvider(dataBroker,
+            netconfSessionIdForReporting);
+
+        this.operations = ImmutableSet.of(
+            new Commit(netconfSessionIdForReporting, transactionProvider),
+            new DiscardChanges(netconfSessionIdForReporting, transactionProvider),
+            new EditConfig(netconfSessionIdForReporting, schemaContext, transactionProvider),
+            new CopyConfig(netconfSessionIdForReporting, schemaContext, transactionProvider),
+            new Get(netconfSessionIdForReporting, schemaContext, transactionProvider),
+            new GetConfig(netconfSessionIdForReporting, schemaContext, transactionProvider),
+            new Lock(netconfSessionIdForReporting),
+            new Unlock(netconfSessionIdForReporting),
+            new RuntimeRpc(netconfSessionIdForReporting, schemaContext, rpcService),
+            new Validate(netconfSessionIdForReporting, transactionProvider));
     }
 
     Set<NetconfOperation> getOperations() {
-        return Sets.newHashSet(
-                new Commit(netconfSessionIdForReporting, transactionProvider),
-                new DiscardChanges(netconfSessionIdForReporting, transactionProvider),
-                new EditConfig(netconfSessionIdForReporting, schemaContext, transactionProvider),
-                new Get(netconfSessionIdForReporting, schemaContext, transactionProvider),
-                new GetConfig(netconfSessionIdForReporting, schemaContext, transactionProvider),
-                new Lock(netconfSessionIdForReporting),
-                new Unlock(netconfSessionIdForReporting),
-                new RuntimeRpc(netconfSessionIdForReporting, schemaContext, rpcService)
-        );
+        return operations;
     }
-
 }