Decompose RPC implementation classes

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/FlowDirectStatisticsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/SingleGetFlowStatistics.java
similarity index 78%
rename from openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/FlowDirectStatisticsService.java
rename to openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/SingleGetFlowStatistics.java
index 1b12b0b54b9205f3258173423053f47acfd76ec4..e5b5ad3f87632c094b7685b9c2f90b6f98a25e98 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/FlowDirectStatisticsService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/SingleGetFlowStatistics.java
@@ -14,7 +14,7 @@ import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 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.statistics.services.direct.AbstractFlowDirectStatisticsService;
+import org.opendaylight.openflowplugin.impl.statistics.services.direct.AbstractGetFlowStatistics;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetFlowStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetFlowStatisticsOutput;
@@ -28,29 +28,22 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.M
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartRequestBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 
-public class FlowDirectStatisticsService extends AbstractFlowDirectStatisticsService<MultipartReply> {
-
-    public FlowDirectStatisticsService(final RequestContextStack requestContextStack,
-                                       final DeviceContext deviceContext,
-                                       final ConvertorExecutor convertorExecutor,
-                                       final MultipartWriterProvider statisticsWriterProvider) {
+public final class SingleGetFlowStatistics extends AbstractGetFlowStatistics<MultipartReply> {
+    public SingleGetFlowStatistics(final RequestContextStack requestContextStack, final DeviceContext deviceContext,
+            final ConvertorExecutor convertorExecutor, final MultipartWriterProvider statisticsWriterProvider) {
         super(requestContextStack, deviceContext, convertorExecutor, statisticsWriterProvider);
     }
 
     @Override
     protected GetFlowStatisticsOutput buildReply(final List<MultipartReply> input, final boolean success) {
         return new GetFlowStatisticsOutputBuilder()
-            .setFlowAndStatisticsMapList(input
-                .stream()
+            .setFlowAndStatisticsMapList(input.stream()
                 .flatMap(multipartReply -> ((MultipartReplyFlowStats) multipartReply.getMultipartReplyBody())
                     .nonnullFlowAndStatisticsMapList()
                     .stream())
-                .map(flowAndStatisticsMapList -> {
-                    final FlowId flowId = new FlowId(generateFlowId(flowAndStatisticsMapList));
-                    return new FlowAndStatisticsMapListBuilder(flowAndStatisticsMapList)
-                        .setFlowId(flowId)
-                        .build();
-                })
+                .map(flowAndStatisticsMapList -> new FlowAndStatisticsMapListBuilder(flowAndStatisticsMapList)
+                    .setFlowId(new FlowId(generateFlowId(flowAndStatisticsMapList)))
+                    .build())
                 .collect(Collectors.toList()))
             .build();
     }
@@ -66,5 +59,4 @@ public class FlowDirectStatisticsService extends AbstractFlowDirectStatisticsSer
                 .build())
             .build();
     }
-
 }