Refactoring to use camel servlet with spring boot

Change-Id: I7c439e9108d84e5e72a42d9dba3bbf7681517527
Issue-ID: AAI-802
Signed-off-by: Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com>

5 files changed, 49 insertions, 227 deletions

diff --git a/src/test/java/org/onap/aai/datarouter/exception/DataRouterExceptionTest.java b/src/test/java/org/onap/aai/datarouter/exception/DataRouterExceptionTest.java
new file mode 100644
index 0000000..a95d97c
--- /dev/null
+++ b/src/test/java/org/onap/aai/datarouter/exception/DataRouterExceptionTest.java
@@ -0,0 +1,49 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 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=========================================================
+ */
+package org.onap.aai.datarouter.exception;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.ws.rs.core.Response;
+
+public class DataRouterExceptionTest {
+
+    @Test
+    public void testDataRouterError(){
+        DataRouterError error1 = DataRouterError.DL_PARSE_100;
+        Assert.assertEquals("DL-100", error1.getId());
+        Assert.assertNotNull(error1.getMessage());
+        Assert.assertEquals(Response.Status.BAD_REQUEST, error1.getHttpStatus());
+    }
+
+    @Test
+    public void testBaseDataRouterException(){
+        BaseDataRouterException exp1 = new BaseDataRouterException("id-1");
+        Assert.assertEquals(exp1.getId(), "id-1");
+
+        BaseDataRouterException exp2 = new BaseDataRouterException("id-1", "test-error");
+        Assert.assertEquals(exp2.getId(), "id-1");
+
+        BaseDataRouterException exp3 = new BaseDataRouterException("id-1", "test-error", new Throwable());
+        Assert.assertEquals(exp3.getId(), "id-1");
+    }
+}
diff --git a/src/test/java/org/onap/aai/datarouter/query/ChameleonRouterTest.java b/src/test/java/org/onap/aai/datarouter/query/ChameleonRouterTest.java
deleted file mode 100644
index 27c2606..0000000
--- a/src/test/java/org/onap/aai/datarouter/query/ChameleonRouterTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 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=========================================================
- */
-package org.onap.aai.datarouter.query;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-
-import javax.ws.rs.core.MediaType;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.aai.restclient.client.OperationResult;
-import org.onap.aai.restclient.client.RestClient;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.google.gson.JsonParser;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ ChameleonRouter.class, RestClient.class })
-public class ChameleonRouterTest {
-
-  ChameleonRouter chameleonRouter;
-  RestClient mockRestClient = mock(RestClient.class);
-
-  JsonParser parser = new JsonParser();
-
-  @SuppressWarnings("unchecked")
-  @Before
-  public void init() throws Exception {
-    RestClientConfig config = PowerMockito.mock(RestClientConfig.class);
-    PowerMockito.when(config.getCertPassword()).thenReturn("password");
-
-    PowerMockito.whenNew(RestClient.class).withAnyArguments().thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.validateServerHostname(any(Boolean.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.validateServerCertChain(any(Boolean.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.clientCertFile(any(String.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.clientCertPassword(any(String.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.trustStore(any(String.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.connectTimeoutMs(any(Integer.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.readTimeoutMs(any(Integer.class))).thenReturn(mockRestClient);
-
-    chameleonRouter = new ChameleonRouter("http:///test", config);
-  }
-
-  @Test
-  public void testProcess() throws Exception {
-    OperationResult chameleonResponse = buildChameleonResponse();
-    PowerMockito.when(mockRestClient.get(any(String.class), any(HashMap.class), any(MediaType.class)))
-        .thenReturn(chameleonResponse);
-
-    String chameleonRouterResponse = chameleonRouter.process("/objects/364d646e-c947-4010-a66a-adf06aa306fb", "", null);
-    Assert.assertEquals(parser.parse(chameleonRouterResponse), parser.parse(readSampleChampResponse()));
-
-  }
-
-  private OperationResult buildChameleonResponse() throws IOException {
-    OperationResult response = new OperationResult();
-    response.setResultCode(200);
-
-    response.setResult(readSampleChameleonResponse());
-    return response;
-  }
-
-  private String readSampleChampResponse() throws IOException {
-    FileInputStream event = new FileInputStream(new File("src/test/resources/champ-response.json"));
-    String json = IOUtils.toString(event, "UTF-8");
-    return json;
-  }
-
-  private String readSampleChameleonResponse() throws IOException {
-    FileInputStream event = new FileInputStream(new File("src/test/resources/chameleon-response.json"));
-    String json = IOUtils.toString(event, "UTF-8");
-    return json;
-  }
-
-}
diff --git a/src/test/java/org/onap/aai/datarouter/query/ChampRouterTest.java b/src/test/java/org/onap/aai/datarouter/query/ChampRouterTest.java
deleted file mode 100644
index 1bf7c88..0000000
--- a/src/test/java/org/onap/aai/datarouter/query/ChampRouterTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 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=========================================================
- */
-package org.onap.aai.datarouter.query;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-
-import javax.ws.rs.core.MediaType;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.onap.aai.restclient.client.OperationResult;
-import org.onap.aai.restclient.client.RestClient;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ ChampRouter.class, RestClient.class })
-public class ChampRouterTest {
-
-  ChampRouter champRouter;
-  RestClient mockRestClient = mock(RestClient.class);
-
-  @SuppressWarnings("unchecked")
-  @Before
-  public void init() throws Exception {
-    RestClientConfig config = PowerMockito.mock(RestClientConfig.class);
-    PowerMockito.when(config.getCertPassword()).thenReturn("password");
-
-    PowerMockito.whenNew(RestClient.class).withAnyArguments().thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.validateServerHostname(any(Boolean.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.validateServerCertChain(any(Boolean.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.clientCertFile(any(String.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.clientCertPassword(any(String.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.trustStore(any(String.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.connectTimeoutMs(any(Integer.class))).thenReturn(mockRestClient);
-    PowerMockito.when(mockRestClient.readTimeoutMs(any(Integer.class))).thenReturn(mockRestClient);
-
-    champRouter = new ChampRouter("http:///test", config);
-  }
-
-  @Test
-  public void testProcess() throws Exception {
-    OperationResult champResponse = buildChampResponse();
-    PowerMockito.when(mockRestClient.get(any(String.class), any(HashMap.class), any(MediaType.class)))
-        .thenReturn(champResponse);
-
-    String champRouterResponse = champRouter.process("/object/1234", "", null);
-    Assert.assertEquals(champRouterResponse, readSampleChampResponse());
-
-  }
-
-  private OperationResult buildChampResponse() throws IOException {
-    OperationResult response = new OperationResult();
-    response.setResultCode(200);
-
-    response.setResult(readSampleChampResponse());
-    return response;
-  }
-
-  private String readSampleChampResponse() throws IOException {
-    FileInputStream event = new FileInputStream(new File("src/test/resources/champ-response.json"));
-    String json = IOUtils.toString(event, "UTF-8");
-    return json;
-  }
-
-}
diff --git a/src/test/resources/chameleon-response.json b/src/test/resources/chameleon-response.json
deleted file mode 100644
index 056bd46..0000000
--- a/src/test/resources/chameleon-response.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-      "ptnii-equip-name": "mtanj119snd-updated-now",      
-      "equip-type": "phone",
-      "equip-vendor": "Samsung",
-      "fqdn": "mtanjrsv119.mtanj.sbcglobal.net",
-      "purpose": "",     
-      "ipv4-oam-address": "135.182.138.60",      
-      "hostname": "phonehost",
-      "equip-model": "DL380p-nd",
-      "aai-uuid": "364d646e-c947-4010-a66a-adf06aa306fb",
-      "resource-version": "1477013499",
-      "type": "pserver"
-}
\ No newline at end of file
diff --git a/src/test/resources/champ-response.json b/src/test/resources/champ-response.json
deleted file mode 100644
index 105f408..0000000
--- a/src/test/resources/champ-response.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-   "key": "364d646e-c947-4010-a66a-adf06aa306fb",
-   "type": "pserver",
-   "properties":    {
-      "ptnii-equip-name": "mtanj119snd-updated-now",      
-      "equip-type": "phone",
-      "equip-vendor": "Samsung",
-      "fqdn": "mtanjrsv119.mtanj.sbcglobal.net",
-      "purpose": "",      
-      "ipv4-oam-address": "135.182.138.60",      
-      "hostname": "phonehost",
-      "equip-model": "DL380p-nd",
-      "aai-uuid": "364d646e-c947-4010-a66a-adf06aa306fb",
-      "resource-version": "1477013499"
-   }
-}
\ No newline at end of file