Merge 'origin/casablanca' into master

[so.git] / mso-catalog-db / src / main / java / org / onap / so / db / catalog / beans / CloudIdentity.java

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java
index e6d02c6..bb01f6f 100644 (file)
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/CloudIdentity.java
@@ -71,6 +71,16 @@ public class CloudIdentity {
     @Column(name = "MSO_PASS")
     private String msoPass;
     
+    @JsonProperty("project_domain_name")
+    @BusinessKey
+    @Column(name = "PROJECT_DOMAIN_NAME")
+    private String projectDomainName;
+    
+    @JsonProperty("user_domain_name")
+    @BusinessKey
+    @Column(name = "USER_DOMAIN_NAME")
+    private String userDomainName;
+    
     @JsonProperty("admin_tenant")
     @BusinessKey
     @Column(name = "ADMIN_TENANT")
@@ -225,6 +235,21 @@ public class CloudIdentity {
                this.identityAuthenticationType = identityAuthenticationType;
        }
 
+       public String getProjectDomainName() {
+               return projectDomainName;
+       }
+       
+       public void setProjectDomainName(String projectDomainName) {
+               this.projectDomainName = projectDomainName;
+       }
+       
+       public String getUserDomainName() {
+               return userDomainName;
+       }
+       
+       public void setUserDomainName(String userDomainName) {
+               this.userDomainName = userDomainName;
+       }
        @Override
        public CloudIdentity clone() {
                CloudIdentity cloudIdentityCopy = new CloudIdentity();
@@ -238,6 +263,8 @@ public class CloudIdentity {
                cloudIdentityCopy.tenantMetadata = this.tenantMetadata;
                cloudIdentityCopy.identityServerType = this.identityServerType;
                cloudIdentityCopy.identityAuthenticationType = this.identityAuthenticationType;
+               cloudIdentityCopy.projectDomainName = this.projectDomainName;
+               cloudIdentityCopy.userDomainName = this.userDomainName;
 
                return cloudIdentityCopy;
        }
@@ -246,6 +273,7 @@ public class CloudIdentity {
        public String toString() {
                return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("id", getId())
                                .append("identityUrl", getIdentityUrl()).append("msoId", getMsoId())
+                               .append("projectDomain", getProjectDomainName()).append("userDomain", getUserDomainName())
                                .append("adminTenant", getAdminTenant()).append("memberRole", getMemberRole())
                                .append("tenantMetadata", getTenantMetadata()).append("identityServerType", getIdentityServerType())
                                .append("identityAuthenticationType", getIdentityAuthenticationType()).toString();
@@ -263,6 +291,7 @@ public class CloudIdentity {
                return new EqualsBuilder().append(getId(), castOther.getId())
                                .append(getIdentityUrl(), castOther.getIdentityUrl()).append(getMsoId(), castOther.getMsoId())
                                .append(getMsoPass(), castOther.getMsoPass()).append(getAdminTenant(), castOther.getAdminTenant())
+                               .append(getProjectDomainName(), castOther.getProjectDomainName()).append(getUserDomainName(), castOther.getUserDomainName())
                                .append(getMemberRole(), castOther.getMemberRole())
                                .append(getTenantMetadata(), castOther.getTenantMetadata())
                                .append(getIdentityServerType(), castOther.getIdentityServerType())
@@ -272,7 +301,7 @@ public class CloudIdentity {
        @Override
        public int hashCode() {
                return new HashCodeBuilder(1, 31).append(getId()).append(getIdentityUrl()).append(getMsoId())
-                               .append(getMsoPass()).append(getAdminTenant()).append(getMemberRole()).append(getTenantMetadata())
+                               .append(getMsoPass()).append(getProjectDomainName()).append(getUserDomainName()).append(getAdminTenant()).append(getMemberRole()).append(getTenantMetadata())
                                .append(getIdentityServerType()).append(getIdentityAuthenticationType()).toHashCode();
        }
 }
\ No newline at end of file