8 files changed, 691 insertions, 671 deletions
diff --git a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/BaseAnalyticsCDAPCommonUnitTest.java b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/BaseAnalyticsCDAPCommonUnitTest.java
index 55a2198..793512b 100644
--- a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/BaseAnalyticsCDAPCommonUnitTest.java
+++ b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/BaseAnalyticsCDAPCommonUnitTest.java
@@ -1,89 +1,89 @@
-/*
- * ===============================LICENSE_START======================================
- *  dcae-analytics
- * ================================================================================
- *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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.openecomp.dcae.apod.analytics.cdap.common;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Suppliers;
-import org.openecomp.dcae.apod.analytics.cdap.common.settings.CDAPAppSettings;
-import org.openecomp.dcae.apod.analytics.cdap.common.settings.CDAPBaseAppConfig;
-import org.openecomp.dcae.apod.analytics.cdap.common.utils.ValidationUtils;
-import org.openecomp.dcae.apod.analytics.cdap.common.validation.CDAPAppSettingsValidator;
-import org.openecomp.dcae.apod.analytics.common.validation.GenericValidationResponse;
-import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
-import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
-
-/**
- * @author Rajiv Singla . Creation Date: 1/12/2017.
- */
-public abstract class BaseAnalyticsCDAPCommonUnitTest extends BaseDCAEAnalyticsUnitTest {
-
-    protected static final String CEF_MESSAGE_FILE_LOCATION = "data/json/cef/cef_message.json";
-    protected static final String TCA_POLICY_FILE_LOCATION = "data/json/policy/tca_policy.json";
-    protected static final ObjectMapper ANALYTICS_MODEL_OBJECT_MAPPER =
-            Suppliers.memoize(new AnalyticsModelObjectMapperSupplier()).get();
-
-    /**
-     * Test Implementation for {@link CDAPBaseAppConfig}
-     */
-    public class CDAPBaseAppConfigImp extends CDAPBaseAppConfig {
-    }
-
-
-    /**
-     * Test implementation for {@link CDAPAppSettings}
-     */
-    public class CDAPTestAppSettings implements CDAPAppSettings {
-
-        private String settingsField;
-
-        public String getSettingsField() {
-            return settingsField;
-        }
-
-        public void setSettingsField(String settingsField) {
-            this.settingsField = settingsField;
-        }
-    }
-
-
-    /**
-     * Test implementation for {@link CDAPAppSettingsValidator}
-     */
-    public class CDAPTestAppSettingsValidator implements CDAPAppSettingsValidator<CDAPTestAppSettings,
-            GenericValidationResponse<CDAPTestAppSettings>> {
-
-        private static final long serialVersionUID = 1L;
-
-        @Override
-        public GenericValidationResponse<CDAPTestAppSettings>
-        validateAppSettings(CDAPTestAppSettings cdapTestAppSettings) {
-            GenericValidationResponse<CDAPTestAppSettings> validationResponse = new
-                    GenericValidationResponse<>();
-            if (ValidationUtils.isEmpty(cdapTestAppSettings.getSettingsField())) {
-                validationResponse
-                        .addErrorMessage("settingsField", "Settings Field must not be empty");
-            }
-            return validationResponse;
-        }
-    }
-
-
-}
+/*
+ * ===============================LICENSE_START======================================
+ *  dcae-analytics
+ * ================================================================================
+ *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  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.openecomp.dcae.apod.analytics.cdap.common;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Suppliers;
+import org.openecomp.dcae.apod.analytics.cdap.common.settings.CDAPAppSettings;
+import org.openecomp.dcae.apod.analytics.cdap.common.settings.CDAPBaseAppConfig;
+import org.openecomp.dcae.apod.analytics.cdap.common.utils.ValidationUtils;
+import org.openecomp.dcae.apod.analytics.cdap.common.validation.CDAPAppSettingsValidator;
+import org.openecomp.dcae.apod.analytics.common.validation.GenericValidationResponse;
+import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;
+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
+
+/**
+ * @author Rajiv Singla . Creation Date: 1/12/2017.
+ */
+public abstract class BaseAnalyticsCDAPCommonUnitTest extends BaseDCAEAnalyticsUnitTest {
+
+    protected static final String CEF_MESSAGE_FILE_LOCATION = "data/json/cef/cef_message.json";
+    protected static final String TCA_POLICY_FILE_LOCATION = "data/json/policy/tca_policy.json";
+    protected static final ObjectMapper ANALYTICS_MODEL_OBJECT_MAPPER =
+            Suppliers.memoize(new AnalyticsModelObjectMapperSupplier()).get();
+
+    /**
+     * Test Implementation for {@link CDAPBaseAppConfig}
+     */
+    public class CDAPBaseAppConfigImp extends CDAPBaseAppConfig {
+    }
+
+
+    /**
+     * Test implementation for {@link CDAPAppSettings}
+     */
+    public class CDAPTestAppSettings implements CDAPAppSettings {
+
+        private String settingsField;
+
+        public String getSettingsField() {
+            return settingsField;
+        }
+
+        public void setSettingsField(String settingsField) {
+            this.settingsField = settingsField;
+        }
+    }
+
+
+    /**
+     * Test implementation for {@link CDAPAppSettingsValidator}
+     */
+    public class CDAPTestAppSettingsValidator implements CDAPAppSettingsValidator<CDAPTestAppSettings,
+            GenericValidationResponse<CDAPTestAppSettings>> {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public GenericValidationResponse<CDAPTestAppSettings>
+        validateAppSettings(CDAPTestAppSettings cdapTestAppSettings) {
+            GenericValidationResponse<CDAPTestAppSettings> validationResponse = new
+                    GenericValidationResponse<>();
+            if (ValidationUtils.isEmpty(cdapTestAppSettings.getSettingsField())) {
+                validationResponse
+                        .addErrorMessage("settingsField", "Settings Field must not be empty");
+            }
+            return validationResponse;
+        }
+    }
+
+
+}
diff --git a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAAlertsAbatementPersisterTest.java b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAAlertsAbatementPersisterTest.java
index 36d72fa..ed46e60 100644
--- a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAAlertsAbatementPersisterTest.java
+++ b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAAlertsAbatementPersisterTest.java
@@ -1,103 +1,123 @@
-package org.openecomp.dcae.apod.analytics.cdap.common.persistance.tca;
-
-import co.cask.cdap.api.dataset.DatasetProperties;
-import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
-import org.openecomp.dcae.apod.analytics.common.utils.PersistenceUtils;
-import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader;
-import org.openecomp.dcae.apod.analytics.model.domain.cef.Event;
-import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerEventName;
-import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Author: rs153v (Rajiv Singla) . Creation Date: 9/13/2017.
- */
-public class TCAAlertsAbatementPersisterTest extends BaseAnalyticsCDAPCommonUnitTest {
-
-    private static final String EVENT_NAME = "testEventName";
-    private static final String SOURCE_NAME = "testSourceName";
-    private static final String REPORTING_ENTITY_NAME = "testReportingEntityName";
-    private static final String THRESHOLD_CLOSED_LOOP_CONTROL_NAME = "testControlLoopName";
-    private static final String THRESHOLD_FIELD_PATH = "testFieldPath";
-    private static final String EXPECTED_LOOKUP_KEY = Joiner.on(PersistenceUtils.ROW_KEY_DELIMITER).join(
-            ImmutableList.of(EVENT_NAME, SOURCE_NAME, REPORTING_ENTITY_NAME,
-                    THRESHOLD_CLOSED_LOOP_CONTROL_NAME, THRESHOLD_FIELD_PATH));
-
-    private ObjectMappedTable<TCAAlertsAbatementEntity> alertsAbatementTable;
-    private EventListener eventListener;
-    private MetricsPerEventName violatedMetricsPerEventName;
-    private TCAVESResponse tcavesResponse;
-    private String abatementTS;
-    private Event event;
-    private CommonEventHeader commonEventHeader;
-    private Threshold violatedThreshold;
-
-    @Before
-    public void before() throws Exception {
-        alertsAbatementTable = mock(ObjectMappedTable.class);
-        eventListener = mock(EventListener.class);
-        event = mock(Event.class);
-        commonEventHeader = mock(CommonEventHeader.class);
-
-        when(eventListener.getEvent()).thenReturn(event);
-        when(event.getCommonEventHeader()).thenReturn(commonEventHeader);
-        when(commonEventHeader.getEventName()).thenReturn(EVENT_NAME);
-        when(commonEventHeader.getSourceName()).thenReturn(SOURCE_NAME);
-        when(commonEventHeader.getReportingEntityName()).thenReturn(REPORTING_ENTITY_NAME);
-
-        violatedMetricsPerEventName = mock(MetricsPerEventName.class);
-        when(violatedMetricsPerEventName.getEventName()).thenReturn(EVENT_NAME);
-        violatedThreshold = mock(Threshold.class);
-        when(violatedMetricsPerEventName.getThresholds()).thenReturn(ImmutableList.of(violatedThreshold));
-        when(violatedThreshold.getClosedLoopControlName()).thenReturn(THRESHOLD_CLOSED_LOOP_CONTROL_NAME);
-        when(violatedThreshold.getFieldPath()).thenReturn(THRESHOLD_FIELD_PATH);
-        tcavesResponse = mock(TCAVESResponse.class);
-        abatementTS = "1234";
-    }
-
-    @Test
-    public void testGetDatasetProperties() throws Exception {
-        final DatasetProperties datasetProperties = TCAAlertsAbatementPersister.getDatasetProperties(20000);
-        assertNotNull(datasetProperties);
-    }
-
-    @Test
-    public void testPersist() throws Exception {
-
-        TCAAlertsAbatementPersister.persist(eventListener, violatedMetricsPerEventName, tcavesResponse,
-                abatementTS, alertsAbatementTable);
-        verify(alertsAbatementTable, times(1)).write(anyString(),
-                any(TCAAlertsAbatementEntity.class));
-
-    }
-
-    @Test
-    public void testLookUpByKey() throws Exception {
-        TCAAlertsAbatementPersister.lookUpByKey(eventListener, violatedMetricsPerEventName, alertsAbatementTable);
-        verify(alertsAbatementTable, times(1)).read(eq(EXPECTED_LOOKUP_KEY));
-    }
-
-    @Test
-    public void testCreateKey() throws Exception {
-        final String createdKey = TCAAlertsAbatementPersister.createKey(eventListener, violatedMetricsPerEventName);
-        assertEquals(createdKey, EXPECTED_LOOKUP_KEY);
-
-    }
-
-}
+/*
+ * ===============================LICENSE_START======================================
+ *  dcae-analytics
+ * ================================================================================
+ *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  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.openecomp.dcae.apod.analytics.cdap.common.persistance.tca;
+
+import co.cask.cdap.api.dataset.DatasetProperties;
+import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
+import org.openecomp.dcae.apod.analytics.common.utils.PersistenceUtils;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.Event;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerEventName;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Rajiv Singla . Creation Date: 9/13/2017.
+ */
+public class TCAAlertsAbatementPersisterTest extends BaseAnalyticsCDAPCommonUnitTest {
+
+    private static final String EVENT_NAME = "testEventName";
+    private static final String SOURCE_NAME = "testSourceName";
+    private static final String REPORTING_ENTITY_NAME = "testReportingEntityName";
+    private static final String THRESHOLD_CLOSED_LOOP_CONTROL_NAME = "testControlLoopName";
+    private static final String THRESHOLD_FIELD_PATH = "testFieldPath";
+    private static final String EXPECTED_LOOKUP_KEY = Joiner.on(PersistenceUtils.ROW_KEY_DELIMITER).join(
+            ImmutableList.of(EVENT_NAME, SOURCE_NAME, REPORTING_ENTITY_NAME,
+                    THRESHOLD_CLOSED_LOOP_CONTROL_NAME, THRESHOLD_FIELD_PATH));
+
+    private ObjectMappedTable<TCAAlertsAbatementEntity> alertsAbatementTable;
+    private EventListener eventListener;
+    private MetricsPerEventName violatedMetricsPerEventName;
+    private TCAVESResponse tcavesResponse;
+    private String abatementTS;
+    private Event event;
+    private CommonEventHeader commonEventHeader;
+    private Threshold violatedThreshold;
+
+    @Before
+    public void before() throws Exception {
+        alertsAbatementTable = mock(ObjectMappedTable.class);
+        eventListener = mock(EventListener.class);
+        event = mock(Event.class);
+        commonEventHeader = mock(CommonEventHeader.class);
+
+        when(eventListener.getEvent()).thenReturn(event);
+        when(event.getCommonEventHeader()).thenReturn(commonEventHeader);
+        when(commonEventHeader.getEventName()).thenReturn(EVENT_NAME);
+        when(commonEventHeader.getSourceName()).thenReturn(SOURCE_NAME);
+        when(commonEventHeader.getReportingEntityName()).thenReturn(REPORTING_ENTITY_NAME);
+
+        violatedMetricsPerEventName = mock(MetricsPerEventName.class);
+        when(violatedMetricsPerEventName.getEventName()).thenReturn(EVENT_NAME);
+        violatedThreshold = mock(Threshold.class);
+        when(violatedMetricsPerEventName.getThresholds()).thenReturn(ImmutableList.of(violatedThreshold));
+        when(violatedThreshold.getClosedLoopControlName()).thenReturn(THRESHOLD_CLOSED_LOOP_CONTROL_NAME);
+        when(violatedThreshold.getFieldPath()).thenReturn(THRESHOLD_FIELD_PATH);
+        tcavesResponse = mock(TCAVESResponse.class);
+        abatementTS = "1234";
+    }
+
+    @Test
+    public void testGetDatasetProperties() throws Exception {
+        final DatasetProperties datasetProperties = TCAAlertsAbatementPersister.getDatasetProperties(20000);
+        assertNotNull(datasetProperties);
+    }
+
+    @Test
+    public void testPersist() throws Exception {
+
+        TCAAlertsAbatementPersister.persist(eventListener, violatedMetricsPerEventName, tcavesResponse,
+                abatementTS, alertsAbatementTable);
+        verify(alertsAbatementTable, times(1)).write(anyString(),
+                any(TCAAlertsAbatementEntity.class));
+
+    }
+
+    @Test
+    public void testLookUpByKey() throws Exception {
+        TCAAlertsAbatementPersister.lookUpByKey(eventListener, violatedMetricsPerEventName, alertsAbatementTable);
+        verify(alertsAbatementTable, times(1)).read(eq(EXPECTED_LOOKUP_KEY));
+    }
+
+    @Test
+    public void testCreateKey() throws Exception {
+        final String createdKey = TCAAlertsAbatementPersister.createKey(eventListener, violatedMetricsPerEventName);
+        assertEquals(createdKey, EXPECTED_LOOKUP_KEY);
+
+    }
+
+}
diff --git a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCACalculatorMessageTypeTest.java b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCACalculatorMessageTypeTest.java
index ce2fc21..89cf241 100644
--- a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCACalculatorMessageTypeTest.java
+++ b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCACalculatorMessageTypeTest.java
@@ -1,38 +1,38 @@
-/*
- * ===============================LICENSE_START======================================
- *  dcae-analytics
- * ================================================================================
- *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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.openecomp.dcae.apod.analytics.cdap.common.persistance.tca;
-
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author Rajiv Singla . Creation Date: 2/16/2017.
- */
-public class TCACalculatorMessageTypeTest extends BaseAnalyticsCDAPCommonUnitTest {
-
-    @Test
-    public void testCalculatorMessageType() throws Exception {
-        assertThat("There must be 3 calculator message type", TCACalculatorMessageType.values().length, is(3));
-    }
-}
+/*
+ * ===============================LICENSE_START======================================
+ *  dcae-analytics
+ * ================================================================================
+ *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  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.openecomp.dcae.apod.analytics.cdap.common.persistance.tca;
+
+import org.junit.Test;
+import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Rajiv Singla . Creation Date: 2/16/2017.
+ */
+public class TCACalculatorMessageTypeTest extends BaseAnalyticsCDAPCommonUnitTest {
+
+    @Test
+    public void testCalculatorMessageType() throws Exception {
+        assertThat("There must be 3 calculator message type", TCACalculatorMessageType.values().length, is(3));
+    }
+}
diff --git a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAMessageStatusPersisterTest.java b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAMessageStatusPersisterTest.java
index 7dfd74d..372e9e6 100644
--- a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAMessageStatusPersisterTest.java
+++ b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAMessageStatusPersisterTest.java
@@ -1,128 +1,128 @@
-/*
- * ===============================LICENSE_START======================================
- *  dcae-analytics
- * ================================================================================
- *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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.openecomp.dcae.apod.analytics.cdap.common.persistance.tca;
-
-import co.cask.cdap.api.dataset.DatasetProperties;
-import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
-import com.google.common.collect.ImmutableList;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
-import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader;
-import org.openecomp.dcae.apod.analytics.model.domain.cef.Domain;
-import org.openecomp.dcae.apod.analytics.model.domain.cef.Event;
-import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
-import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity;
-import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction;
-import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerEventName;
-import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
-import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
-import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext;
-import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Rajiv Singla . Creation Date: 2/16/2017.
- */
-public class TCAMessageStatusPersisterTest extends BaseAnalyticsCDAPCommonUnitTest {
-
-    private static final int TEST_INSTANCE_ID = 0;
-    private static final Domain TEST_DOMAIN = Domain.other;
-    private static final String TEST_EVENT_NAME = "TEST_EVENT_NAME";
-
-    private ObjectMappedTable<TCAMessageStatusEntity> vesMessageStatusTable;
-    private TCACEFProcessorContext processorContext;
-    private EventListener eventListener;
-    private Event event;
-    private CommonEventHeader commonEventHeader;
-    private String functionalRole;
-
-
-    @Before
-    public void before() {
-        vesMessageStatusTable = mock(ObjectMappedTable.class);
-        processorContext = mock(TCACEFProcessorContext.class);
-        eventListener = mock(EventListener.class);
-        event = mock(Event.class);
-        commonEventHeader = mock(CommonEventHeader.class);
-        when(processorContext.getMessage()).thenReturn("testMessage");
-        when(processorContext.getCEFEventListener()).thenReturn(eventListener);
-        when(eventListener.getEvent()).thenReturn(event);
-        when(event.getCommonEventHeader()).thenReturn(commonEventHeader);
-        when(commonEventHeader.getEventName()).thenReturn(TEST_EVENT_NAME);
-        when(commonEventHeader.getDomain()).thenReturn(TEST_DOMAIN);
-    }
-
-
-    @Test
-    public void testPersistWithInApplicableMessage() throws Exception {
-        TCAMessageStatusPersister.persist
-                (processorContext, TEST_INSTANCE_ID, TCACalculatorMessageType.INAPPLICABLE, vesMessageStatusTable);
-        verify(vesMessageStatusTable, times(1)).write(anyString(),
-                any(TCAMessageStatusEntity.class));
-    }
-
-    @Test
-    public void testPersistWithNonCompliantMessage() throws Exception {
-        final MetricsPerEventName metricsPerEventName = mock(MetricsPerEventName.class);
-        final Threshold threshold = mock(Threshold.class);
-        when(processorContext.getMetricsPerEventName()).thenReturn(metricsPerEventName);
-        when((metricsPerEventName.getThresholds())).thenReturn(ImmutableList.of(threshold));
-        when(threshold.getDirection()).thenReturn(Direction.GREATER);
-        when(threshold.getSeverity()).thenReturn(EventSeverity.CRITICAL);
-        TCAMessageStatusPersister.persist(
-                processorContext, TEST_INSTANCE_ID, TCACalculatorMessageType.NON_COMPLIANT,
-                vesMessageStatusTable, "testAlert");
-        verify(vesMessageStatusTable, times(1)).write(anyString(),
-                any(TCAMessageStatusEntity.class));
-    }
-
-    @Test
-    public void testPersistWithCompliantMessage() throws Exception {
-        final String cefMessage = fromStream(CEF_MESSAGE_FILE_LOCATION);
-        final String tcaPolicyString = fromStream(TCA_POLICY_FILE_LOCATION);
-
-        final TCAPolicy tcaPolicy = ANALYTICS_MODEL_OBJECT_MAPPER.readValue(tcaPolicyString, TCAPolicy.class);
-        final TCACEFProcessorContext tcacefProcessorContext = TCAUtils.filterCEFMessage(cefMessage, tcaPolicy);
-        final TCACEFProcessorContext finalProcessorContext =
-                TCAUtils.computeThresholdViolations(tcacefProcessorContext);
-
-        TCAMessageStatusPersister.persist(finalProcessorContext, TEST_INSTANCE_ID,
-                TCACalculatorMessageType.COMPLIANT, vesMessageStatusTable, "testAlert");
-        verify(vesMessageStatusTable, times(1)).write(anyString(),
-                any(TCAMessageStatusEntity.class));
-    }
-
-    @Test
-    public void testGetDatasetProperties() throws Exception {
-        final DatasetProperties datasetProperties = TCAMessageStatusPersister.getDatasetProperties(20000);
-        Assert.assertNotNull(datasetProperties);
-
-    }
-
-}
+/*
+ * ===============================LICENSE_START======================================
+ *  dcae-analytics
+ * ================================================================================
+ *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  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.openecomp.dcae.apod.analytics.cdap.common.persistance.tca;
+
+import co.cask.cdap.api.dataset.DatasetProperties;
+import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
+import com.google.common.collect.ImmutableList;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.Domain;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.Event;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener;
+import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerEventName;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy;
+import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold;
+import org.openecomp.dcae.apod.analytics.tca.processor.TCACEFProcessorContext;
+import org.openecomp.dcae.apod.analytics.tca.utils.TCAUtils;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Rajiv Singla . Creation Date: 2/16/2017.
+ */
+public class TCAMessageStatusPersisterTest extends BaseAnalyticsCDAPCommonUnitTest {
+
+    private static final int TEST_INSTANCE_ID = 0;
+    private static final Domain TEST_DOMAIN = Domain.other;
+    private static final String TEST_EVENT_NAME = "TEST_EVENT_NAME";
+
+    private ObjectMappedTable<TCAMessageStatusEntity> vesMessageStatusTable;
+    private TCACEFProcessorContext processorContext;
+    private EventListener eventListener;
+    private Event event;
+    private CommonEventHeader commonEventHeader;
+
+
+    @Before
+    @SuppressWarnings("unchecked")
+    public void before() {
+        vesMessageStatusTable = mock(ObjectMappedTable.class);
+        processorContext = mock(TCACEFProcessorContext.class);
+        eventListener = mock(EventListener.class);
+        event = mock(Event.class);
+        commonEventHeader = mock(CommonEventHeader.class);
+        when(processorContext.getMessage()).thenReturn("testMessage");
+        when(processorContext.getCEFEventListener()).thenReturn(eventListener);
+        when(eventListener.getEvent()).thenReturn(event);
+        when(event.getCommonEventHeader()).thenReturn(commonEventHeader);
+        when(commonEventHeader.getEventName()).thenReturn(TEST_EVENT_NAME);
+        when(commonEventHeader.getDomain()).thenReturn(TEST_DOMAIN);
+    }
+
+
+    @Test
+    public void testPersistWithInApplicableMessage() throws Exception {
+        TCAMessageStatusPersister.persist
+                (processorContext, TEST_INSTANCE_ID, TCACalculatorMessageType.INAPPLICABLE, vesMessageStatusTable);
+        verify(vesMessageStatusTable, times(1)).write(anyString(),
+                any(TCAMessageStatusEntity.class));
+    }
+
+    @Test
+    public void testPersistWithNonCompliantMessage() throws Exception {
+        final MetricsPerEventName metricsPerEventName = mock(MetricsPerEventName.class);
+        final Threshold threshold = mock(Threshold.class);
+        when(processorContext.getMetricsPerEventName()).thenReturn(metricsPerEventName);
+        when((metricsPerEventName.getThresholds())).thenReturn(ImmutableList.of(threshold));
+        when(threshold.getDirection()).thenReturn(Direction.GREATER);
+        when(threshold.getSeverity()).thenReturn(EventSeverity.CRITICAL);
+        TCAMessageStatusPersister.persist(
+                processorContext, TEST_INSTANCE_ID, TCACalculatorMessageType.NON_COMPLIANT,
+                vesMessageStatusTable, "testAlert");
+        verify(vesMessageStatusTable, times(1)).write(anyString(),
+                any(TCAMessageStatusEntity.class));
+    }
+
+    @Test
+    public void testPersistWithCompliantMessage() throws Exception {
+        final String cefMessage = fromStream(CEF_MESSAGE_FILE_LOCATION);
+        final String tcaPolicyString = fromStream(TCA_POLICY_FILE_LOCATION);
+
+        final TCAPolicy tcaPolicy = ANALYTICS_MODEL_OBJECT_MAPPER.readValue(tcaPolicyString, TCAPolicy.class);
+        final TCACEFProcessorContext tcacefProcessorContext = TCAUtils.filterCEFMessage(cefMessage, tcaPolicy);
+        final TCACEFProcessorContext finalProcessorContext =
+                TCAUtils.computeThresholdViolations(tcacefProcessorContext);
+
+        TCAMessageStatusPersister.persist(finalProcessorContext, TEST_INSTANCE_ID,
+                TCACalculatorMessageType.COMPLIANT, vesMessageStatusTable, "testAlert");
+        verify(vesMessageStatusTable, times(1)).write(anyString(),
+                any(TCAMessageStatusEntity.class));
+    }
+
+    @Test
+    public void testGetDatasetProperties() throws Exception {
+        final DatasetProperties datasetProperties = TCAMessageStatusPersister.getDatasetProperties(20000);
+        Assert.assertNotNull(datasetProperties);
+
+    }
+
+}
diff --git a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAVESAlertsPersisterTest.java b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAVESAlertsPersisterTest.java
index 97fea09..151cbd9 100644
--- a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAVESAlertsPersisterTest.java
+++ b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/persistance/tca/TCAVESAlertsPersisterTest.java
@@ -1,63 +1,63 @@
-/*
- * ===============================LICENSE_START======================================
- *  dcae-analytics
- * ================================================================================
- *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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.openecomp.dcae.apod.analytics.cdap.common.persistance.tca;
-
-import co.cask.cdap.api.dataset.DatasetProperties;
-import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Mockito;
-import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
-
-import java.util.Date;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Rajiv Singla . Creation Date: 2/16/2017.
- */
-public class TCAVESAlertsPersisterTest extends BaseAnalyticsCDAPCommonUnitTest {
-
-    @Test
-    public void testPersist() throws Exception {
-        final ObjectMappedTable<TCAVESAlertEntity> tcaVESAlertTable = Mockito.mock(ObjectMappedTable.class);
-        TCAVESAlertsPersister.persist("test alert message", tcaVESAlertTable);
-        verify(tcaVESAlertTable, times(1)).write(anyString(),
-                any(TCAVESAlertEntity.class));
-    }
-
-    @Test
-    public void testGetDatasetProperties() throws Exception {
-        final DatasetProperties datasetProperties = TCAVESAlertsPersister.getDatasetProperties(20000);
-        Assert.assertNotNull(datasetProperties);
-    }
-
-    @Test
-    public void testCreateRowKey() throws Exception {
-        final String rowKey = TCAVESAlertsPersister.createRowKey(new Date());
-        Assert.assertThat(rowKey.toCharArray().length, is(25));
-    }
-
-}
+/*
+ * ===============================LICENSE_START======================================
+ *  dcae-analytics
+ * ================================================================================
+ *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  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.openecomp.dcae.apod.analytics.cdap.common.persistance.tca;
+
+import co.cask.cdap.api.dataset.DatasetProperties;
+import co.cask.cdap.api.dataset.lib.ObjectMappedTable;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
+
+import java.util.Date;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author Rajiv Singla . Creation Date: 2/16/2017.
+ */
+public class TCAVESAlertsPersisterTest extends BaseAnalyticsCDAPCommonUnitTest {
+
+    @Test
+    public void testPersist() throws Exception {
+        final ObjectMappedTable<TCAVESAlertEntity> tcaVESAlertTable = Mockito.mock(ObjectMappedTable.class);
+        TCAVESAlertsPersister.persist("test alert message", tcaVESAlertTable);
+        verify(tcaVESAlertTable, times(1)).write(anyString(),
+                any(TCAVESAlertEntity.class));
+    }
+
+    @Test
+    public void testGetDatasetProperties() throws Exception {
+        final DatasetProperties datasetProperties = TCAVESAlertsPersister.getDatasetProperties(20000);
+        Assert.assertNotNull(datasetProperties);
+    }
+
+    @Test
+    public void testCreateRowKey() throws Exception {
+        final String rowKey = TCAVESAlertsPersister.createRowKey(new Date());
+        Assert.assertThat(rowKey.toCharArray().length, is(25));
+    }
+
+}
diff --git a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/settings/CDAPBaseAppConfigTest.java b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/settings/CDAPBaseAppConfigTest.java
index d22f736..b4bb9e7 100644
--- a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/settings/CDAPBaseAppConfigTest.java
+++ b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/settings/CDAPBaseAppConfigTest.java
@@ -1,58 +1,58 @@
-/*
- * ===============================LICENSE_START======================================
- *  dcae-analytics
- * ================================================================================
- *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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.openecomp.dcae.apod.analytics.cdap.common.settings;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
-import org.openecomp.dcae.apod.analytics.cdap.common.CDAPComponentsConstants;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author Rajiv Singla . Creation Date: 12/12/2016.
- */
-public class CDAPBaseAppConfigTest extends BaseAnalyticsCDAPCommonUnitTest {
-
-    private CDAPBaseAppConfigImp cdapBaseAppConfigImp = null;
-
-    @Before
-    public void before() {
-        cdapBaseAppConfigImp = new CDAPBaseAppConfigImp();
-    }
-
-    @Test
-    public void testGetAppName() throws Exception {
-        assertThat("Common Default Name must match",
-                cdapBaseAppConfigImp.getAppName(),
-                CoreMatchers.is(CDAPComponentsConstants.COMMON_DEFAULT_DCAE_CDAP_NAME_APP));
-    }
-
-    @Test
-    public void testGetAppDescription() throws Exception {
-        assertThat("Default App Description must match",
-                cdapBaseAppConfigImp.getAppDescription(),
-                is(CDAPComponentsConstants.COMMON_DEFAULT_DCAE_CDAP_DESCRIPTION_APP));
-    }
-
-}
+/*
+ * ===============================LICENSE_START======================================
+ *  dcae-analytics
+ * ================================================================================
+ *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  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.openecomp.dcae.apod.analytics.cdap.common.settings;
+
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
+import org.openecomp.dcae.apod.analytics.cdap.common.CDAPComponentsConstants;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Rajiv Singla . Creation Date: 12/12/2016.
+ */
+public class CDAPBaseAppConfigTest extends BaseAnalyticsCDAPCommonUnitTest {
+
+    private CDAPBaseAppConfigImp cdapBaseAppConfigImp = null;
+
+    @Before
+    public void before() {
+        cdapBaseAppConfigImp = new CDAPBaseAppConfigImp();
+    }
+
+    @Test
+    public void testGetAppName() throws Exception {
+        assertThat("Common Default Name must match",
+                cdapBaseAppConfigImp.getAppName(),
+                CoreMatchers.is(CDAPComponentsConstants.COMMON_DEFAULT_DCAE_CDAP_NAME_APP));
+    }
+
+    @Test
+    public void testGetAppDescription() throws Exception {
+        assertThat("Default App Description must match",
+                cdapBaseAppConfigImp.getAppDescription(),
+                is(CDAPComponentsConstants.COMMON_DEFAULT_DCAE_CDAP_DESCRIPTION_APP));
+    }
+
+}
diff --git a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/utils/DMaaPMRUtilsTest.java b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/utils/DMaaPMRUtilsTest.java
index f9c7eaf..9a52e41 100644
--- a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/utils/DMaaPMRUtilsTest.java
+++ b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/utils/DMaaPMRUtilsTest.java
@@ -1,112 +1,112 @@
-/*
- * ===============================LICENSE_START======================================
- *  dcae-analytics
- * ================================================================================
- *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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.openecomp.dcae.apod.analytics.cdap.common.utils;
-
-import co.cask.cdap.api.metrics.Metrics;
-import com.google.common.collect.ImmutableList;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
-import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
-import org.openecomp.dcae.apod.analytics.cdap.common.CDAPMetricsConstants;
-import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-
-import java.util.Collections;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * @author Rajiv Singla . Creation Date: 2/6/2017.
- */
-public class DMaaPMRUtilsTest extends BaseAnalyticsCDAPCommonUnitTest {
-
-    private DMaaPMRSubscriber subscriber;
-    private Metrics metrics;
-
-
-    @Before
-    public void before() throws Exception {
-        metrics = mock(Metrics.class);
-        doNothing().when(metrics).count(anyString(), anyInt());
-        subscriber = mock(DMaaPMRSubscriber.class);
-    }
-
-    @Test
-    public void testGetSubscriberMessagesWhenMessagesAreFound() throws Exception {
-        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
-        when(subscriberResponse.getResponseCode()).thenReturn(200);
-        when(subscriberResponse.getResponseMessage()).thenReturn("testMessage");
-        when(subscriberResponse.getFetchedMessages()).thenReturn(ImmutableList.of("testMessage1", "testMessage1"));
-        when(subscriber.fetchMessages()).thenReturn(subscriberResponse);
-        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
-        verify(metrics, Mockito.times(1)).count(ArgumentMatchers.eq(CDAPMetricsConstants
-                .DMAAP_MR_SUBSCRIBER_TOTAL_MESSAGES_PROCESSED_METRIC), eq(2));
-    }
-
-    @Test
-    public void testSubscriberMessagesWhenSubscriberResponseCodeIsNull() throws Exception {
-        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
-        when(subscriberResponse.getResponseCode()).thenReturn(null);
-        when(subscriber.fetchMessages()).thenReturn(subscriberResponse);
-        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
-    }
-
-    @Test
-    public void testSubscriberMessagesWhenNoMessagesFound() throws Exception {
-        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
-        when(subscriberResponse.getResponseCode()).thenReturn(200);
-        when(subscriberResponse.getResponseMessage()).thenReturn("no messages");
-        when(subscriberResponse.getFetchedMessages()).thenReturn(Collections.<String>emptyList());
-        when(subscriber.fetchMessages()).thenReturn(subscriberResponse);
-        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
-        verify(metrics, Mockito.times(1)).count(eq(CDAPMetricsConstants
-                .DMAAP_MR_SUBSCRIBER_RESPONSES_WITH_NO_MESSAGES_METRIC), eq(1));
-    }
-
-
-    @Test
-    public void testWhenSubscriberReturnNonSuccessfulReturnCode() throws Exception {
-        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
-        when(subscriberResponse.getResponseCode()).thenReturn(500);
-        when(subscriber.fetchMessages()).thenReturn(subscriberResponse);
-        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
-        verify(metrics, Mockito.times(1)).count(eq(CDAPMetricsConstants
-                .DMAAP_MR_SUBSCRIBER_UNSUCCESSFUL_RESPONSES_METRIC), eq(1));
-    }
-
-    @Test
-    public void testWhenSubscriberThrowsException() throws Exception {
-        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
-        when(subscriberResponse.getResponseCode()).thenReturn(500);
-        when(subscriber.fetchMessages()).thenThrow(DCAEAnalyticsRuntimeException.class);
-        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
-    }
-
-}
+/*
+ * ===============================LICENSE_START======================================
+ *  dcae-analytics
+ * ================================================================================
+ *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  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.openecomp.dcae.apod.analytics.cdap.common.utils;
+
+import co.cask.cdap.api.metrics.Metrics;
+import com.google.common.collect.ImmutableList;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
+import org.openecomp.dcae.apod.analytics.cdap.common.CDAPMetricsConstants;
+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
+
+import java.util.Collections;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Rajiv Singla . Creation Date: 2/6/2017.
+ */
+public class DMaaPMRUtilsTest extends BaseAnalyticsCDAPCommonUnitTest {
+
+    private DMaaPMRSubscriber subscriber;
+    private Metrics metrics;
+
+
+    @Before
+    public void before() throws Exception {
+        metrics = mock(Metrics.class);
+        doNothing().when(metrics).count(anyString(), anyInt());
+        subscriber = mock(DMaaPMRSubscriber.class);
+    }
+
+    @Test
+    public void testGetSubscriberMessagesWhenMessagesAreFound() throws Exception {
+        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
+        when(subscriberResponse.getResponseCode()).thenReturn(200);
+        when(subscriberResponse.getResponseMessage()).thenReturn("testMessage");
+        when(subscriberResponse.getFetchedMessages()).thenReturn(ImmutableList.of("testMessage1", "testMessage1"));
+        when(subscriber.fetchMessages()).thenReturn(subscriberResponse);
+        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
+        verify(metrics, Mockito.times(1)).count(ArgumentMatchers.eq(CDAPMetricsConstants
+                .DMAAP_MR_SUBSCRIBER_TOTAL_MESSAGES_PROCESSED_METRIC), eq(2));
+    }
+
+    @Test
+    public void testSubscriberMessagesWhenSubscriberResponseCodeIsNull() throws Exception {
+        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
+        when(subscriberResponse.getResponseCode()).thenReturn(null);
+        when(subscriber.fetchMessages()).thenReturn(subscriberResponse);
+        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
+    }
+
+    @Test
+    public void testSubscriberMessagesWhenNoMessagesFound() throws Exception {
+        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
+        when(subscriberResponse.getResponseCode()).thenReturn(200);
+        when(subscriberResponse.getResponseMessage()).thenReturn("no messages");
+        when(subscriberResponse.getFetchedMessages()).thenReturn(Collections.<String>emptyList());
+        when(subscriber.fetchMessages()).thenReturn(subscriberResponse);
+        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
+        verify(metrics, Mockito.times(1)).count(eq(CDAPMetricsConstants
+                .DMAAP_MR_SUBSCRIBER_RESPONSES_WITH_NO_MESSAGES_METRIC), eq(1));
+    }
+
+
+    @Test
+    public void testWhenSubscriberReturnNonSuccessfulReturnCode() throws Exception {
+        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
+        when(subscriberResponse.getResponseCode()).thenReturn(500);
+        when(subscriber.fetchMessages()).thenReturn(subscriberResponse);
+        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
+        verify(metrics, Mockito.times(1)).count(eq(CDAPMetricsConstants
+                .DMAAP_MR_SUBSCRIBER_UNSUCCESSFUL_RESPONSES_METRIC), eq(1));
+    }
+
+    @Test
+    public void testWhenSubscriberThrowsException() throws Exception {
+        final DMaaPMRSubscriberResponse subscriberResponse = mock(DMaaPMRSubscriberResponse.class);
+        when(subscriberResponse.getResponseCode()).thenReturn(500);
+        when(subscriber.fetchMessages()).thenThrow(DCAEAnalyticsRuntimeException.class);
+        DMaaPMRUtils.getSubscriberMessages(subscriber, metrics);
+    }
+
+}
diff --git a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/utils/ValidationUtilsTest.java b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/utils/ValidationUtilsTest.java
index 4441451..5344ca5 100644
--- a/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/utils/ValidationUtilsTest.java
+++ b/dcae-analytics-cdap-common/src/test/java/org/openecomp/dcae/apod/analytics/cdap/common/utils/ValidationUtilsTest.java
@@ -1,80 +1,80 @@
-/*
- * ===============================LICENSE_START======================================
- *  dcae-analytics
- * ================================================================================
- *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  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.openecomp.dcae.apod.analytics.cdap.common.utils;
-
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
-import org.openecomp.dcae.apod.analytics.cdap.common.exception.CDAPSettingsException;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Rajiv Singla . Creation Date: 12/12/2016.
- */
-public class ValidationUtilsTest extends BaseAnalyticsCDAPCommonUnitTest {
-
-    @Test
-    public void testIsEmptyWhenStringIsNull() throws Exception {
-        assertTrue(ValidationUtils.isEmpty(null));
-    }
-
-    @Test
-    public void testIsEmptyWhenStringIsEmpty() throws Exception {
-        String emptyString = "";
-        assertTrue(ValidationUtils.isEmpty(emptyString));
-    }
-
-    @Test
-    public void testIsEmptyWhenStringIsEmptyWithBlanks() throws Exception {
-        String blankString = "   ";
-        assertTrue(ValidationUtils.isEmpty(blankString));
-    }
-
-
-    @Test
-    public void testIsNotPresent() throws Exception {
-        assertFalse(ValidationUtils.isPresent(null));
-        String emptyString = "";
-        assertFalse(ValidationUtils.isPresent(emptyString));
-        String blankString = "   ";
-        assertFalse(ValidationUtils.isPresent(blankString));
-        String validString = "SomeValue";
-        assertTrue(ValidationUtils.isPresent(validString));
-    }
-
-    @Test
-    public void testValidateSettingsWhenValidationPasses() throws Exception {
-        CDAPTestAppSettings cdapTestAppSettings = new CDAPTestAppSettings();
-        cdapTestAppSettings.setSettingsField("testValue");
-        ValidationUtils.validateSettings(cdapTestAppSettings, new CDAPTestAppSettingsValidator());
-    }
-
-    @Test(expected = CDAPSettingsException.class)
-    public void testValidateSettingsWhenValidationFails() throws Exception {
-
-        CDAPTestAppSettings cdapTestAppSettings = new CDAPTestAppSettings();
-        cdapTestAppSettings.setSettingsField("");
-        ValidationUtils.validateSettings(cdapTestAppSettings, new CDAPTestAppSettingsValidator());
-    }
-
-}
-
+/*
+ * ===============================LICENSE_START======================================
+ *  dcae-analytics
+ * ================================================================================
+ *    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  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.openecomp.dcae.apod.analytics.cdap.common.utils;
+
+import org.junit.Test;
+import org.openecomp.dcae.apod.analytics.cdap.common.BaseAnalyticsCDAPCommonUnitTest;
+import org.openecomp.dcae.apod.analytics.cdap.common.exception.CDAPSettingsException;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Rajiv Singla . Creation Date: 12/12/2016.
+ */
+public class ValidationUtilsTest extends BaseAnalyticsCDAPCommonUnitTest {
+
+    @Test
+    public void testIsEmptyWhenStringIsNull() throws Exception {
+        assertTrue(ValidationUtils.isEmpty(null));
+    }
+
+    @Test
+    public void testIsEmptyWhenStringIsEmpty() throws Exception {
+        String emptyString = "";
+        assertTrue(ValidationUtils.isEmpty(emptyString));
+    }
+
+    @Test
+    public void testIsEmptyWhenStringIsEmptyWithBlanks() throws Exception {
+        String blankString = "   ";
+        assertTrue(ValidationUtils.isEmpty(blankString));
+    }
+
+
+    @Test
+    public void testIsNotPresent() throws Exception {
+        assertFalse(ValidationUtils.isPresent(null));
+        String emptyString = "";
+        assertFalse(ValidationUtils.isPresent(emptyString));
+        String blankString = "   ";
+        assertFalse(ValidationUtils.isPresent(blankString));
+        String validString = "SomeValue";
+        assertTrue(ValidationUtils.isPresent(validString));
+    }
+
+    @Test
+    public void testValidateSettingsWhenValidationPasses() throws Exception {
+        CDAPTestAppSettings cdapTestAppSettings = new CDAPTestAppSettings();
+        cdapTestAppSettings.setSettingsField("testValue");
+        ValidationUtils.validateSettings(cdapTestAppSettings, new CDAPTestAppSettingsValidator());
+    }
+
+    @Test(expected = CDAPSettingsException.class)
+    public void testValidateSettingsWhenValidationFails() throws Exception {
+
+        CDAPTestAppSettings cdapTestAppSettings = new CDAPTestAppSettings();
+        cdapTestAppSettings.setSettingsField("");
+        ValidationUtils.validateSettings(cdapTestAppSettings, new CDAPTestAppSettingsValidator());
+    }
+
+}
+