Merge "Fix the javadocs error in jenkins"

diff --git a/.gitignore b/.gitignore
index d1d4b34..b181972 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ bundleconfig-local/etc/auth/tomcat_keystore
 bundleconfig-local/etc/logback.xml
 /.pydevproject
 /bin/
+/.idea
+*.iml

diff --git a/.gitreview b/.gitreview
index 8ad7f0b..7c219d2 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
 host=gerrit.onap.org
 port=29418
-project=aai-common.git
+project=aai/aai-common

diff --git a/aai-core/src/test/java/org/openecomp/aai/dbmodel/DbEdgeRulesConverterTest.java b/aai-core/src/test/java/org/openecomp/aai/dbmodel/DbEdgeRulesConverterTest.java
index 1310a05..3a1d9cc 100644 (file)
--- a/aai-core/src/test/java/org/openecomp/aai/dbmodel/DbEdgeRulesConverterTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/dbmodel/DbEdgeRulesConverterTest.java
@@ -73,15 +73,18 @@ public class DbEdgeRulesConverterTest {
                                .putAll("baz|quux",
                                                "treatsVeryKindly,IN,One2One,true,true,true,true")
                                .build();
-               
+
                try {
                        dberCon.setup(dest);
                        File result = new File(outFile);
+                       //Add delete hook to delete the temporary result file on exit/
+                       result.deleteOnExit();
                        FileOutputStream writeStream = new FileOutputStream(result);
                        Writer writer = new OutputStreamWriter(writeStream);
                        dberCon.convert(EdgeRules, writer);
                        File compare = new File("src/test/resources/dbEdgeRulesConversion/conversionTestCompare.json");
                        assertTrue(FileUtils.contentEquals(result, compare));
+                       writer.close();
                } catch (IOException e) {
                        e.printStackTrace();
                        fail("IOException on setup");