Simplify CommonService interface

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / statistics / services / dedicated / StatisticsGatheringService.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringService.java
index 0516d5d1495646df2de2fe785816e13e5fcaeb13..deea2e4a749cfcde3b8910684761ba520ebbc31d 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/services/dedicated/StatisticsGatheringService.java
@@ -8,87 +8,32 @@
 
 package org.opendaylight.openflowplugin.impl.statistics.services.dedicated;
 
-import com.google.common.base.Function;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.ListenableFuture;
 import java.util.List;
 import java.util.concurrent.Future;
-import org.opendaylight.openflowjava.protocol.api.connection.OutboundQueue;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
-import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContextStack;
 import org.opendaylight.openflowplugin.api.openflow.device.Xid;
-import org.opendaylight.openflowplugin.api.openflow.device.handlers.MultiMsgCollector;
 import org.opendaylight.openflowplugin.impl.common.MultipartRequestInputFactory;
-import org.opendaylight.openflowplugin.impl.services.CommonService;
-import org.opendaylight.openflowplugin.impl.services.RequestContextUtil;
+import org.opendaylight.openflowplugin.impl.services.AbstractMultipartService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReply;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
-import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Created by Martin Bobak <mbobak@cisco.com> on 4.4.2015.
  */
-public class StatisticsGatheringService extends CommonService {
-
-    private static final Logger LOG = LoggerFactory.getLogger(StatisticsGatheringService.class);
-
+public class StatisticsGatheringService extends AbstractMultipartService<MultipartType> {
     public StatisticsGatheringService(final RequestContextStack requestContextStack, final DeviceContext deviceContext) {
-
         super(requestContextStack, deviceContext);
     }
 
-
     public Future<RpcResult<List<MultipartReply>>> getStatisticsOfType(final MultipartType type) {
-        return handleServiceCall(new Function<RequestContext<List<MultipartReply>>, ListenableFuture<RpcResult<List<MultipartReply>>>>() {
-                                     @Override
-                                     public ListenableFuture<RpcResult<List<MultipartReply>>> apply(final RequestContext<List<MultipartReply>> requestContext) {
-                                         final Xid xid = requestContext.getXid();
-                                         final DeviceContext deviceContext = getDeviceContext();
-                                         final MultiMsgCollector multiMsgCollector = deviceContext.getMultiMsgCollector(requestContext);
-
-
-                                         final MultipartRequestInput multipartRequestInput = MultipartRequestInputFactory.
-                                                 makeMultipartRequestInput(xid.getValue(),
-                                                         getVersion(),
-                                                         type);
-                                         final OutboundQueue outboundQueue = deviceContext.getPrimaryConnectionContext().getOutboundQueueProvider();
-                                         outboundQueue.commitEntry(xid.getValue(), multipartRequestInput, new FutureCallback<OfHeader>() {
-                                             @Override
-                                             public void onSuccess(final OfHeader ofHeader) {
-                                                 if (ofHeader instanceof MultipartReply) {
-                                                     final MultipartReply multipartReply = (MultipartReply) ofHeader;
-                                                     multiMsgCollector.addMultipartMsg(multipartReply);
-                                                 } else {
-                                                     if (null != ofHeader) {
-                                                         LOG.info("Unexpected response type received {}.", ofHeader.getClass());
-                                                         final RpcResultBuilder<List<MultipartReply>> rpcResultBuilder = RpcResultBuilder.<List<MultipartReply>>failed().withError(RpcError.ErrorType.APPLICATION, String.format("Unexpected response type received %s.", ofHeader.getClass()));
-                                                         requestContext.setResult(rpcResultBuilder.build());
-                                                     } else {
-                                                         LOG.info("Ofheader was null.");
-                                                         multiMsgCollector.endCollecting();
-                                                     }
-                                                 }
-                                             }
-
-                                             @Override
-                                             public void onFailure(final Throwable throwable) {
-                                                 final RpcResultBuilder<List<MultipartReply>> rpcResultBuilder = RpcResultBuilder.<List<MultipartReply>>failed().withError(RpcError.ErrorType.APPLICATION, throwable.getMessage());
-                                                 requestContext.setResult(rpcResultBuilder.build());
-                                                 RequestContextUtil.closeRequstContext(requestContext);
-                                             }
-                                         });
-                                         return requestContext.getFuture();
-                                     }
-                                 }
-
-        );
+        return handleServiceCall(type);
     }
 
+    @Override
+    protected OfHeader buildRequest(final Xid xid, final MultipartType input) {
+        return MultipartRequestInputFactory.makeMultipartRequestInput(xid.getValue(), getVersion(), input);
+    }
 }