Decompose RPC implementation classes

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/GroupDirectStatisticsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/SingleGetGroupStatistics.java
similarity index 76%
rename from openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/GroupDirectStatisticsService.java
rename to openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/SingleGetGroupStatistics.java
index fedf26f693b373ca05c88eac9096bbf7cdc21855..ced476cdb3a7da54be3161220633652313cd9c47 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/GroupDirectStatisticsService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/SingleGetGroupStatistics.java
@@ -12,7 +12,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.AbstractGroupDirectStatisticsService;
+import org.opendaylight.openflowplugin.impl.statistics.services.direct.AbstractGetGroupStatistics;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetGroupStatisticsInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetGroupStatisticsOutput;
@@ -24,24 +24,19 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.M
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
-public class GroupDirectStatisticsService extends AbstractGroupDirectStatisticsService<MultipartReply> {
-
-    public GroupDirectStatisticsService(final RequestContextStack requestContextStack,
-                                        final DeviceContext deviceContext,
-                                        final ConvertorExecutor convertorExecutor,
-                                        final MultipartWriterProvider statisticsWriterProvider) {
+public final class SingleGetGroupStatistics extends AbstractGetGroupStatistics<MultipartReply> {
+    public SingleGetGroupStatistics(final RequestContextStack requestContextStack, final DeviceContext deviceContext,
+            final ConvertorExecutor convertorExecutor, final MultipartWriterProvider statisticsWriterProvider) {
         super(requestContextStack, deviceContext, convertorExecutor, statisticsWriterProvider);
     }
 
     @Override
     protected GetGroupStatisticsOutput buildReply(final List<MultipartReply> input, final boolean success) {
-        final var map = input.stream()
-            .flatMap(multipartReply -> ((MultipartReplyGroupStats) multipartReply.getMultipartReplyBody())
-                .nonnullGroupStats().values().stream())
-            .collect(BindingMap.toOrderedMap());
-
         return new GetGroupStatisticsOutputBuilder()
-            .setGroupStats(map)
+            .setGroupStats(input.stream()
+                .flatMap(multipartReply -> ((MultipartReplyGroupStats) multipartReply.getMultipartReplyBody())
+                    .nonnullGroupStats().values().stream())
+                .collect(BindingMap.toOrderedMap()))
             .build();
     }
 
@@ -56,5 +51,4 @@ public class GroupDirectStatisticsService extends AbstractGroupDirectStatisticsS
                 .build())
             .build();
     }
-
 }