[Policy-52, Policy-92, Policy-93] Policy Enhancements and bugfixes

[policy/engine.git] / BRMSGateway / src / main / java / org / openecomp / policy / brmsInterface / BRMSPush.java

diff --git a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSPush.java b/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSPush.java
index 1fbd2aa..def57e2 100644 (file)
--- a/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSPush.java
+++ b/BRMSGateway/src/main/java/org/openecomp/policy/brmsInterface/BRMSPush.java
@@ -99,7 +99,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
  * BRMSPush: Application responsible to push policies to the BRMS PDP Policy Repository (PR). 
  * Mavenize and push policy to PR
  * 
- * @version 0.9 
+ * @version 1.0 
  */
 
 @SuppressWarnings("deprecation")
@@ -589,7 +589,14 @@ public class BRMSPush {
                 result = artifact;
             }
         }
-        return result;
+        return additionalNexusLatestCheck(selectedName, result);
+       }
+       
+       // Additional Check due to Limitations from Nexus API to check if the artifact is the latest.
+       private NexusArtifact additionalNexusLatestCheck(String selectedName, NexusArtifact result) {
+               String nextVersion = incrementVersion(result.getVersion());
+        List<NexusArtifact> artifact = getArtifactFromNexus(selectedName, nextVersion);
+        return artifact.isEmpty()? result: additionalNexusLatestCheck(selectedName, artifact.get(0));
        }
 
        private boolean checkRemoteSync(String selectedName, String version) {
@@ -630,7 +637,7 @@ public class BRMSPush {
                                }
                        }
                }
-               return new ArrayList<NexusArtifact>();
+               return new ArrayList<>();
        }
 
        private void setVersion(String selectedName) {
@@ -901,43 +908,43 @@ public class BRMSPush {
                String version= StringEscapeUtils.escapeJava(brmsdependencyversion);
 
                Dependency demoDependency = new Dependency();
-               demoDependency.setGroupId("org.openecomp.policy.drools-applications");
+               demoDependency.setGroupId("org.onap.policy.drools-applications");
                demoDependency.setArtifactId("demo");
                demoDependency.setVersion(version);
                dependencyList.add(demoDependency);
 
                Dependency controlloopDependency = new Dependency();
-               controlloopDependency.setGroupId("org.openecomp.policy.drools-applications");
-               controlloopDependency.setArtifactId("controlloop");
+               controlloopDependency.setGroupId("org.onap.policy.drools-applications");
+               controlloopDependency.setArtifactId("events");
                controlloopDependency.setVersion(version);
                dependencyList.add(controlloopDependency);
 
                Dependency restDependency = new Dependency();
-               restDependency.setGroupId("org.openecomp.policy.drools-applications");
+               restDependency.setGroupId("org.onap.policy.drools-applications");
                restDependency.setArtifactId("rest");
                restDependency.setVersion(version);
                dependencyList.add(restDependency);
 
                Dependency appcDependency = new Dependency();
-               appcDependency.setGroupId("org.openecomp.policy.drools-applications");
+               appcDependency.setGroupId("org.onap.policy.drools-applications");
                appcDependency.setArtifactId("appc");
                appcDependency.setVersion(version);
                dependencyList.add(appcDependency);
 
                Dependency aaiDependency = new Dependency();
-               aaiDependency.setGroupId("org.openecomp.policy.drools-applications");
+               aaiDependency.setGroupId("org.onap.policy.drools-applications");
                aaiDependency.setArtifactId("aai");
                aaiDependency.setVersion(version);
                dependencyList.add(aaiDependency);
 
                Dependency msoDependency = new Dependency();
-               msoDependency.setGroupId("org.openecomp.policy.drools-applications");
+               msoDependency.setGroupId("org.onap.policy.drools-applications");
                msoDependency.setArtifactId("mso");
                msoDependency.setVersion(version);
                dependencyList.add(msoDependency);
 
                Dependency trafficgeneratorDependency = new Dependency();
-               trafficgeneratorDependency.setGroupId("org.openecomp.policy.drools-applications");
+               trafficgeneratorDependency.setGroupId("org.onap.policy.drools-applications");
                trafficgeneratorDependency.setArtifactId("trafficgenerator");
                trafficgeneratorDependency.setVersion(version); 
                dependencyList.add(trafficgeneratorDependency);