From de993a59814af4a63496c03a823b3cdc41641f2e Mon Sep 17 00:00:00 2001 From: Parshad Patel Date: Mon, 13 May 2019 15:02:48 +0900 Subject: Fix too many constructor param in dmaapclient Fix Constructor has 9 parameters, which is greater than 7 authorized sonar issue. Fix Constructor has 10 parameters, which is greater than 7 authorized sonar issue. Issue-ID: DMAAP-894 Change-Id: If961a064edc165df9f96c6c5e5432ae136de4a2d Signed-off-by: Parshad Patel --- .../dmaap/mr/client/impl/MRConsumerImplTest.java | 45 +++++++++++++++------- 1 file changed, 32 insertions(+), 13 deletions(-) (limited to 'src/test/java/org/onap/dmaap/mr/client/impl/MRConsumerImplTest.java') diff --git a/src/test/java/org/onap/dmaap/mr/client/impl/MRConsumerImplTest.java b/src/test/java/org/onap/dmaap/mr/client/impl/MRConsumerImplTest.java index f3eab69..52c7111 100644 --- a/src/test/java/org/onap/dmaap/mr/client/impl/MRConsumerImplTest.java +++ b/src/test/java/org/onap/dmaap/mr/client/impl/MRConsumerImplTest.java @@ -31,8 +31,6 @@ import junit.framework.TestCase; import org.junit.Test; import org.onap.dmaap.mr.client.MRClientFactory; -import org.onap.dmaap.mr.client.impl.MRConstants; -import org.onap.dmaap.mr.client.impl.MRConsumerImpl; import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants; public class MRConsumerImplTest extends TestCase { @@ -40,7 +38,10 @@ public class MRConsumerImplTest extends TestCase { public void testNullFilter() throws IOException { final LinkedList hosts = new LinkedList(); hosts.add("localhost:8080"); - final MRConsumerImpl c = new MRConsumerImpl(hosts, "topic", "cg", "cid", -1, -1, null, null, null); + final MRConsumerImpl c = new MRConsumerImpl.MRConsumerImplBuilder().setHostPart(hosts) + .setTopic("topic").setConsumerGroup("cg").setConsumerId("cid").setTimeoutMs(-1) + .setLimit(-1).setFilter(null).setApiKey_username(null).setApiSecret_password(null) + .createMRConsumerImpl(); final String url = c.createUrlPath(MRConstants.makeConsumerUrl("localhost:8080", "topic", "cg", "cid", "http"), -1, -1); assertEquals("http://localhost:8080/events/" + "topic/cg/cid", url); @@ -50,7 +51,10 @@ public class MRConsumerImplTest extends TestCase { public void testFilterWithNoTimeoutOrLimit() throws IOException { final LinkedList hosts = new LinkedList(); hosts.add("localhost:8080"); - final MRConsumerImpl c = new MRConsumerImpl(hosts, "topic", "cg", "cid", -1, -1, "filter", null, null); + final MRConsumerImpl c = new MRConsumerImpl.MRConsumerImplBuilder().setHostPart(hosts) + .setTopic("topic").setConsumerGroup("cg").setConsumerId("cid").setTimeoutMs(-1) + .setLimit(-1).setFilter("filter").setApiKey_username(null) + .setApiSecret_password(null).createMRConsumerImpl(); final String url = c.createUrlPath(MRConstants.makeConsumerUrl("localhost:8080", "topic", "cg", "cid", "http"), -1, -1); assertEquals("http://localhost:8080/events/" + "topic/cg/cid?filter=filter", url); @@ -60,7 +64,10 @@ public class MRConsumerImplTest extends TestCase { public void testTimeoutNoLimitNoFilter() throws IOException { final LinkedList hosts = new LinkedList(); hosts.add("localhost:8080"); - final MRConsumerImpl c = new MRConsumerImpl(hosts, "topic", "cg", "cid", 30000, -1, null, null, null); + final MRConsumerImpl c = new MRConsumerImpl.MRConsumerImplBuilder().setHostPart(hosts) + .setTopic("topic").setConsumerGroup("cg").setConsumerId("cid").setTimeoutMs(30000) + .setLimit(-1).setFilter(null).setApiKey_username(null).setApiSecret_password(null) + .createMRConsumerImpl(); final String url = c.createUrlPath(MRConstants.makeConsumerUrl("localhost:8080", "topic", "cg", "cid", "http"), 30000, -1); assertEquals("http://localhost:8080/events/" + "topic/cg/cid?timeout=30000", url); @@ -70,7 +77,10 @@ public class MRConsumerImplTest extends TestCase { public void testNoTimeoutWithLimitNoFilter() throws IOException { final LinkedList hosts = new LinkedList(); hosts.add("localhost:8080"); - final MRConsumerImpl c = new MRConsumerImpl(hosts, "topic", "cg", "cid", -1, 100, null, null, null); + final MRConsumerImpl c = new MRConsumerImpl.MRConsumerImplBuilder().setHostPart(hosts) + .setTopic("topic").setConsumerGroup("cg").setConsumerId("cid").setTimeoutMs(-1) + .setLimit(100).setFilter(null).setApiKey_username(null).setApiSecret_password(null) + .createMRConsumerImpl(); final String url = c.createUrlPath(MRConstants.makeConsumerUrl("localhost:8080", "topic", "cg", "cid", "http"), -1, 100); assertEquals("http://localhost:8080/events/" + "topic/cg/cid?limit=100", url); @@ -80,7 +90,10 @@ public class MRConsumerImplTest extends TestCase { public void testWithTimeoutWithLimitWithFilter() throws IOException { final LinkedList hosts = new LinkedList(); hosts.add("localhost:8080"); - final MRConsumerImpl c = new MRConsumerImpl(hosts, "topic", "cg", "cid", 1000, 400, "f", null, null); + final MRConsumerImpl c = new MRConsumerImpl.MRConsumerImplBuilder().setHostPart(hosts) + .setTopic("topic").setConsumerGroup("cg").setConsumerId("cid").setTimeoutMs(1000) + .setLimit(400).setFilter("f").setApiKey_username(null).setApiSecret_password(null) + .createMRConsumerImpl(); final String url = c.createUrlPath(MRConstants.makeConsumerUrl("localhost:8080", "topic", "cg", "cid", "http"), 1000, 400); assertEquals("http://localhost:8080/events/" + "topic/cg/cid?timeout=1000&limit=400&filter=f", url); @@ -90,8 +103,10 @@ public class MRConsumerImplTest extends TestCase { public void testFilterEncoding() throws IOException { final LinkedList hosts = new LinkedList(); hosts.add("localhost:8080"); - final MRConsumerImpl c = new MRConsumerImpl(hosts, "topic", "cg", "cid", -1, -1, "{ \"foo\"=\"bar\"bar\" }", - null, null); + final MRConsumerImpl c = new MRConsumerImpl.MRConsumerImplBuilder().setHostPart(hosts) + .setTopic("topic").setConsumerGroup("cg").setConsumerId("cid").setTimeoutMs(-1) + .setLimit(-1).setFilter("{ \"foo\"=\"bar\"bar\" }").setApiKey_username(null) + .setApiSecret_password(null).createMRConsumerImpl(); final String url = c.createUrlPath(MRConstants.makeConsumerUrl("localhost:8080", "topic", "cg", "cid", "http"), -1, -1); assertEquals("http://localhost:8080/events/" + "topic/cg/cid?filter=%7B+%22foo%22%3D%22bar%22bar%22+%7D", url); @@ -116,8 +131,10 @@ public class MRConsumerImplTest extends TestCase { MRClientFactory.prop=properties; - final MRConsumerImpl c = new MRConsumerImpl(hosts, "topic", "cg", "cid", -1, -1, "{ \"foo\"=\"bar\"bar\" }", - null, null); + final MRConsumerImpl c = new MRConsumerImpl.MRConsumerImplBuilder().setHostPart(hosts) + .setTopic("topic").setConsumerGroup("cg").setConsumerId("cid").setTimeoutMs(-1) + .setLimit(-1).setFilter("{ \"foo\"=\"bar\"bar\" }").setApiKey_username(null) + .setApiSecret_password(null).createMRConsumerImpl(); c.setProps(properties); assertNotNull(c.fetchWithReturnConsumerResponse()); c.setProtocolFlag(ProtocolTypeConstants.AAF_AUTH.getValue()); @@ -149,8 +166,10 @@ public class MRConsumerImplTest extends TestCase { properties.store(new FileOutputStream(outFile), ""); MRClientFactory.prop=properties; - final MRConsumerImpl c = new MRConsumerImpl(hosts, "topic", "cg", "cid", -1, -1, "{ \"foo\"=\"bar\"bar\" }", - null, null); + final MRConsumerImpl c = new MRConsumerImpl.MRConsumerImplBuilder().setHostPart(hosts) + .setTopic("topic").setConsumerGroup("cg").setConsumerId("cid").setTimeoutMs(-1) + .setLimit(-1).setFilter("{ \"foo\"=\"bar\"bar\" }").setApiKey_username(null) + .setApiSecret_password(null).createMRConsumerImpl(); c.setProps(properties); try { c.fetch(); -- cgit 1.2.3-korg