Clean up MdsalNetconfOperationService

This class is an implementation detail, do not leak it outside of the
package. Also eliminate OperationProvider, as it is an useless
indirection.

Change-Id: I0fce710493cfdf9aafea52b645dba3683043fbdf
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java
index 1b29d9fe579781e1599aa01331436d9f0ded6be4..3778c25e6044f98124875e8a81e148cf4ce0070a 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java
@@ -7,31 +7,49 @@
  */
 package org.opendaylight.netconf.mdsal.connector;
 
-import java.util.Set;
+import com.google.common.collect.ImmutableSet;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
-
-public class MdsalNetconfOperationService implements NetconfOperationService {
-
-    private final OperationProvider operationProvider;
-
-    public MdsalNetconfOperationService(final CurrentSchemaContext schemaContext,
-                                        final String netconfSessionIdForReporting,
-                                        final DOMDataBroker dataBroker, final DOMRpcService rpcService) {
-        this.operationProvider = new OperationProvider(netconfSessionIdForReporting, schemaContext, dataBroker,
-                rpcService);
+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 MdsalNetconfOperationService implements NetconfOperationService {
+    private final ImmutableSet<NetconfOperation> operations;
+    private final TransactionProvider transactionProvider;
+
+    MdsalNetconfOperationService(final CurrentSchemaContext schemaContext, final String netconfSessionIdForReporting,
+            final DOMDataBroker dataBroker, final DOMRpcService rpcService) {
+        transactionProvider = new TransactionProvider(dataBroker, netconfSessionIdForReporting);
+        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));
     }
 
     @Override
-    public void close() {
-
+    public ImmutableSet<NetconfOperation> getNetconfOperations() {
+        return operations;
     }
 
     @Override
-    public Set<NetconfOperation> getNetconfOperations() {
-        return operationProvider.getOperations();
+    public void close() {
+        // No-op
     }
-
 }

diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java
index a06588fa5f37d96e22f6bc85a4c09809fee98e60..9f726cd8feac9489733d6d838ea092507548556f 100644 (file)
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java
+++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java
@@ -26,6 +26,7 @@ import org.opendaylight.netconf.api.capability.BasicCapability;
 import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.capability.YangModuleCapability;
 import org.opendaylight.netconf.api.monitoring.CapabilityListener;
+import org.opendaylight.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory;
 import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener;
 import org.opendaylight.yangtools.concepts.Registration;
@@ -81,7 +82,7 @@ public final class MdsalNetconfOperationServiceFactory implements NetconfOperati
     }
 
     @Override
-    public MdsalNetconfOperationService createService(final String netconfSessionIdForReporting) {
+    public NetconfOperationService createService(final String netconfSessionIdForReporting) {
         return new MdsalNetconfOperationService(currentSchemaContext, netconfSessionIdForReporting, dataBroker,
                 rpcService);
     }

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
deleted file mode 100644 (file)
index eb5b5d2..0000000
--- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/OperationProvider.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2013 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,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.netconf.mdsal.connector;
-
-import com.google.common.collect.ImmutableSet;
-import java.util.Set;
-import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.mdsal.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 Set<NetconfOperation> operations;
-
-    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 operations;
-    }
-}