简柏林 / thingskit · Commits

Commit 825d7094b303640fa79cbe327fbe53994a9fc68c

Authored by viktorbasanets
1 parent 7bfccc0f

Was cleared of unnecessary

Inline Side-by-side
Showing 1 changed file with 1 additions and 4 deletions
@@ -45,7 +45,6 @@ public class ModelConstants { @@ -45,7 +45,6 @@ public class ModelConstants {
45 public static final String SEARCH_TEXT_PROPERTY = "search_text"; 45 public static final String SEARCH_TEXT_PROPERTY = "search_text";
46 public static final String ADDITIONAL_INFO_PROPERTY = "additional_info"; 46 public static final String ADDITIONAL_INFO_PROPERTY = "additional_info";
47 public static final String ENTITY_TYPE_PROPERTY = "entity_type"; 47 public static final String ENTITY_TYPE_PROPERTY = "entity_type";
48 - /*public static final String ENTITY_VIEW_ID_PROPERTY = "entity_view_id";*/  
49 48
50 public static final String ENTITY_TYPE_COLUMN = ENTITY_TYPE_PROPERTY; 49 public static final String ENTITY_TYPE_COLUMN = ENTITY_TYPE_PROPERTY;
51 public static final String ENTITY_ID_COLUMN = "entity_id"; 50 public static final String ENTITY_ID_COLUMN = "entity_id";
@@ -53,7 +52,6 @@ public class ModelConstants { @@ -53,7 +52,6 @@ public class ModelConstants {
53 public static final String ATTRIBUTE_KEY_COLUMN = "attribute_key"; 52 public static final String ATTRIBUTE_KEY_COLUMN = "attribute_key";
54 public static final String LAST_UPDATE_TS_COLUMN = "last_update_ts"; 53 public static final String LAST_UPDATE_TS_COLUMN = "last_update_ts";
55 54
56 -  
57 /** 55 /**
58 * Cassandra user constants. 56 * Cassandra user constants.
59 */ 57 */
@@ -148,12 +146,11 @@ public class ModelConstants { @@ -148,12 +146,11 @@ public class ModelConstants {
148 * Cassandra entityView constants. 146 * Cassandra entityView constants.
149 */ 147 */
150 public static final String ENTITY_VIEW_TABLE_FAMILY_NAME = "entity_views"; 148 public static final String ENTITY_VIEW_TABLE_FAMILY_NAME = "entity_views";
151 - public static final String ENTITY_VIEW_FAMILY_NAME = "entity-view";  
152 public static final String ENTITY_VIEW_ENTITY_ID_PROPERTY = ENTITY_ID_COLUMN; 149 public static final String ENTITY_VIEW_ENTITY_ID_PROPERTY = ENTITY_ID_COLUMN;
153 public static final String ENTITY_VIEW_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; 150 public static final String ENTITY_VIEW_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
154 public static final String ENTITY_VIEW_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY; 151 public static final String ENTITY_VIEW_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY;
155 public static final String ENTITY_VIEW_NAME_PROPERTY = DEVICE_NAME_PROPERTY; 152 public static final String ENTITY_VIEW_NAME_PROPERTY = DEVICE_NAME_PROPERTY;
156 - public static final String ENTITY_VIEW_TYPE_PROPERTY = DEVICE_TYPE_PROPERTY; 153 + public static final String ENTITY_VIEW_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "entity_view_by_customer_and_search_text";
157 public static final String ENTITY_VIEW_TENANT_AND_NAME_VIEW_NAME = "entity_view_by_tenant_and_name"; 154 public static final String ENTITY_VIEW_TENANT_AND_NAME_VIEW_NAME = "entity_view_by_tenant_and_name";
158 public static final String ENTITY_VIEW_KEYS_PROPERTY = "keys"; 155 public static final String ENTITY_VIEW_KEYS_PROPERTY = "keys";
159 public static final String ENTITY_VIEW_START_TS_PROPERTY = "start_ts"; 156 public static final String ENTITY_VIEW_START_TS_PROPERTY = "start_ts";