Update MRI projects for Aluminium

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
index c57964983de6bcc927f1f8cb6e979b41060f946d..d12461f374c087acb46ad621e19c101e1c18d7af 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/MeterDirectStatisticsService.java
@@ -14,7 +14,6 @@ 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.services.util.ServiceException;
 import org.opendaylight.openflowplugin.impl.statistics.services.direct.AbstractMeterDirectStatisticsService;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetMeterStatisticsInput;
@@ -40,22 +39,21 @@ public class MeterDirectStatisticsService extends AbstractMeterDirectStatisticsS
         return  new GetMeterStatisticsOutputBuilder()
             .setMeterStats(input
                 .stream()
-                .flatMap(multipartReply -> MultipartReplyMeterStats.class
-                    .cast(multipartReply.getMultipartReplyBody())
-                    .getMeterStats()
+                .flatMap(multipartReply -> ((MultipartReplyMeterStats) multipartReply.getMultipartReplyBody())
+                    .nonnullMeterStats().values()
                     .stream())
                 .collect(Collectors.toList()))
             .build();
     }
 
     @Override
-    protected OfHeader buildRequest(final Xid xid, final GetMeterStatisticsInput input) throws ServiceException {
+    protected OfHeader buildRequest(final Xid xid, final GetMeterStatisticsInput input) {
         return new MultipartRequestBuilder()
             .setXid(xid.getValue())
             .setVersion(getVersion())
             .setRequestMore(false)
             .setMultipartRequestBody(new MultipartRequestMeterStatsBuilder()
-                .setMeterId(input.getMeterId())
+                .setStatMeterId(input.getMeterId())
                 .build())
             .build();
     }