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 index 6ab9459efc..293fcb02f9 100644 --- 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 @@ -82,6 +82,8 @@ public class DaoConstants { public static final String OPTIMISTIC_LOCK_PROPERTY = "OPT_LOCK"; + public static final int DESCRIPTION_ROW_LENGTH = 1024; + /** * Common constants. */ diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java index 0663d56121..b085eeb77a 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/BaseSchema.java @@ -26,6 +26,7 @@ import static org.kaaproject.kaa.server.common.dao.DaoConstants.BASE_SCHEMA_NAME; import static org.kaaproject.kaa.server.common.dao.DaoConstants.BASE_SCHEMA_TABLE_NAME; import static org.kaaproject.kaa.server.common.dao.DaoConstants.BASE_SCHEMA_VERSION; +import static org.kaaproject.kaa.server.common.dao.DaoConstants.DESCRIPTION_ROW_LENGTH; import static org.kaaproject.kaa.server.common.dao.model.sql.ModelUtils.getLongId; import org.hibernate.annotations.OnDelete; @@ -57,7 +58,7 @@ public abstract class BaseSchema extends GenericModel implements Ser @Column(name = ENDPOINT_GROUP_ENDPOINT_COUNT) private long endpointCount; - @Column(name = ENDPOINT_GROUP_DESCRIPTION, length = 1024) + @Column(name = ENDPOINT_GROUP_DESCRIPTION, length = DESCRIPTION_ROW_LENGTH) private String description; @Column(name = ENDPOINT_GROUP_CREATED_USERNAME) diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamily.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamily.java index 66091d9dfe..444d8895d4 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamily.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamily.java @@ -16,6 +16,7 @@ package org.kaaproject.kaa.server.common.dao.model.sql; +import static org.kaaproject.kaa.server.common.dao.DaoConstants.DESCRIPTION_ROW_LENGTH; import static org.kaaproject.kaa.server.common.dao.DaoConstants.EVENT_CLASS_FAMILY_CLASS_NAME; import static org.kaaproject.kaa.server.common.dao.DaoConstants.EVENT_CLASS_FAMILY_CREATED_TIME; import static org.kaaproject.kaa.server.common.dao.DaoConstants.EVENT_CLASS_FAMILY_CREATED_USERNAME; @@ -46,7 +47,7 @@ public class EventClassFamily extends GenericModel { private static final long serialVersionUID = 3766947955702551264L; - @Column(name = EVENT_CLASS_FAMILY_DESCRIPTION, length = 1024) + @Column(name = EVENT_CLASS_FAMILY_DESCRIPTION, length = DESCRIPTION_ROW_LENGTH) protected String description; @Column(name = EVENT_CLASS_FAMILY_CREATED_USERNAME) protected String createdUsername; diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Plugin.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Plugin.java index b7434b0d51..9fc07d3977 100755 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Plugin.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Plugin.java @@ -16,6 +16,7 @@ package org.kaaproject.kaa.server.common.dao.model.sql; +import static org.kaaproject.kaa.server.common.dao.DaoConstants.DESCRIPTION_ROW_LENGTH; import static org.kaaproject.kaa.server.common.dao.DaoConstants.PLUGIN_APPLICATION_ID; import static org.kaaproject.kaa.server.common.dao.DaoConstants.PLUGIN_CLASS_NAME; import static org.kaaproject.kaa.server.common.dao.DaoConstants.PLUGIN_CREATED_TIME; @@ -55,7 +56,7 @@ public abstract class Plugin extends GenericModel implem protected Application application; @Column(name = PLUGIN_NAME) private String name; - @Column(name = PLUGIN_DESCRIPTION, length = 1024) + @Column(name = PLUGIN_DESCRIPTION, length = DESCRIPTION_ROW_LENGTH) private String description; @Column(name = PLUGIN_CREATED_USERNAME) private String createdUsername; diff --git a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Topic.java b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Topic.java index eea546a31d..ef640e75de 100644 --- a/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Topic.java +++ b/server/common/dao/src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/Topic.java @@ -16,6 +16,7 @@ package org.kaaproject.kaa.server.common.dao.model.sql; +import static org.kaaproject.kaa.server.common.dao.DaoConstants.DESCRIPTION_ROW_LENGTH; import static org.kaaproject.kaa.server.common.dao.DaoConstants.ENDPOINT_GROUP_APPLICATION_ID; import static org.kaaproject.kaa.server.common.dao.DaoConstants.ENDPOINT_GROUP_TOPICS_ENDPOINT_GROUP_ID; import static org.kaaproject.kaa.server.common.dao.DaoConstants.ENDPOINT_GROUP_TOPICS_TABLE_NAME; @@ -58,7 +59,7 @@ public class Topic extends GenericModel implements Serializable { private static final long serialVersionUID = -5617352698933455002L; - @Column(name = TOPIC_DESCRIPTION, length = 1024) + @Column(name = TOPIC_DESCRIPTION, length = DESCRIPTION_ROW_LENGTH) protected String description; @Column(name = TOPIC_CREATED_USERNAME) protected String createdUsername; diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/sdk/AddSdkProfileViewImpl.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/sdk/AddSdkProfileViewImpl.java index e14de1ec16..5b55af6e50 100755 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/sdk/AddSdkProfileViewImpl.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/sdk/AddSdkProfileViewImpl.java @@ -57,6 +57,7 @@ public class AddSdkProfileViewImpl implements AddSdkProfileView, ValueChangeHandler { private static final String REQUIRED = Utils.avroUiStyle.requiredField(); + private static final int SDK_NAME_TEXT_SIZE_BOX = 255; private SizedTextBox name; @@ -88,7 +89,7 @@ protected void initDetailsTable() { Widget label = new Label(Utils.constants.name()); label.addStyleName(REQUIRED); - name = new KaaAdminSizedTextBox(255); + name = new KaaAdminSizedTextBox(SDK_NAME_TEXT_SIZE_BOX); name.addInputHandler(this); detailsTable.setWidget(0, 0, label); detailsTable.setWidget(0, 1, name); diff --git a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/tenant/TenantViewImpl.java b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/tenant/TenantViewImpl.java index a06c81770e..569678608e 100644 --- a/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/tenant/TenantViewImpl.java +++ b/server/node/src/main/java/org/kaaproject/kaa/server/admin/client/mvp/view/tenant/TenantViewImpl.java @@ -33,6 +33,7 @@ public class TenantViewImpl extends BaseDetailsViewImpl implements TenantView { private static final String REQUIRED = Utils.avroUiStyle.requiredField(); + private static final int TENANT_NAME_TEXT_SIZE_BOX = 100; private SizedTextBox tenantName; @@ -65,7 +66,7 @@ protected String getSubTitle() { @Override protected void initDetailsTable() { - tenantName = new KaaAdminSizedTextBox(100); + tenantName = new KaaAdminSizedTextBox(TENANT_NAME_TEXT_SIZE_BOX); tenantName.setWidth("100%"); tenantName.addInputHandler(this); lableUser = new Label("Users");