diff options
| -rw-r--r-- | aai-annotations/pom.xml | 4 | ||||
| -rw-r--r-- | aai-auth/pom.xml | 4 | ||||
| -rw-r--r-- | aai-core/pom.xml | 4 | ||||
| -rw-r--r-- | aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java | 12 | ||||
| -rw-r--r-- | aai-core/src/test/java/org/onap/aai/rest/RestHandlerTest.java | 40 | ||||
| -rw-r--r-- | aai-core/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java | 89 | ||||
| -rw-r--r-- | aai-schema-ingest/pom.xml | 4 | ||||
| -rw-r--r-- | aai-schema/pom.xml | 4 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json | 2 | ||||
| -rw-r--r-- | aai-schema/src/main/xjb/bindings-onap.xjb | 14 | ||||
| -rw-r--r-- | aai-utils/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
13 files changed, 133 insertions, 52 deletions
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 4297c1a3..4dab523e 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,12 +27,12 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>aai-annotations</artifactId> <name>aai-annotations</name> <packaging>jar</packaging> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> </properties> diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml index 03a32b99..ecae486c 100644 --- a/aai-auth/pom.xml +++ b/aai-auth/pom.xml @@ -26,11 +26,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>aai-auth</artifactId> <name>aai-auth</name> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> diff --git a/aai-core/pom.xml b/aai-core/pom.xml index 9788e115..57b67e67 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -27,11 +27,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>aai-core</artifactId> <name>aai-core</name> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <properties> <sonar.language>java</sonar.language> diff --git a/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java b/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java index 52319709..5915ce68 100644 --- a/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java +++ b/aai-core/src/test/java/org/onap/aai/dbmap/AAIGraphTest.java @@ -31,6 +31,8 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.Matchers.matchesPattern; import static org.junit.Assert.*; +import java.io.FileNotFoundException; + public class AAIGraphTest extends AAISetup{ @Before public void setup() { @@ -68,5 +70,15 @@ public class AAIGraphTest extends AAISetup{ graphMgt.rollback(); graph.close(); } + + @Test (expected=FileNotFoundException.class) + public void JanusGraphOpenNameWithInvalidFilePathTest() throws Exception{ + JanusGraph graph = JanusGraphFactory.open(new AAIGraphConfig.Builder("invalid").forService(SERVICE_NAME).withGraphType("graphType").buildConfiguration()); + JanusGraphManagement graphMgt = graph.openManagement(); + String connectionInstanceName = graphMgt.getOpenInstances().stream().filter(c -> c.contains("current")).findFirst().get(); + assertThat(connectionInstanceName,matchesPattern("^\\d+_[\\w\\-\\d]+_" + SERVICE_NAME + "_graphType_\\d+\\(current\\)$")); + graphMgt.rollback(); + graph.close(); + } } diff --git a/aai-core/src/test/java/org/onap/aai/rest/RestHandlerTest.java b/aai-core/src/test/java/org/onap/aai/rest/RestHandlerTest.java new file mode 100644 index 00000000..c25e2929 --- /dev/null +++ b/aai-core/src/test/java/org/onap/aai/rest/RestHandlerTest.java @@ -0,0 +1,40 @@ +/** + * ============LICENSE_START======================================================= + * org.onap.aai + * ================================================================================ + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Modifications Copyright © 2018 IBM. + * ================================================================================ + * 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.rest; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class RestHandlerTest { + + @Test + public void testGetInstance() { + + RestHandlerService firstInstance = RestHandlerService.getInstance(); + RestHandlerService secondInstance = RestHandlerService.getInstance(); + assertNotNull(firstInstance); + assertNotNull(secondInstance); + assertTrue(firstInstance == secondInstance); + + } +} diff --git a/aai-core/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java b/aai-core/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java index 97349ecc..071b630b 100644 --- a/aai-core/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java +++ b/aai-core/src/test/java/org/onap/aai/util/JettyObfuscationConversionCommandLineUtilTest.java @@ -4,6 +4,8 @@ * ================================================================================ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Modifications Copyright © 2018 IBM. + * ================================================================================ * 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 @@ -30,42 +32,65 @@ import org.junit.Test; public class JettyObfuscationConversionCommandLineUtilTest { - private final ByteArrayOutputStream testOut = new ByteArrayOutputStream(); + private final ByteArrayOutputStream testOut = new ByteArrayOutputStream(); + + /** + * Test. + */ + @Test + public void test() { + //setup, this will catch main's print statements for evaluation + PrintStream oldOutputStream = System.out; + System.setOut(new PrintStream(testOut)); + + /* ------ TEST OBFUSCATION ----*/ + JettyObfuscationConversionCommandLineUtil.main(new String[]{"-e", "hello world"}); + /* + * testOut was also catching any logging statements which interfered with result checking. + * This regex business was the workaround - it tries to find the expected value in + * the results and asserts against that. + */ + String obfResult = testOut.toString(); + String obfExpected = "OBF:1thf1ugo1x151wfw1ylz11tr1ymf1wg21x1h1uh21th7"; + Pattern obfExpectPat = Pattern.compile(obfExpected); + Matcher obfMatch = obfExpectPat.matcher(obfResult); + assertTrue(obfMatch.find()); + + testOut.reset(); //clear out previous result + + /* ------ TEST DEOBFUSCATION ----- */ + JettyObfuscationConversionCommandLineUtil.main(new String[]{"-d", obfExpected}); + String deobfResult = testOut.toString(); + String deobfExpected = "hello world"; + Pattern deobfExpectPat = Pattern.compile(deobfExpected); + Matcher deobfMatch = deobfExpectPat.matcher(deobfResult); + assertTrue(deobfMatch.find()); - /** - * Test. - */ - @Test - public void test() { - //setup, this will catch main's print statements for evaluation - PrintStream oldOutputStream = System.out; - System.setOut(new PrintStream(testOut)); + //clean up, resets to stdout + System.setOut(oldOutputStream); + } - /* ------ TEST OBFUSCATION ----*/ - JettyObfuscationConversionCommandLineUtil.main(new String[]{"-e", "hello world"}); - /* - * testOut was also catching any logging statements which interfered with result checking. - * This regex business was the workaround - it tries to find the expected value in - * the results and asserts against that. - */ - String obfResult = testOut.toString(); - String obfExpected = "OBF:1thf1ugo1x151wfw1ylz11tr1ymf1wg21x1h1uh21th7"; - Pattern obfExpectPat = Pattern.compile(obfExpected); - Matcher obfMatch = obfExpectPat.matcher(obfResult); - assertTrue(obfMatch.find()); + + /** + * Test. + */ + @Test + public void testUsage() { + System.setOut(new PrintStream(testOut)); - testOut.reset(); //clear out previous result + /* ------ TEST OBFUSCATION ----*/ + JettyObfuscationConversionCommandLineUtil.main(new String[]{"-f", "hello world"}); + /* + * testOut was also catching any logging statements which interfered with result checking. + * This regex business was the workaround - it tries to find the expected value in + * the results and asserts against that. + */ + String obfResult = testOut.toString(); + assertTrue(obfResult.startsWith("failed to parse input")); + + testOut.reset(); //clear out previous result - /* ------ TEST DEOBFUSCATION ----- */ - JettyObfuscationConversionCommandLineUtil.main(new String[]{"-d", obfExpected}); - String deobfResult = testOut.toString(); - String deobfExpected = "hello world"; - Pattern deobfExpectPat = Pattern.compile(deobfExpected); - Matcher deobfMatch = deobfExpectPat.matcher(deobfResult); - assertTrue(deobfMatch.find()); - //clean up, resets to stdout - System.setOut(oldOutputStream); - } + } } diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml index 9ac9695e..d2f93694 100644 --- a/aai-schema-ingest/pom.xml +++ b/aai-schema-ingest/pom.xml @@ -25,11 +25,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>aai-schema-ingest</artifactId> <name>aai-schema-ingest</name> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <build> diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 7facd99f..e949d236 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -27,11 +27,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>aai-schema</artifactId> <name>aai-schema</name> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <!-- Start of Default ONAP Schema Properties --> diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json index 1b6d9405..62b6c52e 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json @@ -197,7 +197,7 @@ "to": "service-instance", "label": "org.onap.relationships.inventory.PartOf", "direction": "OUT", - "multiplicity": "ONE2MANY", + "multiplicity": "MANY2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "prevent-delete": "NONE", diff --git a/aai-schema/src/main/xjb/bindings-onap.xjb b/aai-schema/src/main/xjb/bindings-onap.xjb index 85713f2e..f5579b81 100644 --- a/aai-schema/src/main/xjb/bindings-onap.xjb +++ b/aai-schema/src/main/xjb/bindings-onap.xjb @@ -2,7 +2,11 @@ <jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"> + <jaxb:globalBindings> + <xjc:serializable uid="14"/> + </jaxb:globalBindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v8"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v8"/> @@ -16,7 +20,7 @@ <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v10"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v10"/> - </jaxb:schemaBindings> + </jaxb:schemaBindings> </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v11"> <jaxb:schemaBindings> @@ -26,7 +30,7 @@ <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v12"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v12"/> - </jaxb:schemaBindings> + </jaxb:schemaBindings> </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v13"> <jaxb:schemaBindings> @@ -35,7 +39,7 @@ </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v14"> <jaxb:schemaBindings> - <jaxb:package name="org.onap.aai.domain.yang"/> - </jaxb:schemaBindings> + <jaxb:package name="org.onap.aai.domain.yang"/> + </jaxb:schemaBindings> </jaxb:bindings> </jaxb:bindings> diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index 4eadb513..0f02b995 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -29,11 +29,11 @@ <parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <artifactId>aai-utils</artifactId> <name>aai-utils</name> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> @@ -30,7 +30,7 @@ <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-aai-common</name> <description>Contains all of the common code for resources and traversal repos</description> diff --git a/version.properties b/version.properties index 51e1781e..66827fd3 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ # because they are used in Jenkins, whose plug-in doesn't support major_version=1 -minor_version=3 +minor_version=4 patch_version=0 base_version=${major_version}.${minor_version}.${patch_version} |