Some style fixes

kaaproject · Sep 29, 2016 · 5c487af · 5c487af
1 parent d0781e1
commit 5c487af
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 91 deletions.
diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/DaoConstants.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/DaoConstants.java
@@ -57,14 +57,26 @@ public class DaoConstants {
   public static final String ECFV_ALIAS = "ecfv";
 
   public static final String TENANT_REFERENCE = TENANT_ALIAS + "." + ID_PROPERTY;
-  public static final String ENDPOINT_PROFILE_SCHEMA_REFERENCE = ENDPOINT_PROFILE_SCHEMA_ALIAS + "." + ID_PROPERTY;
-  public static final String SERVER_PROFILE_SCHEMA_REFERENCE = SERVER_PROFILE_SCHEMA_ALIAS + "." + ID_PROPERTY;
-  public static final String ENDPOINT_PROFILE_SCHEMA_VERSION_REFERENCE = ENDPOINT_PROFILE_SCHEMA_ALIAS + "." + VERSION_PROPERTY;
-  public static final String SERVER_PROFILE_SCHEMA_VERSION_REFERENCE = SERVER_PROFILE_SCHEMA_ALIAS + "." + VERSION_PROPERTY;
+
+  public static final String ENDPOINT_PROFILE_SCHEMA_REFERENCE = ENDPOINT_PROFILE_SCHEMA_ALIAS
+      + "." + ID_PROPERTY;
+
+  public static final String SERVER_PROFILE_SCHEMA_REFERENCE = SERVER_PROFILE_SCHEMA_ALIAS
+      + "." + ID_PROPERTY;
+
+  public static final String ENDPOINT_PROFILE_SCHEMA_VERSION_REFERENCE =
+      ENDPOINT_PROFILE_SCHEMA_ALIAS + "." + VERSION_PROPERTY;
+
+  public static final String SERVER_PROFILE_SCHEMA_VERSION_REFERENCE = SERVER_PROFILE_SCHEMA_ALIAS
+      + "." + VERSION_PROPERTY;
+
   public static final String ENDPOINT_GROUP_REFERENCE = ENDPOINT_GROUP_ALIAS + "." + ID_PROPERTY;
   public static final String APPLICATION_REFERENCE = APPLICATION_ALIAS + "." + ID_PROPERTY;
   public static final String TOPIC_REFERENCE = TOPIC_ALIAS + "." + ID_PROPERTY;
-  public static final String CONFIGURATION_SCHEMA_REFERENCE = CONFIGURATION_SCHEMA_ALIAS + "." + ID_PROPERTY;
+
+  public static final String CONFIGURATION_SCHEMA_REFERENCE = CONFIGURATION_SCHEMA_ALIAS
+      + "." + ID_PROPERTY;
+
   public static final String ECF_REFERENCE = ECF_ALIAS + "." + ID_PROPERTY;
   public static final String ECFV_REFERENCE = ECFV_ALIAS + "." + ID_PROPERTY;
 
@@ -227,7 +239,8 @@ public class DaoConstants {
   public static final String CONFIGURATION_TABLE_NAME = "configuration";
   public static final String CONFIGURATION_CONFIGURATION_BODY = "configuration_body";
   public static final String CONFIGURATION_CONFIGURATION_SCHEMA_ID = "configuration_schems_id";
-  public static final String CONFIGURATION_CONFIGURATION_SCHEMA_VERSION = "configuration_schems_version";
+  public static final String CONFIGURATION_CONFIGURATION_SCHEMA_VERSION =
+      "configuration_schems_version";
 
   /**
    * Topic constants.
@@ -269,7 +282,8 @@ public class DaoConstants {
   public static final String EVENT_CLASS_FAMILY_VERSION_VERSION = VERSION;
   public static final String EVENT_CLASS_FAMILY_VERSION_CREATED_USERNAME = CREATED_USERNAME;
   public static final String EVENT_CLASS_FAMILY_VERSION_CREATED_TIME = CREATED_TIME;
-  public static final String EVENT_CLASS_FAMILY_VERSION_EVENT_CLASS_FAMILY_ID = EVENT_CLASS_FAMILY_ID;
+  public static final String EVENT_CLASS_FAMILY_VERSION_EVENT_CLASS_FAMILY_ID =
+      EVENT_CLASS_FAMILY_ID;
 
   /**
    * Event class family constants.
@@ -288,7 +302,8 @@ public class DaoConstants {
    */
   public static final String EVENT_CLASS_TABLE_NAME = "events_class";
   public static final String EVENT_CLASS_TENANT_ID = TENANT_ID;
-  public static final String EVENT_CLASS_EVENT_CLASS_FAMILY_VERSION_ID = EVENT_CLASS_FAMILY_VERSION_ID;
+  public static final String EVENT_CLASS_EVENT_CLASS_FAMILY_VERSION_ID =
+      EVENT_CLASS_FAMILY_VERSION_ID;
   public static final String EVENT_CLASS_FQN = FQN;
   public static final String EVENT_CLASS_TYPE = "type";
   public static final String EVENT_CLASS_SCHEMA = "schems";
@@ -301,14 +316,17 @@ public class DaoConstants {
   public static final String APPLICATION_EVENT_MAP_EVENT_CLASS_ID = "events_class_id";
   public static final String APPLICATION_EVENT_MAP_FQN = FQN;
   public static final String APPLICATION_EVENT_MAP_ACTION = "action";
-  public static final String APPLICATION_EVENT_MAP_APPLICATION_EVENT_FAMILY_MAP_ID = "application_event_family_map_id";
+  public static final String APPLICATION_EVENT_MAP_APPLICATION_EVENT_FAMILY_MAP_ID =
+      "application_event_family_map_id";
 
   /**
    * Application event family map constants.
    */
-  public static final String APPLICATION_EVENT_FAMILY_MAP_TABLE_NAME = "application_event_family_map";
+  public static final String APPLICATION_EVENT_FAMILY_MAP_TABLE_NAME =
+      "application_event_family_map";
   public static final String APPLICATION_EVENT_FAMILY_MAP_APPLICATION_ID = APPLICATION_ID;
-  public static final String APPLICATION_EVENT_FAMILY_MAP_EVENT_CLASS_FAMILY_ID = EVENT_CLASS_FAMILY_ID;
+  public static final String APPLICATION_EVENT_FAMILY_MAP_EVENT_CLASS_FAMILY_ID =
+      EVENT_CLASS_FAMILY_ID;
   public static final String APPLICATION_EVENT_FAMILY_MAP_VERSION = VERSION;
   public static final String APPLICATION_EVENT_FAMILY_MAP_CREATED_USERNAME = CREATED_USERNAME;
   public static final String APPLICATION_EVENT_FAMILY_MAP_CREATED_TIME = CREATED_TIME;
@@ -357,14 +375,16 @@ public class DaoConstants {
    * SDK profile constants
    */
   public static final String SDK_PROFILE_APPLICATION_ID = APPLICATION_ID;
-  public static final String SDK_PROFILE_CONFIGURATION_SCHEMA_VERSION = "configuration_schems_version";
+  public static final String SDK_PROFILE_CONFIGURATION_SCHEMA_VERSION =
+      "configuration_schems_version";
   public static final String SDK_PROFILE_CREATED_TIME = CREATED_TIME;
   public static final String SDK_PROFILE_CREATED_USERNAME = CREATED_USERNAME;
   public static final String SDK_PROFILE_DEFAULT_VERIFIER_TOKEN = "default_verifier_token";
   public static final String SDK_PROFILE_ENDPOINT_COUNT = ENDPOINT_COUNT;
   public static final String SDK_PROFILE_LOG_SCHEMA_VERSION = "log_schems_version";
   public static final String SDK_PROFILE_NAME = NAME;
-  public static final String SDK_PROFILE_NOTIFICATION_SCHEMA_VERSION = "notification_schems_version";
+  public static final String SDK_PROFILE_NOTIFICATION_SCHEMA_VERSION =
+      "notification_schems_version";
   public static final String SDK_PROFILE_PROFILE_SCHEMA_VERSION = "profile_schems_version";
   public static final String SDK_PROFILE_TABLE_NAME = "sdk_token";
   public static final String SDK_PROFILE_TOKEN = "token";
@@ -391,7 +411,8 @@ public class DaoConstants {
   // Properties and alias constants
   public static final String CTL_SCHEMA_DEPENDENCY_PROP = "dependencySet";
   public static final String CTL_SCHEMA_DEPENDENCY_ALIAS = "dep";
-  public static final String CTL_SCHEMA_DEPENDENCY_ID_ALIAS = CTL_SCHEMA_DEPENDENCY_ALIAS + "." + ID;
+  public static final String CTL_SCHEMA_DEPENDENCY_ID_ALIAS = CTL_SCHEMA_DEPENDENCY_ALIAS
+      + "." + ID;
 
   /**
    * CTL schems meta info constants
@@ -400,7 +421,8 @@ public class DaoConstants {
   public static final String CTL_SCHEMA_META_INFO_FQN = FQN;
   public static final String CTL_SCHEMA_META_INFO_TENANT_ID = TENANT_ID;
   public static final String CTL_SCHEMA_META_INFO_APPLICATION_ID = APPLICATION_ID;
-  public static final String CTL_SCHEMA_META_INFO_UNIQUE_CONSTRAINT = "ctl_metainfo_unique_constraint";
+  public static final String CTL_SCHEMA_META_INFO_UNIQUE_CONSTRAINT =
+      "ctl_metainfo_unique_constraint";
 
   // CTL schems meta info foreign keys
   public static final String CTL_SCHEMA_META_INFO_TENANT_FK = "fk_ctl_metainfo_tenant_id";
@@ -413,10 +435,14 @@ public class DaoConstants {
   public static final String CTL_SCHEMA_META_INFO_APPLICATION_ID_ALIAS = APPLICATION_REFERENCE;
   public static final String CTL_SCHEMA_META_INFO_PROPERTY = "metaInfo";
   public static final String CTL_SCHEMA_META_INFO_ALIAS = "mi";
-  public static final String CTL_SCHEMA_META_INFO_ALIAS_FQN = CTL_SCHEMA_META_INFO_ALIAS + "." + CTL_SCHEMA_META_INFO_FQN;
-  public static final String CTL_SCHEMA_META_INFO_ALIAS_TENANT_ID = CTL_SCHEMA_META_INFO_ALIAS + "." + TENANT_REFERENCE;
-  public static final String CTL_SCHEMA_META_INFO_ALIAS_APPLICATION_ID = CTL_SCHEMA_META_INFO_ALIAS + "." + APPLICATION_REFERENCE;
-  public static final String CTL_SCHEMA_META_INFO_ALIAS_ID = CTL_SCHEMA_META_INFO_ALIAS + "." + ID_PROPERTY;
+  public static final String CTL_SCHEMA_META_INFO_ALIAS_FQN = CTL_SCHEMA_META_INFO_ALIAS
+      + "." + CTL_SCHEMA_META_INFO_FQN;
+  public static final String CTL_SCHEMA_META_INFO_ALIAS_TENANT_ID = CTL_SCHEMA_META_INFO_ALIAS
+      + "." + TENANT_REFERENCE;
+  public static final String CTL_SCHEMA_META_INFO_ALIAS_APPLICATION_ID = CTL_SCHEMA_META_INFO_ALIAS
+      + "." + APPLICATION_REFERENCE;
+  public static final String CTL_SCHEMA_META_INFO_ALIAS_ID = CTL_SCHEMA_META_INFO_ALIAS
+      + "." + ID_PROPERTY;
 
   public static final String LAST_PAGE_MESSAGE = "It is the last page";
   public static final String PROFILE = "profile";

diff --git a/...r/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java b/...r/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java
@@ -46,7 +46,8 @@
 @Entity
 @Table(name = BASE_SCHEMA_TABLE_NAME)
 @Inheritance(strategy = InheritanceType.JOINED)
-public abstract class BaseSchema<T extends BaseSchemaDto> extends GenericModel<T> implements HasVersion {
+public abstract class BaseSchema<T extends BaseSchemaDto> extends GenericModel<T>
+    implements HasVersion {
 
   private static final long serialVersionUID = 2866125011338808891L;
 
@@ -66,12 +67,14 @@ public abstract class BaseSchema<T extends BaseSchemaDto> extends GenericModel<T
   protected long createdTime;
 
   @ManyToOne(fetch = FetchType.LAZY)
-  @JoinColumn(name = BASE_SCHEMA_APPLICATION_ID, foreignKey = @ForeignKey(name = BASE_SCHEMA_FK_APP_ID))
+  @JoinColumn(name = BASE_SCHEMA_APPLICATION_ID,
+      foreignKey = @ForeignKey(name = BASE_SCHEMA_FK_APP_ID))
   @OnDelete(action = OnDeleteAction.CASCADE)
   private Application application;
 
   @ManyToOne(fetch = FetchType.LAZY)
-  @JoinColumn(name = BASE_SCHEMA_CTL_SCHEMA_ID, nullable = false, foreignKey = @ForeignKey(name = BASE_SCHEMA_FK_CTL_SCHEMA_ID))
+  @JoinColumn(name = BASE_SCHEMA_CTL_SCHEMA_ID, nullable = false,
+      foreignKey = @ForeignKey(name = BASE_SCHEMA_FK_CTL_SCHEMA_ID))
   private CTLSchema ctlSchema;
 
   public BaseSchema() {
@@ -81,6 +84,12 @@ public BaseSchema(Long id) {
     this.id = id;
   }
 
+
+  /**
+   * Instantiates a new Base schema.
+   *
+   * @param dto data transfare object that used to create instance
+   */
   public BaseSchema(T dto) {
     if (dto != null) {
       this.id = getLongId(dto);
@@ -152,6 +161,10 @@ public void setCtlSchema(CTLSchema ctlSchema) {
     this.ctlSchema = ctlSchema;
   }
 
+
+  /**
+   * Return application id.
+   */
   public String getApplicationId() {
     Long id = null;
     if (application != null) {
@@ -253,6 +266,11 @@ public T toDto() {
     return dto;
   }
 
+
+  /**
+   * Return instance that contains only schema id and version.
+   *
+   */
   public VersionDto toVersionDto() {
     VersionDto dto = new VersionDto();
     dto.setId(getStringId());

diff --git a/...r/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/SdkProfile.java b/...r/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/SdkProfile.java
@@ -37,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import javax.persistence.CollectionTable;
 import javax.persistence.Column;
@@ -91,10 +92,22 @@ public class SdkProfile extends GenericModel<SdkProfileDto> implements Serializa
   public SdkProfile() {
   }
 
+
+  /**
+   * Instantiates a new Sdk profile with uniq identifier.
+   *
+   * @param id the identifier of new instance
+   */
   public SdkProfile(Long id) {
     this.id = id;
   }
 
+
+  /**
+   * Instantiates a new SDKProfile based on passed dto object.
+   *
+   * @param dto data transfer object that used for creating new instance
+   */
   public SdkProfile(SdkProfileDto dto) {
     if (dto != null) {
       this.id = ModelUtils.getLongId(dto.getId());
@@ -277,86 +290,59 @@ public SdkProfileDto toDto() {
   }
 
   @Override
-  public boolean equals(Object o) {
-    if (this == o) {
+  public boolean equals(Object obj) {
+    if (this == obj) {
       return true;
     }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-
-    SdkProfile other = (SdkProfile) o;
-
-    if (application != null ? !application.equals(other.application) : other.application != null) {
-      return false;
-    }
-    if (token != null ? !token.equals(other.token) : other.token != null) {
+    if (obj == null || getClass() != obj.getClass()) {
       return false;
     }
-    if (name != null ? !name.equals(other.name) : other.name != null) {
-      return false;
-    }
-    if (configurationSchemaVersion != null ? !configurationSchemaVersion.equals(other.configurationSchemaVersion) : other.configurationSchemaVersion != null) {
-      return false;
-    }
-    if (profileSchemaVersion != null ? !profileSchemaVersion.equals(other.profileSchemaVersion) : other.profileSchemaVersion != null) {
-      return false;
-    }
-    if (notificationSchemaVersion != null ? !notificationSchemaVersion.equals(other.notificationSchemaVersion) : other.notificationSchemaVersion != null) {
-      return false;
-    }
-    if (logSchemaVersion != null ? !logSchemaVersion.equals(other.logSchemaVersion) : other.logSchemaVersion != null) {
-      return false;
-    }
-    if (aefMapIds != null ? !aefMapIds.equals(other.aefMapIds) : other.aefMapIds != null) {
-      return false;
-    }
-    if (defaultVerifierToken != null ? !defaultVerifierToken.equals(other.defaultVerifierToken) : other.defaultVerifierToken != null) {
-      return false;
-    }
-    if (createdUsername != null ? !createdUsername.equals(other.createdUsername) : other.createdUsername != null) {
-      return false;
-    }
-    if (createdTime != null ? !createdTime.equals(other.createdTime) : other.createdTime != null) {
-      return false;
-    }
-
-
-    return true;
+    SdkProfile that = (SdkProfile) obj;
+    return Objects.equals(application, that.application)
+        && Objects.equals(token, that.token)
+        && Objects.equals(name, that.name)
+        && Objects.equals(configurationSchemaVersion, that.configurationSchemaVersion)
+        && Objects.equals(profileSchemaVersion, that.profileSchemaVersion)
+        && Objects.equals(notificationSchemaVersion, that.notificationSchemaVersion)
+        && Objects.equals(logSchemaVersion, that.logSchemaVersion)
+        && Objects.equals(aefMapIds, that.aefMapIds)
+        && Objects.equals(defaultVerifierToken, that.defaultVerifierToken)
+        && Objects.equals(createdUsername, that.createdUsername)
+        && Objects.equals(createdTime, that.createdTime);
   }
 
   @Override
   public int hashCode() {
-    int result = token != null ? token.hashCode() : 0;
-    result = 31 * result + (application != null ? application.hashCode() : 0);
-    result = 31 * result + (name != null ? name.hashCode() : 0);
-    result = 31 * result + (configurationSchemaVersion != null ? configurationSchemaVersion.hashCode() : 0);
-    result = 31 * result + (profileSchemaVersion != null ? profileSchemaVersion.hashCode() : 0);
-    result = 31 * result + (notificationSchemaVersion != null ? notificationSchemaVersion.hashCode() : 0);
-    result = 31 * result + (logSchemaVersion != null ? logSchemaVersion.hashCode() : 0);
-    result = 31 * result + (aefMapIds != null ? aefMapIds.hashCode() : 0);
-    result = 31 * result + (defaultVerifierToken != null ? defaultVerifierToken.hashCode() : 0);
-    result = 31 * result + (createdUsername != null ? createdUsername.hashCode() : 0);
-    result = 31 * result + (createdTime != null ? createdTime.hashCode() : 0);
-
-    return result;
+    return Objects.hash(
+        application,
+        token,
+        name,
+        configurationSchemaVersion,
+        profileSchemaVersion,
+        notificationSchemaVersion,
+        logSchemaVersion,
+        aefMapIds,
+        defaultVerifierToken,
+        createdUsername,
+        createdTime);
   }
 
   @Override
   public String toString() {
-    return "SdkToken{" +
-        "token='" + token + '\'' +
-        ", application=" + application +
-        ", name=" + name +
-        ", configurationSchemaVersion=" + configurationSchemaVersion +
-        ", profileSchemaVersion=" + profileSchemaVersion +
-        ", notificationSchemaVersion=" + notificationSchemaVersion +
-        ", logSchemaVersion=" + logSchemaVersion +
-        ", aefMapIds=" + (aefMapIds != null ? Arrays.toString(aefMapIds.toArray()) : null) +
-        ", defaultVerifierToken=" + defaultVerifierToken +
-        ", createdUsername=" + createdUsername +
-        ", createdTime=" + createdTime +
-        ", endpointCount=" + endpointCount +
-        '}';
+    final StringBuilder sb = new StringBuilder("SdkProfile{");
+    sb.append("application=").append(application);
+    sb.append(", token='").append(token).append('\'');
+    sb.append(", name='").append(name).append('\'');
+    sb.append(", configurationSchemaVersion=").append(configurationSchemaVersion);
+    sb.append(", profileSchemaVersion=").append(profileSchemaVersion);
+    sb.append(", notificationSchemaVersion=").append(notificationSchemaVersion);
+    sb.append(", logSchemaVersion=").append(logSchemaVersion);
+    sb.append(", aefMapIds=").append(aefMapIds);
+    sb.append(", defaultVerifierToken='").append(defaultVerifierToken).append('\'');
+    sb.append(", createdUsername='").append(createdUsername).append('\'');
+    sb.append(", createdTime=").append(createdTime);
+    sb.append(", endpointCount=").append(endpointCount);
+    sb.append('}');
+    return sb.toString();
   }
 }