X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=BRMSGateway%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2FbrmsInterface%2FBRMSPush.java;h=def57e2bc5ee3d719b3516d8dcd6638036afd97f;hb=e92ff832cf993db876f22b2d27562fedf59f5043;hp=3254eac7abc6b48056a88b6863c811c4d0a02364;hpb=570290dc6ba8198e653022c2f6f8e5d01cfa8d1b;p=policy%2Fengine.git 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 3254eac7a..def57e2bc 100644 --- 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 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(); + return new ArrayList<>(); } private void setVersion(String selectedName) { @@ -908,7 +915,7 @@ public class BRMSPush { Dependency controlloopDependency = new Dependency(); controlloopDependency.setGroupId("org.onap.policy.drools-applications"); - controlloopDependency.setArtifactId("controlloop"); + controlloopDependency.setArtifactId("events"); controlloopDependency.setVersion(version); dependencyList.add(controlloopDependency);