fix: messed up duplicated code

Author: coderGtm

src/main/java/com/gautam/ratelimiter/ratelimiter/AdaptiveRateLimiter.java

@@ -285,134 +285,4 @@ public int getRemainingPermits(HttpServletRequest request, Principal user) {
 
 		return Math.min(globalRemaining, Math.min(userRemaining, ipRemaining));
 	}
-}
-		this.factory = factory;
-		this.config = config;
-		this.meterRegistry = meterRegistry;
-		this.userLimiters = Caffeine.newBuilder()
-			.expireAfterAccess(5, TimeUnit.MINUTES)
-			.maximumSize(10_000)
-			.build();
-		this.ipLimiters = Caffeine.newBuilder()
-			.expireAfterAccess(5, TimeUnit.MINUTES)
-			.maximumSize(50_000)
-			.build();
-	}
-
-	private void ensureInitialized() {
-		if (!initialized) {
-			synchronized (this) {
-				if (!initialized) {
-					String algorithmName = config.getAlgorithm();
-					Algorithm algorithm = Algorithm.valueOf(algorithmName);
-
-					globalLimiter = factory.create(
-						"GLOBAL", 
-						algorithm, 
-						config.getLimits().getGlobal().getRequestsPerSecond()
-					);
-
-					log.info("Adaptive Rate Limiter initialized with algorithm: {}", algorithmName);
-					initialized = true;
-				}
-			}
-		}
-	}
-
-	public boolean tryConsume(HttpServletRequest request, Principal user) {
-		ensureInitialized();
-
-		// Layer 1. Check global limit.
-		if (!globalLimiter.allowRequest()) {
-			log.warn("Rate limit exceeded: GLOBAL");
-			count("global", "blocked");
-			return false;
-		}
-		count("global", "allowed");
-
-		// LAYER 2. Check per-user limit (if authenticated)
-		if (user != null) {
-			String username = user.getName();
-			RateLimiter userLimiter = userLimiters.get(username, key ->
-				factory.create(
-					"USER_" + key,
-					config.getAlgorithm(), 
-					config.getLimits().getPerUser().getRequestsPerSecond()
-				)
-			);
-
-			if (!userLimiter.allowRequest()) {
-				log.warn("Rate limit exceeded: USER_{}", username);
-				count("user", "blocked");
-				return false;
-			}
-			count("user", "allowed");
-		}
-
-		// LAYER 3. Check per-IP limit
-		String clientIp = extractClientIp(request);
-		RateLimiter ipLimiter = ipLimiters.get(clientIp, key ->
-			factory.create(
-				"IP_" + clientIp,
-				config.getAlgorithm(), 
-				config.getLimits().getPerIp().getRequestsPerSecond()
-			)
-		);
-
-		if (!ipLimiter.allowRequest()) {
-			log.warn("Rate limit exceeded: IP_{}", clientIp);
-			count("ip", "blocked");
-			return false;
-		}
-		count("ip", "allowed");
-
-		return true;
-	}
-
-	private void count(String layer, String result) {
-		Counter.builder("ratelimiter.requests")
-			.tag("layer", layer)
-			.tag("result", result)
-			.tag("algorithm", config.getAlgorithm())
-			.register(meterRegistry)
-			.increment();
-	}
-
-	private String extractClientIp(HttpServletRequest request) {
-		String xForwardedFor = request.getHeader("X-Forwarded-For");
-		if (xForwardedFor != null && !xForwardedFor.isEmpty()) {
-			// Format: client, proxy1, proxy2
-			return xForwardedFor.split(",")[0].trim();
-		}
-
-		String xRealIp = request.getHeader("X-Real-IP");
-		if (xRealIp != null && !xRealIp.isEmpty()) {
-			return xRealIp;
-		}
-
-		return request.getRemoteAddr();
-	}
-
-	public int getRemainingPermits(HttpServletRequest request, Principal user) {
-		ensureInitialized();
-
-		int globalRemaining = globalLimiter.getRemainingPermits();
-
-		int userRemaining = Integer.MAX_VALUE;
-		if (user != null) {
-			RateLimiter userLimiter = userLimiters.getIfPresent(user.getName());
-			if (userLimiter != null) {
-				userRemaining = userLimiter.getRemainingPermits();
-			}
-		}
-
-		String clientIp = extractClientIp(request);
-		int ipRemaining = Integer.MAX_VALUE;
-		RateLimiter ipLimiter = ipLimiters.getIfPresent(clientIp);
-		if (ipLimiter != null) {
-			ipRemaining = ipLimiter.getRemainingPermits();
-		}
-
-		return Math.min(globalRemaining, Math.min(userRemaining, ipRemaining));
-	}
 }

src/main/java/com/gautam/ratelimiter/ratelimiter/algorithms/LeakyBucketRateLimiter.java

@@ -126,49 +126,4 @@ private void leak() {
 			log.debug("Leaky Bucket {} leaked {} requests. New load: {}", name, leaked, currentLoad);
 		}
 	}
-}
-		this.name = name;
-		this.capacity = capacity;
-		this.leakRate = leakRate;
-		this.lastLeakTime = System.currentTimeMillis();
-		this.currentLoad = 0;
-	}
-
-	@Override
-	public synchronized boolean allowRequest() {
-		leak();
-
-		if (currentLoad < capacity) {
-			currentLoad++;
-			log.debug("Leaky Bucket {} allowed request. Load: {}/{}", name, currentLoad, capacity);
-			return true;
-		}
-
-		log.debug("Leaky Bucket {} blocked request. Queue full: {}/{}", name, currentLoad, capacity);
-		return false;
-	}
-
-	@Override
-	public synchronized int getRemainingPermits() {
-		leak();
-		return (int) (capacity - currentLoad);
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	private void leak() {
-		long now = System.currentTimeMillis();
-		long elapsed = now - lastLeakTime;
-
-		long leaked = (elapsed / 1000) * leakRate;
-
-		if (leaked > 0) {
-			currentLoad = Math.max(currentLoad - leaked, 0);
-			lastLeakTime = now;
-			log.debug("Leaky Bucket {} leaked {} requests. New load: {}", name, leaked, currentLoad);
-		}
-	}
 }

src/main/java/com/gautam/ratelimiter/ratelimiter/algorithms/SlidingWindowRateLimiter.java

@@ -120,46 +120,4 @@ private void checkAndResetWindow() {
 			log.debug("Sliding window {} reset", name);
 		}
 	}
-}
-		this.name = name;
-		this.limit = limit;
-		this.windowSizeMs = windowSizeMs;
-		this.requestCount = 0;
-		this.windowStartTime = System.currentTimeMillis();
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public synchronized boolean allowRequest() {
-		checkAndResetWindow();
-
-		if (requestCount < limit) {
-			requestCount++;
-			log.debug("Sliding window {} allowed request. Count {}/{}", name, requestCount, limit);
-			return true;
-		}
-
-		log.debug("Sliding window {} blocked request. Limit {} reached", name, limit);
-		return false;
-	}
-
-	@Override
-	public synchronized int getRemainingPermits() {
-		checkAndResetWindow();
-		return limit - requestCount;
-	}
-	
-	private void checkAndResetWindow() {
-		long now = System.currentTimeMillis();
-
-		if (now - windowStartTime >= windowSizeMs) {
-			requestCount = 0;
-			windowStartTime = now;
-			log.debug("Sliding window {} reset", name);
-		}
-	}
 }

src/main/java/com/gautam/ratelimiter/ratelimiter/algorithms/TokenBucketRateLimiter.java

@@ -125,48 +125,4 @@ private void refillTokens() {
 			lastRefillTime = now;
 		}
 	}
-}
-		this.name = name;
-		this.capacity = capacity;
-		this.refillRate = refillRate;
-		this.tokens = capacity;
-		this.lastRefillTime = System.currentTimeMillis();
-	}
-
-	@Override
-	public synchronized boolean allowRequest() {
-		refillTokens();
-
-		if (tokens > 0) {
-			tokens--;
-			log.debug("Token bucket {} allowed request. Tokens remaining: {}", name, tokens);
-			return true;
-		}
-
-		log.debug("Token bucket {} blocked request. No tokens available.", name);
-		return false;
-	}
-
-	@Override
-	public synchronized int getRemainingPermits() {
-		refillTokens();
-		return (int) Math.min(tokens, Integer.MAX_VALUE);
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	private void refillTokens() {
-		long now = System.currentTimeMillis();
-		long elapsed = now - lastRefillTime;
-
-		long tokensToAdd = (elapsed / 1000) * refillRate;
-
-		if (tokensToAdd > 0) {
-			tokens = Math.min(tokens + tokensToAdd, capacity);
-			lastRefillTime = now;
-		}
-	}
 }