From 54b0de0c2c5a4d68eb3cd9ca3965ba2521abf105 Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Thu, 20 Feb 2020 16:09:34 +0200 Subject: [PATCH 1/4] move rest-client to own module --- msa/black-box-tests/pom.xml | 4 +++ pom.xml | 1 + rest-client/pom.xml | 34 +++++++++++++++++++ .../org/thingsboard/client}/RestClient.java | 4 +-- .../client}/utils/RestJsonConverter.java | 2 +- 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 rest-client/pom.xml rename {tools/src/main/java/org/thingsboard/client/tools => rest-client/src/main/java/org/thingsboard/client}/RestClient.java (99%) rename {tools/src/main/java/org/thingsboard/client/tools => rest-client/src/main/java/org/thingsboard/client}/utils/RestJsonConverter.java (98%) diff --git a/msa/black-box-tests/pom.xml b/msa/black-box-tests/pom.xml index f624b7ffd3..ea8ae0db3a 100644 --- a/msa/black-box-tests/pom.xml +++ b/msa/black-box-tests/pom.xml @@ -90,6 +90,10 @@ org.thingsboard tools + + org.thingsboard + rest-client + diff --git a/pom.xml b/pom.xml index ef05999b58..21bb0a6c69 100755 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,7 @@ tools application msa + rest-client diff --git a/rest-client/pom.xml b/rest-client/pom.xml new file mode 100644 index 0000000000..8de2e45589 --- /dev/null +++ b/rest-client/pom.xml @@ -0,0 +1,34 @@ + + + + thingsboard + org.thingsboard + 2.5.0-SNAPSHOT + + 4.0.0 + + rest-client + jar + + Thingsboard Rest Client + https://thingsboard.io + + + UTF-8 + ${basedir}/.. + + + + + org.thingsboard.common + data + + + org.springframework.boot + spring-boot-starter-web + + + + \ No newline at end of file diff --git a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java b/rest-client/src/main/java/org/thingsboard/client/RestClient.java similarity index 99% rename from tools/src/main/java/org/thingsboard/client/tools/RestClient.java rename to rest-client/src/main/java/org/thingsboard/client/RestClient.java index 82c1eb6fd5..2c61b12c1c 100644 --- a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java +++ b/rest-client/src/main/java/org/thingsboard/client/RestClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.client.tools; +package org.thingsboard.client; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -31,7 +31,7 @@ import org.springframework.http.client.support.HttpRequestWrapper; import org.springframework.util.StringUtils; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import org.thingsboard.client.tools.utils.RestJsonConverter; +import org.thingsboard.client.utils.RestJsonConverter; import org.thingsboard.server.common.data.AdminSettings; import org.thingsboard.server.common.data.ClaimRequest; import org.thingsboard.server.common.data.Customer; diff --git a/tools/src/main/java/org/thingsboard/client/tools/utils/RestJsonConverter.java b/rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java similarity index 98% rename from tools/src/main/java/org/thingsboard/client/tools/utils/RestJsonConverter.java rename to rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java index 5e70e78659..2470c2d669 100644 --- a/tools/src/main/java/org/thingsboard/client/tools/utils/RestJsonConverter.java +++ b/rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.client.tools.utils; +package org.thingsboard.client.utils; import com.fasterxml.jackson.databind.JsonNode; import org.springframework.util.CollectionUtils; From 30eaa28f6ccdcb889b4044977628bd8fac039b0b Mon Sep 17 00:00:00 2001 From: YevhenBondarenko Date: Thu, 20 Feb 2020 16:30:24 +0200 Subject: [PATCH 2/4] added rest-client dependencies --- application/pom.xml | 5 ++++ .../server/msa/AbstractContainerTest.java | 2 +- pom.xml | 6 ++++ rest-client/pom.xml | 28 ++++++++++++++----- .../{ => rest}/client/RestClient.java | 4 +-- .../client/utils/RestJsonConverter.java | 2 +- 6 files changed, 36 insertions(+), 11 deletions(-) rename rest-client/src/main/java/org/thingsboard/{ => rest}/client/RestClient.java (99%) rename rest-client/src/main/java/org/thingsboard/{ => rest}/client/utils/RestJsonConverter.java (98%) diff --git a/application/pom.xml b/application/pom.xml index acadf92978..21a319491d 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -220,6 +220,11 @@ tools test + + org.thingsboard + rest-client + test + org.springframework.boot spring-boot-starter-test diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java index 1d603a9415..6032dc112a 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java @@ -38,7 +38,7 @@ import org.junit.rules.TestRule; import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; -import org.thingsboard.client.tools.RestClient; +import org.thingsboard.rest.client.RestClient; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.id.DeviceId; diff --git a/pom.xml b/pom.xml index 21bb0a6c69..547c97448f 100755 --- a/pom.xml +++ b/pom.xml @@ -432,6 +432,12 @@ ${project.version} test + + org.thingsboard + rest-client + ${project.version} + test + org.thingsboard dao diff --git a/rest-client/pom.xml b/rest-client/pom.xml index 8de2e45589..2ed7890e6e 100644 --- a/rest-client/pom.xml +++ b/rest-client/pom.xml @@ -1,14 +1,28 @@ - - + + 4.0.0 - thingsboard org.thingsboard 2.5.0-SNAPSHOT + thingsboard - 4.0.0 - rest-client jar @@ -31,4 +45,4 @@ - \ No newline at end of file + diff --git a/rest-client/src/main/java/org/thingsboard/client/RestClient.java b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java similarity index 99% rename from rest-client/src/main/java/org/thingsboard/client/RestClient.java rename to rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java index 2c61b12c1c..2ece3228aa 100644 --- a/rest-client/src/main/java/org/thingsboard/client/RestClient.java +++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.client; +package org.thingsboard.rest.client; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -31,7 +31,7 @@ import org.springframework.http.client.support.HttpRequestWrapper; import org.springframework.util.StringUtils; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import org.thingsboard.client.utils.RestJsonConverter; +import org.thingsboard.rest.client.utils.RestJsonConverter; import org.thingsboard.server.common.data.AdminSettings; import org.thingsboard.server.common.data.ClaimRequest; import org.thingsboard.server.common.data.Customer; diff --git a/rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java b/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java similarity index 98% rename from rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java rename to rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java index 2470c2d669..d6e7ad9e6c 100644 --- a/rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java +++ b/rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.thingsboard.client.utils; +package org.thingsboard.rest.client.utils; import com.fasterxml.jackson.databind.JsonNode; import org.springframework.util.CollectionUtils; From 106bcd8cc02e9536ff447b8b5f9eab81cf04f444 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Fri, 21 Feb 2020 13:41:46 +0200 Subject: [PATCH 3/4] Minimize Dependency --- rest-client/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest-client/pom.xml b/rest-client/pom.xml index 2ed7890e6e..5d931d7afd 100644 --- a/rest-client/pom.xml +++ b/rest-client/pom.xml @@ -40,8 +40,8 @@ data - org.springframework.boot - spring-boot-starter-web + org.springframework + spring-web From f2aefb5570cd54fd47c9a7666a69e8f835ec2992 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Fri, 21 Feb 2020 15:46:41 +0200 Subject: [PATCH 4/4] Fix for PostgreSQL Inserts logic --- .../server/dao/sqlts/psql/PsqlInsertTsRepository.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/PsqlInsertTsRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/PsqlInsertTsRepository.java index caf4528812..00be466027 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/PsqlInsertTsRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sqlts/psql/PsqlInsertTsRepository.java @@ -85,10 +85,10 @@ public class PsqlInsertTsRepository extends AbstractInsertRepository implements } else { ps.setNull(7, Types.DOUBLE); ps.setNull(12, Types.DOUBLE); - - ps.setString(8, replaceNullChars(tsKvEntity.getJsonValue())); - ps.setString(13, replaceNullChars(tsKvEntity.getJsonValue())); } + + ps.setString(8, replaceNullChars(tsKvEntity.getJsonValue())); + ps.setString(13, replaceNullChars(tsKvEntity.getJsonValue())); } @Override