TCA: Support for VES/A&AI enrichment

Change-Id: I75e0f8e034b9334e918304739e4d73dd12c1ff62
Signed-off-by: an4828 <nekrassov@att.com>
Issue-ID: DCAEGEN2-116

17 files changed, 1745 insertions, 1747 deletions

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java
index 94d287a..d4ce67e 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPGuiceUnitTest.java
@@ -1,31 +1,31 @@
-/*
- * ===============================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.dmaap;
-
-import org.junit.runner.RunWith;
-import org.openecomp.dcae.apod.analytics.test.runner.GuiceJUnitRunner;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/20/2016.
- */
-@RunWith(GuiceJUnitRunner.class)
-public abstract class BaseAnalyticsDMaaPGuiceUnitTest extends BaseAnalyticsDMaaPUnitTest {
-}
+/*

+ * ===============================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.dmaap;

+

+import org.junit.runner.RunWith;

+import org.openecomp.dcae.apod.analytics.test.runner.GuiceJUnitRunner;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/20/2016.

+ */

+@RunWith(GuiceJUnitRunner.class)

+public abstract class BaseAnalyticsDMaaPGuiceUnitTest extends BaseAnalyticsDMaaPUnitTest {

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java
index be52fdd..9b5f1d1 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/BaseAnalyticsDMaaPUnitTest.java
@@ -1,99 +1,99 @@
-/*
- * ===============================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.dmaap;
-
-import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;
-
-import java.util.List;
-
-import static com.google.common.collect.ImmutableList.of;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/14/2016.
- */
-public abstract class BaseAnalyticsDMaaPUnitTest extends BaseDCAEAnalyticsUnitTest {
-
-    // Unit Test Settings
-    protected static final String HOST_NAME = "testHostName";
-    protected static final Integer PORT_NUMBER = 8080;
-    protected static final String TOPIC_NAME = "testTopicName";
-    protected static final String USERNAME = "testUserName";
-    protected static final String PASSWORD = "testPassword";
-    protected static final String HTTP_PROTOCOL = "https";
-    protected static final String CONTENT_TYPE = "application/json";
-
-    protected static final int PUBLISHER_MAX_BATCH_QUEUE_SIZE = 200;
-    protected static final int PUBLISHER_MAX_RECOVERY_QUEUE_SIZE = 2000;
-
-    protected static final String SUBSCRIBER_CONSUMER_ID = "123";
-    protected static final String SUBSCRIBER_CONSUMER_GROUP_NAME = "testGonsumerName-" + SUBSCRIBER_CONSUMER_ID;
-    protected static final int SUBSCRIBER_TIMEOUT_MS = 2000;
-    protected static final int SUBSCRIBER_MESSAGE_LIMIT = 20;
-
-    /**
-     * Creates Sample Publisher settings for unit testing purposes
-     *
-     * @return sample publisher settings for testing
-     */
-    protected static DMaaPMRPublisherConfig getPublisherConfig() {
-        return new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)
-                .setPortNumber(PORT_NUMBER)
-                .setProtocol(HTTP_PROTOCOL)
-                .setUserName(USERNAME)
-                .setUserPassword(PASSWORD)
-                .setContentType(CONTENT_TYPE)
-                .setMaxRecoveryQueueSize(PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)
-                .setMaxBatchSize(PUBLISHER_MAX_BATCH_QUEUE_SIZE).build();
-    }
-
-    /**
-     * Creates Sample Subscriber settings for unit testing purposes
-     *
-     * @return sample subscriber settings for testing
-     */
-    protected static DMaaPMRSubscriberConfig getSubscriberConfig(String consumerId, String consumerGroup) {
-        return new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)
-                .setPortNumber(PORT_NUMBER)
-                .setUserName(USERNAME)
-                .setUserPassword(PASSWORD)
-                .setProtocol(HTTP_PROTOCOL)
-                .setContentType(CONTENT_TYPE)
-                .setConsumerGroup(consumerGroup != null ? consumerGroup : SUBSCRIBER_CONSUMER_GROUP_NAME)
-                .setConsumerId(consumerId != null ? consumerId : SUBSCRIBER_CONSUMER_ID)
-                .setTimeoutMS(SUBSCRIBER_TIMEOUT_MS)
-                .setMessageLimit(SUBSCRIBER_MESSAGE_LIMIT).build();
-    }
-
-    /**
-     * Creates two sample message for publishing
-     *
-     * @return sample publish message list
-     */
-    protected static List<String> getTwoSampleMessages() {
-        String message1 = "{ \"message\" : \"Test Message1\"}";
-        String message2 = "{ \"message\" : \"Test Message2\"}";
-        return of(message1, message2);
-    }
-
-
-}
+/*

+ * ===============================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.dmaap;

+

+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;

+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;

+

+import java.util.List;

+

+import static com.google.common.collect.ImmutableList.of;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/14/2016.

+ */

+public abstract class BaseAnalyticsDMaaPUnitTest extends BaseDCAEAnalyticsUnitTest {

+

+    // Unit Test Settings

+    protected static final String HOST_NAME = "testHostName";

+    protected static final Integer PORT_NUMBER = 8080;

+    protected static final String TOPIC_NAME = "testTopicName";

+    protected static final String USERNAME = "testUserName";

+    protected static final String PASSWORD = "testPassword";

+    protected static final String HTTP_PROTOCOL = "https";

+    protected static final String CONTENT_TYPE = "application/json";

+

+    protected static final int PUBLISHER_MAX_BATCH_QUEUE_SIZE = 200;

+    protected static final int PUBLISHER_MAX_RECOVERY_QUEUE_SIZE = 2000;

+

+    protected static final String SUBSCRIBER_CONSUMER_ID = "123";

+    protected static final String SUBSCRIBER_CONSUMER_GROUP_NAME = "testGonsumerName-" + SUBSCRIBER_CONSUMER_ID;

+    protected static final int SUBSCRIBER_TIMEOUT_MS = 2000;

+    protected static final int SUBSCRIBER_MESSAGE_LIMIT = 20;

+

+    /**

+     * Creates Sample Publisher settings for unit testing purposes

+     *

+     * @return sample publisher settings for testing

+     */

+    protected static DMaaPMRPublisherConfig getPublisherConfig() {

+        return new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)

+                .setPortNumber(PORT_NUMBER)

+                .setProtocol(HTTP_PROTOCOL)

+                .setUserName(USERNAME)

+                .setUserPassword(PASSWORD)

+                .setContentType(CONTENT_TYPE)

+                .setMaxRecoveryQueueSize(PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)

+                .setMaxBatchSize(PUBLISHER_MAX_BATCH_QUEUE_SIZE).build();

+    }

+

+    /**

+     * Creates Sample Subscriber settings for unit testing purposes

+     *

+     * @return sample subscriber settings for testing

+     */

+    protected static DMaaPMRSubscriberConfig getSubscriberConfig(String consumerId, String consumerGroup) {

+        return new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)

+                .setPortNumber(PORT_NUMBER)

+                .setUserName(USERNAME)

+                .setUserPassword(PASSWORD)

+                .setProtocol(HTTP_PROTOCOL)

+                .setContentType(CONTENT_TYPE)

+                .setConsumerGroup(consumerGroup != null ? consumerGroup : SUBSCRIBER_CONSUMER_GROUP_NAME)

+                .setConsumerId(consumerId != null ? consumerId : SUBSCRIBER_CONSUMER_ID)

+                .setTimeoutMS(SUBSCRIBER_TIMEOUT_MS)

+                .setMessageLimit(SUBSCRIBER_MESSAGE_LIMIT).build();

+    }

+

+    /**

+     * Creates two sample message for publishing

+     *

+     * @return sample publish message list

+     */

+    protected static List<String> getTwoSampleMessages() {

+        String message1 = "{ \"message\" : \"Test Message1\"}";

+        String message2 = "{ \"message\" : \"Test Message2\"}";

+        return of(message1, message2);

+    }

+

+

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactoryTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactoryTest.java
index 9f83c60..5388d0b 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactoryTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/DMaaPMRFactoryTest.java
@@ -1,67 +1,67 @@
-/*
- * ===============================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.dmaap;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.module.AnalyticsDMaaPTestModule;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-import org.openecomp.dcae.apod.analytics.test.annotation.GuiceModules;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-
-/**
- * @author Manjesh Gowda. Creation Date: 11/7/2016.
- */
-@GuiceModules(AnalyticsDMaaPTestModule.class)
-public class DMaaPMRFactoryTest extends BaseAnalyticsDMaaPGuiceUnitTest {
-
-    private DMaaPMRFactory dmaapMRFactory;
-
-    @Before
-    public void setUp() throws Exception {
-        dmaapMRFactory = new DMaaPMRFactory(new AnalyticsDMaaPTestModule());
-    }
-
-    @Test
-    public void createPublisher() throws Exception {
-        DMaaPMRPublisher publisher = dmaapMRFactory.createPublisher(getPublisherConfig());
-        DMaaPMRPublisherResponse response = publisher.publish(null);
-        assertThat(response.getResponseCode(), is(102));
-    }
-
-    @Test
-    public void createSubscriber() throws Exception {
-        DMaaPMRSubscriber dmaapMRSubscriber = dmaapMRFactory.createSubscriber(getSubscriberConfig("", ""));
-        DMaaPMRSubscriberResponse response = dmaapMRSubscriber.fetchMessages();
-        assertThat(response.getResponseCode(), is(102));
-    }
-
-    @Test
-    public void create() throws Exception {
-
-    }
-
-}
+/*

+ * ===============================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.dmaap;

+

+import org.junit.Before;

+import org.junit.Test;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;

+import org.openecomp.dcae.apod.analytics.dmaap.module.AnalyticsDMaaPTestModule;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;

+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;

+import org.openecomp.dcae.apod.analytics.test.annotation.GuiceModules;

+

+import static org.hamcrest.Matchers.is;

+import static org.junit.Assert.assertThat;

+

+/**

+ * @author Manjesh Gowda. Creation Date: 11/7/2016.

+ */

+@GuiceModules(AnalyticsDMaaPTestModule.class)

+public class DMaaPMRFactoryTest extends BaseAnalyticsDMaaPGuiceUnitTest {

+

+    private DMaaPMRFactory dmaapMRFactory;

+

+    @Before

+    public void setUp() throws Exception {

+        dmaapMRFactory = new DMaaPMRFactory(new AnalyticsDMaaPTestModule());

+    }

+

+    @Test

+    public void createPublisher() throws Exception {

+        DMaaPMRPublisher publisher = dmaapMRFactory.createPublisher(getPublisherConfig());

+        DMaaPMRPublisherResponse response = publisher.publish(null);

+        assertThat(response.getResponseCode(), is(102));

+    }

+

+    @Test

+    public void createSubscriber() throws Exception {

+        DMaaPMRSubscriber dmaapMRSubscriber = dmaapMRFactory.createSubscriber(getSubscriberConfig("", ""));

+        DMaaPMRSubscriberResponse response = dmaapMRSubscriber.fetchMessages();

+        assertThat(response.getResponseCode(), is(102));

+    }

+

+    @Test

+    public void create() throws Exception {

+

+    }

+

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java
index d5563a1..9787295 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfigTest.java
@@ -1,78 +1,78 @@
-/*
- * ===============================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.dmaap.domain.config;
-
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/14/2016.
- */
-public class DMaaPMRPublisherConfigTest extends BaseAnalyticsDMaaPUnitTest {
-
-
-    @Test
-    public void testPublisherConfigDefaults() throws Exception {
-
-        final DMaaPMRPublisherConfig actualDefaultPublisherConfig =
-                new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME).build();
-
-        final DMaaPMRPublisherConfig expectedDefaultPublisherConfig =
-                new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)
-                        .setPortNumber(AnalyticsConstants.DEFAULT_PORT_NUMBER)
-                        .setContentType(AnalyticsConstants.DEFAULT_CONTENT_TYPE)
-                        .setProtocol(AnalyticsConstants.DEFAULT_PROTOCOL)
-                        .setMaxBatchSize(AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE)
-                        .setMaxRecoveryQueueSize(AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)
-                        .build();
-
-        assertTrue("Default Publisher Config parameters must match",
-                actualDefaultPublisherConfig.equals(expectedDefaultPublisherConfig));
-
-    }
-
-
-    @Test
-    public void testPublisherCustomConfig() throws Exception {
-
-
-        final DMaaPMRPublisherConfig actualCustomPublisherConfig = getPublisherConfig();
-
-        final DMaaPMRPublisherConfig expectedCustomPublisherConfig =
-                new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)
-                        .setPortNumber(PORT_NUMBER)
-                        .setUserName(USERNAME)
-                        .setUserPassword(PASSWORD)
-                        .setContentType(CONTENT_TYPE)
-                        .setProtocol(HTTP_PROTOCOL)
-                        .setMaxBatchSize(PUBLISHER_MAX_BATCH_QUEUE_SIZE)
-                        .setMaxRecoveryQueueSize(PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)
-                        .build();
-
-        assertTrue("Custom Publisher Config parameters must match",
-                actualCustomPublisherConfig.equals(expectedCustomPublisherConfig));
-    }
-
-
-}
+/*

+ * ===============================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.dmaap.domain.config;

+

+import org.junit.Test;

+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;

+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;

+

+import static org.junit.Assert.assertTrue;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/14/2016.

+ */

+public class DMaaPMRPublisherConfigTest extends BaseAnalyticsDMaaPUnitTest {

+

+

+    @Test

+    public void testPublisherConfigDefaults() throws Exception {

+

+        final DMaaPMRPublisherConfig actualDefaultPublisherConfig =

+                new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME).build();

+

+        final DMaaPMRPublisherConfig expectedDefaultPublisherConfig =

+                new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)

+                        .setPortNumber(AnalyticsConstants.DEFAULT_PORT_NUMBER)

+                        .setContentType(AnalyticsConstants.DEFAULT_CONTENT_TYPE)

+                        .setProtocol(AnalyticsConstants.DEFAULT_PROTOCOL)

+                        .setMaxBatchSize(AnalyticsConstants.DEFAULT_PUBLISHER_MAX_BATCH_SIZE)

+                        .setMaxRecoveryQueueSize(AnalyticsConstants.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)

+                        .build();

+

+        assertTrue("Default Publisher Config parameters must match",

+                actualDefaultPublisherConfig.equals(expectedDefaultPublisherConfig));

+

+    }

+

+

+    @Test

+    public void testPublisherCustomConfig() throws Exception {

+

+

+        final DMaaPMRPublisherConfig actualCustomPublisherConfig = getPublisherConfig();

+

+        final DMaaPMRPublisherConfig expectedCustomPublisherConfig =

+                new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)

+                        .setPortNumber(PORT_NUMBER)

+                        .setUserName(USERNAME)

+                        .setUserPassword(PASSWORD)

+                        .setContentType(CONTENT_TYPE)

+                        .setProtocol(HTTP_PROTOCOL)

+                        .setMaxBatchSize(PUBLISHER_MAX_BATCH_QUEUE_SIZE)

+                        .setMaxRecoveryQueueSize(PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)

+                        .build();

+

+        assertTrue("Custom Publisher Config parameters must match",

+                actualCustomPublisherConfig.equals(expectedCustomPublisherConfig));

+    }

+

+

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java
index ce9b4be..296c42f 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/domain/config/DMaaPMRSubscriberConfigTest.java
@@ -1,84 +1,84 @@
-/*
- * ===============================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.dmaap.domain.config;
-
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;
-import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/14/2016.
- */
-public class DMaaPMRSubscriberConfigTest extends BaseAnalyticsDMaaPUnitTest {
-
-    @Test
-    public void testSubscriberConfigDefaults() throws Exception {
-
-        DMaaPMRSubscriberConfig actualDefaultSubscriberConfig =
-                new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)
-                        .setConsumerGroup(AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX + SUBSCRIBER_CONSUMER_ID)
-                        .setConsumerId(SUBSCRIBER_CONSUMER_ID).build();
-
-        DMaaPMRSubscriberConfig expectedSubscriberConfig =
-                new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)
-                        .setPortNumber(AnalyticsConstants.DEFAULT_PORT_NUMBER)
-                        .setContentType(AnalyticsConstants.DEFAULT_CONTENT_TYPE)
-                        .setProtocol(AnalyticsConstants.DEFAULT_PROTOCOL)
-                        .setConsumerGroup(AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX + SUBSCRIBER_CONSUMER_ID)
-                        .setConsumerId(SUBSCRIBER_CONSUMER_ID)
-                        .setMessageLimit(AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT)
-                        .setTimeoutMS(AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS)
-                        .build();
-
-        assertTrue("Default Subscriber Config parameters must match",
-                actualDefaultSubscriberConfig.equals(expectedSubscriberConfig));
-
-    }
-
-
-    @Test
-    public void testSubscriberCustomConfig() throws Exception {
-
-        DMaaPMRSubscriberConfig actualSubscriberCustomConfig = getSubscriberConfig(SUBSCRIBER_CONSUMER_ID,
-                SUBSCRIBER_CONSUMER_GROUP_NAME);
-
-        DMaaPMRSubscriberConfig expectedSubscriberCustomConfig =
-                new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)
-                        .setPortNumber(PORT_NUMBER)
-                        .setUserName(USERNAME)
-                        .setUserPassword(PASSWORD)
-                        .setContentType(CONTENT_TYPE)
-                        .setProtocol(HTTP_PROTOCOL)
-                        .setConsumerGroup(SUBSCRIBER_CONSUMER_GROUP_NAME)
-                        .setConsumerId(SUBSCRIBER_CONSUMER_ID)
-                        .setMessageLimit(SUBSCRIBER_MESSAGE_LIMIT)
-                        .setTimeoutMS(SUBSCRIBER_TIMEOUT_MS)
-                        .build();
-
-        assertTrue("Custom Subscriber Config parameters must match",
-                actualSubscriberCustomConfig.equals(expectedSubscriberCustomConfig));
-
-    }
-
-
-}
+/*

+ * ===============================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.dmaap.domain.config;

+

+import org.junit.Test;

+import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants;

+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;

+

+import static org.junit.Assert.assertTrue;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/14/2016.

+ */

+public class DMaaPMRSubscriberConfigTest extends BaseAnalyticsDMaaPUnitTest {

+

+    @Test

+    public void testSubscriberConfigDefaults() throws Exception {

+

+        DMaaPMRSubscriberConfig actualDefaultSubscriberConfig =

+                new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)

+                        .setConsumerGroup(AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX + SUBSCRIBER_CONSUMER_ID)

+                        .setConsumerId(SUBSCRIBER_CONSUMER_ID).build();

+

+        DMaaPMRSubscriberConfig expectedSubscriberConfig =

+                new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)

+                        .setPortNumber(AnalyticsConstants.DEFAULT_PORT_NUMBER)

+                        .setContentType(AnalyticsConstants.DEFAULT_CONTENT_TYPE)

+                        .setProtocol(AnalyticsConstants.DEFAULT_PROTOCOL)

+                        .setConsumerGroup(AnalyticsConstants.DEFAULT_SUBSCRIBER_GROUP_PREFIX + SUBSCRIBER_CONSUMER_ID)

+                        .setConsumerId(SUBSCRIBER_CONSUMER_ID)

+                        .setMessageLimit(AnalyticsConstants.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT)

+                        .setTimeoutMS(AnalyticsConstants.DEFAULT_SUBSCRIBER_TIMEOUT_MS)

+                        .build();

+

+        assertTrue("Default Subscriber Config parameters must match",

+                actualDefaultSubscriberConfig.equals(expectedSubscriberConfig));

+

+    }

+

+

+    @Test

+    public void testSubscriberCustomConfig() throws Exception {

+

+        DMaaPMRSubscriberConfig actualSubscriberCustomConfig = getSubscriberConfig(SUBSCRIBER_CONSUMER_ID,

+                SUBSCRIBER_CONSUMER_GROUP_NAME);

+

+        DMaaPMRSubscriberConfig expectedSubscriberCustomConfig =

+                new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)

+                        .setPortNumber(PORT_NUMBER)

+                        .setUserName(USERNAME)

+                        .setUserPassword(PASSWORD)

+                        .setContentType(CONTENT_TYPE)

+                        .setProtocol(HTTP_PROTOCOL)

+                        .setConsumerGroup(SUBSCRIBER_CONSUMER_GROUP_NAME)

+                        .setConsumerId(SUBSCRIBER_CONSUMER_ID)

+                        .setMessageLimit(SUBSCRIBER_MESSAGE_LIMIT)

+                        .setTimeoutMS(SUBSCRIBER_TIMEOUT_MS)

+                        .build();

+

+        assertTrue("Custom Subscriber Config parameters must match",

+                actualSubscriberCustomConfig.equals(expectedSubscriberCustomConfig));

+

+    }

+

+

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java
index 036e8ca..840d356 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/BaseAnalyticsDMaaPIT.java
@@ -1,109 +1,109 @@
-/*
- * ===============================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.dmaap.it;
-
-import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsIT;
-
-import java.util.List;
-
-import static com.google.common.collect.ImmutableList.of;
-
-/**
- * Base class for all DCAE DMaaP Integration Tests
- * <p>
- * @author Rajiv Singla . Creation Date: 10/13/2016.
- */
-public abstract class BaseAnalyticsDMaaPIT extends BaseDCAEAnalyticsIT {
-
-    // Integration Test Settings
-    protected static final String HOST_NAME = "mrlocal-mtnjftle01.homer.com";
-    protected static final Integer PORT_NUMBER = 3905;
-    protected static final String TOPIC_NAME = "com.dcae.dmaap.mtnje2.DcaeTestVESPub";
-
-    protected static final String USERNAME = "USER";
-    protected static final String PASSWORD = "PASSWORD";
-    protected static final String HTTP_PROTOCOL = "https";
-    protected static final String CONTENT_TYPE = "application/json";
-
-    protected static final int PUBLISHER_MAX_BATCH_QUEUE_SIZE = 20;
-    protected static final int PUBLISHER_MAX_RECOVERY_QUEUE_SIZE = 200;
-
-    protected static final String SUBSCRIBER_CONSUMER_ID = "123";
-    protected static final String SUBSCRIBER_CONSUMER_GROUP_NAME = "testGonsumerName-" + SUBSCRIBER_CONSUMER_ID;
-    protected static final int SUBSCRIBER_TIMEOUT_MS = 2000;
-    protected static final int SUBSCRIBER_MESSAGE_LIMIT = 20;
-
-    /**
-     * Creates Sample Publisher settings for integration testing purposes
-     *
-     * @return DMaaP MR Publisher Config
-     */
-    protected static DMaaPMRPublisherConfig getPublisherConfig() {
-        return new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)
-                .setPortNumber(PORT_NUMBER)
-                .setProtocol(HTTP_PROTOCOL)
-                .setContentType(CONTENT_TYPE)
-                .setUserName(USERNAME)
-                .setUserPassword(PASSWORD)
-                .setMaxBatchSize(PUBLISHER_MAX_BATCH_QUEUE_SIZE)
-                .setMaxRecoveryQueueSize(PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)
-                .build();
-    }
-
-    /**
-     * Creates Sample Subscriber settings for integration testing purposes
-     *
-     * @return DMaaP MR Subscriber Config
-     */
-    protected static DMaaPMRSubscriberConfig getSubscriberConfig(String consumerId) {
-        return new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)
-                .setPortNumber(PORT_NUMBER)
-                .setProtocol(HTTP_PROTOCOL)
-                .setContentType(CONTENT_TYPE)
-                .setUserName(USERNAME)
-                .setUserPassword(PASSWORD)
-                .setConsumerGroup(SUBSCRIBER_CONSUMER_GROUP_NAME)
-                .setConsumerId(consumerId != null ? consumerId : SUBSCRIBER_CONSUMER_ID)
-                .setTimeoutMS(SUBSCRIBER_TIMEOUT_MS)
-                .setMessageLimit(SUBSCRIBER_MESSAGE_LIMIT).build();
-    }
-
-    /**
-     * Publishes 2 sample message to DMaaP Topic for integration test purposes
-     *
-     * @param dMaaPMRPublisher DMaaP MR Publisher
-     * @return DMaaP MR Publisher Response
-     */
-    protected static DMaaPMRPublisherResponse publishTwoSampleMessages(DMaaPMRPublisher dMaaPMRPublisher) {
-        return dMaaPMRPublisher.publish(getTwoSampleMessage());
-    }
-
-    protected static List<String> getTwoSampleMessage() {
-        String message1 = "{ \"message\" : \"Test Message1\"}";
-        String message2 = "{ \"message\" : \"Test Message2\"}";
-        return of(message1, message2);
-    }
-
-}
+/*

+ * ===============================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.dmaap.it;

+

+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;

+import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsIT;

+

+import java.util.List;

+

+import static com.google.common.collect.ImmutableList.of;

+

+/**

+ * Base class for all DCAE DMaaP Integration Tests

+ * <p>

+ * @author Rajiv Singla . Creation Date: 10/13/2016.

+ */

+public abstract class BaseAnalyticsDMaaPIT extends BaseDCAEAnalyticsIT {

+

+    // Integration Test Settings

+    protected static final String HOST_NAME = "mrlocal-mtnjftle01.homer.com";

+    protected static final Integer PORT_NUMBER = 3905;

+    protected static final String TOPIC_NAME = "com.dcae.dmaap.mtnje2.DcaeTestVESPub";

+

+    protected static final String USERNAME = "USER";

+    protected static final String PASSWORD = "PASSWORD";

+    protected static final String HTTP_PROTOCOL = "https";

+    protected static final String CONTENT_TYPE = "application/json";

+

+    protected static final int PUBLISHER_MAX_BATCH_QUEUE_SIZE = 20;

+    protected static final int PUBLISHER_MAX_RECOVERY_QUEUE_SIZE = 200;

+

+    protected static final String SUBSCRIBER_CONSUMER_ID = "123";

+    protected static final String SUBSCRIBER_CONSUMER_GROUP_NAME = "testGonsumerName-" + SUBSCRIBER_CONSUMER_ID;

+    protected static final int SUBSCRIBER_TIMEOUT_MS = 2000;

+    protected static final int SUBSCRIBER_MESSAGE_LIMIT = 20;

+

+    /**

+     * Creates Sample Publisher settings for integration testing purposes

+     *

+     * @return DMaaP MR Publisher Config

+     */

+    protected static DMaaPMRPublisherConfig getPublisherConfig() {

+        return new DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)

+                .setPortNumber(PORT_NUMBER)

+                .setProtocol(HTTP_PROTOCOL)

+                .setContentType(CONTENT_TYPE)

+                .setUserName(USERNAME)

+                .setUserPassword(PASSWORD)

+                .setMaxBatchSize(PUBLISHER_MAX_BATCH_QUEUE_SIZE)

+                .setMaxRecoveryQueueSize(PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)

+                .build();

+    }

+

+    /**

+     * Creates Sample Subscriber settings for integration testing purposes

+     *

+     * @return DMaaP MR Subscriber Config

+     */

+    protected static DMaaPMRSubscriberConfig getSubscriberConfig(String consumerId) {

+        return new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)

+                .setPortNumber(PORT_NUMBER)

+                .setProtocol(HTTP_PROTOCOL)

+                .setContentType(CONTENT_TYPE)

+                .setUserName(USERNAME)

+                .setUserPassword(PASSWORD)

+                .setConsumerGroup(SUBSCRIBER_CONSUMER_GROUP_NAME)

+                .setConsumerId(consumerId != null ? consumerId : SUBSCRIBER_CONSUMER_ID)

+                .setTimeoutMS(SUBSCRIBER_TIMEOUT_MS)

+                .setMessageLimit(SUBSCRIBER_MESSAGE_LIMIT).build();

+    }

+

+    /**

+     * Publishes 2 sample message to DMaaP Topic for integration test purposes

+     *

+     * @param dMaaPMRPublisher DMaaP MR Publisher

+     * @return DMaaP MR Publisher Response

+     */

+    protected static DMaaPMRPublisherResponse publishTwoSampleMessages(DMaaPMRPublisher dMaaPMRPublisher) {

+        return dMaaPMRPublisher.publish(getTwoSampleMessage());

+    }

+

+    protected static List<String> getTwoSampleMessage() {

+        String message1 = "{ \"message\" : \"Test Message1\"}";

+        String message2 = "{ \"message\" : \"Test Message2\"}";

+        return of(message1, message2);

+    }

+

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRPublisherImplIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRPublisherImplIT.java
index 2b6c68a..0d09f3b 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRPublisherImplIT.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRPublisherImplIT.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.dmaap.it;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/13/2016.
- */
-@Ignore
-public class DMaaPMRPublisherImplIT extends BaseAnalyticsDMaaPIT {
-
-    private DMaaPMRPublisher dMaaPMRPublisher;
-
-    @Before
-    public void before() throws Exception {
-        DMaaPMRFactory dMaaPMRFactory = DMaaPMRFactory.create();
-        dMaaPMRPublisher = dMaaPMRFactory.createPublisher(getPublisherConfig());
-    }
-
-    @Test
-    public void testPublish() throws Exception {
-        long pendingMessageCount = publishTwoSampleMessages(dMaaPMRPublisher).getPendingMessagesCount();
-        Assert.assertTrue("Published Message Count must be 2", pendingMessageCount == 2);
-    }
-
-    @Test
-    public void testFlush() throws Exception {
-        publishTwoSampleMessages(dMaaPMRPublisher);
-        DMaaPMRPublisherResponse publisherResponse = dMaaPMRPublisher.flush();
-        Integer responseCode = publisherResponse.getResponseCode();
-        Assert.assertTrue("Server Response code must be 200", responseCode == 200);
-    }
-}
+/*

+ * ===============================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.dmaap.it;

+

+import org.junit.Assert;

+import org.junit.Before;

+import org.junit.Ignore;

+import org.junit.Test;

+import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/13/2016.

+ */

+@Ignore

+public class DMaaPMRPublisherImplIT extends BaseAnalyticsDMaaPIT {

+

+    private DMaaPMRPublisher dMaaPMRPublisher;

+

+    @Before

+    public void before() throws Exception {

+        DMaaPMRFactory dMaaPMRFactory = DMaaPMRFactory.create();

+        dMaaPMRPublisher = dMaaPMRFactory.createPublisher(getPublisherConfig());

+    }

+

+    @Test

+    public void testPublish() throws Exception {

+        long pendingMessageCount = publishTwoSampleMessages(dMaaPMRPublisher).getPendingMessagesCount();

+        Assert.assertTrue("Published Message Count must be 2", pendingMessageCount == 2);

+    }

+

+    @Test

+    public void testFlush() throws Exception {

+        publishTwoSampleMessages(dMaaPMRPublisher);

+        DMaaPMRPublisherResponse publisherResponse = dMaaPMRPublisher.flush();

+        Integer responseCode = publisherResponse.getResponseCode();

+        Assert.assertTrue("Server Response code must be 200", responseCode == 200);

+    }

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java
index 5fdfd81..a336ef5 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/it/DMaaPMRSubscriberImplIT.java
@@ -1,87 +1,87 @@
-/*
- * ===============================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.dmaap.it;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/13/2016.
- */
-@Ignore
-public class DMaaPMRSubscriberImplIT extends BaseAnalyticsDMaaPIT {
-
-    private DMaaPMRPublisher dMaaPMRPublisher;
-    private DMaaPMRSubscriber dMaaPMRSubscriber;
-
-    @Before
-    public void before() throws Exception {
-        String randomConsumerID = UUID.randomUUID().toString();
-        DMaaPMRFactory dMaaPMRFactory = DMaaPMRFactory.create();
-        dMaaPMRSubscriber = dMaaPMRFactory.createSubscriber(getSubscriberConfig(randomConsumerID));
-        dMaaPMRPublisher = dMaaPMRFactory.createPublisher(getPublisherConfig());
-    }
-
-    @After
-    public void after() throws Exception {
-        dMaaPMRSubscriber.close();
-        dMaaPMRPublisher.close();
-    }
-
-
-    @Test
-    public void testFetchMessages() throws Exception {
-
-        // This call is used to just register a brand new subscriber with DMaaP
-        DMaaPMRSubscriberResponse subscriberRegistrationResponse = dMaaPMRSubscriber.fetchMessages();
-        assertTrue("Subscriber Registration Response code must be 200 confirming subscriber was registered " +
-                "successfully", subscriberRegistrationResponse.getResponseCode() == 200);
-        assertTrue("Subscriber Registration Response must not contain any messages", subscriberRegistrationResponse
-                .getFetchedMessages().size() == 0);
-
-        // Force push couple of test messages
-        DMaaPMRPublisherResponse publisherResponse = dMaaPMRPublisher.forcePublish(getTwoSampleMessage());
-        assertTrue("Message must be posted successfully before subscriber can fetch it", publisherResponse
-                .getResponseCode() == 200);
-
-        // Now fetch messages from DMaaP
-        DMaaPMRSubscriberResponse subscriberResponse = dMaaPMRSubscriber.fetchMessages();
-        List<String> messageList = new LinkedList<>();
-        for (String message : subscriberResponse.getFetchedMessages()) {
-            messageList.add(message);
-        }
-        assertTrue("Subscriber message count must be 2", messageList.size() == 2);
-    }
-
-}
+/*

+ * ===============================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.dmaap.it;

+

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Ignore;

+import org.junit.Test;

+import org.openecomp.dcae.apod.analytics.dmaap.DMaaPMRFactory;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;

+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;

+

+import java.util.LinkedList;

+import java.util.List;

+import java.util.UUID;

+

+import static org.junit.Assert.assertTrue;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/13/2016.

+ */

+@Ignore

+public class DMaaPMRSubscriberImplIT extends BaseAnalyticsDMaaPIT {

+

+    private DMaaPMRPublisher dMaaPMRPublisher;

+    private DMaaPMRSubscriber dMaaPMRSubscriber;

+

+    @Before

+    public void before() throws Exception {

+        String randomConsumerID = UUID.randomUUID().toString();

+        DMaaPMRFactory dMaaPMRFactory = DMaaPMRFactory.create();

+        dMaaPMRSubscriber = dMaaPMRFactory.createSubscriber(getSubscriberConfig(randomConsumerID));

+        dMaaPMRPublisher = dMaaPMRFactory.createPublisher(getPublisherConfig());

+    }

+

+    @After

+    public void after() throws Exception {

+        dMaaPMRSubscriber.close();

+        dMaaPMRPublisher.close();

+    }

+

+

+    @Test

+    public void testFetchMessages() throws Exception {

+

+        // This call is used to just register a brand new subscriber with DMaaP

+        DMaaPMRSubscriberResponse subscriberRegistrationResponse = dMaaPMRSubscriber.fetchMessages();

+        assertTrue("Subscriber Registration Response code must be 200 confirming subscriber was registered " +

+                "successfully", subscriberRegistrationResponse.getResponseCode() == 200);

+        assertTrue("Subscriber Registration Response must not contain any messages", subscriberRegistrationResponse

+                .getFetchedMessages().size() == 0);

+

+        // Force push couple of test messages

+        DMaaPMRPublisherResponse publisherResponse = dMaaPMRPublisher.forcePublish(getTwoSampleMessage());

+        assertTrue("Message must be posted successfully before subscriber can fetch it", publisherResponse

+                .getResponseCode() == 200);

+

+        // Now fetch messages from DMaaP

+        DMaaPMRSubscriberResponse subscriberResponse = dMaaPMRSubscriber.fetchMessages();

+        List<String> messageList = new LinkedList<>();

+        for (String message : subscriberResponse.getFetchedMessages()) {

+            messageList.add(message);

+        }

+        assertTrue("Subscriber message count must be 2", messageList.size() == 2);

+    }

+

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPTestModule.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPTestModule.java
index acd646a..e7e536e 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPTestModule.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/module/AnalyticsDMaaPTestModule.java
@@ -1,60 +1,60 @@
-/*
- * ===============================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.dmaap.module;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.assistedinject.FactoryModuleBuilder;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherMockImpl;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl;
-import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;
-import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory;
-import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberMockImpl;
-
-/**
- * DMaaP Guice Test Module
- * <p>
- * @author Rajiv Singla . Creation Date: 10/20/2016.
- */
-public class AnalyticsDMaaPTestModule extends AbstractModule {
-
-
-    @Override
-    protected void configure() {
-// Bind Http Client
-        bind(CloseableHttpClient.class).toInstance(HttpClients.createDefault());
-
-        // Bind Publishing queue
-        install(new FactoryModuleBuilder().implement(DMaaPMRPublisherQueue.class, DMaaPMRPublisherQueueImpl.class)
-                .build(DMaaPMRPublisherQueueFactory.class));
-
-        install(new FactoryModuleBuilder().implement(DMaaPMRPublisher.class, DMaaPMRPublisherMockImpl.class)
-                .build(DMaaPMRPublisherFactory.class));
-
-        install(new FactoryModuleBuilder().implement(DMaaPMRSubscriber.class, DMaaPMRSubscriberMockImpl.class)
-                .build(DMaaPMRSubscriberFactory.class));
-    }
-}
+/*

+ * ===============================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.dmaap.module;

+

+import com.google.inject.AbstractModule;

+import com.google.inject.assistedinject.FactoryModuleBuilder;

+import org.apache.http.impl.client.CloseableHttpClient;

+import org.apache.http.impl.client.HttpClients;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisher;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherFactory;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherMockImpl;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueFactory;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueueImpl;

+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriber;

+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberFactory;

+import org.openecomp.dcae.apod.analytics.dmaap.service.subscriber.DMaaPMRSubscriberMockImpl;

+

+/**

+ * DMaaP Guice Test Module

+ * <p>

+ * @author Rajiv Singla . Creation Date: 10/20/2016.

+ */

+public class AnalyticsDMaaPTestModule extends AbstractModule {

+

+

+    @Override

+    protected void configure() {

+// Bind Http Client

+        bind(CloseableHttpClient.class).toInstance(HttpClients.createDefault());

+

+        // Bind Publishing queue

+        install(new FactoryModuleBuilder().implement(DMaaPMRPublisherQueue.class, DMaaPMRPublisherQueueImpl.class)

+                .build(DMaaPMRPublisherQueueFactory.class));

+

+        install(new FactoryModuleBuilder().implement(DMaaPMRPublisher.class, DMaaPMRPublisherMockImpl.class)

+                .build(DMaaPMRPublisherFactory.class));

+

+        install(new FactoryModuleBuilder().implement(DMaaPMRSubscriber.class, DMaaPMRSubscriberMockImpl.class)

+                .build(DMaaPMRSubscriberFactory.class));

+    }

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponentTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponentTest.java
index 4c60512..4265c46 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponentTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/BaseDMaaPMRComponentTest.java
@@ -1,300 +1,300 @@
-/*
- * ===============================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.dmaap.service;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.google.common.base.Optional;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.StatusLine;
-import org.apache.http.client.ResponseHandler;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mockito;
-import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isA;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.mock;
-
-/**
- * @author Manjesh Gowda. Creation Date: 11/4/2016.
- */
-public class BaseDMaaPMRComponentTest extends BaseAnalyticsDMaaPUnitTest {
-
-    @Test
-    public void testGetAuthHeaderWithGoodValues() {
-        String expectedEncodedString = "Basic bTAwNTAyQHRjYS5hZi5kY2FlLmNvbTpUZTUwMjFhYmM=";
-        Optional<String> actualOutput = BaseDMaaPMRComponent.getAuthHeader("USER", "PASSWORD");
-        assertTrue(" Authentication Header has value ", actualOutput.isPresent());
-//        assertEquals(" Authentication Header has value ", expectedEncodedString, actualOutput.get());
-    }
-
-    @Test
-    public void testGetAuthHeaderWithNullValues() {
-        Optional<String> actualOutput = BaseDMaaPMRComponent.getAuthHeader(null, null);
-        assertFalse(" Authentication Header has value ", actualOutput.isPresent());
-    }
-
-    @Test
-    public void testGetAuthHeaderWithUserNullValue() {
-        Optional<String> actualOutput = BaseDMaaPMRComponent.getAuthHeader("USER", null);
-        assertFalse(" Authentication Header has value ", actualOutput.isPresent());
-    }
-
-    @Test
-    public void testGetAuthHeaderWithPasswordNullValue() {
-        Optional<String> actualOutput = BaseDMaaPMRComponent.getAuthHeader(null, "PASSWORD");
-        assertFalse(" Authentication Header has value ", actualOutput.isPresent());
-    }
-
-    @Test
-    public void testCreatePublishURIWithGoodValues() {
-        URI actualURI = BaseDMaaPMRComponent.createPublisherURI(getPublisherConfig());
-        String test = actualURI.toString();
-        assertEquals("Generated Publisher URL is correct",
-                "https://testHostName:8080/events/testTopicName", actualURI.toString());
-    }
-
-    @Test(expected = DCAEAnalyticsRuntimeException.class)
-    public void testCreatePublishURIWithURISyntaxException() {
-        DMaaPMRPublisherConfig badPublisherConfig = new DMaaPMRPublisherConfig
-                .Builder(" dav /gh. ss/ asd ", "///@$%#-htps:<>!##")
-                .setPortNumber(0)
-                .setProtocol("https").build();
-
-      BaseDMaaPMRComponent.createPublisherURI(badPublisherConfig);
-    }
-
-    @Test
-    public void testCreateSubscribeURIWithGoodValues() {
-        URI actualURI = BaseDMaaPMRComponent.createSubscriberURI(
-                getSubscriberConfig("test-consumer-group", "test-consumer-id"));
-        assertEquals("Generated Subscriber URL is correct",
-                "https://testHostName:8080/events/testTopicName/" +
-                        "test-consumer-id/test-consumer-group?timeout=2000&limit=20",
-                actualURI.toString());
-    }
-
-    @Test(expected = DCAEAnalyticsRuntimeException.class)
-    public void testCreateSubscribeURIWithURISyntaxException() {
-        DMaaPMRSubscriberConfig badSubscriberConfig = new DMaaPMRSubscriberConfig
-                .Builder(" dav /gh. ss/ asd ", "")
-                .setPortNumber(PORT_NUMBER)
-                .setProtocol(HTTP_PROTOCOL)
-                .setContentType(CONTENT_TYPE).build();
-
-        URI actualURI = BaseDMaaPMRComponent.createSubscriberURI(badSubscriberConfig);
-    }
-
-    @Test
-    public void testConvertToJsonStringGoodJsonStringList() {
-        List<String> jsonMessage = Arrays.asList(
-                "{\"message\":\"I'm Object 1 Message\"}",
-                "{\"message\":\"I'm Object 2 Message\"}");
-
-        String actualJSONMsg = BaseDMaaPMRComponent.convertToJsonString(jsonMessage);
-
-        String expectedJSONMsg = "[{\"message\":\"I'm Object 1 Message\"}," +
-                "{\"message\":\"I'm Object 2 Message\"}]";
-        assertEquals("Convert a List of Strings to JSON is working fine", expectedJSONMsg, actualJSONMsg);
-
-    }
-
-    @Rule
-    public ExpectedException expectedJsonProcessingException = ExpectedException.none();
-
-    @Test
-    public void testConvertToJsonStringBadJsonStringList() {
-        expectedJsonProcessingException.expect(DCAEAnalyticsRuntimeException.class);
-        expectedJsonProcessingException.expectCause(isA(JsonProcessingException.class));
-
-        List<String> jsonMessage = Arrays.asList(
-                "{\"message\":\"I'm Object 1 Message\"",
-                "\"message\":\"I'm Object 2 Message\"");
-
-        BaseDMaaPMRComponent.convertToJsonString(jsonMessage);
-    }
-
-    @Test
-    public void testConvertToJsonStringWithEmptyList() {
-        List<String> jsonMessage = Arrays.asList();
-        String actualJSONMsg = BaseDMaaPMRComponent.convertToJsonString(jsonMessage);
-        String expectedJSONMsg = "[]";
-        assertEquals("Convert a List of Strings to JSON is working fine", expectedJSONMsg, actualJSONMsg);
-    }
-
-    @Test
-    public void testConvertToJsonStringWithNullList() {
-        String actualJSONMsg = BaseDMaaPMRComponent.convertToJsonString(null);
-        String expectedJSONMsg = "[]";
-        assertEquals("Convert a List of Strings to JSON is working fine", expectedJSONMsg, actualJSONMsg);
-    }
-
-
-    @Test
-    public void testConvertJsonToStringMessagesGoodValues() {
-        String inputJSONMsg = "[{\"message\":\"I'm Object 1 Message\"}," +
-                "{\"message\":\"I'm Object 2 Message\"}]";
-        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages(inputJSONMsg);
-        assertThat(actualList, hasSize(2));
-        assertThat(actualList, containsInAnyOrder(
-                "{\"message\":\"I'm Object 1 Message\"}",
-                "{\"message\":\"I'm Object 2 Message\"}"
-        ));
-    }
-
-    @Test
-    public void testConvertJsonToStringMessagesNoValues() {
-        String inputJSONMsg = "[]";
-        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages(inputJSONMsg);
-        assertThat(actualList, hasSize(0));
-    }
-
-    @Test
-    public void testConvertJsonToStringMessagesNullValues() {
-        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages(null);
-        assertThat(actualList, hasSize(0));
-    }
-
-    @Test
-    public void testConvertJsonToStringMessagesEmptyValues() {
-        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages("  ");
-        assertThat(actualList, hasSize(0));
-    }
-
-    @Rule
-    public ExpectedException convertToJSONIOException = ExpectedException.none();
-
-    @Test
-    public void testConvertJsonToStringMessagesException() {
-        convertToJSONIOException.expect(DCAEAnalyticsRuntimeException.class);
-        convertToJSONIOException.expectCause(isA(IOException.class));
-
-        String inputJSONMsg = "[\"{\"message\":\"I'm Object 1 Message\"}\"," +
-                "\"{\"message\":\"I'm Object 2 Message\"}\"]";
-        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages(inputJSONMsg);
-        assertThat(actualList, hasSize(2));
-        assertThat(actualList, containsInAnyOrder(
-                "{\"message\":\"I'm Object 1 Message\"}",
-                "{\"message\":\"I'm Object 2 Message\"}"
-        ));
-    }
-
-    @Test
-    public void testAddMessagesToRecoveryQueueAllGood() {
-        DMaaPMRPublisherQueue dmaapMRPublisherQueue = mock(DMaaPMRPublisherQueue.class);
-        given(dmaapMRPublisherQueue.addRecoverableMessages(Mockito.<String>anyList())).willReturn(0);
-        given(dmaapMRPublisherQueue.getBatchQueueRemainingSize()).willReturn(0);
-        List<String> messages = new ArrayList<String>();
-        BaseDMaaPMRComponent.addMessagesToRecoveryQueue(dmaapMRPublisherQueue, messages);
-    }
-
-    @Rule
-    public ExpectedException addQueueIllegalException = ExpectedException.none();
-
-    @Test
-    public void testAddMessagesToRecoveryQueueException() {
-        addQueueIllegalException.expect(isA(DCAEAnalyticsRuntimeException.class));
-        addQueueIllegalException.expectCause(isA(IllegalStateException.class));
-
-        DMaaPMRPublisherQueue dmaapMRPublisherQueue = mock(DMaaPMRPublisherQueue.class);
-
-        given(dmaapMRPublisherQueue.addRecoverableMessages(Mockito.<String>anyList()))
-                .willThrow(IllegalStateException.class);
-        List<String> messages = new ArrayList<String>();
-
-        BaseDMaaPMRComponent.addMessagesToRecoveryQueue(dmaapMRPublisherQueue, messages);
-    }
-
-
-    @Test
-    public void testResponseHandler() {
-        HttpResponse mockHttpResponse = mock(HttpResponse.class);
-        StatusLine mockStatusLine = mock(StatusLine.class);
-        HttpEntity mockHttpEntity = mock(HttpEntity.class);
-        // Could not mock EntityUtils as it's final class
-        //EntityUtils mockEntityUtils = mock(EntityUtils.class);
-
-        given(mockHttpResponse.getStatusLine()).willReturn(mockStatusLine);
-        given(mockStatusLine.getStatusCode()).willReturn(200);
-        given(mockHttpResponse.getEntity()).willReturn(null);
-        //given(mockEntityUtils.toString()).willReturn("Test value");
-
-        ResponseHandler<Pair<Integer, String>> responseHandler = BaseDMaaPMRComponent.responseHandler();
-        try {
-            Pair<Integer, String> mappedResponse = responseHandler.handleResponse(mockHttpResponse);
-            assertTrue("Http response code returned properly ", mappedResponse.getLeft().equals(200));
-            assertTrue("Http response body returned properly ", mappedResponse.getRight().equals(""));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-
-    @Test
-    public void testCreateSubscriberResponse() {
-        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse =
-                BaseDMaaPMRComponent.createSubscriberResponse(200, "Test Message", getTwoSampleMessages());
-
-        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));
-        assertEquals(dmaapMRSubscriberResponse.getResponseMessage(), "Test Message");
-        assertThat(dmaapMRSubscriberResponse.getFetchedMessages().size(), is(2));
-
-    }
-
-    @Test
-    public void testCreateSubscriberResponse_no_message() {
-        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse =
-                BaseDMaaPMRComponent.createSubscriberResponse(200, "Test Message", null);
-
-        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));
-        assertEquals(dmaapMRSubscriberResponse.getResponseMessage(), "Test Message");
-        assertThat(dmaapMRSubscriberResponse.getFetchedMessages().size(), is(0));
-
-    }
-
-}
-
-
-
-
-
+/*

+ * ===============================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.dmaap.service;

+

+import com.fasterxml.jackson.core.JsonProcessingException;

+import com.google.common.base.Optional;

+import org.apache.commons.lang3.tuple.Pair;

+import org.apache.http.HttpEntity;

+import org.apache.http.HttpResponse;

+import org.apache.http.StatusLine;

+import org.apache.http.client.ResponseHandler;

+import org.junit.Rule;

+import org.junit.Test;

+import org.junit.rules.ExpectedException;

+import org.mockito.Mockito;

+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;

+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;

+import org.openecomp.dcae.apod.analytics.dmaap.service.publisher.DMaaPMRPublisherQueue;

+

+import java.io.IOException;

+import java.net.URI;

+import java.util.ArrayList;

+import java.util.Arrays;

+import java.util.List;

+

+import static org.hamcrest.Matchers.containsInAnyOrder;

+import static org.hamcrest.Matchers.hasSize;

+import static org.hamcrest.Matchers.is;

+import static org.hamcrest.Matchers.isA;

+import static org.junit.Assert.assertEquals;

+import static org.junit.Assert.assertFalse;

+import static org.junit.Assert.assertThat;

+import static org.junit.Assert.assertTrue;

+import static org.mockito.BDDMockito.given;

+import static org.mockito.Mockito.mock;

+

+/**

+ * @author Manjesh Gowda. Creation Date: 11/4/2016.

+ */

+public class BaseDMaaPMRComponentTest extends BaseAnalyticsDMaaPUnitTest {

+

+    @Test

+    public void testGetAuthHeaderWithGoodValues() {

+        String expectedEncodedString = "Basic bTAwNTAyQHRjYS5hZi5kY2FlLmNvbTpUZTUwMjFhYmM=";

+        Optional<String> actualOutput = BaseDMaaPMRComponent.getAuthHeader("USER", "PASSWORD");

+        assertTrue(" Authentication Header has value ", actualOutput.isPresent());

+//        assertEquals(" Authentication Header has value ", expectedEncodedString, actualOutput.get());

+    }

+

+    @Test

+    public void testGetAuthHeaderWithNullValues() {

+        Optional<String> actualOutput = BaseDMaaPMRComponent.getAuthHeader(null, null);

+        assertFalse(" Authentication Header has value ", actualOutput.isPresent());

+    }

+

+    @Test

+    public void testGetAuthHeaderWithUserNullValue() {

+        Optional<String> actualOutput = BaseDMaaPMRComponent.getAuthHeader("USER", null);

+        assertFalse(" Authentication Header has value ", actualOutput.isPresent());

+    }

+

+    @Test

+    public void testGetAuthHeaderWithPasswordNullValue() {

+        Optional<String> actualOutput = BaseDMaaPMRComponent.getAuthHeader(null, "PASSWORD");

+        assertFalse(" Authentication Header has value ", actualOutput.isPresent());

+    }

+

+    @Test

+    public void testCreatePublishURIWithGoodValues() {

+        URI actualURI = BaseDMaaPMRComponent.createPublisherURI(getPublisherConfig());

+        String test = actualURI.toString();

+        assertEquals("Generated Publisher URL is correct",

+                "https://testHostName:8080/events/testTopicName", actualURI.toString());

+    }

+

+    @Test(expected = DCAEAnalyticsRuntimeException.class)

+    public void testCreatePublishURIWithURISyntaxException() {

+        DMaaPMRPublisherConfig badPublisherConfig = new DMaaPMRPublisherConfig

+                .Builder(" dav /gh. ss/ asd ", "///@$%#-htps:<>!##")

+                .setPortNumber(0)

+                .setProtocol("https").build();

+

+      BaseDMaaPMRComponent.createPublisherURI(badPublisherConfig);

+    }

+

+    @Test

+    public void testCreateSubscribeURIWithGoodValues() {

+        URI actualURI = BaseDMaaPMRComponent.createSubscriberURI(

+                getSubscriberConfig("test-consumer-group", "test-consumer-id"));

+        assertEquals("Generated Subscriber URL is correct",

+                "https://testHostName:8080/events/testTopicName/" +

+                        "test-consumer-id/test-consumer-group?timeout=2000&limit=20",

+                actualURI.toString());

+    }

+

+    @Test(expected = DCAEAnalyticsRuntimeException.class)

+    public void testCreateSubscribeURIWithURISyntaxException() {

+        DMaaPMRSubscriberConfig badSubscriberConfig = new DMaaPMRSubscriberConfig

+                .Builder(" dav /gh. ss/ asd ", "")

+                .setPortNumber(PORT_NUMBER)

+                .setProtocol(HTTP_PROTOCOL)

+                .setContentType(CONTENT_TYPE).build();

+

+        URI actualURI = BaseDMaaPMRComponent.createSubscriberURI(badSubscriberConfig);

+    }

+

+    @Test

+    public void testConvertToJsonStringGoodJsonStringList() {

+        List<String> jsonMessage = Arrays.asList(

+                "{\"message\":\"I'm Object 1 Message\"}",

+                "{\"message\":\"I'm Object 2 Message\"}");

+

+        String actualJSONMsg = BaseDMaaPMRComponent.convertToJsonString(jsonMessage);

+

+        String expectedJSONMsg = "[{\"message\":\"I'm Object 1 Message\"}," +

+                "{\"message\":\"I'm Object 2 Message\"}]";

+        assertEquals("Convert a List of Strings to JSON is working fine", expectedJSONMsg, actualJSONMsg);

+

+    }

+

+    @Rule

+    public ExpectedException expectedJsonProcessingException = ExpectedException.none();

+

+    @Test

+    public void testConvertToJsonStringBadJsonStringList() {

+        expectedJsonProcessingException.expect(DCAEAnalyticsRuntimeException.class);

+        expectedJsonProcessingException.expectCause(isA(JsonProcessingException.class));

+

+        List<String> jsonMessage = Arrays.asList(

+                "{\"message\":\"I'm Object 1 Message\"",

+                "\"message\":\"I'm Object 2 Message\"");

+

+        BaseDMaaPMRComponent.convertToJsonString(jsonMessage);

+    }

+

+    @Test

+    public void testConvertToJsonStringWithEmptyList() {

+        List<String> jsonMessage = Arrays.asList();

+        String actualJSONMsg = BaseDMaaPMRComponent.convertToJsonString(jsonMessage);

+        String expectedJSONMsg = "[]";

+        assertEquals("Convert a List of Strings to JSON is working fine", expectedJSONMsg, actualJSONMsg);

+    }

+

+    @Test

+    public void testConvertToJsonStringWithNullList() {

+        String actualJSONMsg = BaseDMaaPMRComponent.convertToJsonString(null);

+        String expectedJSONMsg = "[]";

+        assertEquals("Convert a List of Strings to JSON is working fine", expectedJSONMsg, actualJSONMsg);

+    }

+

+

+    @Test

+    public void testConvertJsonToStringMessagesGoodValues() {

+        String inputJSONMsg = "[{\"message\":\"I'm Object 1 Message\"}," +

+                "{\"message\":\"I'm Object 2 Message\"}]";

+        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages(inputJSONMsg);

+        assertThat(actualList, hasSize(2));

+        assertThat(actualList, containsInAnyOrder(

+                "{\"message\":\"I'm Object 1 Message\"}",

+                "{\"message\":\"I'm Object 2 Message\"}"

+        ));

+    }

+

+    @Test

+    public void testConvertJsonToStringMessagesNoValues() {

+        String inputJSONMsg = "[]";

+        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages(inputJSONMsg);

+        assertThat(actualList, hasSize(0));

+    }

+

+    @Test

+    public void testConvertJsonToStringMessagesNullValues() {

+        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages(null);

+        assertThat(actualList, hasSize(0));

+    }

+

+    @Test

+    public void testConvertJsonToStringMessagesEmptyValues() {

+        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages("  ");

+        assertThat(actualList, hasSize(0));

+    }

+

+    @Rule

+    public ExpectedException convertToJSONIOException = ExpectedException.none();

+

+    @Test

+    public void testConvertJsonToStringMessagesException() {

+        convertToJSONIOException.expect(DCAEAnalyticsRuntimeException.class);

+        convertToJSONIOException.expectCause(isA(IOException.class));

+

+        String inputJSONMsg = "[\"{\"message\":\"I'm Object 1 Message\"}\"," +

+                "\"{\"message\":\"I'm Object 2 Message\"}\"]";

+        List<String> actualList = BaseDMaaPMRComponent.convertJsonToStringMessages(inputJSONMsg);

+        assertThat(actualList, hasSize(2));

+        assertThat(actualList, containsInAnyOrder(

+                "{\"message\":\"I'm Object 1 Message\"}",

+                "{\"message\":\"I'm Object 2 Message\"}"

+        ));

+    }

+

+    @Test

+    public void testAddMessagesToRecoveryQueueAllGood() {

+        DMaaPMRPublisherQueue dmaapMRPublisherQueue = mock(DMaaPMRPublisherQueue.class);

+        given(dmaapMRPublisherQueue.addRecoverableMessages(Mockito.<String>anyList())).willReturn(0);

+        given(dmaapMRPublisherQueue.getBatchQueueRemainingSize()).willReturn(0);

+        List<String> messages = new ArrayList<String>();

+        BaseDMaaPMRComponent.addMessagesToRecoveryQueue(dmaapMRPublisherQueue, messages);

+    }

+

+    @Rule

+    public ExpectedException addQueueIllegalException = ExpectedException.none();

+

+    @Test

+    public void testAddMessagesToRecoveryQueueException() {

+        addQueueIllegalException.expect(isA(DCAEAnalyticsRuntimeException.class));

+        addQueueIllegalException.expectCause(isA(IllegalStateException.class));

+

+        DMaaPMRPublisherQueue dmaapMRPublisherQueue = mock(DMaaPMRPublisherQueue.class);

+

+        given(dmaapMRPublisherQueue.addRecoverableMessages(Mockito.<String>anyList()))

+                .willThrow(IllegalStateException.class);

+        List<String> messages = new ArrayList<String>();

+

+        BaseDMaaPMRComponent.addMessagesToRecoveryQueue(dmaapMRPublisherQueue, messages);

+    }

+

+

+    @Test

+    public void testResponseHandler() {

+        HttpResponse mockHttpResponse = mock(HttpResponse.class);

+        StatusLine mockStatusLine = mock(StatusLine.class);

+        HttpEntity mockHttpEntity = mock(HttpEntity.class);

+        // Could not mock EntityUtils as it's final class

+        //EntityUtils mockEntityUtils = mock(EntityUtils.class);

+

+        given(mockHttpResponse.getStatusLine()).willReturn(mockStatusLine);

+        given(mockStatusLine.getStatusCode()).willReturn(200);

+        given(mockHttpResponse.getEntity()).willReturn(null);

+        //given(mockEntityUtils.toString()).willReturn("Test value");

+

+        ResponseHandler<Pair<Integer, String>> responseHandler = BaseDMaaPMRComponent.responseHandler();

+        try {

+            Pair<Integer, String> mappedResponse = responseHandler.handleResponse(mockHttpResponse);

+            assertTrue("Http response code returned properly ", mappedResponse.getLeft().equals(200));

+            assertTrue("Http response body returned properly ", mappedResponse.getRight().equals(""));

+        } catch (IOException e) {

+            e.printStackTrace();

+        }

+    }

+

+

+    @Test

+    public void testCreateSubscriberResponse() {

+        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse =

+                BaseDMaaPMRComponent.createSubscriberResponse(200, "Test Message", getTwoSampleMessages());

+

+        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));

+        assertEquals(dmaapMRSubscriberResponse.getResponseMessage(), "Test Message");

+        assertThat(dmaapMRSubscriberResponse.getFetchedMessages().size(), is(2));

+

+    }

+

+    @Test

+    public void testCreateSubscriberResponse_no_message() {

+        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse =

+                BaseDMaaPMRComponent.createSubscriberResponse(200, "Test Message", null);

+

+        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));

+        assertEquals(dmaapMRSubscriberResponse.getResponseMessage(), "Test Message");

+        assertThat(dmaapMRSubscriberResponse.getFetchedMessages().size(), is(0));

+

+    }

+

+}

+

+

+

+

+

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java
index 557742f..d38d59c 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherImplTest.java
@@ -1,212 +1,210 @@
-/*
- * ===============================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.dmaap.service.publisher;
-
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import static org.hamcrest.CoreMatchers.isA;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
-import static org.mockito.BDDMockito.given;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/21/2016.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class DMaaPMRPublisherImplTest extends BaseAnalyticsDMaaPUnitTest {
-
-    @Mock
-    DMaaPMRPublisherQueueFactory dmaapMRPublisherQueueFactory;
-    @Mock
-    CloseableHttpClient closeableHttpClient;
-    @Mock
-    DMaaPMRPublisherQueue dmaapMRPublisherQueue;
-
-    @Before
-    public void setUp() throws Exception {
-        given(dmaapMRPublisherQueueFactory.create(Mockito.anyInt(), Mockito.anyInt()))
-                .willReturn(dmaapMRPublisherQueue);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    }
-
-    @Test
-    public void testPublishSmallMessageList() throws Exception {
-        given(dmaapMRPublisherQueue.getBatchQueueRemainingSize()).willReturn(10);
-        given(dmaapMRPublisherQueue.addBatchMessages(Mockito.<String>anyList())).willReturn(2);
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);
-
-        DMaaPMRPublisherResponse dmaapMRPublisherResponse = dmaapMRPublisherImpl.publish(getTwoSampleMessages());
-
-        assertThat(dmaapMRPublisherResponse.getResponseCode(), is(202));
-        assertThat(dmaapMRPublisherResponse.getPendingMessagesCount(), is(2));
-        assertThat(dmaapMRPublisherResponse.getResponseMessage(),
-                is("Accepted - Messages queued for batch publishing to MR Topic"));
-    }
-
-    @Test
-    public void testPublishBigMessageList() throws Exception {
-
-        given(dmaapMRPublisherQueue.getBatchQueueRemainingSize()).willReturn(0);
-        given(dmaapMRPublisherQueue.getMessageForPublishing()).willReturn(getTwoSampleMessages());
-        Mockito.when(
-                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(200, "Message successfully posted"));
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);
-
-        DMaaPMRPublisherResponse dmaapMRPublisherResponse = dmaapMRPublisherImpl.publish(getTwoSampleMessages());
-
-        assertThat(dmaapMRPublisherResponse.getResponseCode(), is(200));
-        assertThat(dmaapMRPublisherResponse.getPendingMessagesCount(), is(200));
-        assertThat(dmaapMRPublisherResponse.getResponseMessage(), is("Message successfully posted"));
-    }
-
-    @Test
-    public void testForcePublishSuccessful() throws Exception {
-        DMaaPMRPublisherConfig dmaapMRPublisherConfig = new
-                DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)
-                .setPortNumber(PORT_NUMBER)
-                .setProtocol(HTTP_PROTOCOL)
-                .setContentType(CONTENT_TYPE)
-                .setMaxRecoveryQueueSize(PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)
-                .setMaxBatchSize(PUBLISHER_MAX_BATCH_QUEUE_SIZE).build();
-
-        HttpPost httpPost = Mockito.mock(HttpPost.class);
-        Mockito.when(closeableHttpClient.execute(
-                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(200, "Message successfully posted"));
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                dmaapMRPublisherConfig, dmaapMRPublisherQueueFactory, closeableHttpClient);
-        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.forcePublish(getTwoSampleMessages());
-        assertThat(response.getResponseCode(), is(200));
-    }
-
-    @Test
-    public void testForcePublishFailure() throws Exception {
-        Mockito.when(closeableHttpClient.execute(
-                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(503, "Message successfully posted"));
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);
-        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.forcePublish(getTwoSampleMessages());
-        assertThat(response.getResponseCode(), is(503));
-    }
-
-    @Rule
-    public ExpectedException httpIOException = ExpectedException.none();
-
-    @Test
-    public void testForcePublishHttpFailure() throws Exception {
-
-        httpIOException.expect(DCAEAnalyticsRuntimeException.class);
-        httpIOException.expectCause(isA(IOException.class));
-
-        given(closeableHttpClient.execute(
-                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class))).willThrow(IOException.class);
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);
-        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.forcePublish(getTwoSampleMessages());
-    }
-
-    @Test
-    public void testFlushSuccessful() throws Exception {
-        Mockito.when(closeableHttpClient.execute(
-                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(200, "Message successfully posted"));
-
-        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(getTwoSampleMessages());
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);
-        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.flush();
-        assertThat(response.getResponseCode(), is(200));
-    }
-
-    @Test
-    public void testFlushEmptyList() throws Exception {
-        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(new ArrayList());
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);
-        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.flush();
-        assertThat(response.getResponseCode(), is(204));
-    }
-
-    @Test
-    public void testClose() throws Exception {
-        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(new ArrayList());
-        Mockito.when(closeableHttpClient.execute(
-                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(200, "Message successfully posted"));
-        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(getTwoSampleMessages());
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);
-        dmaapMRPublisherImpl.close();
-        verify(closeableHttpClient).execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class));
-    }
-
-    @Test
-    public void testCloseUnsuccessful() throws Exception {
-        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(new ArrayList());
-        Mockito.when(closeableHttpClient.execute(
-                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(400, "Message successfully posted"));
-        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(getTwoSampleMessages());
-
-        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(
-                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);
-        dmaapMRPublisherImpl.close();
-        verify(closeableHttpClient, times(6)).execute(Mockito.any(HttpUriRequest.class),
-                Mockito.any(ResponseHandler.class));
-    }
-}
+/*

+ * ===============================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.dmaap.service.publisher;

+

+import org.apache.commons.lang3.tuple.ImmutablePair;

+import org.apache.http.client.ResponseHandler;

+import org.apache.http.client.methods.HttpUriRequest;

+import org.apache.http.impl.client.CloseableHttpClient;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Rule;

+import org.junit.Test;

+import org.junit.rules.ExpectedException;

+import org.junit.runner.RunWith;

+import org.mockito.Mock;

+import org.mockito.Mockito;

+import org.mockito.junit.MockitoJUnitRunner;

+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;

+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRPublisherConfig;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;

+

+import java.io.IOException;

+import java.util.ArrayList;

+

+import static org.hamcrest.CoreMatchers.isA;

+import static org.hamcrest.core.Is.is;

+import static org.junit.Assert.assertThat;

+import static org.mockito.BDDMockito.given;

+import static org.mockito.Mockito.times;

+import static org.mockito.Mockito.verify;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/21/2016.

+ */

+@RunWith(MockitoJUnitRunner.class)

+public class DMaaPMRPublisherImplTest extends BaseAnalyticsDMaaPUnitTest {

+

+    @Mock

+    private DMaaPMRPublisherQueueFactory dmaapMRPublisherQueueFactory;

+    @Mock

+    private CloseableHttpClient closeableHttpClient;

+    @Mock

+    private DMaaPMRPublisherQueue dmaapMRPublisherQueue;

+

+    @Before

+    public void setUp() throws Exception {

+        given(dmaapMRPublisherQueueFactory.create(Mockito.anyInt(), Mockito.anyInt()))

+                .willReturn(dmaapMRPublisherQueue);

+    }

+

+    @After

+    public void tearDown() throws Exception {

+    }

+

+    @Test

+    public void testPublishSmallMessageList() throws Exception {

+        given(dmaapMRPublisherQueue.getBatchQueueRemainingSize()).willReturn(10);

+        given(dmaapMRPublisherQueue.addBatchMessages(Mockito.<String>anyList())).willReturn(2);

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);

+

+        DMaaPMRPublisherResponse dmaapMRPublisherResponse = dmaapMRPublisherImpl.publish(getTwoSampleMessages());

+

+        assertThat(dmaapMRPublisherResponse.getResponseCode(), is(202));

+        assertThat(dmaapMRPublisherResponse.getPendingMessagesCount(), is(2));

+        assertThat(dmaapMRPublisherResponse.getResponseMessage(),

+                is("Accepted - Messages queued for batch publishing to MR Topic"));

+    }

+

+    @Test

+    public void testPublishBigMessageList() throws Exception {

+

+        given(dmaapMRPublisherQueue.getBatchQueueRemainingSize()).willReturn(0);

+        given(dmaapMRPublisherQueue.getMessageForPublishing()).willReturn(getTwoSampleMessages());

+        Mockito.when(

+                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(200, "Message successfully posted"));

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);

+

+        DMaaPMRPublisherResponse dmaapMRPublisherResponse = dmaapMRPublisherImpl.publish(getTwoSampleMessages());

+

+        assertThat(dmaapMRPublisherResponse.getResponseCode(), is(200));

+        assertThat(dmaapMRPublisherResponse.getPendingMessagesCount(), is(200));

+        assertThat(dmaapMRPublisherResponse.getResponseMessage(), is("Message successfully posted"));

+    }

+

+    @Test

+    public void testForcePublishSuccessful() throws Exception {

+        DMaaPMRPublisherConfig dmaapMRPublisherConfig = new

+                DMaaPMRPublisherConfig.Builder(HOST_NAME, TOPIC_NAME)

+                .setPortNumber(PORT_NUMBER)

+                .setProtocol(HTTP_PROTOCOL)

+                .setContentType(CONTENT_TYPE)

+                .setMaxRecoveryQueueSize(PUBLISHER_MAX_RECOVERY_QUEUE_SIZE)

+                .setMaxBatchSize(PUBLISHER_MAX_BATCH_QUEUE_SIZE).build();

+

+        Mockito.when(closeableHttpClient.execute(

+                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(200, "Message successfully posted"));

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                dmaapMRPublisherConfig, dmaapMRPublisherQueueFactory, closeableHttpClient);

+        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.forcePublish(getTwoSampleMessages());

+        assertThat(response.getResponseCode(), is(200));

+    }

+

+    @Test

+    public void testForcePublishFailure() throws Exception {

+        Mockito.when(closeableHttpClient.execute(

+                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(503, "Message successfully posted"));

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);

+        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.forcePublish(getTwoSampleMessages());

+        assertThat(response.getResponseCode(), is(503));

+    }

+

+    @Rule

+    public ExpectedException httpIOException = ExpectedException.none();

+

+    @Test

+    public void testForcePublishHttpFailure() throws Exception {

+

+        httpIOException.expect(DCAEAnalyticsRuntimeException.class);

+        httpIOException.expectCause(isA(IOException.class));

+

+        given(closeableHttpClient.execute(

+                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class))).willThrow(IOException.class);

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);

+        dmaapMRPublisherImpl.forcePublish(getTwoSampleMessages());

+    }

+

+    @Test

+    public void testFlushSuccessful() throws Exception {

+        Mockito.when(closeableHttpClient.execute(

+                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(200, "Message successfully posted"));

+

+        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(getTwoSampleMessages());

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);

+        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.flush();

+        assertThat(response.getResponseCode(), is(200));

+    }

+

+    @Test

+    public void testFlushEmptyList() throws Exception {

+        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(new ArrayList<String>());

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);

+        DMaaPMRPublisherResponse response = dmaapMRPublisherImpl.flush();

+        assertThat(response.getResponseCode(), is(204));

+    }

+

+    @Test

+    public void testClose() throws Exception {

+        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(new ArrayList<String>());

+        Mockito.when(closeableHttpClient.execute(

+                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(200, "Message successfully posted"));

+        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(getTwoSampleMessages());

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);

+        dmaapMRPublisherImpl.close();

+        verify(closeableHttpClient).execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class));

+    }

+

+    @Test

+    public void testCloseUnsuccessful() throws Exception {

+        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(new ArrayList<String>());

+        Mockito.when(closeableHttpClient.execute(

+                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(400, "Message successfully posted"));

+        Mockito.when(dmaapMRPublisherQueue.getMessageForPublishing()).thenReturn(getTwoSampleMessages());

+

+        DMaaPMRPublisherImpl dmaapMRPublisherImpl = new DMaaPMRPublisherImpl(

+                getPublisherConfig(), dmaapMRPublisherQueueFactory, closeableHttpClient);

+        dmaapMRPublisherImpl.close();

+        verify(closeableHttpClient, times(6)).execute(Mockito.any(HttpUriRequest.class),

+                Mockito.any(ResponseHandler.class));

+    }

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java
index 263660b..6902d1d 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherMockImpl.java
@@ -1,59 +1,59 @@
-/*
- * ===============================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.dmaap.service.publisher;
-
-import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/21/2016.
- */
-public class DMaaPMRPublisherMockImpl implements  DMaaPMRPublisher {
-
-    @Override
-    public DMaaPMRPublisherResponse publish(List<String> messages) throws DCAEAnalyticsRuntimeException {
-        return new DMaaPMRPublisherResponseImpl(102, "Mock Response", 100);
-    }
-
-    @Override
-    public DMaaPMRPublisherResponse forcePublish(List<String> messages) throws DCAEAnalyticsRuntimeException {
-        return null;
-    }
-
-    @Override
-    public DMaaPMRPublisherResponse flush() {
-        return null;
-    }
-
-    @Override
-    public Date getPublisherCreationTime() {
-        return null;
-    }
-
-    @Override
-    public void close() throws Exception {
-
-    }
-}
+/*

+ * ===============================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.dmaap.service.publisher;

+

+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponse;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRPublisherResponseImpl;

+

+import java.util.Date;

+import java.util.List;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/21/2016.

+ */

+public class DMaaPMRPublisherMockImpl implements  DMaaPMRPublisher {

+

+    @Override

+    public DMaaPMRPublisherResponse publish(List<String> messages) throws DCAEAnalyticsRuntimeException {

+        return new DMaaPMRPublisherResponseImpl(102, "Mock Response", 100);

+    }

+

+    @Override

+    public DMaaPMRPublisherResponse forcePublish(List<String> messages) throws DCAEAnalyticsRuntimeException {

+        return null;

+    }

+

+    @Override

+    public DMaaPMRPublisherResponse flush() {

+        return null;

+    }

+

+    @Override

+    public Date getPublisherCreationTime() {

+        return null;

+    }

+

+    @Override

+    public void close() throws Exception {

+

+    }

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java
index e854716..518765d 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueImplTest.java
@@ -1,189 +1,189 @@
-/*
- * ===============================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.dmaap.service.publisher;
-
-import org.junit.Test;
-import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-
-import java.util.List;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- *
- * @author Rajiv Singla . Creation Date: 11/2/2016.
- */
-public class DMaaPMRPublisherQueueImplTest extends BaseAnalyticsDMaaPUnitTest {
-
-
-    @Test
-    public void testAddBatchMessages() throws Exception {
-        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);
-        // add two messages to batch queue
-        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);
-        // add two more message to batch queue
-        final int batchMessagesSizeAfterSecondInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        assertTrue("Batch Message Queue size must be 4", batchMessagesSizeAfterSecondInsert == 4);
-        // Now get all messages which must drain out batch queue
-        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();
-        assertTrue("There must be 4 messages to publish", messagesToPublish.size() == 4);
-        assertTrue("Batch Queue must be empty", publisherQueue.getBatchQueueRemainingSize() == 10);
-
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testAddBatchMessagesWhenQueueSizeIsFull() throws Exception {
-        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(2, 20);
-        // add two messages to batch queue
-        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);
-        // add 2 more messages should now throw IllegalStateException
-        publisherQueue.addBatchMessages(getTwoSampleMessages());
-    }
-
-    @Test
-    public void testAddRecoverableMessages() throws Exception {
-        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);
-        // add two messages to batch queue
-        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);
-        // add two recoverable messages
-        final int recoverableMessageSizeAfterFirstInsert =
-                publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-        assertTrue("Recovery Message Queue size must be 2 after first insert",
-                recoverableMessageSizeAfterFirstInsert == 2);
-        // add two more recoverable messages
-        final int recoverableMessageSizeAfterSecondInsert =
-                publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-        assertTrue("Recovery Message Queue size must be 4 after second insert",
-                recoverableMessageSizeAfterSecondInsert == 4);
-        // Now get all messages which must drain out batch queue
-        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();
-        assertTrue("There must be 6 messages to publish", messagesToPublish.size() == 6);
-        assertTrue("Batch Queue must be empty", publisherQueue.getBatchQueueRemainingSize() == 10);
-        assertTrue("Recovery Queue must be empty", publisherQueue.getRecoveryQueueRemainingSize() == 20);
-    }
-
-
-    @Test(expected = IllegalStateException.class)
-    public void testAddRecoverableMessagesWhenRecoveryQueueIsFull() throws Exception {
-        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 2);
-        // add two messages to batch queue
-        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);
-        // add two recoverable messages
-        final int recoverableMessageSizeAfterFirstInsert =
-                publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-        assertTrue("Recovery Message Queue size must be 2 after first insert",
-                recoverableMessageSizeAfterFirstInsert == 2);
-        // add two more recoverable messages which should throw IllegalStateException
-        publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-    }
-
-    @Test
-    public void testGetMessageForPublishing() throws Exception {
-        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);
-        // add two messages to batch queue
-        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);
-        // add two recoverable messages
-        final int recoverableMessageSizeAfterFirstInsert =
-                publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-        assertTrue("Recovery Message Queue size must be 2 after first insert",
-                recoverableMessageSizeAfterFirstInsert == 2);
-        // add two more recoverable messages
-        final int recoverableMessageSizeAfterSecondInsert =
-                publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-        assertTrue("Recovery Message Queue size must be 4 after second insert",
-                recoverableMessageSizeAfterSecondInsert == 4);
-        // Now get all messages which must drain out batch queue
-        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();
-        assertTrue("There must be 6 messages to publish", messagesToPublish.size() == 6);
-        // add two more batch and recovery messages
-        final int batchQueueSize = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        final int recoveryQueueSize = publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-        final int messagePublishCount = publisherQueue.getMessageForPublishing().size();
-        assertTrue("Batch Queue + Recovery Queue message total must batch publish message count",
-                messagePublishCount == (batchQueueSize + recoveryQueueSize));
-        assertTrue("Batch Queue must be empty", publisherQueue.getBatchQueueRemainingSize() == 10);
-        assertTrue("Recovery Queue must be empty", publisherQueue.getRecoveryQueueRemainingSize() == 20);
-
-    }
-
-    @Test
-    public void testGetBatchQueueRemainingSize() throws Exception {
-
-        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);
-        // add two messages to batch queue
-        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);
-        assertTrue("Batch remaining capacity should be reduced by 2",
-                publisherQueue.getBatchQueueRemainingSize() == 8);
-
-        // add two recoverable messages
-        final int recoverableMessageSizeAfterFirstInsert =
-                publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-        assertTrue("Recovery Message Queue size must be 2 after first insert",
-                recoverableMessageSizeAfterFirstInsert == 2);
-
-        // recoverable message should not change batch queue capacity
-        assertTrue("Adding recoverable Message must not have any impact on batch queue remaining capacity ",
-                publisherQueue.getBatchQueueRemainingSize() == 8);
-        // Now get all messages which must drain out batch queue
-        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();
-        assertTrue("There must be exactly 4 messages to publish", messagesToPublish.size() == 4);
-
-        // Batch queue remaining capacity should now match original batch size
-        assertTrue("Batch Queue remaining capacity must match original batch queue size", publisherQueue
-                .getBatchQueueRemainingSize() == 10);
-    }
-
-    @Test
-    public void testGetRecoveryQueueRemainingSize() throws Exception {
-        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);
-
-        // add two recoverable messages
-        final int recoverableMessageSizeAfterFirstInsert =
-                publisherQueue.addRecoverableMessages(getTwoSampleMessages());
-        assertTrue("Recovery Message Queue size must be 2 after first insert",
-                recoverableMessageSizeAfterFirstInsert == 2);
-        assertTrue("Recovery Queue remaining capacity should be reduced by 2",
-                publisherQueue.getRecoveryQueueRemainingSize() == 18);
-
-        // add two messages to batch queue
-        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());
-        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);
-
-        // batch message should not change recoverable queue capacity
-        assertTrue("Adding batch queue Message must not have any impact on recovery queue remaining capacity ",
-                publisherQueue.getRecoveryQueueRemainingSize() == 18);
-
-        // Now get all messages which must drain out recovery queue
-        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();
-        assertTrue("There must be exactly 4 messages to publish", messagesToPublish.size() == 4);
-
-        // Recoverable queue remaining capacity should now match original recovery queue size
-        assertTrue("Recoverable Queue remaining capacity must match original batch queue size", publisherQueue
-                .getRecoveryQueueRemainingSize() == 20);
-    }
-
-}
+/*

+ * ===============================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.dmaap.service.publisher;

+

+import org.junit.Test;

+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;

+

+import java.util.List;

+

+import static org.junit.Assert.assertTrue;

+

+/**

+ *

+ * @author Rajiv Singla . Creation Date: 11/2/2016.

+ */

+public class DMaaPMRPublisherQueueImplTest extends BaseAnalyticsDMaaPUnitTest {

+

+

+    @Test

+    public void testAddBatchMessages() throws Exception {

+        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);

+        // add two messages to batch queue

+        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);

+        // add two more message to batch queue

+        final int batchMessagesSizeAfterSecondInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        assertTrue("Batch Message Queue size must be 4", batchMessagesSizeAfterSecondInsert == 4);

+        // Now get all messages which must drain out batch queue

+        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();

+        assertTrue("There must be 4 messages to publish", messagesToPublish.size() == 4);

+        assertTrue("Batch Queue must be empty", publisherQueue.getBatchQueueRemainingSize() == 10);

+

+    }

+

+    @Test(expected = IllegalStateException.class)

+    public void testAddBatchMessagesWhenQueueSizeIsFull() throws Exception {

+        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(2, 20);

+        // add two messages to batch queue

+        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);

+        // add 2 more messages should now throw IllegalStateException

+        publisherQueue.addBatchMessages(getTwoSampleMessages());

+    }

+

+    @Test

+    public void testAddRecoverableMessages() throws Exception {

+        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);

+        // add two messages to batch queue

+        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);

+        // add two recoverable messages

+        final int recoverableMessageSizeAfterFirstInsert =

+                publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+        assertTrue("Recovery Message Queue size must be 2 after first insert",

+                recoverableMessageSizeAfterFirstInsert == 2);

+        // add two more recoverable messages

+        final int recoverableMessageSizeAfterSecondInsert =

+                publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+        assertTrue("Recovery Message Queue size must be 4 after second insert",

+                recoverableMessageSizeAfterSecondInsert == 4);

+        // Now get all messages which must drain out batch queue

+        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();

+        assertTrue("There must be 6 messages to publish", messagesToPublish.size() == 6);

+        assertTrue("Batch Queue must be empty", publisherQueue.getBatchQueueRemainingSize() == 10);

+        assertTrue("Recovery Queue must be empty", publisherQueue.getRecoveryQueueRemainingSize() == 20);

+    }

+

+

+    @Test(expected = IllegalStateException.class)

+    public void testAddRecoverableMessagesWhenRecoveryQueueIsFull() throws Exception {

+        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 2);

+        // add two messages to batch queue

+        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);

+        // add two recoverable messages

+        final int recoverableMessageSizeAfterFirstInsert =

+                publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+        assertTrue("Recovery Message Queue size must be 2 after first insert",

+                recoverableMessageSizeAfterFirstInsert == 2);

+        // add two more recoverable messages which should throw IllegalStateException

+        publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+    }

+

+    @Test

+    public void testGetMessageForPublishing() throws Exception {

+        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);

+        // add two messages to batch queue

+        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);

+        // add two recoverable messages

+        final int recoverableMessageSizeAfterFirstInsert =

+                publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+        assertTrue("Recovery Message Queue size must be 2 after first insert",

+                recoverableMessageSizeAfterFirstInsert == 2);

+        // add two more recoverable messages

+        final int recoverableMessageSizeAfterSecondInsert =

+                publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+        assertTrue("Recovery Message Queue size must be 4 after second insert",

+                recoverableMessageSizeAfterSecondInsert == 4);

+        // Now get all messages which must drain out batch queue

+        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();

+        assertTrue("There must be 6 messages to publish", messagesToPublish.size() == 6);

+        // add two more batch and recovery messages

+        final int batchQueueSize = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        final int recoveryQueueSize = publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+        final int messagePublishCount = publisherQueue.getMessageForPublishing().size();

+        assertTrue("Batch Queue + Recovery Queue message total must batch publish message count",

+                messagePublishCount == (batchQueueSize + recoveryQueueSize));

+        assertTrue("Batch Queue must be empty", publisherQueue.getBatchQueueRemainingSize() == 10);

+        assertTrue("Recovery Queue must be empty", publisherQueue.getRecoveryQueueRemainingSize() == 20);

+

+    }

+

+    @Test

+    public void testGetBatchQueueRemainingSize() throws Exception {

+

+        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);

+        // add two messages to batch queue

+        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);

+        assertTrue("Batch remaining capacity should be reduced by 2",

+                publisherQueue.getBatchQueueRemainingSize() == 8);

+

+        // add two recoverable messages

+        final int recoverableMessageSizeAfterFirstInsert =

+                publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+        assertTrue("Recovery Message Queue size must be 2 after first insert",

+                recoverableMessageSizeAfterFirstInsert == 2);

+

+        // recoverable message should not change batch queue capacity

+        assertTrue("Adding recoverable Message must not have any impact on batch queue remaining capacity ",

+                publisherQueue.getBatchQueueRemainingSize() == 8);

+        // Now get all messages which must drain out batch queue

+        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();

+        assertTrue("There must be exactly 4 messages to publish", messagesToPublish.size() == 4);

+

+        // Batch queue remaining capacity should now match original batch size

+        assertTrue("Batch Queue remaining capacity must match original batch queue size", publisherQueue

+                .getBatchQueueRemainingSize() == 10);

+    }

+

+    @Test

+    public void testGetRecoveryQueueRemainingSize() throws Exception {

+        DMaaPMRPublisherQueue publisherQueue = new DMaaPMRPublisherQueueImpl(10, 20);

+

+        // add two recoverable messages

+        final int recoverableMessageSizeAfterFirstInsert =

+                publisherQueue.addRecoverableMessages(getTwoSampleMessages());

+        assertTrue("Recovery Message Queue size must be 2 after first insert",

+                recoverableMessageSizeAfterFirstInsert == 2);

+        assertTrue("Recovery Queue remaining capacity should be reduced by 2",

+                publisherQueue.getRecoveryQueueRemainingSize() == 18);

+

+        // add two messages to batch queue

+        final int batchMessagesSizeAfterFirstInsert = publisherQueue.addBatchMessages(getTwoSampleMessages());

+        assertTrue("Batch Message Queue size must be 2", batchMessagesSizeAfterFirstInsert == 2);

+

+        // batch message should not change recoverable queue capacity

+        assertTrue("Adding batch queue Message must not have any impact on recovery queue remaining capacity ",

+                publisherQueue.getRecoveryQueueRemainingSize() == 18);

+

+        // Now get all messages which must drain out recovery queue

+        final List<String> messagesToPublish = publisherQueue.getMessageForPublishing();

+        assertTrue("There must be exactly 4 messages to publish", messagesToPublish.size() == 4);

+

+        // Recoverable queue remaining capacity should now match original recovery queue size

+        assertTrue("Recoverable Queue remaining capacity must match original batch queue size", publisherQueue

+                .getRecoveryQueueRemainingSize() == 20);

+    }

+

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java
index ac7023b..4de8f1b 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/publisher/DMaaPMRPublisherQueueMockImpl.java
@@ -1,53 +1,53 @@
-/*
- * ===============================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.dmaap.service.publisher;
-
-import java.util.List;
-
-/**
- * @author Manjesh Gowda. Creation Date: 11/7/2016.
- */
-public class DMaaPMRPublisherQueueMockImpl implements DMaaPMRPublisherQueue {
-    @Override
-    public int addBatchMessages(List<String> batchMessages) throws IllegalStateException {
-        return 100;
-    }
-
-    @Override
-    public int addRecoverableMessages(List<String> recoverableMessages) throws IllegalStateException {
-        return 0;
-    }
-
-    @Override
-    public List<String> getMessageForPublishing() {
-        return null;
-    }
-
-    @Override
-    public int getBatchQueueRemainingSize() {
-        return 0;
-    }
-
-    @Override
-    public int getRecoveryQueueRemainingSize() {
-        return 0;
-    }
-}
+/*

+ * ===============================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.dmaap.service.publisher;

+

+import java.util.List;

+

+/**

+ * @author Manjesh Gowda. Creation Date: 11/7/2016.

+ */

+public class DMaaPMRPublisherQueueMockImpl implements DMaaPMRPublisherQueue {

+    @Override

+    public int addBatchMessages(List<String> batchMessages) throws IllegalStateException {

+        return 100;

+    }

+

+    @Override

+    public int addRecoverableMessages(List<String> recoverableMessages) throws IllegalStateException {

+        return 0;

+    }

+

+    @Override

+    public List<String> getMessageForPublishing() {

+        return null;

+    }

+

+    @Override

+    public int getBatchQueueRemainingSize() {

+        return 0;

+    }

+

+    @Override

+    public int getRecoveryQueueRemainingSize() {

+        return 0;

+    }

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java
index c68447f..20902b0 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberImplTest.java
@@ -1,158 +1,158 @@
-/*
- * ===============================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.dmaap.service.subscriber;
-
-import com.jayway.jsonassert.impl.matcher.IsCollectionWithSize;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.http.client.ResponseHandler;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;
-import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;
-import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;
-
-import java.io.IOException;
-import java.util.Random;
-import java.util.UUID;
-
-import static org.hamcrest.CoreMatchers.isA;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.mockito.BDDMockito.given;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/21/2016.
- */
-@RunWith(MockitoJUnitRunner.class)
-public class DMaaPMRSubscriberImplTest extends BaseAnalyticsDMaaPUnitTest {
-
-    @Mock
-    private CloseableHttpClient closeableHttpClient;
-
-    private String consumerGroup, consumerId;
-
-    @Before
-    public void setUp() throws Exception {
-        Random random = new Random(10000L);
-        consumerGroup = "Test-Consumer-Group" + Long.toString(random.nextLong());
-        consumerId = UUID.randomUUID().toString();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-
-    }
-
-    @Test
-    public void testSubscriberSuccessfullyReceiveDmaapMessage() throws Exception {
-
-        String testMessages = "[{\"message\":\"I'm Object 1 Message\"}," +
-                "{\"message\":\"I'm Object 2 Message\"}]";
-        Mockito.when(
-                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(200, testMessages));
-
-        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(
-                getSubscriberConfig(consumerId, consumerGroup), closeableHttpClient);
-        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse = dmaapMRSubscriberImpl.fetchMessages();
-        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));
-        assertThat(dmaapMRSubscriberResponse.getFetchedMessages(), IsCollectionWithSize.hasSize(2));
-    }
-
-    @Test
-    public void testSubscriberSuccessfullyReceiveDmaapMessageWithNoUsername() throws Exception {
-
-        DMaaPMRSubscriberConfig dmaapMRSubscriberConfig = new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)
-                .setPortNumber(PORT_NUMBER)
-                .setProtocol(HTTP_PROTOCOL)
-                .setContentType(CONTENT_TYPE)
-                .setConsumerGroup(consumerGroup != null ? consumerGroup : SUBSCRIBER_CONSUMER_GROUP_NAME)
-                .setConsumerId(consumerId != null ? consumerId : SUBSCRIBER_CONSUMER_ID)
-                .setTimeoutMS(SUBSCRIBER_TIMEOUT_MS)
-                .setMessageLimit(SUBSCRIBER_MESSAGE_LIMIT).build();
-
-        String testMessages = "[{\"message\":\"I'm Object 1 Message\"}," +
-                "{\"message\":\"I'm Object 2 Message\"}]";
-        Mockito.when(
-                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(200, testMessages));
-
-        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(
-                dmaapMRSubscriberConfig, closeableHttpClient);
-        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse = dmaapMRSubscriberImpl.fetchMessages();
-        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));
-        assertThat(dmaapMRSubscriberResponse.getFetchedMessages(), IsCollectionWithSize.hasSize(2));
-    }
-
-    @Test
-    public void testSubscriberSuccessfullyReceiveNoDmaapMessage() throws Exception {
-        Mockito.when(
-                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(200, null));
-
-        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(
-                getSubscriberConfig(consumerId, consumerGroup), closeableHttpClient);
-        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse = dmaapMRSubscriberImpl.fetchMessages();
-        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));
-        assertThat(dmaapMRSubscriberResponse.getFetchedMessages(), IsCollectionWithSize.hasSize(0));
-    }
-
-    @Test
-    public void testSubscriberSuccessfullyReceiveErrorMessage() throws Exception {
-        Mockito.when(
-                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))
-                .thenReturn(new ImmutablePair<>(400, "Bad Request"));
-
-        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(
-                getSubscriberConfig(consumerId, consumerGroup), closeableHttpClient);
-        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse = dmaapMRSubscriberImpl.fetchMessages();
-        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(400));
-        assertThat(dmaapMRSubscriberResponse.getFetchedMessages(), IsCollectionWithSize.hasSize(0));
-    }
-
-    @Rule
-    public ExpectedException httpIOException = ExpectedException.none();
-
-    @Test
-    public void testSubscriberSuccessfullyReceiveException() throws Exception {
-
-        httpIOException.expect(DCAEAnalyticsRuntimeException.class);
-        httpIOException.expectCause(isA(IOException.class));
-
-        given(closeableHttpClient.execute(
-                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class))).willThrow(IOException.class);
-
-        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(
-                getSubscriberConfig(consumerId, consumerGroup), closeableHttpClient);
-        dmaapMRSubscriberImpl.fetchMessages();
-    }
-
-}
+/*

+ * ===============================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.dmaap.service.subscriber;

+

+import com.jayway.jsonassert.impl.matcher.IsCollectionWithSize;

+import org.apache.commons.lang3.tuple.ImmutablePair;

+import org.apache.http.client.ResponseHandler;

+import org.apache.http.client.methods.HttpUriRequest;

+import org.apache.http.impl.client.CloseableHttpClient;

+import org.junit.After;

+import org.junit.Before;

+import org.junit.Rule;

+import org.junit.Test;

+import org.junit.rules.ExpectedException;

+import org.junit.runner.RunWith;

+import org.mockito.Mock;

+import org.mockito.Mockito;

+import org.mockito.junit.MockitoJUnitRunner;

+import org.openecomp.dcae.apod.analytics.common.exception.DCAEAnalyticsRuntimeException;

+import org.openecomp.dcae.apod.analytics.dmaap.BaseAnalyticsDMaaPUnitTest;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.config.DMaaPMRSubscriberConfig;

+import org.openecomp.dcae.apod.analytics.dmaap.domain.response.DMaaPMRSubscriberResponse;

+

+import java.io.IOException;

+import java.util.Random;

+import java.util.UUID;

+

+import static org.hamcrest.CoreMatchers.isA;

+import static org.hamcrest.MatcherAssert.assertThat;

+import static org.hamcrest.core.Is.is;

+import static org.mockito.BDDMockito.given;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/21/2016.

+ */

+@RunWith(MockitoJUnitRunner.class)

+public class DMaaPMRSubscriberImplTest extends BaseAnalyticsDMaaPUnitTest {

+

+    @Mock

+    private CloseableHttpClient closeableHttpClient;

+

+    private String consumerGroup, consumerId;

+

+    @Before

+    public void setUp() throws Exception {

+        Random random = new Random(10000L);

+        consumerGroup = "Test-Consumer-Group" + Long.toString(random.nextLong());

+        consumerId = UUID.randomUUID().toString();

+    }

+

+    @After

+    public void tearDown() throws Exception {

+

+    }

+

+    @Test

+    public void testSubscriberSuccessfullyReceiveDmaapMessage() throws Exception {

+

+        String testMessages = "[{\"message\":\"I'm Object 1 Message\"}," +

+                "{\"message\":\"I'm Object 2 Message\"}]";

+        Mockito.when(

+                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(200, testMessages));

+

+        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(

+                getSubscriberConfig(consumerId, consumerGroup), closeableHttpClient);

+        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse = dmaapMRSubscriberImpl.fetchMessages();

+        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));

+        assertThat(dmaapMRSubscriberResponse.getFetchedMessages(), IsCollectionWithSize.hasSize(2));

+    }

+

+    @Test

+    public void testSubscriberSuccessfullyReceiveDmaapMessageWithNoUsername() throws Exception {

+

+        DMaaPMRSubscriberConfig dmaapMRSubscriberConfig = new DMaaPMRSubscriberConfig.Builder(HOST_NAME, TOPIC_NAME)

+                .setPortNumber(PORT_NUMBER)

+                .setProtocol(HTTP_PROTOCOL)

+                .setContentType(CONTENT_TYPE)

+                .setConsumerGroup(consumerGroup != null ? consumerGroup : SUBSCRIBER_CONSUMER_GROUP_NAME)

+                .setConsumerId(consumerId != null ? consumerId : SUBSCRIBER_CONSUMER_ID)

+                .setTimeoutMS(SUBSCRIBER_TIMEOUT_MS)

+                .setMessageLimit(SUBSCRIBER_MESSAGE_LIMIT).build();

+

+        String testMessages = "[{\"message\":\"I'm Object 1 Message\"}," +

+                "{\"message\":\"I'm Object 2 Message\"}]";

+        Mockito.when(

+                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(200, testMessages));

+

+        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(

+                dmaapMRSubscriberConfig, closeableHttpClient);

+        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse = dmaapMRSubscriberImpl.fetchMessages();

+        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));

+        assertThat(dmaapMRSubscriberResponse.getFetchedMessages(), IsCollectionWithSize.hasSize(2));

+    }

+

+    @Test

+    public void testSubscriberSuccessfullyReceiveNoDmaapMessage() throws Exception {

+        Mockito.when(

+                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(200, null));

+

+        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(

+                getSubscriberConfig(consumerId, consumerGroup), closeableHttpClient);

+        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse = dmaapMRSubscriberImpl.fetchMessages();

+        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(200));

+        assertThat(dmaapMRSubscriberResponse.getFetchedMessages(), IsCollectionWithSize.hasSize(0));

+    }

+

+    @Test

+    public void testSubscriberSuccessfullyReceiveErrorMessage() throws Exception {

+        Mockito.when(

+                closeableHttpClient.execute(Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class)))

+                .thenReturn(new ImmutablePair<>(400, "Bad Request"));

+

+        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(

+                getSubscriberConfig(consumerId, consumerGroup), closeableHttpClient);

+        DMaaPMRSubscriberResponse dmaapMRSubscriberResponse = dmaapMRSubscriberImpl.fetchMessages();

+        assertThat(dmaapMRSubscriberResponse.getResponseCode(), is(400));

+        assertThat(dmaapMRSubscriberResponse.getFetchedMessages(), IsCollectionWithSize.hasSize(0));

+    }

+

+    @Rule

+    public ExpectedException httpIOException = ExpectedException.none();

+

+    @Test

+    public void testSubscriberSuccessfullyReceiveException() throws Exception {

+

+        httpIOException.expect(DCAEAnalyticsRuntimeException.class);

+        httpIOException.expectCause(isA(IOException.class));

+

+        given(closeableHttpClient.execute(

+                Mockito.any(HttpUriRequest.class), Mockito.any(ResponseHandler.class))).willThrow(IOException.class);

+

+        DMaaPMRSubscriberImpl dmaapMRSubscriberImpl = new DMaaPMRSubscriberImpl(

+                getSubscriberConfig(consumerId, consumerGroup), closeableHttpClient);

+        dmaapMRSubscriberImpl.fetchMessages();

+    }

+

+}

diff --git a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java
index 257c467..05b8ba6 100644
--- a/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java
+++ b/dcae-analytics-dmaap/src/test/java/org/openecomp/dcae/apod/analytics/dmaap/service/subscriber/DMaaPMRSubscriberMockImpl.java
@@ -1,48 +1,48 @@
-/*
- * ===============================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.dmaap.service.subscriber;
-
-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.domain.response.DMaaPMRSubscriberResponseImpl;
-
-import java.util.Date;
-
-/**
- * @author Rajiv Singla . Creation Date: 10/21/2016.
- */
-public class DMaaPMRSubscriberMockImpl implements DMaaPMRSubscriber {
-
-    @Override
-    public DMaaPMRSubscriberResponse fetchMessages() throws DCAEAnalyticsRuntimeException {
-        return new DMaaPMRSubscriberResponseImpl(102, "Mock Response", null);
-    }
-
-    @Override
-    public Date getSubscriberCreationTime() {
-        return null;
-    }
-
-    @Override
-    public void close() throws Exception {
-
-    }
-}
+/*

+ * ===============================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.dmaap.service.subscriber;

+

+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.domain.response.DMaaPMRSubscriberResponseImpl;

+

+import java.util.Date;

+

+/**

+ * @author Rajiv Singla . Creation Date: 10/21/2016.

+ */

+public class DMaaPMRSubscriberMockImpl implements DMaaPMRSubscriber {

+

+    @Override

+    public DMaaPMRSubscriberResponse fetchMessages() throws DCAEAnalyticsRuntimeException {

+        return new DMaaPMRSubscriberResponseImpl(102, "Mock Response", null);

+    }

+

+    @Override

+    public Date getSubscriberCreationTime() {

+        return null;

+    }

+

+    @Override

+    public void close() throws Exception {

+

+    }

+}

diff --git a/dcae-analytics-dmaap/src/test/resources/logback-test.xml b/dcae-analytics-dmaap/src/test/resources/logback-test.xml
index 68d2f3d..4857522 100644
--- a/dcae-analytics-dmaap/src/test/resources/logback-test.xml
+++ b/dcae-analytics-dmaap/src/test/resources/logback-test.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ ===============================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===========================================
-  -->
-<configuration debug="false">
-
-    <!--
-      Disabling some chatty loggers.
-    -->
-    <logger name="org.apache.commons.beanutils" level="ERROR"/>
-    <logger name="org.apache.zookeeper.server" level="ERROR"/>
-    <logger name="org.apache.zookeeper" level="ERROR"/>
-    <logger name="com.ning" level="WARN"/>
-    <logger name="org.apache.spark" level="WARN"/>
-    <logger name="org.spark-project" level="WARN"/>
-    <logger name="org.apache.hadoop" level="WARN"/>
-    <logger name="org.apache.hive" level="WARN"/>
-    <logger name="org.quartz.core" level="WARN"/>
-    <logger name="org.eclipse.jetty" level="WARN"/>
-    <logger name="io.netty.util.internal" level="WARN"/>
-
-    <logger name="org.apache.twill" level="WARN"/>
-    <logger name="co.cask.cdap" level="INFO"/>
-    <logger name="org.openecomp.dcae.apod.analytics" level="DEBUG"/>
-
-    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="ERROR">
-        <appender-ref ref="Console"/>
-    </root>
-
-
-</configuration>
-
+<?xml version="1.0" encoding="UTF-8"?>

+

+<!--

+  ~ ===============================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===========================================

+  -->

+<configuration debug="false">

+

+    <!--

+      Disabling some chatty loggers.

+    -->

+    <logger name="org.apache.commons.beanutils" level="ERROR"/>

+    <logger name="org.apache.zookeeper.server" level="ERROR"/>

+    <logger name="org.apache.zookeeper" level="ERROR"/>

+    <logger name="com.ning" level="WARN"/>

+    <logger name="org.apache.spark" level="WARN"/>

+    <logger name="org.spark-project" level="WARN"/>

+    <logger name="org.apache.hadoop" level="WARN"/>

+    <logger name="org.apache.hive" level="WARN"/>

+    <logger name="org.quartz.core" level="WARN"/>

+    <logger name="org.eclipse.jetty" level="WARN"/>

+    <logger name="io.netty.util.internal" level="WARN"/>

+

+    <logger name="org.apache.twill" level="WARN"/>

+    <logger name="co.cask.cdap" level="INFO"/>

+    <logger name="org.openecomp.dcae.apod.analytics" level="DEBUG"/>

+

+    <appender name="Console" class="ch.qos.logback.core.ConsoleAppender">

+        <encoder>

+            <pattern>%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n</pattern>

+        </encoder>

+    </appender>

+

+    <root level="ERROR">

+        <appender-ref ref="Console"/>

+    </root>

+

+

+</configuration>

+