aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xpom.xml6
-rw-r--r--src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java15
-rw-r--r--src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java43
-rw-r--r--version.properties2
4 files changed, 34 insertions, 32 deletions
diff --git a/pom.xml b/pom.xml
index 156d1fc..1c4765e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-parent</artifactId>
- <version>1.14.5</version>
+ <version>1.14.6</version>
</parent>
<groupId>org.onap.aai.graphadmin</groupId>
<artifactId>aai-graphadmin</artifactId>
- <version>1.14.6-SNAPSHOT</version>
+ <version>1.14.7-SNAPSHOT</version>
<properties>
@@ -55,7 +55,7 @@
<docker.push.registry>localhost:5000</docker.push.registry>
<aai.docker.version>1.0.0</aai.docker.version>
<aai.schema.service.version>1.12.5</aai.schema.service.version>
- <aai.common.version>1.14.5</aai.common.version>
+ <aai.common.version>1.14.6</aai.common.version>
<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
</aai.build.directory>
<aai.docker.namespace>onap</aai.docker.namespace>
diff --git a/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java b/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
index edcb50d..63bdea1 100644
--- a/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
+++ b/src/main/java/org/onap/aai/dbgen/DynamicPayloadGenerator.java
@@ -21,15 +21,16 @@ package org.onap.aai.dbgen;
import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.node.ObjectNode;
-import org.codehaus.jackson.type.TypeReference;
import org.onap.aai.restclient.PropertyPasswordConfiguration;
import org.onap.aai.db.props.AAIProperties;
import org.onap.aai.dbmap.InMemoryGraph;
@@ -280,7 +281,7 @@ public class DynamicPayloadGenerator {
JsonNode rootNode = mapper.readTree(jsonFile);
- Iterator<Entry<String, JsonNode>> nodeFields = rootNode.getFields();
+ Iterator<Entry<String, JsonNode>> nodeFields = rootNode.fields();
while (nodeFields.hasNext()) {
Entry<String, JsonNode> entry = nodeFields.next();
@@ -354,7 +355,7 @@ public class DynamicPayloadGenerator {
JsonNode rootNode = mapper.readTree(jsonFile);
- Iterator<Entry<String, JsonNode>> nodeFields = rootNode.getFields();
+ Iterator<Entry<String, JsonNode>> nodeFields = rootNode.fields();
while (nodeFields.hasNext()) {
Entry<String, JsonNode> entry = nodeFields.next();
@@ -390,7 +391,7 @@ public class DynamicPayloadGenerator {
JsonNode rootNode = mapper.readTree(jsonFile);
- Iterator<Entry<String, JsonNode>> nodeFields = rootNode.getFields();
+ Iterator<Entry<String, JsonNode>> nodeFields = rootNode.fields();
while (nodeFields.hasNext()) {
Entry<String, JsonNode> entry = nodeFields.next();
diff --git a/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java b/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java
index 55af4f9..23c3352 100644
--- a/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java
+++ b/src/test/java/org/onap/aai/schema/db/ManageSchemaTest.java
@@ -20,8 +20,6 @@
package org.onap.aai.schema.db;
import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
import org.janusgraph.core.JanusGraph;
import org.janusgraph.core.JanusGraphFactory;
import org.janusgraph.core.schema.JanusGraphManagement;
@@ -33,6 +31,9 @@ import org.onap.aai.AAISetup;
import org.onap.aai.db.schema.DBIndex;
import org.onap.aai.db.schema.ManageJanusGraphSchema;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import java.io.IOException;
import java.util.Set;
@@ -45,14 +46,14 @@ public class ManageSchemaTest extends AAISetup {
public void beforeTest() {
graph = JanusGraphFactory.open("bundleconfig-local/etc/appprops/aaiconfig.properties");
}
-
+
/*
@Test
public void populateEmptyGraph() {
ManageJanusGraphSchema schema = new ManageJanusGraphSchema(graph);
schema.buildSchema();
}
-
+
@Test
public void modifyIndex() {
ManageJanusGraphSchema schema = new ManageJanusGraphSchema(graph);
@@ -66,37 +67,37 @@ public class ManageSchemaTest extends AAISetup {
index.setName("internet-topology");
index.setUnique(false);
schema.updateIndex(index);
-
+
}
*/
@Test
public void closeRunningInstances() {
-
+
JanusGraphManagement mgmt = graph.openManagement();
Set<String> instances = mgmt.getOpenInstances();
-
+
for (String instance : instances) {
-
+
if (!instance.contains("(current)")) {
mgmt.forceCloseInstance(instance);
}
}
mgmt.commit();
-
+
graph.close();
-
+
}
@Test
public void addNewIndex() throws JsonParseException, JsonMappingException, IOException {
ObjectMapper mapper = new ObjectMapper();
- String content = " {\r\n" +
- " \"name\" : \"equipment-name\",\r\n" +
- " \"unique\" : false,\r\n" +
- " \"properties\" : [ {\r\n" +
- " \"name\" : \"equipment-name\",\r\n" +
- " \"cardinality\" : \"SINGLE\",\r\n" +
- " \"typeClass\" : \"java.lang.String\"\r\n" +
- " } ]\r\n" +
+ String content = " {\r\n" +
+ " \"name\" : \"equipment-name\",\r\n" +
+ " \"unique\" : false,\r\n" +
+ " \"properties\" : [ {\r\n" +
+ " \"name\" : \"equipment-name\",\r\n" +
+ " \"cardinality\" : \"SINGLE\",\r\n" +
+ " \"typeClass\" : \"java.lang.String\"\r\n" +
+ " } ]\r\n" +
" }";
DBIndex index = mapper.readValue(content, DBIndex.class);
ManageJanusGraphSchema schema = new ManageJanusGraphSchema(graph, auditorFactory, schemaVersions, edgeIngestor);
@@ -104,9 +105,9 @@ public class ManageSchemaTest extends AAISetup {
Set<String> instances = mgmt.getOpenInstances();
System.out.println(instances);
schema.updateIndex(index);
-
+
graph.close();
-
+
}
-
+
}
diff --git a/version.properties b/version.properties
index cae43c2..e8f490e 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
major_version=1
minor_version=14
-patch_version=6
+patch_version=7
base_version=${major_version}.${minor_version}.${patch_version}