dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix code style issues

Browse Source
This commit is contained in:
Igor Kulikov 2021-04-13 13:09:19 +03:00
parent 29f64d9380
commit 54ba69a82c
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/EntityDataMsgConstructor.java
View File

@ -15,13 +15,13 @@
*/ */
package org.thingsboard.server.service.edge.rpc.constructor; package org.thingsboard.server.service.edge.rpc.constructor;
import com.google.gson.reflect.TypeToken;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; 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.edge.EdgeEventActionType;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.transport.adaptor.JsonConverter; import org.thingsboard.server.common.transport.adaptor.JsonConverter;
@ -82,7 +82,7 @@ public class EntityDataMsgConstructor {
AttributeDeleteMsg.Builder attributeDeleteMsg = AttributeDeleteMsg.newBuilder(); AttributeDeleteMsg.Builder attributeDeleteMsg = AttributeDeleteMsg.newBuilder();
attributeDeleteMsg.setScope(entityData.getAsJsonObject().getAsJsonPrimitive("scope").getAsString()); attributeDeleteMsg.setScope(entityData.getAsJsonObject().getAsJsonPrimitive("scope").getAsString());
JsonArray jsonArray = entityData.getAsJsonObject().getAsJsonArray("keys"); 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.addAllAttributeNames(keys);
attributeDeleteMsg.build(); attributeDeleteMsg.build();
builder.setAttributeDeleteMsg(attributeDeleteMsg); builder.setAttributeDeleteMsg(attributeDeleteMsg);

2
application/src/main/java/org/thingsboard/server/service/install/cql/CassandraDbHelper.java
View File

@ -159,7 +159,7 @@ public class CassandraDbHelper {
} else if (type.getProtocolCode() == ProtocolConstants.DataType.TIMESTAMP) { } else if (type.getProtocolCode() == ProtocolConstants.DataType.TIMESTAMP) {
str = ""+row.getInstant(index).toEpochMilli(); str = ""+row.getInstant(index).toEpochMilli();
} else if (type.getProtocolCode() == ProtocolConstants.DataType.BOOLEAN) { } else if (type.getProtocolCode() == ProtocolConstants.DataType.BOOLEAN) {
str = new Boolean(row.getBoolean(index)).toString(); str = Boolean.valueOf(row.getBoolean(index)).toString();
} else { } else {
str = row.getString(index); str = row.getString(index);
} }

3
application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
View File

@ -270,7 +270,8 @@ public class EdgeImitator {
responsesLatch = new CountDownLatch(messageAmount); 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; Optional<T> result;
try { try {
lock.lock(); lock.lock();

10
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
View File

@ -103,9 +103,9 @@ public class LwM2mClient implements Cloneable {
* @param modelProvider - * @param modelProvider -
*/ */
public void deleteResources(String pathIdVer, LwM2mModelProvider modelProvider) { public void deleteResources(String pathIdVer, LwM2mModelProvider modelProvider) {
Set key = getKeysEqualsIdVer(pathIdVer); Set<String> key = getKeysEqualsIdVer(pathIdVer);
key.forEach(pathRez -> { 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()); ResourceModel resourceModel = modelProvider.getObjectModel(registration).getResourceModel(pathIds.getObjectId(), pathIds.getResourceId());
if (resourceModel != null) { if (resourceModel != null) {
this.resources.get(pathRez).setResourceModel(resourceModel); this.resources.get(pathRez).setResourceModel(resourceModel);
@ -122,8 +122,8 @@ public class LwM2mClient implements Cloneable {
* @param modelProvider - * @param modelProvider -
*/ */
public void updateResourceModel(String idVer, LwM2mModelProvider modelProvider) { public void updateResourceModel(String idVer, LwM2mModelProvider modelProvider) {
Set key = getKeysEqualsIdVer(idVer); Set<String> key = getKeysEqualsIdVer(idVer);
key.forEach(k -> this.saveResourceModel(k.toString(), modelProvider)); key.forEach(k -> this.saveResourceModel(k, modelProvider));
} }
private void saveResourceModel(String pathRez, LwM2mModelProvider modelProvider) { private void saveResourceModel(String pathRez, LwM2mModelProvider modelProvider) {
@ -132,7 +132,7 @@ public class LwM2mClient implements Cloneable {
this.resources.get(pathRez).setResourceModel(resourceModel); this.resources.get(pathRez).setResourceModel(resourceModel);
} }
private Set getKeysEqualsIdVer(String idVer) { private Set<String> getKeysEqualsIdVer(String idVer) {
return this.resources.keySet() return this.resources.keySet()
.stream() .stream()
.filter(e -> idVer.equals(e.split(LWM2M_SEPARATOR_PATH)[1])) .filter(e -> idVer.equals(e.split(LWM2M_SEPARATOR_PATH)[1]))

2
dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java
View File

@ -586,7 +586,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic
@Override @Override
public Object activateInstance(String edgeLicenseSecret, String releaseDate) { 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("licenseSecret", edgeLicenseSecret);
params.put("releaseDate", releaseDate); params.put("releaseDate", releaseDate);
return this.restTemplate.postForEntity(EDGE_LICENSE_SERVER_ENDPOINT + "/api/license/activateInstance?licenseSecret={licenseSecret}&releaseDate={releaseDate}", (Object) null, Object.class, params); return this.restTemplate.postForEntity(EDGE_LICENSE_SERVER_ENDPOINT + "/api/license/activateInstance?licenseSecret={licenseSecret}&releaseDate={releaseDate}", (Object) null, Object.class, params);

17
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/TbMsgPushToEdgeNode.java
View File

@ -16,13 +16,14 @@
package org.thingsboard.rule.engine.edge; package org.thingsboard.rule.engine.edge;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode; 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.FutureCallback;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.rule.engine.api.EmptyNodeConfiguration; import org.thingsboard.rule.engine.api.EmptyNodeConfiguration;
import org.thingsboard.rule.engine.api.RuleNode; import org.thingsboard.rule.engine.api.RuleNode;
import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbContext;
@ -87,8 +88,6 @@ public class TbMsgPushToEdgeNode implements TbNode {
private EmptyNodeConfiguration config; private EmptyNodeConfiguration config;
private static final ObjectMapper json = new ObjectMapper();
private static final String SCOPE = "scope"; private static final String SCOPE = "scope";
@Override @Override
@ -200,7 +199,7 @@ public class TbMsgPushToEdgeNode implements TbNode {
EdgeEventActionType actionType = getEdgeEventActionTypeByMsgType(msgType); EdgeEventActionType actionType = getEdgeEventActionTypeByMsgType(msgType);
Map<String, Object> entityBody = new HashMap<>(); Map<String, Object> entityBody = new HashMap<>();
Map<String, String> metadata = msg.getMetaData().getData(); Map<String, String> metadata = msg.getMetaData().getData();
JsonNode dataJson = json.readTree(msg.getData()); JsonNode dataJson = JacksonUtil.toJsonNode(msg.getData());
switch (actionType) { switch (actionType) {
case ATTRIBUTES_UPDATED: case ATTRIBUTES_UPDATED:
case POST_ATTRIBUTES: case POST_ATTRIBUTES:
@ -208,7 +207,7 @@ public class TbMsgPushToEdgeNode implements TbNode {
entityBody.put(SCOPE, getScope(metadata)); entityBody.put(SCOPE, getScope(metadata));
break; break;
case ATTRIBUTES_DELETED: 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("keys", keys);
entityBody.put(SCOPE, getScope(metadata)); entityBody.put(SCOPE, getScope(metadata));
break; break;
@ -217,7 +216,7 @@ public class TbMsgPushToEdgeNode implements TbNode {
entityBody.put("ts", metadata.get("ts")); entityBody.put("ts", metadata.get("ts"));
break; 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; return edgeEvent;
} }
private UUID getUUIDFromMsgData(TbMsg msg) throws JsonProcessingException { private UUID getUUIDFromMsgData(TbMsg msg) {
JsonNode data = json.readTree(msg.getData()).get("id"); JsonNode data = JacksonUtil.toJsonNode(msg.getData()).get("id");
String id = json.treeToValue(data.get("id"), String.class); String id = JacksonUtil.convertValue(data.get("id"), String.class);
return UUID.fromString(id); return UUID.fromString(id);
} }