From 005417081dfc1b2adbba03eeb74b8eb041af1690 Mon Sep 17 00:00:00 2001
From: rball11
Date: Mon, 4 May 2026 10:17:26 -0700
Subject: [PATCH] Update logger statement
[issue-471](https://github.com/Open-J-Proxy/ojp/issues/471)
---
.../grpc/client/HealthCheckConfig.java | 6 ++----
.../utils/PropertyPlaceholderResolver.java | 17 ++++++++---------
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/ojp-jdbc-driver/src/main/java/org/openjproxy/grpc/client/HealthCheckConfig.java b/ojp-jdbc-driver/src/main/java/org/openjproxy/grpc/client/HealthCheckConfig.java
index 34dfd3dc4..0c5989b65 100644
--- a/ojp-jdbc-driver/src/main/java/org/openjproxy/grpc/client/HealthCheckConfig.java
+++ b/ojp-jdbc-driver/src/main/java/org/openjproxy/grpc/client/HealthCheckConfig.java
@@ -1,7 +1,6 @@
package org.openjproxy.grpc.client;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
import java.util.Properties;
@@ -9,10 +8,9 @@
* Configuration for health check and connection redistribution in multinode deployments.
* Loads settings from ojp.properties.
*/
+@Slf4j
public class HealthCheckConfig {
- private static final Logger log = LoggerFactory.getLogger(HealthCheckConfig.class);
-
// Default values
private static final long DEFAULT_HEALTH_CHECK_INTERVAL_MS = 5000L; // 5 seconds
private static final long DEFAULT_HEALTH_CHECK_THRESHOLD_MS = 5000L; // 5 seconds
diff --git a/ojp-server/src/main/java/org/openjproxy/grpc/server/utils/PropertyPlaceholderResolver.java b/ojp-server/src/main/java/org/openjproxy/grpc/server/utils/PropertyPlaceholderResolver.java
index f39656462..5c2c1e7c2 100644
--- a/ojp-server/src/main/java/org/openjproxy/grpc/server/utils/PropertyPlaceholderResolver.java
+++ b/ojp-server/src/main/java/org/openjproxy/grpc/server/utils/PropertyPlaceholderResolver.java
@@ -1,7 +1,6 @@
package org.openjproxy.grpc.server.utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -31,8 +30,8 @@
*
*
*/
+@Slf4j
public class PropertyPlaceholderResolver {
- private static final Logger logger = LoggerFactory.getLogger(PropertyPlaceholderResolver.class);
// Pattern to match ${property.name} placeholders
private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("\\$\\{([^}]+)\\}");
@@ -90,7 +89,7 @@ public static String resolvePlaceholders(String input) {
"The suffix after the prefix must be 1-200 characters.",
placeholder
);
- logger.error(errorMsg);
+ log.error(errorMsg);
throw new SecurityException(errorMsg);
}
@@ -102,11 +101,11 @@ public static String resolvePlaceholders(String input) {
"Please set JVM property '-D%s=' or environment variable '%s'",
placeholder, placeholder, propertyNameToEnvVar(placeholder)
);
- logger.error(errorMsg);
+ log.error(errorMsg);
throw new IllegalArgumentException(errorMsg);
}
- logger.debug("Resolved placeholder ${{{}}}: {} characters", placeholder, value.length());
+ log.debug("Resolved placeholder ${{{}}}: {} characters", placeholder, value.length());
// Escape backslashes and dollar signs in the replacement string for regex
matcher.appendReplacement(result, Matcher.quoteReplacement(value));
}
@@ -162,7 +161,7 @@ private static String resolveProperty(String propertyName) {
// First check JVM system properties
String value = System.getProperty(propertyName);
if (value != null) {
- logger.debug("Resolved property '{}' from JVM system property", propertyName);
+ log.debug("Resolved property '{}' from JVM system property", propertyName);
return value;
}
@@ -170,11 +169,11 @@ private static String resolveProperty(String propertyName) {
String envKey = propertyNameToEnvVar(propertyName);
value = System.getenv(envKey);
if (value != null) {
- logger.debug("Resolved property '{}' from environment variable '{}'", propertyName, envKey);
+ log.debug("Resolved property '{}' from environment variable '{}'", propertyName, envKey);
return value;
}
- logger.debug("Property '{}' not found in system properties or environment variables", propertyName);
+ log.debug("Property '{}' not found in system properties or environment variables", propertyName);
return null;
}