lwm2m - Updating device profile profile_data transport_type==LWM2M...

application/src/main/data/upgrade/3.3.2/schema_update_lwm2m_bootstrap.sql

@@ -0,0 +1,82 @@
+--
+-- 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.
+--
+
+CREATE OR REPLACE FUNCTION get_bootstrap_3_3_3(bootstrap_in jsonb, publickey_bs text, publickey_lw text) RETURNS jsonb AS
+$$
+BEGIN
+  RETURN json_build_array(
+    json_build_object('shortServerId', bootstrap_in::json #> '{bootstrapServer}' -> 'serverId',
+                      'securityMode', bootstrap_in::json #> '{bootstrapServer}' ->> 'securityMode',
+                      'binding', bootstrap_in::json #> '{servers}' ->> 'binding',
+                      'lifetime', bootstrap_in::json #> '{servers}' -> 'lifetime',
+                      'notifIfDisabled', bootstrap_in::json #> '{servers}' -> 'notifIfDisabled',
+                      'defaultMinPeriod', bootstrap_in::json #> '{servers}' -> 'defaultMinPeriod',
+                      'host', bootstrap_in::json #> '{bootstrapServer}' ->> 'host',
+                      'port', bootstrap_in::json #> '{bootstrapServer}' -> 'port',
+                      'serverPublicKey', publickey_bs,
+                      'bootstrapServerIs', true,
+                      'clientHoldOffTime', bootstrap_in::json #> '{bootstrapServer}' -> 'clientHoldOffTime',
+                      'bootstrapServerAccountTimeout',
+                      bootstrap_in::json #> '{bootstrapServer}' -> 'bootstrapServerAccountTimeout'
+      ),
+    json_build_object('shortServerId', bootstrap_in::json #> '{lwm2mServer}' -> 'serverId',
+                      'securityMode', bootstrap_in::json #> '{lwm2mServer}' ->> 'securityMode',
+                      'binding', bootstrap_in::json #> '{servers}' ->> 'binding',
+                      'lifetime', bootstrap_in::json #> '{servers}' -> 'lifetime',
+                      'notifIfDisabled', bootstrap_in::json #> '{servers}' -> 'notifIfDisabled',
+                      'defaultMinPeriod', bootstrap_in::json #> '{servers}' -> 'defaultMinPeriod',
+                      'host', bootstrap_in::json #> '{lwm2mServer}' ->> 'host',
+                      'port', bootstrap_in::json #> '{lwm2mServer}' -> 'port',
+                      'serverPublicKey', publickey_lw,
+                      'bootstrapServerIs', false,
+                      'clientHoldOffTime', bootstrap_in::json #> '{lwm2mServer}' -> 'clientHoldOffTime',
+                      'bootstrapServerAccountTimeout',
+                      bootstrap_in::json #> '{lwm2mServer}' -> 'bootstrapServerAccountTimeout'
+      )
+    );
+END ;
+$$ LANGUAGE plpgsql;
+
+CREATE OR REPLACE PROCEDURE update_profile_bootstrap()
+  LANGUAGE plpgsql AS
+$$
+
+BEGIN
+
+  UPDATE device_profile
+  SET profile_data = jsonb_set(
+    profile_data,
+    '{transportConfiguration, bootstrap}',
+    get_bootstrap_3_3_3(
+      profile_data::jsonb #> '{transportConfiguration,bootstrap}',
+      subquery.publickey_bs,
+      subquery.publickey_lw),
+    true)
+  FROM (
+         SELECT id,
+                encode(
+                  decode(profile_data::json #> '{transportConfiguration,bootstrap,bootstrapServer}' ->>
+                         'serverPublicKey', 'hex')::bytea, 'base64') AS publickey_bs,
+                encode(
+                  decode(profile_data::json #> '{transportConfiguration,bootstrap,lwm2mServer}' ->>
+                         'serverPublicKey', 'hex')::bytea, 'base64') AS publickey_lw
+         FROM device_profile
+         WHERE transport_type = 'LWM2M'
+       ) AS subquery
+  WHERE device_profile.id = subquery.id;
+
+END;
+$$;

application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java

@@ -469,6 +469,24 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                     log.error("Failed updating schema!!!", e);
                 }
                 break;
+            case "3.3.2":
+                try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
+                    log.info("Updating device (section bootstrap) and device profile profile_data transport_type==LWM2M...");
+                    schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.3.2", "schema_update_lwm2m_bootstrap.sql");
+                    loadSql(schemaUpdateFile, conn);
+                    log.info("Updating device profile profile_data transport_type==LWM2M...");
+                    conn.createStatement().execute("call update_profile_bootstrap();");
+                    log.info("Device profile profile_data transport_type==LWM2M updated.");
+
+                    log.info("Updating device (section bootstrap) transport_type==LWM2M...");
+//                    conn.createStatement().execute("call update_device_bootstrap();");
+                    log.info("Device (section bootstrap) transport_type==LWM2M updated.");
+//                    conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3003003;");
+//                    log.info("Schema updated.");
+                } catch (Exception e) {
+                    log.error("Failed updating schema!!!", e);
+                }
+                break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);
         }

application/src/main/java/org/thingsboard/server/service/install/update/DefaultCacheCleanupService.java

@@ -55,7 +55,10 @@ public class DefaultCacheCleanupService implements CacheCleanupService {
                 clearCacheByName("deviceProfiles");
                 clearCacheByName("tenantProfiles");
                 clearCacheByName("relations");
-
+                break;
+            case "3.3.2":
+                log.info("Clear cache to upgrade from version 3.3.2 to 3.3.3 ...");
+                clearAllCaches();
                 break;
             default:
                 throw new RuntimeException("Unable to update cache, unsupported fromVersion: " + fromVersion);