Sonar fix too many method param

+ implement builder pattern to reduce too many method param

Issue-ID: USECASEUI-250
Change-Id: I0fc34d51826cfe0f85e4a24b11136b5e192c63a3
Signed-off-by: Arindam Mondal <arind.mondal@samsung.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java
index 36ad68b..fb8d388 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java
+++ b/server/src/main/java/org/onap/usecaseui/server/bean/PerformanceHeader.java
@@ -83,6 +83,128 @@ public class PerformanceHeader implements Serializable {
        \r
        @Column(name = "measurementInterval")\r
        private String measurementInterval;\r
+\r
+       /** */\r
+       public static class PerformanceHeaderBuilder {\r
+               private String sourceId;\r
+               private String version;\r
+               private String eventName;\r
+               private String domain;\r
+               private String eventId;\r
+               private String eventType;\r
+               private String nfcNamingCode;\r
+               private String nfNamingCode;\r
+               private String sourceName;\r
+               private String reportingEntityId;\r
+               private String reportingEntityName;\r
+               private String priority;\r
+               private String startEpochMicrosec;\r
+               private String lastEpochMicroSec;\r
+               private String sequence;\r
+               private String measurementsForVfScalingVersion;\r
+               private String measurementInterval;\r
+               private Date createTime;\r
+               private Date updateTime;\r
+\r
+               public PerformanceHeaderBuilder setSourceId(String sourceId) {\r
+                       this.sourceId = sourceId;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setVersion(String version) {\r
+                       this.version = version;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setEventName(String eventName) {\r
+                       this.eventName = eventName;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setDomain(String domain) {\r
+                       this.domain = domain;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setEventId(String eventId) {\r
+                       this.eventId = eventId;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setEventType(String eventType) {\r
+                       this.eventType = eventType;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setNfcNamingCode(String nfcNamingCode) {\r
+                       this.nfcNamingCode = nfcNamingCode;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setNfNamingCode(String nfNamingCode) {\r
+                       this.nfNamingCode = nfNamingCode;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setSourceName(String sourceName) {\r
+                       this.sourceName = sourceName;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setReportingEntityId(String reportingEntityId) {\r
+                       this.reportingEntityId = reportingEntityId;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setReportingEntityName(String reportingEntityName) {\r
+                       this.reportingEntityName = reportingEntityName;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setPriority(String priority) {\r
+                       this.priority = priority;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setStartEpochMicrosec(String startEpochMicrosec) {\r
+                       this.startEpochMicrosec = startEpochMicrosec;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setLastEpochMicroSec(String lastEpochMicroSec) {\r
+                       this.lastEpochMicroSec = lastEpochMicroSec;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setSequence(String sequence) {\r
+                       this.sequence = sequence;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setMeasurementsForVfScalingVersion(String measurementsForVfScalingVersion) {\r
+                       this.measurementsForVfScalingVersion = measurementsForVfScalingVersion;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setMeasurementInterval(String measurementInterval) {\r
+                       this.measurementInterval = measurementInterval;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setCreateTime(Date createTime) {\r
+                       this.createTime = createTime;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeaderBuilder setUpdateTime(Date updateTime) {\r
+                       this.updateTime = updateTime;\r
+                       return this;\r
+               }\r
+\r
+               public PerformanceHeader createPerformanceHeader() {\r
+                       return new PerformanceHeader(this);\r
+               }\r
+       }\r
        \r
        public PerformanceHeader() {\r
        }\r
@@ -91,24 +213,24 @@ public class PerformanceHeader implements Serializable {
                this.sourceId = sourceId;\r
        }\r
 \r
-       public PerformanceHeader(String version, String eventName, String domain, String eventId, String eventType, String nfcNamingCode, String nfNamingCode, String sourceId, String sourceName, String reportingEntityId, String reportingEntityName, String priority, String startEpochMicrosec, String lastEpochMicroSec, String sequence, String measurementsForVfScalingVersion, String measurementInterval, Date createTime, Date updateTime) {\r
-               this.version = version;\r
-               this.eventName = eventName;\r
-               this.domain = domain;\r
-               this.eventId = eventId;\r
-               this.eventType = eventType;\r
-               this.nfcNamingCode = nfcNamingCode;\r
-               this.nfNamingCode = nfNamingCode;\r
-               this.sourceId = sourceId;\r
-               this.sourceName = sourceName;\r
-               this.reportingEntityId = reportingEntityId;\r
-               this.reportingEntityName = reportingEntityName;\r
-               this.priority = priority;\r
-               this.startEpochMicrosec = startEpochMicrosec;\r
-               this.lastEpochMicroSec = lastEpochMicroSec;\r
-               this.sequence = sequence;\r
-               this.measurementsForVfScalingVersion = measurementsForVfScalingVersion;\r
-               this.measurementInterval = measurementInterval;\r
+       public PerformanceHeader(PerformanceHeaderBuilder builder) {\r
+               this.version = builder.version;\r
+               this.eventName = builder.eventName;\r
+               this.domain = builder.domain;\r
+               this.eventId = builder.eventId;\r
+               this.eventType = builder.eventType;\r
+               this.nfcNamingCode = builder.nfcNamingCode;\r
+               this.nfNamingCode = builder.nfNamingCode;\r
+               this.sourceId = builder.sourceId;\r
+               this.sourceName = builder.sourceName;\r
+               this.reportingEntityId = builder.reportingEntityId;\r
+               this.reportingEntityName = builder.reportingEntityName;\r
+               this.priority = builder.priority;\r
+               this.startEpochMicrosec = builder.startEpochMicrosec;\r
+               this.lastEpochMicroSec = builder.lastEpochMicroSec;\r
+               this.sequence = builder.sequence;\r
+               this.measurementsForVfScalingVersion = builder.measurementsForVfScalingVersion;\r
+               this.measurementInterval = builder.measurementInterval;\r
        }\r
 \r
        public String getVersion() {\r

diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java b/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java
index 6b7eecc..0ef97ce 100755 (executable)
--- a/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/PerformanceController.java
@@ -78,7 +78,7 @@ public class PerformanceController {
                                      @RequestParam(required = false) String sourceName,
                                      @RequestParam(required = false) String startTime,@RequestParam(required = false) String endTime) throws JsonProcessingException, ParseException {
         Page<PerformanceHeader> pa = new Page<PerformanceHeader>();
-            PerformanceHeader performanceHeader = new PerformanceHeader();
+            PerformanceHeader performanceHeader = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
             performanceHeader.setSourceName(sourceName);
             performanceHeader.setStartEpochMicrosec(!UuiCommonUtil.isNotNullOrEmpty(startTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(startTime).getTime()+"");
             performanceHeader.setLastEpochMicroSec(!UuiCommonUtil.isNotNullOrEmpty(endTime)?null:new SimpleDateFormat(Constant.DATE_FORMAT).parse(endTime).getTime()+"");
@@ -125,7 +125,7 @@ public class PerformanceController {
     @RequestMapping(value = {"/performance/getSourceNames/{currentPage}/{pageSize}"},method = RequestMethod.GET, produces = "application/json")
     public String getPerformanceSourceNames(@PathVariable String currentPage,@PathVariable String pageSize,
             @RequestParam(required = false) String sourceName) throws JsonProcessingException{
-        PerformanceHeader performanceHeader = new PerformanceHeader();
+        PerformanceHeader performanceHeader = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
         Page<PerformanceHeader> page = new Page<PerformanceHeader>();
         Set<String> names = new HashSet<String>();
         performanceHeader.setSourceName(sourceName);
@@ -133,7 +133,7 @@ public class PerformanceController {
         if(!UuiCommonUtil.isNotNullOrEmpty(page)){
             page = new Page<>();
             List<PerformanceHeader> list = new ArrayList<>();
-            performanceHeader = new PerformanceHeader();
+            performanceHeader =  new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
             list.add(performanceHeader);
             page.setList(list);
 

diff --git a/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java b/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
index df003bd..1d51e2e 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
+++ b/server/src/main/java/org/onap/usecaseui/server/util/DmaapSubscriber.java
@@ -31,10 +31,7 @@ import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
 
 import org.glassfish.jersey.client.ClientConfig;
-import org.onap.usecaseui.server.bean.AlarmsHeader;
-import org.onap.usecaseui.server.bean.AlarmsInformation;
-import org.onap.usecaseui.server.bean.PerformanceHeader;
-import org.onap.usecaseui.server.bean.PerformanceInformation;
+import org.onap.usecaseui.server.bean.*;
 import org.onap.usecaseui.server.constant.Constant;
 import org.onap.usecaseui.server.service.AlarmsHeaderService;
 import org.onap.usecaseui.server.service.AlarmsInformationService;
@@ -236,7 +233,7 @@ public class DmaapSubscriber implements Runnable {
     }
 
     public void performanceProcess(Map<String, Object> maps) {
-        PerformanceHeader performance_header = new PerformanceHeader();
+        PerformanceHeader performance_header = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
         performance_header.setId(UuiCommonUtil.getUUID());
         List<PerformanceInformation> performance_informations = new ArrayList<>();
         maps.forEach((ek1, ev1) -> {

diff --git a/server/src/test/java/org/onap/usecaseui/server/bean/PerformanceHeaderTest.java b/server/src/test/java/org/onap/usecaseui/server/bean/PerformanceHeaderTest.java
index 24d1242..09ac14b 100644 (file)
--- a/server/src/test/java/org/onap/usecaseui/server/bean/PerformanceHeaderTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/bean/PerformanceHeaderTest.java
@@ -34,10 +34,7 @@ public class PerformanceHeaderTest implements Serializable {
 
        @Test
        public void testGetPerformanceHeader() throws Exception {
-               PerformanceHeader ph = new PerformanceHeader("version", "eventName", "domain", "eventId", "eventType", "nfcNamingCode", "nfNamingCode",
-                                                                                                       "sourceId", "sourceName", "reportingEntityId", "reportingEntityName", "priority",
-                                                                                                       "startEpochMicrosec", "lastEpochMicroSec", "sequence", "measurementsForVfScalingVersion",
-                                                                                                       "measurementInterval", DateUtils.now(), DateUtils.now());
+               PerformanceHeader ph = new PerformanceHeader.PerformanceHeaderBuilder().setVersion("version").setEventName("eventName").setDomain("domain").setEventId("eventId").setEventType("eventType").setNfcNamingCode("nfcNamingCode").setNfNamingCode("nfNamingCode").setSourceId("sourceId").setSourceName("sourceName").setReportingEntityId("reportingEntityId").setReportingEntityName("reportingEntityName").setPriority("priority").setStartEpochMicrosec("startEpochMicrosec").setLastEpochMicroSec("lastEpochMicroSec").setSequence("sequence").setMeasurementsForVfScalingVersion("measurementsForVfScalingVersion").setMeasurementInterval("measurementInterval").setCreateTime(DateUtils.now()).setUpdateTime(DateUtils.now()).createPerformanceHeader();
                ph.getVersion();
                ph.getEventName();
                ph.getDomain();
@@ -60,7 +57,7 @@ public class PerformanceHeaderTest implements Serializable {
 
        @Test
        public void testSetPerformanceHeader() throws Exception {
-               PerformanceHeader ph = new PerformanceHeader("sourceId");
+               PerformanceHeader ph = new PerformanceHeader.PerformanceHeaderBuilder().setSourceId("sourceId").createPerformanceHeader();
                ph.setVersion("");
                ph.setEventName("");
                ph.setDomain("");

diff --git a/server/src/test/java/org/onap/usecaseui/server/controller/PerformanceControllerTest.java b/server/src/test/java/org/onap/usecaseui/server/controller/PerformanceControllerTest.java
index bccf73b..1c62abc 100755 (executable)
--- a/server/src/test/java/org/onap/usecaseui/server/controller/PerformanceControllerTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/controller/PerformanceControllerTest.java
@@ -60,7 +60,7 @@ public class PerformanceControllerTest {
            String  priority="Normal";
            String  startTime="1521678529000";
            String  endTime="1521680329000";
-           PerformanceHeader header = new PerformanceHeader();
+           PerformanceHeader header = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
 
 
            controller.getPerformanceData(currentPage+"",pageSize+"",sourceName,startTime,endTime);

diff --git a/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java b/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java
index 8c63062..f2958d4 100644 (file)
--- a/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/impl/PerformanceHeaderServiceImplTest.java
@@ -19,8 +19,6 @@ import org.junit.Test;
 import org.junit.Before;
 import org.junit.After;
 import org.onap.usecaseui.server.bean.PerformanceHeader;
-import org.onap.usecaseui.server.service.impl.PerformanceHeaderServiceImpl;
-import org.onap.usecaseui.server.util.DateUtils;
 
 import java.util.*;
 import java.io.*;
@@ -85,7 +83,7 @@ public class PerformanceHeaderServiceImplTest {
                        }
                        @Mock
                        public List<PerformanceHeader> list() {
-                               PerformanceHeader ph = new PerformanceHeader();
+                               PerformanceHeader ph = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
                                return Arrays.asList(ph);
                        }
                        @Mock
@@ -139,7 +137,7 @@ public class PerformanceHeaderServiceImplTest {
        public void testSavePerformanceHeader() throws Exception {
                try {
                        PerformanceHeader ph = null;
-                       PerformanceHeader phNew = new PerformanceHeader();
+                       PerformanceHeader phNew = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
                        performanceHeaderServiceImpl.savePerformanceHeader(ph);
                        performanceHeaderServiceImpl.savePerformanceHeader(phNew);
                } catch (Exception e) {
@@ -151,7 +149,7 @@ public class PerformanceHeaderServiceImplTest {
        public void testUpdatePerformanceHeader() throws Exception {
                try {
                        PerformanceHeader ph = null;
-                       PerformanceHeader phNew = new PerformanceHeader();
+                       PerformanceHeader phNew = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
                        performanceHeaderServiceImpl.updatePerformanceHeader(ph);
                        performanceHeaderServiceImpl.updatePerformanceHeader(phNew);
                } catch (Exception e) {
@@ -168,7 +166,7 @@ public class PerformanceHeaderServiceImplTest {
                        }
                };
                try {
-                       PerformanceHeader ph = new PerformanceHeader();
+                       PerformanceHeader ph = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
                        ph.setVersion("");
                        ph.setEventName("");
                        ph.setDomain("");
@@ -190,7 +188,7 @@ public class PerformanceHeaderServiceImplTest {
                        ph.setLastEpochMicroSec("");;
                        performanceHeaderServiceImpl.getAllCount(ph, 1, 1);
                        
-                       PerformanceHeader phNew = new PerformanceHeader();
+                       PerformanceHeader phNew = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
                        performanceHeaderServiceImpl.getAllCount(phNew, 1, 1);
                        performanceHeaderServiceImpl.getAllCount(null, 1, 1);
                } catch (Exception e) {
@@ -201,7 +199,7 @@ public class PerformanceHeaderServiceImplTest {
        @Test
        public void testQueryPerformanceHeader() throws Exception {
                try {
-                       PerformanceHeader ph = new PerformanceHeader();
+                       PerformanceHeader ph = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
                        ph.setVersion("");
                        ph.setEventName("");
                        ph.setDomain("");
@@ -223,7 +221,7 @@ public class PerformanceHeaderServiceImplTest {
                        ph.setLastEpochMicroSec("");;
                        performanceHeaderServiceImpl.queryPerformanceHeader(ph, 1, 10);
                        
-                       PerformanceHeader phNew = new PerformanceHeader();
+                       PerformanceHeader phNew = new PerformanceHeader.PerformanceHeaderBuilder().createPerformanceHeader();
                        performanceHeaderServiceImpl.queryPerformanceHeader(phNew, 1, 1);
                        performanceHeaderServiceImpl.queryPerformanceHeader(null, 1, 1);
                } catch (Exception e) {