Merge branch 'master' into develop

Author: guFalcon

pom.xml

@@ -1,6 +1,4 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<parent>
 		<groupId>info.unterrainer.commons</groupId>
@@ -10,7 +8,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rest-client</artifactId>
-	<version>0.1.0</version>
+	<version>0.1.2</version>
 	<name>RestClient</name>
 	<packaging>jar</packaging>
 
@@ -26,7 +24,7 @@
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>serialization</artifactId>
-			<version>0.2.0</version>
+			<version>0.2.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>

src/main/java/info/unterrainer/commons/restclient/BaseBuilder.java

@@ -15,7 +15,7 @@
 import info.unterrainer.commons.restclient.RestClient.HttpGetCall;
 import info.unterrainer.commons.restclient.exceptions.RestClientException;
 import info.unterrainer.commons.restclient.jsons.ListJson;
-import info.unterrainer.commons.serialization.JsonMapper;
+import info.unterrainer.commons.serialization.jsonmapper.JsonMapper;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -203,12 +203,12 @@ public T execute() {
 			url += "?" + params;
 
 		switch (retry) {
-		case SHORT:
-			return client.retryShort(provide(url, type, javaType, headers));
-		case ENDURING:
-			return client.retryEnduring(provide(url, type, javaType, headers));
-		default:
-			return client.once(provide(url, type, javaType, headers));
+			case SHORT:
+				return client.retryShort(provide(url, type, javaType, headers));
+			case ENDURING:
+				return client.retryEnduring(provide(url, type, javaType, headers));
+			default:
+				return client.once(provide(url, type, javaType, headers));
 		}
 	}
 

src/main/java/info/unterrainer/commons/restclient/RestClient.java

@@ -5,7 +5,7 @@
 import java.util.concurrent.TimeUnit;
 
 import info.unterrainer.commons.restclient.exceptions.RestClientException;
-import info.unterrainer.commons.serialization.JsonMapper;
+import info.unterrainer.commons.serialization.jsonmapper.JsonMapper;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Call;

src/test/java/info/unterrainer/commons/restclient/BuilderTests.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 
 import info.unterrainer.commons.restclient.jsons.MessageJson;
-import info.unterrainer.commons.serialization.JsonMapper;
+import info.unterrainer.commons.serialization.jsonmapper.JsonMapper;
 
 public class BuilderTests {
 

src/test/java/info/unterrainer/commons/restclient/KeycloakContextTests.java

@@ -5,7 +5,7 @@
 
 import info.unterrainer.commons.restclient.jsons.EliteUserJson;
 import info.unterrainer.commons.restclient.jsons.ListJson;
-import info.unterrainer.commons.serialization.JsonMapper;
+import info.unterrainer.commons.serialization.jsonmapper.JsonMapper;
 
 public class KeycloakContextTests {