From 4efa360f5ca73a52b1e43cde842658f473d5bb54 Mon Sep 17 00:00:00 2001
From: nickAS21 <nick@thingsboard.io>
Date: Thu, 4 Nov 2021 16:26:44 +0200
Subject: [PATCH] lwm2m - profile fix bug server config

---
 .../thingsboard/server/service/lwm2m/LwM2MServiceImpl.java  | 2 +-
 .../data/device/data/lwm2m/BootstrapConfiguration.java      | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServiceImpl.java b/application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServiceImpl.java
index 34f8c54300..06e772c52d 100644
--- a/application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServiceImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/lwm2m/LwM2MServiceImpl.java
@@ -55,7 +55,7 @@ public class LwM2MServiceImpl implements LwM2MService {
         if (publicKeyBase64 == null) {
             bsServ.setServerPublicKey("");
         } else {
-            bsServ.setServerPublicKey(Base64.encodeBase64String(getPublicKey(serverConfig)));
+            bsServ.setServerPublicKey(Base64.encodeBase64String(publicKeyBase64));
         }
         return bsServ;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/lwm2m/BootstrapConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/lwm2m/BootstrapConfiguration.java
index 4b3901d655..007fd81c07 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/device/data/lwm2m/BootstrapConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/data/lwm2m/BootstrapConfiguration.java
@@ -16,15 +16,13 @@
 package org.thingsboard.server.common.data.device.data.lwm2m;
 
 import lombok.Data;
+import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.ServerConfig;
 import org.thingsboard.server.common.data.device.profile.lwm2m.bootstrap.ServerCredentials;
 
-import java.util.Map;
-
 @Data
 public class BootstrapConfiguration {
 
-    //TODO: define the objects;
-    private Map<String, Object> servers;
+    private ServerConfig servers;
     private ServerCredentials lwm2mServer;
     private ServerCredentials bootstrapServer;