Merge "Remove performance problem."

6 files changed, 92 insertions, 17 deletions

diff --git a/pom.xml b/pom.xml
index c66b855..e955c80 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,12 @@ limitations under the License.
          <scope>test</scope>
       </dependency>
 
+     <dependency>
+       <groupId>org.assertj</groupId>
+       <artifactId>assertj-core</artifactId>
+       <version>3.10.0</version>
+       <scope>test</scope>
+     </dependency>
       <dependency>
          <groupId>org.powermock</groupId>
          <artifactId>powermock-api-mockito</artifactId>
diff --git a/src/main/java/org/onap/aai/datarouter/policy/AbstractSpikeEntityEventProcessor.java b/src/main/java/org/onap/aai/datarouter/policy/AbstractSpikeEntityEventProcessor.java
index 7a4884a..ca8caf4 100644
--- a/src/main/java/org/onap/aai/datarouter/policy/AbstractSpikeEntityEventProcessor.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/AbstractSpikeEntityEventProcessor.java
@@ -407,13 +407,7 @@ public abstract class AbstractSpikeEntityEventProcessor implements Processor {
 
 
  protected String getOxmEntityType(String entityType) {
-
-   String[] entityTypeArr = entityType.split("-");
-   String oxmEntityType = "";
-   for (String entityWord : entityTypeArr) {
-     oxmEntityType += entityWord.substring(0, 1).toUpperCase() + entityWord.substring(1);
-   }
-   return oxmEntityType;
+   return new OxmEntityTypeConverter().convert(entityType);
  }
  
  protected List<String> getSearchableAttibutes(DynamicJAXBContext oxmJaxbContext, String oxmEntityType,
diff --git a/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
index c1a1f2e..ae5d0e6 100644
--- a/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/EntityEventPolicy.java
@@ -314,11 +314,7 @@ public class EntityEventPolicy implements Processor {
 
 
     // Process for building AaiEventEntity object
-    String[] entityTypeArr = entityType.split("-");
-    String oxmEntityType = "";
-    for (String entityWord : entityTypeArr) {
-      oxmEntityType += entityWord.substring(0, 1).toUpperCase() + entityWord.substring(1);
-    }
+    String oxmEntityType = new OxmEntityTypeConverter().convert(entityType);
 
     List<String> searchableAttr =
         getOxmAttributes(uebPayload, oxmJaxbContext, oxmEntityType, entityType, "searchable");
diff --git a/src/main/java/org/onap/aai/datarouter/policy/OxmEntityTypeConverter.java b/src/main/java/org/onap/aai/datarouter/policy/OxmEntityTypeConverter.java
new file mode 100644
index 0000000..d05ebc9
--- /dev/null
+++ b/src/main/java/org/onap/aai/datarouter/policy/OxmEntityTypeConverter.java
@@ -0,0 +1,42 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Nokia
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.datarouter.policy;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Created by Bogumil Zebek on 6/21/18.
+ */
+public class OxmEntityTypeConverter {
+
+    private static final String DELIMITER = "-";
+
+    public String convert(String entityType) {
+
+        String[] entityTypeArr = entityType.split(DELIMITER);
+
+        StringBuilder oxmEntityType = new StringBuilder();
+        for (String entityWord : entityTypeArr) {
+            oxmEntityType.append(StringUtils.capitalize(entityWord));
+        }
+        return oxmEntityType.toString();
+    }
+}
diff --git a/src/main/java/org/onap/aai/datarouter/policy/SpikeEntityEventPolicy.java b/src/main/java/org/onap/aai/datarouter/policy/SpikeEntityEventPolicy.java
index 8f0e426..67db407 100644
--- a/src/main/java/org/onap/aai/datarouter/policy/SpikeEntityEventPolicy.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/SpikeEntityEventPolicy.java
@@ -338,11 +338,7 @@ public class SpikeEntityEventPolicy implements Processor {
         eventPayload);
 
     // Process for building SpikeEventEntity object
-    String[] entityTypeArr = entityType.split("-");
-    String oxmEntityType = "";
-    for (String entityWord : entityTypeArr) {
-      oxmEntityType += entityWord.substring(0, 1).toUpperCase() + entityWord.substring(1);
-    }
+    String oxmEntityType = new OxmEntityTypeConverter().convert(entityType);
     
     List<String> searchableAttr =
         getOxmAttributes(oxmJaxbContext, oxmEntityType, entityType, "searchable");
diff --git a/src/test/java/org/onap/aai/datarouter/policy/OxmEntityTypeConverterTest.java b/src/test/java/org/onap/aai/datarouter/policy/OxmEntityTypeConverterTest.java
new file mode 100644
index 0000000..12e23be
--- /dev/null
+++ b/src/test/java/org/onap/aai/datarouter/policy/OxmEntityTypeConverterTest.java
@@ -0,0 +1,41 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Nokia
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.datarouter.policy;
+
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+/**
+ * Created by Bogumil Zebek on 6/21/18.
+ */
+public class OxmEntityTypeConverterTest {
+
+    private OxmEntityTypeConverter oxmEntityTypeConverter = new OxmEntityTypeConverter();
+
+    @Test
+    public void shouldConvertEntityTypeToOxmEntityType(){
+        Assertions.assertThat(oxmEntityTypeConverter.convert("generic-vnf")).isEqualTo("GenericVnf");
+        Assertions.assertThat(oxmEntityTypeConverter.convert("pserver")).isEqualTo("Pserver");
+        Assertions.assertThat(oxmEntityTypeConverter.convert("optical-router")).isEqualTo("OpticalRouter");
+    }
+
+}
\ No newline at end of file