From 8872ec19b641b827cc4ca413825ddce911b33b14 Mon Sep 17 00:00:00 2001 From: nordmif Date: Tue, 11 Dec 2018 20:11:12 +0200 Subject: [PATCH 01/11] fixed conflicts --- .../server/controller/TelemetryController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java index bebd2cc4d3..4748c22e25 100644 --- a/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/TelemetryController.java @@ -279,8 +279,14 @@ public class TelemetryController extends BaseController { deleteFromTs = 0L; deleteToTs = System.currentTimeMillis(); } else { - deleteFromTs = startTs; - deleteToTs = endTs; + if (startTs == null || endTs == null) { + deleteToTs = endTs; + return getImmediateDeferredResult("When deleteAllDataForKeys is false, start and end timestamp values shouldn't be empty", HttpStatus.BAD_REQUEST); + } + else{ + deleteFromTs = startTs; + deleteToTs = endTs; + } } return accessValidator.validateEntityAndCallback(user, entityIdStr, (result, tenantId, entityId) -> { From 3ec0a7036334669ee6e98a06f629982dac3c3204 Mon Sep 17 00:00:00 2001 From: nordmif Date: Wed, 26 Dec 2018 20:23:35 +0200 Subject: [PATCH 02/11] fixed URL templating --- application/pom.xml | 4 ++++ .../org/thingsboard/server/config/SwaggerConfiguration.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/application/pom.xml b/application/pom.xml index 6280d0031f..d7b560189e 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -264,6 +264,10 @@ org.javadelight delight-nashorn-sandbox + + io.springfox.ui + springfox-swagger-ui-rfc6570 + diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java index 2254cf3da0..52eef828f8 100644 --- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java +++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java @@ -64,7 +64,8 @@ public class SwaggerConfiguration { .paths(apiPaths()) .build() .securitySchemes(newArrayList(jwtTokenKey())) - .securityContexts(newArrayList(securityContext())); + .securityContexts(newArrayList(securityContext())) + .enableUrlTemplating(true); } private ApiKey jwtTokenKey() { From d3ee9ade3c758fb46dbf2a2f484c9cad4553c232 Mon Sep 17 00:00:00 2001 From: nordmif Date: Wed, 26 Dec 2018 20:31:20 +0200 Subject: [PATCH 03/11] added springfox version --- application/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/application/pom.xml b/application/pom.xml index d7b560189e..4af0ad45ec 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -267,6 +267,7 @@ io.springfox.ui springfox-swagger-ui-rfc6570 + 1.0.0 From 17b2eaf350c33df0b82582feb76a3ac9cdf45a57 Mon Sep 17 00:00:00 2001 From: nordmif Date: Thu, 27 Dec 2018 16:21:16 +0200 Subject: [PATCH 04/11] moved dependency declaration --- application/pom.xml | 5 ----- pom.xml | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 4af0ad45ec..6280d0031f 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -264,11 +264,6 @@ org.javadelight delight-nashorn-sandbox - - io.springfox.ui - springfox-swagger-ui-rfc6570 - 1.0.0 - diff --git a/pom.xml b/pom.xml index b3182f74ff..bfb5caa1ce 100755 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,7 @@ 2.19.1 3.0.2 2.6.1 + 1.0.0 1.56 2.0.1 2.4.0 @@ -794,6 +795,11 @@ bucket4j-core ${bucket4j.version} + + io.springfox.ui + springfox-swagger-ui-rfc6570 + ${springfox-swagger-ui-rfc6570.version} + From 2f86547b195e5068f389f307b7489506bb1467e9 Mon Sep 17 00:00:00 2001 From: nordmif Date: Thu, 27 Dec 2018 17:02:40 +0200 Subject: [PATCH 05/11] further fix --- application/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/pom.xml b/application/pom.xml index 6280d0031f..d7b560189e 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -264,6 +264,10 @@ org.javadelight delight-nashorn-sandbox + + io.springfox.ui + springfox-swagger-ui-rfc6570 + From 86f5b3fd08b39d50af9949f8cef32979a9eb8db7 Mon Sep 17 00:00:00 2001 From: nordmif Date: Thu, 27 Dec 2018 17:46:41 +0200 Subject: [PATCH 06/11] more fixes --- application/pom.xml | 1 + pom.xml | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index d7b560189e..88b40946ad 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -267,6 +267,7 @@ io.springfox.ui springfox-swagger-ui-rfc6570 + ${springfox-swagger-ui-rfc6570.version} diff --git a/pom.xml b/pom.xml index bfb5caa1ce..530f39d42e 100755 --- a/pom.xml +++ b/pom.xml @@ -795,11 +795,6 @@ bucket4j-core ${bucket4j.version} - - io.springfox.ui - springfox-swagger-ui-rfc6570 - ${springfox-swagger-ui-rfc6570.version} - From cc0f559651cf1a1e11aafcf37a8d3e6068109b78 Mon Sep 17 00:00:00 2001 From: nordmif Date: Thu, 27 Dec 2018 18:58:28 +0200 Subject: [PATCH 07/11] optimized import --- .../server/actors/ruleChain/RuleNodeActorMessageProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java index 7f200e176e..452b9d7eb8 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActorMessageProcessor.java @@ -17,7 +17,6 @@ package org.thingsboard.server.actors.ruleChain; import akka.actor.ActorContext; import akka.actor.ActorRef; -import akka.event.LoggingAdapter; import org.thingsboard.rule.engine.api.TbContext; import org.thingsboard.rule.engine.api.TbNode; import org.thingsboard.rule.engine.api.TbNodeConfiguration; From 9805828b802f4a532c852b7fb0fadd8b88fc244c Mon Sep 17 00:00:00 2001 From: nordmif Date: Thu, 27 Dec 2018 20:06:18 +0200 Subject: [PATCH 08/11] reverting to first version to check --- application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/pom.xml b/application/pom.xml index 88b40946ad..4af0ad45ec 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -267,7 +267,7 @@ io.springfox.ui springfox-swagger-ui-rfc6570 - ${springfox-swagger-ui-rfc6570.version} + 1.0.0 From 829f8a9786c5faea54f32459aac09a12fd715e6d Mon Sep 17 00:00:00 2001 From: nordmif Date: Fri, 28 Dec 2018 12:09:35 +0200 Subject: [PATCH 09/11] reverted to version before new dependency --- application/pom.xml | 10 +++++----- .../server/config/SwaggerConfiguration.java | 4 ++-- pom.xml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 4af0ad45ec..f9b9850af5 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -264,11 +264,11 @@ org.javadelight delight-nashorn-sandbox - - io.springfox.ui - springfox-swagger-ui-rfc6570 - 1.0.0 - + + + + + diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java index 52eef828f8..ce27a6c48f 100644 --- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java +++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java @@ -64,8 +64,8 @@ public class SwaggerConfiguration { .paths(apiPaths()) .build() .securitySchemes(newArrayList(jwtTokenKey())) - .securityContexts(newArrayList(securityContext())) - .enableUrlTemplating(true); + .securityContexts(newArrayList(securityContext())); + //.enableUrlTemplating(true); } private ApiKey jwtTokenKey() { diff --git a/pom.xml b/pom.xml index 530f39d42e..11181f4e87 100755 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 2.19.1 3.0.2 2.6.1 - 1.0.0 + 1.56 2.0.1 2.4.0 From 4f2a68a72c6c769c55bc0890a77a9f6737941384 Mon Sep 17 00:00:00 2001 From: nordmif Date: Fri, 28 Dec 2018 12:57:53 +0200 Subject: [PATCH 10/11] added dependency with version in correct place --- application/pom.xml | 10 +++++----- .../server/config/SwaggerConfiguration.java | 4 ++-- pom.xml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index f9b9850af5..88b40946ad 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -264,11 +264,11 @@ org.javadelight delight-nashorn-sandbox - - - - - + + io.springfox.ui + springfox-swagger-ui-rfc6570 + ${springfox-swagger-ui-rfc6570.version} + diff --git a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java index ce27a6c48f..52eef828f8 100644 --- a/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java +++ b/application/src/main/java/org/thingsboard/server/config/SwaggerConfiguration.java @@ -64,8 +64,8 @@ public class SwaggerConfiguration { .paths(apiPaths()) .build() .securitySchemes(newArrayList(jwtTokenKey())) - .securityContexts(newArrayList(securityContext())); - //.enableUrlTemplating(true); + .securityContexts(newArrayList(securityContext())) + .enableUrlTemplating(true); } private ApiKey jwtTokenKey() { diff --git a/pom.xml b/pom.xml index 11181f4e87..530f39d42e 100755 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ 2.19.1 3.0.2 2.6.1 - + 1.0.0 1.56 2.0.1 2.4.0 From 4366178b88b48ac727138c3fc6194b9d46c30213 Mon Sep 17 00:00:00 2001 From: nordmif Date: Fri, 28 Dec 2018 15:01:00 +0200 Subject: [PATCH 11/11] added to dependencyManagement --- application/pom.xml | 1 - pom.xml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/pom.xml b/application/pom.xml index 88b40946ad..d7b560189e 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -267,7 +267,6 @@ io.springfox.ui springfox-swagger-ui-rfc6570 - ${springfox-swagger-ui-rfc6570.version} diff --git a/pom.xml b/pom.xml index 530f39d42e..bfb5caa1ce 100755 --- a/pom.xml +++ b/pom.xml @@ -795,6 +795,11 @@ bucket4j-core ${bucket4j.version} + + io.springfox.ui + springfox-swagger-ui-rfc6570 + ${springfox-swagger-ui-rfc6570.version} +