From 6535675526d608c835f4702b2ee57799da250fbe Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Sun, 25 Nov 2018 11:49:39 +0200 Subject: SDC can not handle complex string in tosca yaml Issue-ID: SDC-1918 Change-Id: I86957b5d4bf0dab5ca749623efbccd6f4b535f10 Signed-off-by: Tal Gitelman --- .../openecomp/sdc/common/util/ValidationUtils.java | 30 +++++++++++++++++++++- .../openecomp/sdc/common/test/CommonUtilsTest.java | 2 +- 2 files changed, 30 insertions(+), 2 deletions(-) (limited to 'common-app-api') diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java index 0ee097b979..adfa457166 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java @@ -259,7 +259,35 @@ public class ValidationUtils { } public static String normaliseWhitespace(String str) { - return StringUtil.normaliseWhitespace(str); + StringBuilder sb = new StringBuilder(str.length()); + appendNormalisedWhitespace(sb, str, false); + return sb.toString(); + } + + private static void appendNormalisedWhitespace(StringBuilder accum, String string, boolean stripLeading) { + boolean lastWasWhite = false; + boolean reachedNonWhite = false; + + int len = string.length(); + int c; + for (int i = 0; i < len; i+= Character.charCount(c)) { + c = string.codePointAt(i); + if (isWhitespace(c)) { + if ((stripLeading && !reachedNonWhite) || lastWasWhite) + continue; + accum.append(' '); + lastWasWhite = true; + } + else { + accum.appendCodePoint(c); + lastWasWhite = false; + reachedNonWhite = true; + } + } + } + + private static boolean isWhitespace(int c){ + return c == ' '; } public static String stripOctets(String str) { diff --git a/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java b/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java index e59f6a061f..9806bffc5e 100644 --- a/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java +++ b/common-app-api/src/test/java/org/openecomp/sdc/common/test/CommonUtilsTest.java @@ -146,7 +146,7 @@ public class CommonUtilsTest { public void testnormaliseWhitespace() { assertEquals("goo boo", ValidationUtils.normaliseWhitespace("goo boo")); - assertEquals("goo boo ", ValidationUtils.normaliseWhitespace("goo boo ")); + assertEquals("goo boo ", ValidationUtils.normaliseWhitespace("goo boo ")); assertEquals("goo boo", ValidationUtils.normaliseWhitespace("goo boo")); } -- cgit 1.2.3-korg a>stats

path: root/examples/examples-periodic/pom.xml

blob: 8783c0334430f76d745ec055eeeb96d252786976 (plain)