From f94a95f9db9e843671f480efd6227f7c72d47532 Mon Sep 17 00:00:00 2001 From: "Eran (ev672n), Vosk" Date: Mon, 29 Oct 2018 18:10:13 +0200 Subject: Sync code Sync the code between repositories Change-Id: I3e570c9c8b090adc5520381019a22e8a46d66beb Issue-ID: SDC-1874 Signed-off-by: Eran (ev672n), Vosk --- dcaedt_be/pom.xml | 14 +++++++------- .../onap/sdc/dcae/composition/CompositionEngine.java | 2 +- .../composition/impl/CompositionBusinessLogic.java | 2 +- .../editor/translators/StringTransformTranslator.java | 2 +- .../composition/impl/BlueprintBusinessLogicTest.java | 2 +- .../composition/impl/CompositionBusinessLogicTest.java | 4 ++-- .../composition/impl/ServiceBusinessLogicTest.java | 4 ++-- .../dcae/composition/impl/VfcmtBusinessLogicTest.java | 18 +++++++++--------- 8 files changed, 24 insertions(+), 24 deletions(-) (limited to 'dcaedt_be') diff --git a/dcaedt_be/pom.xml b/dcaedt_be/pom.xml index a33306a..950af26 100644 --- a/dcaedt_be/pom.xml +++ b/dcaedt_be/pom.xml @@ -36,7 +36,7 @@ org.apache.commons commons-lang3 - 3.5 + 3.7 commons-net @@ -51,7 +51,7 @@ com.google.code.gson gson - 2.8.0 + 2.8.5 org.json @@ -86,13 +86,13 @@ org.powermock powermock-module-junit4 - 2.0.0-beta.5 + 1.6.4 test org.powermock - powermock-api-mockito2 - 2.0.0-beta.5 + powermock-api-mockito + 1.6.4 test @@ -109,7 +109,7 @@ io.springfox springfox-swagger2 - 2.6.1 + 2.8.0 compile @@ -135,7 +135,7 @@ org.springframework.boot spring-boot-starter-jetty - 2.0.5.RELEASE + 2.0.6.RELEASE org.eclipse.jetty.websocket diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java index f07358a..c633c59 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java @@ -14,7 +14,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.boot.web.support.SpringBootServletInitializer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java index 43674fe..2791028 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java @@ -148,7 +148,7 @@ public class CompositionBusinessLogic extends BaseBusinessLogic { if (null != vfiRefs && 1 < vfiRefs.size()) { debugLogger.log(LogLevel.DEBUG, this.getClass().getName(), "Found {} external monitoring references for vfi {} on service {}:{}", vfiRefs.size(), newReferencedMc.getVfiName(), service.getUuid(), vfiRefs); Collections.synchronizedList(vfiRefs).parallelStream() - .filter(p -> !newReferencedMc.getUuid().equals(p)) + .filter(p -> !newReferencedMc.getUuid().equals(p) && !p.endsWith(REVERTED_REF)) .filter(p -> newReferencedMc.getInvariantUUID().equals(sdcRestClient.getResource(p, requestId).getInvariantUUID())) .forEach(id -> sdcRestClient.deleteExternalMonitoringReference(userId, context, service.getUuid(), normalizedInstanceName, id, requestId)); } else { diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/StringTransformTranslator.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/StringTransformTranslator.java index de326d1..146fc53 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/StringTransformTranslator.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/StringTransformTranslator.java @@ -24,7 +24,7 @@ public class StringTransformTranslator extends ActionTranslator listOfArtifactCompositionYml = new ArrayList<>(); - Artifact compositionArtifact = Mockito.mock(Artifact.class); + Artifact compositionArtifact = mock(Artifact.class); when(compositionArtifact.getArtifactName()).thenReturn(DcaeBeConstants.Composition.fileNames.COMPOSITION_YML); when(compositionArtifact.getArtifactUUID()).thenReturn("compositionArtifactUuid"); when(compositionArtifact.getPayloadData()).thenReturn("{\"flowType\":\"don't override\"}"); @@ -303,7 +303,7 @@ public class VfcmtBusinessLogicTest { private void emulateCdumpArtifactWithoutFlowtype() { List listOfArtifactCompositionYml = new ArrayList<>(); - Artifact compositionArtifact = Mockito.mock(Artifact.class); + Artifact compositionArtifact = mock(Artifact.class); when(compositionArtifact.getArtifactName()).thenReturn(DcaeBeConstants.Composition.fileNames.COMPOSITION_YML); when(compositionArtifact.getArtifactUUID()).thenReturn("compositionArtifactUuid"); when(compositionArtifact.getPayloadData()).thenReturn("{\"cid\":\"xsssdaerrwr\"}\""); @@ -313,8 +313,8 @@ public class VfcmtBusinessLogicTest { private void emulateListOfArtifactsWithCompositionYmlAndSvcRef() { List listOfArtifactCompositionYml = new ArrayList<>(); - Artifact compositionArtifact = Mockito.mock(Artifact.class); - Artifact svcRefArtifact = Mockito.mock(Artifact.class); + Artifact compositionArtifact = mock(Artifact.class); + Artifact svcRefArtifact = mock(Artifact.class); when(compositionArtifact.getArtifactName()).thenReturn(DcaeBeConstants.Composition.fileNames.COMPOSITION_YML); when(compositionArtifact.getArtifactUUID()).thenReturn("compositionArtifactUuid"); when(compositionArtifact.getPayloadData()).thenReturn("{\"flowType\":\"don't override\"}"); -- cgit 1.2.3-korg