Refactoring - renaming

application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeInstallInstructionsService.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.edge.instructions;
 
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -52,6 +53,7 @@ public class DefaultEdgeInstallInstructionsService implements EdgeInstallInstruc
     private boolean sslEnabled;
 
     @Value("${app.version:unknown}")
+    @Setter
     private String appVersion;
 
     @Override
@@ -68,11 +70,6 @@ public class DefaultEdgeInstallInstructionsService implements EdgeInstallInstruc
         }
     }
 
-    @Override
-    public void updateApplicationVersion(String version) {
-        appVersion = version;
-    }
-
     private EdgeInstructions getDockerInstallInstructions(Edge edge, HttpServletRequest request) {
         String dockerInstallInstructions = readFile(resolveFile("docker", "instructions.md"));
         String baseUrl = request.getServerName();

application/src/main/java/org/thingsboard/server/service/edge/instructions/DefaultEdgeUpgradeInstructionsService.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.service.edge.instructions;
 
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -48,6 +49,7 @@ public class DefaultEdgeUpgradeInstructionsService implements EdgeUpgradeInstruc
     private final InstallScripts installScripts;
 
     @Value("${app.version:unknown}")
+    @Setter
     private String appVersion;
 
     @Override
@@ -65,11 +67,6 @@ public class DefaultEdgeUpgradeInstructionsService implements EdgeUpgradeInstruc
         }
     }
 
-    @Override
-    public void updateApplicationVersion(String version) {
-        appVersion = version;
-    }
-
     @Override
     public void updateInstructionMap(Map<String, EdgeUpgradeInfo> map) {
         for (String key : map.keySet()) {

application/src/main/java/org/thingsboard/server/service/edge/instructions/EdgeInstallInstructionsService.java

@@ -24,5 +24,5 @@ public interface EdgeInstallInstructionsService {
 
     EdgeInstructions getInstallInstructions(Edge edge, String installationMethod, HttpServletRequest request);
 
-    void updateApplicationVersion(String version);
+    void setAppVersion(String version);
 }

application/src/main/java/org/thingsboard/server/service/edge/instructions/EdgeUpgradeInstructionsService.java

@@ -26,5 +26,5 @@ public interface EdgeUpgradeInstructionsService {
 
     void updateInstructionMap(Map<String, EdgeUpgradeInfo> upgradeVersions);
 
-    void updateApplicationVersion(String version);
+    void setAppVersion(String version);
 }

application/src/main/java/org/thingsboard/server/service/update/DefaultUpdateService.java

@@ -155,15 +155,13 @@ public class DefaultUpdateService implements UpdateService {
                         .build());
             }
             ObjectNode edgeRequest = JacksonUtil.newObjectNode().put(VERSION_PARAM, version);
-            String prevEdgeInstallVersion = edgeInstallVersion;
+            String edgeInstallVersion = restClient.postForObject(UPDATE_SERVER_BASE_URL + "/api/v1/edge/installMapping", new HttpEntity<>(edgeRequest.toString(), headers), String.class);
-            edgeInstallVersion = restClient.postForObject(UPDATE_SERVER_BASE_URL + "/api/v1/edge/installMapping", new HttpEntity<>(edgeRequest.toString(), headers), String.class);
+            if (edgeInstallVersion != null) {
-            if (edgeInstallVersion != null && !edgeInstallVersion.equals(prevEdgeInstallVersion)) {
+                edgeInstallInstructionsService.setAppVersion(edgeInstallVersion);
-                edgeInstallInstructionsService.updateApplicationVersion(edgeInstallVersion);
+                edgeUpgradeInstructionsService.setAppVersion(edgeInstallVersion);
-                edgeUpgradeInstructionsService.updateApplicationVersion(edgeInstallVersion);
             }
-            EdgeUpgradeMessage prevEdgeUpgradeMessage = edgeUpgradeMessage;
+            EdgeUpgradeMessage edgeUpgradeMessage = restClient.postForObject(UPDATE_SERVER_BASE_URL + "/api/v1/edge/upgradeMapping", new HttpEntity<>(edgeRequest.toString(), headers), EdgeUpgradeMessage.class);
-            edgeUpgradeMessage = restClient.postForObject(UPDATE_SERVER_BASE_URL + "/api/v1/edge/upgradeMapping", new HttpEntity<>(edgeRequest.toString(), headers), EdgeUpgradeMessage.class);
+            if (edgeUpgradeMessage != null) {
-            if (edgeUpgradeMessage != null && !edgeUpgradeMessage.equals(prevEdgeUpgradeMessage)) {
                 edgeUpgradeInstructionsService.updateInstructionMap(edgeUpgradeMessage.getEdgeVersions());
             }
         } catch (Exception e) {