Replaced all tabs with spaces in java and pom.xml

[so.git] / common / src / main / java / org / onap / so / serviceinstancebeans / CloudConfiguration.java

diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/CloudConfiguration.java b/common/src/main/java/org/onap/so/serviceinstancebeans/CloudConfiguration.java
index a58949e..4a284b5 100644 (file)
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/CloudConfiguration.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/CloudConfiguration.java
@@ -21,30 +21,31 @@
 package org.onap.so.serviceinstancebeans;
 
 import java.io.Serializable;
-
+import org.onap.so.constants.Defaults;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 @JsonRootName(value = "cloudConfiguration")
-@JsonInclude(Include.NON_DEFAULT)
+@JsonInclude(Include.NON_EMPTY)
 public class CloudConfiguration implements Serializable {
 
-       private static final long serialVersionUID = 6260165690180745471L;
-       @JsonProperty("aicNodeClli")
+    private static final long serialVersionUID = 6260165690180745471L;
+    @JsonProperty("aicNodeClli")
     protected String aicNodeClli;
-       @JsonProperty("tenantId")
+    @JsonProperty("tenantId")
     protected String tenantId;
-       @JsonProperty("lcpCloudRegionId")
+    @JsonProperty("cloudOwner")
+    protected String cloudOwner = Defaults.CLOUD_OWNER.toString();
+    @JsonProperty("lcpCloudRegionId")
     protected String lcpCloudRegionId;
 
     /**
      * Gets the value of the aicNodeClli property.
      *
-     * @return
-     *     possible object is
-     *     {@link String }
+     * @return possible object is {@link String }
      *
      */
     public String getAicNodeClli() {
@@ -54,9 +55,7 @@ public class CloudConfiguration implements Serializable {
     /**
      * Sets the value of the aicNodeClli property.
      *
-     * @param value
-     *     allowed object is
-     *     {@link String }
+     * @param value allowed object is {@link String }
      *
      */
     public void setAicNodeClli(String value) {
@@ -66,9 +65,7 @@ public class CloudConfiguration implements Serializable {
     /**
      * Gets the value of the tenantId property.
      *
-     * @return
-     *     possible object is
-     *     {@link String }
+     * @return possible object is {@link String }
      *
      */
     public String getTenantId() {
@@ -78,9 +75,7 @@ public class CloudConfiguration implements Serializable {
     /**
      * Sets the value of the tenantId property.
      *
-     * @param value
-     *     allowed object is
-     *     {@link String }
+     * @param value allowed object is {@link String }
      *
      */
     public void setTenantId(String value) {
@@ -88,19 +83,27 @@ public class CloudConfiguration implements Serializable {
     }
 
 
-       public String getLcpCloudRegionId() {
-               return lcpCloudRegionId;
-       }
+    public String getLcpCloudRegionId() {
+        return lcpCloudRegionId;
+    }
+
+    public void setLcpCloudRegionId(String lcpCloudRegionId) {
+        this.lcpCloudRegionId = lcpCloudRegionId;
+    }
+
+    public String getCloudOwner() {
+        return cloudOwner;
+    }
 
-       public void setLcpCloudRegionId(String lcpCloudRegionId) {
-               this.lcpCloudRegionId = lcpCloudRegionId;
-       }
+    public void setCloudOwner(String cloudOwner) {
+        this.cloudOwner = cloudOwner;
+    }
 
-       @Override
-       public String toString() {
-               return "CloudConfiguration [aicNodeClli=" + aicNodeClli + ", tenantId="
-                               + tenantId + ", lcpCloudRegionId=" + lcpCloudRegionId + "]";
-       }
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).append("aicNodeClli", getAicNodeClli()).append("tenantId", getTenantId())
+                .append("cloudOwner", getCloudOwner()).append("lcpCloudRegionId", getLcpCloudRegionId()).toString();
+    }
 
 
 }