From 14365b73fbf5111e62ba91b9d7f80602db383a3c Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 21 Apr 2017 11:51:01 -0700 Subject: Remove CommandExecutorInput CommandExecutorInput.getTtl() was never called. Once that is removed, CommandExecutorInput only contains a single RuntimeContext object. This change removes CommandExecutorInput and replaces its uses with RuntimeContext directly. Change-Id: Ib8145b7f844d4b9ea294622e7cf4bdfc3aefcd0a Signed-off-by: Gary Wu --- .../org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java | 5 +---- .../java/org/openecomp/appc/requesthandler/TestRequestHandler.java | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'appc-dispatcher/appc-request-handler') diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java index b1fe117b7..07a430671 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/impl/RequestHandlerImpl.java @@ -29,7 +29,6 @@ import org.openecomp.appc.domainmodel.lcm.*; import org.openecomp.appc.exceptions.APPCException; import org.openecomp.appc.executor.CommandExecutor; import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.executor.objects.CommandExecutorInput; import org.openecomp.appc.executor.objects.LCMCommandStatus; import org.openecomp.appc.executor.objects.Params; import org.openecomp.appc.executor.objects.UniqueRequestIdentifier; @@ -368,9 +367,7 @@ public class RequestHandlerImpl implements RequestHandler { logger.debug("Calling command Executor with remaining TTL value: " + remainingTTL); } - RuntimeContext clonedContext = cloneContext(runtimeContext); - - CommandExecutorInput commandExecutorInput = new CommandExecutorInput(clonedContext, remainingTTL); + RuntimeContext commandExecutorInput = cloneContext(runtimeContext); try { commandExecutor.executeCommand(commandExecutorInput); diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java index e060775ce..e1c117fe3 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/test/java/org/openecomp/appc/requesthandler/TestRequestHandler.java @@ -30,7 +30,6 @@ import org.mockito.Mockito; import org.openecomp.appc.domainmodel.lcm.*; import org.openecomp.appc.executor.CommandExecutor; import org.openecomp.appc.executor.UnstableVNFException; -import org.openecomp.appc.executor.objects.CommandExecutorInput; import org.openecomp.appc.executor.objects.LCMCommandStatus; import org.openecomp.appc.lifecyclemanager.LifecycleManager; import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -- cgit 1.2.3-korg