update old version

of apigateway common data-provider helpserver websocketmanager2

Issue-ID: SDNC-1005
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I13990aa4329810bb7a7dd815e6149e9890617d07
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>

3 files changed, 488 insertions, 3 deletions

diff --git a/sdnr/wt/common/pom.xml b/sdnr/wt/common/pom.xml
index 2254b78f1..dfefe1834 100644
--- a/sdnr/wt/common/pom.xml
+++ b/sdnr/wt/common/pom.xml
@@ -107,8 +107,9 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>${basedir}/../data-provider/database/src/main/resources/es-init.sh</executable>
+							<executable>bash</executable>
                             <arguments>
+								<argument>${basedir}/../data-provider/database/src/main/resources/es-init.sh</argument>
                                 <argument>initfile</argument>
                                 <argument>-f</argument>
                                 <argument>${project.build.directory}/EsInit.script</argument>
@@ -122,11 +123,12 @@
                 <artifactId>elasticsearch-maven-plugin</artifactId>
                 <version>6.16</version>
                 <configuration>
-                    <skip>true</skip>
+					<skip>${skipTests}</skip>
                     <clusterName>testCluster</clusterName>
                     <transportPort>9500</transportPort>
                     <httpPort>${databaseport}</httpPort>
-                    <version>6.4.3</version>
+                    <version>6.5.0</version>
+                    <timeout>120</timeout>
                     <pathInitScript>${project.build.directory}/EsInit.script</pathInitScript>
                 </configuration>
                 <executions>
diff --git a/sdnr/wt/common/src/test/java/org/onap/ccsdk/features/sdnr/wt/common/test/TestDbClient.java b/sdnr/wt/common/src/test/java/org/onap/ccsdk/features/sdnr/wt/common/test/TestDbClient.java
new file mode 100644
index 000000000..0d46b4d20
--- /dev/null
+++ b/sdnr/wt/common/src/test/java/org/onap/ccsdk/features/sdnr/wt/common/test/TestDbClient.java
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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.ccsdk.features.sdnr.wt.common.test;
+
+import static org.junit.Assert.*;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchHit;
+import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+
+public class TestDbClient {
+	
+	private static HtDatabaseClient dbClient;
+	private static HostInfo[] hosts = new HostInfo[] { new HostInfo("localhost", Integer
+			.valueOf(System.getProperty("databaseport") != null ? System.getProperty("databaseport") : "49200")) };
+
+	@BeforeClass
+	public static void init() {
+
+		dbClient = new HtDatabaseClient(hosts);
+		dbClient.waitForYellowStatus(20000);
+
+	}
+	@Test
+	public void testCRUD() {
+		final String IDX = "test23-knmoinsd";
+		final String ID = "abcddd";
+		final String JSON = "{\"data\":{\"inner\":\"more\"}}";
+		final String JSON2 = "{\"data\":{\"inner\":\"more2\"}}";
+		//Create
+		String esId=dbClient.doWriteRaw(IDX, ID, JSON);
+		assertEquals("inserted id is wrong",ID,esId);
+		//Read
+		SearchResult<SearchHit> result = dbClient.doReadByQueryJsonData(IDX, QueryBuilders.matchQuery("_id", ID));
+		assertEquals("amount of results is wrong",1,result.getTotal());
+		assertEquals("data not valid", JSON,result.getHits().get(0).getSourceAsString());
+		//Update
+		esId= dbClient.doUpdateOrCreate(IDX, ID, JSON2);
+		assertEquals("update response not successfull",ID,esId);
+		//Verify
+		result = dbClient.doReadByQueryJsonData( IDX, QueryBuilders.matchQuery("_id", ID));
+		assertEquals("amount of results is wrong",1,result.getTotal());
+		assertEquals("data not valid", JSON2,result.getHits().get(0).getSourceAsString());
+		//Delete
+		boolean del=dbClient.doRemove(IDX, ID);
+		assertTrue("item not deleted",del);
+		//Verify
+		result = dbClient.doReadByQueryJsonData(IDX, QueryBuilders.matchQuery("_id", ID));
+		assertEquals("amount of results is wrong",0,result.getTotal());
+	}
+
+}
diff --git a/sdnr/wt/common/src/test/java/org/onap/ccsdk/features/sdnr/wt/common/test/TestDbRequests.java b/sdnr/wt/common/src/test/java/org/onap/ccsdk/features/sdnr/wt/common/test/TestDbRequests.java
new file mode 100644
index 000000000..36bbebefd
--- /dev/null
+++ b/sdnr/wt/common/src/test/java/org/onap/ccsdk/features/sdnr/wt/common/test/TestDbRequests.java
@@ -0,0 +1,412 @@
+/*******************************************************************************
+ * ============LICENSE_START========================================================================
+ * ONAP : ccsdk feature sdnr wt
+ * =================================================================================================
+ * Copyright (C) 2019 highstreet technologies GmbH 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.ccsdk.features.sdnr.wt.common.test;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
+import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
+import org.onap.ccsdk.features.sdnr.wt.common.database.queries.QueryBuilders;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.ClusterHealthRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.CreateIndexRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.DeleteByQueryRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.DeleteIndexRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.DeleteRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.GetRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.IndexRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.NodeStatsRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.RefreshIndexRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.SearchRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.UpdateByQueryRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.requests.UpdateRequest;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.ClusterHealthResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.CreateIndexResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.DeleteByQueryResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.DeleteIndexResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.DeleteResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.GetResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.IndexResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.NodeStatsResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.SearchResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.UpdateByQueryResponse;
+import org.onap.ccsdk.features.sdnr.wt.common.database.responses.UpdateResponse;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class TestDbRequests {
+
+	private static HtDatabaseClient dbClient;
+	private static HostInfo[] hosts = new HostInfo[] { new HostInfo("localhost", Integer
+			.valueOf(System.getProperty("databaseport") != null ? System.getProperty("databaseport") : "49200")) };
+
+	@BeforeClass
+	public static void init() {
+
+		dbClient = new HtDatabaseClient(hosts);
+
+	}
+	@AfterClass
+	public static void deinit() {
+		if(dbClient!=null) {
+			dbClient.close();
+		}
+	}
+	@Test
+	public void testHealth() {
+
+		ClusterHealthResponse response = null;
+		ClusterHealthRequest request = new ClusterHealthRequest();
+		request.timeout(10);
+		try {
+			response = dbClient.health(request);
+		} catch (UnsupportedOperationException | IOException | JSONException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull("response is null", response);
+		assertTrue(response.isStatusMinimal(ClusterHealthResponse.HEALTHSTATUS_YELLOW));
+	}
+
+	@Test
+	public void testCount() {
+
+	}
+
+	@Test
+	public void testCreateAndDeleteIndex() {
+		final String IDX = "testcidx1";
+		CreateIndexRequest request = new CreateIndexRequest(IDX);
+		CreateIndexResponse response = null;
+		try {
+			response = dbClient.createIndex(request);
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response);
+
+		assertTrue("index not existing", dbClient.isExistsIndex(IDX));
+
+		DeleteIndexRequest request2 = new DeleteIndexRequest(IDX);
+
+		DeleteIndexResponse response2 = null;
+		try {
+			response2 = dbClient.deleteIndex(request2);
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response2);
+		assertFalse("index still existing", dbClient.isExistsIndex(IDX));
+		this.deleteIndex(IDX);
+	}
+
+	@Test
+	public void testInsertAndDelete() {
+		final String IDX = "test23-knmoinsd";
+		final String ID = "abcddd";
+		final String JSON = "{\"data\":{\"inner\":\"more\"}}";
+		this.insert(IDX, ID, JSON);
+		// delete data
+		DeleteRequest request2 = new DeleteRequest(IDX, IDX, ID);
+		DeleteResponse response2 = null;
+		try {
+			response2 = dbClient.delete(request2);
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response2);
+		assertTrue(response2.isDeleted());
+		try {
+			dbClient.refreshIndex(new RefreshIndexRequest(IDX));
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		// verify data deleted
+		GetRequest request4 = new GetRequest(IDX, IDX, ID);
+		GetResponse response4 = null;
+		try {
+			response4 = dbClient.get(request4);
+		} catch (IOException e1) {
+			fail(e1.getMessage());
+		}
+		assertNotNull(response4);
+		assertFalse("data still existing", response4.isExists());
+		this.deleteIndex(IDX);
+	}
+
+	@Test
+	public void testInsertAndDeleteByQuery() {
+		final String IDX = "test34-knmoinsd";
+		final String ID = "abcdddseae";
+		final String JSON = "{\"data\":{\"inner\":\"more\"}}";
+		this.insert(IDX, ID, JSON);
+
+		// delete data
+		DeleteByQueryRequest request2 = new DeleteByQueryRequest(IDX);
+		request2.source(QueryBuilders.matchQuery("_id", ID));
+		DeleteByQueryResponse response2 = null;
+		try {
+			response2 = dbClient.deleteByQuery(request2);
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response2);
+		assertTrue(response2.isResponseSucceeded());
+		try {
+			dbClient.refreshIndex(new RefreshIndexRequest(IDX));
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		// verify data deleted
+		GetRequest request4 = new GetRequest(IDX, IDX, ID);
+		GetResponse response4 = null;
+		try {
+			response4 = dbClient.get(request4);
+		} catch (IOException e1) {
+			fail(e1.getMessage());
+		}
+		assertNotNull(response4);
+		assertFalse("data still existing", response4.isExists());
+		this.deleteIndex(IDX);
+	}
+
+	private void insert(String IDX, String ID, String JSON) {
+
+		// create data
+		IndexRequest request = new IndexRequest(IDX, IDX, ID);
+		request.source(JSON);
+		IndexResponse response = null;
+		try {
+			response = dbClient.index(request);
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response);
+		if (ID != null) {
+			assertEquals("id not correct", ID, response.getId());
+		} else {
+			ID = response.getId();
+		}
+		// do db refresh
+		try {
+			dbClient.refreshIndex(new RefreshIndexRequest(IDX));
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		// verify data exists
+		GetRequest request3 = new GetRequest(IDX, IDX, ID);
+		GetResponse response3 = null;
+		try {
+			response3 = dbClient.get(request3);
+		} catch (IOException e1) {
+			fail(e1.getMessage());
+		}
+		assertNotNull(response3);
+		JSONAssert.assertEquals("could not verify update", JSON, response3.getSourceAsBytesRef(), true);
+	}
+
+	@Test
+	public void testSearch() {
+		final String IDX = "test44-moinsd";
+		final String ID = "abe";
+		final String JSON = "{\"data\":{\"inner\":\"more\"}}";
+		final String ID2 = "abe2";
+		final String JSON2 = "{\"data\":{\"inner\":\"more2\"}}";
+		final String ID3 = "abe3";
+		final String JSON3 = "{\"data\":{\"inner\":\"more3\"}}";
+		this.insert(IDX, ID, JSON);
+		this.insert(IDX, ID2, JSON2);
+		this.insert(IDX, ID3, JSON3);
+		SearchRequest request = new SearchRequest(IDX, IDX);
+		request.setQuery(QueryBuilders.matchAllQuery());
+		SearchResponse response = null;
+		try {
+			response = dbClient.search(request);
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response);
+		assertEquals("not all items found", 3, response.getHits().length);
+		assertEquals("incorrect index",IDX,response.getHits()[0].getIndex());
+		assertEquals("incorrect type",IDX,response.getHits()[0].getType());
+		this.deleteIndex(IDX);
+	}
+
+	@Test
+	public void testUpdate() {
+		final String IDX = "test4534-moinsd";
+		final String ID = "assbe";
+		final String JSON = "{\"data\":{\"inner\":\"more\"}}";
+		final String JSON2 = "{\"data\":{\"inner\":\"more2\"},\"data2\":\"value2\",\"data3\":true}";
+
+		this.insert(IDX, ID, JSON);
+		UpdateRequest request = new UpdateRequest(IDX, IDX, ID);
+		UpdateResponse response = null;
+		try {
+			request.source(new JSONObject(JSON2));
+			response = dbClient.update(request);
+		} catch (JSONException | IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response);
+		assertTrue(response.succeeded());
+		// refresh index
+		try {
+			dbClient.refreshIndex(new RefreshIndexRequest(IDX));
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		// verify update
+		GetRequest request3 = new GetRequest(IDX, IDX, ID);
+		GetResponse response3 = null;
+		try {
+			response3 = dbClient.get(request3);
+		} catch (IOException e1) {
+			fail(e1.getMessage());
+		}
+		assertNotNull(response3);
+		JSONAssert.assertEquals("could not verify update", JSON2, response3.getSourceAsBytesRef(), true);
+		this.deleteIndex(IDX);
+	}
+
+	@Test
+	public void testUpdateByQuery() {
+		final String IDX = "test224534-moinsd";
+		final String ID = "asssabe";
+		final String JSON = "{\"data\":{\"inner\":\"more\"}}";
+		final String JSON2 = "{\"data\":{\"inner\":\"more2\"},\"data2\":\"value2\",\"data3\":true}";
+
+		this.insert(IDX, ID, JSON);
+		UpdateByQueryRequest request = new UpdateByQueryRequest(IDX, IDX);
+		UpdateByQueryResponse response = null;
+		try {
+			request.source(ID, new JSONObject(JSON2));
+			response = dbClient.update(request);
+		} catch (JSONException | IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response);
+		assertTrue(response.isUpdated());
+		// refresh index
+		try {
+			dbClient.refreshIndex(new RefreshIndexRequest(IDX));
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		// verify update
+		GetRequest request3 = new GetRequest(IDX, IDX, ID);
+		GetResponse response3 = null;
+		try {
+			response3 = dbClient.get(request3);
+		} catch (IOException e1) {
+			fail(e1.getMessage());
+		}
+		assertNotNull(response3);
+		JSONAssert.assertEquals("could not verify update", JSON2, response3.getSourceAsBytesRef(), true);
+		this.deleteIndex(IDX);
+	}
+
+	@Test
+	public void testAggregations() {
+		final String IDX = "test3227533677-moisnsd";
+		final String JSON = "{ \"node-id\":\"sim1\",\"severity\":\"critical\"}";
+		final String JSON2 = "{ \"node-id\":\"sim2\",\"severity\":\"critical\"}";
+		final String JSON3 = "{ \"node-id\":\"sim3\",\"severity\":\"minor\"}";
+		final String JSON4 = "{ \"node-id\":\"sim4\",\"severity\":\"warning\"}";
+		final String JSON5 = "{ \"node-id\":\"sim5\",\"severity\":\"major\"}";
+		final String MAPPINGS = "{\""+IDX+"\":{\"properties\":{\"node-id\": {\"type\": \"keyword\"},\"severity\": {\"type\": \"keyword\"}}}}";
+		//create index with mapping keyword
+		CreateIndexRequest irequest = new CreateIndexRequest(IDX);
+		irequest.mappings(new JSONObject(MAPPINGS));
+		CreateIndexResponse iresponse = null;
+		try {
+			iresponse = dbClient.createIndex(irequest);
+		} catch (IOException e1) {
+			fail("unable to create index: "+e1.getMessage());
+		}
+		assertNotNull(iresponse);
+		assertTrue(iresponse.isAcknowledged());
+		// fill index
+		this.insert(IDX, null, JSON);
+		this.insert(IDX, null, JSON2);
+		this.insert(IDX, null, JSON3);
+		this.insert(IDX, null, JSON4);
+		this.insert(IDX, null, JSON5);
+		// refresh index
+		try {
+			dbClient.refreshIndex(new RefreshIndexRequest(IDX));
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+
+		SearchRequest request = new SearchRequest(IDX, IDX);
+		request.setQuery(QueryBuilders.matchAllQuery().aggregations("severity").size(0));
+		SearchResponse response = null;
+		try {
+			response = dbClient.search(request);
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(response);
+		assertTrue(response.hasAggregations());
+		assertEquals("aggregation size not correct", 4, response.getAggregations("severity").size());
+
+		List<String> items1 = Arrays.asList(response.getAggregations("severity").getKeysAsPagedStringList(2, 0));
+		List<String> items2 = Arrays.asList(response.getAggregations("severity").getKeysAsPagedStringList(2, 2));
+		assertEquals("pagination does not work", 2,items1.size());
+		assertEquals("pagination does not work", 2,items2.size());
+		for(String s:items1) {
+			assertFalse("pagination overlap is not allowed",items2.contains(s));
+		}
+		for(String s:items2) {
+			assertFalse("pagination overlap is not allowed",items1.contains(s));
+		}
+
+		this.deleteIndex(IDX);
+	}
+	
+	@Test
+	public void testStatistics() {
+		NodeStatsResponse stats=null;
+		try {
+			stats = dbClient.stats(new NodeStatsRequest());
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
+		assertNotNull(stats);
+		System.out.println(stats.getNodesInfo());
+		System.out.println(stats.getNodeStatistics());
+	}
+	private void deleteIndex(String idx) {
+		try {
+			dbClient.deleteIndex( new DeleteIndexRequest(idx));
+		} catch (IOException e) {
+
+		}
+	}
+
+}