tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

used jakarta validation constraints

pull/11520/head
IrynaMatveieva 2 years ago
parent
b56f75a996
commit
5256cae804
3 changed files with 32 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNode.java
  2. 8
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeConfiguration.java
  3. 59
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java

26
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNode.java
View File

@ -39,6 +39,8 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
import java.nio.ByteBuffer;
import java.util.concurrent.TimeUnit;
import static org.thingsboard.server.dao.service.ConstraintValidator.validateFields;
@Slf4j
@RuleNode(
type = ComponentType.EXTERNAL,
@ -62,7 +64,8 @@ public class TbAwsLambdaNode extends TbAbstractExternalNode {
@Override
public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
config = TbNodeUtils.convert(configuration, TbAwsLambdaNodeConfiguration.class);
validateConfig();
String errorPrefix = "'" + ctx.getSelf().getName() + "' node configuration is invalid: ";
validateFields(config, errorPrefix);
try {
AWSCredentials awsCredentials = new BasicAWSCredentials(config.getAccessKey(), config.getSecretKey());
client = AWSLambdaAsyncClientBuilder.standard()
@ -136,27 +139,6 @@ public class TbAwsLambdaNode extends TbAbstractExternalNode {
return TbMsg.transformMsgMetadata(origMsg, metaData);
}
private void validateConfig() throws TbNodeException {
if (StringUtils.isBlank(config.getFunctionName())) {
throw new TbNodeException("Function name must be set!", true);
}
if (StringUtils.isBlank(config.getAccessKey())) {
throw new TbNodeException("Access Key must be set!", true);
}
if (StringUtils.isBlank(config.getSecretKey())) {
throw new TbNodeException("Secret Access Key must be set!", true);
}
if (StringUtils.isBlank(config.getRegion())) {
throw new TbNodeException("Region must be set!", true);
}
if (config.getConnectionTimeout() < 0) {
throw new TbNodeException("Min connection timeout is 0!", true);
}
if (config.getRequestTimeout() < 0) {
throw new TbNodeException("Min request timeout is 0!", true);
}
}
@Override
public void destroy() {
if (client != null) {

8
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeConfiguration.java
View File

@ -15,6 +15,8 @@
*/
package org.thingsboard.rule.engine.aws.lambda;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import org.thingsboard.rule.engine.api.NodeConfiguration;
@ -23,12 +25,18 @@ public class TbAwsLambdaNodeConfiguration implements NodeConfiguration<TbAwsLamb
public static final String DEFAULT_QUALIFIER = "$LATEST";
@NotBlank
private String accessKey;
@NotBlank
private String secretKey;
@NotBlank
private String region;
@NotBlank
private String functionName;
private String qualifier;
@Min(0)
private int connectionTimeout;
@Min(0)
private int requestTimeout;
private boolean tellFailureIfFuncThrowsExc;

59
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/aws/lambda/TbAwsLambdaNodeTest.java
View File

@ -36,13 +36,14 @@ import org.springframework.test.util.ReflectionTestUtils;
import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.rule.engine.api.TbContext;
import org.thingsboard.rule.engine.api.TbNodeConfiguration;
import org.thingsboard.rule.engine.api.TbNodeException;
import org.thingsboard.rule.engine.api.util.TbNodeUtils;
import org.thingsboard.server.common.data.StringUtils;
import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.msg.TbMsgType;
import org.thingsboard.server.common.data.rule.RuleNode;
import org.thingsboard.server.common.msg.TbMsg;
import org.thingsboard.server.common.msg.TbMsgMetaData;
import org.thingsboard.server.dao.exception.DataValidationException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
@ -50,8 +51,8 @@ import java.util.Map;
import java.util.UUID;
import java.util.stream.Stream;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
@ -72,7 +73,7 @@ public class TbAwsLambdaNodeTest {
private AWSLambdaAsync clientMock;
@BeforeEach
void setUp() {
public void setUp() {
node = new TbAwsLambdaNode();
config = new TbAwsLambdaNodeConfiguration().defaultConfiguration();
config.setAccessKey("accessKey");
@ -98,12 +99,7 @@ public class TbAwsLambdaNodeTest {
@ValueSource(strings = " ")
public void givenInvalidFunctionName_whenInit_thenThrowsException(String funcName) {
config.setFunctionName(funcName);
var configuration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
assertThatThrownBy(() -> node.init(ctx, configuration))
.isInstanceOf(TbNodeException.class)
.hasMessage("Function name must be set!")
.extracting(e -> ((TbNodeException) e).isUnrecoverable())
.isEqualTo(true);
verifyDataValidationExceptionOnInit();
}
@ParameterizedTest
@ -111,12 +107,7 @@ public class TbAwsLambdaNodeTest {
@ValueSource(strings = " ")
public void givenInvalidAccessKey_whenInit_thenThrowsException(String accessKey) {
config.setAccessKey(accessKey);
var configuration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
assertThatThrownBy(() -> node.init(ctx, configuration))
.isInstanceOf(TbNodeException.class)
.hasMessage("Access Key must be set!")
.extracting(e -> ((TbNodeException) e).isUnrecoverable())
.isEqualTo(true);
verifyDataValidationExceptionOnInit();
}
@ParameterizedTest
@ -124,12 +115,7 @@ public class TbAwsLambdaNodeTest {
@ValueSource(strings = " ")
public void givenInvalidSecretAccessKey_whenInit_thenThrowsException(String secretAccessKey) {
config.setSecretKey(secretAccessKey);
var configuration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
assertThatThrownBy(() -> node.init(ctx, configuration))
.isInstanceOf(TbNodeException.class)
.hasMessage("Secret Access Key must be set!")
.extracting(e -> ((TbNodeException) e).isUnrecoverable())
.isEqualTo(true);
verifyDataValidationExceptionOnInit();
}
@ParameterizedTest
@ -137,34 +123,19 @@ public class TbAwsLambdaNodeTest {
@ValueSource(strings = " ")
public void givenInvalidRegion_whenInit_thenThrowsException(String region) {
config.setRegion(region);
var configuration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
assertThatThrownBy(() -> node.init(ctx, configuration))
.isInstanceOf(TbNodeException.class)
.hasMessage("Region must be set!")
.extracting(e -> ((TbNodeException) e).isUnrecoverable())
.isEqualTo(true);
verifyDataValidationExceptionOnInit();
}
@Test
public void givenInvalidConnectionTimeout_whenInit_thenThrowsException() {
config.setConnectionTimeout(-100);
var configuration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
assertThatThrownBy(() -> node.init(ctx, configuration))
.isInstanceOf(TbNodeException.class)
.hasMessage("Min connection timeout is 0!")
.extracting(e -> ((TbNodeException) e).isUnrecoverable())
.isEqualTo(true);
verifyDataValidationExceptionOnInit();
}
@Test
public void givenInvalidRequestTimeout_whenInit_thenThrowsException() {
config.setRequestTimeout(-100);
var configuration = new TbNodeConfiguration(JacksonUtil.valueToTree(config));
assertThatThrownBy(() -> node.init(ctx, configuration))
.isInstanceOf(TbNodeException.class)
.hasMessage("Min request timeout is 0!")
.extracting(e -> ((TbNodeException) e).isUnrecoverable())
.isEqualTo(true);
verifyDataValidationExceptionOnInit();
}
@ParameterizedTest
@ -347,6 +318,16 @@ public class TbAwsLambdaNodeTest {
assertThat(throwableCaptor.getValue()).isInstanceOf(AWSLambdaException.class).hasMessageStartingWith(errorMsg);
}
private void verifyDataValidationExceptionOnInit() {
RuleNode ruleNode = new RuleNode();
ruleNode.setName("test");
when(ctx.getSelf()).thenReturn(ruleNode);
String errorPrefix = "'test' node configuration is invalid: ";
assertThatThrownBy(() -> node.init(ctx, new TbNodeConfiguration(JacksonUtil.valueToTree(config))))
.isInstanceOf(DataValidationException.class)
.hasMessageContaining(errorPrefix);
}
private void init() {
ReflectionTestUtils.setField(node, "client", clientMock);
ReflectionTestUtils.setField(node, "config", config);

Write Preview
Loading…
Cancel
Save