Decompose RPC implementation classes

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / services / sal / SendExperimenterImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SendExperimenterImpl.java
similarity index 81%
rename from openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImpl.java
rename to openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SendExperimenterImpl.java
index ba18b4b5107e4579badf36ba118f43f887ad2033..04ac1e6b9e62eb78b62f85cb3a5203ee1871ecb1 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SalExperimenterMessageServiceImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/sal/SendExperimenterImpl.java
@@ -22,7 +22,7 @@ import org.opendaylight.openflowplugin.extension.api.exception.ConversionExcepti
 import org.opendaylight.openflowplugin.extension.api.exception.ConverterNotFoundException;
 import org.opendaylight.openflowplugin.impl.services.AbstractSimpleService;
 import org.opendaylight.openflowplugin.impl.services.util.ServiceException;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.experimenter.message.service.rev151020.SalExperimenterMessageService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.experimenter.message.service.rev151020.SendExperimenter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.experimenter.message.service.rev151020.SendExperimenterInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.experimenter.message.service.rev151020.SendExperimenterOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.ExperimenterInputBuilder;
@@ -33,20 +33,24 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SalExperimenterMessageServiceImpl extends AbstractSimpleService<SendExperimenterInput,
-        SendExperimenterOutput> implements SalExperimenterMessageService {
-    private static final Logger LOG = LoggerFactory.getLogger(SalExperimenterMessageServiceImpl.class);
+public final class SendExperimenterImpl extends AbstractSimpleService<SendExperimenterInput, SendExperimenterOutput>
+        implements SendExperimenter {
+    private static final Logger LOG = LoggerFactory.getLogger(SendExperimenterImpl.class);
     private final ExtensionConverterProvider extensionConverterProvider;
 
-    public SalExperimenterMessageServiceImpl(final RequestContextStack requestContextStack,
-                                             final DeviceContext deviceContext,
-                                             final ExtensionConverterProvider extensionConverterProvider) {
+    public SendExperimenterImpl(final RequestContextStack requestContextStack, final DeviceContext deviceContext,
+            final ExtensionConverterProvider extensionConverterProvider) {
         super(requestContextStack, deviceContext, SendExperimenterOutput.class);
         this.extensionConverterProvider = extensionConverterProvider;
     }
 
     @Override
-    protected OfHeader buildRequest(Xid xid, SendExperimenterInput input) throws ServiceException {
+    public ListenableFuture<RpcResult<SendExperimenterOutput>> invoke(final SendExperimenterInput input) {
+        return handleServiceCall(input);
+    }
+
+    @Override
+    protected OfHeader buildRequest(final Xid xid, final SendExperimenterInput input) throws ServiceException {
         final TypeVersionKey key =
                 new TypeVersionKey(input.getExperimenterMessageOfChoice().implementedInterface(), getVersion());
         final ConverterMessageToOFJava<ExperimenterMessageOfChoice, ExperimenterDataOfChoice,
@@ -59,7 +63,7 @@ public class SalExperimenterMessageServiceImpl extends AbstractSimpleService<Sen
         }
         final ExperimenterInputBuilder experimenterInputBld;
         try {
-            final ExtensionConvertorData data = new ExtensionConvertorData(OFConstants.OFP_VERSION_1_3);
+            final var data = new ExtensionConvertorData(OFConstants.OFP_VERSION_1_3);
             data.setXid(xid.getValue());
             data.setDatapathId(extractDatapathId(input.getNode()));
             experimenterInputBld = new ExperimenterInputBuilder()
@@ -76,9 +80,4 @@ public class SalExperimenterMessageServiceImpl extends AbstractSimpleService<Sen
 
         return experimenterInputBld.build();
     }
-
-    @Override
-    public ListenableFuture<RpcResult<SendExperimenterOutput>> sendExperimenter(SendExperimenterInput input) {
-        return handleServiceCall(input);
-    }
 }