Browse Source

move rest-client to own module

pull/2442/head
YevhenBondarenko 7 years ago
committed by Andrew Shvayka
parent
commit
3c20546d5f
  1. 4
      msa/black-box-tests/pom.xml
  2. 1
      pom.xml
  3. 34
      rest-client/pom.xml
  4. 4
      rest-client/src/main/java/org/thingsboard/client/RestClient.java
  5. 2
      rest-client/src/main/java/org/thingsboard/client/utils/RestJsonConverter.java

4
msa/black-box-tests/pom.xml

@ -90,6 +90,10 @@
<groupId>org.thingsboard</groupId>
<artifactId>tools</artifactId>
</dependency>
<dependency>
<groupId>org.thingsboard</groupId>
<artifactId>rest-client</artifactId>
</dependency>
</dependencies>
<build>

1
pom.xml

@ -106,6 +106,7 @@
<module>tools</module>
<module>application</module>
<module>msa</module>
<module>rest-client</module>
</modules>
<profiles>

34
rest-client/pom.xml

@ -0,0 +1,34 @@
<?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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>thingsboard</artifactId>
<groupId>org.thingsboard</groupId>
<version>2.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rest-client</artifactId>
<packaging>jar</packaging>
<name>Thingsboard Rest Client</name>
<url>https://thingsboard.io</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.dir>${basedir}/..</main.dir>
</properties>
<dependencies>
<dependency>
<groupId>org.thingsboard.common</groupId>
<artifactId>data</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
</dependencies>
</project>

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

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