Refactor methods, added tests

Author: wlanboy

src/main/java/com/wlanboy/javahttpclient/client/ClientService.java

@@ -17,8 +17,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.MultiValueMap;
 
 import com.wlanboy.javahttpclient.controller.JavaHttpRequest;
 
@@ -40,15 +38,20 @@ public ClientService() {
 
 	public ResponseEntity<String> sendRequest(JavaHttpRequest requestData, HttpHeaders incomingHeaders) {
 		try {
-			HttpRequest.BodyPublisher bodyPublisher = (requestData.body() == null || requestData.body().isBlank())
-					? HttpRequest.BodyPublishers.noBody()
-					: HttpRequest.BodyPublishers.ofString(requestData.body());
+			boolean hasBody = requestData.body() != null && !requestData.body().isBlank();
+
+			HttpRequest.BodyPublisher bodyPublisher = hasBody
+					? HttpRequest.BodyPublishers.ofString(requestData.body())
+					: HttpRequest.BodyPublishers.noBody();
 
 			HttpRequest.Builder builder = HttpRequest.newBuilder()
 					.uri(URI.create(requestData.url()))
+					.timeout(Duration.ofSeconds(30))
 					.method(requestData.method().name(), bodyPublisher);
 
-			if (requestData.body() != null && !requestData.body().isBlank()) {
+			if (hasBody && requestData.contentType() != null && !requestData.contentType().isBlank()) {
+				builder.header("Content-Type", requestData.contentType());
+			} else if (hasBody) {
 				builder.header("Content-Type", "application/json");
 			}
 
@@ -74,9 +77,12 @@ public ResponseEntity<String> sendRequest(JavaHttpRequest requestData, HttpHeade
 
 			HttpResponse<String> response = client.send(builder.build(), BodyHandlers.ofString());
 
-			MultiValueMap<String, String> responseHeaders = CollectionUtils.toMultiValueMap(response.headers().map());
+			HttpHeaders responseHeaders = new HttpHeaders();
+			response.headers().map().forEach(responseHeaders::addAll);
 
-			return new ResponseEntity<>(response.body(), responseHeaders, response.statusCode());
+			return ResponseEntity.status(response.statusCode())
+					.headers(h -> h.addAll(responseHeaders))
+					.body(response.body());
 
 		} catch (Exception e) {
 			String errorDetail = formatErrorResponse(e);

src/main/java/com/wlanboy/javahttpclient/client/K8sDiagnosticService.java

@@ -13,8 +13,11 @@
 import java.net.Socket;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.time.Duration;
 import java.util.*;
 
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+
 @Service
 public class K8sDiagnosticService {
 
@@ -30,7 +33,10 @@ public class K8sDiagnosticService {
     private volatile String k8sInitError = null;
 
     public K8sDiagnosticService() {
-        this.restTemplate = new RestTemplate();
+        SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
+        factory.setConnectTimeout(Duration.ofSeconds(5));
+        factory.setReadTimeout(Duration.ofSeconds(10));
+        this.restTemplate = new RestTemplate(factory);
         initializeK8sClient();
         logger.info("K8s Diagnostic Service initialisiert (K8s API verfügbar: {}).", k8sInitialized);
     }
@@ -87,8 +93,8 @@ public Map<String, Object> getFullSidecarDetails() {
             String rawStats = restTemplate.getForObject(
                     ENVOY_ADMIN_URL + "/stats?filter=.*(errors|5xx|timeout|retry|failed|reset|refused|overflow).*",
                     String.class);
-            Map<String, String> activeErrors = parseErrorStatsOnly(rawStats);
-            health.put("activeErrorMetrics", parseErrorStatsOnly(rawStats));
+            Map<String, String> activeErrors = parseStats(rawStats, true);
+            health.put("activeErrorMetrics", activeErrors);
             health.put("errorCount", activeErrors.size());
             report.put("healthDiagnostics", health);
 
@@ -100,27 +106,6 @@ public Map<String, Object> getFullSidecarDetails() {
         return report;
     }
 
-    private Map<String, String> parseErrorStatsOnly(String rawStats) {
-        Map<String, String> errorMap = new TreeMap<>();
-        if (rawStats != null) {
-            rawStats.lines()
-                    .filter(line -> line.contains(":"))
-                    .forEach(line -> {
-                        int colonIndex = line.lastIndexOf(':');
-                        if (colonIndex > 0 && colonIndex < line.length() - 1) {
-                            String key = line.substring(0, colonIndex).trim();
-                            String val = line.substring(colonIndex + 1).trim();
-                            try {
-                                if (Long.parseLong(val) > 0) {
-                                    errorMap.put(key, val);
-                                }
-                            } catch (NumberFormatException ignored) {
-                            }
-                        }
-                    });
-        }
-        return errorMap;
-    }
 
     private Map<String, Object> getEnvoyDetails() {
         Map<String, Object> envoy = new HashMap<>();
@@ -136,7 +121,7 @@ private Map<String, Object> getEnvoyDetails() {
             // Wichtige Netzwerk-Stats (Retries, Timeouts, 5xx Fehler)
             String stats = restTemplate.getForObject(
                     ENVOY_ADMIN_URL + "/stats?filter=cluster.*.upstream_rq_(5xx|timeout|retry)", String.class);
-            envoy.put("networkStats", parseStats(stats));
+            envoy.put("networkStats", parseStats(stats, false));
 
         } catch (Exception e) {
             envoy.put("error", "Envoy Admin API nicht erreichbar: " + e.getMessage());
@@ -178,16 +163,25 @@ private String summarizeClusters(String rawClusters) {
         return count + " aktive Upstream-Cluster-Einträge";
     }
 
-    private Map<String, String> parseStats(String rawStats) {
-        Map<String, String> statsMap = new HashMap<>();
+    private Map<String, String> parseStats(String rawStats, boolean onlyNonZero) {
+        Map<String, String> statsMap = onlyNonZero ? new TreeMap<>() : new HashMap<>();
         if (rawStats != null) {
             rawStats.lines()
                     .filter(line -> line.contains(":"))
                     .forEach(line -> {
                         int colonIndex = line.lastIndexOf(':');
                         if (colonIndex > 0 && colonIndex < line.length() - 1) {
-                            statsMap.put(line.substring(0, colonIndex).trim(),
-                                        line.substring(colonIndex + 1).trim());
+                            String key = line.substring(0, colonIndex).trim();
+                            String val = line.substring(colonIndex + 1).trim();
+                            if (onlyNonZero) {
+                                try {
+                                    if (Long.parseLong(val) > 0) {
+                                        statsMap.put(key, val);
+                                    }
+                                } catch (NumberFormatException ignored) {}
+                            } else {
+                                statsMap.put(key, val);
+                            }
                         }
                     });
         }

src/main/java/com/wlanboy/javahttpclient/controller/JavaHttpRequest.java

@@ -19,9 +19,12 @@ public record JavaHttpRequest(
     @NotNull(message = "HTTP Methode ist erforderlich")
     HttpMethod method,
 
-    @Schema(description = "Optionaler JSON Body", example = "{\"key\": \"value\"}")
+    @Schema(description = "Optionaler Request Body", example = "{\"key\": \"value\"}")
     String body,
 
+    @Schema(description = "Content-Type des Bodys", example = "application/json")
+    String contentType,
+
     @Schema(description = "Header kopieren")
     boolean copyHeaders,