Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

@@ -10,7 +10,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rest-client</artifactId>
-	<version>0.0.4</version>
+	<version>0.0.5</version>
 	<name>RestClient</name>
 	<packaging>jar</packaging>
 

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

@@ -12,9 +12,11 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import info.unterrainer.commons.httpserver.jsons.ListJson;
 import info.unterrainer.commons.restclient.RestClient.HttpGetCall;
+import info.unterrainer.commons.serialization.JsonMapper;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -67,7 +69,9 @@ public R addUrl(final String urlPart) {
 	 */
 	@SuppressWarnings("unchecked")
 	public R isListJson() {
-		javaType = client.jsonMapper.getTypeFactory().constructParametricType(ListJson.class, type);
+		JsonMapper mapper = client.jsonMapper;
+		TypeFactory typeFactory = mapper.getTypeFactory();
+		javaType = typeFactory.constructParametricType(ListJson.class, type);
 		return (R) this;
 	}
 

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

@@ -33,8 +33,16 @@ public <T> PostKeycloakBuilder<T> post(final RestClient client, final Class<?> t
 	}
 
 	void update(final RestClient client) {
-		long now = System.currentTimeMillis();
+		if (userName == null) {
+			log.error("UserName is null");
+			return;
+		}
+		if (password == null) {
+			log.error("Password is null");
+			return;
+		}
 
+		long now = System.currentTimeMillis();
 		log.debug("now: [{}]", now);
 		log.debug("accessToken: [{}]", accessToken);
 		log.debug("refreshTimestamp: [{}]", refreshTimestamp);