From 6a0812672bc3d8032f170d72854fec45023cffa5 Mon Sep 17 00:00:00 2001 From: "Smokowski, Kevin (ks6305)" Date: Fri, 16 Mar 2018 19:46:56 +0000 Subject: Additional enum support support enumerations containing whitespace Change-Id: I91971a111e67e0faf757c954fb6658529e3020d2 Issue-ID: CCSDK-214 Signed-off-by: Smokowski, Kevin (ks6305) --- .../java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java | 3 +++ .../org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java index bea21387..76101514 100644 --- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java +++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java @@ -1267,6 +1267,9 @@ public class MdsalHelper { // This will strip out all periods, which cannot be in a java enum inStr = inStr.replaceAll("\\.", ""); + //This is needed for enums containing spaces + inStr = inStr.replaceAll(" ", ""); + String[] terms = inStr.split("-"); StringBuffer sbuff = new StringBuffer(); diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java index c00da68c..e7f1e18b 100644 --- a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java +++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java @@ -28,7 +28,10 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import static org.junit.Assert.*; + import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode; +import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper; import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter; @@ -132,4 +135,10 @@ public class MdsalHelperTest extends TestCase { } + + public void testToJavaEnum() throws Exception{ + assertEquals("_2018HelloWorld",MdsalHelper.toJavaEnum("2018Hello World")); + assertEquals("SomethingElse",MdsalHelper.toJavaEnum("Something.Else")); + assertEquals("MyTestString",MdsalHelper.toJavaEnum("my-test-string")); + } } -- cgit 1.2.3-korg