Fix the AAI Ctx Builder start up issue

Issue-ID: LOG-661
Change-Id: I3dd6739dba45bfdf75ada98640b907dfe56f8ff5
Signed-off-by: Jennie Jia <Jennie.Jia@amdocs.com>

3 files changed, 375 insertions, 368 deletions

diff --git a/pom.xml b/pom.xml
index f06a3e1..e41084a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,361 +1,363 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
-
-  <groupId>org.onap.logging-analytics.pomba</groupId>
-  <artifactId>pomba-aai-context-builder</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.onap.oparent</groupId>
-    <artifactId>oparent</artifactId>
-    <version>1.2.0</version>
-    <relativePath/>
-  </parent>
-
-  <properties>
-    <aai.rest.client.version>1.2.1</aai.rest.client.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <logback.version>1.2.3</logback.version>
-    <swagger.directory>${project.build.directory}/generated-resources/swagger</swagger.directory>
-    <!--docker -->
-    <docker.tag>${project.version}-${timestamp}</docker.tag>
-    <docker.latest.tag>${project.version}-latest</docker.latest.tag>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-dependencies</artifactId>
-        <version>1.5.12.RELEASE</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-security</artifactId>
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-jersey</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.logging-analytics.pomba</groupId>
-      <artifactId>pomba-audit-common</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
-    <!-- logging dependencies -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.logging-analytics</groupId>
-      <artifactId>logging-slf4j</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.att.eelf</groupId>
-          <artifactId>eelf-core</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.7</version>
-    </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.jayway.jsonpath</groupId>
-      <artifactId>json-path</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.onap.aai</groupId>
-      <artifactId>rest-client</artifactId>
-      <version>${aai.rest.client.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.logging.log4j</groupId>
-          <artifactId>log4j-slf4j-impl</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-core</artifactId>
-      <version>1.5.9</version>
-    </dependency>
-    <dependency>
-      <groupId>io.swagger</groupId>
-      <artifactId>swagger-annotations</artifactId>
-      <version>1.5.9</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
-            <version>2.18.0</version>
-            <scope>test</scope>
-        </dependency>
-  </dependencies>
-
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>repackage</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-    <resources>
-      <resource>
-        <targetPath>config</targetPath>
-        <directory>config</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>docker</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <version>0.19.1</version>
-            <configuration>
-              <verbose>true</verbose>
-              <apiVersion>1.23</apiVersion>
-              <images>
-                <image>
-                  <name>onap/${project.artifactId}</name>
-                  <alias>${project.artifactId}</alias>
-                  <build>
-                    <cleanup>try</cleanup>
-                    <dockerFileDir>${project.basedir}/target/docker-stage</dockerFileDir>
-                    <tags>
-                      <tag>${docker.snapshot.tag}</tag>
-                      <tag>${docker.latest.tag}</tag>
-                    </tags>
-                  </build>
-                </image>
-              </images>
-            </configuration>
-            <executions>
-              <execution>
-                <id>generate-images</id>
-                <phase>generate-sources</phase>
-                <goals>
-                  <goal>build</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>push-images</id>
-                <phase>deploy</phase>
-                <goals>
-                  <goal>build</goal>
-                  <goal>push</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>3.1.0</version>
-            <executions>
-              <execution>
-                <id>copy-resources</id>
-                <!-- here the phase you need -->
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>
-                        ${project.build.directory}/generated-resources/swagger
-                      </directory>
-                      <targetPath>META-INF/resources/swagger</targetPath>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>com.github.kongchen</groupId>
-            <artifactId>swagger-maven-plugin</artifactId>
-            <version>3.1.3</version>
-            <configuration>
-              <apiSources>
-                <apiSource>
-                  <locations>org.onap.pomba.contextbuilder.aai.service.rs</locations>
-                  <basePath>/aaicontextbuilder</basePath>
-                  <info>
-                    <title>${project.artifactId} Service</title>
-                    <version>${project.version}</version>
-                  </info>
-                  <swaggerDirectory>${swagger.directory}</swaggerDirectory>
-                </apiSource>
-              </apiSources>
-            </configuration>
-            <executions>
-              <execution>
-                <!-- <phase>compile</phase> -->
-                <phase>package</phase>
-                <goals>
-                  <goal>generate</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>2.6</version>
-            <executions>
-              <execution>
-                <id>copy-dockerfile</id>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals><!-- here the phase you need -->
-                <phase>package</phase>
-                <configuration>
-                  <outputDirectory>${project.basedir}/target/docker-stage</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>src/main/docker</directory>
-                      <includes>
-                        <include>Dockerfile</include>
-                      </includes>
-                      <filtering>true</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-properties</id>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <phase>validate</phase>
-                <configuration>
-                  <outputDirectory>${project.basedir}/target/docker-stage/config</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>config</directory>
-                      <includes>
-                        <include>*.properties</include>
-                        <include>*.xml</include>
-                      </includes>
-                      <filtering>false</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-script</id>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <phase>package</phase>
-                <configuration>
-                  <outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>src/main/docker</directory>
-                      <includes>
-                        <include>*.sh</include>
-                      </includes>
-                      <filtering>false</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-jar</id>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-                <phase>package</phase>
-                <configuration>
-                  <outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>
-                  <resources>
-                    <resource>
-                      <directory>target</directory>
-                      <includes>
-                        <include>*.jar</include>
-                      </includes>
-                      <filtering>false</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
+<?xml version="1.0"?>

+<project xmlns="http://maven.apache.org/POM/4.0.0" 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>

+

+  <groupId>org.onap.logging-analytics.pomba</groupId>

+  <artifactId>pomba-aai-context-builder</artifactId>

+  <version>1.3.1-SNAPSHOT</version>

+

+  <parent>

+    <groupId>org.onap.oparent</groupId>

+    <artifactId>oparent</artifactId>

+    <version>1.2.0</version>

+    <relativePath/>

+  </parent>

+

+  <properties>

+    <aai.rest.client.version>1.3.0-SNAPSHOT</aai.rest.client.version>

+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+    <logback.version>1.2.3</logback.version>

+    <swagger.directory>${project.build.directory}/generated-resources/swagger</swagger.directory>

+    <!--docker -->

+    <docker.tag>${project.version}-${timestamp}</docker.tag>

+    <docker.latest.tag>${project.version}-latest</docker.latest.tag>

+  </properties>

+

+  <dependencyManagement>

+    <dependencies>

+      <dependency>

+        <groupId>org.springframework.boot</groupId>

+        <artifactId>spring-boot-dependencies</artifactId>

+        <version>1.5.12.RELEASE</version>

+        <type>pom</type>

+        <scope>import</scope>

+      </dependency>

+    </dependencies>

+  </dependencyManagement>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.eclipse.jetty</groupId>

+      <artifactId>jetty-security</artifactId>

+    </dependency>

+

+

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-jersey</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-web</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-actuator</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.onap.logging-analytics.pomba</groupId>

+      <artifactId>pomba-audit-common</artifactId>

+      <version>1.3.1-SNAPSHOT</version>

+    </dependency>

+    <dependency>

+      <groupId>com.google.code.gson</groupId>

+      <artifactId>gson</artifactId>

+    </dependency>

+    <!-- logging dependencies -->

+    <dependency>

+      <groupId>org.slf4j</groupId>

+      <artifactId>slf4j-api</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.onap.logging-analytics</groupId>

+      <artifactId>logging-slf4j</artifactId>

+      <version>1.2.2-SNAPSHOT</version>

+      <exclusions>

+        <exclusion>

+          <groupId>com.att.eelf</groupId>

+          <artifactId>eelf-core</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+    <dependency>

+      <groupId>org.glassfish.jersey.core</groupId>

+      <artifactId>jersey-client</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.glassfish.jersey.core</groupId>

+      <artifactId>jersey-common</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.commons</groupId>

+      <artifactId>commons-lang3</artifactId>

+      <version>3.7</version>

+    </dependency>

+    <dependency>

+      <groupId>org.json</groupId>

+      <artifactId>json</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>com.jayway.jsonpath</groupId>

+      <artifactId>json-path</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>io.swagger</groupId>

+      <artifactId>swagger-core</artifactId>

+      <version>1.5.9</version>

+    </dependency>

+    <dependency>

+      <groupId>io.swagger</groupId>

+      <artifactId>swagger-annotations</artifactId>

+      <version>1.5.9</version>

+    </dependency>

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework.boot</groupId>

+      <artifactId>spring-boot-starter-test</artifactId>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+            <groupId>org.mockito</groupId>

+            <artifactId>mockito-all</artifactId>

+            <version>1.10.19</version>

+            <scope>test</scope>

+        </dependency>

+     <dependency>

+            <groupId>com.github.tomakehurst</groupId>

+            <artifactId>wiremock</artifactId>

+            <version>2.18.0</version>

+            <scope>test</scope>

+     </dependency>

+

+     <dependency>

+      <groupId>org.onap.aai</groupId>

+      <artifactId>rest-client</artifactId>

+      <version>${aai.rest.client.version}</version>

+      <exclusions>

+        <exclusion>

+          <groupId>org.apache.logging.log4j</groupId>

+          <artifactId>log4j-slf4j-impl</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+

+  </dependencies>

+

+  <build>

+    <finalName>${project.artifactId}</finalName>

+    <plugins>

+      <plugin>

+        <groupId>org.springframework.boot</groupId>

+        <artifactId>spring-boot-maven-plugin</artifactId>

+        <executions>

+          <execution>

+            <goals>

+              <goal>repackage</goal>

+            </goals>

+          </execution>

+        </executions>

+      </plugin>

+    </plugins>

+

+    <resources>

+      <resource>

+        <targetPath>config</targetPath>

+        <directory>config</directory>

+        <filtering>true</filtering>

+        <includes>

+          <include>**/*</include>

+        </includes>

+      </resource>

+    </resources>

+  </build>

+

+  <profiles>

+    <profile>

+      <id>docker</id>

+      <build>

+        <plugins>

+          <plugin>

+            <groupId>io.fabric8</groupId>

+            <artifactId>docker-maven-plugin</artifactId>

+            <version>0.19.1</version>

+            <configuration>

+              <verbose>true</verbose>

+              <apiVersion>1.23</apiVersion>

+              <images>

+                <image>

+                  <name>onap/${project.artifactId}</name>

+                  <alias>${project.artifactId}</alias>

+                  <build>

+                    <cleanup>try</cleanup>

+                    <dockerFileDir>${project.basedir}/target/docker-stage</dockerFileDir>

+                    <tags>

+                      <tag>${docker.snapshot.tag}</tag>

+                      <tag>${docker.latest.tag}</tag>

+                    </tags>

+                  </build>

+                </image>

+              </images>

+            </configuration>

+            <executions>

+              <execution>

+                <id>generate-images</id>

+                <goals>

+                  <goal>build</goal>

+                </goals>

+              </execution>

+              <execution>

+                <id>push-images</id>

+                <phase>deploy</phase>

+                <goals>

+                  <goal>build</goal>

+                  <goal>push</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+          <plugin>

+            <artifactId>maven-resources-plugin</artifactId>

+            <version>3.1.0</version>

+            <executions>

+              <execution>

+                <id>copy-resources</id>

+                <!-- here the phase you need -->

+                <phase>prepare-package</phase>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals>

+                <configuration>

+                  <outputDirectory>${project.build.outputDirectory}</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>

+                        ${project.build.directory}/generated-resources/swagger

+                      </directory>

+                      <targetPath>META-INF/resources/swagger</targetPath>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+            </executions>

+          </plugin>

+

+          <plugin>

+            <groupId>com.github.kongchen</groupId>

+            <artifactId>swagger-maven-plugin</artifactId>

+            <version>3.1.3</version>

+            <configuration>

+              <apiSources>

+                <apiSource>

+                  <locations>org.onap.pomba.contextbuilder.aai.service.rs</locations>

+                  <basePath>/aaicontextbuilder</basePath>

+                  <info>

+                    <title>${project.artifactId} Service</title>

+                    <version>${project.version}</version>

+                  </info>

+                  <swaggerDirectory>${swagger.directory}</swaggerDirectory>

+                </apiSource>

+              </apiSources>

+            </configuration>

+            <executions>

+              <execution>

+                <!-- <phase>compile</phase> -->

+                <phase>package</phase>

+                <goals>

+                  <goal>generate</goal>

+                </goals>

+              </execution>

+            </executions>

+          </plugin>

+          <plugin>

+            <artifactId>maven-resources-plugin</artifactId>

+            <version>2.6</version>

+            <executions>

+              <execution>

+                <id>copy-dockerfile</id>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals><!-- here the phase you need -->

+                <phase>package</phase>

+                <configuration>

+                  <outputDirectory>${project.basedir}/target/docker-stage</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>src/main/docker</directory>

+                      <includes>

+                        <include>Dockerfile</include>

+                      </includes>

+                      <filtering>true</filtering>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+              <execution>

+                <id>copy-properties</id>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals>

+                <phase>validate</phase>

+                <configuration>

+                  <outputDirectory>${project.basedir}/target/docker-stage/config</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>config</directory>

+                      <includes>

+                        <include>*.properties</include>

+                        <include>*.xml</include>

+                      </includes>

+                      <filtering>false</filtering>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+              <execution>

+                <id>copy-script</id>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals>

+                <phase>package</phase>

+                <configuration>

+                  <outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>src/main/docker</directory>

+                      <includes>

+                        <include>*.sh</include>

+                      </includes>

+                      <filtering>false</filtering>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+              <execution>

+                <id>copy-jar</id>

+                <goals>

+                  <goal>copy-resources</goal>

+                </goals>

+                <phase>package</phase>

+                <configuration>

+                  <outputDirectory>${project.basedir}/target/docker-stage/</outputDirectory>

+                  <resources>

+                    <resource>

+                      <directory>target</directory>

+                      <includes>

+                        <include>*.jar</include>

+                      </includes>

+                      <filtering>false</filtering>

+                    </resource>

+                  </resources>

+                </configuration>

+              </execution>

+            </executions>

+          </plugin>

+        </plugins>

+      </build>

+    </profile>

+  </profiles>

+</project>

diff --git a/src/main/java/org/onap/pomba/contextbuilder/aai/common/LogMessages.java b/src/main/java/org/onap/pomba/contextbuilder/aai/common/LogMessages.java
index 762543c..d027d4a 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/aai/common/LogMessages.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/aai/common/LogMessages.java
@@ -21,7 +21,7 @@ public class LogMessages {
 
     private LogMessages() {}
 
-    public static final String AAI_CONTEXT_BUILDER_URL = "AAI Context Builder URL: ";
+    public static final String AAI_CONTEXT_BUILDER_URL = "AAI Context Builder URL: {}";
     public static final String HEADER_MESSAGE = "Header {} not present in request, generating new value: {}";
     public static final String NOT_FOUND = "{} {} is not found from AAI";
     public static final String NUMBER_OF_API_CALLS = "The number of API calls for {} is {}";
diff --git a/src/main/java/org/onap/pomba/contextbuilder/aai/util/RestUtil.java b/src/main/java/org/onap/pomba/contextbuilder/aai/util/RestUtil.java
index 19de411..c0ae25c 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/aai/util/RestUtil.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/aai/util/RestUtil.java
@@ -14,7 +14,7 @@
 package org.onap.pomba.contextbuilder.aai.util;
 
 
-import com.sun.jersey.core.util.MultivaluedMapImpl;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -26,7 +26,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.Response.Status;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -62,9 +62,6 @@ public class RestUtil {
     private static Logger log = LoggerFactory.getLogger(RestUtil.class);
     // Parameters for Query AAI Model Data API
     private static final String SERVICE_INSTANCE_ID = "serviceInstanceId";
-    private static final String MODEL_VERSION_ID = "modelVersionId";
-    private static final String MODEL_INVARIANT_ID = "modelInvariantId";
-
 
     // HTTP headers
     private static final String TRANSACTION_ID = "X-TransactionId";
@@ -179,6 +176,14 @@ public class RestUtil {
 
         // Obtain resource-link based on resource-type = service-Instance
         String resourceLink = obtainResouceLinkBasedOnServiceInstanceFromAAI(aaiClient, baseURL, aaiPathToSearchNodeQuery, serviceInstanceId, transactionId, aaiBasicAuthorization);
+
+        // Handle the case if the service instance is not found in AAI
+        if (resourceLink==null) {
+            // return the empty Json on the root level. i.e service instance
+            return null;
+        }
+
+        // Build URl to get ServiceInstance Payload
         String url = baseURL + resourceLink;
 
         // Response from service instance API call
@@ -669,7 +674,7 @@ public class RestUtil {
     }
 
     private static Map<String, List<String>> buildHeaders(String aaiBasicAuthorization, String transactionId) {
-        MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
+        MultivaluedHashMap<String, String> headers = new MultivaluedHashMap<String, String>();
         headers.put(TRANSACTION_ID, Collections.singletonList(transactionId));
         headers.put(FROM_APP_ID, Collections.singletonList(APP_NAME));
         headers.put(AUTHORIZATION, Collections.singletonList(aaiBasicAuthorization));