Fixed issue with reconnecting plugin after disconnect

Author: amedviediev

devicehive-plugin/src/main/java/com/devicehive/service/PluginRegisterService.java

@@ -234,6 +234,7 @@ private CompletableFuture<PluginVO> updatePlugin(PluginVO existingPlugin, Plugin
         if (existingPlugin.getStatus().equals(PluginStatus.ACTIVE)) {
             request = pluginUpdateQuery.toRequest(filterService);
             request.setSubscriptionId(existingPlugin.getSubscriptionId());
+            ((PluginSubscribeRequest) request).setTopicName(existingPlugin.getTopicName());
         } else {
             request = new PluginUnsubscribeRequest(existingPlugin.getSubscriptionId(), existingPlugin.getTopicName());
         }
@@ -265,7 +266,7 @@ private JsonObject createTokenResponse(String topicName, JwtTokenVO jwtTokenVO)
 
         response.addProperty("accessToken", jwtTokenVO.getAccessToken());
         response.addProperty("refreshToken", jwtTokenVO.getRefreshToken());
-        response.addProperty("proxyEndpoint", webSocketKafkaProxyConfig.getProxyConnect());
+        response.addProperty("proxyEndpoint", webSocketKafkaProxyConfig.getProxyPluginConnect());
         response.addProperty("topicName", topicName);
 
         return response;

devicehive-plugin/src/main/resources/application.properties

@@ -62,4 +62,8 @@ jwt.access-token-max-age=1800000
 health.initial.delay=300000
 
 #auth service link
-auth.base.url=http://localhost:8090/dh/rest
+auth.base.url=http://localhost:8090/dh/rest
+
+#proxy link
+proxy.connect=localhost:3000
+proxy.plugin.connect=localhost:3001

devicehive-proxy-ws-kafka-impl/src/main/java/com/devicehive/proxy/config/WebSocketKafkaProxyConfig.java

@@ -31,6 +31,9 @@ public class WebSocketKafkaProxyConfig {
     @Value("${proxy.connect:localhost:3000}")
     private String proxyConnect;
 
+    @Value("${proxy.plugin.connect:localhost:3001}")
+    private String proxyPluginConnect;
+
     @Value("${proxy.request-consumer.group:request-consumer-group}")
     private String consumerGroup;
 
@@ -50,6 +53,10 @@ public String getProxyConnect() {
         return proxyConnect;
     }
 
+    public String getProxyPluginConnect() {
+        return proxyPluginConnect;
+    }
+
     public String getConsumerGroup() {
         return consumerGroup;
     }