From 6a7b6c092c282884cf263315a4a4802242dcb2fc Mon Sep 17 00:00:00 2001
From: "Dunietz, Irwin" <irwin.dunietz@att.com>
Date: Sun, 3 Mar 2019 12:20:53 -0500
Subject: Update appc-dispatcher for >1 ansible servers

Change Transaction record update logic to handle null instance entry.

Issue-ID: APPC-1516

Change-Id: Ia87e08fbb61d4d0be38802e3e81b45773b1d9498
Signed-off-by: Dunietz, Irwin <irwin.dunietz@att.com>
---
 .../appc-request-handler-api/pom.xml                    | 12 ++++++------
 .../appc-request-handler-core/pom.xml                   | 17 +++++++++++------
 .../requesthandler/impl/AbstractRequestHandlerImpl.java | 10 +++++-----
 3 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'appc-dispatcher/appc-request-handler')

diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
index c13e6c47c..15229dd2e 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml
@@ -24,12 +24,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.onap.appc.parent</groupId>
-		<artifactId>binding-parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
-                <relativePath />
-	</parent>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
 
     <artifactId>appc-request-handler-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
index 87aad831c..f31ef0fd6 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml
@@ -25,12 +25,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.onap.appc.parent</groupId>
-		<artifactId>binding-parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
-                <relativePath />
-	</parent>
+    <parent>
+        <groupId>org.onap.appc.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <relativePath />
+    </parent>
 
     <artifactId>appc-request-handler-core</artifactId>
     <packaging>bundle</packaging>
@@ -143,6 +143,11 @@
             <version>${equinox.osgi.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestHandlerImpl.java b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestHandlerImpl.java
index 73c98e939..aa9b42a5a 100644
--- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestHandlerImpl.java
+++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/src/main/java/org/onap/appc/requesthandler/impl/AbstractRequestHandlerImpl.java
@@ -2,22 +2,22 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
  * 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=========================================================
  */
 
@@ -233,7 +233,7 @@ public abstract class AbstractRequestHandlerImpl implements RequestHandler {
                     dateToStringConverterMillis(endTime));
         }
         try {
-            transactionRecorder.update(record.getTransactionId(), updateColumns);
+            transactionRecorder.update(record.getTransactionId(), record.getRequestId(), updateColumns);
         } catch (APPCException e) {
             logger.error("Error accessing database", e);
         }
-- 
cgit 1.2.3-korg