Fix sonar violation

Fix sonar violation'

Change-Id: Ia5718d2bcbf9f5efea40d8250b7ad57f6d2eb2f3
Issue-ID: DCAEGEN2-1016
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>

diff --git a/etc/log4j.xml b/etc/log4j.xml
index 460004c..aa836eb 100644 (file)
--- a/etc/log4j.xml
+++ b/etc/log4j.xml
@@ -103,18 +103,18 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                <layout class="com.att.nsa.logging.log4j.EcompLayout"><param name="ConversionPattern" value="ECOMP_DEBUG" /></layout>
        </appender>
        
-       <logger name="org.onap.dcae.commonFunction.input" additivity="false">
+       <logger name="org.onap.dcae.common.input" additivity="false">
             <level value="INFO"/>
             <appender-ref ref="IFILE"/>
     </logger> 
 
-    <logger name="org.onap.dcae.commonFunction.output" additivity="false">
+    <logger name="org.onap.dcae.common.output" additivity="false">
             <level value="INFO"/>
             <appender-ref ref="CONSOLE" />
             <appender-ref ref="OFILE"/>
     </logger> 
 
-       <logger name="org.onap.dcae.commonFunction.error" additivity="false">
+       <logger name="org.onap.dcae.common.error" additivity="false">
             <level value="DEBUG"/>
             <appender-ref ref="EFILE"/>
             <appender-ref ref="CONSOLE" />
@@ -147,7 +147,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
                <appender-ref ref="ECOMP_DEBUG" />
        </logger>
     
-    <logger name="org.onap.dcae.commonFunction.EventPublisher" additivity="false">
+    <logger name="org.onap.dcae.common.EventPublisher" additivity="false">
                <level value="debug"/>
                <appender-ref ref="CONSOLE" />
        </logger>

diff --git a/src/main/java/org/onap/dcae/VesApplication.java b/src/main/java/org/onap/dcae/VesApplication.java
index b57caf3..48ac6b8 100644 (file)
--- a/src/main/java/org/onap/dcae/VesApplication.java
+++ b/src/main/java/org/onap/dcae/VesApplication.java
@@ -28,11 +28,11 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
-import org.onap.dcae.commonFunction.EventProcessor;
-import org.onap.dcae.commonFunction.EventSender;
-import org.onap.dcae.commonFunction.event.publishing.DMaaPConfigurationParser;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
-import org.onap.dcae.commonFunction.event.publishing.PublisherConfig;
+import org.onap.dcae.common.EventProcessor;
+import org.onap.dcae.common.EventSender;
+import org.onap.dcae.common.publishing.DMaaPConfigurationParser;
+import org.onap.dcae.common.publishing.EventPublisher;
+import org.onap.dcae.common.publishing.PublisherConfig;
 import org.onap.dcae.controller.ConfigLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,9 +48,9 @@ import org.springframework.context.annotation.Lazy;
 public class VesApplication {
 
     private static final Logger metriclog = LoggerFactory.getLogger("com.att.ecomp.metrics");
-    private static final Logger incomingRequestsLogger = LoggerFactory.getLogger("org.onap.dcae.commonFunction.input");
-    private static final Logger oplog = LoggerFactory.getLogger("org.onap.dcae.commonFunction.output");
-    private static final Logger errorLog = LoggerFactory.getLogger("org.onap.dcae.commonFunction.error");
+    private static final Logger incomingRequestsLogger = LoggerFactory.getLogger("org.onap.dcae.common.input");
+    private static final Logger oplog = LoggerFactory.getLogger("org.onap.dcae.common.output");
+    private static final Logger errorLog = LoggerFactory.getLogger("org.onap.dcae.common.error");
     private static final int MAX_THREADS = 20;
     public static LinkedBlockingQueue<JSONObject> fProcessingInputQueue;
     private static ApplicationSettings properties;

diff --git a/src/main/java/org/onap/dcae/commonFunction/AnyNode.java b/src/main/java/org/onap/dcae/common/AnyNode.java
similarity index 99%
rename from src/main/java/org/onap/dcae/commonFunction/AnyNode.java
rename to src/main/java/org/onap/dcae/common/AnyNode.java
index 7be45b0..a68e629 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/AnyNode.java
+++ b/src/main/java/org/onap/dcae/common/AnyNode.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import io.vavr.collection.List;
 import io.vavr.collection.Set;

diff --git a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessorAdapter.java b/src/main/java/org/onap/dcae/common/ConfigProcessorAdapter.java
similarity index 97%
rename from src/main/java/org/onap/dcae/commonFunction/ConfigProcessorAdapter.java
rename to src/main/java/org/onap/dcae/common/ConfigProcessorAdapter.java
index 3df412e..0a93bb8 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessorAdapter.java
+++ b/src/main/java/org/onap/dcae/common/ConfigProcessorAdapter.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import java.lang.reflect.Method;
 import org.json.JSONObject;

diff --git a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java b/src/main/java/org/onap/dcae/common/ConfigProcessors.java
similarity index 99%
rename from src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
rename to src/main/java/org/onap/dcae/common/ConfigProcessors.java
index 09ceeac..c459bb1 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/ConfigProcessors.java
+++ b/src/main/java/org/onap/dcae/common/ConfigProcessors.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

diff --git a/src/main/java/org/onap/dcae/commonFunction/Event.java b/src/main/java/org/onap/dcae/common/Event.java
similarity index 97%
rename from src/main/java/org/onap/dcae/commonFunction/Event.java
rename to src/main/java/org/onap/dcae/common/Event.java
index faae245..1fa8179 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/Event.java
+++ b/src/main/java/org/onap/dcae/common/Event.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import com.google.gson.JsonObject;
 

diff --git a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java b/src/main/java/org/onap/dcae/common/EventProcessor.java
similarity index 96%
rename from src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
rename to src/main/java/org/onap/dcae/common/EventProcessor.java
index bd83045..bf3bf70 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java
+++ b/src/main/java/org/onap/dcae/common/EventProcessor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================\r
  */\r
 \r
-package org.onap.dcae.commonFunction;\r
+package org.onap.dcae.common;\r
 \r
 import com.att.nsa.clock.SaClock;\r
 import com.att.nsa.logging.LoggingContext;\r

diff --git a/src/main/java/org/onap/dcae/commonFunction/EventSender.java b/src/main/java/org/onap/dcae/common/EventSender.java
similarity index 96%
rename from src/main/java/org/onap/dcae/commonFunction/EventSender.java
rename to src/main/java/org/onap/dcae/common/EventSender.java
index 8a9c1ec..3c95315 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/EventSender.java
+++ b/src/main/java/org/onap/dcae/common/EventSender.java
@@ -18,23 +18,20 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import io.vavr.collection.Map;
-import io.vavr.control.Option;
 import java.io.FileReader;
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 import org.json.JSONObject;
 import org.onap.dcae.ApplicationSettings;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
+import org.onap.dcae.common.publishing.EventPublisher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/org/onap/dcae/commonFunction/Processor.java b/src/main/java/org/onap/dcae/common/Processor.java
similarity index 96%
rename from src/main/java/org/onap/dcae/commonFunction/Processor.java
rename to src/main/java/org/onap/dcae/common/Processor.java
index ea79f1d..20ef4da 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/Processor.java
+++ b/src/main/java/org/onap/dcae/common/Processor.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import com.google.gson.JsonObject;
 

diff --git a/src/main/java/org/onap/dcae/commonFunction/SSLContextCreator.java b/src/main/java/org/onap/dcae/common/SSLContextCreator.java
similarity index 98%
rename from src/main/java/org/onap/dcae/commonFunction/SSLContextCreator.java
rename to src/main/java/org/onap/dcae/common/SSLContextCreator.java
index 29e974e..a76c7cb 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/SSLContextCreator.java
+++ b/src/main/java/org/onap/dcae/common/SSLContextCreator.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import org.springframework.boot.web.server.Ssl;
 

diff --git a/src/main/java/org/onap/dcae/commonFunction/VESLogger.java b/src/main/java/org/onap/dcae/common/VESLogger.java
similarity index 99%
rename from src/main/java/org/onap/dcae/commonFunction/VESLogger.java
rename to src/main/java/org/onap/dcae/common/VESLogger.java
index 2a392e8..c735450 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/VESLogger.java
+++ b/src/main/java/org/onap/dcae/common/VESLogger.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import com.att.nsa.clock.SaClock;
 import com.att.nsa.logging.LoggingContext;

diff --git a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParser.java b/src/main/java/org/onap/dcae/common/publishing/DMaaPConfigurationParser.java
similarity index 95%
rename from src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParser.java
rename to src/main/java/org/onap/dcae/common/publishing/DMaaPConfigurationParser.java
index 91db517..274e449 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParser.java
+++ b/src/main/java/org/onap/dcae/common/publishing/DMaaPConfigurationParser.java
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import io.vavr.collection.List;
 import io.vavr.collection.Map;
 import io.vavr.control.Option;
 import io.vavr.control.Try;
-import org.onap.dcae.commonFunction.AnyNode;
+import org.onap.dcae.common.AnyNode;
 
 import java.net.URL;
 import java.nio.file.Files;
@@ -32,8 +32,8 @@ import java.nio.file.Path;
 import org.json.JSONObject;
 
 import static io.vavr.API.*;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.enhanceError;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.enhanceError;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
 
 /**
  * @author Pawel Szalapski (pawel.szalapski@nokia.com)

diff --git a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisher.java b/src/main/java/org/onap/dcae/common/publishing/DMaaPEventPublisher.java
similarity index 95%
rename from src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisher.java
rename to src/main/java/org/onap/dcae/common/publishing/DMaaPEventPublisher.java
index a0ee3bf..aa3dc7a 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisher.java
+++ b/src/main/java/org/onap/dcae/common/publishing/DMaaPEventPublisher.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import com.att.nsa.cambria.client.CambriaBatchingPublisher;
 import com.att.nsa.clock.SaClock;
@@ -28,13 +28,13 @@ import com.att.nsa.logging.log4j.EcompFields;
 import io.vavr.collection.Map;
 import io.vavr.control.Try;
 import org.json.JSONObject;
-import org.onap.dcae.commonFunction.VESLogger;
+import org.onap.dcae.common.VESLogger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
 
 /**
  * @author Pawel Szalapski (pawel.szalapski@nokia.com)

diff --git a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersBuilder.java b/src/main/java/org/onap/dcae/common/publishing/DMaaPPublishersBuilder.java
similarity index 91%
rename from src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersBuilder.java
rename to src/main/java/org/onap/dcae/common/publishing/DMaaPPublishersBuilder.java
index 4f67271..a93073b 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersBuilder.java
+++ b/src/main/java/org/onap/dcae/common/publishing/DMaaPPublishersBuilder.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import com.att.nsa.cambria.client.CambriaBatchingPublisher;
 import com.att.nsa.cambria.client.CambriaClientBuilders;
@@ -25,8 +25,8 @@ import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder;
 import io.vavr.control.Try;
 
 import static io.vavr.API.Try;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.enhanceError;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.enhanceError;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
 
 /**
  * @author Pawel Szalapski (pawel.szalapski@nokia.com)

diff --git a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCache.java b/src/main/java/org/onap/dcae/common/publishing/DMaaPPublishersCache.java
similarity index 97%
rename from src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCache.java
rename to src/main/java/org/onap/dcae/common/publishing/DMaaPPublishersCache.java
index c66cee0..b7997ef 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCache.java
+++ b/src/main/java/org/onap/dcae/common/publishing/DMaaPPublishersCache.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import com.att.nsa.cambria.client.CambriaBatchingPublisher;
 import com.google.common.cache.*;
@@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static io.vavr.API.Option;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
 
 /**
  * @author Pawel Szalapski (pawel.szalapski@nokia.com)

diff --git a/src/main/java/org/onap/dcae/commonFunction/event/publishing/EventPublisher.java b/src/main/java/org/onap/dcae/common/publishing/EventPublisher.java
similarity index 96%
rename from src/main/java/org/onap/dcae/commonFunction/event/publishing/EventPublisher.java
rename to src/main/java/org/onap/dcae/common/publishing/EventPublisher.java
index 9cd718f..42e721a 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/event/publishing/EventPublisher.java
+++ b/src/main/java/org/onap/dcae/common/publishing/EventPublisher.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import io.vavr.collection.Map;
 import org.json.JSONObject;

diff --git a/src/main/java/org/onap/dcae/commonFunction/event/publishing/PublisherConfig.java b/src/main/java/org/onap/dcae/common/publishing/PublisherConfig.java
similarity index 98%
rename from src/main/java/org/onap/dcae/commonFunction/event/publishing/PublisherConfig.java
rename to src/main/java/org/onap/dcae/common/publishing/PublisherConfig.java
index f1cbb8e..1fd0d31 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/event/publishing/PublisherConfig.java
+++ b/src/main/java/org/onap/dcae/common/publishing/PublisherConfig.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import io.vavr.collection.List;
 import io.vavr.control.Option;

diff --git a/src/main/java/org/onap/dcae/commonFunction/event/publishing/VavrUtils.java b/src/main/java/org/onap/dcae/common/publishing/VavrUtils.java
similarity index 93%
rename from src/main/java/org/onap/dcae/commonFunction/event/publishing/VavrUtils.java
rename to src/main/java/org/onap/dcae/common/publishing/VavrUtils.java
index 7d535a2..e1eae24 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/event/publishing/VavrUtils.java
+++ b/src/main/java/org/onap/dcae/common/publishing/VavrUtils.java
@@ -17,14 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import io.vavr.API;
 import io.vavr.API.Match.Case;
-import io.vavr.Function0;
-import io.vavr.Function1;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import org.slf4j.Logger;
 
 import static io.vavr.API.$;

diff --git a/src/main/java/org/onap/dcae/controller/ConfigFilesFacade.java b/src/main/java/org/onap/dcae/controller/ConfigFilesFacade.java
index 9338bf6..c83db2d 100644 (file)
--- a/src/main/java/org/onap/dcae/controller/ConfigFilesFacade.java
+++ b/src/main/java/org/onap/dcae/controller/ConfigFilesFacade.java
@@ -36,7 +36,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 
 import static io.vavr.API.Try;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.*;
+import static org.onap.dcae.common.publishing.VavrUtils.*;
 import static org.onap.dcae.controller.Conversions.toList;
 
 class ConfigFilesFacade {

diff --git a/src/main/java/org/onap/dcae/controller/ConfigLoader.java b/src/main/java/org/onap/dcae/controller/ConfigLoader.java
index fb80707..c1ac65d 100644 (file)
--- a/src/main/java/org/onap/dcae/controller/ConfigLoader.java
+++ b/src/main/java/org/onap/dcae/controller/ConfigLoader.java
@@ -20,7 +20,7 @@
  */
 package org.onap.dcae.controller;
 
-import static org.onap.dcae.commonFunction.event.publishing.DMaaPConfigurationParser.parseToDomainMapping;
+import static org.onap.dcae.common.publishing.DMaaPConfigurationParser.parseToDomainMapping;
 import static org.onap.dcae.controller.ConfigParsing.getDMaaPConfig;
 import static org.onap.dcae.controller.ConfigParsing.getProperties;
 import static org.onap.dcae.controller.EnvPropertiesReader.readEnvProps;
@@ -33,8 +33,7 @@ import io.vavr.control.Try;
 import java.nio.file.Path;
 import java.util.function.Consumer;
 import org.json.JSONObject;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
-import org.onap.dcae.commonFunction.event.publishing.PublisherConfig;
+import org.onap.dcae.common.publishing.PublisherConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/org/onap/dcae/controller/ConfigParsing.java b/src/main/java/org/onap/dcae/controller/ConfigParsing.java
index 2ee0c91..e164422 100644 (file)
--- a/src/main/java/org/onap/dcae/controller/ConfigParsing.java
+++ b/src/main/java/org/onap/dcae/controller/ConfigParsing.java
@@ -22,7 +22,7 @@ package org.onap.dcae.controller;
 
 import static io.vavr.API.Try;
 import static io.vavr.API.Tuple;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
 import static org.onap.dcae.controller.Conversions.toList;
 
 import io.vavr.collection.Map;

diff --git a/src/main/java/org/onap/dcae/controller/ConfigSource.java b/src/main/java/org/onap/dcae/controller/ConfigSource.java
index c20a22a..68dc250 100644 (file)
--- a/src/main/java/org/onap/dcae/controller/ConfigSource.java
+++ b/src/main/java/org/onap/dcae/controller/ConfigSource.java
@@ -21,8 +21,8 @@
 package org.onap.dcae.controller;
 
 import static io.vavr.API.Try;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.enhanceError;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.enhanceError;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
 import static org.onap.dcae.controller.Conversions.toJson;
 import static org.onap.dcae.controller.Conversions.toJsonArray;
 

diff --git a/src/main/java/org/onap/dcae/controller/Conversions.java b/src/main/java/org/onap/dcae/controller/Conversions.java
index 09a9a43..e8f7cc0 100644 (file)
--- a/src/main/java/org/onap/dcae/controller/Conversions.java
+++ b/src/main/java/org/onap/dcae/controller/Conversions.java
@@ -19,7 +19,7 @@
  */
 package org.onap.dcae.controller;
 
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.enhanceError;
+import static org.onap.dcae.common.publishing.VavrUtils.enhanceError;
 
 import io.vavr.API;
 import io.vavr.collection.List;

diff --git a/src/main/java/org/onap/dcae/controller/EnvPropertiesReader.java b/src/main/java/org/onap/dcae/controller/EnvPropertiesReader.java
index 5f7a2fb..319caa6 100644 (file)
--- a/src/main/java/org/onap/dcae/controller/EnvPropertiesReader.java
+++ b/src/main/java/org/onap/dcae/controller/EnvPropertiesReader.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 
 import static io.vavr.API.List;
 import static io.vavr.API.Try;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
 
 final class EnvPropertiesReader {
 

diff --git a/src/main/java/org/onap/dcae/controller/PreAppStartupConfigUpdater.java b/src/main/java/org/onap/dcae/controller/PreAppStartupConfigUpdater.java
index c5ee9d8..be56911 100644 (file)
--- a/src/main/java/org/onap/dcae/controller/PreAppStartupConfigUpdater.java
+++ b/src/main/java/org/onap/dcae/controller/PreAppStartupConfigUpdater.java
@@ -23,7 +23,7 @@ import io.vavr.collection.Map;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.function.Consumer;
-import org.onap.dcae.commonFunction.event.publishing.PublisherConfig;
+import org.onap.dcae.common.publishing.PublisherConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/org/onap/dcae/restapi/ServletConfig.java b/src/main/java/org/onap/dcae/restapi/ServletConfig.java
index 49455e5..2ba8a28 100644 (file)
--- a/src/main/java/org/onap/dcae/restapi/ServletConfig.java
+++ b/src/main/java/org/onap/dcae/restapi/ServletConfig.java
@@ -22,7 +22,7 @@
 package org.onap.dcae.restapi;
 
 import org.onap.dcae.ApplicationSettings;
-import org.onap.dcae.commonFunction.SSLContextCreator;
+import org.onap.dcae.common.SSLContextCreator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/main/java/org/onap/dcae/restapi/VesRestController.java b/src/main/java/org/onap/dcae/restapi/VesRestController.java
index 21fa685..68aecce 100644 (file)
--- a/src/main/java/org/onap/dcae/restapi/VesRestController.java
+++ b/src/main/java/org/onap/dcae/restapi/VesRestController.java
@@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.onap.dcae.ApplicationSettings;
-import org.onap.dcae.commonFunction.VESLogger;
+import org.onap.dcae.common.VESLogger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java b/src/test/java/org/onap/dcae/common/ApiExceptionTest.java
similarity index 98%
rename from src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java
rename to src/test/java/org/onap/dcae/common/ApiExceptionTest.java
index a63e97f..2436694 100644 (file)
--- a/src/test/java/org/onap/dcae/commonFunction/ApiExceptionTest.java
+++ b/src/test/java/org/onap/dcae/common/ApiExceptionTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java b/src/test/java/org/onap/dcae/common/ConfigProcessorAdapterTest.java
similarity index 98%
rename from src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java
rename to src/test/java/org/onap/dcae/common/ConfigProcessorAdapterTest.java
index f2cb364..214bada 100644 (file)
--- a/src/test/java/org/onap/dcae/commonFunction/ConfigProcessorAdapterTest.java
+++ b/src/test/java/org/onap/dcae/common/ConfigProcessorAdapterTest.java
@@ -17,7 +17,7 @@
 //        ============LICENSE_END=========================================================
 //
 //
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.times;

diff --git a/src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java b/src/test/java/org/onap/dcae/common/EventSenderTest.java
similarity index 96%
rename from src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java
rename to src/test/java/org/onap/dcae/common/EventSenderTest.java
index f3cebdb..aba3c2a 100644 (file)
--- a/src/test/java/org/onap/dcae/commonFunction/EventSenderTest.java
+++ b/src/test/java/org/onap/dcae/common/EventSenderTest.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction;
+package org.onap.dcae.common;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
@@ -34,7 +34,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.dcae.ApplicationSettings;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
+import org.onap.dcae.common.publishing.EventPublisher;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 public class EventSenderTest {

diff --git a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParserTest.java b/src/test/java/org/onap/dcae/common/publishing/DMaaPConfigurationParserTest.java
similarity index 97%
rename from src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParserTest.java
rename to src/test/java/org/onap/dcae/common/publishing/DMaaPConfigurationParserTest.java
index 5a94c66..923aae0 100644 (file)
--- a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPConfigurationParserTest.java
+++ b/src/test/java/org/onap/dcae/common/publishing/DMaaPConfigurationParserTest.java
@@ -18,11 +18,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import static io.vavr.API.List;
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.onap.dcae.commonFunction.event.publishing.DMaaPConfigurationParser.parseToDomainMapping;
+import static org.onap.dcae.common.publishing.DMaaPConfigurationParser.parseToDomainMapping;
 
 import io.vavr.collection.Map;
 import io.vavr.control.Try;

diff --git a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisherTest.java b/src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java
similarity index 98%
rename from src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisherTest.java
rename to src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java
index bbe5079..809ac99 100644 (file)
--- a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPEventPublisherTest.java
+++ b/src/test/java/org/onap/dcae/common/publishing/DMaaPEventPublisherTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import static io.vavr.API.Option;
 import static org.mockito.ArgumentMatchers.anyString;

diff --git a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCacheTest.java b/src/test/java/org/onap/dcae/common/publishing/DMaaPPublishersCacheTest.java
similarity index 95%
rename from src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCacheTest.java
rename to src/test/java/org/onap/dcae/common/publishing/DMaaPPublishersCacheTest.java
index 8dc69f6..f4dbe19 100644 (file)
--- a/src/test/java/org/onap/dcae/commonFunction/event/publishing/DMaaPPublishersCacheTest.java
+++ b/src/test/java/org/onap/dcae/common/publishing/DMaaPPublishersCacheTest.java
@@ -17,7 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae.commonFunction.event.publishing;
+package org.onap.dcae.common.publishing;
 
 import static io.vavr.API.List;
 import static io.vavr.API.Map;
@@ -35,8 +35,8 @@ import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.dcae.commonFunction.event.publishing.DMaaPPublishersCache.CambriaPublishersCacheLoader;
-import org.onap.dcae.commonFunction.event.publishing.DMaaPPublishersCache.OnPublisherRemovalListener;
+import org.onap.dcae.common.publishing.DMaaPPublishersCache.CambriaPublishersCacheLoader;
+import org.onap.dcae.common.publishing.DMaaPPublishersCache.OnPublisherRemovalListener;
 
 
 public class DMaaPPublishersCacheTest {

diff --git a/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java b/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
index 09dca67..b0a984a 100644 (file)
--- a/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
+++ b/src/test/java/org/onap/dcae/controller/ConfigLoaderIntegrationE2ETest.java
@@ -27,19 +27,18 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
 import static org.onap.dcae.TestingUtilities.createTemporaryFile;
 import static org.onap.dcae.TestingUtilities.readFile;
 import static org.onap.dcae.TestingUtilities.readJSONFromFile;
-import static org.onap.dcae.commonFunction.event.publishing.VavrUtils.f;
+import static org.onap.dcae.common.publishing.VavrUtils.f;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import org.json.JSONObject;
 import org.junit.Test;
 import org.onap.dcae.WiremockBasedTest;
-import org.onap.dcae.commonFunction.event.publishing.DMaaPConfigurationParser;
-import org.onap.dcae.commonFunction.event.publishing.EventPublisher;
+import org.onap.dcae.common.publishing.DMaaPConfigurationParser;
+import org.onap.dcae.common.publishing.EventPublisher;
 
 public class ConfigLoaderIntegrationE2ETest extends WiremockBasedTest {
 

diff --git a/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java b/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
index 52f8127..24577c0 100644 (file)
--- a/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
+++ b/src/test/java/org/onap/dcae/vestest/AnyNodeTest.java
@@ -26,7 +26,7 @@ import com.google.common.collect.Sets;
 import java.util.Set;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.dcae.commonFunction.AnyNode;
+import org.onap.dcae.common.AnyNode;
 
 /**
  * Created by koblosz on 07.06.18.

diff --git a/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
index 79ae9ef..a350ef8 100644 (file)
--- a/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
+++ b/src/test/java/org/onap/dcae/vestest/TestConfigProcessor.java
@@ -28,7 +28,7 @@ import java.io.FileReader;
 import java.io.IOException;\r
 import org.json.JSONObject;\r
 import org.junit.Test;\r
-import org.onap.dcae.commonFunction.ConfigProcessors;\r
+import org.onap.dcae.common.ConfigProcessors;\r
 \r
 public class TestConfigProcessor {\r
 \r

diff --git a/src/test/java/org/onap/dcae/vestest/TestVESLogger.java b/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
index a1b3e7d..1689263 100644 (file)
--- a/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
+++ b/src/test/java/org/onap/dcae/vestest/TestVESLogger.java
@@ -23,13 +23,13 @@ package org.onap.dcae.vestest;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
-import static org.onap.dcae.commonFunction.VESLogger.REQUEST_ID;
+import static org.onap.dcae.common.VESLogger.REQUEST_ID;
 
 import com.att.nsa.logging.LoggingContext;
 import com.att.nsa.logging.log4j.EcompFields;
 import java.util.UUID;
 import org.junit.Test;
-import org.onap.dcae.commonFunction.VESLogger;
+import org.onap.dcae.common.VESLogger;
 
 public class TestVESLogger {