Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -31,6 +31,7 @@ import org.thingsboard.server.service.install.TsDatabaseSchemaService;
 import org.thingsboard.server.service.install.TsLatestDatabaseSchemaService;
 import org.thingsboard.server.service.install.TsLatestDatabaseSchemaService;
 import org.thingsboard.server.service.install.migrate.EntitiesMigrateService;
 import org.thingsboard.server.service.install.migrate.EntitiesMigrateService;
 import org.thingsboard.server.service.install.migrate.TsLatestMigrateService;
 import org.thingsboard.server.service.install.migrate.TsLatestMigrateService;
+import org.thingsboard.server.service.install.update.CacheCleanupService;
 import org.thingsboard.server.service.install.update.DataUpdateService;
 import org.thingsboard.server.service.install.update.DataUpdateService;
 
 
 @Service
 @Service
@@ -74,6 +75,9 @@ public class ThingsboardInstallService {
     @Autowired
     @Autowired
     private DataUpdateService dataUpdateService;
     private DataUpdateService dataUpdateService;
 
 
+    @Autowired
+    private CacheCleanupService cacheCleanupService;
+
     @Autowired(required = false)
     @Autowired(required = false)
     private EntitiesMigrateService entitiesMigrateService;
     private EntitiesMigrateService entitiesMigrateService;
 
 
@@ -85,6 +89,8 @@ public class ThingsboardInstallService {
             if (isUpgrade) {
             if (isUpgrade) {
                 log.info("Starting ThingsBoard Upgrade from version {} ...", upgradeFromVersion);
                 log.info("Starting ThingsBoard Upgrade from version {} ...", upgradeFromVersion);
 
 
+                cacheCleanupService.clearCache(upgradeFromVersion);
+
                 if ("2.5.0-cassandra".equals(upgradeFromVersion)) {
                 if ("2.5.0-cassandra".equals(upgradeFromVersion)) {
                     log.info("Migrating ThingsBoard entities data from cassandra to SQL database ...");
                     log.info("Migrating ThingsBoard entities data from cassandra to SQL database ...");
                     entitiesMigrateService.migrate();
                     entitiesMigrateService.migrate();
@@ -207,6 +213,9 @@ public class ThingsboardInstallService {
                             log.info("Updating system data...");
                             log.info("Updating system data...");
                             systemDataLoaderService.updateSystemWidgets();
                             systemDataLoaderService.updateSystemWidgets();
                             break;
                             break;
+
+                        //TODO update CacheCleanupService on the next version upgrade
+
                         default:
                         default:
                             throw new RuntimeException("Unable to upgrade ThingsBoard, unsupported fromVersion: " + upgradeFromVersion);
                             throw new RuntimeException("Unable to upgrade ThingsBoard, unsupported fromVersion: " + upgradeFromVersion);
 
 

+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.install.update;
+
+public interface CacheCleanupService {
+
+    void clearCache(String fromVersion) throws Exception;
+
+}

+/**
+ * Copyright © 2016-2021 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.install.update;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+@Profile("install")
+@Slf4j
+public class DefaultCacheCleanupService implements CacheCleanupService {
+
+    @Autowired
+    CacheManager cacheManager;
+
+    /**
+     * Cleanup caches that can not deserialize anymore due to schema upgrade or data update using sql scripts.
+     * Refer to SqlDatabaseUpgradeService and /data/upgrage/*.sql
+     * to discover which tables were changed
+     * */
+    @Override
+    public void clearCache(String fromVersion) throws Exception {
+        switch (fromVersion) {
+            case "3.0.1":
+                log.info("Clear cache to upgrade from version 3.0.1 to 3.1.0 ...");
+                clearAllCaches();
+                //do not break to show explicit calls for next versions
+            case "3.1.1":
+                log.info("Clear cache to upgrade from version 3.1.1 to 3.2.0 ...");
+                clearCacheByName("devices");
+                clearCacheByName("deviceProfiles");
+                clearCacheByName("tenantProfiles");
+            case "3.2.2":
+                log.info("Clear cache to upgrade from version 3.2.2 to 3.3.0 ...");
+                clearCacheByName("devices");
+                clearCacheByName("deviceProfiles");
+                clearCacheByName("tenantProfiles");
+                clearCacheByName("relations");
+
+                break;
+            default:
+                throw new RuntimeException("Unable to update cache, unsupported fromVersion: " + fromVersion);
+        }
+    }
+
+    void clearAllCaches() {
+        cacheManager.getCacheNames().forEach(this::clearCacheByName);
+    }
+
+    void clearCacheByName(final String cacheName) {
+        Cache cache = cacheManager.getCache(cacheName);
+        Objects.requireNonNull(cache, "Cache does not exist for name " + cacheName);
+        cache.clear();
+    }
+
+}

@@ -44,6 +44,7 @@ public abstract class ContactBased<I extends UUIDBased> extends SearchTextBasedW
     @Length(fieldName = "phone")
     @Length(fieldName = "phone")
     @NoXss
     @NoXss
     protected String phone;
     protected String phone;
+    @Length(fieldName = "email")
     @NoXss
     @NoXss
     protected String email;
     protected String email;
 
 

@@ -35,6 +35,7 @@ public class DashboardInfo extends SearchTextBased<DashboardId> implements HasNa
     @NoXss
     @NoXss
     @Length(fieldName = "title")
     @Length(fieldName = "title")
     private String title;
     private String title;
+    @Length(fieldName = "image", max = 1000000)
     private String image;
     private String image;
     @Valid
     @Valid
     private Set<ShortCustomerInfo> assignedCustomers;
     private Set<ShortCustomerInfo> assignedCustomers;

@@ -54,6 +54,7 @@ public class DeviceProfile extends SearchTextBased<DeviceProfileId> implements H
     @NoXss
     @NoXss
     @ApiModelProperty(position = 11, value = "Device Profile description. ")
     @ApiModelProperty(position = 11, value = "Device Profile description. ")
     private String description;
     private String description;
+    @Length(fieldName = "image", max = 1000000)
     @ApiModelProperty(position = 12, value = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of device profiles in the grid view. ")
     @ApiModelProperty(position = 12, value = "Either URL or Base64 data of the icon. Used in the mobile application to visualize set of device profiles in the grid view. ")
     private String image;
     private String image;
     private boolean isDefault;
     private boolean isDefault;

@@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.validation.NoXss;
 @JsonPropertyOrder({ "alias", "name", "image", "description", "descriptor" })
 @JsonPropertyOrder({ "alias", "name", "image", "description", "descriptor" })
 public class WidgetTypeDetails extends WidgetType {
 public class WidgetTypeDetails extends WidgetType {
 
 
-    @NoXss
+    @Length(fieldName = "image", max = 1000000)
     @ApiModelProperty(position = 8, value = "Base64 encoded thumbnail", readOnly = true)
     @ApiModelProperty(position = 8, value = "Base64 encoded thumbnail", readOnly = true)
     private String image;
     private String image;
     @NoXss
     @NoXss

@@ -50,6 +50,7 @@ public class WidgetsBundle extends SearchTextBased<WidgetsBundleId> implements H
     @ApiModelProperty(position = 5, value = "Title used in search and UI", readOnly = true)
     @ApiModelProperty(position = 5, value = "Title used in search and UI", readOnly = true)
     private String title;
     private String title;
 
 
+    @Length(fieldName = "image", max = 1000000)
     @Getter
     @Getter
     @Setter
     @Setter
     @ApiModelProperty(position = 6, value = "Base64 encoded thumbnail", readOnly = true)
     @ApiModelProperty(position = 6, value = "Base64 encoded thumbnail", readOnly = true)

@@ -24,8 +24,9 @@
       color: rgba(0, 0, 0, .7);
       color: rgba(0, 0, 0, .7);
     }
     }
 
 
-    .tb-hint{
+    .tb-hint {
       padding: 0;
       padding: 0;
+      max-width: fit-content;
     }
     }
   }
   }
 }
 }