refactor: de-lombok EndpointStats

diennea · Nov 20, 2024 · 0a1306c · 0a1306c
1 parent b7dc216
commit 0a1306c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 7 deletions.
diff --git a/carapace-server/src/main/java/org/carapaceproxy/EndpointStats.java b/carapace-server/src/main/java/org/carapaceproxy/EndpointStats.java
@@ -21,26 +21,32 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import lombok.Getter;
-import lombok.ToString;
 import org.carapaceproxy.core.EndpointKey;
 
 /**
  * Stats about an endpoint
  *
  * @author enrico.olivelli
  */
-@ToString
 public class EndpointStats {
 
     private final EndpointKey key;
-    @Getter
     private final AtomicInteger totalRequests = new AtomicInteger();
-    @Getter
     private final AtomicLong lastActivity = new AtomicLong();
 
-    public EndpointStats(EndpointKey key) {
+    public EndpointStats(final EndpointKey key) {
         this.key = key;
     }
 
+    public String toString() {
+        return "EndpointStats(key=" + this.key + ", totalRequests=" + this.totalRequests + ", lastActivity=" + this.lastActivity + ")";
+    }
+
+    public AtomicInteger getTotalRequests() {
+        return this.totalRequests;
+    }
+
+    public AtomicLong getLastActivity() {
+        return this.lastActivity;
+    }
 }
diff --git a/carapace-server/src/main/java/org/carapaceproxy/core/EndpointKey.java b/carapace-server/src/main/java/org/carapaceproxy/core/EndpointKey.java
@@ -19,21 +19,41 @@
  */
 package org.carapaceproxy.core;
 
+import org.carapaceproxy.utils.StringUtils;
+
 /**
  * Identifier of an endpoint
  *
  * @author enrico.olivelli
  */
 public record EndpointKey(String host, int port) {
 
+    /**
+     * The minimum port value according to <a href="https://tools.ietf.org/html/rfc6335">RFC 6335</a>.
+     */
+    public static final int MIN_PORT = 0;
+    /**
+     * The maximum port value according to <a href="https://tools.ietf.org/html/rfc6335">RFC 6335</a>.
+     */
+    public static final int MAX_PORT = 0xffff;
+
+    public EndpointKey {
+        if (StringUtils.isBlank(host)) {
+            throw new IllegalArgumentException("Hostname cannot be blank");
+        }
+        if (port > MAX_PORT || port < MIN_PORT) {
+            throw new IllegalArgumentException("Invalid port: " + port);
+        }
+    }
+
     public static EndpointKey make(String host, int port) {
         return new EndpointKey(host, port);
     }
 
     public static EndpointKey make(String hostAndPort) {
         int pos = hostAndPort.indexOf(':');
         if (pos <= 0) {
-            return new EndpointKey(hostAndPort, 0);
+            return new EndpointKey(hostAndPort, MIN_PORT);
         }
         String host = hostAndPort.substring(0, pos);
         int port = Integer.parseInt(hostAndPort.substring(pos + 1));