简柏林 / thingskit · Commits

Commit b76ec5012378a6d2ab1b6b569bfdb795c8cbf9b3

Authored by YevhenBondarenko
1 parent ebf10b55

refactored

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
@@ -79,7 +79,8 @@ public class EntityKeyMapping { @@ -79,7 +79,8 @@ public class EntityKeyMapping {
79 public static final List<String> dashboardEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, TITLE); 79 public static final List<String> dashboardEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, TITLE);
80 public static final List<String> labeledEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME, TYPE, LABEL, ADDITIONAL_INFO); 80 public static final List<String> labeledEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME, TYPE, LABEL, ADDITIONAL_INFO);
81 public static final List<String> contactBasedEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, EMAIL, TITLE, COUNTRY, STATE, CITY, ADDRESS, ADDRESS_2, ZIP, PHONE, ADDITIONAL_INFO); 81 public static final List<String> contactBasedEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, EMAIL, TITLE, COUNTRY, STATE, CITY, ADDRESS, ADDRESS_2, ZIP, PHONE, ADDITIONAL_INFO);
82 - public static final List<String> apiUsageStateEntityFields = Collections.singletonList(CREATED_TIME); 82 +
  83 + public static final Set<String> apiUsageStateEntityFields = Collections.singleton(CREATED_TIME);
83 public static final Set<String> commonEntityFieldsSet = new HashSet<>(commonEntityFields); 84 public static final Set<String> commonEntityFieldsSet = new HashSet<>(commonEntityFields);
84 public static final Set<String> relationQueryEntityFieldsSet = new HashSet<>(Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME, TYPE, LABEL, FIRST_NAME, LAST_NAME, EMAIL, REGION, TITLE, COUNTRY, STATE, CITY, ADDRESS, ADDRESS_2, ZIP, PHONE, ADDITIONAL_INFO)); 85 public static final Set<String> relationQueryEntityFieldsSet = new HashSet<>(Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME, TYPE, LABEL, FIRST_NAME, LAST_NAME, EMAIL, REGION, TITLE, COUNTRY, STATE, CITY, ADDRESS, ADDRESS_2, ZIP, PHONE, ADDITIONAL_INFO));
85 86
@@ -99,7 +100,7 @@ public class EntityKeyMapping { @@ -99,7 +100,7 @@ public class EntityKeyMapping {
99 allowedEntityFieldMap.put(EntityType.RULE_NODE, new HashSet<>(commonEntityFields)); 100 allowedEntityFieldMap.put(EntityType.RULE_NODE, new HashSet<>(commonEntityFields));
100 allowedEntityFieldMap.put(EntityType.WIDGET_TYPE, new HashSet<>(widgetEntityFields)); 101 allowedEntityFieldMap.put(EntityType.WIDGET_TYPE, new HashSet<>(widgetEntityFields));
101 allowedEntityFieldMap.put(EntityType.WIDGETS_BUNDLE, new HashSet<>(widgetEntityFields)); 102 allowedEntityFieldMap.put(EntityType.WIDGETS_BUNDLE, new HashSet<>(widgetEntityFields));
102 - allowedEntityFieldMap.put(EntityType.API_USAGE_STATE, new HashSet<>(apiUsageStateEntityFields)); 103 + allowedEntityFieldMap.put(EntityType.API_USAGE_STATE, apiUsageStateEntityFields);
103 104
104 entityFieldColumnMap.put(CREATED_TIME, ModelConstants.CREATED_TIME_PROPERTY); 105 entityFieldColumnMap.put(CREATED_TIME, ModelConstants.CREATED_TIME_PROPERTY);
105 entityFieldColumnMap.put(ENTITY_TYPE, ModelConstants.ENTITY_TYPE_PROPERTY); 106 entityFieldColumnMap.put(ENTITY_TYPE, ModelConstants.ENTITY_TYPE_PROPERTY);
@@ -85,7 +85,6 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A @@ -85,7 +85,6 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
85 Tenant tenant = tenantDao.findById(tenantId, tenantId.getId()); 85 Tenant tenant = tenantDao.findById(tenantId, tenantId.getId());
86 TenantProfile tenantProfile = tenantProfileDao.findById(tenantId, tenant.getTenantProfileId().getId()); 86 TenantProfile tenantProfile = tenantProfileDao.findById(tenantId, tenant.getTenantProfileId().getId());
87 TenantProfileConfiguration configuration = tenantProfile.getProfileData().getConfiguration(); 87 TenantProfileConfiguration configuration = tenantProfile.getProfileData().getConfiguration();
88 - List<TsKvEntry> profileThresholds = new ArrayList<>();  
89 List<TsKvEntry> apiUsageStates = new ArrayList<>(); 88 List<TsKvEntry> apiUsageStates = new ArrayList<>();
90 apiUsageStates.add(new BasicTsKvEntry(apiUsageState.getCreatedTime(), 89 apiUsageStates.add(new BasicTsKvEntry(apiUsageState.getCreatedTime(),
91 new StringDataEntry(ApiFeature.TRANSPORT.getApiStateKey(), ApiUsageStateValue.ENABLED.name()))); 90 new StringDataEntry(ApiFeature.TRANSPORT.getApiStateKey(), ApiUsageStateValue.ENABLED.name())));
@@ -97,6 +96,8 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A @@ -97,6 +96,8 @@ public class ApiUsageStateServiceImpl extends AbstractEntityService implements A
97 new StringDataEntry(ApiFeature.JS.getApiStateKey(), ApiUsageStateValue.ENABLED.name()))); 96 new StringDataEntry(ApiFeature.JS.getApiStateKey(), ApiUsageStateValue.ENABLED.name())));
98 tsService.save(tenantId, saved.getId(), apiUsageStates, 0L); 97 tsService.save(tenantId, saved.getId(), apiUsageStates, 0L);
99 98
  99 + List<TsKvEntry> profileThresholds = new ArrayList<>();
  100 +
100 for (ApiUsageRecordKey key : ApiUsageRecordKey.values()) { 101 for (ApiUsageRecordKey key : ApiUsageRecordKey.values()) {
101 profileThresholds.add(new BasicTsKvEntry(saved.getCreatedTime(), new LongDataEntry(key.getApiLimitKey(), configuration.getProfileThreshold(key)))); 102 profileThresholds.add(new BasicTsKvEntry(saved.getCreatedTime(), new LongDataEntry(key.getApiLimitKey(), configuration.getProfileThreshold(key))));
102 } 103 }