lwm2m - refactoring by comments

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

@@ -24,7 +24,7 @@ UPDATE device_profile
 SET profile_data = jsonb_set(
   profile_data,
   '{transportConfiguration, bootstrap}',
-  get_bootstrap_3_3_3(
+  get_bootstrap(
     profile_data::jsonb #> '{transportConfiguration,bootstrap}',
     subquery.publickey_bs,
     subquery.publickey_lw),
@@ -47,7 +47,7 @@ WHERE device_profile.id = subquery.id
 END;
 $$;
 
-CREATE OR REPLACE FUNCTION get_bootstrap_3_3_3(bootstrap_in jsonb, publickey_bs text, publickey_lw text) RETURNS jsonb AS
+CREATE OR REPLACE FUNCTION get_bootstrap(bootstrap_in jsonb, publickey_bs text, publickey_lw text) RETURNS jsonb AS
 $$
 BEGIN
 
@@ -92,12 +92,12 @@ $$
 BEGIN
 
 UPDATE device_credentials
-SET credentials_value = get_device_and_bootstrap_3_3_3(credentials_value::text)
+SET credentials_value = get_device_and_bootstrap(credentials_value::text)
 WHERE credentials_type = 'LWM2M_CREDENTIALS';
 END;
 $$;
 
-CREATE OR REPLACE FUNCTION get_device_and_bootstrap_3_3_3(IN credentials_value text, OUT credentials_value_new text)
+CREATE OR REPLACE FUNCTION get_device_and_bootstrap(IN credentials_value text, OUT credentials_value_new text)
   LANGUAGE plpgsql AS
 $$
 DECLARE

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

@@ -471,18 +471,17 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                 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...");
+                    log.info("Updating schema ...");
                     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...");
+                    log.info("Updating server`s public key from HexDec to Base64 in profile for 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...");
+                    log.info("Server`s public key from HexDec to Base64 in profile for LWM2M updated.");
+                    log.info("Updating client`s public key and secret key from HexDec to Base64 for LWM2M...");
                     conn.createStatement().execute("call update_device_credentials_to_base64_and_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.");
+                    log.info("Client`s public key and secret key from HexDec to Base64 for 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);
                 }