Cleaned up appc-orchestrator

Removed unused files
Add building of original jar to so-appc-orchestrator
ApplicationControllerClient can now be sub-classed

Issue-ID: SO-3187
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I99dc4e53dbec1879a76ae184fe4b94afe1a673db

5 files changed, 14 insertions, 374 deletions

diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml
index 2229c1a60b..68814fc075 100644
--- a/adapters/so-appc-orchestrator/pom.xml
+++ b/adapters/so-appc-orchestrator/pom.xml
@@ -56,6 +56,16 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>original</id>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <executions>
           <execution>
diff --git a/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java b/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java
index 65e7b35506..99b83f1de3 100644
--- a/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java
+++ b/adapters/so-appc-orchestrator/src/main/java/org/onap/so/adapters/appc/orchestrator/client/ApplicationControllerClient.java
@@ -59,9 +59,9 @@ public class ApplicationControllerClient {
 
     private static final String CLIENT_NAME = "MSO";
 
-    private static final String API_VER = "2.00";
-    private static final String ORIGINATOR_ID = "MSO";
-    private static final int FLAGS_TTL = 65000;
+    protected static final String API_VER = "2.00";
+    protected static final String ORIGINATOR_ID = "MSO";
+    protected static final int FLAGS_TTL = 65000;
     private static Logger logger = LoggerFactory.getLogger(ApplicationControllerClient.class);
 
     @Autowired
@@ -216,13 +216,12 @@ public class ApplicationControllerClient {
         return requestObject;
     }
 
-    private CommonHeader buildCommonHeader(String requestId, String requestorId) {
+    protected CommonHeader buildCommonHeader(String requestId, String requestorId) {
         CommonHeader commonHeader = new CommonHeader();
         commonHeader.setApiVer(API_VER);
         commonHeader.setOriginatorId(ORIGINATOR_ID);
         commonHeader.setRequestId(requestId == null ? UUID.randomUUID().toString() : requestId);
         commonHeader.setSubRequestId(UUID.randomUUID().toString());
-        // commonHeader.setXOnapRequestorid(requestorId);
         Flags flags = new Flags();
         String flagsMode = "NORMAL";
         Mode mode = Mode.valueOf(flagsMode);
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerClientV2.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerClientV2.java
deleted file mode 100644
index dc5b6308bb..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerClientV2.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.appc;
-
-import org.onap.appc.client.lcm.api.AppcClientServiceFactoryProvider;
-import org.onap.appc.client.lcm.api.AppcLifeCycleManagerServiceFactory;
-import org.onap.appc.client.lcm.api.ApplicationContext;
-import org.onap.appc.client.lcm.api.LifeCycleManagerStateful;
-import org.onap.appc.client.lcm.exceptions.AppcClientException;
-import org.onap.appc.client.lcm.model.*;
-import org.onap.appc.client.lcm.model.Flags.Force;
-import org.onap.appc.client.lcm.model.Flags.Mode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.time.Instant;
-import java.util.Properties;
-import java.util.UUID;
-
-@Component
-@Deprecated
-public class ApplicationControllerClientV2 {
-
-    private static final String CLIENT_NAME = "MSO";
-    private static final String API_VER = "2.00";
-    private static final String ORIGINATOR_ID = "MSO";
-    private static final int FLAGS_TTL = 65000;
-    private static Logger logger = LoggerFactory.getLogger(ApplicationControllerClientV2.class);
-
-    // @Autowired
-    ApplicationControllerConfiguration applicationControllerConfiguration;
-
-    // @Autowired
-    private ApplicationControllerSupport appCSupport;
-
-    private static LifeCycleManagerStateful client;
-
-    // @PostConstruct
-    public void buildClient() {
-        client = this.getAppCClient("");
-    }
-
-    // @PostConstruct
-    public void buildClient(String controllerType) {
-        client = this.getAppCClient(controllerType);
-    }
-
-    public Status runCommand(Action action, ActionIdentifiers actionIdentifiers, Payload payload, String requestID)
-            throws ApplicationControllerOrchestratorException {
-        Object requestObject;
-        requestObject = createRequest(action, actionIdentifiers, payload, requestID);
-        appCSupport.logLCMMessage(requestObject);
-        Method lcmMethod = appCSupport.getAPIMethod(action.name(), client, false);
-        try {
-            Object response = lcmMethod.invoke(client, requestObject);
-            return appCSupport.getStatusFromGenericResponse(response);
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-            throw new RuntimeException(String.format("%s : %s", "Unable to invoke action", action.toString()), e);
-        }
-    }
-
-    public LifeCycleManagerStateful getAppCClient(String controllerType) {
-        if (client == null)
-            try {
-                client = AppcClientServiceFactoryProvider.getFactory(AppcLifeCycleManagerServiceFactory.class)
-                        .createLifeCycleManagerStateful(new ApplicationContext(), getLCMProperties(controllerType));
-            } catch (AppcClientException e) {
-                logger.error("Error in getting LifeCycleManagerStateful Client", e);
-            }
-        return client;
-    }
-
-    protected Properties getLCMProperties(String controllerType) {
-        Properties properties = new Properties();
-        properties.put("topic.read", applicationControllerConfiguration.getReadTopic());
-        properties.put("topic.read.timeout", applicationControllerConfiguration.getReadTimeout());
-        properties.put("client.response.timeout", applicationControllerConfiguration.getResponseTimeout());
-        properties.put("topic.write", applicationControllerConfiguration.getWrite());
-        properties.put("poolMembers", applicationControllerConfiguration.getPoolMembers());
-        properties.put("client.key", applicationControllerConfiguration.getClientKey());
-        properties.put("client.secret", applicationControllerConfiguration.getClientSecret());
-        properties.put("client.name", CLIENT_NAME);
-        properties.put("service", applicationControllerConfiguration.getService());
-        return properties;
-    }
-
-    public Object createRequest(Action action, ActionIdentifiers identifier, Payload payload, String requestId) {
-        Object requestObject = appCSupport.getInput(action.name());
-        try {
-            CommonHeader commonHeader = buildCommonHeader(requestId);
-            requestObject.getClass().getDeclaredMethod("setCommonHeader", CommonHeader.class).invoke(requestObject,
-                    commonHeader);
-            requestObject.getClass().getDeclaredMethod("setAction", Action.class).invoke(requestObject, action);
-            requestObject.getClass().getDeclaredMethod("setActionIdentifiers", ActionIdentifiers.class)
-                    .invoke(requestObject, identifier);
-            if (payload != null) {
-                requestObject.getClass().getDeclaredMethod("setPayload", Payload.class).invoke(requestObject, payload);
-            }
-        } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) {
-            logger.error("Error building Appc request", e);
-        }
-        return requestObject;
-    }
-
-    private CommonHeader buildCommonHeader(String requestId) {
-        CommonHeader commonHeader = new CommonHeader();
-        commonHeader.setApiVer(API_VER);
-        commonHeader.setOriginatorId(ORIGINATOR_ID);
-        commonHeader.setRequestId(requestId == null ? UUID.randomUUID().toString() : requestId);
-        commonHeader.setSubRequestId(requestId);
-        Flags flags = new Flags();
-        String flagsMode = "NORMAL";
-        Mode mode = Mode.valueOf(flagsMode);
-        flags.setMode(mode);
-        String flagsForce = "FALSE";
-        Force force = Force.valueOf(flagsForce);
-        flags.setForce(force);
-        flags.setTtl(FLAGS_TTL);
-        commonHeader.setFlags(flags);
-        Instant timestamp = Instant.now();
-        ZULU zulu = new ZULU(timestamp.toString());
-        commonHeader.setTimestamp(zulu);
-        return commonHeader;
-    }
-
-    public Flags createRequestFlags() {
-        Flags flags = new Flags();
-        flags.setTtl(6000);
-        return flags;
-    }
-}
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerConfiguration.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerConfiguration.java
deleted file mode 100644
index b39ba5f63f..0000000000
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/appc/ApplicationControllerConfiguration.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.appc;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class ApplicationControllerConfiguration {
-    @Value("${appc.client.topic.read.name}")
-    private String readTopic;
-
-    @Value("${appc.client.topic.read.timeout}")
-    private String readTimeout;
-
-    @Value("${appc.client.response.timeout}")
-    private String responseTimeout;
-
-    @Value("${appc.client.topic.write}")
-    private String write;
-
-    @Value("${appc.client.poolMembers}")
-    private String poolMembers;
-
-    @Value("${appc.client.key}")
-    private String clientKey;
-
-    @Value("${appc.client.secret}")
-    private String clientSecret;
-
-    @Value("${appc.client.service}")
-    private String service;
-
-    public String getClientKey() {
-        return clientKey;
-    }
-
-    public String getClientSecret() {
-        return clientSecret;
-    }
-
-    public String getPoolMembers() {
-        return poolMembers;
-    }
-
-    public String getReadTimeout() {
-        return readTimeout;
-    }
-
-    public String getResponseTimeout() {
-        return responseTimeout;
-    }
-
-    public String getReadTopic() {
-        return readTopic;
-    }
-
-    public String getService() {
-        return service;
-    }
-
-    public String getWrite() {
-        return write;
-    }
-}
-
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerClientV2Test.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerClientV2Test.java
deleted file mode 100644
index c242017838..0000000000
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/appc/ApplicationControllerClientV2Test.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.so.client.appc;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.appc.client.lcm.model.Action;
-import org.onap.appc.client.lcm.model.ActionIdentifiers;
-import org.onap.appc.client.lcm.model.CheckLockInput;
-import org.onap.appc.client.lcm.model.Status;
-import org.onap.so.BaseTest;
-import java.util.Properties;
-import java.util.UUID;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.when;
-
-@RunWith(MockitoJUnitRunner.class)
-public class ApplicationControllerClientV2Test {
-
-    @Mock
-    ApplicationControllerSupport applicationControllerSupport;
-
-    @Mock
-    ApplicationControllerConfiguration applicationControllerConfiguration;
-
-    @InjectMocks
-    ApplicationControllerClientV2 client;
-
-
-    @Before
-    public void setup() {
-        when(applicationControllerConfiguration.getReadTopic()).thenReturn("APPC-TEST-AMDOCS2");
-        when(applicationControllerConfiguration.getReadTimeout()).thenReturn("120000");
-        when(applicationControllerConfiguration.getResponseTimeout()).thenReturn("120000");
-        when(applicationControllerConfiguration.getWrite()).thenReturn("APPC-TEST-AMDOCS1-DEV3");
-        when(applicationControllerConfiguration.getService()).thenReturn("ueb");
-        when(applicationControllerConfiguration.getPoolMembers())
-                .thenReturn("localhost:3904,localhost:3904,localhost:3904");
-        when(applicationControllerConfiguration.getClientKey()).thenReturn("iaEMAfjsVsZnraBP");
-        when(applicationControllerConfiguration.getClientSecret()).thenReturn("wcivUjsjXzmGFBfxMmyJu9dz");
-        // client.buildClient();
-    }
-
-    @BeforeClass
-    public static void beforeClass() {
-        System.setProperty("mso.config.path", "src/test/resources");
-    }
-
-    @Ignore
-    @Test
-    public void createRequest_CheckLock_RequestBuilt() {
-        ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
-        actionIdentifiers.setVnfId("vnfId");
-        // when(applicationControllerSupport.getInput(eq(Action.CheckLock.name()))).thenReturn(new CheckLockInput());
-        CheckLockInput checkLockInput =
-                (CheckLockInput) client.createRequest(Action.CheckLock, actionIdentifiers, null, "requestId");
-        assertEquals(checkLockInput.getAction().name(), "CheckLock");
-    }
-
-    @Ignore
-    @Test
-    public void runCommand_liveAppc() {
-        ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
-        // actionIdentifiers.setVnfId("ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f");
-        actionIdentifiers.setVnfId("2d2bf10e-81a5-");
-        Status status;
-        // when(applicationControllerSupport.getInput(eq(Action.Lock.name()))).thenReturn(new LockInput());
-        // when(applicationControllerSupport.getAPIMethod(anyString(),any(),anyBoolean())).thenCallRealMethod();
-        try {
-            status = client.runCommand(Action.Lock, actionIdentifiers, null, UUID.randomUUID().toString());
-        } catch (ApplicationControllerOrchestratorException e) {
-            status = new Status();
-            status.setCode(e.getAppcCode());
-            status.setMessage(e.getMessage());
-        }
-        assertEquals("Status of run command is correct", status.getCode(), 306);
-    }
-
-    @Ignore
-    @Test
-    public void runCommand_CheckLock_RequestBuilt() {
-        ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
-        actionIdentifiers.setVnfId("fusion-vpp-vnf-001");
-        Status status;
-        try {
-            status = client.runCommand(Action.Unlock, actionIdentifiers, null, "requestId");
-        } catch (ApplicationControllerOrchestratorException e) {
-            status = new Status();
-            status.setCode(e.getAppcCode());
-            status.setMessage(e.getMessage());
-        }
-        assertEquals("Status of run command is correct", status.getCode(), 309);
-    }
-
-    @Ignore
-    @Test
-    public void test_getLCMPropertiesHelper() {
-        Properties properties = client.getLCMProperties("");
-        assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3");
-        assertEquals(properties.get("topic.read.timeout"), "120000");
-        assertEquals(properties.get("client.response.timeout"), "120000");
-        assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2");
-        assertEquals(properties.get("poolMembers"), "localhost:3904,localhost:3904,localhost:3904");
-        assertEquals(properties.get("client.key"), "iaEMAfjsVsZnraBP");
-        assertEquals(properties.get("client.secret"), "wcivUjsjXzmGFBfxMmyJu9dz");
-    }
-
-}