Remove commented methods/fields in APPC

Taking a stab at removing numerous
commented out methods and fields.
Almost all of what is removed is
commented code with no explanation.

Change-Id: I61cb1d7100ae6c75f6d42f500ade0504c97b760c
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>

6 files changed, 0 insertions, 59 deletions

diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
index e5ac79cfa..2f9d2c970 100644
--- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
+++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/src/main/java/org/openecomp/appc/executor/impl/CommandTaskFactory.java
@@ -32,10 +32,6 @@ import org.openecomp.appc.workflow.WorkFlowManager;
 
 
 public class CommandTaskFactory {
-
-//    private LCMCommandTask lcmCommandTask;
-//    private LCMReadonlyCommandTask LCMReadonlyCommandTask;
-
     private RequestHandler requestHandler;
     private WorkFlowManager workflowManager;
     private LifecycleManager lifecyclemanager;
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
index 294d948a0..520af4fa4 100644
--- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/openecomp/appc/dao/util/DBUtils.java
@@ -63,21 +63,4 @@ public class DBUtils {
 		return clearFlag;
 
 	}
-
-	/*public static DbLibService getDBLibService(){
-		DbLibService dblibSvc = null;
-		BundleContext bctx = FrameworkUtil.getBundle(SvcLogicDblibStore.class).getBundleContext();
-		ServiceReference sref = bctx.getServiceReference("org.openecomp.sdnc.sli.resource.dblib.DBResourceManager");
-		if (sref == null) {
-//			LOG.warn("Could not find service reference for DBLIB service (org.openecomp.sdnc.sli.resource.dblib.DBResourceManager)");
-		}
-		else {
-			dblibSvc = (DbLibService)bctx.getService(sref);
-			if (dblibSvc == null)
-			{
-//				LOG.warn("Could not find service reference for DBLIB service (org.openecomp.sdnc.sli.resource.dblib.DBResourceManager)");
-			}
-		}
-		return dblibSvc;
-	}*/
 }
diff --git a/appc-dispatcher/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/helper/MetadataReader.java b/appc-dispatcher/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/helper/MetadataReader.java
index 516bb7e4b..82c497d58 100644
--- a/appc-dispatcher/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/helper/MetadataReader.java
+++ b/appc-dispatcher/appc-lifecycle-management/appc-lifecycle-management-core/src/main/java/org/openecomp/appc/lifecyclemanager/helper/MetadataReader.java
@@ -53,7 +53,6 @@ public class MetadataReader {
         State STOPPING = new State(VNFStates.Stopping.toString());
         State STOPPED = new State(VNFStates.Stopped.toString());
 
-//        State PRE_UPGRADE_TESTING = new State(VNFStates.Pre_Upgrade_Testing.toString());
         State BACKING_UP = new State(VNFStates.Backing_Up.toString());
         State SNAPSHOTTING = new State(VNFStates.Snapshotting.toString());
         State SOFTWARE_UPLOADING = new State(VNFStates.Software_Uploading.toString());
@@ -106,7 +105,6 @@ public class MetadataReader {
         builder = builder.addState(TERMINATING);
         builder = builder.addState(STOPPING);
         builder = builder.addState(STOPPED);
-//        builder = builder.addState(PRE_UPGRADE_TESTING);
         builder = builder.addState(BACKING_UP);
         builder = builder.addState(SNAPSHOTTING);
         builder = builder.addState(SOFTWARE_UPLOADING);
@@ -306,9 +304,6 @@ public class MetadataReader {
         builder = builder.addTransition(STOPPING,SUCCESS,STOPPED);
         builder = builder.addTransition(STOPPING,FAILURE,ERROR);
 
-//        builder = builder.addTransition(PRE_UPGRADE_TESTING,SUCCESS,TESTED);
-//        builder = builder.addTransition(PRE_UPGRADE_TESTING,FAILURE,ERROR);
-
         builder = builder.addTransition(BACKING_UP,SUCCESS,RUNNING);
         builder = builder.addTransition(BACKING_UP,FAILURE,ERROR);
 
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterDmaapImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterDmaapImpl.java
index 9f74ad438..21c21db93 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterDmaapImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/messageadapter/impl/MessageAdapterDmaapImpl.java
@@ -48,8 +48,6 @@ public class MessageAdapterDmaapImpl implements MessageAdapter{
     private String apiKey;
     private String apiSecret;
 
-    private Integer READ_TIMEOUT;
-
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(MessageAdapterDmaapImpl.class);
 
     /**
@@ -75,15 +73,9 @@ public class MessageAdapterDmaapImpl implements MessageAdapter{
         }
         pool = new HashSet<>();
         if (props != null) {
-            // readTopic = props.getProperty("dmaap.topic.read");
             writeTopic = props.getProperty("dmaap.topic.write");
             apiKey = props.getProperty("dmaap.client.key");
             apiSecret = props.getProperty("dmaap.client.secret");
-            /*          clientName = props.getProperty("dmaap.client.name", "APP-C");
-            clientId = props.getProperty("dmaap.client.name.id", "0");
-            filter_json = props.getProperty("dmaap.topic.read.filter");
-             */
-            //  READ_TIMEOUT = Integer.valueOf(props.getProperty("dmaap.topic.read.timeout", String.valueOf(READ_TIMEOUT)));
             String hostnames = props.getProperty("dmaap.poolMembers");
             if (hostnames != null && !hostnames.isEmpty()) {
                 for (String name : hostnames.split(",")) {
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java
index e72eb89a7..3513516ae 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/openecomp/appc/requesthandler/conv/Converter.java
@@ -90,7 +90,6 @@ public class Converter {
         Action action = Action.valueOf(vnfOperation.name());
         CommonHeader commonHeader = convAsyncResponseTorev160108CommonHeader(response);
         Status status = convAsyncResponseTorev160108Status(response);
-//        Payload payload = convAsyncResponseTorev160108Payload(inObj);
         switch (action){
             case Rollback:
                 outObj = new RollbackOutputBuilder();
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 0273c7957..d63cb8bb8 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
@@ -670,8 +670,6 @@ public class RequestHandlerImpl implements RequestHandler {
         if (logger.isTraceEnabled()) {
             logger.trace("Entering to postMessageToDMaaP with AsyncResponse = " + ObjectUtils.toString(responseContext));
         }
-        /*boolean updated = updateAsyncResponseStatus(responseContext, isTTLEnd, aaiUpdateSuccess);
-         */
         boolean callbackResponse = messageAdapter.post(operation, rpcName, responseContext);
         if (!callbackResponse) {
             logger.error("DMaaP posting status: " + callbackResponse, "dmaapMessage: " + responseContext);
@@ -680,28 +678,6 @@ public class RequestHandlerImpl implements RequestHandler {
             logger.trace("Exiting from postMessageToDMaaP with (callbackResponse = " + ObjectUtils.toString(callbackResponse) + ")");
     }
 
-    //returns true if asyncResponse was modified
-    /*    private boolean updateAsyncResponseStatus(ResponseContext asyncResponse, boolean isTTLEnd, boolean aaiUpdateSuccess) {
-        boolean updated = false;
-        if (logger.isTraceEnabled())
-            logger.trace("Entering to updateAsyncResponseStatus with AsyncResponse = "+ObjectUtils.toString(asyncResponse)+ ", isTTLEnd = "+ ObjectUtils.toString(isTTLEnd)+ ", aaiUpdateSuccess = "+ ObjectUtils.toString(aaiUpdateSuccess));
-        if(!aaiUpdateSuccess){
-                if (asyncResponse.getStatus().getCode() == 0 || asyncResponse.getStatus().getCode() == LCMCommandStatus.SUCCESS.getResponseCode()) {
-                    asyncResponse.getStatus().setCode(LCMCommandStatus.UPDATE_AAI_FAILURE.getResponseCode());
-                    asyncResponse.getStatus().setMessage(LCMCommandStatus.UPDATE_AAI_FAILURE.getResponseMessage());
-                updated = true;
-            }
-        }else if(isTTLEnd){
-                asyncResponse.getStatus().setCode(LCMCommandStatus.EXPIRED_REQUEST_FAILURE.getResponseCode());
-                asyncResponse.getStatus().setMessage(LCMCommandStatus.EXPIRED_REQUEST_FAILURE.getResponseMessage());
-            updated = true;
-        }
-        if (logger.isTraceEnabled())
-            logger.trace("Exiting from updateAsyncResponseStatus with (asyncResponse = "+ ObjectUtils.toString(asyncResponse)+")");
-        return updated;
-    }*/
-
-
     /**
      * This method perform following operations required if TTL ends when request still waiting in execution queue .
      * It posts asynchronous response to message bus (DMaaP).