From fcb216b869058fbc58956b837b495a8f3749b16f Mon Sep 17 00:00:00 2001 From: NotedSalmon Date: Thu, 8 Aug 2024 14:29:40 +0100 Subject: [PATCH 1/7] FISH-9175 MetricsServiceImpl string concatenation fix --- .../microprofile/metrics/impl/MetricsServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appserver/payara-appserver-modules/microprofile/metrics/src/main/java/fish/payara/microprofile/metrics/impl/MetricsServiceImpl.java b/appserver/payara-appserver-modules/microprofile/metrics/src/main/java/fish/payara/microprofile/metrics/impl/MetricsServiceImpl.java index bfca197d204..bfa17f40dea 100644 --- a/appserver/payara-appserver-modules/microprofile/metrics/src/main/java/fish/payara/microprofile/metrics/impl/MetricsServiceImpl.java +++ b/appserver/payara-appserver-modules/microprofile/metrics/src/main/java/fish/payara/microprofile/metrics/impl/MetricsServiceImpl.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) [2018-2023] Payara Foundation and/or its affiliates. All rights reserved. + * Copyright (c) [2018-2024] Payara Foundation and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -366,10 +366,11 @@ private static String toName(MetricID metric, String suffix) { } if (name.indexOf('.') > 0) { String[] words = name.split("\\."); - name = ""; + StringBuilder nameBuilder = new StringBuilder(); for (String word : words) { - name += toFirstLetterUpperCase(word); + nameBuilder.append(toFirstLetterUpperCase(word)); } + name += nameBuilder.toString(); } } name = toFirstLetterUpperCase(name); From 4890779f94c1afc4fea35750406f9616f347f66a Mon Sep 17 00:00:00 2001 From: NotedSalmon Date: Thu, 8 Aug 2024 14:30:21 +0100 Subject: [PATCH 2/7] FISH-9175 GlassFishORBManager string concatenation fix --- .../enterprise/iiop/impl/GlassFishORBManager.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java index d07f8fccf25..c72703d6b5c 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java @@ -37,7 +37,7 @@ * only if the new code is made subject to such option by the copyright * holder. */ -// Portions Copyright [2016-2022] [Payara Foundation and/or its affiliates] +// Portions Copyright [2016-2024] [Payara Foundation and/or its affiliates] package org.glassfish.enterprise.iiop.impl; @@ -952,19 +952,18 @@ private String[] getORBInitRef(String endpoints) { private String getCorbalocURL(Object[] list) { - String corbalocURL = ""; + StringBuilder corbalocURL = new StringBuilder(); //convert list into corbaloc url for (int i = 0; i < list.length; i++) { logger.log(Level.INFO, "list[i] ==> {0}", list[i]); - if (corbalocURL.equals("")) { - corbalocURL = IIOP_URL + ((String) list[i]).trim(); + if (corbalocURL.toString().equals("")) { + corbalocURL.append(IIOP_URL).append(((String) list[i]).trim()); } else { - corbalocURL = corbalocURL + "," + - IIOP_URL + ((String) list[i]).trim(); + corbalocURL.append(",").append(IIOP_URL).append(((String) list[i]).trim()); } } - logger.log(Level.INFO, "corbaloc url ==> {0}", corbalocURL); - return corbalocURL; + logger.log(Level.INFO, "corbaloc url ==> {0}", corbalocURL.toString()); + return corbalocURL.toString(); } String getIIOPEndpoints() { From a02f8e560dced438e10390e05c57dddf21f69a78 Mon Sep 17 00:00:00 2001 From: NotedSalmon Date: Thu, 8 Aug 2024 14:30:53 +0100 Subject: [PATCH 3/7] FISH-9175 SendAsadminCommand string concatenation fix --- .../micro/services/asadmin/SendAsadminCommand.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java b/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java index 81f5895cc68..484839ada67 100644 --- a/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java +++ b/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) [2016-2021] Payara Foundation and/or its affiliates. All rights reserved. + * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development @@ -202,21 +202,21 @@ public void execute(AdminCommandContext context) // Skip if neither verbose or logOutput were selected if (verbose || logOutput) { - String output = ""; + StringBuilder output = new StringBuilder(); // Combine the success messages into one String for (String successMessage : successMessages) { - output += "\n" + successMessage; + output.append("\n").append(successMessage); } // Only print out the messages if verbose was chosen if (verbose) { - actionReport.setMessage(output); + actionReport.setMessage(output.toString()); } // Only log the messages if logOutput was chosen if (logOutput) { - Logger.getLogger(SendAsadminCommand.class.getName()).log(Level.INFO, output); + Logger.getLogger(SendAsadminCommand.class.getName()).log(Level.INFO, output.toString()); } } From c0f80dec1b2cdc3446ad0dbc7454fe1ee813abfd Mon Sep 17 00:00:00 2001 From: NotedSalmon Date: Fri, 9 Aug 2024 11:47:20 +0100 Subject: [PATCH 4/7] FISH-9175 Changes to GlassFishORBManager implementing changes suggested. --- .../enterprise/iiop/impl/GlassFishORBManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java index c72703d6b5c..c98bd8248c3 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java @@ -956,14 +956,15 @@ private String getCorbalocURL(Object[] list) { //convert list into corbaloc url for (int i = 0; i < list.length; i++) { logger.log(Level.INFO, "list[i] ==> {0}", list[i]); - if (corbalocURL.toString().equals("")) { + if (corbalocURL.length()==0) { corbalocURL.append(IIOP_URL).append(((String) list[i]).trim()); } else { corbalocURL.append(",").append(IIOP_URL).append(((String) list[i]).trim()); } } - logger.log(Level.INFO, "corbaloc url ==> {0}", corbalocURL.toString()); - return corbalocURL.toString(); + String corbalocURLString = corbalocURL.toString(); + logger.log(Level.INFO, "corbaloc url ==> {0}", corbalocURLString); + return corbalocURLString; } String getIIOPEndpoints() { From ec037116aed9cb1c88d426b9abde7eab1a9ade08 Mon Sep 17 00:00:00 2001 From: NotedSalmon Date: Fri, 9 Aug 2024 11:51:03 +0100 Subject: [PATCH 5/7] FISH-9175 Changes to SendAsadminCommand, added supplier for Output stringBuilder. --- .../micro/services/asadmin/SendAsadminCommand.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java b/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java index 484839ada67..3c360fc8b13 100644 --- a/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java +++ b/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java @@ -208,15 +208,17 @@ public void execute(AdminCommandContext context) for (String successMessage : successMessages) { output.append("\n").append(successMessage); } + + String outputString = output.toString(); // Only print out the messages if verbose was chosen if (verbose) { - actionReport.setMessage(output.toString()); + actionReport.setMessage(outputString); } // Only log the messages if logOutput was chosen if (logOutput) { - Logger.getLogger(SendAsadminCommand.class.getName()).log(Level.INFO, output.toString()); + Logger.getLogger(SendAsadminCommand.class.getName()).log(Level.INFO, outputString); } } From 9f2167e713916fb15e67bd1fbc17303204554ffa Mon Sep 17 00:00:00 2001 From: NotedSalmon Date: Fri, 9 Aug 2024 12:26:37 +0100 Subject: [PATCH 6/7] FISH-9175 Changes to SendAsadminCommand, added supplier for logger --- .../micro/services/asadmin/SendAsadminCommand.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java b/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java index 484839ada67..f5a863ce92f 100644 --- a/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java +++ b/appserver/payara-appserver-modules/payara-micro-service/src/main/java/fish/payara/appserver/micro/services/asadmin/SendAsadminCommand.java @@ -208,15 +208,17 @@ public void execute(AdminCommandContext context) for (String successMessage : successMessages) { output.append("\n").append(successMessage); } + + String outputString = output.toString(); // Only print out the messages if verbose was chosen if (verbose) { - actionReport.setMessage(output.toString()); + actionReport.setMessage(outputString); } // Only log the messages if logOutput was chosen if (logOutput) { - Logger.getLogger(SendAsadminCommand.class.getName()).log(Level.INFO, output.toString()); + Logger.getLogger(SendAsadminCommand.class.getName()).info(()->outputString); } } From f74d01997e5f793d633074fac7b1d2e5079995bb Mon Sep 17 00:00:00 2001 From: NotedSalmon Date: Fri, 9 Aug 2024 14:53:25 +0100 Subject: [PATCH 7/7] FISH-9175 Changes to GlassFishORBManager, added supplier for corbalocURL --- .../org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java index c98bd8248c3..68b3580d80e 100644 --- a/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java +++ b/appserver/orb/orb-iiop/src/main/java/org/glassfish/enterprise/iiop/impl/GlassFishORBManager.java @@ -963,7 +963,7 @@ private String getCorbalocURL(Object[] list) { } } String corbalocURLString = corbalocURL.toString(); - logger.log(Level.INFO, "corbaloc url ==> {0}", corbalocURLString); + logger.info(() -> "corbaloc url ==> " + corbalocURLString); return corbalocURLString; }