KAA-876: Add missing Javadoc

server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/CredentialsDto.java

@@ -13,61 +13,47 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.kaaproject.kaa.common.dto.credentials;
 
 import java.io.Serializable;
 import java.util.Arrays;
 
 import org.kaaproject.kaa.common.dto.HasId;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * @author Bohdan Khablenko
  * @author Andrew Shvayka
  *
  * @since v0.9.0
  */
-@JsonInclude(Include.NON_NULL)
 public final class CredentialsDto implements HasId, Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1000L;
 
-    @JsonProperty("credentialsId")
     private String id;
-
-    @JsonProperty("credentials")
-    private byte[] credentials;
-
-    @JsonProperty("status")
+    private byte[] credentialsBody;
     private CredentialsStatus status;
-
-    public CredentialsDto() {
-        super();
-    }
 
     @Override
     public String getId() {
-        return id;
+        return this.id;
     }
 
-    @Override
     public void setId(String id) {
         this.id = id;
     }
 
-    public byte[] getCredentials() {
-        return credentials;
+    public byte[] getCredentialsBody() {
+        return this.credentialsBody;
     }
 
-    public void setCredentials(byte[] credentials) {
-        this.credentials = credentials;
+    public void setCredentialsBody(byte[] credentialsBody) {
+        this.credentialsBody = credentialsBody;
     }
 
     public CredentialsStatus getStatus() {
-        return status;
+        return this.status;
     }
 
     public void setStatus(CredentialsStatus status) {
@@ -78,36 +64,50 @@ public void setStatus(CredentialsStatus status) {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + Arrays.hashCode(credentials);
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        result = prime * result + ((status == null) ? 0 : status.hashCode());
+        result = prime * result + Arrays.hashCode(this.credentialsBody);
+        result = prime * result + ((this.id == null) ? 0 : this.id.hashCode());
+        result = prime * result + ((this.status == null) ? 0 : this.status.hashCode());
         return result;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
+        }
         CredentialsDto other = (CredentialsDto) obj;
-        if (!Arrays.equals(credentials, other.credentials))
+        if (!Arrays.equals(this.credentialsBody, other.credentialsBody)) {
             return false;
-        if (id == null) {
-            if (other.id != null)
+        }
+        if (this.id == null) {
+            if (other.id != null) {
                 return false;
-        } else if (!id.equals(other.id))
+            }
+        } else if (!this.id.equals(other.id)) {
             return false;
-        if (status != other.status)
+        }
+        if (this.status != other.status) {
             return false;
+        }
         return true;
     }
 
     @Override
     public String toString() {
-        return "CredentialsDto [id=" + id + ", credentials=" + Arrays.toString(credentials) + ", status=" + status + "]";
+        StringBuilder builder = new StringBuilder();
+        builder.append("CredentialsDto [id=");
+        builder.append(this.id);
+        builder.append(", credentialsBody=");
+        builder.append(Arrays.toString(this.credentialsBody));
+        builder.append(", status=");
+        builder.append(this.status);
+        builder.append("]");
+        return builder.toString();
     }
-
 }

server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/CredentialsStatus.java

@@ -13,14 +13,14 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.kaaproject.kaa.common.dto.credentials;
 
 /**
- * @author Bohdan Khablenko
  * @author Andrew Shvayka
  *
  * @since v0.9.0
  */
 public enum CredentialsStatus {
-    AVAILABLE, IN_USE, REVOKED; 
+    AVAILABLE, IN_USE, REVOKED;
 }

server/common/dto/src/main/java/org/kaaproject/kaa/common/dto/credentials/EndpointRegistrationInfoDto.java

@@ -13,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.kaaproject.kaa.common.dto.credentials;
 
 import java.io.Serializable;
@@ -21,75 +22,157 @@
 import org.kaaproject.kaa.common.dto.HasId;
 
 /**
- * @author Bohdan Khablenko
  * @author Andrew Shvayka
+ * @author Bohdan Khablenko
  *
  * @since v0.9.0
  */
-public class EndpointRegistrationInfoDto implements HasId, Serializable {
+public final class EndpointRegistrationInfoDto implements HasId, Serializable {
+
+    private static final long serialVersionUID = 1000L;
 
-    private static final long serialVersionUID = 1L;
-
     private String id;
-
     private String applicationId;
-
-    /**
-     * This is optional
-     */
-    private String credentialsId;
-
     private String endpointId;
-
+    private String credentialsId;
     private Integer serverProfileVersion;
-
     private String serverProfileBody;
 
+    @Override
     public String getId() {
-        return id;
+        return this.id;
     }
 
     public void setId(String id) {
         this.id = id;
     }
 
     public String getApplicationId() {
-        return applicationId;
+        return this.applicationId;
     }
 
     public void setApplicationId(String applicationId) {
         this.applicationId = applicationId;
     }
 
-    public String getCredentialsId() {
-        return credentialsId;
+    public String getEndpointId() {
+        return this.endpointId;
     }
 
-    public void setCredentialsId(String credentialsId) {
-        this.credentialsId = credentialsId;
+    public void setEndpointId(String endpointId) {
+        this.endpointId = endpointId;
     }
 
-    public String getEndpointId() {
-        return endpointId;
+    public Optional<String> getCredentialsId() {
+        return Optional.ofNullable(this.credentialsId);
     }
 
-    public void setEndpointId(String endpointId) {
-        this.endpointId = endpointId;
+    public void setCredentialsId(String credentialsId) {
+        this.credentialsId = credentialsId;
     }
 
     public Optional<Integer> getServerProfileVersion() {
-        return Optional.ofNullable(serverProfileVersion);
+        return Optional.ofNullable(this.serverProfileVersion);
     }
 
     public void setServerProfileVersion(Integer serverProfileVersion) {
         this.serverProfileVersion = serverProfileVersion;
     }
 
     public Optional<String> getServerProfileBody() {
-        return Optional.ofNullable(serverProfileBody);
+        return Optional.ofNullable(this.serverProfileBody);
     }
 
     public void setServerProfileBody(String serverProfileBody) {
         this.serverProfileBody = serverProfileBody;
     }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((this.applicationId == null) ? 0 : this.applicationId.hashCode());
+        result = prime * result + ((this.credentialsId == null) ? 0 : this.credentialsId.hashCode());
+        result = prime * result + ((this.endpointId == null) ? 0 : this.endpointId.hashCode());
+        result = prime * result + ((this.id == null) ? 0 : this.id.hashCode());
+        result = prime * result + ((this.serverProfileBody == null) ? 0 : this.serverProfileBody.hashCode());
+        result = prime * result + ((this.serverProfileVersion == null) ? 0 : this.serverProfileVersion.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;
+        }
+        EndpointRegistrationInfoDto other = (EndpointRegistrationInfoDto) obj;
+        if (this.applicationId == null) {
+            if (other.applicationId != null) {
+                return false;
+            }
+        } else if (!this.applicationId.equals(other.applicationId)) {
+            return false;
+        }
+        if (this.credentialsId == null) {
+            if (other.credentialsId != null) {
+                return false;
+            }
+        } else if (!this.credentialsId.equals(other.credentialsId)) {
+            return false;
+        }
+        if (this.endpointId == null) {
+            if (other.endpointId != null) {
+                return false;
+            }
+        } else if (!this.endpointId.equals(other.endpointId)) {
+            return false;
+        }
+        if (this.id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!this.id.equals(other.id)) {
+            return false;
+        }
+        if (this.serverProfileBody == null) {
+            if (other.serverProfileBody != null) {
+                return false;
+            }
+        } else if (!this.serverProfileBody.equals(other.serverProfileBody)) {
+            return false;
+        }
+        if (this.serverProfileVersion == null) {
+            if (other.serverProfileVersion != null) {
+                return false;
+            }
+        } else if (!this.serverProfileVersion.equals(other.serverProfileVersion)) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("EndpointRegistrationInfoDto [id=");
+        builder.append(this.id);
+        builder.append(", applicationId=");
+        builder.append(this.applicationId);
+        builder.append(", endpointId=");
+        builder.append(this.endpointId);
+        builder.append(", credentialsId=");
+        builder.append(this.credentialsId);
+        builder.append(", serverProfileVersion=");
+        builder.append(this.serverProfileVersion);
+        builder.append(", serverProfileBody=");
+        builder.append(this.serverProfileBody);
+        builder.append("]");
+        return builder.toString();
+    }
 }