Fix code style issues

Igor Kulikov
1 parent 29f64d93
Showing 6 changed files with 19 additions and 19 deletions
application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityDataMsgConstructor.java
application/src/main/java/org/thingsboard/server/service/install/cql/CassandraDbHelper.java
application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityDataMsgConstructor.java
View file @54ba69a
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityDataMsgConstructor.java
View file @54ba69a
@@ -15,13 +15,13 @@
  */
 package org.thingsboard.server.service.edge.rpc.constructor;
+import com.google.gson.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.transport.adaptor.JsonConverter;
@@ -82,7 +82,7 @@ public class EntityDataMsgConstructor {
                     AttributeDeleteMsg.Builder attributeDeleteMsg = AttributeDeleteMsg.newBuilder();
                     attributeDeleteMsg.setScope(entityData.getAsJsonObject().getAsJsonPrimitive("scope").getAsString());
                     JsonArray jsonArray = entityData.getAsJsonObject().getAsJsonArray("keys");
-                    List<String> keys = new Gson().fromJson(jsonArray.toString(), List.class);
+                    List<String> keys = new Gson().fromJson(jsonArray.toString(), new TypeToken<>(){}.getType());
                     attributeDeleteMsg.addAllAttributeNames(keys);
                     attributeDeleteMsg.build();
                     builder.setAttributeDeleteMsg(attributeDeleteMsg);
--- a/application/src/main/java/org/thingsboard/server/service/install/cql/CassandraDbHelper.java
View file @54ba69a
+++ b/application/src/main/java/org/thingsboard/server/service/install/cql/CassandraDbHelper.java
View file @54ba69a
@@ -159,7 +159,7 @@ public class CassandraDbHelper {
                 } else if (type.getProtocolCode() == ProtocolConstants.DataType.TIMESTAMP) {
                     str = ""+row.getInstant(index).toEpochMilli();
                 } else if (type.getProtocolCode() == ProtocolConstants.DataType.BOOLEAN) {
-                    str = new Boolean(row.getBoolean(index)).toString();
+                    str = Boolean.valueOf(row.getBoolean(index)).toString();
                 } else {
                     str = row.getString(index);
                 }
--- a/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
View file @54ba69a
+++ b/application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
View file @54ba69a
@@ -270,7 +270,8 @@ public class EdgeImitator {
         responsesLatch = new CountDownLatch(messageAmount);
     }
-    public <T> Optional<T> findMessageByType(Class<T> tClass) {
+    @SuppressWarnings("unchecked")
+    public <T extends AbstractMessage> Optional<T> findMessageByType(Class<T> tClass) {
         Optional<T> result;
         try {
             lock.lock();
--- a/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
View file @54ba69a
+++ b/common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
View file @54ba69a
@@ -103,9 +103,9 @@ public class LwM2mClient implements Cloneable {
      * @param modelProvider -
      */
     public void deleteResources(String pathIdVer, LwM2mModelProvider modelProvider) {
-        Set key = getKeysEqualsIdVer(pathIdVer);
+        Set<String> key = getKeysEqualsIdVer(pathIdVer);
         key.forEach(pathRez -> {
-            LwM2mPath pathIds = new LwM2mPath(convertToObjectIdFromIdVer(pathRez.toString()));
+            LwM2mPath pathIds = new LwM2mPath(convertToObjectIdFromIdVer(pathRez));
             ResourceModel resourceModel = modelProvider.getObjectModel(registration).getResourceModel(pathIds.getObjectId(), pathIds.getResourceId());
             if (resourceModel != null) {
                 this.resources.get(pathRez).setResourceModel(resourceModel);
@@ -122,8 +122,8 @@ public class LwM2mClient implements Cloneable {
      * @param modelProvider -
      */
     public void updateResourceModel(String idVer, LwM2mModelProvider modelProvider) {
-        Set key = getKeysEqualsIdVer(idVer);
-        key.forEach(k -> this.saveResourceModel(k.toString(), modelProvider));
+        Set<String> key = getKeysEqualsIdVer(idVer);
+        key.forEach(k -> this.saveResourceModel(k, modelProvider));
     }
     private void saveResourceModel(String pathRez, LwM2mModelProvider modelProvider) {
@@ -132,7 +132,7 @@ public class LwM2mClient implements Cloneable {
         this.resources.get(pathRez).setResourceModel(resourceModel);
     }
-    private Set getKeysEqualsIdVer(String idVer) {
+    private Set<String> getKeysEqualsIdVer(String idVer) {
         return this.resources.keySet()
                 .stream()
                 .filter(e -> idVer.equals(e.split(LWM2M_SEPARATOR_PATH)[1]))
--- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View file @54ba69a
+++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View file @54ba69a
@@ -586,7 +586,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
     @Override
     public Object activateInstance(String edgeLicenseSecret, String releaseDate) {
-        Map<String, String> params = new HashMap();
+        Map<String, String> params = new HashMap<>();
         params.put("licenseSecret", edgeLicenseSecret);
         params.put("releaseDate", releaseDate);
         return this.restTemplate.postForEntity(EDGE_LICENSE_SERVER_ENDPOINT + "/api/license/activateInstance?licenseSecret={licenseSecret}&releaseDate={releaseDate}", (Object) null, Object.class, params);
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
View file @54ba69a
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
View file @54ba69a
@@ -16,13 +16,14 @@
 package org.thingsboard.rule.engine.edge;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.StringUtils;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rule.engine.api.EmptyNodeConfiguration;
 import org.thingsboard.rule.engine.api.RuleNode;
 import org.thingsboard.rule.engine.api.TbContext;
@@ -87,8 +88,6 @@ public class TbMsgPushToEdgeNode implements TbNode {
     private EmptyNodeConfiguration config;
-    private static final ObjectMapper json = new ObjectMapper();
-
     private static final String SCOPE = "scope";
     @Override
@@ -200,7 +199,7 @@ public class TbMsgPushToEdgeNode implements TbNode {
             EdgeEventActionType actionType = getEdgeEventActionTypeByMsgType(msgType);
             Map<String, Object> entityBody = new HashMap<>();
             Map<String, String> metadata = msg.getMetaData().getData();
-            JsonNode dataJson = json.readTree(msg.getData());
+            JsonNode dataJson = JacksonUtil.toJsonNode(msg.getData());
             switch (actionType) {
                 case ATTRIBUTES_UPDATED:
                 case POST_ATTRIBUTES:
@@ -208,7 +207,7 @@ public class TbMsgPushToEdgeNode implements TbNode {
                     entityBody.put(SCOPE, getScope(metadata));
                     break;
                 case ATTRIBUTES_DELETED:
-                    List<String> keys = json.treeToValue(dataJson.get("attributes"), List.class);
+                    List<String> keys = JacksonUtil.convertValue(dataJson.get("attributes"), new TypeReference<>() {});
                     entityBody.put("keys", keys);
                     entityBody.put(SCOPE, getScope(metadata));
                     break;
@@ -217,7 +216,7 @@ public class TbMsgPushToEdgeNode implements TbNode {
                     entityBody.put("ts", metadata.get("ts"));
                     break;
             }
-            return buildEdgeEvent(ctx.getTenantId(), actionType, msg.getOriginator().getId(), edgeEventTypeByEntityType, json.valueToTree(entityBody));
+            return buildEdgeEvent(ctx.getTenantId(), actionType, msg.getOriginator().getId(), edgeEventTypeByEntityType, JacksonUtil.valueToTree(entityBody));
         }
     }
@@ -240,9 +239,9 @@ public class TbMsgPushToEdgeNode implements TbNode {
         return edgeEvent;
     }
-    private UUID getUUIDFromMsgData(TbMsg msg) throws JsonProcessingException {
-        JsonNode data = json.readTree(msg.getData()).get("id");
-        String id = json.treeToValue(data.get("id"), String.class);
+    private UUID getUUIDFromMsgData(TbMsg msg) {
+        JsonNode data = JacksonUtil.toJsonNode(msg.getData()).get("id");
+        String id = JacksonUtil.convertValue(data.get("id"), String.class);
         return UUID.fromString(id);
     }