X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pce%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fpce%2Fimpl%2FPceServiceRPCImpl.java;h=49f8e71b9d29ff7ca5613774315f34f931b90c2d;hb=b1b3bafd549bb501937cea5c976d5344608b6ed3;hp=a299875e80f0d3b6f1d7337ff6c28e55943e1be6;hpb=bfa3306fd7278eff3d5a8706525532f35476d09f;p=transportpce.git

diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java
index a299875e8..49f8e71b9 100644
--- a/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java
+++ b/pce/src/main/java/org/opendaylight/transportpce/pce/impl/PceServiceRPCImpl.java
@@ -8,24 +8,13 @@
 package org.opendaylight.transportpce.pce.impl;
 
 import com.google.common.collect.ImmutableClassToInstanceMap;
-import com.google.common.util.concurrent.ListenableFuture;
-import java.util.concurrent.ExecutionException;
 import org.opendaylight.mdsal.binding.api.RpcProviderService;
 import org.opendaylight.transportpce.pce.service.PathComputationService;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.CancelResourceReserve;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.CancelResourceReserveInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.CancelResourceReserveOutput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRequestOutput;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRerouteRequest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRerouteRequestInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.PathComputationRerouteRequestOutput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev240205.TransportpcePceService;
 import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.binding.Rpc;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Deactivate;
@@ -37,23 +26,18 @@ import org.slf4j.LoggerFactory;
  * PceService implementation.
  */
 @Component(immediate = true)
-public class PceServiceRPCImpl implements TransportpcePceService {
-
+public class PceServiceRPCImpl {
     private static final Logger LOG = LoggerFactory.getLogger(PceServiceRPCImpl.class);
-
-    private final PathComputationService pathComputationService;
     private Registration reg;
 
     @Activate
     public PceServiceRPCImpl(@Reference RpcProviderService rpcProviderService,
             @Reference PathComputationService pathComputationService) {
-        this.pathComputationService = pathComputationService;
         this.reg = rpcProviderService.registerRpcImplementations(ImmutableClassToInstanceMap.<Rpc<?, ?>>builder()
-            .put(CancelResourceReserve.class, this::cancelResourceReserve)
-            .put(PathComputationRequest.class, this::pathComputationRequest)
-            .put(PathComputationRerouteRequest.class, this::pathComputationRerouteRequest)
+            .put(CancelResourceReserve.class, new CancelResourceReserveImpl(pathComputationService))
+            .put(PathComputationRequest.class, new PathComputationRequestImpl(pathComputationService))
+            .put(PathComputationRerouteRequest.class, new PathComputationRerouteRequestImpl(pathComputationService))
             .build());
-
         LOG.info("PceServiceRPCImpl instantiated");
     }
 
@@ -63,53 +47,6 @@ public class PceServiceRPCImpl implements TransportpcePceService {
         LOG.info("PceServiceRPCImpl Closed");
     }
 
-    @Override
-    public final ListenableFuture<RpcResult<CancelResourceReserveOutput>>
-            cancelResourceReserve(CancelResourceReserveInput input) {
-        LOG.info("RPC cancelResourceReserve request received");
-        try {
-            return RpcResultBuilder
-                    .success(
-                            this.pathComputationService.cancelResourceReserve(input).get())
-                    .buildFuture();
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("RPC cancelResourceReserve failed !", e);
-            return RpcResultBuilder.success((CancelResourceReserveOutput) null).buildFuture();
-        }
-    }
-
-    @Override
-    public final ListenableFuture<RpcResult<PathComputationRequestOutput>>
-            pathComputationRequest(PathComputationRequestInput input) {
-        LOG.info("RPC path computation request received");
-        LOG.debug("input parameters are : input = {}", input);
-        try {
-            return RpcResultBuilder
-                    .success(
-                            this.pathComputationService.pathComputationRequest(input).get())
-                    .buildFuture();
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("RPC path computation request failed !", e);
-        }
-        return RpcResultBuilder.success((PathComputationRequestOutput) null).buildFuture();
-    }
-
-    @Override
-    public final ListenableFuture<RpcResult<PathComputationRerouteRequestOutput>> pathComputationRerouteRequest(
-            PathComputationRerouteRequestInput input) {
-        LOG.info("RPC path computation reroute request received");
-        LOG.debug("input parameters are : input = {}", input);
-        try {
-            return RpcResultBuilder
-                    .success(
-                            this.pathComputationService.pathComputationRerouteRequest(input).get())
-                    .buildFuture();
-        } catch (InterruptedException | ExecutionException e) {
-            LOG.error("RPC path computation request failed !", e);
-            return RpcResultBuilder.success((PathComputationRerouteRequestOutput) null).buildFuture();
-        }
-    }
-
     public Registration getRegisteredRpc() {
         return reg;
     }