Decompose RPC implementation classes

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / statistics / services / direct / multilayer / MultiGetMeterStatistics.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MeterDirectStatisticsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MultiGetMeterStatistics.java
similarity index 79%
rename from openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MeterDirectStatisticsService.java
rename to openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MultiGetMeterStatistics.java
index 0355afc5086ab03f29ba411e74e403ffbe9572d7..9b0f037db2660eddd8b389833d40ff1e174d702f 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MeterDirectStatisticsService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/multilayer/MultiGetMeterStatistics.java
@@ -15,7 +15,7 @@ import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
 import org.opendaylight.openflowplugin.api.openflow.device.Xid;
 import org.opendaylight.openflowplugin.impl.datastore.MultipartWriterProvider;
 import org.opendaylight.openflowplugin.impl.services.util.RequestInputUtils;
-import org.opendaylight.openflowplugin.impl.statistics.services.direct.AbstractMeterDirectStatisticsService;
+import org.opendaylight.openflowplugin.impl.statistics.services.direct.AbstractGetMeterStatistics;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatisticsInput;
@@ -27,19 +27,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeterCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter._case.MultipartReplyMeter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestMeterCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter._case.MultipartRequestMeterBuilder;
 import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
-public class MeterDirectStatisticsService extends AbstractMeterDirectStatisticsService<MultipartReply> {
-
+public final class MultiGetMeterStatistics extends AbstractGetMeterStatistics<MultipartReply> {
     private final VersionConvertorData data;
 
-    public MeterDirectStatisticsService(final RequestContextStack requestContextStack,
-                                        final DeviceContext deviceContext,
-                                        final ConvertorExecutor convertorExecutor,
-                                        final MultipartWriterProvider statisticsWriterProvider) {
+    public MultiGetMeterStatistics(final RequestContextStack requestContextStack, final DeviceContext deviceContext,
+            final ConvertorExecutor convertorExecutor, final MultipartWriterProvider statisticsWriterProvider) {
         super(requestContextStack, deviceContext, convertorExecutor, statisticsWriterProvider);
         data = new VersionConvertorData(getVersion());
     }
@@ -49,9 +45,9 @@ public class MeterDirectStatisticsService extends AbstractMeterDirectStatisticsS
         final var meterStats = BindingMap.<MeterStatsKey, MeterStats>orderedBuilder();
 
         if (success) {
-            for (final MultipartReply mpReply : input) {
-                final MultipartReplyMeterCase caseBody = (MultipartReplyMeterCase) mpReply.getMultipartReplyBody();
-                final MultipartReplyMeter replyBody = caseBody.getMultipartReplyMeter();
+            for (var mpReply : input) {
+                final var caseBody = (MultipartReplyMeterCase) mpReply.getMultipartReplyBody();
+                final var replyBody = caseBody.getMultipartReplyMeter();
                 final Optional<List<MeterStats>> meterStatsList =
                         getConvertorExecutor().convert(replyBody.getMeterStats(), data);
                 meterStatsList.ifPresent(meterStats::addAll);
@@ -65,7 +61,7 @@ public class MeterDirectStatisticsService extends AbstractMeterDirectStatisticsS
 
     @Override
     protected OfHeader buildRequest(final Xid xid, final GetMeterStatisticsInput input) {
-        final MultipartRequestMeterBuilder mprMeterBuild = new MultipartRequestMeterBuilder();
+        final var mprMeterBuild = new MultipartRequestMeterBuilder();
 
         if (input.getMeterId() != null) {
             mprMeterBuild.setMeterId(new MeterId(input.getMeterId().getValue()));