From f94a95f9db9e843671f480efd6227f7c72d47532 Mon Sep 17 00:00:00 2001
From: "Eran (ev672n), Vosk" <ev672n@att.com>
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 <ev672n@att.com>
---
 .../src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java  | 2 +-
 .../org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java    | 2 +-
 .../sdc/dcae/rule/editor/translators/StringTransformTranslator.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'dcaedt_be/src/main')

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<StringTransformA
 			targetCase = action.targetCase();
 			trim = String.valueOf(action.trim());
 			toField = action.getTarget();
-			value = action.fromValue();
+			value = action.startValue();
 		}
 	}
 
-- 
cgit 1.2.3-korg