Merge "Migrate aai-aai-common docs"

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 6115680..932454c 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-annotations</artifactId>

diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index 1f29c9d..223e1b5 100644 (file)
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-auth</artifactId>

diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml
index 72b12cf..c705596 100644 (file)
--- a/aai-common-docker/pom.xml
+++ b/aai-common-docker/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index eebfbeb..e5ba732 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -28,7 +28,7 @@
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
-               <version>1.6.3-SNAPSHOT</version>
+               <version>1.6.4-SNAPSHOT</version>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-core</artifactId>
@@ -39,7 +39,7 @@
                <sonar.language>java</sonar.language>
                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
-               <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>
+               <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/coverage-reports/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
                <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
                <sonar.projectVersion>${project.version}</sonar.projectVersion>
                <httpclient.version>4.5.5</httpclient.version>
@@ -112,14 +112,14 @@
                                <version>2.8</version>
                        </plugin>
                        <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>sonar-maven-plugin</artifactId>
-                               <version>3.2</version>
+                         <groupId>org.sonarsource.scanner.maven</groupId>
+                         <artifactId>sonar-maven-plugin</artifactId>
+                         <version>3.6.1.1688</version>
                        </plugin>
                        <plugin>
                                <groupId>org.jacoco</groupId>
                                <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
+                               <version>0.8.5</version>
                                <configuration>
                                        <dumpOnExit>true</dumpOnExit>
                                </configuration>
@@ -130,7 +130,7 @@
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.xml</destFile>
                                                        <!-- <append>true</append> -->
                                                </configuration>
                                        </execution>
@@ -142,7 +142,7 @@
                                                </goals>
                                                <configuration>
                                                        <!-- Sets the path to the file which contains the execution data. -->
-                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
+                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco.xml</dataFile>
                                                        <!-- Sets the output directory for the code coverage report. -->
                                                        <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
                                                </configuration>
@@ -153,7 +153,7 @@
                                                        <goal>check</goal>
                                                </goals>
                                                <configuration>
-                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
+                                                       <dataFile>${project.build.directory}/coverage-reports/jacoco.xml</dataFile>
                                                        <rules>
                                                                <rule implementation="org.jacoco.maven.RuleConfiguration">
                                                                        <element>BUNDLE</element>

diff --git a/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java b/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java
index 9e599a6..11e6233 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/Introspector.java
@@ -177,7 +177,7 @@ public abstract class Introspector implements Cloneable {
         if (obj != null) {
 
             try {
-                if (!obj.getClass().getName().equals(nameClass.getName())) {
+                if (!nameClass.isAssignableFrom(obj.getClass())) {
                     if (nameClass.isPrimitive()) {
                         nameClass = ClassUtils.primitiveToWrapper(nameClass);
                         result = nameClass.getConstructor(String.class).newInstance(obj.toString());
@@ -349,7 +349,7 @@ public abstract class Introspector implements Cloneable {
     /**
      * This will returned the generic parameterized type of the underlying
      * object if it exists
-     * 
+     *
      * @param name
      * @return the generic type of the java class of the underlying object
      */
@@ -414,7 +414,7 @@ public abstract class Introspector implements Cloneable {
 
     /**
      * Is this type not a Java String or primitive
-     * 
+     *
      * @param name
      * @return
      */

diff --git a/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java b/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java
index 55580dc..e628d5a 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java
+++ b/aai-core/src/main/java/org/onap/aai/introspection/JSONStrategy.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.onap.aai.schema.enums.ObjectMetadata;
 import org.onap.aai.schema.enums.PropertyMetadata;
@@ -149,7 +150,7 @@ public class JSONStrategy extends Introspector {
         Object resultObject = null;
         Class<?> resultClass = null;
         resultObject = this.getValue(name);
-        if (resultObject.getClass().getName().equals("org.json.simple.JSONArray")) {
+        if (resultObject instanceof JSONArray) {
             resultClass = ((List) resultObject).get(0).getClass();
         }
 
@@ -273,10 +274,10 @@ public class JSONStrategy extends Introspector {
     /*
      * @Override
      * public String findEdgeName(String parent, String child) {
-     * 
+     *
      * // Always has for now
      * return "has";
-     * 
+     *
      * }
      */
 

diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index 68aaf02..ef0538c 100644 (file)
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -27,7 +27,7 @@
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-common</artifactId>
-               <version>1.6.3-SNAPSHOT</version>
+               <version>1.6.4-SNAPSHOT</version>
        </parent>
        <artifactId>aai-parent</artifactId>
        <name>aai-parent</name>
@@ -63,7 +63,7 @@
                <eelf.core.version>1.0.1-oss</eelf.core.version>
                <freemarker.version>2.3.29</freemarker.version>
                <google.guava.version>19.0</google.guava.version>
-               <gremlin.version>3.2.11</gremlin.version>
+               <gremlin.version>3.2.3</gremlin.version>
                <groovy.version>2.5.8</groovy.version>
                <gson.version>2.8.6</gson.version>
                <hamcrest.junit.version>2.0.0.0</hamcrest.junit.version>

diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index ebf464d..c271ccc 100644 (file)
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-rest</artifactId>

diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
index 14b07a5..fb21264 100644 (file)
--- a/aai-schema-abstraction/pom.xml
+++ b/aai-schema-abstraction/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-parent</artifactId>
-    <version>1.6.3-SNAPSHOT</version>
+    <version>1.6.4-SNAPSHOT</version>
     <relativePath>../aai-parent/pom.xml</relativePath>
   </parent>
   

diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index 183c553..c684d9d 100644 (file)
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -15,7 +15,7 @@
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
-               <version>1.6.3-SNAPSHOT</version>
+               <version>1.6.4-SNAPSHOT</version>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-schema-ingest</artifactId>

diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index b090050..8c7eba9 100644 (file)
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.3-SNAPSHOT</version>
+        <version>1.6.4-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-utils</artifactId>

diff --git a/pom.xml b/pom.xml
index dc5aebc..f5e9a7d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.6.3-SNAPSHOT</version>
+    <version>1.6.4-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/releases/1.6.4-maven-release.yaml b/releases/1.6.4-maven-release.yaml
new file mode 100644 (file)
index 0000000..3e37cb5
--- /dev/null
+++ b/releases/1.6.4-maven-release.yaml
@@ -0,0 +1,4 @@
+distribution_type: maven
+log_dir: aai-aai-common-maven-stage-master/245/
+project: aai-common
+version: 1.6.4

diff --git a/version.properties b/version.properties
index fd02907..fc0709c 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=6
-patch_version=3
+patch_version=4
 
 base_version=${major_version}.${minor_version}.${patch_version}