Reduce number of parameters in constructor
Constructor has 24 parameters, which is greater than 7 authorized
Issue-ID: PORTAL-562
Change-Id: I155446c6a16af1bcd7b2e8b5e00d3e0ba642bb64
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
index 09afcf7..3778a00 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesServiceImpl.java
@@ -1179,14 +1179,19 @@
&& (globalRole.toLowerCase().startsWith("global_")))) {
CentralV2UserApp cua = new CentralV2UserApp();
cua.setUserId(null);
- CentralApp cenApp = new CentralApp(1L, epApp.getCreated(), epApp.getModified(),
- epApp.getCreatedId(), epApp.getModifiedId(), epApp.getRowNum(), epApp.getName(),
- epApp.getImageUrl(), epApp.getDescription(), epApp.getNotes(), epApp.getUrl(),
- epApp.getAlternateUrl(), epApp.getAppRestEndpoint(), epApp.getMlAppName(),
- epApp.getMlAppAdminId(), String.valueOf(epApp.getMotsId()), epApp.getAppPassword(),
- String.valueOf(epApp.getOpen()), String.valueOf(epApp.getEnabled()),
- epApp.getThumbnail(), epApp.getUsername(), epApp.getUebKey(), epApp.getUebSecret(),
- epApp.getUebTopicName());
+ CentralApp cenApp = new CentralApp.CentralAppBuilder().setId(1L).setCreated(epApp.getCreated())
+ .setModified(epApp.getModified()).setCreatedId(epApp.getCreatedId())
+ .setModifiedId(epApp.getModifiedId()).setRowNum(epApp.getRowNum())
+ .setName(epApp.getName()).setImageUrl(epApp.getImageUrl())
+ .setDescription(epApp.getDescription()).setNotes(epApp.getNotes())
+ .setUrl(epApp.getUrl()).setAlternateUrl(epApp.getAlternateUrl())
+ .setRestEndpoint(epApp.getAppRestEndpoint()).setMlAppName(epApp.getMlAppName())
+ .setMlAppAdminId(epApp.getMlAppAdminId()).setMotsId(String.valueOf(epApp.getMotsId()))
+ .setAppPassword(epApp.getAppPassword()).setOpen(String.valueOf(epApp.getOpen()))
+ .setEnabled(String.valueOf(epApp.getEnabled())).setThumbnail(epApp.getThumbnail())
+ .setUsername(epApp.getUsername()).setUebKey(epApp.getUebKey())
+ .setUebSecret(epApp.getUebSecret()).setUebTopicName(epApp.getUebTopicName())
+ .createCentralApp();
cenApp.setAppPassword(EPCommonSystemProperties.APP_DISPLAY_PASSWORD);
cua.setApp(cenApp);
Long appId = null;
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralApp.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralApp.java
index d3ad868..6da5711 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralApp.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/transport/CentralApp.java
@@ -33,368 +33,561 @@
*
* ============LICENSE_END============================================
*
- *
+ *
*/
package org.onap.portalapp.portal.transport;
import java.io.Serializable;
import java.util.Date;
-public class CentralApp implements Serializable{
- /**
- *
- */
- private static final long serialVersionUID = -3325965646585871632L;
- private Long id;
- private Date created;
- private Date modified;
- private Long createdId;
- private Long modifiedId;
- private Long rowNum;
- private String name; // app_name
- private String imageUrl; // app_image_url
- private String description; // app_description
- private String notes; // app_notes
- private String url; // app_url
- private String alternateUrl; // app_alternate_url
- private String restEndpoint; // app_rest_endpoint
- private String mlAppName; // ml_app_name
- private String mlAppAdminId; // ml_app_admin_id;
- private String motsId; // mots_id
- private String appPassword; // app_password
- private String open;
- private String enabled;
- private byte[] thumbnail;
- private String username; // app_username
- private String uebKey; // ueb_key
- private String uebSecret; // ueb_secret
- private String uebTopicName; // ueb_topic_name
-
- public CentralApp(){
-
- }
+public class CentralApp implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -3325965646585871632L;
+ private Long id;
+ private Date created;
+ private Date modified;
+ private Long createdId;
+ private Long modifiedId;
+ private Long rowNum;
+ private String name; // app_name
+ private String imageUrl; // app_image_url
+ private String description; // app_description
+ private String notes; // app_notes
+ private String url; // app_url
+ private String alternateUrl; // app_alternate_url
+ private String restEndpoint; // app_rest_endpoint
+ private String mlAppName; // ml_app_name
+ private String mlAppAdminId; // ml_app_admin_id;
+ private String motsId; // mots_id
+ private String appPassword; // app_password
+ private String open;
+ private String enabled;
+ private byte[] thumbnail;
+ private String username; // app_username
+ private String uebKey; // ueb_key
+ private String uebSecret; // ueb_secret
+ private String uebTopicName; // ueb_topic_name
- public CentralApp(Long id, Date created, Date modified, Long createdId, Long modifiedId, Long rowNum, String name,
- String imageUrl, String description, String notes, String url, String alternateUrl, String restEndpoint,
- String mlAppName, String mlAppAdminId, String motsId, String appPassword, String open, String enabled,
- byte[] thumbnail, String username, String uebKey, String uebSecret, String uebTopicName) {
- super();
- this.id = id;
- this.created = created;
- this.modified = modified;
- this.createdId = createdId;
- this.modifiedId = modifiedId;
- this.rowNum = rowNum;
- this.name = name;
- this.imageUrl = imageUrl;
- this.description = description;
- this.notes = notes;
- this.url = url;
- this.alternateUrl = alternateUrl;
- this.restEndpoint = restEndpoint;
- this.mlAppName = mlAppName;
- this.mlAppAdminId = mlAppAdminId;
- this.motsId = motsId;
- this.appPassword = appPassword;
- this.open = open;
- this.enabled = enabled;
- this.thumbnail = thumbnail;
- this.username = username;
- this.uebKey = uebKey;
- this.uebSecret = uebSecret;
- this.uebTopicName = uebTopicName;
- }
-
- public Long getId() {
- return id;
- }
- public void setId(Long id) {
- this.id = id;
- }
-
- public Date getCreated() {
- return created;
- }
- public void setCreated(Date created) {
- this.created = created;
- }
- public Date getModified() {
- return modified;
- }
- public void setModified(Date modified) {
- this.modified = modified;
- }
- public Long getCreatedId() {
- return createdId;
- }
- public void setCreatedId(Long createdId) {
- this.createdId = createdId;
- }
- public Long getModifiedId() {
- return modifiedId;
- }
- public void setModifiedId(Long modifiedId) {
- this.modifiedId = modifiedId;
- }
- public Long getRowNum() {
- return rowNum;
- }
- public void setRowNum(Long rowNum) {
- this.rowNum = rowNum;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getImageUrl() {
- return imageUrl;
- }
- public void setImageUrl(String imageUrl) {
- this.imageUrl = imageUrl;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public String getNotes() {
- return notes;
- }
- public void setNotes(String notes) {
- this.notes = notes;
- }
- public String getUrl() {
- return url;
- }
- public void setUrl(String url) {
- this.url = url;
- }
- public String getAlternateUrl() {
- return alternateUrl;
- }
- public void setAlternateUrl(String alternateUrl) {
- this.alternateUrl = alternateUrl;
- }
- public String getRestEndpoint() {
- return restEndpoint;
- }
- public void setRestEndpoint(String restEndpoint) {
- this.restEndpoint = restEndpoint;
- }
- public String getMlAppName() {
- return mlAppName;
- }
- public void setMlAppName(String mlAppName) {
- this.mlAppName = mlAppName;
- }
- public String getMlAppAdminId() {
- return mlAppAdminId;
- }
- public void setMlAppAdminId(String mlAppAdminId) {
- this.mlAppAdminId = mlAppAdminId;
- }
- public String getMotsId() {
- return motsId;
- }
- public void setMotsId(String motsId) {
- this.motsId = motsId;
- }
- public String getAppPassword() {
- return appPassword;
- }
- public void setAppPassword(String appPassword) {
- this.appPassword = appPassword;
- }
- public String getOpen() {
- return open;
- }
- public void setOpen(String open) {
- this.open = open;
- }
- public String getEnabled() {
- return enabled;
- }
- public void setEnabled(String enabled) {
- this.enabled = enabled;
- }
- public byte[] getThumbnail() {
- return thumbnail;
- }
- public void setThumbnail(byte[] thumbnail) {
- this.thumbnail = thumbnail;
- }
- public String getUsername() {
- return username;
- }
- public void setUsername(String username) {
- this.username = username;
- }
- public String getUebKey() {
- return uebKey;
- }
- public void setUebKey(String uebKey) {
- this.uebKey = uebKey;
- }
- public String getUebSecret() {
- return uebSecret;
- }
- public void setUebSecret(String uebSecret) {
- this.uebSecret = uebSecret;
- }
- public String getUebTopicName() {
- return uebTopicName;
- }
- public void setUebTopicName(String uebTopicName) {
- this.uebTopicName = uebTopicName;
- }
+ public CentralApp() {
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((alternateUrl == null) ? 0 : alternateUrl.hashCode());
- result = prime * result + ((appPassword == null) ? 0 : appPassword.hashCode());
- result = prime * result + ((createdId == null) ? 0 : createdId.hashCode());
- result = prime * result + ((description == null) ? 0 : description.hashCode());
- result = prime * result + ((enabled == null) ? 0 : enabled.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result + ((imageUrl == null) ? 0 : imageUrl.hashCode());
- result = prime * result + ((mlAppAdminId == null) ? 0 : mlAppAdminId.hashCode());
- result = prime * result + ((mlAppName == null) ? 0 : mlAppName.hashCode());
- result = prime * result + ((modifiedId == null) ? 0 : modifiedId.hashCode());
- result = prime * result + ((motsId == null) ? 0 : motsId.hashCode());
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- result = prime * result + ((notes == null) ? 0 : notes.hashCode());
- result = prime * result + ((open == null) ? 0 : open.hashCode());
- result = prime * result + ((restEndpoint == null) ? 0 : restEndpoint.hashCode());
- result = prime * result + ((rowNum == null) ? 0 : rowNum.hashCode());
- result = prime * result + ((uebKey == null) ? 0 : uebKey.hashCode());
- result = prime * result + ((uebSecret == null) ? 0 : uebSecret.hashCode());
- result = prime * result + ((uebTopicName == null) ? 0 : uebTopicName.hashCode());
- result = prime * result + ((url == null) ? 0 : url.hashCode());
- result = prime * result + ((username == null) ? 0 : username.hashCode());
- return result;
- }
+ }
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- CentralApp other = (CentralApp) obj;
- if (alternateUrl == null) {
- if (other.alternateUrl != null)
- return false;
- } else if (!alternateUrl.equals(other.alternateUrl))
- return false;
- if (appPassword == null) {
- if (other.appPassword != null)
- return false;
- } else if (!appPassword.equals(other.appPassword))
- return false;
- if (createdId == null) {
- if (other.createdId != null)
- return false;
- } else if (!createdId.equals(other.createdId))
- return false;
- if (description == null) {
- if (other.description != null)
- return false;
- } else if (!description.equals(other.description))
- return false;
- if (enabled == null) {
- if (other.enabled != null)
- return false;
- } else if (!enabled.equals(other.enabled))
- return false;
- if (id == null) {
- if (other.id != null)
- return false;
- } else if (!id.equals(other.id))
- return false;
- if (imageUrl == null) {
- if (other.imageUrl != null)
- return false;
- } else if (!imageUrl.equals(other.imageUrl))
- return false;
- if (mlAppAdminId == null) {
- if (other.mlAppAdminId != null)
- return false;
- } else if (!mlAppAdminId.equals(other.mlAppAdminId))
- return false;
- if (mlAppName == null) {
- if (other.mlAppName != null)
- return false;
- } else if (!mlAppName.equals(other.mlAppName))
- return false;
- if (modifiedId == null) {
- if (other.modifiedId != null)
- return false;
- } else if (!modifiedId.equals(other.modifiedId))
- return false;
- if (motsId == null) {
- if (other.motsId != null)
- return false;
- } else if (!motsId.equals(other.motsId))
- return false;
- if (name == null) {
- if (other.name != null)
- return false;
- } else if (!name.equals(other.name))
- return false;
- if (notes == null) {
- if (other.notes != null)
- return false;
- } else if (!notes.equals(other.notes))
- return false;
- if (open == null) {
- if (other.open != null)
- return false;
- } else if (!open.equals(other.open))
- return false;
- if (restEndpoint == null) {
- if (other.restEndpoint != null)
- return false;
- } else if (!restEndpoint.equals(other.restEndpoint))
- return false;
- if (rowNum == null) {
- if (other.rowNum != null)
- return false;
- } else if (!rowNum.equals(other.rowNum))
- return false;
- if (uebKey == null) {
- if (other.uebKey != null)
- return false;
- } else if (!uebKey.equals(other.uebKey))
- return false;
- if (uebSecret == null) {
- if (other.uebSecret != null)
- return false;
- } else if (!uebSecret.equals(other.uebSecret))
- return false;
- if (uebTopicName == null) {
- if (other.uebTopicName != null)
- return false;
- } else if (!uebTopicName.equals(other.uebTopicName))
- return false;
- if (url == null) {
- if (other.url != null)
- return false;
- } else if (!url.equals(other.url))
- return false;
- if (username == null) {
- if (other.username != null)
- return false;
- } else if (!username.equals(other.username))
- return false;
- return true;
- }
-
-
+ public CentralApp(CentralAppBuilder builder) {
+ super();
+ this.id = builder.id;
+ this.created = builder.created;
+ this.modified = builder.modified;
+ this.createdId = builder.createdId;
+ this.modifiedId = builder.modifiedId;
+ this.rowNum = builder.rowNum;
+ this.name = builder.name;
+ this.imageUrl = builder.imageUrl;
+ this.description = builder.description;
+ this.notes = builder.notes;
+ this.url = builder.url;
+ this.alternateUrl = builder.alternateUrl;
+ this.restEndpoint = builder.restEndpoint;
+ this.mlAppName = builder.mlAppName;
+ this.mlAppAdminId = builder.mlAppAdminId;
+ this.motsId = builder.motsId;
+ this.appPassword = builder.appPassword;
+ this.open = builder.open;
+ this.enabled = builder.enabled;
+ this.thumbnail = builder.thumbnail;
+ this.username = builder.username;
+ this.uebKey = builder.uebKey;
+ this.uebSecret = builder.uebSecret;
+ this.uebTopicName = builder.uebTopicName;
+ }
+
+ public static class CentralAppBuilder {
+ private Long id;
+ private Date created;
+ private Date modified;
+ private Long createdId;
+ private Long modifiedId;
+ private Long rowNum;
+ private String name;
+ private String imageUrl;
+ private String description;
+ private String notes;
+ private String url;
+ private String alternateUrl;
+ private String restEndpoint;
+ private String mlAppName;
+ private String mlAppAdminId;
+ private String motsId;
+ private String appPassword;
+ private String open;
+ private String enabled;
+ private byte[] thumbnail;
+ private String username;
+ private String uebKey;
+ private String uebSecret;
+ private String uebTopicName;
+
+ public CentralAppBuilder setId(Long id) {
+ this.id = id;
+ return this;
+ }
+
+ public CentralAppBuilder setCreated(Date created) {
+ this.created = created;
+ return this;
+ }
+
+ public CentralAppBuilder setModified(Date modified) {
+ this.modified = modified;
+ return this;
+ }
+
+ public CentralAppBuilder setCreatedId(Long createdId) {
+ this.createdId = createdId;
+ return this;
+ }
+
+ public CentralAppBuilder setModifiedId(Long modifiedId) {
+ this.modifiedId = modifiedId;
+ return this;
+ }
+
+ public CentralAppBuilder setRowNum(Long rowNum) {
+ this.rowNum = rowNum;
+ return this;
+ }
+
+ public CentralAppBuilder setName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public CentralAppBuilder setImageUrl(String imageUrl) {
+ this.imageUrl = imageUrl;
+ return this;
+ }
+
+ public CentralAppBuilder setDescription(String description) {
+ this.description = description;
+ return this;
+ }
+
+ public CentralAppBuilder setNotes(String notes) {
+ this.notes = notes;
+ return this;
+ }
+
+ public CentralAppBuilder setUrl(String url) {
+ this.url = url;
+ return this;
+ }
+
+ public CentralAppBuilder setAlternateUrl(String alternateUrl) {
+ this.alternateUrl = alternateUrl;
+ return this;
+ }
+
+ public CentralAppBuilder setRestEndpoint(String restEndpoint) {
+ this.restEndpoint = restEndpoint;
+ return this;
+ }
+
+ public CentralAppBuilder setMlAppName(String mlAppName) {
+ this.mlAppName = mlAppName;
+ return this;
+ }
+
+ public CentralAppBuilder setMlAppAdminId(String mlAppAdminId) {
+ this.mlAppAdminId = mlAppAdminId;
+ return this;
+ }
+
+ public CentralAppBuilder setMotsId(String motsId) {
+ this.motsId = motsId;
+ return this;
+ }
+
+ public CentralAppBuilder setAppPassword(String appPassword) {
+ this.appPassword = appPassword;
+ return this;
+ }
+
+ public CentralAppBuilder setOpen(String open) {
+ this.open = open;
+ return this;
+ }
+
+ public CentralAppBuilder setEnabled(String enabled) {
+ this.enabled = enabled;
+ return this;
+ }
+
+ public CentralAppBuilder setThumbnail(byte[] thumbnail) {
+ this.thumbnail = thumbnail;
+ return this;
+ }
+
+ public CentralAppBuilder setUsername(String username) {
+ this.username = username;
+ return this;
+ }
+
+ public CentralAppBuilder setUebKey(String uebKey) {
+ this.uebKey = uebKey;
+ return this;
+ }
+
+ public CentralAppBuilder setUebSecret(String uebSecret) {
+ this.uebSecret = uebSecret;
+ return this;
+ }
+
+ public CentralAppBuilder setUebTopicName(String uebTopicName) {
+ this.uebTopicName = uebTopicName;
+ return this;
+ }
+
+ public CentralApp createCentralApp() {
+ return new CentralApp(this);
+ }
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Date getCreated() {
+ return created;
+ }
+
+ public void setCreated(Date created) {
+ this.created = created;
+ }
+
+ public Date getModified() {
+ return modified;
+ }
+
+ public void setModified(Date modified) {
+ this.modified = modified;
+ }
+
+ public Long getCreatedId() {
+ return createdId;
+ }
+
+ public void setCreatedId(Long createdId) {
+ this.createdId = createdId;
+ }
+
+ public Long getModifiedId() {
+ return modifiedId;
+ }
+
+ public void setModifiedId(Long modifiedId) {
+ this.modifiedId = modifiedId;
+ }
+
+ public Long getRowNum() {
+ return rowNum;
+ }
+
+ public void setRowNum(Long rowNum) {
+ this.rowNum = rowNum;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getImageUrl() {
+ return imageUrl;
+ }
+
+ public void setImageUrl(String imageUrl) {
+ this.imageUrl = imageUrl;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getNotes() {
+ return notes;
+ }
+
+ public void setNotes(String notes) {
+ this.notes = notes;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getAlternateUrl() {
+ return alternateUrl;
+ }
+
+ public void setAlternateUrl(String alternateUrl) {
+ this.alternateUrl = alternateUrl;
+ }
+
+ public String getRestEndpoint() {
+ return restEndpoint;
+ }
+
+ public void setRestEndpoint(String restEndpoint) {
+ this.restEndpoint = restEndpoint;
+ }
+
+ public String getMlAppName() {
+ return mlAppName;
+ }
+
+ public void setMlAppName(String mlAppName) {
+ this.mlAppName = mlAppName;
+ }
+
+ public String getMlAppAdminId() {
+ return mlAppAdminId;
+ }
+
+ public void setMlAppAdminId(String mlAppAdminId) {
+ this.mlAppAdminId = mlAppAdminId;
+ }
+
+ public String getMotsId() {
+ return motsId;
+ }
+
+ public void setMotsId(String motsId) {
+ this.motsId = motsId;
+ }
+
+ public String getAppPassword() {
+ return appPassword;
+ }
+
+ public void setAppPassword(String appPassword) {
+ this.appPassword = appPassword;
+ }
+
+ public String getOpen() {
+ return open;
+ }
+
+ public void setOpen(String open) {
+ this.open = open;
+ }
+
+ public String getEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(String enabled) {
+ this.enabled = enabled;
+ }
+
+ public byte[] getThumbnail() {
+ return thumbnail;
+ }
+
+ public void setThumbnail(byte[] thumbnail) {
+ this.thumbnail = thumbnail;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getUebKey() {
+ return uebKey;
+ }
+
+ public void setUebKey(String uebKey) {
+ this.uebKey = uebKey;
+ }
+
+ public String getUebSecret() {
+ return uebSecret;
+ }
+
+ public void setUebSecret(String uebSecret) {
+ this.uebSecret = uebSecret;
+ }
+
+ public String getUebTopicName() {
+ return uebTopicName;
+ }
+
+ public void setUebTopicName(String uebTopicName) {
+ this.uebTopicName = uebTopicName;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((alternateUrl == null) ? 0 : alternateUrl.hashCode());
+ result = prime * result + ((appPassword == null) ? 0 : appPassword.hashCode());
+ result = prime * result + ((createdId == null) ? 0 : createdId.hashCode());
+ result = prime * result + ((description == null) ? 0 : description.hashCode());
+ result = prime * result + ((enabled == null) ? 0 : enabled.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((imageUrl == null) ? 0 : imageUrl.hashCode());
+ result = prime * result + ((mlAppAdminId == null) ? 0 : mlAppAdminId.hashCode());
+ result = prime * result + ((mlAppName == null) ? 0 : mlAppName.hashCode());
+ result = prime * result + ((modifiedId == null) ? 0 : modifiedId.hashCode());
+ result = prime * result + ((motsId == null) ? 0 : motsId.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((notes == null) ? 0 : notes.hashCode());
+ result = prime * result + ((open == null) ? 0 : open.hashCode());
+ result = prime * result + ((restEndpoint == null) ? 0 : restEndpoint.hashCode());
+ result = prime * result + ((rowNum == null) ? 0 : rowNum.hashCode());
+ result = prime * result + ((uebKey == null) ? 0 : uebKey.hashCode());
+ result = prime * result + ((uebSecret == null) ? 0 : uebSecret.hashCode());
+ result = prime * result + ((uebTopicName == null) ? 0 : uebTopicName.hashCode());
+ result = prime * result + ((url == null) ? 0 : url.hashCode());
+ result = prime * result + ((username == null) ? 0 : username.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ CentralApp other = (CentralApp) obj;
+ if (alternateUrl == null) {
+ if (other.alternateUrl != null)
+ return false;
+ } else if (!alternateUrl.equals(other.alternateUrl))
+ return false;
+ if (appPassword == null) {
+ if (other.appPassword != null)
+ return false;
+ } else if (!appPassword.equals(other.appPassword))
+ return false;
+ if (createdId == null) {
+ if (other.createdId != null)
+ return false;
+ } else if (!createdId.equals(other.createdId))
+ return false;
+ if (description == null) {
+ if (other.description != null)
+ return false;
+ } else if (!description.equals(other.description))
+ return false;
+ if (enabled == null) {
+ if (other.enabled != null)
+ return false;
+ } else if (!enabled.equals(other.enabled))
+ return false;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ if (imageUrl == null) {
+ if (other.imageUrl != null)
+ return false;
+ } else if (!imageUrl.equals(other.imageUrl))
+ return false;
+ if (mlAppAdminId == null) {
+ if (other.mlAppAdminId != null)
+ return false;
+ } else if (!mlAppAdminId.equals(other.mlAppAdminId))
+ return false;
+ if (mlAppName == null) {
+ if (other.mlAppName != null)
+ return false;
+ } else if (!mlAppName.equals(other.mlAppName))
+ return false;
+ if (modifiedId == null) {
+ if (other.modifiedId != null)
+ return false;
+ } else if (!modifiedId.equals(other.modifiedId))
+ return false;
+ if (motsId == null) {
+ if (other.motsId != null)
+ return false;
+ } else if (!motsId.equals(other.motsId))
+ return false;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ if (notes == null) {
+ if (other.notes != null)
+ return false;
+ } else if (!notes.equals(other.notes))
+ return false;
+ if (open == null) {
+ if (other.open != null)
+ return false;
+ } else if (!open.equals(other.open))
+ return false;
+ if (restEndpoint == null) {
+ if (other.restEndpoint != null)
+ return false;
+ } else if (!restEndpoint.equals(other.restEndpoint))
+ return false;
+ if (rowNum == null) {
+ if (other.rowNum != null)
+ return false;
+ } else if (!rowNum.equals(other.rowNum))
+ return false;
+ if (uebKey == null) {
+ if (other.uebKey != null)
+ return false;
+ } else if (!uebKey.equals(other.uebKey))
+ return false;
+ if (uebSecret == null) {
+ if (other.uebSecret != null)
+ return false;
+ } else if (!uebSecret.equals(other.uebSecret))
+ return false;
+ if (uebTopicName == null) {
+ if (other.uebTopicName != null)
+ return false;
+ } else if (!uebTopicName.equals(other.uebTopicName))
+ return false;
+ if (url == null) {
+ if (other.url != null)
+ return false;
+ } else if (!url.equals(other.url))
+ return false;
+ if (username == null) {
+ if (other.username != null)
+ return false;
+ } else if (!username.equals(other.username))
+ return false;
+ return true;
+ }
+
}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralAppTest.java
index c56fa46..bf5a275 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralAppTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralAppTest.java
@@ -38,337 +38,398 @@
package org.onap.portalapp.portal.transport;
import static org.junit.Assert.*;
-
import java.util.Date;
-
import org.junit.Test;
-import org.onap.portalapp.portal.transport.CentralApp;
public class CentralAppTest {
-
- CentralApp centralApp=new CentralApp();
- private static final String TEST="test";
- public CentralApp mockCentralApp(){
- CentralApp centralApp = new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, TEST, TEST, TEST, TEST, TEST, TEST, TEST, TEST, TEST,
- TEST, TEST, TEST, TEST, null, TEST, TEST, TEST, TEST);
- return centralApp;
- }
-
- @Test
- public void centralAppTest(){
- CentralApp centralApp = mockCentralApp();
-
- CentralApp centralApp1 = buildCentralApp();
-
- assertEquals(centralApp.getId(), new Long(1));
- assertEquals(centralApp.getCreatedId(), new Long(1));
- assertEquals(centralApp.getModifiedId(), new Long(1));
- assertEquals(centralApp.getRowNum(), new Long(1));
- assertEquals(centralApp.getName(), TEST);
- assertEquals(centralApp.getImageUrl(), TEST);
- assertEquals(centralApp.getDescription(), TEST);
- assertEquals(centralApp.getNotes(), TEST);
- assertEquals(centralApp.getUrl(), TEST);
- assertEquals(centralApp.getAlternateUrl(), TEST);
- assertEquals(centralApp.getRestEndpoint(), TEST);
- assertEquals(centralApp.getMlAppName(), TEST);
- assertEquals(centralApp.getMlAppAdminId(), TEST);
- assertEquals(centralApp.getMotsId(), TEST);
- assertEquals(centralApp.getAppPassword(), TEST);
- assertEquals(centralApp.getOpen(), TEST);
- assertEquals(centralApp.getEnabled(), TEST);
- assertEquals(centralApp.getUsername(), TEST);
- assertEquals(centralApp.getUebKey(), TEST);
- assertEquals(centralApp.getUebSecret(), TEST);
- assertEquals(centralApp.getUebTopicName(), TEST);
-
- assertTrue(centralApp.equals(centralApp1));
- assertEquals(centralApp.hashCode(), centralApp1.hashCode());
- }
-
- private CentralApp buildCentralApp() {
- CentralApp centralApp = new CentralApp();
- centralApp.setId(1l);
- centralApp.setCreatedId(1l);
- centralApp.setModifiedId(1l);
- centralApp.setRowNum(1l);
- centralApp.setName(TEST);
- centralApp.setImageUrl(TEST);
- centralApp.setDescription(TEST);
- centralApp.setNotes(TEST);
- centralApp.setUrl(TEST);
- centralApp.setAlternateUrl(TEST);
- centralApp.setRestEndpoint(TEST);
- centralApp.setMlAppAdminId(TEST);
- centralApp.setMlAppName(TEST);
- centralApp.setMotsId(TEST);
- centralApp.setAppPassword(TEST);
- centralApp.setOpen(TEST);
- centralApp.setEnabled(TEST);
- centralApp.setUsername(TEST);
- centralApp.setUebKey(TEST);
- centralApp.setUebSecret(TEST);
- centralApp.setUebTopicName(TEST);
-
-
-
-
-
-
-
-
- return centralApp;
-
- }
-
-
- @Test
- public void unt_IdTest(){
- Long defaultValue=123L;
- centralApp.setId(defaultValue);
- assertEquals(defaultValue, centralApp.getId());
- }
-
- @Test
- public void unt_createdTest(){
- Date defaultValue=new Date();
- centralApp.setCreated(defaultValue);
- assertEquals(defaultValue, centralApp.getCreated());
- }
-
- @Test
- public void unt_modifiedTest(){
- Date defaultValue=new Date();
- centralApp.setCreated(defaultValue);
- assertEquals(defaultValue, centralApp.getCreated());
- }
-
- @Test
- public void unt_craetedIdTest(){
- Long defaultValue=123L;
- centralApp.setCreatedId(defaultValue);
- assertEquals(defaultValue, centralApp.getCreatedId());
- }
-
- @Test
- public void unt_modifiedIdTest(){
- Long defaultValue=123L;
- centralApp.setModifiedId(defaultValue);
- assertEquals(defaultValue, centralApp.getModifiedId());
- }
-
- @Test
- public void unt_rowNumTest(){
- Long defaultValue=123L;
- centralApp.setRowNum(defaultValue);
- assertEquals(defaultValue, centralApp.getRowNum());
- }
-
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().createCentralApp();
- @Test
- public void unt_nameTest(){
- String defaultValue="test";
- centralApp.setName(defaultValue);
- assertEquals(defaultValue, centralApp.getName());
- }
-
- @Test
- public void unt_ImageUrlTest(){
- String defaultValue="test";
- centralApp.setImageUrl(defaultValue);
- assertEquals(defaultValue, centralApp.getImageUrl());
- }
-
- @Test
- public void unt_descriptionTest(){
- String defaultValue="test";
- centralApp.setDescription(defaultValue);
- assertEquals(defaultValue, centralApp.getDescription());
- }
-
- @Test
- public void unt_notesTest(){
- String defaultValue="test";
- centralApp.setNotes(defaultValue);
- assertEquals(defaultValue, centralApp.getNotes());
- }
-
- @Test
- public void unt_urlTest(){
- String defaultValue="testUrl";
- centralApp.setUrl(defaultValue);
- assertEquals(defaultValue, centralApp.getUrl());
- }
-
- @Test
- public void unt_alternateUrlTest(){
- String defaultValue="testUrl";
- centralApp.setAlternateUrl(defaultValue);
- assertEquals(defaultValue, centralApp.getAlternateUrl());
- }
-
- @Test
- public void unt_restendpointTest(){
- String defaultValue="testUrl";
- centralApp.setRestEndpoint(defaultValue);
- assertEquals(defaultValue, centralApp.getRestEndpoint());
- }
-
- @Test
- public void unt_mlAppNameTest(){
- String defaultValue="testAppName";
- centralApp.setMlAppName(defaultValue);
- assertEquals(defaultValue, centralApp.getMlAppName());
- }
-
- @Test
- public void unt_mlAppAdminIdTest(){
- String defaultValue="testAppAdminId";
- centralApp.setMlAppAdminId(defaultValue);
- assertEquals(defaultValue, centralApp.getMlAppAdminId());
- }
-
- @Test
- public void unt_motsIdIdTest(){
- String defaultValue="testmotsid";
- centralApp.setMotsId(defaultValue);
- assertEquals(defaultValue, centralApp.getMotsId());
- }
-
- @Test
- public void unt_appPasswordTest(){
- String defaultValue="TestAppPassword";
- centralApp.setAppPassword(defaultValue);
- assertEquals(defaultValue, centralApp.getAppPassword());
- }
-
- @Test
- public void unt_openTest(){
- String defaultValue="Testopen";
- centralApp.setOpen(defaultValue);
- assertEquals(defaultValue, centralApp.getOpen());
- }
-
- @Test
- public void unt_enabledTest(){
- String defaultValue="Testenable";
- centralApp.setEnabled(defaultValue);
- assertEquals(defaultValue, centralApp.getEnabled());
- }
-
- @Test
- public void unt_thumbnailTest(){
- byte[] defaultValue={1,2,3};
- centralApp.setThumbnail(defaultValue);
- assertEquals(defaultValue, centralApp.getThumbnail());
- }
-
- @Test
- public void unt_userNameTest(){
- String defaultValue="Testusername";
- centralApp.setUsername(defaultValue);
- assertEquals(defaultValue, centralApp.getUsername());
- }
-
- @Test
- public void unt_uebKeyTest(){
- String defaultValue="Testuebkey";
- centralApp.setUebKey(defaultValue);
- assertEquals(defaultValue, centralApp.getUebKey());
- }
-
- @Test
- public void unt_uebSecreteTest(){
- String defaultValue="Testuebscrete";
- centralApp.setUebSecret(defaultValue);
- assertEquals(defaultValue, centralApp.getUebSecret());
- }
-
- @Test
- public void unt_uebTopicNameTest(){
- String defaultValue="Testuebtopicname";
- centralApp.setUebTopicName(defaultValue);
- assertEquals(defaultValue, centralApp.getUebTopicName());
- }
-
- @Test
- public void unt_hashCodeWithNullTest(){
- CentralApp centralApp=new CentralApp(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
-
- CentralApp centralApp1=new CentralApp(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+ private static final String TEST = "test";
- assertEquals(centralApp.hashCode(), centralApp1.hashCode());
- assertTrue(centralApp.equals(centralApp1));
-
- }
-
- @Test
- public void unt_hashCodeTest(){
- CentralApp centralApp=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
-
- CentralApp centralApp1=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
+ public CentralApp mockCentralApp() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName(TEST).setImageUrl(TEST)
+ .setDescription(TEST).setNotes(TEST).setUrl(TEST).setAlternateUrl(TEST).setRestEndpoint(TEST)
+ .setMlAppName(TEST).setMlAppAdminId(TEST).setMotsId(TEST).setAppPassword(TEST).setOpen(TEST)
+ .setEnabled(TEST).setThumbnail(null).setUsername(TEST).setUebKey(TEST).setUebSecret(TEST)
+ .setUebTopicName(TEST).createCentralApp();
+ return centralApp;
+ }
- assertEquals(centralApp.hashCode(), centralApp1.hashCode());
- assertTrue(centralApp.equals(centralApp1));
-
- }
-
- @Test
- public void unt_hashCodeTestWithNull(){
- CentralApp centralApp=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
- CentralApp centralApp1=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
- assertEquals(centralApp.hashCode(), centralApp1.hashCode());
- assertFalse(centralApp.equals(null));
-
- }
-
- @Test
- public void unt_hashCodeTestWithNull1(){
- CentralApp centralApp=new CentralApp(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
- CentralApp centralApp1=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
- assertFalse(centralApp.equals(centralApp1));
-
- }
-
- @Test
- public void unt_hashCodeTestWithalternateURL(){
- CentralApp centralApp=new CentralApp(null, null, null, null, null, null, null, null, null, null, null, "test1", null, null, null, null, null, null, null, null, null, null, null, null);
- CentralApp centralApp1=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
- assertFalse(centralApp.equals(centralApp1));
-
- }
-
- @Test
- public void unt_hashCodeTestWithpassword(){
- CentralApp centralApp=new CentralApp(null, null, null, null, null, null, null, null, null, null, null, "test", null, null, null, null, "testPass", null, null, null, null, null, null, null);
- CentralApp centralApp1=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
- assertFalse(centralApp.equals(centralApp1));
-
- }
-
- @Test
- public void unt_hashCodeTestWithcreateId(){
- CentralApp centralApp=new CentralApp(null, null, null, 123L, null, null, null, null, null, null, null, "test", null, null, null, null, "test", null, null, null, null, null, null, null);
- CentralApp centralApp1=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
- assertFalse(centralApp.equals(centralApp1));
-
- }
-
- @Test
- public void unt_hashCodeTestWithcreateId1(){
- CentralApp centralApp=new CentralApp(12L, null, null, 123L, 123L, 123L, "test1", "test1", "test1", "test1", "test1", "test", "tests1", "test1", "test1", null, "test", null, null, null, null, null, null, null);
- CentralApp centralApp1=new CentralApp((long)1, null, null, (long)1, (long)1, (long)1, "test", "test", "test", "test", "test", "test", "test", "test", "test",
- "test", "test", "test", "test", null, "test", "test", "test", "test");
- assertFalse(centralApp.equals(centralApp1));
-
- }
+ @Test
+ public void centralAppTest() {
+ CentralApp centralApp = mockCentralApp();
+
+ CentralApp centralApp1 = buildCentralApp();
+
+ assertEquals(centralApp.getId(), new Long(1));
+ assertEquals(centralApp.getCreatedId(), new Long(1));
+ assertEquals(centralApp.getModifiedId(), new Long(1));
+ assertEquals(centralApp.getRowNum(), new Long(1));
+ assertEquals(centralApp.getName(), TEST);
+ assertEquals(centralApp.getImageUrl(), TEST);
+ assertEquals(centralApp.getDescription(), TEST);
+ assertEquals(centralApp.getNotes(), TEST);
+ assertEquals(centralApp.getUrl(), TEST);
+ assertEquals(centralApp.getAlternateUrl(), TEST);
+ assertEquals(centralApp.getRestEndpoint(), TEST);
+ assertEquals(centralApp.getMlAppName(), TEST);
+ assertEquals(centralApp.getMlAppAdminId(), TEST);
+ assertEquals(centralApp.getMotsId(), TEST);
+ assertEquals(centralApp.getAppPassword(), TEST);
+ assertEquals(centralApp.getOpen(), TEST);
+ assertEquals(centralApp.getEnabled(), TEST);
+ assertEquals(centralApp.getUsername(), TEST);
+ assertEquals(centralApp.getUebKey(), TEST);
+ assertEquals(centralApp.getUebSecret(), TEST);
+ assertEquals(centralApp.getUebTopicName(), TEST);
+
+ assertTrue(centralApp.equals(centralApp1));
+ assertEquals(centralApp.hashCode(), centralApp1.hashCode());
+ }
+
+ private CentralApp buildCentralApp() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().createCentralApp();
+ centralApp.setId(1l);
+ centralApp.setCreatedId(1l);
+ centralApp.setModifiedId(1l);
+ centralApp.setRowNum(1l);
+ centralApp.setName(TEST);
+ centralApp.setImageUrl(TEST);
+ centralApp.setDescription(TEST);
+ centralApp.setNotes(TEST);
+ centralApp.setUrl(TEST);
+ centralApp.setAlternateUrl(TEST);
+ centralApp.setRestEndpoint(TEST);
+ centralApp.setMlAppAdminId(TEST);
+ centralApp.setMlAppName(TEST);
+ centralApp.setMotsId(TEST);
+ centralApp.setAppPassword(TEST);
+ centralApp.setOpen(TEST);
+ centralApp.setEnabled(TEST);
+ centralApp.setUsername(TEST);
+ centralApp.setUebKey(TEST);
+ centralApp.setUebSecret(TEST);
+ centralApp.setUebTopicName(TEST);
+ return centralApp;
+ }
+
+ @Test
+ public void unt_IdTest() {
+ Long defaultValue = 123L;
+ centralApp.setId(defaultValue);
+ assertEquals(defaultValue, centralApp.getId());
+ }
+
+ @Test
+ public void unt_createdTest() {
+ Date defaultValue = new Date();
+ centralApp.setCreated(defaultValue);
+ assertEquals(defaultValue, centralApp.getCreated());
+ }
+
+ @Test
+ public void unt_modifiedTest() {
+ Date defaultValue = new Date();
+ centralApp.setCreated(defaultValue);
+ assertEquals(defaultValue, centralApp.getCreated());
+ }
+
+ @Test
+ public void unt_craetedIdTest() {
+ Long defaultValue = 123L;
+ centralApp.setCreatedId(defaultValue);
+ assertEquals(defaultValue, centralApp.getCreatedId());
+ }
+
+ @Test
+ public void unt_modifiedIdTest() {
+ Long defaultValue = 123L;
+ centralApp.setModifiedId(defaultValue);
+ assertEquals(defaultValue, centralApp.getModifiedId());
+ }
+
+ @Test
+ public void unt_rowNumTest() {
+ Long defaultValue = 123L;
+ centralApp.setRowNum(defaultValue);
+ assertEquals(defaultValue, centralApp.getRowNum());
+ }
+
+ @Test
+ public void unt_nameTest() {
+ String defaultValue = "test";
+ centralApp.setName(defaultValue);
+ assertEquals(defaultValue, centralApp.getName());
+ }
+
+ @Test
+ public void unt_ImageUrlTest() {
+ String defaultValue = "test";
+ centralApp.setImageUrl(defaultValue);
+ assertEquals(defaultValue, centralApp.getImageUrl());
+ }
+
+ @Test
+ public void unt_descriptionTest() {
+ String defaultValue = "test";
+ centralApp.setDescription(defaultValue);
+ assertEquals(defaultValue, centralApp.getDescription());
+ }
+
+ @Test
+ public void unt_notesTest() {
+ String defaultValue = "test";
+ centralApp.setNotes(defaultValue);
+ assertEquals(defaultValue, centralApp.getNotes());
+ }
+
+ @Test
+ public void unt_urlTest() {
+ String defaultValue = "testUrl";
+ centralApp.setUrl(defaultValue);
+ assertEquals(defaultValue, centralApp.getUrl());
+ }
+
+ @Test
+ public void unt_alternateUrlTest() {
+ String defaultValue = "testUrl";
+ centralApp.setAlternateUrl(defaultValue);
+ assertEquals(defaultValue, centralApp.getAlternateUrl());
+ }
+
+ @Test
+ public void unt_restendpointTest() {
+ String defaultValue = "testUrl";
+ centralApp.setRestEndpoint(defaultValue);
+ assertEquals(defaultValue, centralApp.getRestEndpoint());
+ }
+
+ @Test
+ public void unt_mlAppNameTest() {
+ String defaultValue = "testAppName";
+ centralApp.setMlAppName(defaultValue);
+ assertEquals(defaultValue, centralApp.getMlAppName());
+ }
+
+ @Test
+ public void unt_mlAppAdminIdTest() {
+ String defaultValue = "testAppAdminId";
+ centralApp.setMlAppAdminId(defaultValue);
+ assertEquals(defaultValue, centralApp.getMlAppAdminId());
+ }
+
+ @Test
+ public void unt_motsIdIdTest() {
+ String defaultValue = "testmotsid";
+ centralApp.setMotsId(defaultValue);
+ assertEquals(defaultValue, centralApp.getMotsId());
+ }
+
+ @Test
+ public void unt_appPasswordTest() {
+ String defaultValue = "TestAppPassword";
+ centralApp.setAppPassword(defaultValue);
+ assertEquals(defaultValue, centralApp.getAppPassword());
+ }
+
+ @Test
+ public void unt_openTest() {
+ String defaultValue = "Testopen";
+ centralApp.setOpen(defaultValue);
+ assertEquals(defaultValue, centralApp.getOpen());
+ }
+
+ @Test
+ public void unt_enabledTest() {
+ String defaultValue = "Testenable";
+ centralApp.setEnabled(defaultValue);
+ assertEquals(defaultValue, centralApp.getEnabled());
+ }
+
+ @Test
+ public void unt_thumbnailTest() {
+ byte[] defaultValue = { 1, 2, 3 };
+ centralApp.setThumbnail(defaultValue);
+ assertEquals(defaultValue, centralApp.getThumbnail());
+ }
+
+ @Test
+ public void unt_userNameTest() {
+ String defaultValue = "Testusername";
+ centralApp.setUsername(defaultValue);
+ assertEquals(defaultValue, centralApp.getUsername());
+ }
+
+ @Test
+ public void unt_uebKeyTest() {
+ String defaultValue = "Testuebkey";
+ centralApp.setUebKey(defaultValue);
+ assertEquals(defaultValue, centralApp.getUebKey());
+ }
+
+ @Test
+ public void unt_uebSecreteTest() {
+ String defaultValue = "Testuebscrete";
+ centralApp.setUebSecret(defaultValue);
+ assertEquals(defaultValue, centralApp.getUebSecret());
+ }
+
+ @Test
+ public void unt_uebTopicNameTest() {
+ String defaultValue = "Testuebtopicname";
+ centralApp.setUebTopicName(defaultValue);
+ assertEquals(defaultValue, centralApp.getUebTopicName());
+ }
+
+ @Test
+ public void unt_hashCodeWithNullTest() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId(null).setCreated(null).setModified(null)
+ .setCreatedId(null).setModifiedId(null).setRowNum(null).setName(null).setImageUrl(null)
+ .setDescription(null).setNotes(null).setUrl(null).setAlternateUrl(null).setRestEndpoint(null)
+ .setMlAppName(null).setMlAppAdminId(null).setMotsId(null).setAppPassword(null).setOpen(null)
+ .setEnabled(null).setThumbnail(null).setUsername(null).setUebKey(null).setUebSecret(null)
+ .setUebTopicName(null).createCentralApp();
+
+ CentralApp centralApp1 = new CentralApp.CentralAppBuilder().setId(null).setCreated(null).setModified(null)
+ .setCreatedId(null).setModifiedId(null).setRowNum(null).setName(null).setImageUrl(null)
+ .setDescription(null).setNotes(null).setUrl(null).setAlternateUrl(null).setRestEndpoint(null)
+ .setMlAppName(null).setMlAppAdminId(null).setMotsId(null).setAppPassword(null).setOpen(null)
+ .setEnabled(null).setThumbnail(null).setUsername(null).setUebKey(null).setUebSecret(null)
+ .setUebTopicName(null).createCentralApp();
+
+ assertEquals(centralApp.hashCode(), centralApp1.hashCode());
+ assertTrue(centralApp.equals(centralApp1));
+
+ }
+
+ @Test
+ public void unt_hashCodeTest() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+
+ CentralApp centralApp1 = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+
+ assertEquals(centralApp.hashCode(), centralApp1.hashCode());
+ assertTrue(centralApp.equals(centralApp1));
+
+ }
+
+ @Test
+ public void unt_hashCodeTestWithNull() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+ CentralApp centralApp1 = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+ assertEquals(centralApp.hashCode(), centralApp1.hashCode());
+ assertFalse(centralApp.equals(null));
+
+ }
+
+ @Test
+ public void unt_hashCodeTestWithNull1() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId(null).setCreated(null).setModified(null)
+ .setCreatedId(null).setModifiedId(null).setRowNum(null).setName(null).setImageUrl(null)
+ .setDescription(null).setNotes(null).setUrl(null).setAlternateUrl(null).setRestEndpoint(null)
+ .setMlAppName(null).setMlAppAdminId(null).setMotsId(null).setAppPassword(null).setOpen(null)
+ .setEnabled(null).setThumbnail(null).setUsername(null).setUebKey(null).setUebSecret(null)
+ .setUebTopicName(null).createCentralApp();
+ CentralApp centralApp1 = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+ assertFalse(centralApp.equals(centralApp1));
+
+ }
+
+ @Test
+ public void unt_hashCodeTestWithalternateURL() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId(null).setCreated(null).setModified(null)
+ .setCreatedId(null).setModifiedId(null).setRowNum(null).setName(null).setImageUrl(null)
+ .setDescription(null).setNotes(null).setUrl(null).setAlternateUrl("test1").setRestEndpoint(null)
+ .setMlAppName(null).setMlAppAdminId(null).setMotsId(null).setAppPassword(null).setOpen(null)
+ .setEnabled(null).setThumbnail(null).setUsername(null).setUebKey(null).setUebSecret(null)
+ .setUebTopicName(null).createCentralApp();
+ CentralApp centralApp1 = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+ assertFalse(centralApp.equals(centralApp1));
+
+ }
+
+ @Test
+ public void unt_hashCodeTestWithpassword() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId(null).setCreated(null).setModified(null)
+ .setCreatedId(null).setModifiedId(null).setRowNum(null).setName(null).setImageUrl(null)
+ .setDescription(null).setNotes(null).setUrl(null).setAlternateUrl("test").setRestEndpoint(null)
+ .setMlAppName(null).setMlAppAdminId(null).setMotsId(null).setAppPassword("testPass").setOpen(null)
+ .setEnabled(null).setThumbnail(null).setUsername(null).setUebKey(null).setUebSecret(null)
+ .setUebTopicName(null).createCentralApp();
+ CentralApp centralApp1 = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+ assertFalse(centralApp.equals(centralApp1));
+
+ }
+
+ @Test
+ public void unt_hashCodeTestWithcreateId() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId(null).setCreated(null).setModified(null)
+ .setCreatedId(123L).setModifiedId(null).setRowNum(null).setName(null).setImageUrl(null)
+ .setDescription(null).setNotes(null).setUrl(null).setAlternateUrl("test").setRestEndpoint(null)
+ .setMlAppName(null).setMlAppAdminId(null).setMotsId(null).setAppPassword("test").setOpen(null)
+ .setEnabled(null).setThumbnail(null).setUsername(null).setUebKey(null).setUebSecret(null)
+ .setUebTopicName(null).createCentralApp();
+ CentralApp centralApp1 = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+ assertFalse(centralApp.equals(centralApp1));
+
+ }
+
+ @Test
+ public void unt_hashCodeTestWithcreateId1() {
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().setId(12L).setCreated(null).setModified(null)
+ .setCreatedId(123L).setModifiedId(123L).setRowNum(123L).setName("test1").setImageUrl("test1")
+ .setDescription("test1").setNotes("test1").setUrl("test1").setAlternateUrl("test")
+ .setRestEndpoint("tests1").setMlAppName("test1").setMlAppAdminId("test1").setMotsId(null)
+ .setAppPassword("test").setOpen(null).setEnabled(null).setThumbnail(null).setUsername(null)
+ .setUebKey(null).setUebSecret(null).setUebTopicName(null).createCentralApp();
+ CentralApp centralApp1 = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId((long) 1).setModifiedId((long) 1).setRowNum((long) 1).setName("test").setImageUrl("test")
+ .setDescription("test").setNotes("test").setUrl("test").setAlternateUrl("test").setRestEndpoint("test")
+ .setMlAppName("test").setMlAppAdminId("test").setMotsId("test").setAppPassword("test").setOpen("test")
+ .setEnabled("test").setThumbnail(null).setUsername("test").setUebKey("test").setUebSecret("test")
+ .setUebTopicName("test").createCentralApp();
+ assertFalse(centralApp.equals(centralApp1));
+ }
}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
index a41cbd8..57b1ab7 100644
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/transport/CentralUserAppTest.java
@@ -40,55 +40,56 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-
import org.junit.Test;
public class CentralUserAppTest {
-
- private static final Long ID=1l;
- private static final String TEST="test";
-
- private CentralUserApp buildCentralUserApp() {
- CentralUserApp app=new CentralUserApp();
- app.setUserId(ID);
- app.setPriority((Integer)1);
- CentralApp centralApp=new CentralApp();
- centralApp.setName(TEST);
- CentralRole role= new CentralRole.CentralRoleBuilder().createCentralRole();
- role.setName(TEST);
- app.setApp(centralApp);
- app.setRole(role);
-
- return app;
- }
-
-
- @Test
- public void test() {
- CentralUserApp app1=buildCentralUserApp();
- CentralUserApp app=new CentralUserApp();
- app.setApp(app1.getApp());
- app.setPriority(app1.getPriority());
- app.setRole(app1.getRole());
- app.setUserId(app1.getUserId());
- assertEquals(app.hashCode(), app1.hashCode());
- app.compareTo(app1);
- assertTrue(app.equals(app1));
- assertFalse(app.equals(null));
- app.setRole(null);
- assertFalse(app.equals(app1));
- app.setRole(app1.getRole());
- app.getRole().setName("test2");
-
- assertTrue(app.equals(app1));
-
- }
+
+ private static final Long ID = 1l;
+ private static final String TEST = "test";
+
+ private CentralUserApp buildCentralUserApp() {
+ CentralUserApp app = new CentralUserApp();
+ app.setUserId(ID);
+ app.setPriority((Integer) 1);
+ CentralApp centralApp = new CentralApp.CentralAppBuilder().createCentralApp();
+ centralApp.setName(TEST);
+ CentralRole role = new CentralRole.CentralRoleBuilder().createCentralRole();
+ role.setName(TEST);
+ app.setApp(centralApp);
+ app.setRole(role);
+
+ return app;
+ }
+
+ @Test
+ public void test() {
+ CentralUserApp app1 = buildCentralUserApp();
+ CentralUserApp app = new CentralUserApp();
+ app.setApp(app1.getApp());
+ app.setPriority(app1.getPriority());
+ app.setRole(app1.getRole());
+ app.setUserId(app1.getUserId());
+ assertEquals(app.hashCode(), app1.hashCode());
+ app.compareTo(app1);
+ assertTrue(app.equals(app1));
+ assertFalse(app.equals(null));
+ app.setRole(null);
+ assertFalse(app.equals(app1));
+ app.setRole(app1.getRole());
+ app.getRole().setName("test2");
+
+ assertTrue(app.equals(app1));
+ }
public CentralV2UserApp mockCentralUserApp() {
CentralV2UserApp centralV2UserApp = new CentralV2UserApp();
- CentralApp app = new CentralApp((long) 1, null, null, ID, ID, ID, TEST, TEST, TEST, TEST, TEST, TEST, TEST,
- TEST, TEST, TEST, TEST, TEST, TEST, null, TEST, TEST, TEST, TEST);
+ CentralApp app = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId(ID).setModifiedId(ID).setRowNum(ID).setName(TEST).setImageUrl(TEST).setDescription(TEST)
+ .setNotes(TEST).setUrl(TEST).setAlternateUrl(TEST).setRestEndpoint(TEST).setMlAppName(TEST)
+ .setMlAppAdminId(TEST).setMotsId(TEST).setAppPassword(TEST).setOpen(TEST).setEnabled(TEST)
+ .setThumbnail(null).setUsername(TEST).setUebKey(TEST).setUebSecret(TEST).setUebTopicName(TEST)
+ .createCentralApp();
CentralV2Role role = new CentralV2Role();
@@ -99,16 +100,17 @@
return centralV2UserApp;
}
-
-
-
- @Test
+
+ @Test
public void centralUserAppTest() {
CentralV2UserApp centralV2UserApp = mockCentralUserApp();
- CentralApp app1 = new CentralApp((long) 1, null, null, ID, ID, ID, TEST, TEST, TEST, TEST, TEST, TEST, TEST,
- TEST, TEST, TEST, TEST, TEST, TEST, null, TEST, TEST, TEST, TEST);
-
+ CentralApp app1 = new CentralApp.CentralAppBuilder().setId((long) 1).setCreated(null).setModified(null)
+ .setCreatedId(ID).setModifiedId(ID).setRowNum(ID).setName(TEST).setImageUrl(TEST).setDescription(TEST)
+ .setNotes(TEST).setUrl(TEST).setAlternateUrl(TEST).setRestEndpoint(TEST).setMlAppName(TEST)
+ .setMlAppAdminId(TEST).setMotsId(TEST).setAppPassword(TEST).setOpen(TEST).setEnabled(TEST)
+ .setThumbnail(null).setUsername(TEST).setUebKey(TEST).setUebSecret(TEST).setUebTopicName(TEST)
+ .createCentralApp();
CentralV2Role role1 = new CentralV2Role();
@@ -119,29 +121,28 @@
}
@Test
- public void centralUserAppEqualsTest(){
- CentralV2UserApp centralV2UserApp = mockCentralUserApp();
- CentralV2UserApp centralV2UserApp2 = mockCentralUserApp();
+ public void centralUserAppEqualsTest() {
+ CentralV2UserApp centralV2UserApp = mockCentralUserApp();
+ CentralV2UserApp centralV2UserApp2 = mockCentralUserApp();
- assertTrue(centralV2UserApp.equals(centralV2UserApp));
- assertTrue(centralV2UserApp.equals(centralV2UserApp2));
- assertFalse(centralV2UserApp.equals(new Long(1)));
- centralV2UserApp2.setPriority(213);
- assertFalse(centralV2UserApp.equals(centralV2UserApp2));
- }
-
- @Test
- public void unt_hashCodeTest(){
- AppCatalogPersonalization appCatalogPersonalization=new AppCatalogPersonalization();
- appCatalogPersonalization.setAppId(123L);
- appCatalogPersonalization.setPending(true);
- appCatalogPersonalization.setSelect(true);
- AppCatalogPersonalization appCatalogPersonalization1 = new AppCatalogPersonalization();
- appCatalogPersonalization1.setAppId(123L);
- appCatalogPersonalization1.setPending(true);
- appCatalogPersonalization1.setSelect(true);
- assertEquals(appCatalogPersonalization.hashCode(), appCatalogPersonalization1.hashCode());
- assertTrue(appCatalogPersonalization.equals(appCatalogPersonalization1));
-
- }
+ assertTrue(centralV2UserApp.equals(centralV2UserApp));
+ assertTrue(centralV2UserApp.equals(centralV2UserApp2));
+ assertFalse(centralV2UserApp.equals(new Long(1)));
+ centralV2UserApp2.setPriority(213);
+ assertFalse(centralV2UserApp.equals(centralV2UserApp2));
+ }
+
+ @Test
+ public void unt_hashCodeTest() {
+ AppCatalogPersonalization appCatalogPersonalization = new AppCatalogPersonalization();
+ appCatalogPersonalization.setAppId(123L);
+ appCatalogPersonalization.setPending(true);
+ appCatalogPersonalization.setSelect(true);
+ AppCatalogPersonalization appCatalogPersonalization1 = new AppCatalogPersonalization();
+ appCatalogPersonalization1.setAppId(123L);
+ appCatalogPersonalization1.setPending(true);
+ appCatalogPersonalization1.setSelect(true);
+ assertEquals(appCatalogPersonalization.hashCode(), appCatalogPersonalization1.hashCode());
+ assertTrue(appCatalogPersonalization.equals(appCatalogPersonalization1));
+ }
}