From 6f10c95ce58141778f4a31d1d68475808fa880a4 Mon Sep 17 00:00:00 2001
From: "Kuleshov, Elena" <evn@att.com>
Date: Wed, 19 Aug 2020 16:08:28 -0400
Subject: 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
---
 adapters/so-appc-orchestrator/pom.xml                          | 10 ++++++++++
 .../appc/orchestrator/client/ApplicationControllerClient.java  |  9 ++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'adapters/so-appc-orchestrator')

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
@@ -54,6 +54,16 @@
           </execution>
         </executions>
       </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>
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);
-- 
cgit 1.2.3-korg