Browse Source

added rest-client dependencies

pull/2445/head
YevhenBondarenko 7 years ago
committed by Andrew Shvayka
parent
commit
30eaa28f6c
  1. 5
      application/pom.xml
  2. 2
      msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java
  3. 6
      pom.xml
  4. 28
      rest-client/pom.xml
  5. 4
      rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java
  6. 2
      rest-client/src/main/java/org/thingsboard/rest/client/utils/RestJsonConverter.java

5
application/pom.xml

@ -220,6 +220,11 @@
<artifactId>tools</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.thingsboard</groupId>
<artifactId>rest-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>

2
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;

6
pom.xml

@ -432,6 +432,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.thingsboard</groupId>
<artifactId>rest-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.thingsboard</groupId>
<artifactId>dao</artifactId>

28
rest-client/pom.xml

@ -1,14 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<!--
Copyright © 2016-2020 The Thingsboard Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>thingsboard</artifactId>
<groupId>org.thingsboard</groupId>
<version>2.5.0-SNAPSHOT</version>
<artifactId>thingsboard</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rest-client</artifactId>
<packaging>jar</packaging>
@ -31,4 +45,4 @@
</dependency>
</dependencies>
</project>
</project>

4
rest-client/src/main/java/org/thingsboard/client/RestClient.java → 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;

2
rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java → 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;
Loading…
Cancel
Save