Refactor UserUtils: Improve JavaDoc formatting and streamline IP header checks

Author: devondragon

src/main/java/com/digitalsanctuary/spring/user/util/UserUtils.java

@@ -16,26 +16,17 @@ private UserUtils() {
 
 	/**
 	 * Get the client's IP address by checking various headers commonly used by proxies, load balancers, and CDNs.
-	 * 
-	 * Checks headers in order of preference:
-	 * 1. X-Forwarded-For (standard proxy header)
-	 * 2. X-Real-IP (nginx and other reverse proxies)
-	 * 3. CF-Connecting-IP (Cloudflare)
-	 * 4. True-Client-IP (Akamai, Cloudflare Enterprise)
-	 * 5. Falls back to request.getRemoteAddr()
+	 *
+	 * Checks headers in order of preference: 1. X-Forwarded-For (standard proxy header) 2. X-Real-IP (nginx and other reverse proxies) 3.
+	 * CF-Connecting-IP (Cloudflare) 4. True-Client-IP (Akamai, Cloudflare Enterprise) 5. Falls back to request.getRemoteAddr()
 	 *
 	 * @param request The HttpServletRequest object.
 	 * @return The client's IP address as a String.
 	 */
 	public static String getClientIP(HttpServletRequest request) {
 		// Array of header names to check in order of preference
-		String[] ipHeaders = {
-			"X-Forwarded-For",
-			"X-Real-IP", 
-			"CF-Connecting-IP",
-			"True-Client-IP"
-		};
-		
+		String[] ipHeaders = {"X-Forwarded-For", "X-Real-IP", "CF-Connecting-IP", "True-Client-IP"};
+
 		for (String header : ipHeaders) {
 			String ip = request.getHeader(header);
 			if (ip != null && !ip.isEmpty() && !"unknown".equalsIgnoreCase(ip)) {
@@ -46,17 +37,16 @@ public static String getClientIP(HttpServletRequest request) {
 				return ip.trim();
 			}
 		}
-		
+
 		// Fall back to remote address if no proxy headers found
 		return request.getRemoteAddr();
 	}
 
 	/**
 	 * Get the application URL based on the provided request, handling proxy headers properly.
-	 * 
-	 * Checks for forwarded headers (X-Forwarded-Proto, X-Forwarded-Host, X-Forwarded-Port)
-	 * to construct the correct URL when behind a proxy or load balancer.
-	 * Falls back to standard request properties if no proxy headers are present.
+	 *
+	 * Checks for forwarded headers (X-Forwarded-Proto, X-Forwarded-Host, X-Forwarded-Port) to construct the correct URL when behind a proxy or load
+	 * balancer. Falls back to standard request properties if no proxy headers are present.
 	 *
 	 * @param request The HttpServletRequest object.
 	 * @return The application URL as a String.
@@ -67,7 +57,7 @@ public static String getAppUrl(HttpServletRequest request) {
 		if (scheme == null || scheme.isEmpty()) {
 			scheme = request.getScheme();
 		}
-		
+
 		// Check for forwarded host
 		String host = request.getHeader("X-Forwarded-Host");
 		if (host == null || host.isEmpty()) {
@@ -79,25 +69,22 @@ public static String getAppUrl(HttpServletRequest request) {
 				host = host.substring(0, colonIndex);
 			}
 		}
-		
+
 		// Check for forwarded port
 		String portHeader = request.getHeader("X-Forwarded-Port");
 		int port;
-			try {
-				port = Integer.parseInt(portHeader);
-			} catch (NumberFormatException e) {
-				port = request.getServerPort();
-			}
-		} else {
+		try {
+			port = Integer.parseInt(portHeader);
+		} catch (NumberFormatException e) {
 			port = request.getServerPort();
 		}
-		
+
 		// Build URL - always include port for backward compatibility
 		StringBuilder url = new StringBuilder();
 		url.append(scheme).append("://").append(host);
 		url.append(":").append(port);
 		url.append(request.getContextPath());
-		
+
 		return url.toString();
 	}
 }