diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtils.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtils.java
new file mode 100644
index 00000000..b04d38e8
--- /dev/null
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtils.java
@@ -0,0 +1,328 @@
+// Generated by RSD - Do not modify
+package dev.rsdlang.sample.client.jdkhttp.impl;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.HexFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import dev.rsdlang.sample.client.impl.model.json._JsonUtils;
+import dev.rsdlang.sample.client.impl.model.json._JsonUtils.TypeInfo;
+import dev.rsdlang.sample.client.model._Base;
+
+public class BaseUtils {
+	private record SearchParam(String key, Object value) {
+
+	}
+
+	public static class URLSearchParams {
+		private List<SearchParam> params = new ArrayList<>();
+
+		public void append(String key, Object value) {
+			params.add(new SearchParam(key, value));
+		}
+
+		public String toQueryString() {
+			if (params.isEmpty()) {
+				return "";
+			}
+			return "?" + params.stream()
+					.map(e -> "%s=%s".formatted(encodeQueryString(e.key), encodeQueryString(e.value)))
+					.collect(Collectors.joining("&"));
+		}
+	}
+
+	private static String encodeQueryString(Object value) {
+		if (value == null) {
+			return "null";
+		}
+
+		if (value instanceof byte[] bytes) {
+			return encodeBase64(bytes);
+		}
+
+		return URLEncoder.encode(value.toString(), StandardCharsets.UTF_8);
+	}
+
+	public static String[] toHeaders(Map<String, String> data) {
+		return data.entrySet().stream()
+				.flatMap(e -> Stream.of(e.getKey(), e.getValue()))
+				.toArray(String[]::new);
+	}
+
+	public static byte[] ofBoolean(
+			Boolean value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.BOOLEAN);
+	}
+
+	public static byte[] ofBooleanList(
+			List<Boolean> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.BOOLEAN.withMulti());
+	}
+
+	public static byte[] ofShort(
+			Short value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.SHORT);
+	}
+
+	public static byte[] ofShortList(
+			List<Short> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.SHORT.withMulti());
+	}
+
+	public static byte[] ofInt(
+			Integer value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.INTEGER);
+	}
+
+	public static byte[] ofIntList(
+			List<Integer> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.INTEGER.withMulti());
+	}
+
+	public static byte[] ofLong(
+			Long value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.LONG);
+	}
+
+	public static byte[] ofLongList(
+			List<Long> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.LONG.withMulti());
+	}
+
+	public static byte[] ofFloat(
+			Float value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.FLOAT);
+	}
+
+	public static byte[] ofFloatList(
+			List<Float> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.FLOAT.withMulti());
+	}
+
+	public static byte[] ofDouble(
+			Double value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.DOUBLE);
+	}
+
+	public static byte[] ofDoubleList(
+			List<Double> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.DOUBLE.withMulti());
+	}
+
+	public static byte[] ofString(
+			String value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofStringList(
+			List<String> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofLocalDate(
+			LocalDate value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofLocalDateList(
+			List<LocalDate> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofLocalDateTime(
+			LocalDateTime value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofLocalDateTimeList(
+			List<LocalDateTime> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofZonedDateTime(
+			ZonedDateTime value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofZonedDateTimeList(
+			List<ZonedDateTime> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofLocalTime(
+			LocalTime value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofLocalTimeList(
+			List<LocalTime> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofOffsetDateTime(
+			OffsetDateTime value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofOffsetDateTimeList(
+			List<OffsetDateTime> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofLiteral(
+			Object value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static <T> byte[] ofLiteralList(
+			List<T> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static <T extends _Base.BaseData> byte[] ofObject(
+			T value,
+			boolean nullable,
+			String contentType,
+			Class<T> type) {
+		return of(value, nullable, contentType, TypeInfo.value(type));
+	}
+
+	public static <T extends _Base.BaseData> byte[] ofObjectList(
+			List<T> value,
+			boolean nullable,
+			String contentType,
+			Class<T> type) {
+		return of(value, nullable, contentType, TypeInfo.value(type).withMulti());
+	}
+
+	private static byte[] of(
+			Object value,
+			boolean nullable,
+			String contentType,
+			TypeInfo<?> baseTypeInfo) {
+		var typeInfo = baseTypeInfo;
+		if (nullable) {
+			typeInfo = typeInfo.withNullable();
+		}
+
+		return _JsonUtils.encodeValue(value, contentType, typeInfo);
+	}
+
+	public static String encodeAsciiString(String text) {
+		text = text.replace("\\u", "\\u005Cu"); // Escape existing \\u sequences
+		int leading = 0;
+		while (leading < text.length() && text.charAt(leading) == ' ') leading++;
+		if (leading > 0) {
+			text = "\\u0020".repeat(leading) + text.substring(leading);
+		}
+		int trailing = 0;
+		int len = text.length();
+		while (trailing < len && text.charAt(len - 1 - trailing) == ' ') trailing++;
+		if (trailing > 0) {
+			text = text.substring(0, len - trailing) + "\\u0020".repeat(trailing);
+		}
+		var b = new StringBuilder(text.length());
+		var l = text.length();
+		for (var i = 0; i < l; i++) {
+			var c = text.charAt(i);
+			// Escape non-printable characters, comma and all non-ASCII characters
+			if (c < 32 || c > 126 || c == 44) {
+				b.append(String.format("\\u%04x", (int) c));
+			} else {
+				b.append(c);
+			}
+		}
+
+		return b.toString();
+	}
+
+	public static String encodeBase64(byte[] value) {
+		return Base64.getEncoder().encodeToString(value);
+	}
+
+	public static String encodeURIComponent(String value) {
+		var bytes = value.getBytes(StandardCharsets.UTF_8);
+		var result = new StringBuilder();
+
+		HexFormat hex = HexFormat.of().withUpperCase();
+		for (byte b : bytes) {
+			// Unreserved characters according to RFC 3986
+			if ((b >= 'A' && b <= 'Z') // Alpanumeric characters uppercase
+					|| (b >= 'a' && b <= 'z') // Alpanumeric characters lowercase
+					|| (b >= '0' && b <= '9') // Numeric characters
+					|| b == '-' || b == '_' || b == '.' // Unreserved Part 1
+					|| b == '!' || b == '~' || b == '*' // Unreserved Part 2
+					|| b == '\'' || b == '(' || b == ')' // Unreserved Part 3
+			) {
+				result.append((char) b); // safe as we know this is an ascii character
+			} else {
+				result.append('%');
+				hex.toHexDigits(result, b);
+			}
+		}
+		return result.toString();
+	}
+}
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BinaryTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BinaryTypesServiceImpl.java
index 226b8c97..b2974293 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BinaryTypesServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BinaryTypesServiceImpl.java
@@ -83,11 +83,11 @@ public int uploadFile(RSDFile data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFile", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFile", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -127,11 +127,11 @@ public int uploadFileOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -174,11 +174,11 @@ public int uploadFileOpt(RSDFile data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -221,11 +221,11 @@ public int uploadFileNil(RSDFile data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -265,11 +265,11 @@ public int uploadFileOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -315,11 +315,11 @@ public int uploadFileOptNil(RSDFile data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -362,11 +362,11 @@ public int uploadBlob(RSDBlob data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlob", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlob", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -406,11 +406,11 @@ public int uploadBlobOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -453,11 +453,11 @@ public int uploadBlobOpt(RSDBlob data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -500,11 +500,11 @@ public int uploadBlobNil(RSDBlob data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -544,11 +544,11 @@ public int uploadBlobOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -594,11 +594,11 @@ public int uploadBlobOptNil(RSDBlob data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 201) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -641,11 +641,11 @@ public int uploadFileList(List<RSDFile> data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileList", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileList", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -685,11 +685,11 @@ public int uploadFileListOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -732,11 +732,11 @@ public int uploadFileListOpt(List<RSDFile> data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -779,11 +779,11 @@ public int uploadFileListNil(List<RSDFile> data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileListNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileListNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -823,11 +823,11 @@ public int uploadFileListOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileListOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileListOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -873,11 +873,11 @@ public int uploadFileListOptNil(List<RSDFile> data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadFileListOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadFileListOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -920,11 +920,11 @@ public int uploadBlobList(List<RSDBlob> data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobList", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobList", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -964,11 +964,11 @@ public int uploadBlobListOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1011,11 +1011,11 @@ public int uploadBlobListOpt(List<RSDBlob> data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1058,11 +1058,11 @@ public int uploadBlobListNil(List<RSDBlob> data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobListNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobListNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1102,11 +1102,11 @@ public int uploadBlobListOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobListOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobListOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1152,11 +1152,11 @@ public int uploadBlobListOptNil(List<RSDBlob> data) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("uploadBlobListOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadBlobListOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1198,7 +1198,7 @@ public UploadMixedResult.Data uploadMixed(String text, int number, SimpleRecord.
 			$jsonPayload.add("recList", _JsonUtils.toJsonValueArray(recList, i -> ((_BaseDataImpl) i).data));
 			$formDataBuilder.addBlob("dataFile", dataFile);
 			$formDataBuilder.addBlob("dataBlob", dataBlob);
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1213,11 +1213,11 @@ public UploadMixedResult.Data uploadMixed(String text, int number, SimpleRecord.
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixed", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixed", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1244,7 +1244,7 @@ public UploadMixedResult.Data uploadMixedOpt() {
 		try {
 			var $formDataBuilder = RSDFormDataPublisherBuilder.create();
 			var $jsonPayload = Json.createObjectBuilder();
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1259,11 +1259,11 @@ public UploadMixedResult.Data uploadMixedOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1293,7 +1293,7 @@ public UploadMixedResult.Data uploadMixedOpt(String text) {
 			if (text != null) {
 				$jsonPayload.add("text", text);
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1308,11 +1308,11 @@ public UploadMixedResult.Data uploadMixedOpt(String text) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1345,7 +1345,7 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number) {
 			if (number != null) {
 				$jsonPayload.add("number", number);
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1360,11 +1360,11 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1400,7 +1400,7 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 			if (rec != null) {
 				$jsonPayload.add("rec", ((_BaseDataImpl) rec).data);
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1415,11 +1415,11 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1458,7 +1458,7 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 			if (textList != null) {
 				$jsonPayload.add("textList", _JsonUtils.toJsonLiteralArray(textList, Objects::toString));
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1473,11 +1473,11 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1519,7 +1519,7 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 			if (numberList != null) {
 				$jsonPayload.add("numberList", _JsonUtils.toJsonIntArray(numberList));
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1534,11 +1534,11 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1583,7 +1583,7 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 			if (recList != null) {
 				$jsonPayload.add("recList", _JsonUtils.toJsonValueArray(recList, i -> ((_BaseDataImpl) i).data));
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1598,11 +1598,11 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1650,7 +1650,7 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 			if (dataFile != null) {
 				$formDataBuilder.addBlob("dataFile", dataFile);
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1665,11 +1665,11 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1720,7 +1720,7 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 			if (dataBlob != null) {
 				$formDataBuilder.addBlob("dataBlob", dataBlob);
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1735,11 +1735,11 @@ public UploadMixedResult.Data uploadMixedOpt(String text, Integer number, Simple
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1802,7 +1802,7 @@ public UploadMixedResult.Data uploadMixedNil(String text, Integer number, Simple
 			if (dataBlob != null) {
 				$formDataBuilder.addBlob("dataBlob", dataBlob);
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1817,11 +1817,11 @@ public UploadMixedResult.Data uploadMixedNil(String text, Integer number, Simple
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1848,7 +1848,7 @@ public UploadMixedResult.Data uploadMixedOptNil() {
 		try {
 			var $formDataBuilder = RSDFormDataPublisherBuilder.create();
 			var $jsonPayload = Json.createObjectBuilder();
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1863,11 +1863,11 @@ public UploadMixedResult.Data uploadMixedOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1899,7 +1899,7 @@ public UploadMixedResult.Data uploadMixedOptNil(String text) {
 			} else {
 				$jsonPayload.addNull("text");
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1914,11 +1914,11 @@ public UploadMixedResult.Data uploadMixedOptNil(String text) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1955,7 +1955,7 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number) {
 			} else {
 				$jsonPayload.addNull("number");
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -1970,11 +1970,11 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2016,7 +2016,7 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 			} else {
 				$jsonPayload.addNull("rec");
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -2031,11 +2031,11 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2082,7 +2082,7 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 			} else {
 				$jsonPayload.addNull("textList");
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -2097,11 +2097,11 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2153,7 +2153,7 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 			} else {
 				$jsonPayload.addNull("numberList");
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -2168,11 +2168,11 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2229,7 +2229,7 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 			} else {
 				$jsonPayload.addNull("recList");
 			}
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -2244,11 +2244,11 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2311,7 +2311,7 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 				$formDataBuilder.addString("_rsdNull-dataFile", "true", null);
 			}
 
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -2326,11 +2326,11 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2399,7 +2399,7 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 				$formDataBuilder.addString("_rsdNull-dataBlob", "true", null);
 			}
 
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesUploadMixedOptNilDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesUploadMixedOptNilDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -2414,11 +2414,11 @@ public UploadMixedResult.Data uploadMixedOptNil(String text, Integer number, Sim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UploadMixedResultDataImpl::of, UploadMixedResult.Data.class);
 				this.lifecycleHook.onSuccess("uploadMixedOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("uploadMixedOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2447,19 +2447,19 @@ public MixedResult.Data mixed(String pathString, int pathNumber, String headerSt
 
 		var $path = "%s/api/binarytypes/mixed/%s/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathString)),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathNumber)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathString)),
+				BaseUtils.encodeURIComponent(Objects.toString(pathNumber)));
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryString", queryString);
 		$queryParams.append("queryNumber", queryNumber);
-		$queryParams.append("queryRecord", ServiceUtils.ofObject(queryRecord, false, this.contentType(), SimpleRecord.Data.class));
+		$queryParams.append("queryRecord", BaseUtils.ofObject(queryRecord, false, this.contentType(), SimpleRecord.Data.class));
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerString", ServiceUtils.encodeAsciiString(headerString));
+		$headerParams.put("headerString", BaseUtils.encodeAsciiString(headerString));
 		$headerParams.put("headerNumber", String.format("%s", headerNumber));
-		$headerParams.put("headerRecord", ServiceUtils.encodeBase64(ServiceUtils.ofObject(headerRecord, false, this.contentType(), SimpleRecord.Data.class)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerRecord", BaseUtils.encodeBase64(BaseUtils.ofObject(headerRecord, false, this.contentType(), SimpleRecord.Data.class)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
 		try {
@@ -2483,11 +2483,11 @@ public MixedResult.Data mixed(String pathString, int pathNumber, String headerSt
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, MixedResultDataImpl::of, MixedResult.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, MixedResultDataImpl::of, MixedResult.Data.class);
 				this.lifecycleHook.onSuccess("mixed", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("mixed", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2519,7 +2519,7 @@ public String singleBodyAddition(String name, RSDBlob dataBlob) {
 			var $jsonPayload = Json.createObjectBuilder();
 			$jsonPayload.add("name", name);
 			$formDataBuilder.addBlob("dataBlob", dataBlob);
-			$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new BinaryTypesSingleBodyAdditionDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesSingleBodyAdditionDataImpl.class), this.contentType());
+			$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new BinaryTypesSingleBodyAdditionDataImpl($jsonPayload.build()), false, this.contentType(), BinaryTypesSingleBodyAdditionDataImpl.class), this.contentType());
 			var $formData = $formDataBuilder.build();
 			var $body = $formData.publisher();
 			var $contentType = $formData.contentType();
@@ -2534,11 +2534,11 @@ public String singleBodyAddition(String name, RSDBlob dataBlob) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("singleBodyAddition", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("singleBodyAddition", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2583,11 +2583,11 @@ public List<Integer> twoBinariesAddition(RSDBlob dataBlob, RSDFile dataFile) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInts($response);
+				var $rv = JDKHttpClientResponseUtils.mapInts($response);
 				this.lifecycleHook.onSuccess("twoBinariesAddition", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("twoBinariesAddition", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2622,17 +2622,17 @@ public RSDFile downloadFile()
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFile($response);
+				var $rv = JDKHttpClientResponseUtils.mapFile($response);
 				this.lifecycleHook.onSuccess("downloadFile", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
+				var $errorData = JDKHttpClientResponseUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of downloadFile failed");
 				var exception = new SampleErrorWithValueException($message, $errorData);
 				this.lifecycleHook.onError("downloadFile", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("downloadFile", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2667,17 +2667,17 @@ public RSDBlob downloadBlob()
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBlob($response);
+				var $rv = JDKHttpClientResponseUtils.mapBlob($response);
 				this.lifecycleHook.onSuccess("downloadBlob", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
+				var $errorData = JDKHttpClientResponseUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of downloadBlob failed");
 				var exception = new SampleErrorWithValueException($message, $errorData);
 				this.lifecycleHook.onError("downloadBlob", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("downloadBlob", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BodyParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BodyParameterTypesServiceImpl.java
index 036052ec..435dbb63 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BodyParameterTypesServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/BodyParameterTypesServiceImpl.java
@@ -69,7 +69,7 @@ public boolean simpleBooleanBodyParam(boolean bodyBoolean) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofBoolean(bodyBoolean, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofBoolean(bodyBoolean, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -81,11 +81,11 @@ public boolean simpleBooleanBodyParam(boolean bodyBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBoolean($response);
+				var $rv = JDKHttpClientResponseUtils.mapBoolean($response);
 				this.lifecycleHook.onSuccess("simpleBooleanBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -123,11 +123,11 @@ public NilResult simpleBooleanBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -153,7 +153,7 @@ public NilResult simpleBooleanBodyParamOpt(Boolean bodyBoolean) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyBoolean == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofBoolean(bodyBoolean, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyBoolean == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofBoolean(bodyBoolean, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -165,11 +165,11 @@ public NilResult simpleBooleanBodyParamOpt(Boolean bodyBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -195,7 +195,7 @@ public NilResult simpleBooleanBodyParamNil(Boolean bodyBoolean) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofBoolean(bodyBoolean, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofBoolean(bodyBoolean, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -207,11 +207,11 @@ public NilResult simpleBooleanBodyParamNil(Boolean bodyBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -249,11 +249,11 @@ public NilResult simpleBooleanBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -279,7 +279,7 @@ public NilResult simpleBooleanBodyParamOptNil(Boolean bodyBoolean) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofBoolean(bodyBoolean, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofBoolean(bodyBoolean, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -291,11 +291,11 @@ public NilResult simpleBooleanBodyParamOptNil(Boolean bodyBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -321,7 +321,7 @@ public short simpleShortBodyParam(short bodyShort) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofShort(bodyShort, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofShort(bodyShort, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -333,11 +333,11 @@ public short simpleShortBodyParam(short bodyShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShort($response);
+				var $rv = JDKHttpClientResponseUtils.mapShort($response);
 				this.lifecycleHook.onSuccess("simpleShortBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -375,11 +375,11 @@ public NilResult simpleShortBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -405,7 +405,7 @@ public NilResult simpleShortBodyParamOpt(Short bodyShort) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyShort == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofShort(bodyShort, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyShort == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofShort(bodyShort, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -417,11 +417,11 @@ public NilResult simpleShortBodyParamOpt(Short bodyShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -447,7 +447,7 @@ public NilResult simpleShortBodyParamNil(Short bodyShort) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofShort(bodyShort, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofShort(bodyShort, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -459,11 +459,11 @@ public NilResult simpleShortBodyParamNil(Short bodyShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -501,11 +501,11 @@ public NilResult simpleShortBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -531,7 +531,7 @@ public NilResult simpleShortBodyParamOptNil(Short bodyShort) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofShort(bodyShort, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofShort(bodyShort, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -543,11 +543,11 @@ public NilResult simpleShortBodyParamOptNil(Short bodyShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -573,7 +573,7 @@ public int simpleIntBodyParam(int bodyInt) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofInt(bodyInt, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofInt(bodyInt, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -585,11 +585,11 @@ public int simpleIntBodyParam(int bodyInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("simpleIntBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -627,11 +627,11 @@ public NilResult simpleIntBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -657,7 +657,7 @@ public NilResult simpleIntBodyParamOpt(Integer bodyInt) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyInt == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofInt(bodyInt, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyInt == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofInt(bodyInt, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -669,11 +669,11 @@ public NilResult simpleIntBodyParamOpt(Integer bodyInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -699,7 +699,7 @@ public NilResult simpleIntBodyParamNil(Integer bodyInt) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofInt(bodyInt, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofInt(bodyInt, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -711,11 +711,11 @@ public NilResult simpleIntBodyParamNil(Integer bodyInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -753,11 +753,11 @@ public NilResult simpleIntBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -783,7 +783,7 @@ public NilResult simpleIntBodyParamOptNil(Integer bodyInt) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofInt(bodyInt, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofInt(bodyInt, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -795,11 +795,11 @@ public NilResult simpleIntBodyParamOptNil(Integer bodyInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -825,7 +825,7 @@ public long simpleLongBodyParam(long bodyLong) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLong(bodyLong, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLong(bodyLong, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -837,11 +837,11 @@ public long simpleLongBodyParam(long bodyLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLong($response);
+				var $rv = JDKHttpClientResponseUtils.mapLong($response);
 				this.lifecycleHook.onSuccess("simpleLongBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -879,11 +879,11 @@ public NilResult simpleLongBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -909,7 +909,7 @@ public NilResult simpleLongBodyParamOpt(Long bodyLong) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyLong == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLong(bodyLong, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyLong == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLong(bodyLong, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -921,11 +921,11 @@ public NilResult simpleLongBodyParamOpt(Long bodyLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -951,7 +951,7 @@ public NilResult simpleLongBodyParamNil(Long bodyLong) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLong(bodyLong, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLong(bodyLong, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -963,11 +963,11 @@ public NilResult simpleLongBodyParamNil(Long bodyLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1005,11 +1005,11 @@ public NilResult simpleLongBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1035,7 +1035,7 @@ public NilResult simpleLongBodyParamOptNil(Long bodyLong) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLong(bodyLong, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLong(bodyLong, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1047,11 +1047,11 @@ public NilResult simpleLongBodyParamOptNil(Long bodyLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1077,7 +1077,7 @@ public float simpleFloatBodyParam(float bodyFloat) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofFloat(bodyFloat, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofFloat(bodyFloat, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1089,11 +1089,11 @@ public float simpleFloatBodyParam(float bodyFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloat($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloat($response);
 				this.lifecycleHook.onSuccess("simpleFloatBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1131,11 +1131,11 @@ public NilResult simpleFloatBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1161,7 +1161,7 @@ public NilResult simpleFloatBodyParamOpt(Float bodyFloat) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyFloat == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofFloat(bodyFloat, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyFloat == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofFloat(bodyFloat, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1173,11 +1173,11 @@ public NilResult simpleFloatBodyParamOpt(Float bodyFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1203,7 +1203,7 @@ public NilResult simpleFloatBodyParamNil(Float bodyFloat) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofFloat(bodyFloat, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofFloat(bodyFloat, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1215,11 +1215,11 @@ public NilResult simpleFloatBodyParamNil(Float bodyFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1257,11 +1257,11 @@ public NilResult simpleFloatBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1287,7 +1287,7 @@ public NilResult simpleFloatBodyParamOptNil(Float bodyFloat) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofFloat(bodyFloat, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofFloat(bodyFloat, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1299,11 +1299,11 @@ public NilResult simpleFloatBodyParamOptNil(Float bodyFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1329,7 +1329,7 @@ public double simpleDoubleBodyParam(double bodyDouble) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofDouble(bodyDouble, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofDouble(bodyDouble, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1341,11 +1341,11 @@ public double simpleDoubleBodyParam(double bodyDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDouble($response);
+				var $rv = JDKHttpClientResponseUtils.mapDouble($response);
 				this.lifecycleHook.onSuccess("simpleDoubleBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1383,11 +1383,11 @@ public NilResult simpleDoubleBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1413,7 +1413,7 @@ public NilResult simpleDoubleBodyParamOpt(Double bodyDouble) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyDouble == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofDouble(bodyDouble, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyDouble == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofDouble(bodyDouble, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1425,11 +1425,11 @@ public NilResult simpleDoubleBodyParamOpt(Double bodyDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1455,7 +1455,7 @@ public NilResult simpleDoubleBodyParamNil(Double bodyDouble) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofDouble(bodyDouble, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofDouble(bodyDouble, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1467,11 +1467,11 @@ public NilResult simpleDoubleBodyParamNil(Double bodyDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1509,11 +1509,11 @@ public NilResult simpleDoubleBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1539,7 +1539,7 @@ public NilResult simpleDoubleBodyParamOptNil(Double bodyDouble) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofDouble(bodyDouble, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofDouble(bodyDouble, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1551,11 +1551,11 @@ public NilResult simpleDoubleBodyParamOptNil(Double bodyDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1583,7 +1583,7 @@ public String simpleStringBodyParam(String bodyString) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofString(bodyString, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofString(bodyString, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1595,11 +1595,11 @@ public String simpleStringBodyParam(String bodyString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("simpleStringBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1637,11 +1637,11 @@ public NilResult simpleStringBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1667,7 +1667,7 @@ public NilResult simpleStringBodyParamOpt(String bodyString) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyString == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofString(bodyString, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyString == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofString(bodyString, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1679,11 +1679,11 @@ public NilResult simpleStringBodyParamOpt(String bodyString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1709,7 +1709,7 @@ public NilResult simpleStringBodyParamNil(String bodyString) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofString(bodyString, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofString(bodyString, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1721,11 +1721,11 @@ public NilResult simpleStringBodyParamNil(String bodyString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1763,11 +1763,11 @@ public NilResult simpleStringBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1793,7 +1793,7 @@ public NilResult simpleStringBodyParamOptNil(String bodyString) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofString(bodyString, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofString(bodyString, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1805,11 +1805,11 @@ public NilResult simpleStringBodyParamOptNil(String bodyString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1837,7 +1837,7 @@ public LocalDate simpleLocalDateBodyParam(LocalDate bodyLocalDate) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDate(bodyLocalDate, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDate(bodyLocalDate, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1849,11 +1849,11 @@ public LocalDate simpleLocalDateBodyParam(LocalDate bodyLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDate($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDate($response);
 				this.lifecycleHook.onSuccess("simpleLocalDateBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1891,11 +1891,11 @@ public NilResult simpleLocalDateBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1921,7 +1921,7 @@ public NilResult simpleLocalDateBodyParamOpt(LocalDate bodyLocalDate) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyLocalDate == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLocalDate(bodyLocalDate, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyLocalDate == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLocalDate(bodyLocalDate, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1933,11 +1933,11 @@ public NilResult simpleLocalDateBodyParamOpt(LocalDate bodyLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1963,7 +1963,7 @@ public NilResult simpleLocalDateBodyParamNil(LocalDate bodyLocalDate) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDate(bodyLocalDate, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDate(bodyLocalDate, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1975,11 +1975,11 @@ public NilResult simpleLocalDateBodyParamNil(LocalDate bodyLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2017,11 +2017,11 @@ public NilResult simpleLocalDateBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2047,7 +2047,7 @@ public NilResult simpleLocalDateBodyParamOptNil(LocalDate bodyLocalDate) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDate(bodyLocalDate, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDate(bodyLocalDate, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2059,11 +2059,11 @@ public NilResult simpleLocalDateBodyParamOptNil(LocalDate bodyLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2091,7 +2091,7 @@ public LocalDateTime simpleLocalDateTimeBodyParam(LocalDateTime bodyLocalDateTim
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateTime(bodyLocalDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateTime(bodyLocalDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2103,11 +2103,11 @@ public LocalDateTime simpleLocalDateTimeBodyParam(LocalDateTime bodyLocalDateTim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTime($response);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2145,11 +2145,11 @@ public NilResult simpleLocalDateTimeBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2175,7 +2175,7 @@ public NilResult simpleLocalDateTimeBodyParamOpt(LocalDateTime bodyLocalDateTime
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyLocalDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLocalDateTime(bodyLocalDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyLocalDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLocalDateTime(bodyLocalDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2187,11 +2187,11 @@ public NilResult simpleLocalDateTimeBodyParamOpt(LocalDateTime bodyLocalDateTime
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2217,7 +2217,7 @@ public NilResult simpleLocalDateTimeBodyParamNil(LocalDateTime bodyLocalDateTime
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateTime(bodyLocalDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateTime(bodyLocalDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2229,11 +2229,11 @@ public NilResult simpleLocalDateTimeBodyParamNil(LocalDateTime bodyLocalDateTime
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2271,11 +2271,11 @@ public NilResult simpleLocalDateTimeBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2301,7 +2301,7 @@ public NilResult simpleLocalDateTimeBodyParamOptNil(LocalDateTime bodyLocalDateT
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateTime(bodyLocalDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateTime(bodyLocalDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2313,11 +2313,11 @@ public NilResult simpleLocalDateTimeBodyParamOptNil(LocalDateTime bodyLocalDateT
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2345,7 +2345,7 @@ public LocalTime simpleLocalTimeBodyParam(LocalTime bodyLocalTime) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalTime(bodyLocalTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalTime(bodyLocalTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2357,11 +2357,11 @@ public LocalTime simpleLocalTimeBodyParam(LocalTime bodyLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTime($response);
 				this.lifecycleHook.onSuccess("simpleLocalTimeBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2399,11 +2399,11 @@ public NilResult simpleLocalTimeBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2429,7 +2429,7 @@ public NilResult simpleLocalTimeBodyParamOpt(LocalTime bodyLocalTime) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyLocalTime == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLocalTime(bodyLocalTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyLocalTime == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLocalTime(bodyLocalTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2441,11 +2441,11 @@ public NilResult simpleLocalTimeBodyParamOpt(LocalTime bodyLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2471,7 +2471,7 @@ public NilResult simpleLocalTimeBodyParamNil(LocalTime bodyLocalTime) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalTime(bodyLocalTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalTime(bodyLocalTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2483,11 +2483,11 @@ public NilResult simpleLocalTimeBodyParamNil(LocalTime bodyLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2525,11 +2525,11 @@ public NilResult simpleLocalTimeBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2555,7 +2555,7 @@ public NilResult simpleLocalTimeBodyParamOptNil(LocalTime bodyLocalTime) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalTime(bodyLocalTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalTime(bodyLocalTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2567,11 +2567,11 @@ public NilResult simpleLocalTimeBodyParamOptNil(LocalTime bodyLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2599,7 +2599,7 @@ public OffsetDateTime simpleOffsetDateTimeBodyParam(OffsetDateTime bodyOffsetDat
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofOffsetDateTime(bodyOffsetDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofOffsetDateTime(bodyOffsetDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2611,11 +2611,11 @@ public OffsetDateTime simpleOffsetDateTimeBodyParam(OffsetDateTime bodyOffsetDat
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTime($response);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2653,11 +2653,11 @@ public NilResult simpleOffsetDateTimeBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2683,7 +2683,7 @@ public NilResult simpleOffsetDateTimeBodyParamOpt(OffsetDateTime bodyOffsetDateT
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyOffsetDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofOffsetDateTime(bodyOffsetDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyOffsetDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofOffsetDateTime(bodyOffsetDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2695,11 +2695,11 @@ public NilResult simpleOffsetDateTimeBodyParamOpt(OffsetDateTime bodyOffsetDateT
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2725,7 +2725,7 @@ public NilResult simpleOffsetDateTimeBodyParamNil(OffsetDateTime bodyOffsetDateT
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofOffsetDateTime(bodyOffsetDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofOffsetDateTime(bodyOffsetDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2737,11 +2737,11 @@ public NilResult simpleOffsetDateTimeBodyParamNil(OffsetDateTime bodyOffsetDateT
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2779,11 +2779,11 @@ public NilResult simpleOffsetDateTimeBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2809,7 +2809,7 @@ public NilResult simpleOffsetDateTimeBodyParamOptNil(OffsetDateTime bodyOffsetDa
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofOffsetDateTime(bodyOffsetDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofOffsetDateTime(bodyOffsetDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2821,11 +2821,11 @@ public NilResult simpleOffsetDateTimeBodyParamOptNil(OffsetDateTime bodyOffsetDa
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2853,7 +2853,7 @@ public ZonedDateTime simpleZonedDateTimeBodyParam(ZonedDateTime bodyZonedDateTim
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofZonedDateTime(bodyZonedDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofZonedDateTime(bodyZonedDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2865,11 +2865,11 @@ public ZonedDateTime simpleZonedDateTimeBodyParam(ZonedDateTime bodyZonedDateTim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTime($response);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2907,11 +2907,11 @@ public NilResult simpleZonedDateTimeBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2937,7 +2937,7 @@ public NilResult simpleZonedDateTimeBodyParamOpt(ZonedDateTime bodyZonedDateTime
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyZonedDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofZonedDateTime(bodyZonedDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyZonedDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofZonedDateTime(bodyZonedDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2949,11 +2949,11 @@ public NilResult simpleZonedDateTimeBodyParamOpt(ZonedDateTime bodyZonedDateTime
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2979,7 +2979,7 @@ public NilResult simpleZonedDateTimeBodyParamNil(ZonedDateTime bodyZonedDateTime
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofZonedDateTime(bodyZonedDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofZonedDateTime(bodyZonedDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2991,11 +2991,11 @@ public NilResult simpleZonedDateTimeBodyParamNil(ZonedDateTime bodyZonedDateTime
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3033,11 +3033,11 @@ public NilResult simpleZonedDateTimeBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3063,7 +3063,7 @@ public NilResult simpleZonedDateTimeBodyParamOptNil(ZonedDateTime bodyZonedDateT
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofZonedDateTime(bodyZonedDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofZonedDateTime(bodyZonedDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3075,11 +3075,11 @@ public NilResult simpleZonedDateTimeBodyParamOptNil(ZonedDateTime bodyZonedDateT
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3107,7 +3107,7 @@ public ZoneId simpleScalarBodyParam(ZoneId bodyScalar) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyScalar, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyScalar, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3119,11 +3119,11 @@ public ZoneId simpleScalarBodyParam(ZoneId bodyScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("simpleScalarBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3161,11 +3161,11 @@ public NilResult simpleScalarBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3191,7 +3191,7 @@ public NilResult simpleScalarBodyParamOpt(ZoneId bodyScalar) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyScalar == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLiteral(bodyScalar, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyScalar == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLiteral(bodyScalar, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3203,11 +3203,11 @@ public NilResult simpleScalarBodyParamOpt(ZoneId bodyScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3233,7 +3233,7 @@ public NilResult simpleScalarBodyParamNil(ZoneId bodyScalar) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyScalar, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyScalar, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3245,11 +3245,11 @@ public NilResult simpleScalarBodyParamNil(ZoneId bodyScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3287,11 +3287,11 @@ public NilResult simpleScalarBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3317,7 +3317,7 @@ public NilResult simpleScalarBodyParamOptNil(ZoneId bodyScalar) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyScalar, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyScalar, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3329,11 +3329,11 @@ public NilResult simpleScalarBodyParamOptNil(ZoneId bodyScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3361,7 +3361,7 @@ public SampleEnum simpleEnumBodyParam(SampleEnum bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyEnum, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyEnum, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3373,11 +3373,11 @@ public SampleEnum simpleEnumBodyParam(SampleEnum bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3415,11 +3415,11 @@ public NilResult simpleEnumBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3445,7 +3445,7 @@ public NilResult simpleEnumBodyParamOpt(SampleEnum bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyEnum == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLiteral(bodyEnum, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyEnum == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLiteral(bodyEnum, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3457,11 +3457,11 @@ public NilResult simpleEnumBodyParamOpt(SampleEnum bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3487,7 +3487,7 @@ public NilResult simpleEnumBodyParamNil(SampleEnum bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyEnum, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyEnum, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3499,11 +3499,11 @@ public NilResult simpleEnumBodyParamNil(SampleEnum bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3541,11 +3541,11 @@ public NilResult simpleEnumBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3571,7 +3571,7 @@ public NilResult simpleEnumBodyParamOptNil(SampleEnum bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyEnum, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyEnum, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3583,11 +3583,11 @@ public NilResult simpleEnumBodyParamOptNil(SampleEnum bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3615,7 +3615,7 @@ public NilResult simpleEnumBodyParamOptNil(SampleEnum bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyEnum, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyEnum, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3627,11 +3627,11 @@ public NilResult simpleEnumBodyParamOptNil(SampleEnum bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, SimpleInlineEnumBodyParam_Result$::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, SimpleInlineEnumBodyParam_Result$::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3669,11 +3669,11 @@ public NilResult simpleInlineEnumBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3699,7 +3699,7 @@ public NilResult simpleInlineEnumBodyParamOpt(SimpleInlineEnumBodyParamOpt_BodyE
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyEnum == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLiteral(bodyEnum, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyEnum == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLiteral(bodyEnum, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3711,11 +3711,11 @@ public NilResult simpleInlineEnumBodyParamOpt(SimpleInlineEnumBodyParamOpt_BodyE
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3741,7 +3741,7 @@ public NilResult simpleInlineEnumBodyParamNil(SimpleInlineEnumBodyParamNil_BodyE
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyEnum, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyEnum, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3753,11 +3753,11 @@ public NilResult simpleInlineEnumBodyParamNil(SimpleInlineEnumBodyParamNil_BodyE
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3795,11 +3795,11 @@ public NilResult simpleInlineEnumBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3825,7 +3825,7 @@ public NilResult simpleInlineEnumBodyParamOptNil(SimpleInlineEnumBodyParamOptNil
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(bodyEnum, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(bodyEnum, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3837,11 +3837,11 @@ public NilResult simpleInlineEnumBodyParamOptNil(SimpleInlineEnumBodyParamOptNil
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3874,7 +3874,7 @@ public String multiBodyParam(String valueA, int valueB, SimpleRecord.Data valueC
 			$builder = $builder.add("valueA", valueA);
 			$builder = $builder.add("valueB", valueB);
 			$builder = $builder.add("valueC", ((_BaseDataImpl)valueC).data);
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3886,11 +3886,11 @@ public String multiBodyParam(String valueA, int valueB, SimpleRecord.Data valueC
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3928,11 +3928,11 @@ public String multiBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3962,7 +3962,7 @@ public String multiBodyParamOpt(String valueA) {
 			if(valueA != null) {
 				$builder = $builder.add("valueA", valueA);
 			}
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3974,11 +3974,11 @@ public String multiBodyParamOpt(String valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4011,7 +4011,7 @@ public String multiBodyParamOpt(String valueA, Integer valueB) {
 			if(valueB != null) {
 				$builder = $builder.add("valueB", valueB);
 			}
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4023,11 +4023,11 @@ public String multiBodyParamOpt(String valueA, Integer valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4063,7 +4063,7 @@ public String multiBodyParamOpt(String valueA, Integer valueB, SimpleRecord.Data
 			if(valueC != null) {
 				$builder = $builder.add("valueC", ((_BaseDataImpl)valueC).data);
 			}
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4075,11 +4075,11 @@ public String multiBodyParamOpt(String valueA, Integer valueB, SimpleRecord.Data
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4109,7 +4109,7 @@ public String multiBodyParamNil(String valueA, Integer valueB, SimpleRecord.Data
 			$builder = valueA == null ? $builder.addNull("valueA") : $builder.add("valueA", valueA);
 			$builder = valueB == null ? $builder.addNull("valueB") : $builder.add("valueB", valueB);
 			$builder = valueC == null ? $builder.addNull("valueC") : $builder.add("valueC", ((_BaseDataImpl)valueC).data);
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamNilDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamNilDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamNilDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamNilDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4121,11 +4121,11 @@ public String multiBodyParamNil(String valueA, Integer valueB, SimpleRecord.Data
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4163,11 +4163,11 @@ public String multiBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4195,7 +4195,7 @@ public String multiBodyParamOptNil(String valueA) {
 			var $contentType = this.contentType();
 			var $builder = Json.createObjectBuilder();
 			$builder = valueA == null ? $builder.addNull("valueA") : $builder.add("valueA", valueA);
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptNilDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptNilDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4207,11 +4207,11 @@ public String multiBodyParamOptNil(String valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4240,7 +4240,7 @@ public String multiBodyParamOptNil(String valueA, Integer valueB) {
 			var $builder = Json.createObjectBuilder();
 			$builder = valueA == null ? $builder.addNull("valueA") : $builder.add("valueA", valueA);
 			$builder = valueB == null ? $builder.addNull("valueB") : $builder.add("valueB", valueB);
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptNilDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptNilDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4252,11 +4252,11 @@ public String multiBodyParamOptNil(String valueA, Integer valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4286,7 +4286,7 @@ public String multiBodyParamOptNil(String valueA, Integer valueB, SimpleRecord.D
 			$builder = valueA == null ? $builder.addNull("valueA") : $builder.add("valueA", valueA);
 			$builder = valueB == null ? $builder.addNull("valueB") : $builder.add("valueB", valueB);
 			$builder = valueC == null ? $builder.addNull("valueC") : $builder.add("valueC", ((_BaseDataImpl)valueC).data);
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptNilDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamOptNilDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4298,11 +4298,11 @@ public String multiBodyParamOptNil(String valueA, Integer valueB, SimpleRecord.D
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4340,11 +4340,11 @@ public String multiBodyParamFirst() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamFirst", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamFirst", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4374,7 +4374,7 @@ public String multiBodyParamFirst(String valueA) {
 			if(valueA != null) {
 				$builder = $builder.add("valueA", valueA);
 			}
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamFirstDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamFirstDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamFirstDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamFirstDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4386,11 +4386,11 @@ public String multiBodyParamFirst(String valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamFirst", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamFirst", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4421,7 +4421,7 @@ public String multiBodyParamFirst(String valueA, int valueB) {
 				$builder = $builder.add("valueA", valueA);
 			}
 			$builder = $builder.add("valueB", valueB);
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamFirstDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamFirstDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamFirstDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamFirstDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4433,11 +4433,11 @@ public String multiBodyParamFirst(String valueA, int valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamFirst", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamFirst", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4471,7 +4471,7 @@ public String multiBodyParamFirst(String valueA, int valueB, SimpleRecord.Data v
 			}
 			$builder = $builder.add("valueB", valueB);
 			$builder = $builder.add("valueC", ((_BaseDataImpl)valueC).data);
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new BodyParameterTypesMultiBodyParamFirstDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamFirstDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new BodyParameterTypesMultiBodyParamFirstDataImpl($builder.build()), false, this.contentType(), BodyParameterTypesMultiBodyParamFirstDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4483,11 +4483,11 @@ public String multiBodyParamFirst(String valueA, int valueB, SimpleRecord.Data v
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiBodyParamFirst", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiBodyParamFirst", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4515,7 +4515,7 @@ public SimpleRecord.Data recordBodyParam(SimpleRecord.Data bodyRecord) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyRecord, false, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyRecord, false, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4527,11 +4527,11 @@ public SimpleRecord.Data recordBodyParam(SimpleRecord.Data bodyRecord) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("recordBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4569,11 +4569,11 @@ public NilResult recordBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4599,7 +4599,7 @@ public NilResult recordBodyParamOpt(SimpleRecord.Data bodyRecord) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyRecord == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofObject(bodyRecord, false, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(bodyRecord == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofObject(bodyRecord, false, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4611,11 +4611,11 @@ public NilResult recordBodyParamOpt(SimpleRecord.Data bodyRecord) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4641,7 +4641,7 @@ public NilResult recordBodyParamNil(SimpleRecord.Data bodyRecord) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyRecord, true, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyRecord, true, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4653,11 +4653,11 @@ public NilResult recordBodyParamNil(SimpleRecord.Data bodyRecord) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4695,11 +4695,11 @@ public NilResult recordBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4725,7 +4725,7 @@ public NilResult recordBodyParamOptNil(SimpleRecord.Data bodyRecord) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyRecord, true, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyRecord, true, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4737,11 +4737,11 @@ public NilResult recordBodyParamOptNil(SimpleRecord.Data bodyRecord) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4769,7 +4769,7 @@ public Union.Data unionBodyParam(Union.Data bodyUnion) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyUnion, false, $contentType, Union.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyUnion, false, $contentType, Union.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4781,11 +4781,11 @@ public Union.Data unionBodyParam(Union.Data bodyUnion) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, UnionDataImpl::of, Union.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, UnionDataImpl::of, Union.Data.class);
 				this.lifecycleHook.onSuccess("unionBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("unionBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4823,11 +4823,11 @@ public NilResult unionBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("unionBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("unionBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4853,7 +4853,7 @@ public NilResult unionBodyParamOpt(Union.Data bodyUnion) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyUnion == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofObject(bodyUnion, false, $contentType, Union.Data.class));
+			var $body = BodyPublishers.ofByteArray(bodyUnion == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofObject(bodyUnion, false, $contentType, Union.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4865,11 +4865,11 @@ public NilResult unionBodyParamOpt(Union.Data bodyUnion) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("unionBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("unionBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4895,7 +4895,7 @@ public NilResult unionBodyParamNil(Union.Data bodyUnion) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyUnion, true, $contentType, Union.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyUnion, true, $contentType, Union.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4907,11 +4907,11 @@ public NilResult unionBodyParamNil(Union.Data bodyUnion) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("unionBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("unionBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4949,11 +4949,11 @@ public NilResult unionBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("unionBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("unionBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4979,7 +4979,7 @@ public NilResult unionBodyParamOptNil(Union.Data bodyUnion) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyUnion, true, $contentType, Union.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyUnion, true, $contentType, Union.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4991,11 +4991,11 @@ public NilResult unionBodyParamOptNil(Union.Data bodyUnion) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("unionBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("unionBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -5023,7 +5023,7 @@ public PatchableRecord.Data patchableRecordBodyParam(PatchableRecord.Patch bodyR
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyRecord, false, $contentType, PatchableRecord.Patch.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyRecord, false, $contentType, PatchableRecord.Patch.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -5035,11 +5035,11 @@ public PatchableRecord.Data patchableRecordBodyParam(PatchableRecord.Patch bodyR
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
 				this.lifecycleHook.onSuccess("patchableRecordBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("patchableRecordBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -5077,11 +5077,11 @@ public PatchableRecord.Data patchableRecordBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
 				this.lifecycleHook.onSuccess("patchableRecordBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("patchableRecordBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -5107,7 +5107,7 @@ public PatchableRecord.Data patchableRecordBodyParamOpt(PatchableRecord.Patch bo
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyRecord == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofObject(bodyRecord, false, $contentType, PatchableRecord.Patch.class));
+			var $body = BodyPublishers.ofByteArray(bodyRecord == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofObject(bodyRecord, false, $contentType, PatchableRecord.Patch.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -5119,11 +5119,11 @@ public PatchableRecord.Data patchableRecordBodyParamOpt(PatchableRecord.Patch bo
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
 				this.lifecycleHook.onSuccess("patchableRecordBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("patchableRecordBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -5149,7 +5149,7 @@ public PatchableRecord.Data patchableRecordBodyParamNil(PatchableRecord.Patch bo
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyRecord, true, $contentType, PatchableRecord.Patch.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyRecord, true, $contentType, PatchableRecord.Patch.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -5161,11 +5161,11 @@ public PatchableRecord.Data patchableRecordBodyParamNil(PatchableRecord.Patch bo
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
 				this.lifecycleHook.onSuccess("patchableRecordBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("patchableRecordBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -5203,11 +5203,11 @@ public PatchableRecord.Data patchableRecordBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
 				this.lifecycleHook.onSuccess("patchableRecordBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("patchableRecordBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -5233,7 +5233,7 @@ public PatchableRecord.Data patchableRecordBodyParamOptNil(PatchableRecord.Patch
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(bodyRecord, true, $contentType, PatchableRecord.Patch.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(bodyRecord, true, $contentType, PatchableRecord.Patch.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -5245,11 +5245,11 @@ public PatchableRecord.Data patchableRecordBodyParamOptNil(PatchableRecord.Patch
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, PatchableRecordDataImpl::of, PatchableRecord.Data.class);
 				this.lifecycleHook.onSuccess("patchableRecordBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("patchableRecordBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/HeaderParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/HeaderParameterTypesServiceImpl.java
index 80d2ed66..c55eb649 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/HeaderParameterTypesServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/HeaderParameterTypesServiceImpl.java
@@ -57,7 +57,7 @@ public boolean simpleBooleanHeaderParam(boolean headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -73,11 +73,11 @@ public boolean simpleBooleanHeaderParam(boolean headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBoolean($response);
+				var $rv = JDKHttpClientResponseUtils.mapBoolean($response);
 				this.lifecycleHook.onSuccess("simpleBooleanHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -111,11 +111,11 @@ public NilResult simpleBooleanHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -140,7 +140,7 @@ public NilResult simpleBooleanHeaderParamOpt(Boolean headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -156,11 +156,11 @@ public NilResult simpleBooleanHeaderParamOpt(Boolean headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -185,7 +185,7 @@ public NilResult simpleBooleanHeaderParamNil(Boolean headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -201,11 +201,11 @@ public NilResult simpleBooleanHeaderParamNil(Boolean headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -239,11 +239,11 @@ public NilResult simpleBooleanHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -268,7 +268,7 @@ public NilResult simpleBooleanHeaderParamOptNil(Boolean headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -284,11 +284,11 @@ public NilResult simpleBooleanHeaderParamOptNil(Boolean headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -313,7 +313,7 @@ public short simpleShortHeaderParam(short headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -329,11 +329,11 @@ public short simpleShortHeaderParam(short headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShort($response);
+				var $rv = JDKHttpClientResponseUtils.mapShort($response);
 				this.lifecycleHook.onSuccess("simpleShortHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -367,11 +367,11 @@ public NilResult simpleShortHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -396,7 +396,7 @@ public NilResult simpleShortHeaderParamOpt(Short headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -412,11 +412,11 @@ public NilResult simpleShortHeaderParamOpt(Short headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -441,7 +441,7 @@ public NilResult simpleShortHeaderParamNil(Short headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -457,11 +457,11 @@ public NilResult simpleShortHeaderParamNil(Short headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -495,11 +495,11 @@ public NilResult simpleShortHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -524,7 +524,7 @@ public NilResult simpleShortHeaderParamOptNil(Short headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -540,11 +540,11 @@ public NilResult simpleShortHeaderParamOptNil(Short headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -569,7 +569,7 @@ public int simpleIntHeaderParam(int headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -585,11 +585,11 @@ public int simpleIntHeaderParam(int headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("simpleIntHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -623,11 +623,11 @@ public NilResult simpleIntHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -652,7 +652,7 @@ public NilResult simpleIntHeaderParamOpt(Integer headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -668,11 +668,11 @@ public NilResult simpleIntHeaderParamOpt(Integer headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -697,7 +697,7 @@ public NilResult simpleIntHeaderParamNil(Integer headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -713,11 +713,11 @@ public NilResult simpleIntHeaderParamNil(Integer headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -751,11 +751,11 @@ public NilResult simpleIntHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -780,7 +780,7 @@ public NilResult simpleIntHeaderParamOptNil(Integer headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -796,11 +796,11 @@ public NilResult simpleIntHeaderParamOptNil(Integer headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -825,7 +825,7 @@ public long simpleLongHeaderParam(long headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -841,11 +841,11 @@ public long simpleLongHeaderParam(long headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLong($response);
+				var $rv = JDKHttpClientResponseUtils.mapLong($response);
 				this.lifecycleHook.onSuccess("simpleLongHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -879,11 +879,11 @@ public NilResult simpleLongHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -908,7 +908,7 @@ public NilResult simpleLongHeaderParamOpt(Long headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -924,11 +924,11 @@ public NilResult simpleLongHeaderParamOpt(Long headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -953,7 +953,7 @@ public NilResult simpleLongHeaderParamNil(Long headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -969,11 +969,11 @@ public NilResult simpleLongHeaderParamNil(Long headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1007,11 +1007,11 @@ public NilResult simpleLongHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1036,7 +1036,7 @@ public NilResult simpleLongHeaderParamOptNil(Long headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1052,11 +1052,11 @@ public NilResult simpleLongHeaderParamOptNil(Long headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1081,7 +1081,7 @@ public float simpleFloatHeaderParam(float headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1097,11 +1097,11 @@ public float simpleFloatHeaderParam(float headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloat($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloat($response);
 				this.lifecycleHook.onSuccess("simpleFloatHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1135,11 +1135,11 @@ public NilResult simpleFloatHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1164,7 +1164,7 @@ public NilResult simpleFloatHeaderParamOpt(Float headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1180,11 +1180,11 @@ public NilResult simpleFloatHeaderParamOpt(Float headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1209,7 +1209,7 @@ public NilResult simpleFloatHeaderParamNil(Float headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1225,11 +1225,11 @@ public NilResult simpleFloatHeaderParamNil(Float headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1263,11 +1263,11 @@ public NilResult simpleFloatHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1292,7 +1292,7 @@ public NilResult simpleFloatHeaderParamOptNil(Float headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1308,11 +1308,11 @@ public NilResult simpleFloatHeaderParamOptNil(Float headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1337,7 +1337,7 @@ public double simpleDoubleHeaderParam(double headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1353,11 +1353,11 @@ public double simpleDoubleHeaderParam(double headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDouble($response);
+				var $rv = JDKHttpClientResponseUtils.mapDouble($response);
 				this.lifecycleHook.onSuccess("simpleDoubleHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1391,11 +1391,11 @@ public NilResult simpleDoubleHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1420,7 +1420,7 @@ public NilResult simpleDoubleHeaderParamOpt(Double headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1436,11 +1436,11 @@ public NilResult simpleDoubleHeaderParamOpt(Double headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1465,7 +1465,7 @@ public NilResult simpleDoubleHeaderParamNil(Double headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1481,11 +1481,11 @@ public NilResult simpleDoubleHeaderParamNil(Double headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1519,11 +1519,11 @@ public NilResult simpleDoubleHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1548,7 +1548,7 @@ public NilResult simpleDoubleHeaderParamOptNil(Double headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1564,11 +1564,11 @@ public NilResult simpleDoubleHeaderParamOptNil(Double headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1594,8 +1594,8 @@ public String simpleStringHeaderParam(String headerValue) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", ServiceUtils.encodeAsciiString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", BaseUtils.encodeAsciiString(headerValue));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1611,11 +1611,11 @@ public String simpleStringHeaderParam(String headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("simpleStringHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1649,11 +1649,11 @@ public NilResult simpleStringHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1678,9 +1678,9 @@ public NilResult simpleStringHeaderParamOpt(String headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", ServiceUtils.encodeAsciiString(headerValue));
+			$headerParams.put("headerValue", BaseUtils.encodeAsciiString(headerValue));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1696,11 +1696,11 @@ public NilResult simpleStringHeaderParamOpt(String headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1725,11 +1725,11 @@ public NilResult simpleStringHeaderParamNil(String headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", ServiceUtils.encodeAsciiString(headerValue));
+			$headerParams.put("headerValue", BaseUtils.encodeAsciiString(headerValue));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1745,11 +1745,11 @@ public NilResult simpleStringHeaderParamNil(String headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1783,11 +1783,11 @@ public NilResult simpleStringHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1812,11 +1812,11 @@ public NilResult simpleStringHeaderParamOptNil(String headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", ServiceUtils.encodeAsciiString(headerValue));
+			$headerParams.put("headerValue", BaseUtils.encodeAsciiString(headerValue));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1832,11 +1832,11 @@ public NilResult simpleStringHeaderParamOptNil(String headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1863,7 +1863,7 @@ public LocalDate simpleLocalDateHeaderParam(LocalDate headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1879,11 +1879,11 @@ public LocalDate simpleLocalDateHeaderParam(LocalDate headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDate($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDate($response);
 				this.lifecycleHook.onSuccess("simpleLocalDateHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1917,11 +1917,11 @@ public NilResult simpleLocalDateHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1946,7 +1946,7 @@ public NilResult simpleLocalDateHeaderParamOpt(LocalDate headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1962,11 +1962,11 @@ public NilResult simpleLocalDateHeaderParamOpt(LocalDate headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1991,7 +1991,7 @@ public NilResult simpleLocalDateHeaderParamNil(LocalDate headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2007,11 +2007,11 @@ public NilResult simpleLocalDateHeaderParamNil(LocalDate headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2045,11 +2045,11 @@ public NilResult simpleLocalDateHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2074,7 +2074,7 @@ public NilResult simpleLocalDateHeaderParamOptNil(LocalDate headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2090,11 +2090,11 @@ public NilResult simpleLocalDateHeaderParamOptNil(LocalDate headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2121,7 +2121,7 @@ public LocalDateTime simpleLocalDateTimeHeaderParam(LocalDateTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2137,11 +2137,11 @@ public LocalDateTime simpleLocalDateTimeHeaderParam(LocalDateTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTime($response);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2175,11 +2175,11 @@ public NilResult simpleLocalDateTimeHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2204,7 +2204,7 @@ public NilResult simpleLocalDateTimeHeaderParamOpt(LocalDateTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2220,11 +2220,11 @@ public NilResult simpleLocalDateTimeHeaderParamOpt(LocalDateTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2249,7 +2249,7 @@ public NilResult simpleLocalDateTimeHeaderParamNil(LocalDateTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2265,11 +2265,11 @@ public NilResult simpleLocalDateTimeHeaderParamNil(LocalDateTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2303,11 +2303,11 @@ public NilResult simpleLocalDateTimeHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2332,7 +2332,7 @@ public NilResult simpleLocalDateTimeHeaderParamOptNil(LocalDateTime headerValue)
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2348,11 +2348,11 @@ public NilResult simpleLocalDateTimeHeaderParamOptNil(LocalDateTime headerValue)
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2379,7 +2379,7 @@ public LocalTime simpleLocalTimeHeaderParam(LocalTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2395,11 +2395,11 @@ public LocalTime simpleLocalTimeHeaderParam(LocalTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTime($response);
 				this.lifecycleHook.onSuccess("simpleLocalTimeHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2433,11 +2433,11 @@ public NilResult simpleLocalTimeHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2462,7 +2462,7 @@ public NilResult simpleLocalTimeHeaderParamOpt(LocalTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2478,11 +2478,11 @@ public NilResult simpleLocalTimeHeaderParamOpt(LocalTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2507,7 +2507,7 @@ public NilResult simpleLocalTimeHeaderParamNil(LocalTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2523,11 +2523,11 @@ public NilResult simpleLocalTimeHeaderParamNil(LocalTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2561,11 +2561,11 @@ public NilResult simpleLocalTimeHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2590,7 +2590,7 @@ public NilResult simpleLocalTimeHeaderParamOptNil(LocalTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2606,11 +2606,11 @@ public NilResult simpleLocalTimeHeaderParamOptNil(LocalTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2637,7 +2637,7 @@ public OffsetDateTime simpleOffsetDateTimeHeaderParam(OffsetDateTime headerValue
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2653,11 +2653,11 @@ public OffsetDateTime simpleOffsetDateTimeHeaderParam(OffsetDateTime headerValue
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTime($response);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2691,11 +2691,11 @@ public NilResult simpleOffsetDateTimeHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2720,7 +2720,7 @@ public NilResult simpleOffsetDateTimeHeaderParamOpt(OffsetDateTime headerValue)
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2736,11 +2736,11 @@ public NilResult simpleOffsetDateTimeHeaderParamOpt(OffsetDateTime headerValue)
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2765,7 +2765,7 @@ public NilResult simpleOffsetDateTimeHeaderParamNil(OffsetDateTime headerValue)
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2781,11 +2781,11 @@ public NilResult simpleOffsetDateTimeHeaderParamNil(OffsetDateTime headerValue)
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2819,11 +2819,11 @@ public NilResult simpleOffsetDateTimeHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2848,7 +2848,7 @@ public NilResult simpleOffsetDateTimeHeaderParamOptNil(OffsetDateTime headerValu
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2864,11 +2864,11 @@ public NilResult simpleOffsetDateTimeHeaderParamOptNil(OffsetDateTime headerValu
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2895,7 +2895,7 @@ public ZonedDateTime simpleZonedDateTimeHeaderParam(ZonedDateTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2911,11 +2911,11 @@ public ZonedDateTime simpleZonedDateTimeHeaderParam(ZonedDateTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTime($response);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2949,11 +2949,11 @@ public NilResult simpleZonedDateTimeHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2978,7 +2978,7 @@ public NilResult simpleZonedDateTimeHeaderParamOpt(ZonedDateTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2994,11 +2994,11 @@ public NilResult simpleZonedDateTimeHeaderParamOpt(ZonedDateTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3023,7 +3023,7 @@ public NilResult simpleZonedDateTimeHeaderParamNil(ZonedDateTime headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3039,11 +3039,11 @@ public NilResult simpleZonedDateTimeHeaderParamNil(ZonedDateTime headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3077,11 +3077,11 @@ public NilResult simpleZonedDateTimeHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3106,7 +3106,7 @@ public NilResult simpleZonedDateTimeHeaderParamOptNil(ZonedDateTime headerValue)
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.format("%s", headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3122,11 +3122,11 @@ public NilResult simpleZonedDateTimeHeaderParamOptNil(ZonedDateTime headerValue)
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3152,8 +3152,8 @@ public ZoneId simpleScalarHeaderParam(ZoneId headerValue) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", ServiceUtils.encodeAsciiString(Objects.toString(headerValue)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", BaseUtils.encodeAsciiString(Objects.toString(headerValue)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3169,11 +3169,11 @@ public ZoneId simpleScalarHeaderParam(ZoneId headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("simpleScalarHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3207,11 +3207,11 @@ public NilResult simpleScalarHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3235,8 +3235,8 @@ public NilResult simpleScalarHeaderParamOpt(ZoneId headerValue) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", ServiceUtils.encodeAsciiString(Objects.toString(headerValue)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", BaseUtils.encodeAsciiString(Objects.toString(headerValue)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3252,11 +3252,11 @@ public NilResult simpleScalarHeaderParamOpt(ZoneId headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3280,8 +3280,8 @@ public NilResult simpleScalarHeaderParamNil(ZoneId headerValue) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", ServiceUtils.encodeAsciiString(Objects.toString(headerValue)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", BaseUtils.encodeAsciiString(Objects.toString(headerValue)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3297,11 +3297,11 @@ public NilResult simpleScalarHeaderParamNil(ZoneId headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3335,11 +3335,11 @@ public NilResult simpleScalarHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3363,8 +3363,8 @@ public NilResult simpleScalarHeaderParamOptNil(ZoneId headerValue) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", ServiceUtils.encodeAsciiString(Objects.toString(headerValue)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", BaseUtils.encodeAsciiString(Objects.toString(headerValue)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3380,11 +3380,11 @@ public NilResult simpleScalarHeaderParamOptNil(ZoneId headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3411,7 +3411,7 @@ public SampleEnum simpleEnumHeaderParam(SampleEnum headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", Objects.toString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3427,11 +3427,11 @@ public SampleEnum simpleEnumHeaderParam(SampleEnum headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3465,11 +3465,11 @@ public NilResult simpleEnumHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3494,7 +3494,7 @@ public NilResult simpleEnumHeaderParamOpt(SampleEnum headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", Objects.toString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3510,11 +3510,11 @@ public NilResult simpleEnumHeaderParamOpt(SampleEnum headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3539,7 +3539,7 @@ public NilResult simpleEnumHeaderParamNil(SampleEnum headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", Objects.toString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3555,11 +3555,11 @@ public NilResult simpleEnumHeaderParamNil(SampleEnum headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3593,11 +3593,11 @@ public NilResult simpleEnumHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3622,7 +3622,7 @@ public NilResult simpleEnumHeaderParamOptNil(SampleEnum headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", Objects.toString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3638,11 +3638,11 @@ public NilResult simpleEnumHeaderParamOptNil(SampleEnum headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3669,7 +3669,7 @@ public NilResult simpleEnumHeaderParamOptNil(SampleEnum headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", Objects.toString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3685,11 +3685,11 @@ public NilResult simpleEnumHeaderParamOptNil(SampleEnum headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, SimpleInlineEnumHeaderParam_Result$::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, SimpleInlineEnumHeaderParam_Result$::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3723,11 +3723,11 @@ public NilResult simpleInlineEnumHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3752,7 +3752,7 @@ public NilResult simpleInlineEnumHeaderParamOpt(SimpleInlineEnumHeaderParamOpt_H
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", Objects.toString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3768,11 +3768,11 @@ public NilResult simpleInlineEnumHeaderParamOpt(SimpleInlineEnumHeaderParamOpt_H
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3797,7 +3797,7 @@ public NilResult simpleInlineEnumHeaderParamNil(SimpleInlineEnumHeaderParamNil_H
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", Objects.toString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3813,11 +3813,11 @@ public NilResult simpleInlineEnumHeaderParamNil(SimpleInlineEnumHeaderParamNil_H
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3851,11 +3851,11 @@ public NilResult simpleInlineEnumHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3880,7 +3880,7 @@ public NilResult simpleInlineEnumHeaderParamOptNil(SimpleInlineEnumHeaderParamOp
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", Objects.toString(headerValue));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3896,11 +3896,11 @@ public NilResult simpleInlineEnumHeaderParamOptNil(SimpleInlineEnumHeaderParamOp
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleInlineEnumHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleInlineEnumHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3926,9 +3926,9 @@ public String multiHeaderParam(String valueA, int valueB) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("valueA", ServiceUtils.encodeAsciiString(valueA));
+		$headerParams.put("valueA", BaseUtils.encodeAsciiString(valueA));
 		$headerParams.put("valueB", String.format("%s", valueB));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3944,11 +3944,11 @@ public String multiHeaderParam(String valueA, int valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3982,11 +3982,11 @@ public List<NilResult> multiHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("multiHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4011,9 +4011,9 @@ public List<NilResult> multiHeaderParamOpt(String valueA) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", ServiceUtils.encodeAsciiString(valueA));
+			$headerParams.put("valueA", BaseUtils.encodeAsciiString(valueA));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4029,11 +4029,11 @@ public List<NilResult> multiHeaderParamOpt(String valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("multiHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4058,10 +4058,10 @@ public List<NilResult> multiHeaderParamOpt(String valueA, Integer valueB) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", ServiceUtils.encodeAsciiString(valueA));
+			$headerParams.put("valueA", BaseUtils.encodeAsciiString(valueA));
 		}
 		$headerParams.put("valueB", String.format("%s", valueB));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4077,11 +4077,11 @@ public List<NilResult> multiHeaderParamOpt(String valueA, Integer valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("multiHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4106,12 +4106,12 @@ public List<NilResult> multiHeaderParamNil(String valueA, Integer valueB) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", ServiceUtils.encodeAsciiString(valueA));
+			$headerParams.put("valueA", BaseUtils.encodeAsciiString(valueA));
 		} else {
 			$headerParams.put("valueA", "null");
 		}
 		$headerParams.put("valueB", String.format("%s", valueB));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4127,11 +4127,11 @@ public List<NilResult> multiHeaderParamNil(String valueA, Integer valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("multiHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4165,11 +4165,11 @@ public List<NilResult> multiHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("multiHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4194,11 +4194,11 @@ public List<NilResult> multiHeaderParamOptNil(String valueA) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", ServiceUtils.encodeAsciiString(valueA));
+			$headerParams.put("valueA", BaseUtils.encodeAsciiString(valueA));
 		} else {
 			$headerParams.put("valueA", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4214,11 +4214,11 @@ public List<NilResult> multiHeaderParamOptNil(String valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("multiHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4243,12 +4243,12 @@ public List<NilResult> multiHeaderParamOptNil(String valueA, Integer valueB) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", ServiceUtils.encodeAsciiString(valueA));
+			$headerParams.put("valueA", BaseUtils.encodeAsciiString(valueA));
 		} else {
 			$headerParams.put("valueA", "null");
 		}
 		$headerParams.put("valueB", String.format("%s", valueB));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4264,11 +4264,11 @@ public List<NilResult> multiHeaderParamOptNil(String valueA, Integer valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("multiHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4294,8 +4294,8 @@ public SimpleRecord.Data recordHeaderParam(SimpleRecord.Data headerValue) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", ServiceUtils.encodeBase64(ServiceUtils.ofObject(headerValue, false, this.contentType(), SimpleRecord.Data.class)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", BaseUtils.encodeBase64(BaseUtils.ofObject(headerValue, false, this.contentType(), SimpleRecord.Data.class)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4312,11 +4312,11 @@ public SimpleRecord.Data recordHeaderParam(SimpleRecord.Data headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("recordHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4350,11 +4350,11 @@ public NilResult recordHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4379,9 +4379,9 @@ public NilResult recordHeaderParamOpt(SimpleRecord.Data headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", ServiceUtils.encodeBase64(ServiceUtils.ofObject(headerValue, false, this.contentType(), SimpleRecord.Data.class)));
+			$headerParams.put("headerValue", BaseUtils.encodeBase64(BaseUtils.ofObject(headerValue, false, this.contentType(), SimpleRecord.Data.class)));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4398,11 +4398,11 @@ public NilResult recordHeaderParamOpt(SimpleRecord.Data headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4427,11 +4427,11 @@ public NilResult recordHeaderParamNil(SimpleRecord.Data headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", ServiceUtils.encodeBase64(ServiceUtils.ofObject(headerValue, false, this.contentType(), SimpleRecord.Data.class)));
+			$headerParams.put("headerValue", BaseUtils.encodeBase64(BaseUtils.ofObject(headerValue, false, this.contentType(), SimpleRecord.Data.class)));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4448,11 +4448,11 @@ public NilResult recordHeaderParamNil(SimpleRecord.Data headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4486,11 +4486,11 @@ public NilResult recordHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4515,11 +4515,11 @@ public NilResult recordHeaderParamOptNil(SimpleRecord.Data headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", ServiceUtils.encodeBase64(ServiceUtils.ofObject(headerValue, false, this.contentType(), SimpleRecord.Data.class)));
+			$headerParams.put("headerValue", BaseUtils.encodeBase64(BaseUtils.ofObject(headerValue, false, this.contentType(), SimpleRecord.Data.class)));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4536,11 +4536,11 @@ public NilResult recordHeaderParamOptNil(SimpleRecord.Data headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4569,24 +4569,24 @@ public void mixed(String pathString, int pathNumber, String headerString, int he
 
 		var $path = "%s/api/headerparametertypes/mixed/%s/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathString)),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathNumber)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathString)),
+				BaseUtils.encodeURIComponent(Objects.toString(pathNumber)));
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryString", queryString);
 		$queryParams.append("queryNumber", queryNumber);
-		$queryParams.append("queryRecord", ServiceUtils.ofObject(queryRecord, false, this.contentType(), SimpleRecord.Data.class));
+		$queryParams.append("queryRecord", BaseUtils.ofObject(queryRecord, false, this.contentType(), SimpleRecord.Data.class));
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerString", ServiceUtils.encodeAsciiString(headerString));
+		$headerParams.put("headerString", BaseUtils.encodeAsciiString(headerString));
 		$headerParams.put("headerNumber", String.format("%s", headerNumber));
-		$headerParams.put("headerRecord", ServiceUtils.encodeBase64(ServiceUtils.ofObject(headerRecord, false, this.contentType(), SimpleRecord.Data.class)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerRecord", BaseUtils.encodeBase64(BaseUtils.ofObject(headerRecord, false, this.contentType(), SimpleRecord.Data.class)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(body, false, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(body, false, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4605,7 +4605,7 @@ public void mixed(String pathString, int pathNumber, String headerString, int he
 				this.lifecycleHook.onSuccess("mixed", null, this.client.createResponseAdaptable($response));
 				return;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("mixed", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ServiceUtils.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/JDKHttpClientResponseUtils.java
similarity index 54%
rename from dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ServiceUtils.java
rename to dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/JDKHttpClientResponseUtils.java
index ae495bdd..c3241f0d 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ServiceUtils.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/JDKHttpClientResponseUtils.java
@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import java.io.IOException;
 import java.net.http.HttpResponse;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -14,58 +13,18 @@
 import java.time.LocalTime;
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.Base64;
 import java.util.function.Function;
-import java.util.HexFormat;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import jakarta.json.JsonObject;
 
 import dev.rsdlang.sample.client.impl.model.json._BlobImpl;
 import dev.rsdlang.sample.client.impl.model.json._FileImpl;
 import dev.rsdlang.sample.client.impl.model.json._JsonUtils;
-import dev.rsdlang.sample.client.impl.model.json._JsonUtils.TypeInfo;
-import dev.rsdlang.sample.client.model._Base;
 import dev.rsdlang.sample.client.model.RSDBlob;
 import dev.rsdlang.sample.client.model.RSDFile;
 
-public class ServiceUtils {
-	private record SearchParam(String key, Object value) {
-
-	}
-
-	public static class URLSearchParams {
-		private List<SearchParam> params = new ArrayList<>();
-
-		public void append(String key, Object value) {
-			params.add(new SearchParam(key, value));
-		}
-
-		public String toQueryString() {
-			if (params.isEmpty()) {
-				return "";
-			}
-			return "?" + params.stream()
-					.map(e -> "%s=%s".formatted(encodeQueryString(e.key), encodeQueryString(e.value)))
-					.collect(Collectors.joining("&"));
-		}
-	}
-
-	private static String encodeQueryString(Object value) {
-		if (value == null) {
-			return "null";
-		}
-
-		if (value instanceof byte[] bytes) {
-			return encodeBase64(bytes);
-		}
-
-		return URLEncoder.encode(value.toString(), StandardCharsets.UTF_8);
-	}
+public class JDKHttpClientResponseUtils {
 
 	public static String toString(HttpResponse<InputStream> response) {
 		try (var is = response.body()) {
@@ -75,12 +34,6 @@ public static String toString(HttpResponse<InputStream> response) {
 		}
 	}
 
-	public static String[] toHeaders(Map<String, String> data) {
-		return data.entrySet().stream()
-				.flatMap(e -> Stream.of(e.getKey(), e.getValue()))
-				.toArray(String[]::new);
-	}
-
 	private static String contentType(HttpResponse<InputStream> response) {
 		return response.headers().firstValue("Content-Type")
 				.orElseThrow(() -> new IllegalStateException("Response is missing Content-Type header"));
@@ -310,272 +263,6 @@ public static List<OffsetDateTime> mapOffsetDateTimes(HttpResponse<InputStream>
 		}
 	}
 
-	public static byte[] ofBoolean(
-			Boolean value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.BOOLEAN);
-	}
-
-	public static byte[] ofBooleanList(
-			List<Boolean> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.BOOLEAN.withMulti());
-	}
-
-	public static byte[] ofShort(
-			Short value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.SHORT);
-	}
-
-	public static byte[] ofShortList(
-			List<Short> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.SHORT.withMulti());
-	}
-
-	public static byte[] ofInt(
-			Integer value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.INTEGER);
-	}
-
-	public static byte[] ofIntList(
-			List<Integer> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.INTEGER.withMulti());
-	}
-
-	public static byte[] ofLong(
-			Long value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.LONG);
-	}
-
-	public static byte[] ofLongList(
-			List<Long> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.LONG.withMulti());
-	}
-
-	public static byte[] ofFloat(
-			Float value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.FLOAT);
-	}
-
-	public static byte[] ofFloatList(
-			List<Float> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.FLOAT.withMulti());
-	}
-
-	public static byte[] ofDouble(
-			Double value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.DOUBLE);
-	}
-
-	public static byte[] ofDoubleList(
-			List<Double> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.DOUBLE.withMulti());
-	}
-
-	public static byte[] ofString(
-			String value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofStringList(
-			List<String> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofLocalDate(
-			LocalDate value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofLocalDateList(
-			List<LocalDate> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofLocalDateTime(
-			LocalDateTime value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofLocalDateTimeList(
-			List<LocalDateTime> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofZonedDateTime(
-			ZonedDateTime value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofZonedDateTimeList(
-			List<ZonedDateTime> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofLocalTime(
-			LocalTime value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofLocalTimeList(
-			List<LocalTime> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofOffsetDateTime(
-			OffsetDateTime value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofOffsetDateTimeList(
-			List<OffsetDateTime> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofLiteral(
-			Object value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static <T> byte[] ofLiteralList(
-			List<T> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static <T extends _Base.BaseData> byte[] ofObject(
-			T value,
-			boolean nullable,
-			String contentType,
-			Class<T> type) {
-		return of(value, nullable, contentType, TypeInfo.value(type));
-	}
-
-	public static <T extends _Base.BaseData> byte[] ofObjectList(
-			List<T> value,
-			boolean nullable,
-			String contentType,
-			Class<T> type) {
-		return of(value, nullable, contentType, TypeInfo.value(type).withMulti());
-	}
-
-	private static byte[] of(
-			Object value,
-			boolean nullable,
-			String contentType,
-			TypeInfo<?> baseTypeInfo) {
-		var typeInfo = baseTypeInfo;
-		if (nullable) {
-			typeInfo = typeInfo.withNullable();
-		}
-
-		return _JsonUtils.encodeValue(value, contentType, typeInfo);
-	}
-
-	public static String encodeAsciiString(String text) {
-		text = text.replace("\\u", "\\u005Cu"); // Escape existing \\u sequences
-		int leading = 0;
-		while (leading < text.length() && text.charAt(leading) == ' ') leading++;
-		if (leading > 0) {
-			text = "\\u0020".repeat(leading) + text.substring(leading);
-		}
-		int trailing = 0;
-		int len = text.length();
-		while (trailing < len && text.charAt(len - 1 - trailing) == ' ') trailing++;
-		if (trailing > 0) {
-			text = text.substring(0, len - trailing) + "\\u0020".repeat(trailing);
-		}
-		var b = new StringBuilder(text.length());
-		var l = text.length();
-		for (var i = 0; i < l; i++) {
-			var c = text.charAt(i);
-			// Escape non-printable characters, comma and all non-ASCII characters
-			if (c < 32 || c > 126 || c == 44) {
-				b.append(String.format("\\u%04x", (int) c));
-			} else {
-				b.append(c);
-			}
-		}
-
-		return b.toString();
-	}
-
-	public static String encodeBase64(byte[] value) {
-		return Base64.getEncoder().encodeToString(value);
-	}
-
-	public static String encodeURIComponent(String value) {
-		var bytes = value.getBytes(StandardCharsets.UTF_8);
-		var result = new StringBuilder();
-
-		HexFormat hex = HexFormat.of().withUpperCase();
-		for (byte b : bytes) {
-			// Unreserved characters according to RFC 3986
-			if ((b >= 'A' && b <= 'Z') // Alpanumeric characters uppercase
-					|| (b >= 'a' && b <= 'z') // Alpanumeric characters lowercase
-					|| (b >= '0' && b <= '9') // Numeric characters
-					|| b == '-' || b == '_' || b == '.' // Unreserved Part 1
-					|| b == '!' || b == '~' || b == '*' // Unreserved Part 2
-					|| b == '\'' || b == '(' || b == ')' // Unreserved Part 3
-			) {
-				result.append((char) b); // safe as we know this is an ascii character
-			} else {
-				result.append('%');
-				hex.toHexDigits(result, b);
-			}
-		}
-		return result.toString();
-	}
-
 	public static String mapFileToString(HttpResponse<Path> response) {
 		var file = response.body();
 		try {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListBodyParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListBodyParameterTypesServiceImpl.java
index 2f6e2527..46c4a668 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListBodyParameterTypesServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListBodyParameterTypesServiceImpl.java
@@ -65,7 +65,7 @@ public List<Boolean> listBooleanBodyParam(List<Boolean> bodyBoolean) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofBooleanList(bodyBoolean, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofBooleanList(bodyBoolean, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -77,11 +77,11 @@ public List<Boolean> listBooleanBodyParam(List<Boolean> bodyBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBooleans($response);
+				var $rv = JDKHttpClientResponseUtils.mapBooleans($response);
 				this.lifecycleHook.onSuccess("listBooleanBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -119,11 +119,11 @@ public NilResult listBooleanBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -149,7 +149,7 @@ public NilResult listBooleanBodyParamOpt(List<Boolean> bodyBoolean) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyBoolean == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofBooleanList(bodyBoolean, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyBoolean == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofBooleanList(bodyBoolean, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -161,11 +161,11 @@ public NilResult listBooleanBodyParamOpt(List<Boolean> bodyBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -191,7 +191,7 @@ public NilResult listBooleanBodyParamNil(List<Boolean> bodyBoolean) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofBooleanList(bodyBoolean, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofBooleanList(bodyBoolean, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -203,11 +203,11 @@ public NilResult listBooleanBodyParamNil(List<Boolean> bodyBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -245,11 +245,11 @@ public NilResult listBooleanBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -275,7 +275,7 @@ public NilResult listBooleanBodyParamOptNil(List<Boolean> bodyBoolean) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofBooleanList(bodyBoolean, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofBooleanList(bodyBoolean, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -287,11 +287,11 @@ public NilResult listBooleanBodyParamOptNil(List<Boolean> bodyBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -317,7 +317,7 @@ public List<Short> listShortBodyParam(List<Short> bodyShort) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofShortList(bodyShort, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofShortList(bodyShort, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -329,11 +329,11 @@ public List<Short> listShortBodyParam(List<Short> bodyShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShorts($response);
+				var $rv = JDKHttpClientResponseUtils.mapShorts($response);
 				this.lifecycleHook.onSuccess("listShortBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -371,11 +371,11 @@ public NilResult listShortBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -401,7 +401,7 @@ public NilResult listShortBodyParamOpt(List<Short> bodyShort) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyShort == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofShortList(bodyShort, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyShort == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofShortList(bodyShort, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -413,11 +413,11 @@ public NilResult listShortBodyParamOpt(List<Short> bodyShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -443,7 +443,7 @@ public NilResult listShortBodyParamNil(List<Short> bodyShort) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofShortList(bodyShort, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofShortList(bodyShort, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -455,11 +455,11 @@ public NilResult listShortBodyParamNil(List<Short> bodyShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -497,11 +497,11 @@ public NilResult listShortBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -527,7 +527,7 @@ public NilResult listShortBodyParamOptNil(List<Short> bodyShort) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofShortList(bodyShort, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofShortList(bodyShort, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -539,11 +539,11 @@ public NilResult listShortBodyParamOptNil(List<Short> bodyShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -569,7 +569,7 @@ public List<Integer> listIntBodyParam(List<Integer> bodyInt) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofIntList(bodyInt, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofIntList(bodyInt, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -581,11 +581,11 @@ public List<Integer> listIntBodyParam(List<Integer> bodyInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInts($response);
+				var $rv = JDKHttpClientResponseUtils.mapInts($response);
 				this.lifecycleHook.onSuccess("listIntBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -623,11 +623,11 @@ public NilResult listIntBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -653,7 +653,7 @@ public NilResult listIntBodyParamOpt(List<Integer> bodyInt) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyInt == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofIntList(bodyInt, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyInt == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofIntList(bodyInt, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -665,11 +665,11 @@ public NilResult listIntBodyParamOpt(List<Integer> bodyInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -695,7 +695,7 @@ public NilResult listIntBodyParamNil(List<Integer> bodyInt) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofIntList(bodyInt, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofIntList(bodyInt, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -707,11 +707,11 @@ public NilResult listIntBodyParamNil(List<Integer> bodyInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -749,11 +749,11 @@ public NilResult listIntBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -779,7 +779,7 @@ public NilResult listIntBodyParamOptNil(List<Integer> bodyInt) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofIntList(bodyInt, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofIntList(bodyInt, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -791,11 +791,11 @@ public NilResult listIntBodyParamOptNil(List<Integer> bodyInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -821,7 +821,7 @@ public List<Long> listLongBodyParam(List<Long> bodyLong) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLongList(bodyLong, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLongList(bodyLong, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -833,11 +833,11 @@ public List<Long> listLongBodyParam(List<Long> bodyLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLongs($response);
+				var $rv = JDKHttpClientResponseUtils.mapLongs($response);
 				this.lifecycleHook.onSuccess("listLongBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -875,11 +875,11 @@ public NilResult listLongBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -905,7 +905,7 @@ public NilResult listLongBodyParamOpt(List<Long> bodyLong) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyLong == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLongList(bodyLong, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyLong == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLongList(bodyLong, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -917,11 +917,11 @@ public NilResult listLongBodyParamOpt(List<Long> bodyLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -947,7 +947,7 @@ public NilResult listLongBodyParamNil(List<Long> bodyLong) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLongList(bodyLong, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLongList(bodyLong, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -959,11 +959,11 @@ public NilResult listLongBodyParamNil(List<Long> bodyLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1001,11 +1001,11 @@ public NilResult listLongBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1031,7 +1031,7 @@ public NilResult listLongBodyParamOptNil(List<Long> bodyLong) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLongList(bodyLong, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLongList(bodyLong, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1043,11 +1043,11 @@ public NilResult listLongBodyParamOptNil(List<Long> bodyLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1073,7 +1073,7 @@ public List<Float> listFloatBodyParam(List<Float> bodyFloat) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofFloatList(bodyFloat, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofFloatList(bodyFloat, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1085,11 +1085,11 @@ public List<Float> listFloatBodyParam(List<Float> bodyFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloats($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloats($response);
 				this.lifecycleHook.onSuccess("listFloatBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1127,11 +1127,11 @@ public NilResult listFloatBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1157,7 +1157,7 @@ public NilResult listFloatBodyParamOpt(List<Float> bodyFloat) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyFloat == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofFloatList(bodyFloat, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyFloat == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofFloatList(bodyFloat, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1169,11 +1169,11 @@ public NilResult listFloatBodyParamOpt(List<Float> bodyFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1199,7 +1199,7 @@ public NilResult listFloatBodyParamNil(List<Float> bodyFloat) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofFloatList(bodyFloat, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofFloatList(bodyFloat, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1211,11 +1211,11 @@ public NilResult listFloatBodyParamNil(List<Float> bodyFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1253,11 +1253,11 @@ public NilResult listFloatBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1283,7 +1283,7 @@ public NilResult listFloatBodyParamOptNil(List<Float> bodyFloat) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofFloatList(bodyFloat, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofFloatList(bodyFloat, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1295,11 +1295,11 @@ public NilResult listFloatBodyParamOptNil(List<Float> bodyFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1325,7 +1325,7 @@ public List<Double> listDoubleBodyParam(List<Double> bodyDouble) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofDoubleList(bodyDouble, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofDoubleList(bodyDouble, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1337,11 +1337,11 @@ public List<Double> listDoubleBodyParam(List<Double> bodyDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDoubles($response);
+				var $rv = JDKHttpClientResponseUtils.mapDoubles($response);
 				this.lifecycleHook.onSuccess("listDoubleBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1379,11 +1379,11 @@ public NilResult listDoubleBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1409,7 +1409,7 @@ public NilResult listDoubleBodyParamOpt(List<Double> bodyDouble) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyDouble == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofDoubleList(bodyDouble, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyDouble == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofDoubleList(bodyDouble, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1421,11 +1421,11 @@ public NilResult listDoubleBodyParamOpt(List<Double> bodyDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1451,7 +1451,7 @@ public NilResult listDoubleBodyParamNil(List<Double> bodyDouble) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofDoubleList(bodyDouble, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofDoubleList(bodyDouble, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1463,11 +1463,11 @@ public NilResult listDoubleBodyParamNil(List<Double> bodyDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1505,11 +1505,11 @@ public NilResult listDoubleBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1535,7 +1535,7 @@ public NilResult listDoubleBodyParamOptNil(List<Double> bodyDouble) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofDoubleList(bodyDouble, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofDoubleList(bodyDouble, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1547,11 +1547,11 @@ public NilResult listDoubleBodyParamOptNil(List<Double> bodyDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1579,7 +1579,7 @@ public List<String> listStringBodyParam(List<String> bodyString) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofStringList(bodyString, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofStringList(bodyString, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1591,11 +1591,11 @@ public List<String> listStringBodyParam(List<String> bodyString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapStrings($response);
+				var $rv = JDKHttpClientResponseUtils.mapStrings($response);
 				this.lifecycleHook.onSuccess("listStringBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1633,11 +1633,11 @@ public NilResult listStringBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1663,7 +1663,7 @@ public NilResult listStringBodyParamOpt(List<String> bodyString) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyString == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofStringList(bodyString, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyString == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofStringList(bodyString, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1675,11 +1675,11 @@ public NilResult listStringBodyParamOpt(List<String> bodyString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1705,7 +1705,7 @@ public NilResult listStringBodyParamNil(List<String> bodyString) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofStringList(bodyString, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofStringList(bodyString, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1717,11 +1717,11 @@ public NilResult listStringBodyParamNil(List<String> bodyString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1759,11 +1759,11 @@ public NilResult listStringBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1789,7 +1789,7 @@ public NilResult listStringBodyParamOptNil(List<String> bodyString) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofStringList(bodyString, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofStringList(bodyString, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1801,11 +1801,11 @@ public NilResult listStringBodyParamOptNil(List<String> bodyString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1833,7 +1833,7 @@ public List<LocalDate> listLocalDateBodyParam(List<LocalDate> bodyLocalDate) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateList(bodyLocalDate, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateList(bodyLocalDate, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1845,11 +1845,11 @@ public List<LocalDate> listLocalDateBodyParam(List<LocalDate> bodyLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDates($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDates($response);
 				this.lifecycleHook.onSuccess("listLocalDateBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1887,11 +1887,11 @@ public NilResult listLocalDateBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1917,7 +1917,7 @@ public NilResult listLocalDateBodyParamOpt(List<LocalDate> bodyLocalDate) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyLocalDate == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLocalDateList(bodyLocalDate, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyLocalDate == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLocalDateList(bodyLocalDate, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1929,11 +1929,11 @@ public NilResult listLocalDateBodyParamOpt(List<LocalDate> bodyLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1959,7 +1959,7 @@ public NilResult listLocalDateBodyParamNil(List<LocalDate> bodyLocalDate) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateList(bodyLocalDate, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateList(bodyLocalDate, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -1971,11 +1971,11 @@ public NilResult listLocalDateBodyParamNil(List<LocalDate> bodyLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2013,11 +2013,11 @@ public NilResult listLocalDateBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2043,7 +2043,7 @@ public NilResult listLocalDateBodyParamOptNil(List<LocalDate> bodyLocalDate) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateList(bodyLocalDate, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateList(bodyLocalDate, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2055,11 +2055,11 @@ public NilResult listLocalDateBodyParamOptNil(List<LocalDate> bodyLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2087,7 +2087,7 @@ public List<LocalDateTime> listLocalDateTimeBodyParam(List<LocalDateTime> bodyLo
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateTimeList(bodyLocalDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateTimeList(bodyLocalDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2099,11 +2099,11 @@ public List<LocalDateTime> listLocalDateTimeBodyParam(List<LocalDateTime> bodyLo
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTimes($response);
 				this.lifecycleHook.onSuccess("listLocalDateTimeBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2141,11 +2141,11 @@ public NilResult listLocalDateTimeBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2171,7 +2171,7 @@ public NilResult listLocalDateTimeBodyParamOpt(List<LocalDateTime> bodyLocalDate
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyLocalDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLocalDateTimeList(bodyLocalDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyLocalDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLocalDateTimeList(bodyLocalDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2183,11 +2183,11 @@ public NilResult listLocalDateTimeBodyParamOpt(List<LocalDateTime> bodyLocalDate
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2213,7 +2213,7 @@ public NilResult listLocalDateTimeBodyParamNil(List<LocalDateTime> bodyLocalDate
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateTimeList(bodyLocalDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateTimeList(bodyLocalDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2225,11 +2225,11 @@ public NilResult listLocalDateTimeBodyParamNil(List<LocalDateTime> bodyLocalDate
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2267,11 +2267,11 @@ public NilResult listLocalDateTimeBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2297,7 +2297,7 @@ public NilResult listLocalDateTimeBodyParamOptNil(List<LocalDateTime> bodyLocalD
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalDateTimeList(bodyLocalDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalDateTimeList(bodyLocalDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2309,11 +2309,11 @@ public NilResult listLocalDateTimeBodyParamOptNil(List<LocalDateTime> bodyLocalD
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2341,7 +2341,7 @@ public List<LocalTime> listLocalTimeBodyParam(List<LocalTime> bodyLocalTime) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalTimeList(bodyLocalTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalTimeList(bodyLocalTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2353,11 +2353,11 @@ public List<LocalTime> listLocalTimeBodyParam(List<LocalTime> bodyLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTimes($response);
 				this.lifecycleHook.onSuccess("listLocalTimeBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2395,11 +2395,11 @@ public NilResult listLocalTimeBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2425,7 +2425,7 @@ public NilResult listLocalTimeBodyParamOpt(List<LocalTime> bodyLocalTime) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyLocalTime == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLocalTimeList(bodyLocalTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyLocalTime == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLocalTimeList(bodyLocalTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2437,11 +2437,11 @@ public NilResult listLocalTimeBodyParamOpt(List<LocalTime> bodyLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2467,7 +2467,7 @@ public NilResult listLocalTimeBodyParamNil(List<LocalTime> bodyLocalTime) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalTimeList(bodyLocalTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalTimeList(bodyLocalTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2479,11 +2479,11 @@ public NilResult listLocalTimeBodyParamNil(List<LocalTime> bodyLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2521,11 +2521,11 @@ public NilResult listLocalTimeBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2551,7 +2551,7 @@ public NilResult listLocalTimeBodyParamOptNil(List<LocalTime> bodyLocalTime) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLocalTimeList(bodyLocalTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLocalTimeList(bodyLocalTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2563,11 +2563,11 @@ public NilResult listLocalTimeBodyParamOptNil(List<LocalTime> bodyLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2595,7 +2595,7 @@ public List<OffsetDateTime> listOffsetDateTimeBodyParam(List<OffsetDateTime> bod
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofOffsetDateTimeList(bodyOffsetDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofOffsetDateTimeList(bodyOffsetDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2607,11 +2607,11 @@ public List<OffsetDateTime> listOffsetDateTimeBodyParam(List<OffsetDateTime> bod
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTimes($response);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2649,11 +2649,11 @@ public NilResult listOffsetDateTimeBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2679,7 +2679,7 @@ public NilResult listOffsetDateTimeBodyParamOpt(List<OffsetDateTime> bodyOffsetD
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyOffsetDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofOffsetDateTimeList(bodyOffsetDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyOffsetDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofOffsetDateTimeList(bodyOffsetDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2691,11 +2691,11 @@ public NilResult listOffsetDateTimeBodyParamOpt(List<OffsetDateTime> bodyOffsetD
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2721,7 +2721,7 @@ public NilResult listOffsetDateTimeBodyParamNil(List<OffsetDateTime> bodyOffsetD
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofOffsetDateTimeList(bodyOffsetDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofOffsetDateTimeList(bodyOffsetDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2733,11 +2733,11 @@ public NilResult listOffsetDateTimeBodyParamNil(List<OffsetDateTime> bodyOffsetD
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2775,11 +2775,11 @@ public NilResult listOffsetDateTimeBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2805,7 +2805,7 @@ public NilResult listOffsetDateTimeBodyParamOptNil(List<OffsetDateTime> bodyOffs
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofOffsetDateTimeList(bodyOffsetDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofOffsetDateTimeList(bodyOffsetDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2817,11 +2817,11 @@ public NilResult listOffsetDateTimeBodyParamOptNil(List<OffsetDateTime> bodyOffs
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2849,7 +2849,7 @@ public List<ZonedDateTime> listZonedDateTimeBodyParam(List<ZonedDateTime> bodyZo
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofZonedDateTimeList(bodyZonedDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofZonedDateTimeList(bodyZonedDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2861,11 +2861,11 @@ public List<ZonedDateTime> listZonedDateTimeBodyParam(List<ZonedDateTime> bodyZo
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTimes($response);
 				this.lifecycleHook.onSuccess("listZonedDateTimeBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2903,11 +2903,11 @@ public NilResult listZonedDateTimeBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2933,7 +2933,7 @@ public NilResult listZonedDateTimeBodyParamOpt(List<ZonedDateTime> bodyZonedDate
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyZonedDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofZonedDateTimeList(bodyZonedDateTime, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyZonedDateTime == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofZonedDateTimeList(bodyZonedDateTime, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2945,11 +2945,11 @@ public NilResult listZonedDateTimeBodyParamOpt(List<ZonedDateTime> bodyZonedDate
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2975,7 +2975,7 @@ public NilResult listZonedDateTimeBodyParamNil(List<ZonedDateTime> bodyZonedDate
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofZonedDateTimeList(bodyZonedDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofZonedDateTimeList(bodyZonedDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -2987,11 +2987,11 @@ public NilResult listZonedDateTimeBodyParamNil(List<ZonedDateTime> bodyZonedDate
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3029,11 +3029,11 @@ public NilResult listZonedDateTimeBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3059,7 +3059,7 @@ public NilResult listZonedDateTimeBodyParamOptNil(List<ZonedDateTime> bodyZonedD
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofZonedDateTimeList(bodyZonedDateTime, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofZonedDateTimeList(bodyZonedDateTime, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3071,11 +3071,11 @@ public NilResult listZonedDateTimeBodyParamOptNil(List<ZonedDateTime> bodyZonedD
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3103,7 +3103,7 @@ public List<ZoneId> listScalarBodyParam(List<ZoneId> bodyScalar) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyScalar, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyScalar, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3115,11 +3115,11 @@ public List<ZoneId> listScalarBodyParam(List<ZoneId> bodyScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("listScalarBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3157,11 +3157,11 @@ public NilResult listScalarBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3187,7 +3187,7 @@ public NilResult listScalarBodyParamOpt(List<ZoneId> bodyScalar) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyScalar == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLiteralList(bodyScalar, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyScalar == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLiteralList(bodyScalar, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3199,11 +3199,11 @@ public NilResult listScalarBodyParamOpt(List<ZoneId> bodyScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3229,7 +3229,7 @@ public NilResult listScalarBodyParamNil(List<ZoneId> bodyScalar) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyScalar, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyScalar, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3241,11 +3241,11 @@ public NilResult listScalarBodyParamNil(List<ZoneId> bodyScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3283,11 +3283,11 @@ public NilResult listScalarBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3313,7 +3313,7 @@ public NilResult listScalarBodyParamOptNil(List<ZoneId> bodyScalar) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyScalar, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyScalar, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3325,11 +3325,11 @@ public NilResult listScalarBodyParamOptNil(List<ZoneId> bodyScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3357,7 +3357,7 @@ public List<SampleEnum> listEnumBodyParam(List<SampleEnum> bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyEnum, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyEnum, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3369,11 +3369,11 @@ public List<SampleEnum> listEnumBodyParam(List<SampleEnum> bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("listEnumBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3411,11 +3411,11 @@ public NilResult listEnumBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3441,7 +3441,7 @@ public NilResult listEnumBodyParamOpt(List<SampleEnum> bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyEnum == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLiteralList(bodyEnum, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyEnum == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLiteralList(bodyEnum, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3453,11 +3453,11 @@ public NilResult listEnumBodyParamOpt(List<SampleEnum> bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3483,7 +3483,7 @@ public NilResult listEnumBodyParamNil(List<SampleEnum> bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyEnum, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyEnum, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3495,11 +3495,11 @@ public NilResult listEnumBodyParamNil(List<SampleEnum> bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3537,11 +3537,11 @@ public NilResult listEnumBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3567,7 +3567,7 @@ public NilResult listEnumBodyParamOptNil(List<SampleEnum> bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyEnum, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyEnum, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3579,11 +3579,11 @@ public NilResult listEnumBodyParamOptNil(List<SampleEnum> bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3611,7 +3611,7 @@ public NilResult listEnumBodyParamOptNil(List<SampleEnum> bodyEnum) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyEnum, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyEnum, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3623,11 +3623,11 @@ public NilResult listEnumBodyParamOptNil(List<SampleEnum> bodyEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, ListInlineEnumBodyParam_Result$::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ListInlineEnumBodyParam_Result$::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3665,11 +3665,11 @@ public NilResult listInlineEnumBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3695,7 +3695,7 @@ public NilResult listInlineEnumBodyParamOpt(List<ListInlineEnumBodyParamOpt_Body
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyEnum == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLiteralList(bodyEnum, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(bodyEnum == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLiteralList(bodyEnum, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3707,11 +3707,11 @@ public NilResult listInlineEnumBodyParamOpt(List<ListInlineEnumBodyParamOpt_Body
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3737,7 +3737,7 @@ public NilResult listInlineEnumBodyParamNil(List<ListInlineEnumBodyParamNil_Body
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyEnum, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyEnum, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3749,11 +3749,11 @@ public NilResult listInlineEnumBodyParamNil(List<ListInlineEnumBodyParamNil_Body
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3791,11 +3791,11 @@ public NilResult listInlineEnumBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3821,7 +3821,7 @@ public NilResult listInlineEnumBodyParamOptNil(List<ListInlineEnumBodyParamOptNi
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(bodyEnum, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(bodyEnum, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3833,11 +3833,11 @@ public NilResult listInlineEnumBodyParamOptNil(List<ListInlineEnumBodyParamOptNi
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3870,7 +3870,7 @@ public String listMultiBodyParam(List<String> valueA, List<Integer> valueB, List
 			$builder = $builder.add("valueA", _JsonUtils.toJsonStringArray(valueA));
 			$builder = $builder.add("valueB", _JsonUtils.toJsonIntArray(valueB));
 			$builder = $builder.add("valueC", _JsonUtils.toJsonValueArray(valueC, i -> ((_BaseDataImpl) i).data));
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3882,11 +3882,11 @@ public String listMultiBodyParam(List<String> valueA, List<Integer> valueB, List
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("listMultiBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3924,11 +3924,11 @@ public List<NilResult> listMultiBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3958,7 +3958,7 @@ public List<NilResult> listMultiBodyParamOpt(List<String> valueA) {
 			if(valueA != null) {
 				$builder = $builder.add("valueA", _JsonUtils.toJsonStringArray(valueA));
 			}
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -3970,11 +3970,11 @@ public List<NilResult> listMultiBodyParamOpt(List<String> valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4007,7 +4007,7 @@ public List<NilResult> listMultiBodyParamOpt(List<String> valueA, List<Integer>
 			if(valueB != null) {
 				$builder = $builder.add("valueB", _JsonUtils.toJsonIntArray(valueB));
 			}
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4019,11 +4019,11 @@ public List<NilResult> listMultiBodyParamOpt(List<String> valueA, List<Integer>
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4059,7 +4059,7 @@ public List<NilResult> listMultiBodyParamOpt(List<String> valueA, List<Integer>
 			if(valueC != null) {
 				$builder = $builder.add("valueC", _JsonUtils.toJsonValueArray(valueC, i -> ((_BaseDataImpl) i).data));
 			}
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4071,11 +4071,11 @@ public List<NilResult> listMultiBodyParamOpt(List<String> valueA, List<Integer>
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4105,7 +4105,7 @@ public List<NilResult> listMultiBodyParamNil(List<String> valueA, List<Integer>
 			$builder = valueA == null ? $builder.addNull("valueA") : $builder.add("valueA", _JsonUtils.toJsonStringArray(valueA));
 			$builder = valueB == null ? $builder.addNull("valueB") : $builder.add("valueB", _JsonUtils.toJsonIntArray(valueB));
 			$builder = valueC == null ? $builder.addNull("valueC") : $builder.add("valueC", _JsonUtils.toJsonValueArray(valueC, i -> ((_BaseDataImpl) i).data));
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamNilDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamNilDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamNilDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamNilDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4117,11 +4117,11 @@ public List<NilResult> listMultiBodyParamNil(List<String> valueA, List<Integer>
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4159,11 +4159,11 @@ public List<NilResult> listMultiBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4191,7 +4191,7 @@ public List<NilResult> listMultiBodyParamOptNil(List<String> valueA) {
 			var $contentType = this.contentType();
 			var $builder = Json.createObjectBuilder();
 			$builder = valueA == null ? $builder.addNull("valueA") : $builder.add("valueA", _JsonUtils.toJsonStringArray(valueA));
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4203,11 +4203,11 @@ public List<NilResult> listMultiBodyParamOptNil(List<String> valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4236,7 +4236,7 @@ public List<NilResult> listMultiBodyParamOptNil(List<String> valueA, List<Intege
 			var $builder = Json.createObjectBuilder();
 			$builder = valueA == null ? $builder.addNull("valueA") : $builder.add("valueA", _JsonUtils.toJsonStringArray(valueA));
 			$builder = valueB == null ? $builder.addNull("valueB") : $builder.add("valueB", _JsonUtils.toJsonIntArray(valueB));
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4248,11 +4248,11 @@ public List<NilResult> listMultiBodyParamOptNil(List<String> valueA, List<Intege
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4282,7 +4282,7 @@ public List<NilResult> listMultiBodyParamOptNil(List<String> valueA, List<Intege
 			$builder = valueA == null ? $builder.addNull("valueA") : $builder.add("valueA", _JsonUtils.toJsonStringArray(valueA));
 			$builder = valueB == null ? $builder.addNull("valueB") : $builder.add("valueB", _JsonUtils.toJsonIntArray(valueB));
 			$builder = valueC == null ? $builder.addNull("valueC") : $builder.add("valueC", _JsonUtils.toJsonValueArray(valueC, i -> ((_BaseDataImpl) i).data));
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObject(new ListBodyParameterTypesListMultiBodyParamOptNilDataImpl($builder.build()), false, this.contentType(), ListBodyParameterTypesListMultiBodyParamOptNilDataImpl.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4294,11 +4294,11 @@ public List<NilResult> listMultiBodyParamOptNil(List<String> valueA, List<Intege
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4326,7 +4326,7 @@ public List<SimpleRecord.Data> listRecordBodyParam(List<SimpleRecord.Data> bodyR
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObjectList(bodyRecord, false, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObjectList(bodyRecord, false, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4338,11 +4338,11 @@ public List<SimpleRecord.Data> listRecordBodyParam(List<SimpleRecord.Data> bodyR
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("listRecordBodyParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordBodyParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4380,11 +4380,11 @@ public NilResult listRecordBodyParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4410,7 +4410,7 @@ public NilResult listRecordBodyParamOpt(List<SimpleRecord.Data> bodyRecord) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(bodyRecord == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofObjectList(bodyRecord, false, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(bodyRecord == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofObjectList(bodyRecord, false, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4422,11 +4422,11 @@ public NilResult listRecordBodyParamOpt(List<SimpleRecord.Data> bodyRecord) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordBodyParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordBodyParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4452,7 +4452,7 @@ public NilResult listRecordBodyParamNil(List<SimpleRecord.Data> bodyRecord) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObjectList(bodyRecord, true, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObjectList(bodyRecord, true, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4464,11 +4464,11 @@ public NilResult listRecordBodyParamNil(List<SimpleRecord.Data> bodyRecord) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordBodyParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordBodyParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4506,11 +4506,11 @@ public NilResult listRecordBodyParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4536,7 +4536,7 @@ public NilResult listRecordBodyParamOptNil(List<SimpleRecord.Data> bodyRecord) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofObjectList(bodyRecord, true, $contentType, SimpleRecord.Data.class));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofObjectList(bodyRecord, true, $contentType, SimpleRecord.Data.class));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -4548,11 +4548,11 @@ public NilResult listRecordBodyParamOptNil(List<SimpleRecord.Data> bodyRecord) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordBodyParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordBodyParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListHeaderParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListHeaderParameterTypesServiceImpl.java
index 154cd059..c46bac5f 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListHeaderParameterTypesServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListHeaderParameterTypesServiceImpl.java
@@ -56,7 +56,7 @@ public List<Boolean> listBooleanHeaderParam(List<Boolean> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -72,11 +72,11 @@ public List<Boolean> listBooleanHeaderParam(List<Boolean> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBooleans($response);
+				var $rv = JDKHttpClientResponseUtils.mapBooleans($response);
 				this.lifecycleHook.onSuccess("listBooleanHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -110,11 +110,11 @@ public NilResult listBooleanHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -141,7 +141,7 @@ public NilResult listBooleanHeaderParamOpt(List<Boolean> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -157,11 +157,11 @@ public NilResult listBooleanHeaderParamOpt(List<Boolean> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -190,7 +190,7 @@ public NilResult listBooleanHeaderParamNil(List<Boolean> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -206,11 +206,11 @@ public NilResult listBooleanHeaderParamNil(List<Boolean> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -244,11 +244,11 @@ public NilResult listBooleanHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -277,7 +277,7 @@ public NilResult listBooleanHeaderParamOptNil(List<Boolean> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -293,11 +293,11 @@ public NilResult listBooleanHeaderParamOptNil(List<Boolean> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listBooleanHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -322,7 +322,7 @@ public List<Short> listShortHeaderParam(List<Short> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -338,11 +338,11 @@ public List<Short> listShortHeaderParam(List<Short> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShorts($response);
+				var $rv = JDKHttpClientResponseUtils.mapShorts($response);
 				this.lifecycleHook.onSuccess("listShortHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -376,11 +376,11 @@ public NilResult listShortHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -407,7 +407,7 @@ public NilResult listShortHeaderParamOpt(List<Short> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -423,11 +423,11 @@ public NilResult listShortHeaderParamOpt(List<Short> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -456,7 +456,7 @@ public NilResult listShortHeaderParamNil(List<Short> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -472,11 +472,11 @@ public NilResult listShortHeaderParamNil(List<Short> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -510,11 +510,11 @@ public NilResult listShortHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -543,7 +543,7 @@ public NilResult listShortHeaderParamOptNil(List<Short> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -559,11 +559,11 @@ public NilResult listShortHeaderParamOptNil(List<Short> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listShortHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -588,7 +588,7 @@ public List<Integer> listIntHeaderParam(List<Integer> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -604,11 +604,11 @@ public List<Integer> listIntHeaderParam(List<Integer> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInts($response);
+				var $rv = JDKHttpClientResponseUtils.mapInts($response);
 				this.lifecycleHook.onSuccess("listIntHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -642,11 +642,11 @@ public NilResult listIntHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -673,7 +673,7 @@ public NilResult listIntHeaderParamOpt(List<Integer> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -689,11 +689,11 @@ public NilResult listIntHeaderParamOpt(List<Integer> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -722,7 +722,7 @@ public NilResult listIntHeaderParamNil(List<Integer> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -738,11 +738,11 @@ public NilResult listIntHeaderParamNil(List<Integer> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -776,11 +776,11 @@ public NilResult listIntHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -809,7 +809,7 @@ public NilResult listIntHeaderParamOptNil(List<Integer> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -825,11 +825,11 @@ public NilResult listIntHeaderParamOptNil(List<Integer> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listIntHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -854,7 +854,7 @@ public List<Long> listLongHeaderParam(List<Long> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -870,11 +870,11 @@ public List<Long> listLongHeaderParam(List<Long> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLongs($response);
+				var $rv = JDKHttpClientResponseUtils.mapLongs($response);
 				this.lifecycleHook.onSuccess("listLongHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -908,11 +908,11 @@ public NilResult listLongHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -939,7 +939,7 @@ public NilResult listLongHeaderParamOpt(List<Long> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -955,11 +955,11 @@ public NilResult listLongHeaderParamOpt(List<Long> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -988,7 +988,7 @@ public NilResult listLongHeaderParamNil(List<Long> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1004,11 +1004,11 @@ public NilResult listLongHeaderParamNil(List<Long> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1042,11 +1042,11 @@ public NilResult listLongHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1075,7 +1075,7 @@ public NilResult listLongHeaderParamOptNil(List<Long> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1091,11 +1091,11 @@ public NilResult listLongHeaderParamOptNil(List<Long> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLongHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1120,7 +1120,7 @@ public List<Float> listFloatHeaderParam(List<Float> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1136,11 +1136,11 @@ public List<Float> listFloatHeaderParam(List<Float> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloats($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloats($response);
 				this.lifecycleHook.onSuccess("listFloatHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1174,11 +1174,11 @@ public NilResult listFloatHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1205,7 +1205,7 @@ public NilResult listFloatHeaderParamOpt(List<Float> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1221,11 +1221,11 @@ public NilResult listFloatHeaderParamOpt(List<Float> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1254,7 +1254,7 @@ public NilResult listFloatHeaderParamNil(List<Float> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1270,11 +1270,11 @@ public NilResult listFloatHeaderParamNil(List<Float> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1308,11 +1308,11 @@ public NilResult listFloatHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1341,7 +1341,7 @@ public NilResult listFloatHeaderParamOptNil(List<Float> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1357,11 +1357,11 @@ public NilResult listFloatHeaderParamOptNil(List<Float> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listFloatHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1386,7 +1386,7 @@ public List<Double> listDoubleHeaderParam(List<Double> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1402,11 +1402,11 @@ public List<Double> listDoubleHeaderParam(List<Double> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDoubles($response);
+				var $rv = JDKHttpClientResponseUtils.mapDoubles($response);
 				this.lifecycleHook.onSuccess("listDoubleHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1440,11 +1440,11 @@ public NilResult listDoubleHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1471,7 +1471,7 @@ public NilResult listDoubleHeaderParamOpt(List<Double> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1487,11 +1487,11 @@ public NilResult listDoubleHeaderParamOpt(List<Double> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1520,7 +1520,7 @@ public NilResult listDoubleHeaderParamNil(List<Double> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1536,11 +1536,11 @@ public NilResult listDoubleHeaderParamNil(List<Double> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1574,11 +1574,11 @@ public NilResult listDoubleHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1607,7 +1607,7 @@ public NilResult listDoubleHeaderParamOptNil(List<Double> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1623,11 +1623,11 @@ public NilResult listDoubleHeaderParamOptNil(List<Double> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listDoubleHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1653,8 +1653,8 @@ public List<String> listStringHeaderParam(List<String> headerValue) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1670,11 +1670,11 @@ public List<String> listStringHeaderParam(List<String> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapStrings($response);
+				var $rv = JDKHttpClientResponseUtils.mapStrings($response);
 				this.lifecycleHook.onSuccess("listStringHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1708,11 +1708,11 @@ public NilResult listStringHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1737,9 +1737,9 @@ public NilResult listStringHeaderParamOpt(List<String> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1755,11 +1755,11 @@ public NilResult listStringHeaderParamOpt(List<String> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1784,11 +1784,11 @@ public NilResult listStringHeaderParamNil(List<String> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1804,11 +1804,11 @@ public NilResult listStringHeaderParamNil(List<String> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1842,11 +1842,11 @@ public NilResult listStringHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1871,11 +1871,11 @@ public NilResult listStringHeaderParamOptNil(List<String> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1891,11 +1891,11 @@ public NilResult listStringHeaderParamOptNil(List<String> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listStringHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1922,7 +1922,7 @@ public List<LocalDate> listLocalDateHeaderParam(List<LocalDate> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1938,11 +1938,11 @@ public List<LocalDate> listLocalDateHeaderParam(List<LocalDate> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDates($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDates($response);
 				this.lifecycleHook.onSuccess("listLocalDateHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1976,11 +1976,11 @@ public NilResult listLocalDateHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2007,7 +2007,7 @@ public NilResult listLocalDateHeaderParamOpt(List<LocalDate> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2023,11 +2023,11 @@ public NilResult listLocalDateHeaderParamOpt(List<LocalDate> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2056,7 +2056,7 @@ public NilResult listLocalDateHeaderParamNil(List<LocalDate> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2072,11 +2072,11 @@ public NilResult listLocalDateHeaderParamNil(List<LocalDate> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2110,11 +2110,11 @@ public NilResult listLocalDateHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2143,7 +2143,7 @@ public NilResult listLocalDateHeaderParamOptNil(List<LocalDate> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2159,11 +2159,11 @@ public NilResult listLocalDateHeaderParamOptNil(List<LocalDate> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2190,7 +2190,7 @@ public List<LocalDateTime> listLocalDateTimeHeaderParam(List<LocalDateTime> head
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2206,11 +2206,11 @@ public List<LocalDateTime> listLocalDateTimeHeaderParam(List<LocalDateTime> head
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTimes($response);
 				this.lifecycleHook.onSuccess("listLocalDateTimeHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2244,11 +2244,11 @@ public NilResult listLocalDateTimeHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2275,7 +2275,7 @@ public NilResult listLocalDateTimeHeaderParamOpt(List<LocalDateTime> headerValue
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2291,11 +2291,11 @@ public NilResult listLocalDateTimeHeaderParamOpt(List<LocalDateTime> headerValue
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2324,7 +2324,7 @@ public NilResult listLocalDateTimeHeaderParamNil(List<LocalDateTime> headerValue
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2340,11 +2340,11 @@ public NilResult listLocalDateTimeHeaderParamNil(List<LocalDateTime> headerValue
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2378,11 +2378,11 @@ public NilResult listLocalDateTimeHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2411,7 +2411,7 @@ public NilResult listLocalDateTimeHeaderParamOptNil(List<LocalDateTime> headerVa
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2427,11 +2427,11 @@ public NilResult listLocalDateTimeHeaderParamOptNil(List<LocalDateTime> headerVa
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2458,7 +2458,7 @@ public List<LocalTime> listLocalTimeHeaderParam(List<LocalTime> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2474,11 +2474,11 @@ public List<LocalTime> listLocalTimeHeaderParam(List<LocalTime> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTimes($response);
 				this.lifecycleHook.onSuccess("listLocalTimeHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2512,11 +2512,11 @@ public NilResult listLocalTimeHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2543,7 +2543,7 @@ public NilResult listLocalTimeHeaderParamOpt(List<LocalTime> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2559,11 +2559,11 @@ public NilResult listLocalTimeHeaderParamOpt(List<LocalTime> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2592,7 +2592,7 @@ public NilResult listLocalTimeHeaderParamNil(List<LocalTime> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2608,11 +2608,11 @@ public NilResult listLocalTimeHeaderParamNil(List<LocalTime> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2646,11 +2646,11 @@ public NilResult listLocalTimeHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2679,7 +2679,7 @@ public NilResult listLocalTimeHeaderParamOptNil(List<LocalTime> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2695,11 +2695,11 @@ public NilResult listLocalTimeHeaderParamOptNil(List<LocalTime> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listLocalTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2726,7 +2726,7 @@ public List<OffsetDateTime> listOffsetDateTimeHeaderParam(List<OffsetDateTime> h
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2742,11 +2742,11 @@ public List<OffsetDateTime> listOffsetDateTimeHeaderParam(List<OffsetDateTime> h
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTimes($response);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2780,11 +2780,11 @@ public NilResult listOffsetDateTimeHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2811,7 +2811,7 @@ public NilResult listOffsetDateTimeHeaderParamOpt(List<OffsetDateTime> headerVal
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2827,11 +2827,11 @@ public NilResult listOffsetDateTimeHeaderParamOpt(List<OffsetDateTime> headerVal
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2860,7 +2860,7 @@ public NilResult listOffsetDateTimeHeaderParamNil(List<OffsetDateTime> headerVal
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2876,11 +2876,11 @@ public NilResult listOffsetDateTimeHeaderParamNil(List<OffsetDateTime> headerVal
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2914,11 +2914,11 @@ public NilResult listOffsetDateTimeHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2947,7 +2947,7 @@ public NilResult listOffsetDateTimeHeaderParamOptNil(List<OffsetDateTime> header
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -2963,11 +2963,11 @@ public NilResult listOffsetDateTimeHeaderParamOptNil(List<OffsetDateTime> header
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2994,7 +2994,7 @@ public List<ZonedDateTime> listZonedDateTimeHeaderParam(List<ZonedDateTime> head
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3010,11 +3010,11 @@ public List<ZonedDateTime> listZonedDateTimeHeaderParam(List<ZonedDateTime> head
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTimes($response);
 				this.lifecycleHook.onSuccess("listZonedDateTimeHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3048,11 +3048,11 @@ public NilResult listZonedDateTimeHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3079,7 +3079,7 @@ public NilResult listZonedDateTimeHeaderParamOpt(List<ZonedDateTime> headerValue
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3095,11 +3095,11 @@ public NilResult listZonedDateTimeHeaderParamOpt(List<ZonedDateTime> headerValue
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3128,7 +3128,7 @@ public NilResult listZonedDateTimeHeaderParamNil(List<ZonedDateTime> headerValue
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3144,11 +3144,11 @@ public NilResult listZonedDateTimeHeaderParamNil(List<ZonedDateTime> headerValue
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3182,11 +3182,11 @@ public NilResult listZonedDateTimeHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3215,7 +3215,7 @@ public NilResult listZonedDateTimeHeaderParamOptNil(List<ZonedDateTime> headerVa
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3231,11 +3231,11 @@ public NilResult listZonedDateTimeHeaderParamOptNil(List<ZonedDateTime> headerVa
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listZonedDateTimeHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3261,8 +3261,8 @@ public List<ZoneId> listScalarHeaderParam(List<ZoneId> headerValue) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeAsciiString(Objects.toString($v))).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeAsciiString(Objects.toString($v))).toList()));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3278,11 +3278,11 @@ public List<ZoneId> listScalarHeaderParam(List<ZoneId> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("listScalarHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3316,11 +3316,11 @@ public NilResult listScalarHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3345,9 +3345,9 @@ public NilResult listScalarHeaderParamOpt(List<ZoneId> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeAsciiString(Objects.toString($v))).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeAsciiString(Objects.toString($v))).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3363,11 +3363,11 @@ public NilResult listScalarHeaderParamOpt(List<ZoneId> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3392,11 +3392,11 @@ public NilResult listScalarHeaderParamNil(List<ZoneId> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeAsciiString(Objects.toString($v))).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeAsciiString(Objects.toString($v))).toList()));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3412,11 +3412,11 @@ public NilResult listScalarHeaderParamNil(List<ZoneId> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3450,11 +3450,11 @@ public NilResult listScalarHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3479,11 +3479,11 @@ public NilResult listScalarHeaderParamOptNil(List<ZoneId> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeAsciiString(Objects.toString($v))).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeAsciiString(Objects.toString($v))).toList()));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3499,11 +3499,11 @@ public NilResult listScalarHeaderParamOptNil(List<ZoneId> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listScalarHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3530,7 +3530,7 @@ public List<SampleEnum> listEnumHeaderParam(List<SampleEnum> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3546,11 +3546,11 @@ public List<SampleEnum> listEnumHeaderParam(List<SampleEnum> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("listEnumHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3584,11 +3584,11 @@ public NilResult listEnumHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3615,7 +3615,7 @@ public NilResult listEnumHeaderParamOpt(List<SampleEnum> headerValue) {
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3631,11 +3631,11 @@ public NilResult listEnumHeaderParamOpt(List<SampleEnum> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3664,7 +3664,7 @@ public NilResult listEnumHeaderParamNil(List<SampleEnum> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3680,11 +3680,11 @@ public NilResult listEnumHeaderParamNil(List<SampleEnum> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3718,11 +3718,11 @@ public NilResult listEnumHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3751,7 +3751,7 @@ public NilResult listEnumHeaderParamOptNil(List<SampleEnum> headerValue) {
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3767,11 +3767,11 @@ public NilResult listEnumHeaderParamOptNil(List<SampleEnum> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listEnumHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3798,7 +3798,7 @@ public NilResult listEnumHeaderParamOptNil(List<SampleEnum> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3814,11 +3814,11 @@ public NilResult listEnumHeaderParamOptNil(List<SampleEnum> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, ListInlineEnumHeaderParam_Result$::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ListInlineEnumHeaderParam_Result$::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3852,11 +3852,11 @@ public NilResult listInlineEnumHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3883,7 +3883,7 @@ public NilResult listInlineEnumHeaderParamOpt(List<ListInlineEnumHeaderParamOpt_
 		if (headerValue != null) {
 			$headerParams.put("headerValue", String.join(",", headerValue.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3899,11 +3899,11 @@ public NilResult listInlineEnumHeaderParamOpt(List<ListInlineEnumHeaderParamOpt_
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3932,7 +3932,7 @@ public NilResult listInlineEnumHeaderParamNil(List<ListInlineEnumHeaderParamNil_
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -3948,11 +3948,11 @@ public NilResult listInlineEnumHeaderParamNil(List<ListInlineEnumHeaderParamNil_
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -3986,11 +3986,11 @@ public NilResult listInlineEnumHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4019,7 +4019,7 @@ public NilResult listInlineEnumHeaderParamOptNil(List<ListInlineEnumHeaderParamO
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4035,11 +4035,11 @@ public NilResult listInlineEnumHeaderParamOptNil(List<ListInlineEnumHeaderParamO
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4066,10 +4066,10 @@ public String listMultiHeaderParam(List<String> valueA, List<Integer> valueB, Li
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+		$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		$headerParams.put("valueB", String.join(",", valueB.stream().map(Objects::toString).toList()));
-		$headerParams.put("valueC", String.join(",", valueC.stream().map($v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("valueC", String.join(",", valueC.stream().map($v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4086,11 +4086,11 @@ public String listMultiHeaderParam(List<String> valueA, List<Integer> valueB, Li
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("listMultiHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4124,11 +4124,11 @@ public List<NilResult> listMultiHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4153,9 +4153,9 @@ public List<NilResult> listMultiHeaderParamOpt(List<String> valueA) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4171,11 +4171,11 @@ public List<NilResult> listMultiHeaderParamOpt(List<String> valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4200,12 +4200,12 @@ public List<NilResult> listMultiHeaderParamOpt(List<String> valueA, List<Integer
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		}
 		if (valueB != null) {
 			$headerParams.put("valueB", String.join(",", valueB.stream().map(Objects::toString).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4221,11 +4221,11 @@ public List<NilResult> listMultiHeaderParamOpt(List<String> valueA, List<Integer
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4250,15 +4250,15 @@ public List<NilResult> listMultiHeaderParamOpt(List<String> valueA, List<Integer
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		}
 		if (valueB != null) {
 			$headerParams.put("valueB", String.join(",", valueB.stream().map(Objects::toString).toList()));
 		}
 		if (valueC != null) {
-			$headerParams.put("valueC", String.join(",", valueC.stream().map($v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
+			$headerParams.put("valueC", String.join(",", valueC.stream().map($v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4275,11 +4275,11 @@ public List<NilResult> listMultiHeaderParamOpt(List<String> valueA, List<Integer
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4304,7 +4304,7 @@ public List<NilResult> listMultiHeaderParamNil(List<String> valueA, List<Integer
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		} else {
 			$headerParams.put("valueA", "null");
 		}
@@ -4314,11 +4314,11 @@ public List<NilResult> listMultiHeaderParamNil(List<String> valueA, List<Integer
 			$headerParams.put("valueB", "null");
 		}
 		if (valueC != null) {
-			$headerParams.put("valueC", String.join(",", valueC.stream().map($v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
+			$headerParams.put("valueC", String.join(",", valueC.stream().map($v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
 		} else {
 			$headerParams.put("valueC", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4335,11 +4335,11 @@ public List<NilResult> listMultiHeaderParamNil(List<String> valueA, List<Integer
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4373,11 +4373,11 @@ public List<NilResult> listMultiHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4402,11 +4402,11 @@ public List<NilResult> listMultiHeaderParamOptNil(List<String> valueA) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		} else {
 			$headerParams.put("valueA", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4422,11 +4422,11 @@ public List<NilResult> listMultiHeaderParamOptNil(List<String> valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4451,7 +4451,7 @@ public List<NilResult> listMultiHeaderParamOptNil(List<String> valueA, List<Inte
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		} else {
 			$headerParams.put("valueA", "null");
 		}
@@ -4460,7 +4460,7 @@ public List<NilResult> listMultiHeaderParamOptNil(List<String> valueA, List<Inte
 		} else {
 			$headerParams.put("valueB", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4476,11 +4476,11 @@ public List<NilResult> listMultiHeaderParamOptNil(List<String> valueA, List<Inte
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4505,7 +4505,7 @@ public List<NilResult> listMultiHeaderParamOptNil(List<String> valueA, List<Inte
 
 		var $headerParams = new HashMap<String, String>();
 		if (valueA != null) {
-			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> ServiceUtils.encodeAsciiString($v)).toList()));
+			$headerParams.put("valueA", String.join(",", valueA.stream().map($v -> BaseUtils.encodeAsciiString($v)).toList()));
 		} else {
 			$headerParams.put("valueA", "null");
 		}
@@ -4515,11 +4515,11 @@ public List<NilResult> listMultiHeaderParamOptNil(List<String> valueA, List<Inte
 			$headerParams.put("valueB", "null");
 		}
 		if (valueC != null) {
-			$headerParams.put("valueC", String.join(",", valueC.stream().map($v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
+			$headerParams.put("valueC", String.join(",", valueC.stream().map($v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
 		} else {
 			$headerParams.put("valueC", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4536,11 +4536,11 @@ public List<NilResult> listMultiHeaderParamOptNil(List<String> valueA, List<Inte
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listMultiHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4566,8 +4566,8 @@ public List<SimpleRecord.Data> listRecordHeaderParam(List<SimpleRecord.Data> hea
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4584,11 +4584,11 @@ public List<SimpleRecord.Data> listRecordHeaderParam(List<SimpleRecord.Data> hea
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("listRecordHeaderParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordHeaderParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4622,11 +4622,11 @@ public NilResult listRecordHeaderParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4651,9 +4651,9 @@ public NilResult listRecordHeaderParamOpt(List<SimpleRecord.Data> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4670,11 +4670,11 @@ public NilResult listRecordHeaderParamOpt(List<SimpleRecord.Data> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordHeaderParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordHeaderParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4699,11 +4699,11 @@ public NilResult listRecordHeaderParamNil(List<SimpleRecord.Data> headerValue) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4720,11 +4720,11 @@ public NilResult listRecordHeaderParamNil(List<SimpleRecord.Data> headerValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordHeaderParamNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordHeaderParamNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4758,11 +4758,11 @@ public NilResult listRecordHeaderParamOptNil() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -4787,11 +4787,11 @@ public NilResult listRecordHeaderParamOptNil(List<SimpleRecord.Data> headerValue
 
 		var $headerParams = new HashMap<String, String>();
 		if (headerValue != null) {
-			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
+			$headerParams.put("headerValue", String.join(",", headerValue.stream().map($v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), SimpleRecord.Data.class))).toList()));
 		} else {
 			$headerParams.put("headerValue", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -4808,11 +4808,11 @@ public NilResult listRecordHeaderParamOptNil(List<SimpleRecord.Data> headerValue
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("listRecordHeaderParamOptNil", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordHeaderParamOptNil", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListQueryParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListQueryParameterTypesServiceImpl.java
index fe1dd078..4dc1c8f6 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListQueryParameterTypesServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListQueryParameterTypesServiceImpl.java
@@ -52,7 +52,7 @@ public List<Boolean> listBooleanQueryParam(List<Boolean> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listBooleanQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -68,11 +68,11 @@ public List<Boolean> listBooleanQueryParam(List<Boolean> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBooleans($response);
+				var $rv = JDKHttpClientResponseUtils.mapBooleans($response);
 				this.lifecycleHook.onSuccess("listBooleanQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBooleanQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -95,7 +95,7 @@ public List<Short> listShortQueryParam(List<Short> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listShortQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -111,11 +111,11 @@ public List<Short> listShortQueryParam(List<Short> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShorts($response);
+				var $rv = JDKHttpClientResponseUtils.mapShorts($response);
 				this.lifecycleHook.onSuccess("listShortQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShortQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -138,7 +138,7 @@ public List<Integer> listIntQueryParam(List<Integer> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listIntQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -154,11 +154,11 @@ public List<Integer> listIntQueryParam(List<Integer> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInts($response);
+				var $rv = JDKHttpClientResponseUtils.mapInts($response);
 				this.lifecycleHook.onSuccess("listIntQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listIntQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -181,7 +181,7 @@ public List<Long> listLongQueryParam(List<Long> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listLongQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -197,11 +197,11 @@ public List<Long> listLongQueryParam(List<Long> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLongs($response);
+				var $rv = JDKHttpClientResponseUtils.mapLongs($response);
 				this.lifecycleHook.onSuccess("listLongQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLongQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -224,7 +224,7 @@ public List<Float> listFloatQueryParam(List<Float> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listFloatQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -240,11 +240,11 @@ public List<Float> listFloatQueryParam(List<Float> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloats($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloats($response);
 				this.lifecycleHook.onSuccess("listFloatQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloatQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -267,7 +267,7 @@ public List<Double> listDoubleQueryParam(List<Double> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listDoubleQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -283,11 +283,11 @@ public List<Double> listDoubleQueryParam(List<Double> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDoubles($response);
+				var $rv = JDKHttpClientResponseUtils.mapDoubles($response);
 				this.lifecycleHook.onSuccess("listDoubleQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDoubleQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -312,7 +312,7 @@ public List<String> listStringQueryParam(List<String> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listStringQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -328,11 +328,11 @@ public List<String> listStringQueryParam(List<String> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapStrings($response);
+				var $rv = JDKHttpClientResponseUtils.mapStrings($response);
 				this.lifecycleHook.onSuccess("listStringQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listStringQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -357,7 +357,7 @@ public List<LocalDate> listLocalDateQueryParam(List<LocalDate> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listLocalDateQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -373,11 +373,11 @@ public List<LocalDate> listLocalDateQueryParam(List<LocalDate> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDates($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDates($response);
 				this.lifecycleHook.onSuccess("listLocalDateQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -402,7 +402,7 @@ public List<LocalDateTime> listLocalDateTimeQueryParam(List<LocalDateTime> query
 		var $path = "%s/api/listqueryparametertypes/listLocalDateTimeQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -418,11 +418,11 @@ public List<LocalDateTime> listLocalDateTimeQueryParam(List<LocalDateTime> query
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTimes($response);
 				this.lifecycleHook.onSuccess("listLocalDateTimeQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTimeQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -447,7 +447,7 @@ public List<LocalTime> listLocalTimeQueryParam(List<LocalTime> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listLocalTimeQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -463,11 +463,11 @@ public List<LocalTime> listLocalTimeQueryParam(List<LocalTime> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTimes($response);
 				this.lifecycleHook.onSuccess("listLocalTimeQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTimeQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -492,7 +492,7 @@ public List<OffsetDateTime> listOffsetDateTimeQueryParam(List<OffsetDateTime> qu
 		var $path = "%s/api/listqueryparametertypes/listOffsetDateTimeQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -508,11 +508,11 @@ public List<OffsetDateTime> listOffsetDateTimeQueryParam(List<OffsetDateTime> qu
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTimes($response);
 				this.lifecycleHook.onSuccess("listOffsetDateTimeQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTimeQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -537,7 +537,7 @@ public List<ZonedDateTime> listZonedDateTimeQueryParam(List<ZonedDateTime> query
 		var $path = "%s/api/listqueryparametertypes/listZonedDateTimeQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -553,11 +553,11 @@ public List<ZonedDateTime> listZonedDateTimeQueryParam(List<ZonedDateTime> query
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTimes($response);
 				this.lifecycleHook.onSuccess("listZonedDateTimeQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTimeQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -582,7 +582,7 @@ public List<ZoneId> listScalarQueryParam(List<ZoneId> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listScalarQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -598,11 +598,11 @@ public List<ZoneId> listScalarQueryParam(List<ZoneId> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("listScalarQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalarQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -627,7 +627,7 @@ public List<SampleEnum> listEnumQueryParam(List<SampleEnum> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listEnumQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -643,11 +643,11 @@ public List<SampleEnum> listEnumQueryParam(List<SampleEnum> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("listEnumQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnumQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -672,7 +672,7 @@ public List<SampleEnum> listEnumQueryParam(List<SampleEnum> queryValue) {
 		var $path = "%s/api/listqueryparametertypes/listInlineEnumQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
 			$queryParams.append("queryValue", $q);
 		});
@@ -688,11 +688,11 @@ public List<SampleEnum> listEnumQueryParam(List<SampleEnum> queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, ListInlineEnumQueryParam_Result$::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ListInlineEnumQueryParam_Result$::valueOf);
 				this.lifecycleHook.onSuccess("listInlineEnumQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInlineEnumQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -718,7 +718,7 @@ public String listMultiQueryParam(List<String> valueA, List<Integer> valueB, Lis
 		var $path = "%s/api/listqueryparametertypes/listMultiQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		valueA.stream().forEach($q -> {
 			$queryParams.append("valueA", $q);
 		});
@@ -726,7 +726,7 @@ public String listMultiQueryParam(List<String> valueA, List<Integer> valueB, Lis
 			$queryParams.append("valueB", $q);
 		});
 		valueC.stream().forEach($q -> {
-			$queryParams.append("valueC", ServiceUtils.ofObject($q, false, this.contentType(), SimpleRecord.Data.class));
+			$queryParams.append("valueC", BaseUtils.ofObject($q, false, this.contentType(), SimpleRecord.Data.class));
 		});
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -741,11 +741,11 @@ public String listMultiQueryParam(List<String> valueA, List<Integer> valueB, Lis
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("listMultiQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listMultiQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -770,9 +770,9 @@ public List<SimpleRecord.Data> listRecordQueryParam(List<SimpleRecord.Data> quer
 		var $path = "%s/api/listqueryparametertypes/listRecordQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		queryValue.stream().forEach($q -> {
-			$queryParams.append("queryValue", ServiceUtils.ofObject($q, false, this.contentType(), SimpleRecord.Data.class));
+			$queryParams.append("queryValue", BaseUtils.ofObject($q, false, this.contentType(), SimpleRecord.Data.class));
 		});
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -787,11 +787,11 @@ public List<SimpleRecord.Data> listRecordQueryParam(List<SimpleRecord.Data> quer
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("listRecordQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listRecordQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListSampleServiceServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListSampleServiceServiceImpl.java
index 2c618b89..c1ace226 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListSampleServiceServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ListSampleServiceServiceImpl.java
@@ -63,11 +63,11 @@ public List<Boolean> listBoolean() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBooleans($response);
+				var $rv = JDKHttpClientResponseUtils.mapBooleans($response);
 				this.lifecycleHook.onSuccess("listBoolean", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listBoolean", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -101,11 +101,11 @@ public List<Short> listShort() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShorts($response);
+				var $rv = JDKHttpClientResponseUtils.mapShorts($response);
 				this.lifecycleHook.onSuccess("listShort", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listShort", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -139,11 +139,11 @@ public List<Integer> listInt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInts($response);
+				var $rv = JDKHttpClientResponseUtils.mapInts($response);
 				this.lifecycleHook.onSuccess("listInt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listInt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -177,11 +177,11 @@ public List<Long> listLong() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLongs($response);
+				var $rv = JDKHttpClientResponseUtils.mapLongs($response);
 				this.lifecycleHook.onSuccess("listLong", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLong", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -215,11 +215,11 @@ public List<Float> listFloat() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloats($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloats($response);
 				this.lifecycleHook.onSuccess("listFloat", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listFloat", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -253,11 +253,11 @@ public List<Double> listDouble() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDoubles($response);
+				var $rv = JDKHttpClientResponseUtils.mapDoubles($response);
 				this.lifecycleHook.onSuccess("listDouble", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listDouble", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -291,11 +291,11 @@ public List<String> listString() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapStrings($response);
+				var $rv = JDKHttpClientResponseUtils.mapStrings($response);
 				this.lifecycleHook.onSuccess("listString", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listString", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -329,11 +329,11 @@ public List<LocalDate> listLocalDate() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDates($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDates($response);
 				this.lifecycleHook.onSuccess("listLocalDate", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDate", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -367,11 +367,11 @@ public List<LocalDateTime> listLocalDateTime() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTimes($response);
 				this.lifecycleHook.onSuccess("listLocalDateTime", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalDateTime", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -405,11 +405,11 @@ public List<LocalTime> listLocalTime() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTimes($response);
 				this.lifecycleHook.onSuccess("listLocalTime", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listLocalTime", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -443,11 +443,11 @@ public List<OffsetDateTime> listOffsetDateTime() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTimes($response);
 				this.lifecycleHook.onSuccess("listOffsetDateTime", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listOffsetDateTime", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -481,11 +481,11 @@ public List<ZonedDateTime> listZonedDateTime() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTimes($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTimes($response);
 				this.lifecycleHook.onSuccess("listZonedDateTime", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listZonedDateTime", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -519,11 +519,11 @@ public List<ZoneId> listScalar() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("listScalar", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listScalar", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -557,11 +557,11 @@ public List<SampleEnum> listEnum() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("listEnum", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listEnum", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -595,11 +595,11 @@ public List<SimpleRecord.Data> listSimpleRecord() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("listSimpleRecord", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listSimpleRecord", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -634,15 +634,15 @@ public List<SimpleRecord.Data> listSimpleRecordWithError()
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObjects($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("listSimpleRecordWithError", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			} else if ($response.statusCode() == 400) {
-				var exception = new SampleErrorException(ServiceUtils.toString($response));
+				var exception = new SampleErrorException(JDKHttpClientResponseUtils.toString($response));
 				this.lifecycleHook.onError("listSimpleRecordWithError", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("listSimpleRecordWithError", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/PathParameterTypeServiceServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/PathParameterTypeServiceServiceImpl.java
index 7370c250..315decf1 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/PathParameterTypeServiceServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/PathParameterTypeServiceServiceImpl.java
@@ -48,7 +48,7 @@ private String contentType() {
 	public boolean simpleBooleanPathParam(boolean pathBoolean) {
 		var $path = "%s/api/pathparametertype/boolean/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathBoolean)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathBoolean)));
 
 		var $uri = URI.create($path);
 		try {
@@ -61,11 +61,11 @@ public boolean simpleBooleanPathParam(boolean pathBoolean) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBoolean($response);
+				var $rv = JDKHttpClientResponseUtils.mapBoolean($response);
 				this.lifecycleHook.onSuccess("simpleBooleanPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -87,7 +87,7 @@ public boolean simpleBooleanPathParam(boolean pathBoolean) {
 	public short simpleShortPathParam(short pathShort) {
 		var $path = "%s/api/pathparametertype/short/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathShort)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathShort)));
 
 		var $uri = URI.create($path);
 		try {
@@ -100,11 +100,11 @@ public short simpleShortPathParam(short pathShort) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShort($response);
+				var $rv = JDKHttpClientResponseUtils.mapShort($response);
 				this.lifecycleHook.onSuccess("simpleShortPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -126,7 +126,7 @@ public short simpleShortPathParam(short pathShort) {
 	public int simpleIntPathParam(int pathInt) {
 		var $path = "%s/api/pathparametertype/int/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathInt)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathInt)));
 
 		var $uri = URI.create($path);
 		try {
@@ -139,11 +139,11 @@ public int simpleIntPathParam(int pathInt) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("simpleIntPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -165,7 +165,7 @@ public int simpleIntPathParam(int pathInt) {
 	public long simpleLongPathParam(long pathLong) {
 		var $path = "%s/api/pathparametertype/long/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathLong)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathLong)));
 
 		var $uri = URI.create($path);
 		try {
@@ -178,11 +178,11 @@ public long simpleLongPathParam(long pathLong) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLong($response);
+				var $rv = JDKHttpClientResponseUtils.mapLong($response);
 				this.lifecycleHook.onSuccess("simpleLongPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -204,7 +204,7 @@ public long simpleLongPathParam(long pathLong) {
 	public float simpleFloatPathParam(float pathFloat) {
 		var $path = "%s/api/pathparametertype/float/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathFloat)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathFloat)));
 
 		var $uri = URI.create($path);
 		try {
@@ -217,11 +217,11 @@ public float simpleFloatPathParam(float pathFloat) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloat($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloat($response);
 				this.lifecycleHook.onSuccess("simpleFloatPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -243,7 +243,7 @@ public float simpleFloatPathParam(float pathFloat) {
 	public double simpleDoublePathParam(double pathDouble) {
 		var $path = "%s/api/pathparametertype/double/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathDouble)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathDouble)));
 
 		var $uri = URI.create($path);
 		try {
@@ -256,11 +256,11 @@ public double simpleDoublePathParam(double pathDouble) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDouble($response);
+				var $rv = JDKHttpClientResponseUtils.mapDouble($response);
 				this.lifecycleHook.onSuccess("simpleDoublePathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoublePathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -284,7 +284,7 @@ public String simpleStringPathParam(String pathString) {
 
 		var $path = "%s/api/pathparametertype/string/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathString)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathString)));
 
 		var $uri = URI.create($path);
 		try {
@@ -297,11 +297,11 @@ public String simpleStringPathParam(String pathString) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("simpleStringPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -325,7 +325,7 @@ public LocalDate simpleLocalDatePathParam(LocalDate pathLocalDate) {
 
 		var $path = "%s/api/pathparametertype/localdate/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathLocalDate)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathLocalDate)));
 
 		var $uri = URI.create($path);
 		try {
@@ -338,11 +338,11 @@ public LocalDate simpleLocalDatePathParam(LocalDate pathLocalDate) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDate($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDate($response);
 				this.lifecycleHook.onSuccess("simpleLocalDatePathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDatePathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -366,7 +366,7 @@ public LocalDateTime simpleLocalDateTimePathParam(LocalDateTime pathLocalDateTim
 
 		var $path = "%s/api/pathparametertype/localdatetime/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathLocalDateTime)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathLocalDateTime)));
 
 		var $uri = URI.create($path);
 		try {
@@ -379,11 +379,11 @@ public LocalDateTime simpleLocalDateTimePathParam(LocalDateTime pathLocalDateTim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTime($response);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimePathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimePathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -407,7 +407,7 @@ public LocalTime simpleLocalTimePathParam(LocalTime pathLocalTime) {
 
 		var $path = "%s/api/pathparametertype/localtime/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathLocalTime)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathLocalTime)));
 
 		var $uri = URI.create($path);
 		try {
@@ -420,11 +420,11 @@ public LocalTime simpleLocalTimePathParam(LocalTime pathLocalTime) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTime($response);
 				this.lifecycleHook.onSuccess("simpleLocalTimePathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimePathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -448,7 +448,7 @@ public OffsetDateTime simpleOffsetDateTimePathParam(OffsetDateTime pathOffsetDat
 
 		var $path = "%s/api/pathparametertype/offsetdatetime/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathOffsetDateTime)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathOffsetDateTime)));
 
 		var $uri = URI.create($path);
 		try {
@@ -461,11 +461,11 @@ public OffsetDateTime simpleOffsetDateTimePathParam(OffsetDateTime pathOffsetDat
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTime($response);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimePathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimePathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -489,7 +489,7 @@ public ZonedDateTime simpleZonedDateTimePathParam(ZonedDateTime pathZonedDateTim
 
 		var $path = "%s/api/pathparametertype/zoneddatetime/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathZonedDateTime)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathZonedDateTime)));
 
 		var $uri = URI.create($path);
 		try {
@@ -502,11 +502,11 @@ public ZonedDateTime simpleZonedDateTimePathParam(ZonedDateTime pathZonedDateTim
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTime($response);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimePathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimePathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -530,7 +530,7 @@ public ZoneId simpleScalarPathParam(ZoneId pathScalar) {
 
 		var $path = "%s/api/pathparametertype/scalar/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathScalar)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathScalar)));
 
 		var $uri = URI.create($path);
 		try {
@@ -543,11 +543,11 @@ public ZoneId simpleScalarPathParam(ZoneId pathScalar) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("simpleScalarPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -571,7 +571,7 @@ public SampleEnum simpleEnumPathParam(SampleEnum pathEnum) {
 
 		var $path = "%s/api/pathparametertype/enum/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(pathEnum)));
+				BaseUtils.encodeURIComponent(Objects.toString(pathEnum)));
 
 		var $uri = URI.create($path);
 		try {
@@ -584,11 +584,11 @@ public SampleEnum simpleEnumPathParam(SampleEnum pathEnum) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -612,8 +612,8 @@ public String multiPathParam(String valueA, int valueB) {
 
 		var $path = "%s/api/pathparametertype/multipathparam/%s/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(valueA)),
-				ServiceUtils.encodeURIComponent(Objects.toString(valueB)));
+				BaseUtils.encodeURIComponent(Objects.toString(valueA)),
+				BaseUtils.encodeURIComponent(Objects.toString(valueB)));
 
 		var $uri = URI.create($path);
 		try {
@@ -626,11 +626,11 @@ public String multiPathParam(String valueA, int valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiPathParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiPathParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/QueryParameterTypesServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/QueryParameterTypesServiceImpl.java
index 46bf6de6..3930c9a1 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/QueryParameterTypesServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/QueryParameterTypesServiceImpl.java
@@ -52,7 +52,7 @@ public boolean simpleBooleanQueryParam(boolean queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleBooleanQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -66,11 +66,11 @@ public boolean simpleBooleanQueryParam(boolean queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBoolean($response);
+				var $rv = JDKHttpClientResponseUtils.mapBoolean($response);
 				this.lifecycleHook.onSuccess("simpleBooleanQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -104,11 +104,11 @@ public NilResult simpleBooleanQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -131,7 +131,7 @@ public NilResult simpleBooleanQueryParamOpt(Boolean queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleBooleanQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -147,11 +147,11 @@ public NilResult simpleBooleanQueryParamOpt(Boolean queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleBooleanQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleBooleanQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -174,7 +174,7 @@ public short simpleShortQueryParam(short queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleShortQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -188,11 +188,11 @@ public short simpleShortQueryParam(short queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShort($response);
+				var $rv = JDKHttpClientResponseUtils.mapShort($response);
 				this.lifecycleHook.onSuccess("simpleShortQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -226,11 +226,11 @@ public NilResult simpleShortQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -253,7 +253,7 @@ public NilResult simpleShortQueryParamOpt(Short queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleShortQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -269,11 +269,11 @@ public NilResult simpleShortQueryParamOpt(Short queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleShortQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleShortQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -296,7 +296,7 @@ public int simpleIntQueryParam(int queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleIntQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -310,11 +310,11 @@ public int simpleIntQueryParam(int queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("simpleIntQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -348,11 +348,11 @@ public NilResult simpleIntQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -375,7 +375,7 @@ public NilResult simpleIntQueryParamOpt(Integer queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleIntQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -391,11 +391,11 @@ public NilResult simpleIntQueryParamOpt(Integer queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleIntQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleIntQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -418,7 +418,7 @@ public long simpleLongQueryParam(long queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleLongQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -432,11 +432,11 @@ public long simpleLongQueryParam(long queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLong($response);
+				var $rv = JDKHttpClientResponseUtils.mapLong($response);
 				this.lifecycleHook.onSuccess("simpleLongQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -470,11 +470,11 @@ public NilResult simpleLongQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -497,7 +497,7 @@ public NilResult simpleLongQueryParamOpt(Long queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleLongQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -513,11 +513,11 @@ public NilResult simpleLongQueryParamOpt(Long queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLongQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLongQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -540,7 +540,7 @@ public float simpleFloatQueryParam(float queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleFloatQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -554,11 +554,11 @@ public float simpleFloatQueryParam(float queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloat($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloat($response);
 				this.lifecycleHook.onSuccess("simpleFloatQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -592,11 +592,11 @@ public NilResult simpleFloatQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -619,7 +619,7 @@ public NilResult simpleFloatQueryParamOpt(Float queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleFloatQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -635,11 +635,11 @@ public NilResult simpleFloatQueryParamOpt(Float queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleFloatQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleFloatQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -662,7 +662,7 @@ public double simpleDoubleQueryParam(double queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleDoubleQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -676,11 +676,11 @@ public double simpleDoubleQueryParam(double queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDouble($response);
+				var $rv = JDKHttpClientResponseUtils.mapDouble($response);
 				this.lifecycleHook.onSuccess("simpleDoubleQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -714,11 +714,11 @@ public NilResult simpleDoubleQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -741,7 +741,7 @@ public NilResult simpleDoubleQueryParamOpt(Double queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleDoubleQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -757,11 +757,11 @@ public NilResult simpleDoubleQueryParamOpt(Double queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleDoubleQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleDoubleQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -786,7 +786,7 @@ public String simpleStringQueryParam(String queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleStringQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -800,11 +800,11 @@ public String simpleStringQueryParam(String queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("simpleStringQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -838,11 +838,11 @@ public NilResult simpleStringQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -865,7 +865,7 @@ public NilResult simpleStringQueryParamOpt(String queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleStringQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -881,11 +881,11 @@ public NilResult simpleStringQueryParamOpt(String queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleStringQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleStringQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -910,7 +910,7 @@ public LocalDate simpleLocalDateQueryParam(LocalDate queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleLocalDateQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -924,11 +924,11 @@ public LocalDate simpleLocalDateQueryParam(LocalDate queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDate($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDate($response);
 				this.lifecycleHook.onSuccess("simpleLocalDateQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -962,11 +962,11 @@ public NilResult simpleLocalDateQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -989,7 +989,7 @@ public NilResult simpleLocalDateQueryParamOpt(LocalDate queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleLocalDateQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -1005,11 +1005,11 @@ public NilResult simpleLocalDateQueryParamOpt(LocalDate queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1034,7 +1034,7 @@ public LocalDateTime simpleLocalDateTimeQueryParam(LocalDateTime queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleLocalDateTimeQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -1048,11 +1048,11 @@ public LocalDateTime simpleLocalDateTimeQueryParam(LocalDateTime queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTime($response);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1086,11 +1086,11 @@ public NilResult simpleLocalDateTimeQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1113,7 +1113,7 @@ public NilResult simpleLocalDateTimeQueryParamOpt(LocalDateTime queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleLocalDateTimeQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -1129,11 +1129,11 @@ public NilResult simpleLocalDateTimeQueryParamOpt(LocalDateTime queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalDateTimeQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalDateTimeQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1158,7 +1158,7 @@ public LocalTime simpleLocalTimeQueryParam(LocalTime queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleLocalTimeQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -1172,11 +1172,11 @@ public LocalTime simpleLocalTimeQueryParam(LocalTime queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTime($response);
 				this.lifecycleHook.onSuccess("simpleLocalTimeQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1210,11 +1210,11 @@ public NilResult simpleLocalTimeQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1237,7 +1237,7 @@ public NilResult simpleLocalTimeQueryParamOpt(LocalTime queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleLocalTimeQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -1253,11 +1253,11 @@ public NilResult simpleLocalTimeQueryParamOpt(LocalTime queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleLocalTimeQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleLocalTimeQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1282,7 +1282,7 @@ public OffsetDateTime simpleOffsetDateTimeQueryParam(OffsetDateTime queryValue)
 		var $path = "%s/api/queryparametertypes/simpleOffsetDateTimeQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -1296,11 +1296,11 @@ public OffsetDateTime simpleOffsetDateTimeQueryParam(OffsetDateTime queryValue)
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTime($response);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1334,11 +1334,11 @@ public NilResult simpleOffsetDateTimeQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1361,7 +1361,7 @@ public NilResult simpleOffsetDateTimeQueryParamOpt(OffsetDateTime queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleOffsetDateTimeQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -1377,11 +1377,11 @@ public NilResult simpleOffsetDateTimeQueryParamOpt(OffsetDateTime queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleOffsetDateTimeQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleOffsetDateTimeQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1406,7 +1406,7 @@ public ZonedDateTime simpleZonedDateTimeQueryParam(ZonedDateTime queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleZonedDateTimeQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -1420,11 +1420,11 @@ public ZonedDateTime simpleZonedDateTimeQueryParam(ZonedDateTime queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTime($response);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1458,11 +1458,11 @@ public NilResult simpleZonedDateTimeQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1485,7 +1485,7 @@ public NilResult simpleZonedDateTimeQueryParamOpt(ZonedDateTime queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleZonedDateTimeQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -1501,11 +1501,11 @@ public NilResult simpleZonedDateTimeQueryParamOpt(ZonedDateTime queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleZonedDateTimeQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleZonedDateTimeQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1530,7 +1530,7 @@ public ZoneId simpleScalarQueryParam(ZoneId queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleScalarQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -1544,11 +1544,11 @@ public ZoneId simpleScalarQueryParam(ZoneId queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("simpleScalarQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1582,11 +1582,11 @@ public NilResult simpleScalarQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1609,7 +1609,7 @@ public NilResult simpleScalarQueryParamOpt(ZoneId queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleScalarQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -1625,11 +1625,11 @@ public NilResult simpleScalarQueryParamOpt(ZoneId queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleScalarQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleScalarQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1654,7 +1654,7 @@ public SampleEnum simpleEnumQueryParam(SampleEnum queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleEnumQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("queryValue", queryValue);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -1668,11 +1668,11 @@ public SampleEnum simpleEnumQueryParam(SampleEnum queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1706,11 +1706,11 @@ public NilResult simpleEnumQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1733,7 +1733,7 @@ public NilResult simpleEnumQueryParamOpt(SampleEnum queryValue) {
 		var $path = "%s/api/queryparametertypes/simpleEnumQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
 			$queryParams.append("queryValue", queryValue);
 		}
@@ -1749,11 +1749,11 @@ public NilResult simpleEnumQueryParamOpt(SampleEnum queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("simpleEnumQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("simpleEnumQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1778,7 +1778,7 @@ public String multiQueryParam(String valueA, int valueB) {
 		var $path = "%s/api/queryparametertypes/multiQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("valueA", valueA);
 		$queryParams.append("valueB", valueB);
 
@@ -1793,11 +1793,11 @@ public String multiQueryParam(String valueA, int valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1831,11 +1831,11 @@ public String multiQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1858,7 +1858,7 @@ public String multiQueryParamOpt(String valueA) {
 		var $path = "%s/api/queryparametertypes/multiQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (valueA != null) {
 			$queryParams.append("valueA", valueA);
 		}
@@ -1874,11 +1874,11 @@ public String multiQueryParamOpt(String valueA) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1901,7 +1901,7 @@ public String multiQueryParamOpt(String valueA, Integer valueB) {
 		var $path = "%s/api/queryparametertypes/multiQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (valueA != null) {
 			$queryParams.append("valueA", valueA);
 		}
@@ -1920,11 +1920,11 @@ public String multiQueryParamOpt(String valueA, Integer valueB) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("multiQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1949,8 +1949,8 @@ public SimpleRecord.Data recordQueryParam(SimpleRecord.Data queryValue) {
 		var $path = "%s/api/queryparametertypes/recordQueryParam".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
-		$queryParams.append("queryValue", ServiceUtils.ofObject(queryValue, false, this.contentType(), SimpleRecord.Data.class));
+		var $queryParams = new BaseUtils.URLSearchParams();
+		$queryParams.append("queryValue", BaseUtils.ofObject(queryValue, false, this.contentType(), SimpleRecord.Data.class));
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
 		try {
@@ -1964,11 +1964,11 @@ public SimpleRecord.Data recordQueryParam(SimpleRecord.Data queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("recordQueryParam", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordQueryParam", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2002,11 +2002,11 @@ public NilResult recordQueryParamOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -2029,9 +2029,9 @@ public NilResult recordQueryParamOpt(SimpleRecord.Data queryValue) {
 		var $path = "%s/api/queryparametertypes/recordQueryParamOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (queryValue != null) {
-			$queryParams.append("queryValue", ServiceUtils.ofObject(queryValue, false, this.contentType(), SimpleRecord.Data.class));
+			$queryParams.append("queryValue", BaseUtils.ofObject(queryValue, false, this.contentType(), SimpleRecord.Data.class));
 		}
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -2046,11 +2046,11 @@ public NilResult recordQueryParamOpt(SimpleRecord.Data queryValue) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("recordQueryParamOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("recordQueryParamOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/SampleServiceServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/SampleServiceServiceImpl.java
index ba6035c2..93d14b1e 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/SampleServiceServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/SampleServiceServiceImpl.java
@@ -74,11 +74,11 @@ public boolean getBoolean() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapBoolean($response);
+				var $rv = JDKHttpClientResponseUtils.mapBoolean($response);
 				this.lifecycleHook.onSuccess("getBoolean", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getBoolean", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -112,11 +112,11 @@ public short getShort() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapShort($response);
+				var $rv = JDKHttpClientResponseUtils.mapShort($response);
 				this.lifecycleHook.onSuccess("getShort", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getShort", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -150,11 +150,11 @@ public int getInt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapInt($response);
+				var $rv = JDKHttpClientResponseUtils.mapInt($response);
 				this.lifecycleHook.onSuccess("getInt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getInt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -188,11 +188,11 @@ public long getLong() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLong($response);
+				var $rv = JDKHttpClientResponseUtils.mapLong($response);
 				this.lifecycleHook.onSuccess("getLong", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getLong", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -226,11 +226,11 @@ public float getFloat() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapFloat($response);
+				var $rv = JDKHttpClientResponseUtils.mapFloat($response);
 				this.lifecycleHook.onSuccess("getFloat", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getFloat", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -264,11 +264,11 @@ public double getDouble() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapDouble($response);
+				var $rv = JDKHttpClientResponseUtils.mapDouble($response);
 				this.lifecycleHook.onSuccess("getDouble", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getDouble", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -302,11 +302,11 @@ public String getString() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapString($response);
+				var $rv = JDKHttpClientResponseUtils.mapString($response);
 				this.lifecycleHook.onSuccess("getString", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getString", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -340,11 +340,11 @@ public LocalDate getLocalDate() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDate($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDate($response);
 				this.lifecycleHook.onSuccess("getLocalDate", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getLocalDate", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -378,11 +378,11 @@ public LocalDateTime getLocalDateTime() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalDateTime($response);
 				this.lifecycleHook.onSuccess("getLocalDateTime", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getLocalDateTime", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -416,11 +416,11 @@ public LocalTime getLocalTime() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLocalTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapLocalTime($response);
 				this.lifecycleHook.onSuccess("getLocalTime", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getLocalTime", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -454,11 +454,11 @@ public OffsetDateTime getOffsetDateTime() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapOffsetDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapOffsetDateTime($response);
 				this.lifecycleHook.onSuccess("getOffsetDateTime", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getOffsetDateTime", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -492,11 +492,11 @@ public ZonedDateTime getZonedDateTime() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapZonedDateTime($response);
+				var $rv = JDKHttpClientResponseUtils.mapZonedDateTime($response);
 				this.lifecycleHook.onSuccess("getZonedDateTime", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getZonedDateTime", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -530,11 +530,11 @@ public ZoneId getScalar() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, ZoneId::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, ZoneId::of);
 				this.lifecycleHook.onSuccess("getScalar", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getScalar", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -568,11 +568,11 @@ public SampleEnum getEnum() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, SampleEnum::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, SampleEnum::valueOf);
 				this.lifecycleHook.onSuccess("getEnum", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getEnum", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -609,7 +609,7 @@ public void voidOperation() {
 				this.lifecycleHook.onSuccess("voidOperation", null, this.client.createResponseAdaptable($response));
 				return;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("voidOperation", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -647,11 +647,11 @@ public void errorOperation()
 				this.lifecycleHook.onSuccess("errorOperation", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var exception = new SampleErrorException(ServiceUtils.toString($response));
+				var exception = new SampleErrorException(JDKHttpClientResponseUtils.toString($response));
 				this.lifecycleHook.onError("errorOperation", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("errorOperation", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -690,15 +690,15 @@ public void multiErrorOperation()
 				this.lifecycleHook.onSuccess("multiErrorOperation", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var exception = new SampleErrorException(ServiceUtils.toString($response));
+				var exception = new SampleErrorException(JDKHttpClientResponseUtils.toString($response));
 				this.lifecycleHook.onError("multiErrorOperation", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			} else if ($response.statusCode() == 401) {
-				var exception = new SampleError2Exception(ServiceUtils.toString($response));
+				var exception = new SampleError2Exception(JDKHttpClientResponseUtils.toString($response));
 				this.lifecycleHook.onError("multiErrorOperation", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("multiErrorOperation", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -722,7 +722,7 @@ public SimpleRecord.Data getSimpleRecord(String key) {
 
 		var $path = "%s/api/samplerecords/simplerecord/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(key)));
+				BaseUtils.encodeURIComponent(Objects.toString(key)));
 
 		var $uri = URI.create($path);
 		try {
@@ -735,11 +735,11 @@ public SimpleRecord.Data getSimpleRecord(String key) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("getSimpleRecord", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getSimpleRecord", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -764,7 +764,7 @@ public SimpleRecord.Data getSimpleRecordWithError(String key)
 
 		var $path = "%s/api/samplerecords/simplerecordwitherror/%s".formatted(
 				this.baseURI(),
-				ServiceUtils.encodeURIComponent(Objects.toString(key)));
+				BaseUtils.encodeURIComponent(Objects.toString(key)));
 
 		var $uri = URI.create($path);
 		try {
@@ -777,15 +777,15 @@ public SimpleRecord.Data getSimpleRecordWithError(String key)
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
+				var $rv = JDKHttpClientResponseUtils.mapObject($response, SimpleRecordDataImpl::of, SimpleRecord.Data.class);
 				this.lifecycleHook.onSuccess("getSimpleRecordWithError", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			} else if ($response.statusCode() == 400) {
-				var exception = new SampleErrorException(ServiceUtils.toString($response));
+				var exception = new SampleErrorException(JDKHttpClientResponseUtils.toString($response));
 				this.lifecycleHook.onError("getSimpleRecordWithError", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getSimpleRecordWithError", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -823,13 +823,13 @@ public void getSimpleErrorWithValue()
 				this.lifecycleHook.onSuccess("getSimpleErrorWithValue", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
+				var $errorData = JDKHttpClientResponseUtils.mapObject($response, ErrorDataDataImpl::of, ErrorData.Data.class);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of getSimpleErrorWithValue failed");
 				var exception = new SampleErrorWithValueException($message, $errorData);
 				this.lifecycleHook.onError("getSimpleErrorWithValue", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getSimpleErrorWithValue", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -867,13 +867,13 @@ public void getSimpleErrorInt()
 				this.lifecycleHook.onSuccess("getSimpleErrorInt", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapInt($response);
+				var $errorData = JDKHttpClientResponseUtils.mapInt($response);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of getSimpleErrorInt failed");
 				var exception = new SampleErrorIntException($message, $errorData);
 				this.lifecycleHook.onError("getSimpleErrorInt", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getSimpleErrorInt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -911,13 +911,13 @@ public void getSimpleErrorBoolean()
 				this.lifecycleHook.onSuccess("getSimpleErrorBoolean", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapBoolean($response);
+				var $errorData = JDKHttpClientResponseUtils.mapBoolean($response);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of getSimpleErrorBoolean failed");
 				var exception = new SampleErrorBooleanException($message, $errorData);
 				this.lifecycleHook.onError("getSimpleErrorBoolean", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getSimpleErrorBoolean", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -955,13 +955,13 @@ public void getSimpleErrorEnum()
 				this.lifecycleHook.onSuccess("getSimpleErrorEnum", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapLiteral($response, SampleEnum::valueOf);
+				var $errorData = JDKHttpClientResponseUtils.mapLiteral($response, SampleEnum::valueOf);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of getSimpleErrorEnum failed");
 				var exception = new SampleErrorEnumException($message, $errorData);
 				this.lifecycleHook.onError("getSimpleErrorEnum", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getSimpleErrorEnum", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -999,13 +999,13 @@ public void getSimpleErrorScalar()
 				this.lifecycleHook.onSuccess("getSimpleErrorScalar", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapLiteral($response, ZoneId::of);
+				var $errorData = JDKHttpClientResponseUtils.mapLiteral($response, ZoneId::of);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of getSimpleErrorScalar failed");
 				var exception = new SampleErrorScalarException($message, $errorData);
 				this.lifecycleHook.onError("getSimpleErrorScalar", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getSimpleErrorScalar", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1043,13 +1043,13 @@ public void getSimpleErrorUnion()
 				this.lifecycleHook.onSuccess("getSimpleErrorUnion", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapObject($response, UnionDataImpl::of, Union.Data.class);
+				var $errorData = JDKHttpClientResponseUtils.mapObject($response, UnionDataImpl::of, Union.Data.class);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of getSimpleErrorUnion failed");
 				var exception = new SampleErrorUnionException($message, $errorData);
 				this.lifecycleHook.onError("getSimpleErrorUnion", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("getSimpleErrorUnion", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ScalarSubstition_ServiceServiceImpl.java b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ScalarSubstition_ServiceServiceImpl.java
index 06a41180..363ece2d 100644
--- a/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ScalarSubstition_ServiceServiceImpl.java
+++ b/dsl/java-test/java-client/src/main/java/dev/rsdlang/sample/client/jdkhttp/impl/ScalarSubstition_ServiceServiceImpl.java
@@ -60,11 +60,11 @@ public MyRange get() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, MyRange::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, MyRange::of);
 				this.lifecycleHook.onSuccess("get", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("get", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -98,11 +98,11 @@ public List<MyRange> list() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, MyRange::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, MyRange::of);
 				this.lifecycleHook.onSuccess("list", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("list", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -130,7 +130,7 @@ public MyRange post(MyRange range) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(range, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(range, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -142,11 +142,11 @@ public MyRange post(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, MyRange::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, MyRange::of);
 				this.lifecycleHook.onSuccess("post", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("post", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -184,11 +184,11 @@ public NilResult postOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -214,7 +214,7 @@ public NilResult postOpt(MyRange range) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(range == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLiteral(range, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(range == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLiteral(range, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -226,11 +226,11 @@ public NilResult postOpt(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -256,7 +256,7 @@ public NilResult postNull(MyRange range) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(range, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(range, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -268,11 +268,11 @@ public NilResult postNull(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -310,11 +310,11 @@ public NilResult postOptNull() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -340,7 +340,7 @@ public NilResult postOptNull(MyRange range) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteral(range, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteral(range, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -352,11 +352,11 @@ public NilResult postOptNull(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -384,7 +384,7 @@ public List<MyRange> postList(List<MyRange> range) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(range, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(range, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -396,11 +396,11 @@ public List<MyRange> postList(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, MyRange::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, MyRange::of);
 				this.lifecycleHook.onSuccess("postList", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postList", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -438,11 +438,11 @@ public NilResult postListOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -468,7 +468,7 @@ public NilResult postListOpt(List<MyRange> range) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(range == null ? _JsonUtils.encodeEmptyValue($contentType) : ServiceUtils.ofLiteralList(range, false, $contentType));
+			var $body = BodyPublishers.ofByteArray(range == null ? _JsonUtils.encodeEmptyValue($contentType) : BaseUtils.ofLiteralList(range, false, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -480,11 +480,11 @@ public NilResult postListOpt(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -510,7 +510,7 @@ public NilResult postListNull(List<MyRange> range) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(range, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(range, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -522,11 +522,11 @@ public NilResult postListNull(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postListNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postListNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -564,11 +564,11 @@ public NilResult postListOptNull() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postListOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postListOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -594,7 +594,7 @@ public NilResult postListOptNull(List<MyRange> range) {
 		var $uri = URI.create($path);
 		try {
 			var $contentType = this.contentType();
-			var $body = BodyPublishers.ofByteArray(ServiceUtils.ofLiteralList(range, true, $contentType));
+			var $body = BodyPublishers.ofByteArray(BaseUtils.ofLiteralList(range, true, $contentType));
 
 			var $requestBuilder = HttpRequest.newBuilder()
 					.uri($uri)
@@ -606,11 +606,11 @@ public NilResult postListOptNull(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("postListOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("postListOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -635,7 +635,7 @@ public MyRange query(MyRange range) {
 		var $path = "%s/api/scalarsubstitution/query".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		$queryParams.append("range", range);
 
 		var $uri = URI.create($path + $queryParams.toQueryString());
@@ -649,11 +649,11 @@ public MyRange query(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, MyRange::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, MyRange::of);
 				this.lifecycleHook.onSuccess("query", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("query", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -687,11 +687,11 @@ public NilResult queryOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -714,7 +714,7 @@ public NilResult queryOpt(MyRange range) {
 		var $path = "%s/api/scalarsubstitution/queryOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (range != null) {
 			$queryParams.append("range", range);
 		}
@@ -730,11 +730,11 @@ public NilResult queryOpt(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -757,7 +757,7 @@ public NilResult queryNull(MyRange range) {
 		var $path = "%s/api/scalarsubstitution/queryNull".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (range != null) {
 			$queryParams.append("range", range);
 		} else {
@@ -775,11 +775,11 @@ public NilResult queryNull(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -813,11 +813,11 @@ public NilResult queryOptNull() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -840,7 +840,7 @@ public NilResult queryOptNull(MyRange range) {
 		var $path = "%s/api/scalarsubstitution/queryOptNull".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (range != null) {
 			$queryParams.append("range", range);
 		} else {
@@ -858,11 +858,11 @@ public NilResult queryOptNull(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -887,7 +887,7 @@ public List<MyRange> queryList(List<MyRange> range) {
 		var $path = "%s/api/scalarsubstitution/queryList".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		range.stream().forEach($q -> {
 			$queryParams.append("range", $q);
 		});
@@ -903,11 +903,11 @@ public List<MyRange> queryList(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, MyRange::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, MyRange::of);
 				this.lifecycleHook.onSuccess("queryList", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryList", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -941,11 +941,11 @@ public NilResult queryListOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -968,7 +968,7 @@ public NilResult queryListOpt(List<MyRange> range) {
 		var $path = "%s/api/scalarsubstitution/queryListOpt".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (range != null) {
 			range.stream().forEach($q -> {
 				$queryParams.append("range", $q);
@@ -986,11 +986,11 @@ public NilResult queryListOpt(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1013,7 +1013,7 @@ public NilResult queryListNull(List<MyRange> range) {
 		var $path = "%s/api/scalarsubstitution/queryListNull".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (range != null) {
 			range.stream().forEach($q -> {
 				$queryParams.append("range", $q);
@@ -1033,11 +1033,11 @@ public NilResult queryListNull(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryListNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryListNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1071,11 +1071,11 @@ public NilResult queryListOptNull() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryListOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryListOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1098,7 +1098,7 @@ public NilResult queryListOptNull(List<MyRange> range) {
 		var $path = "%s/api/scalarsubstitution/queryListOptNull".formatted(
 				this.baseURI());
 
-		var $queryParams = new ServiceUtils.URLSearchParams();
+		var $queryParams = new BaseUtils.URLSearchParams();
 		if (range != null) {
 			range.stream().forEach($q -> {
 				$queryParams.append("range", $q);
@@ -1118,11 +1118,11 @@ public NilResult queryListOptNull(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("queryListOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("queryListOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1148,8 +1148,8 @@ public MyRange header(MyRange range) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("range", ServiceUtils.encodeAsciiString(Objects.toString(range)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("range", BaseUtils.encodeAsciiString(Objects.toString(range)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1165,11 +1165,11 @@ public MyRange header(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, MyRange::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, MyRange::of);
 				this.lifecycleHook.onSuccess("header", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("header", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1203,11 +1203,11 @@ public NilResult headerOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1231,8 +1231,8 @@ public NilResult headerOpt(MyRange range) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("range", ServiceUtils.encodeAsciiString(Objects.toString(range)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("range", BaseUtils.encodeAsciiString(Objects.toString(range)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1248,11 +1248,11 @@ public NilResult headerOpt(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1276,8 +1276,8 @@ public NilResult headerNull(MyRange range) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("range", ServiceUtils.encodeAsciiString(Objects.toString(range)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("range", BaseUtils.encodeAsciiString(Objects.toString(range)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1293,11 +1293,11 @@ public NilResult headerNull(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1331,11 +1331,11 @@ public NilResult headerOptNull() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1359,8 +1359,8 @@ public NilResult headerOptNull(MyRange range) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("range", ServiceUtils.encodeAsciiString(Objects.toString(range)));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("range", BaseUtils.encodeAsciiString(Objects.toString(range)));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1376,11 +1376,11 @@ public NilResult headerOptNull(MyRange range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1406,8 +1406,8 @@ public List<MyRange> headerList(List<MyRange> range) {
 				this.baseURI());
 
 		var $headerParams = new HashMap<String, String>();
-		$headerParams.put("range", String.join(",", range.stream().map($v -> ServiceUtils.encodeAsciiString(Objects.toString($v))).toList()));
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		$headerParams.put("range", String.join(",", range.stream().map($v -> BaseUtils.encodeAsciiString(Objects.toString($v))).toList()));
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1423,11 +1423,11 @@ public List<MyRange> headerList(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiterals($response, MyRange::of);
+				var $rv = JDKHttpClientResponseUtils.mapLiterals($response, MyRange::of);
 				this.lifecycleHook.onSuccess("headerList", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerList", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1461,11 +1461,11 @@ public NilResult headerListOpt() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1490,9 +1490,9 @@ public NilResult headerListOpt(List<MyRange> range) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (range != null) {
-			$headerParams.put("range", String.join(",", range.stream().map($v -> ServiceUtils.encodeAsciiString(Objects.toString($v))).toList()));
+			$headerParams.put("range", String.join(",", range.stream().map($v -> BaseUtils.encodeAsciiString(Objects.toString($v))).toList()));
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1508,11 +1508,11 @@ public NilResult headerListOpt(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerListOpt", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerListOpt", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1537,11 +1537,11 @@ public NilResult headerListNull(List<MyRange> range) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (range != null) {
-			$headerParams.put("range", String.join(",", range.stream().map($v -> ServiceUtils.encodeAsciiString(Objects.toString($v))).toList()));
+			$headerParams.put("range", String.join(",", range.stream().map($v -> BaseUtils.encodeAsciiString(Objects.toString($v))).toList()));
 		} else {
 			$headerParams.put("range", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1557,11 +1557,11 @@ public NilResult headerListNull(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerListNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerListNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1595,11 +1595,11 @@ public NilResult headerListOptNull() {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerListOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerListOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1624,11 +1624,11 @@ public NilResult headerListOptNull(List<MyRange> range) {
 
 		var $headerParams = new HashMap<String, String>();
 		if (range != null) {
-			$headerParams.put("range", String.join(",", range.stream().map($v -> ServiceUtils.encodeAsciiString(Objects.toString($v))).toList()));
+			$headerParams.put("range", String.join(",", range.stream().map($v -> BaseUtils.encodeAsciiString(Objects.toString($v))).toList()));
 		} else {
 			$headerParams.put("range", "null");
 		}
-		var $headers = ServiceUtils.toHeaders($headerParams);
+		var $headers = BaseUtils.toHeaders($headerParams);
 
 		var $uri = URI.create($path);
 		try {
@@ -1644,11 +1644,11 @@ public NilResult headerListOptNull(List<MyRange> range) {
 
 			var $response = this.httpClient().send($request, BodyHandlers.ofInputStream());
 			if ($response.statusCode() == 200) {
-				var $rv = ServiceUtils.mapLiteral($response, NilResult::valueOf);
+				var $rv = JDKHttpClientResponseUtils.mapLiteral($response, NilResult::valueOf);
 				this.lifecycleHook.onSuccess("headerListOptNull", $rv, this.client.createResponseAdaptable($response));
 				return $rv;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("headerListOptNull", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
@@ -1690,13 +1690,13 @@ public void fail()
 				this.lifecycleHook.onSuccess("fail", null, this.client.createResponseAdaptable($response));
 				return;
 			} else if ($response.statusCode() == 400) {
-				var $errorData = ServiceUtils.mapLiteral($response, MyRange::of);
+				var $errorData = JDKHttpClientResponseUtils.mapLiteral($response, MyRange::of);
 				var $message = $response.headers().firstValue("X-RSD-Error-Message").orElse("Invocation of fail failed");
 				var exception = new SampleErrorScalarSubException($message, $errorData);
 				this.lifecycleHook.onError("fail", exception, this.client.createResponseAdaptable($response));
 				throw exception;
 			}
-			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), ServiceUtils.toString($response)));
+			var $exception = new RSDException(RSDException.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));
 			this.lifecycleHook.onError("fail", $exception, this.client.createResponseAdaptable($response));
 			throw $exception;
 		} catch (Exception e) {
diff --git a/dsl/java-test/java-client/src/test/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtilsTest.java b/dsl/java-test/java-client/src/test/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtilsTest.java
new file mode 100644
index 00000000..a36912af
--- /dev/null
+++ b/dsl/java-test/java-client/src/test/java/dev/rsdlang/sample/client/jdkhttp/impl/BaseUtilsTest.java
@@ -0,0 +1,25 @@
+package dev.rsdlang.sample.client.jdkhttp.impl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+public class BaseUtilsTest {
+    @Test
+    public void encodeAsciiString() {
+        assertEquals("Hello World!", BaseUtils.encodeAsciiString("Hello World!"));
+        assertEquals("\\u0020Hello World!\\u0020", BaseUtils.encodeAsciiString(" Hello World! "));
+        assertEquals("\\u0020\\u0020Hello World!\\u0020\\u0020", BaseUtils.encodeAsciiString("  Hello World!  "));
+        assertEquals("\\u0020\\u0020\\u0020Hello World!\\u0020\\u0020\\u0020",
+                BaseUtils.encodeAsciiString("   Hello World!   "));
+
+        assertEquals("Hello+World!", BaseUtils.encodeAsciiString("Hello+World!"));
+        assertEquals("Hello/World!", BaseUtils.encodeAsciiString("Hello/World!"));
+        assertEquals("Hello\\u0009World!", BaseUtils.encodeAsciiString("Hello\tWorld!"));
+        assertEquals("\\u0020\\u0009Hello Tab-World!\\u0009\\u0020",
+                BaseUtils.encodeAsciiString(" \tHello Tab-World!\t "));
+
+        assertEquals("a \\u0100 \\ud800\\udc00 \\u6587 \\ud83e\\udd84", BaseUtils.encodeAsciiString("a Ā 𐀀 文 🦄"));
+        assertEquals("\\u005Cu FooBar", BaseUtils.encodeAsciiString("\\u FooBar"));
+    }
+}
diff --git a/dsl/java-test/java-client/src/test/java/dev/rsdlang/sample/client/jdkhttp/impl/ServiceUtilsTest.java b/dsl/java-test/java-client/src/test/java/dev/rsdlang/sample/client/jdkhttp/impl/ServiceUtilsTest.java
deleted file mode 100644
index 166cc77d..00000000
--- a/dsl/java-test/java-client/src/test/java/dev/rsdlang/sample/client/jdkhttp/impl/ServiceUtilsTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package dev.rsdlang.sample.client.jdkhttp.impl;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.junit.jupiter.api.Test;
-
-public class ServiceUtilsTest {
-    @Test
-    public void encodeAsciiString() {
-        assertEquals("Hello World!", ServiceUtils.encodeAsciiString("Hello World!"));
-        assertEquals("\\u0020Hello World!\\u0020", ServiceUtils.encodeAsciiString(" Hello World! "));
-        assertEquals("\\u0020\\u0020Hello World!\\u0020\\u0020", ServiceUtils.encodeAsciiString("  Hello World!  "));
-        assertEquals("\\u0020\\u0020\\u0020Hello World!\\u0020\\u0020\\u0020",
-                ServiceUtils.encodeAsciiString("   Hello World!   "));
-
-        assertEquals("Hello+World!", ServiceUtils.encodeAsciiString("Hello+World!"));
-        assertEquals("Hello/World!", ServiceUtils.encodeAsciiString("Hello/World!"));
-        assertEquals("Hello\\u0009World!", ServiceUtils.encodeAsciiString("Hello\tWorld!"));
-        assertEquals("\\u0020\\u0009Hello Tab-World!\\u0009\\u0020",
-                ServiceUtils.encodeAsciiString(" \tHello Tab-World!\t "));
-
-        assertEquals("a \\u0100 \\ud800\\udc00 \\u6587 \\ud83e\\udd84", ServiceUtils.encodeAsciiString("a Ā 𐀀 文 🦄"));
-        assertEquals("\\u005Cu FooBar", ServiceUtils.encodeAsciiString("\\u FooBar"));
-    }
-}
diff --git a/dsl/packages/cli/src/java-base/base-utils.ts b/dsl/packages/cli/src/java-base/base-utils.ts
new file mode 100644
index 00000000..f2dcbbf3
--- /dev/null
+++ b/dsl/packages/cli/src/java-base/base-utils.ts
@@ -0,0 +1,337 @@
+import { CompositeGeneratorNode } from 'langium/generate';
+import { toNodeTree } from '../util.js';
+
+export function generateBaseUtilsContent(
+	artifactConfig: { rootPackageName: string },
+	fqn: (type: string) => string,
+): CompositeGeneratorNode {
+	fqn('java.net.URLEncoder');
+	fqn('java.nio.charset.StandardCharsets');
+	fqn('java.time.LocalDate');
+	fqn('java.time.LocalDateTime');
+	fqn('java.time.LocalTime');
+	fqn('java.time.OffsetDateTime');
+	fqn('java.time.ZonedDateTime');
+	fqn('java.util.List');
+	fqn('java.util.Map');
+	fqn('java.util.stream.Collectors');
+	fqn('java.util.stream.Stream');
+	fqn('java.util.ArrayList');
+	fqn('java.util.Base64');
+	fqn('java.util.HexFormat');
+
+	fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`);
+	fqn(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils.TypeInfo`);
+	fqn(`${artifactConfig.rootPackageName}.model._Base`);
+
+	const compilationContent = toNodeTree(`
+public class BaseUtils {
+	private record SearchParam(String key, Object value) {
+
+	}
+
+	public static class URLSearchParams {
+		private List<SearchParam> params = new ArrayList<>();
+
+		public void append(String key, Object value) {
+			params.add(new SearchParam(key, value));
+		}
+
+		public String toQueryString() {
+			if (params.isEmpty()) {
+				return "";
+			}
+			return "?" + params.stream()
+					.map(e -> "%s=%s".formatted(encodeQueryString(e.key), encodeQueryString(e.value)))
+					.collect(Collectors.joining("&"));
+		}
+	}
+
+	private static String encodeQueryString(Object value) {
+		if (value == null) {
+			return "null";
+		}
+
+		if (value instanceof byte[] bytes) {
+			return encodeBase64(bytes);
+		}
+
+		return URLEncoder.encode(value.toString(), StandardCharsets.UTF_8);
+	}
+
+	public static String[] toHeaders(Map<String, String> data) {
+		return data.entrySet().stream()
+				.flatMap(e -> Stream.of(e.getKey(), e.getValue()))
+				.toArray(String[]::new);
+	}
+
+	public static byte[] ofBoolean(
+			Boolean value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.BOOLEAN);
+	}
+
+	public static byte[] ofBooleanList(
+			List<Boolean> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.BOOLEAN.withMulti());
+	}
+
+	public static byte[] ofShort(
+			Short value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.SHORT);
+	}
+
+	public static byte[] ofShortList(
+			List<Short> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.SHORT.withMulti());
+	}
+
+	public static byte[] ofInt(
+			Integer value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.INTEGER);
+	}
+
+	public static byte[] ofIntList(
+			List<Integer> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.INTEGER.withMulti());
+	}
+
+	public static byte[] ofLong(
+			Long value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.LONG);
+	}
+
+	public static byte[] ofLongList(
+			List<Long> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.LONG.withMulti());
+	}
+
+	public static byte[] ofFloat(
+			Float value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.FLOAT);
+	}
+
+	public static byte[] ofFloatList(
+			List<Float> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.FLOAT.withMulti());
+	}
+
+	public static byte[] ofDouble(
+			Double value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.DOUBLE);
+	}
+
+	public static byte[] ofDoubleList(
+			List<Double> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.DOUBLE.withMulti());
+	}
+
+	public static byte[] ofString(
+			String value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofStringList(
+			List<String> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofLocalDate(
+			LocalDate value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofLocalDateList(
+			List<LocalDate> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofLocalDateTime(
+			LocalDateTime value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofLocalDateTimeList(
+			List<LocalDateTime> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofZonedDateTime(
+			ZonedDateTime value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofZonedDateTimeList(
+			List<ZonedDateTime> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofLocalTime(
+			LocalTime value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofLocalTimeList(
+			List<LocalTime> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofOffsetDateTime(
+			OffsetDateTime value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static byte[] ofOffsetDateTimeList(
+			List<OffsetDateTime> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static byte[] ofLiteral(
+			Object value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING);
+	}
+
+	public static <T> byte[] ofLiteralList(
+			List<T> value,
+			boolean nullable,
+			String contentType) {
+		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
+	}
+
+	public static <T extends _Base.BaseData> byte[] ofObject(
+			T value,
+			boolean nullable,
+			String contentType,
+			Class<T> type) {
+		return of(value, nullable, contentType, TypeInfo.value(type));
+	}
+
+	public static <T extends _Base.BaseData> byte[] ofObjectList(
+			List<T> value,
+			boolean nullable,
+			String contentType,
+			Class<T> type) {
+		return of(value, nullable, contentType, TypeInfo.value(type).withMulti());
+	}
+
+	private static byte[] of(
+			Object value,
+			boolean nullable,
+			String contentType,
+			TypeInfo<?> baseTypeInfo) {
+		var typeInfo = baseTypeInfo;
+		if (nullable) {
+			typeInfo = typeInfo.withNullable();
+		}
+
+		return _JsonUtils.encodeValue(value, contentType, typeInfo);
+	}
+
+	public static String encodeAsciiString(String text) {
+		text = text.replace("\\\\u", "\\\\u005Cu"); // Escape existing \\\\u sequences
+		int leading = 0;
+		while (leading < text.length() && text.charAt(leading) == ' ') leading++;
+		if (leading > 0) {
+			text = "\\\\u0020".repeat(leading) + text.substring(leading);
+		}
+		int trailing = 0;
+		int len = text.length();
+		while (trailing < len && text.charAt(len - 1 - trailing) == ' ') trailing++;
+		if (trailing > 0) {
+			text = text.substring(0, len - trailing) + "\\\\u0020".repeat(trailing);
+		}
+		var b = new StringBuilder(text.length());
+		var l = text.length();
+		for (var i = 0; i < l; i++) {
+			var c = text.charAt(i);
+			// Escape non-printable characters, comma and all non-ASCII characters
+			if (c < 32 || c > 126 || c == 44) {
+				b.append(String.format("\\\\u%04x", (int) c));
+			} else {
+				b.append(c);
+			}
+		}
+
+		return b.toString();
+	}
+
+	public static String encodeBase64(byte[] value) {
+		return Base64.getEncoder().encodeToString(value);
+	}
+
+	public static String encodeURIComponent(String value) {
+		var bytes = value.getBytes(StandardCharsets.UTF_8);
+		var result = new StringBuilder();
+
+		HexFormat hex = HexFormat.of().withUpperCase();
+		for (byte b : bytes) {
+			// Unreserved characters according to RFC 3986
+			if ((b >= 'A' && b <= 'Z') // Alpanumeric characters uppercase
+					|| (b >= 'a' && b <= 'z') // Alpanumeric characters lowercase
+					|| (b >= '0' && b <= '9') // Numeric characters
+					|| b == '-' || b == '_' || b == '.' // Unreserved Part 1
+					|| b == '!' || b == '~' || b == '*' // Unreserved Part 2
+					|| b == '\\'' || b == '(' || b == ')' // Unreserved Part 3
+			) {
+				result.append((char) b); // safe as we know this is an ascii character
+			} else {
+				result.append('%');
+				hex.toHexDigits(result, b);
+			}
+		}
+		return result.toString();
+	}
+}
+`);
+
+	return compilationContent;
+}
diff --git a/dsl/packages/cli/src/java-rest-client-jdk/base-utils.ts b/dsl/packages/cli/src/java-rest-client-jdk/base-utils.ts
new file mode 100644
index 00000000..6e3752fb
--- /dev/null
+++ b/dsl/packages/cli/src/java-rest-client-jdk/base-utils.ts
@@ -0,0 +1,22 @@
+import { toString } from 'langium/generate';
+import { Artifact } from '../artifact-generator.js';
+import {
+	generateCompilationUnit,
+	JavaImportsCollector,
+	JavaRestClientJDKGeneratorConfig,
+	toPath,
+} from '../java-gen-utils.js';
+import { generateBaseUtilsContent } from '../java-base/base-utils.js';
+
+export function generateBaseUtils(artifactConfig: JavaRestClientJDKGeneratorConfig): Artifact {
+	const packageName = `${artifactConfig.rootPackageName}.jdkhttp.impl`;
+
+	const importCollector = new JavaImportsCollector(packageName);
+	const fqn = importCollector.importType.bind(importCollector);
+	const node = generateBaseUtilsContent(artifactConfig, fqn);
+	return {
+		name: 'BaseUtils.java',
+		content: toString(generateCompilationUnit(packageName, importCollector, node), '\t'),
+		path: toPath(artifactConfig.targetFolder, packageName),
+	};
+}
diff --git a/dsl/packages/cli/src/java-rest-client-jdk/generator.ts b/dsl/packages/cli/src/java-rest-client-jdk/generator.ts
index 238a2abf..b7a13178 100644
--- a/dsl/packages/cli/src/java-rest-client-jdk/generator.ts
+++ b/dsl/packages/cli/src/java-rest-client-jdk/generator.ts
@@ -9,11 +9,12 @@ import { generateRecord } from './record.js';
 import { generateJsonUtils } from './json-utils.js';
 import { generateUnion } from './union.js';
 import { generateService } from './service.js';
-import { generateServiceUtils } from './service-utils.js';
+import { generateJDKHttpClientResponseUtils } from './response-utils.js';
 import { generateNillable } from './nillable-impl.js';
 import { generateStreamImpls } from './stream-impl.js';
 import { generateChangeSupport } from './listchange.js';
 import { generateFormDataPublisherBuilder } from './form-data-publisher.js';
+import { generateBaseUtils } from './base-utils.js';
 
 export function generate(
 	model: MResolvedRSDModel,
@@ -32,12 +33,13 @@ export function generate(
 	result.push(generateBase(artifactConfig));
 	result.push(generateNillable(artifactConfig));
 	result.push(generateJsonUtils(artifactConfig));
-	result.push(generateServiceUtils(artifactConfig, model));
+	result.push(generateJDKHttpClientResponseUtils(artifactConfig, model));
 	result.push(...model.elements.flatMap(e => generateType(e, model, artifactConfig)).filter(isDefined));
 	result.push(...model.services.flatMap(e => generateService(e, generatorConfig, artifactConfig)));
 	result.push(...generateStreamImpls(artifactConfig, model));
 	result.push(...generateChangeSupport(artifactConfig));
 	result.push(...generateFormDataPublisherBuilder(artifactConfig, model));
+	result.push(generateBaseUtils(artifactConfig));
 
 	return result;
 }
diff --git a/dsl/packages/cli/src/java-rest-client-jdk/service-utils.ts b/dsl/packages/cli/src/java-rest-client-jdk/response-utils.ts
similarity index 57%
rename from dsl/packages/cli/src/java-rest-client-jdk/service-utils.ts
rename to dsl/packages/cli/src/java-rest-client-jdk/response-utils.ts
index 89092914..01cd1a6c 100644
--- a/dsl/packages/cli/src/java-rest-client-jdk/service-utils.ts
+++ b/dsl/packages/cli/src/java-rest-client-jdk/response-utils.ts
@@ -9,7 +9,7 @@ import {
 import { hasFileStreamResult, hasStreamResult, toNodeTree } from '../util.js';
 import { MResolvedRSDModel } from '../model.js';
 
-export function generateServiceUtils(
+export function generateJDKHttpClientResponseUtils(
 	artifactConfig: JavaRestClientJDKGeneratorConfig,
 	model: MResolvedRSDModel,
 ): Artifact {
@@ -18,7 +18,6 @@ export function generateServiceUtils(
 	const importCollector = new JavaImportsCollector(packageName);
 	importCollector.importType('java.io.InputStream');
 
-	importCollector.importType('java.net.URLEncoder');
 	importCollector.importType('java.net.http.HttpResponse');
 	importCollector.importType('java.nio.charset.StandardCharsets');
 	importCollector.importType('java.time.LocalDate');
@@ -27,11 +26,7 @@ export function generateServiceUtils(
 	importCollector.importType('java.time.OffsetDateTime');
 	importCollector.importType('java.time.ZonedDateTime');
 	importCollector.importType('java.util.List');
-	importCollector.importType('java.util.Map');
 	importCollector.importType('java.util.function.Function');
-	importCollector.importType('java.util.stream.Collectors');
-	importCollector.importType('java.util.stream.Stream');
-	importCollector.importType('java.util.ArrayList');
 	importCollector.importType('java.io.IOException');
 	if (hasStreamResult(model)) {
 		importCollector.importType('java.nio.file.Files');
@@ -46,47 +41,11 @@ export function generateServiceUtils(
 	}
 
 	importCollector.importType('jakarta.json.JsonObject');
-	importCollector.importType('java.util.Base64');
-	importCollector.importType('java.util.HexFormat');
 
 	importCollector.importType(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils`);
-	importCollector.importType(`${artifactConfig.rootPackageName}.impl.model.json._JsonUtils.TypeInfo`);
-	importCollector.importType(`${artifactConfig.rootPackageName}.model._Base`);
 
 	const compilationContent = toNodeTree(`
-public class ServiceUtils {
-	private record SearchParam(String key, Object value) {
-
-	}
-
-	public static class URLSearchParams {
-		private List<SearchParam> params = new ArrayList<>();
-
-		public void append(String key, Object value) {
-			params.add(new SearchParam(key, value));
-		}
-
-		public String toQueryString() {
-			if (params.isEmpty()) {
-				return "";
-			}
-			return "?" + params.stream()
-					.map(e -> "%s=%s".formatted(encodeQueryString(e.key), encodeQueryString(e.value)))
-					.collect(Collectors.joining("&"));
-		}
-	}
-
-	private static String encodeQueryString(Object value) {
-		if (value == null) {
-			return "null";
-		}
-
-		if (value instanceof byte[] bytes) {
-			return encodeBase64(bytes);
-		}
-
-		return URLEncoder.encode(value.toString(), StandardCharsets.UTF_8);
-	}
+public class JDKHttpClientResponseUtils {
 
 	public static String toString(HttpResponse<InputStream> response) {
 		try (var is = response.body()) {
@@ -96,12 +55,6 @@ public class ServiceUtils {
 		}
 	}
 
-	public static String[] toHeaders(Map<String, String> data) {
-		return data.entrySet().stream()
-				.flatMap(e -> Stream.of(e.getKey(), e.getValue()))
-				.toArray(String[]::new);
-	}
-
 	private static String contentType(HttpResponse<InputStream> response) {
 		return response.headers().firstValue("Content-Type")
 				.orElseThrow(() -> new IllegalStateException("Response is missing Content-Type header"));
@@ -330,272 +283,6 @@ public class ServiceUtils {
 			throw new IllegalStateException(e);
 		}
 	}
-
-	public static byte[] ofBoolean(
-			Boolean value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.BOOLEAN);
-	}
-
-	public static byte[] ofBooleanList(
-			List<Boolean> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.BOOLEAN.withMulti());
-	}
-
-	public static byte[] ofShort(
-			Short value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.SHORT);
-	}
-
-	public static byte[] ofShortList(
-			List<Short> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.SHORT.withMulti());
-	}
-
-	public static byte[] ofInt(
-			Integer value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.INTEGER);
-	}
-
-	public static byte[] ofIntList(
-			List<Integer> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.INTEGER.withMulti());
-	}
-
-	public static byte[] ofLong(
-			Long value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.LONG);
-	}
-
-	public static byte[] ofLongList(
-			List<Long> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.LONG.withMulti());
-	}
-
-	public static byte[] ofFloat(
-			Float value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.FLOAT);
-	}
-
-	public static byte[] ofFloatList(
-			List<Float> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.FLOAT.withMulti());
-	}
-
-	public static byte[] ofDouble(
-			Double value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.DOUBLE);
-	}
-
-	public static byte[] ofDoubleList(
-			List<Double> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.DOUBLE.withMulti());
-	}
-
-	public static byte[] ofString(
-			String value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofStringList(
-			List<String> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofLocalDate(
-			LocalDate value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofLocalDateList(
-			List<LocalDate> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofLocalDateTime(
-			LocalDateTime value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofLocalDateTimeList(
-			List<LocalDateTime> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofZonedDateTime(
-			ZonedDateTime value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofZonedDateTimeList(
-			List<ZonedDateTime> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofLocalTime(
-			LocalTime value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofLocalTimeList(
-			List<LocalTime> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofOffsetDateTime(
-			OffsetDateTime value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static byte[] ofOffsetDateTimeList(
-			List<OffsetDateTime> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static byte[] ofLiteral(
-			Object value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING);
-	}
-
-	public static <T> byte[] ofLiteralList(
-			List<T> value,
-			boolean nullable,
-			String contentType) {
-		return of(value, nullable, contentType, TypeInfo.STRING.withMulti());
-	}
-
-	public static <T extends _Base.BaseData> byte[] ofObject(
-			T value,
-			boolean nullable,
-			String contentType,
-			Class<T> type) {
-		return of(value, nullable, contentType, TypeInfo.value(type));
-	}
-
-	public static <T extends _Base.BaseData> byte[] ofObjectList(
-			List<T> value,
-			boolean nullable,
-			String contentType,
-			Class<T> type) {
-		return of(value, nullable, contentType, TypeInfo.value(type).withMulti());
-	}
-
-	private static byte[] of(
-			Object value,
-			boolean nullable,
-			String contentType,
-			TypeInfo<?> baseTypeInfo) {
-		var typeInfo = baseTypeInfo;
-		if (nullable) {
-			typeInfo = typeInfo.withNullable();
-		}
-
-		return _JsonUtils.encodeValue(value, contentType, typeInfo);
-	}
-
-	public static String encodeAsciiString(String text) {
-		text = text.replace("\\\\u", "\\\\u005Cu"); // Escape existing \\\\u sequences
-		int leading = 0;
-		while (leading < text.length() && text.charAt(leading) == ' ') leading++;
-		if (leading > 0) {
-			text = "\\\\u0020".repeat(leading) + text.substring(leading);
-		}
-		int trailing = 0;
-		int len = text.length();
-		while (trailing < len && text.charAt(len - 1 - trailing) == ' ') trailing++;
-		if (trailing > 0) {
-			text = text.substring(0, len - trailing) + "\\\\u0020".repeat(trailing);
-		}
-		var b = new StringBuilder(text.length());
-		var l = text.length();
-		for (var i = 0; i < l; i++) {
-			var c = text.charAt(i);
-			// Escape non-printable characters, comma and all non-ASCII characters
-			if (c < 32 || c > 126 || c == 44) {
-				b.append(String.format("\\\\u%04x", (int) c));
-			} else {
-				b.append(c);
-			}
-		}
-
-		return b.toString();
-	}
-
-	public static String encodeBase64(byte[] value) {
-		return Base64.getEncoder().encodeToString(value);
-	}
-
-	public static String encodeURIComponent(String value) {
-		var bytes = value.getBytes(StandardCharsets.UTF_8);
-		var result = new StringBuilder();
-
-		HexFormat hex = HexFormat.of().withUpperCase();
-		for (byte b : bytes) {
-			// Unreserved characters according to RFC 3986
-			if ((b >= 'A' && b <= 'Z') // Alpanumeric characters uppercase
-					|| (b >= 'a' && b <= 'z') // Alpanumeric characters lowercase
-					|| (b >= '0' && b <= '9') // Numeric characters
-					|| b == '-' || b == '_' || b == '.' // Unreserved Part 1
-					|| b == '!' || b == '~' || b == '*' // Unreserved Part 2
-					|| b == '\\'' || b == '(' || b == ')' // Unreserved Part 3
-			) {
-				result.append((char) b); // safe as we know this is an ascii character
-			} else {
-				result.append('%');
-				hex.toHexDigits(result, b);
-			}
-		}
-		return result.toString();
-	}
 }`);
 
 	if (hasStreamResult(model)) {
@@ -652,7 +339,7 @@ public static RSDFile mapFile(HttpResponse<InputStream> response) {
 	}
 
 	return {
-		name: 'ServiceUtils.java',
+		name: 'JDKHttpClientResponseUtils.java',
 		content: toString(generateCompilationUnit(packageName, importCollector, compilationContent), '\t'),
 		path: toPath(artifactConfig.targetFolder, packageName),
 	};
diff --git a/dsl/packages/cli/src/java-rest-client-jdk/service.ts b/dsl/packages/cli/src/java-rest-client-jdk/service.ts
index fcb9b197..2859417e 100644
--- a/dsl/packages/cli/src/java-rest-client-jdk/service.ts
+++ b/dsl/packages/cli/src/java-rest-client-jdk/service.ts
@@ -189,7 +189,7 @@ function appendFormattedPath(
 				} else {
 					const Objects = fqn('java.util.Objects');
 					formatted.append(
-						`ServiceUtils.encodeURIComponent(${Objects}.toString(${v}))${idx + 1 < variables.length ? ',' : ''}`,
+						`BaseUtils.encodeURIComponent(${Objects}.toString(${v}))${idx + 1 < variables.length ? ',' : ''}`,
 						idx + 1 < variables.length ? NL : '',
 					);
 				}
@@ -209,7 +209,7 @@ function appendQueryParams(
 	const queryParams = allParameters.filter(p => p.meta?.rest?.source === 'query');
 	if (queryParams.length === 0) return false;
 
-	methodBody.append(`var $queryParams = new ServiceUtils.URLSearchParams();`, NL);
+	methodBody.append(`var $queryParams = new BaseUtils.URLSearchParams();`, NL);
 	queryParams.forEach(p => {
 		const restName = p.meta?.rest?.name ?? p.name.toLowerCase();
 		let param: string;
@@ -221,7 +221,7 @@ function appendQueryParams(
 				fqn,
 				{ withArray: false, withOptional: false },
 			);
-			param = `ServiceUtils.ofObject(${p.array ? '$q' : p.name}, false, this.contentType(), ${type}.class)`;
+			param = `BaseUtils.ofObject(${p.array ? '$q' : p.name}, false, this.contentType(), ${type}.class)`;
 		} else {
 			param = p.array ? '$q' : p.name;
 		}
@@ -271,10 +271,10 @@ function appendHeaderParams(
 			if (p.variant === 'builtin' || p.variant === 'enum' || p.variant === 'inline-enum' || p.variant === 'scalar') {
 				let toString: string;
 				if (p.type === 'string') {
-					toString = '$v -> ServiceUtils.encodeAsciiString($v)';
+					toString = '$v -> BaseUtils.encodeAsciiString($v)';
 				} else if (p.variant === 'scalar') {
 					const Objects = fqn('java.util.Objects');
-					toString = `$v -> ServiceUtils.encodeAsciiString(${Objects}.toString($v))`;
+					toString = `$v -> BaseUtils.encodeAsciiString(${Objects}.toString($v))`;
 				} else {
 					const Objects = fqn('java.util.Objects');
 					toString = `${Objects}::toString`;
@@ -298,7 +298,7 @@ function appendHeaderParams(
 					fqn,
 					{ withArray: false, withOptional: false },
 				);
-				const toString = `$v -> ServiceUtils.encodeBase64(ServiceUtils.ofObject($v, false, this.contentType(), ${type}.class))`;
+				const toString = `$v -> BaseUtils.encodeBase64(BaseUtils.ofObject($v, false, this.contentType(), ${type}.class))`;
 				const codeBlock = `$headerParams.put("${restName}", String.join(",", ${p.name}.stream().map(${toString}).toList()));`;
 				appendWithNullGuard(
 					methodBody,
@@ -319,7 +319,7 @@ function appendHeaderParams(
 						p.name,
 						p.nullable,
 						p.optional,
-						`$headerParams.put("${restName}", ServiceUtils.encodeAsciiString(${p.name}));`,
+						`$headerParams.put("${restName}", BaseUtils.encodeAsciiString(${p.name}));`,
 						`$headerParams.put("${restName}", "null");`,
 					);
 				}
@@ -331,7 +331,7 @@ function appendHeaderParams(
 					fqn,
 					{ withArray: false, withOptional: false },
 				);
-				const codeBlock = `$headerParams.put("${restName}", ServiceUtils.encodeBase64(ServiceUtils.ofObject(${p.name}, false, this.contentType(), ${type}.class)));`;
+				const codeBlock = `$headerParams.put("${restName}", BaseUtils.encodeBase64(BaseUtils.ofObject(${p.name}, false, this.contentType(), ${type}.class)));`;
 				appendWithNullGuard(
 					methodBody,
 					p.name,
@@ -345,7 +345,7 @@ function appendHeaderParams(
 			} else if (p.variant === 'scalar') {
 				const Objects = fqn('java.util.Objects');
 				methodBody.append(
-					`$headerParams.put("${restName}", ServiceUtils.encodeAsciiString(${Objects}.toString(${p.name})));`,
+					`$headerParams.put("${restName}", BaseUtils.encodeAsciiString(${Objects}.toString(${p.name})));`,
 					NL,
 				);
 			} else {
@@ -354,7 +354,7 @@ function appendHeaderParams(
 			}
 		}
 	});
-	methodBody.append('var $headers = ServiceUtils.toHeaders($headerParams);', NL);
+	methodBody.append('var $headers = BaseUtils.toHeaders($headerParams);', NL);
 	methodBody.appendNewLine();
 	return true;
 }
@@ -491,7 +491,7 @@ function generateStreamBody(
 	if (hasNonStreamBodyParams) {
 		const typeName = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${s.name}${toFirstUpper(o.name)}DataImpl`);
 		methodBody.append(
-			`$formDataBuilder.addBytes("_rsdPayload", ServiceUtils.ofObject(new ${typeName}($jsonPayload.build()), false, this.contentType(), ${typeName}.class), this.contentType());`,
+			`$formDataBuilder.addBytes("_rsdPayload", BaseUtils.ofObject(new ${typeName}($jsonPayload.build()), false, this.contentType(), ${typeName}.class), this.contentType());`,
 			NL,
 		);
 	}
@@ -604,11 +604,11 @@ function appendSingleParamBody(
 	let baseCall: string;
 	let optionalCall: string;
 	if (param.variant === 'builtin') {
-		const method = `ServiceUtils.of${toFirstUpper(toCamelCaseIdentifier(param.type))}${suffix}`;
+		const method = `BaseUtils.of${toFirstUpper(toCamelCaseIdentifier(param.type))}${suffix}`;
 		baseCall = `${method}(${param.name}, ${String(param.nullable)}, $contentType)`;
 		optionalCall = `${method}(${param.name}, false, $contentType)`;
 	} else if (param.variant === 'scalar' || param.variant === 'enum' || param.variant === 'inline-enum') {
-		const method = `ServiceUtils.ofLiteral${suffix}`;
+		const method = `BaseUtils.ofLiteral${suffix}`;
 		baseCall = `${method}(${param.name}, ${String(param.nullable)}, $contentType)`;
 		optionalCall = `${method}(${param.name}, false, $contentType)`;
 	} else {
@@ -619,7 +619,7 @@ function appendSingleParamBody(
 			fqn,
 			{ withArray: false, withOptional: false },
 		);
-		const method = `ServiceUtils.ofObject${suffix}`;
+		const method = `BaseUtils.ofObject${suffix}`;
 		baseCall = `${method}(${param.name}, ${String(param.nullable)}, $contentType, ${type}.class)`;
 		optionalCall = `${method}(${param.name}, false, $contentType, ${type}.class)`;
 	}
@@ -664,7 +664,7 @@ function appendMultiParamBody(
 	});
 	const typeName = fqn(`${artifactConfig.rootPackageName}.impl.model.json.${s.name}${toFirstUpper(o.name)}DataImpl`);
 	methodBody.append(
-		`var $body = ${BodyPublishers}.ofByteArray(ServiceUtils.ofObject(new ${typeName}($builder.build()), false, this.contentType(), ${typeName}.class));`,
+		`var $body = ${BodyPublishers}.ofByteArray(BaseUtils.ofObject(new ${typeName}($builder.build()), false, this.contentType(), ${typeName}.class));`,
 		NL,
 	);
 }
@@ -770,7 +770,7 @@ function generateResponseDispatch(
 
 	const RSDException = fqn(`${artifactConfig.rootPackageName}.RSDException`);
 	methodBody.append(
-		`var $exception = new ${RSDException}(${RSDException}.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\\n%s", $response.statusCode(), ServiceUtils.toString($response)));`,
+		`var $exception = new ${RSDException}(${RSDException}.Type._UnknownResponse, String.format("Unsupported Http-Status '%s':\\n%s", $response.statusCode(), JDKHttpClientResponseUtils.toString($response)));`,
 		NL,
 	);
 	methodBody.append(
@@ -819,21 +819,21 @@ function handleOkResult(
 	}
 	if (type.variant === 'stream') {
 		if (type.type === 'file') {
-			node.append('var $rv = ServiceUtils.mapFile($response);', NL);
+			node.append('var $rv = JDKHttpClientResponseUtils.mapFile($response);', NL);
 		} else {
-			node.append('var $rv = ServiceUtils.mapBlob($response);', NL);
+			node.append('var $rv = JDKHttpClientResponseUtils.mapBlob($response);', NL);
 		}
 	} else if (type.variant === 'record' || type.variant === 'union') {
 		const modelPkg = `${artifactConfig.rootPackageName}.impl.model.json`;
 		const modelType = fqn(`${modelPkg}.${type.type}DataImpl`);
 		if (type.array) {
 			node.append(
-				`var $rv = ServiceUtils.mapObjects($response, ${modelType}::of, ${toResultType(type, artifactConfig, fqn, '', true)}.class);`,
+				`var $rv = JDKHttpClientResponseUtils.mapObjects($response, ${modelType}::of, ${toResultType(type, artifactConfig, fqn, '', true)}.class);`,
 				NL,
 			);
 		} else {
 			node.append(
-				`var $rv = ServiceUtils.mapObject($response, ${modelType}::of, ${toResultType(type, artifactConfig, fqn, '', true)}.class);`,
+				`var $rv = JDKHttpClientResponseUtils.mapObject($response, ${modelType}::of, ${toResultType(type, artifactConfig, fqn, '', true)}.class);`,
 				NL,
 			);
 		}
@@ -844,22 +844,28 @@ function handleOkResult(
 	} else if (type.variant === 'scalar') {
 		const resolvedType = resolveType(type.type, artifactConfig.nativeTypeSubstitues, fqn, false);
 		if (type.array) {
-			node.append(`var $rv = ServiceUtils.mapLiterals($response, ${resolvedType}::of);`, NL);
+			node.append(`var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ${resolvedType}::of);`, NL);
 		} else {
-			node.append(`var $rv = ServiceUtils.mapLiteral($response, ${resolvedType}::of);`, NL);
+			node.append(`var $rv = JDKHttpClientResponseUtils.mapLiteral($response, ${resolvedType}::of);`, NL);
 		}
 	} else if (type.variant === 'enum') {
 		const resolvedType = resolveType(type.type, artifactConfig.nativeTypeSubstitues, fqn, false);
 		if (type.array) {
-			node.append(`var $rv = ServiceUtils.mapLiterals($response, ${resolvedType}::valueOf);`, NL);
+			node.append(`var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ${resolvedType}::valueOf);`, NL);
 		} else {
-			node.append(`var $rv = ServiceUtils.mapLiteral($response, ${resolvedType}::valueOf);`, NL);
+			node.append(`var $rv = JDKHttpClientResponseUtils.mapLiteral($response, ${resolvedType}::valueOf);`, NL);
 		}
 	} else {
 		if (type.array) {
-			node.append(`var $rv = ServiceUtils.mapLiterals($response, ${toFirstUpper(o.name)}_Result$::valueOf);`, NL);
+			node.append(
+				`var $rv = JDKHttpClientResponseUtils.mapLiterals($response, ${toFirstUpper(o.name)}_Result$::valueOf);`,
+				NL,
+			);
 		} else {
-			node.append(`var $rv = ServiceUtils.mapLiteral($response, ${toFirstUpper(o.name)}_Result$::valueOf);`, NL);
+			node.append(
+				`var $rv = JDKHttpClientResponseUtils.mapLiteral($response, ${toFirstUpper(o.name)}_Result$::valueOf);`,
+				NL,
+			);
 		}
 	}
 	node.append(`this.lifecycleHook.onSuccess("${o.name}", $rv, this.client.createResponseAdaptable($response));`, NL);
@@ -881,7 +887,7 @@ function builtinMapExpression(type: MBuiltinType, array: boolean): string {
 		string: 'String',
 		'zoned-date-time': 'ZonedDateTime',
 	};
-	return `ServiceUtils.map${names[type]}${array ? 's' : ''}($response)`;
+	return `JDKHttpClientResponseUtils.map${names[type]}${array ? 's' : ''}($response)`;
 }
 
 function handleErrorResult(
@@ -903,7 +909,10 @@ function handleErrorResult(
 				`${artifactConfig.rootPackageName}.model`,
 				fqn,
 			);
-			node.append(`var $errorData = ServiceUtils.mapObject($response, ${modelType}::of, ${apiType}.class);`, NL);
+			node.append(
+				`var $errorData = JDKHttpClientResponseUtils.mapObject($response, ${modelType}::of, ${apiType}.class);`,
+				NL,
+			);
 		} else if (isMBuiltinType(type)) {
 			node.append(`var $errorData = ${builtinMapExpression(type, false)};`, NL);
 		} else if (isMScalarType(type)) {
@@ -913,7 +922,7 @@ function handleErrorResult(
 				`${artifactConfig.rootPackageName}.model`,
 				fqn,
 			);
-			node.append(`var $errorData = ServiceUtils.mapLiteral($response, ${apiType}::of);`, NL);
+			node.append(`var $errorData = JDKHttpClientResponseUtils.mapLiteral($response, ${apiType}::of);`, NL);
 		} else if (isMEnumType(type)) {
 			const apiType = toAPIType(
 				resolvedError.resolvedContentType,
@@ -921,7 +930,7 @@ function handleErrorResult(
 				`${artifactConfig.rootPackageName}.model`,
 				fqn,
 			);
-			node.append(`var $errorData = ServiceUtils.mapLiteral($response, ${apiType}::valueOf);`, NL);
+			node.append(`var $errorData = JDKHttpClientResponseUtils.mapLiteral($response, ${apiType}::valueOf);`, NL);
 		} else {
 			throw new Error(`Unsupported error content type for operation ${o.name}`);
 		}
@@ -935,7 +944,7 @@ function handleErrorResult(
 		);
 	} else {
 		node.append(
-			`var exception = new ${fqn(`${artifactConfig.rootPackageName}.${error}Exception`)}(ServiceUtils.toString($response));`,
+			`var exception = new ${fqn(`${artifactConfig.rootPackageName}.${error}Exception`)}(JDKHttpClientResponseUtils.toString($response));`,
 			NL,
 		);
 	}