Andrew Shvayka
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
0 additions and
6 deletions
-
common/script/remote-js-client/src/main/java/org/thingsboard/server/service/script/RemoteJsInvokeService.java
-
dao/src/main/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDao.java
-
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java
|
|
|
@ -20,7 +20,6 @@ import com.google.common.util.concurrent.ListenableFuture; |
|
|
|
import com.google.common.util.concurrent.MoreExecutors; |
|
|
|
import lombok.Getter; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.jetbrains.annotations.NotNull; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; |
|
|
|
@ -191,7 +190,6 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService { |
|
|
|
}, callbackExecutor); |
|
|
|
} |
|
|
|
|
|
|
|
@NotNull |
|
|
|
private JsInvokeProtos.RemoteJsRequest buildJsInvokeRequest(JsScriptInfo jsInfo, Object[] args, boolean includeScriptBody, String scriptBody) { |
|
|
|
JsInvokeProtos.JsInvokeRequest.Builder jsRequestBuilder = JsInvokeProtos.JsInvokeRequest.newBuilder() |
|
|
|
.setScriptHash(jsInfo.getHash()) |
|
|
|
|
|
|
|
@ -18,7 +18,6 @@ package org.thingsboard.server.dao.sql.alarm; |
|
|
|
import com.fasterxml.jackson.databind.JsonNode; |
|
|
|
import com.google.common.util.concurrent.ListenableFuture; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.jetbrains.annotations.NotNull; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.data.domain.PageRequest; |
|
|
|
import org.springframework.data.jpa.repository.JpaRepository; |
|
|
|
@ -303,7 +302,6 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A |
|
|
|
return alarmQueryRepository.countAlarmsByQuery(tenantId, customerId, query); |
|
|
|
} |
|
|
|
|
|
|
|
@NotNull |
|
|
|
private static String getPropagationTypes(AlarmPropagationInfo ap) { |
|
|
|
String propagateRelationTypes; |
|
|
|
if (!CollectionUtils.isEmpty(ap.getPropagateRelationTypes())) { |
|
|
|
|
|
|
|
@ -21,7 +21,6 @@ import com.google.gson.JsonElement; |
|
|
|
import com.google.gson.JsonParser; |
|
|
|
import com.google.gson.JsonPrimitive; |
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
import org.jetbrains.annotations.NotNull; |
|
|
|
import org.thingsboard.server.common.data.util.CollectionsUtil; |
|
|
|
import org.thingsboard.common.util.DonAsynchron; |
|
|
|
import org.thingsboard.rule.engine.api.EmptyNodeConfiguration; |
|
|
|
@ -127,7 +126,6 @@ public class TbCopyAttributesToEntityViewNode implements TbNode { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@NotNull |
|
|
|
private FutureCallback<Void> getFutureCallback(TbContext ctx, TbMsg msg, EntityView entityView) { |
|
|
|
return new FutureCallback<Void>() { |
|
|
|
@Override |
|
|
|
|