Refactoring about logger

Signed-off-by: kaido207 <kaido.hiroki@fujitsu.com>
eclipse-ee4j · Oct 31, 2023 · bf93a6f · bf93a6f
1 parent b56e762
commit bf93a6f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 42 deletions.
diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/RestUtil.java
@@ -428,11 +428,9 @@ public static Map<String, Object> parseResponse(RestResponse response, HandlerCo
                             GuiUtil.handleError(handlerCtx, message);
                             if (!quiet) {
                                 Logger logger = GuiUtil.getLogger();
-                                logger.severe(
+                                logger.log(Level.SEVERE,
                                         neutralizeForLog(GuiUtil.getCommonMessage("LOG_REQUEST_RESULT", new Object[] { exitCode, endpoint, maskedAttr })));
-                                if (logger.isLoggable(Level.FINEST)) {
-                                    logger.finest("response.getResponseBody(): " + response.getResponseBody());
-                                }
+                                logger.log(Level.FINEST, "response.getResponseBody(): " + response.getResponseBody());
                             }
                             return new HashMap();
                         } else {
@@ -442,18 +440,16 @@ public static Map<String, Object> parseResponse(RestResponse response, HandlerCo
                     } else { // Issue Number :13312 handling the case when throwException is false.
                         if (!quiet) {
                             Logger logger = GuiUtil.getLogger();
-                            logger.severe(neutralizeForLog(GuiUtil.getCommonMessage("LOG_REQUEST_RESULT", new Object[] { exitCode, endpoint, maskedAttr })));
-                            if (logger.isLoggable(Level.FINEST)) {
-                                logger.finest("response.getResponseBody(): " + response.getResponseBody());
-                            }
+                            logger.log(Level.SEVERE, neutralizeForLog(GuiUtil.getCommonMessage("LOG_REQUEST_RESULT", new Object[] { exitCode, endpoint, maskedAttr })));
+                            logger.log(Level.FINEST, "response.getResponseBody(): " + response.getResponseBody());
                         }
                         return responseMap;
                     }
                 }
                 case WARNING: {
                     GuiUtil.prepareAlert("warning", GuiUtil.getCommonMessage("msg.command.warning"), message);
                     GuiUtil.getLogger()
-                            .warning(neutralizeForLog(GuiUtil.getCommonMessage("LOG_REQUEST_RESULT", new Object[] { exitCode, endpoint, maskedAttr })));
+                            .log(Level.WARNING, neutralizeForLog(GuiUtil.getCommonMessage("LOG_REQUEST_RESULT", new Object[] { exitCode, endpoint, maskedAttr })));
                     return responseMap;
                 }
                 case SUCCESS: {
@@ -463,10 +459,8 @@ public static Map<String, Object> parseResponse(RestResponse response, HandlerCo
             } catch (Exception ex) {
                 if (!quiet) {
                     Logger logger = GuiUtil.getLogger();
-                    logger.severe(neutralizeForLog(GuiUtil.getCommonMessage("LOG_REQUEST_RESULT", new Object[] { exitCode, endpoint, maskedAttr })));
-                    if (logger.isLoggable(Level.FINEST)) {
-                        logger.finest("response.getResponseBody(): " + response.getResponseBody());
-                    }
+                    logger.log(Level.SEVERE, neutralizeForLog(GuiUtil.getCommonMessage("LOG_REQUEST_RESULT", new Object[] { exitCode, endpoint, maskedAttr })));
+                    logger.log(Level.FINEST, "response.getResponseBody(): " + response.getResponseBody());
                 }
                 if (handlerCtx != null) {
                     // If this is called from the jsf as handler, we want to stop processing and show error
@@ -531,10 +525,8 @@ protected static MultivaluedMap buildMultivalueMap(Map<String, Object> payload)
                         formData.add(key, obj);
                     } catch (ClassCastException ex) {
                         Logger logger = GuiUtil.getLogger();
-                        if (logger.isLoggable(Level.FINEST)) {
-                            logger.log(Level.FINEST,
-                                    GuiUtil.getCommonMessage("LOG_BUILD_MULTI_VALUE_MAP_ERROR", new Object[] { key, obj }));
-                        }
+                        logger.log(Level.FINEST,
+                                GuiUtil.getCommonMessage("LOG_BUILD_MULTI_VALUE_MAP_ERROR", new Object[] { key, obj }));
 
                         // Allow it to continue b/c this property most likely
                         // should have been excluded for this request
@@ -546,10 +538,8 @@ protected static MultivaluedMap buildMultivalueMap(Map<String, Object> payload)
                     formData.putSingle(key, value);
                 } catch (ClassCastException ex) {
                     Logger logger = GuiUtil.getLogger();
-                    if (logger.isLoggable(Level.FINEST)) {
-                        logger.log(Level.FINEST,
-                                GuiUtil.getCommonMessage("LOG_BUILD_MULTI_VALUE_MAP_ERROR", new Object[] { key, value }));
-                    }
+                    logger.log(Level.FINEST,
+                            GuiUtil.getCommonMessage("LOG_BUILD_MULTI_VALUE_MAP_ERROR", new Object[] { key, value }));
                     // Allow it to continue b/c this property most likely
                     // should have been excluded for this request
                 }
@@ -932,7 +922,7 @@ public static ClientBuilder initialize(ClientBuilder clientBuilder) {
                     .register(CsrfProtectionFilter.class);
 
         } catch (Exception ex) {
-            GuiUtil.getLogger().warning("RestUtil.initialize() failed");
+            GuiUtil.getLogger().log(Level.WARNING, "RestUtil.initialize() failed");
             if (GuiUtil.getLogger().isLoggable(Level.FINE)) {
                 ex.printStackTrace();
             }

diff --git a/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/JMXUtil.java b/appserver/admingui/jms-plugin/src/main/java/org/glassfish/admingui/plugin/jms/JMXUtil.java
@@ -50,7 +50,7 @@ public static Object invoke(String objectName, String operationName, Object[] pa
         try {
             Object result = invoke(new ObjectName(objectName), operationName, params, signature);
             return result;
-        } catch (javax.management.MalformedObjectNameException ex) {
+        } catch (MalformedObjectNameException ex) {
             throw new RuntimeException(objectName + " is MalformedObjectName.", ex);
         }
     }
@@ -88,7 +88,7 @@ public static Object getAttribute(ObjectName objectName, String attributeName) {
     public static void setAttribute(String objectName, Attribute attributeName) {
         try {
             setAttribute(new ObjectName(objectName), attributeName);
-        } catch (javax.management.MalformedObjectNameException ex) {
+        } catch (MalformedObjectNameException ex) {
             throw new RuntimeException(objectName + " is MalformedObjectName.", ex);
         }
     }

diff --git a/...ngui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java b/...ngui/plugin-service/src/main/java/org/glassfish/admingui/plugin/ConsolePluginService.java
@@ -104,12 +104,10 @@ protected synchronized void init() {
                             ConsoleProvider.DEFAULT_CONFIG_FILENAME);
                 }
                 if (url == null) {
-                    if (logger.isLoggable(Level.INFO)) {
-                        logger.info("Unable to find "
-                                + ConsoleProvider.DEFAULT_CONFIG_FILENAME
-                                + " file for provider '"
-                                + provider.getClass().getName() + "'");
-                    }
+                    logger.log(Level.INFO, "Unable to find "
+                            + ConsoleProvider.DEFAULT_CONFIG_FILENAME
+                            + " file for provider '"
+                            + provider.getClass().getName() + "'");
                     continue;
                 }
 //System.out.println("Provider *"+provider+"* : url=*"+url+"*");
@@ -132,12 +130,8 @@ protected synchronized void init() {
 //System.out.println("IP Map: " + pointsByType.toString());
 
         // Log some trace messages
-        if (logger.isLoggable(Level.FINE)) {
-            logger.fine("Console Plugin Service has been Initialized!");
-            if (logger.isLoggable(Level.FINEST)) {
-                logger.finest(pointsByType.toString());
-            }
-        }
+        logger.log(Level.FINE, "Console Plugin Service has been Initialized!");
+        logger.log(Level.FINEST, pointsByType.toString());
     }
 
     /**
@@ -313,12 +307,10 @@ public Map<String, List<URL>> getResources(String name) {
                 try {
                     urls = loader.getResources(name);
                 } catch (IOException ex) {
-                    if (logger.isLoggable(Level.INFO)) {
-                        logger.log(Level.INFO, "Error getting resource '"
-                                + name + "' from provider: '"
-                                + provider.getClass().getName() + "'. Skipping...",
-                                ex);
-                    }
+                    logger.log(Level.INFO, "Error getting resource '"
+                            + name + "' from provider: '"
+                            + provider.getClass().getName() + "'. Skipping...",
+                            ex);
                     continue;
                 }
                 List<URL> providerURLs = new ArrayList<URL>();