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

fix pr comments

Browse Source
This commit is contained in:
thingsboard 2022-07-12 12:29:27 +03:00
parent c7daaa571e
commit bc88babd11
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
View File

@ -23,7 +23,12 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.server.cluster.TbClusterService; import org.thingsboard.server.cluster.TbClusterService;
import org.thingsboard.server.common.data.*; import org.thingsboard.server.common.data.DataConstants;
import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.HasName;
import org.thingsboard.server.common.data.HasTenantId;
import org.thingsboard.server.common.data.User;
import org.thingsboard.server.common.data.StringUtils;
import org.thingsboard.server.common.data.audit.ActionType; 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.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;

10
common/data/pom.xml
View File

@ -108,16 +108,6 @@
<groupId>de.ruedigermoeller</groupId> <groupId>de.ruedigermoeller</groupId>
<artifactId>fst</artifactId> <artifactId>fst</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.leshan</groupId>
<artifactId>leshan-core</artifactId>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<version>1.11.747</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

8
common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
View File

@ -17,13 +17,9 @@ package org.thingsboard.server.common.data;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
import java.nio.charset.Charset;
import static org.apache.commons.lang3.StringUtils.repeat; import static org.apache.commons.lang3.StringUtils.repeat;
public class StringUtils { public class StringUtils {
public static Charset UTF8 = com.amazonaws.util.StringUtils.UTF8;
public static final String EMPTY = ""; public static final String EMPTY = "";
public static final int INDEX_NOT_FOUND = -1; public static final int INDEX_NOT_FOUND = -1;
@ -101,8 +97,8 @@ public class StringUtils {
return Splitter.fixedLength(maxPartSize).split(value); return Splitter.fixedLength(maxPartSize).split(value);
} }
public static boolean equalsIgnoreCase(String value, String aTrue) { public static boolean equalsIgnoreCase(String str1, String str2) {
return org.eclipse.leshan.core.util.StringUtils.equalsIgnoreCase(value, aTrue); return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
} }
public static String join(String[] keyArray, String lwm2mSeparatorPath) { public static String join(String[] keyArray, String lwm2mSeparatorPath) {

2
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
View File

@ -89,7 +89,7 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import static org.thingsboard.server.common.data.StringUtils.UTF8; import static com.amazonaws.util.StringUtils.UTF8;
import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_ACCEPTED;
import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_NOT_AUTHORIZED; import static io.netty.handler.codec.mqtt.MqttConnectReturnCode.CONNECTION_REFUSED_NOT_AUTHORIZED;
import static io.netty.handler.codec.mqtt.MqttMessageType.CONNACK; import static io.netty.handler.codec.mqtt.MqttMessageType.CONNACK;