Merge pull request #24870 from escay/issue_24868b

Fixes issue 24868 Clean code: fix unlikely argument and remove some unused variables.
eclipse-ee4j · Mar 26, 2024 · 0fce188 · 0fce188
2 parents 2f9e0f8 + bbd6bf7
commit 0fce188
Show file tree

Hide file tree

Showing 132 changed files with 254 additions and 546 deletions.
diff --git a/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java b/appserver/admin/admin-core/src/main/java/com/sun/enterprise/admin/UpgradeService.java
@@ -61,7 +61,6 @@ public class UpgradeService implements ConfigurationUpgrade, PostConstruct {
 
     private final static Logger logger = Logger.getAnonymousLogger();
 
-    private static final String MODULE_TYPE = "moduleType";
     private static final String APPCLIENT_SNIFFER_NAME = "appclient";
     private static final String V3_0_1_JAVA_WEB_START_ENABLED_PROPERTY_NAME = "javaWebStartEnabled";
     private static final String GF3_1_JAVA_WEB_START_ENABLED_PROPERTY_NAME = "java-web-start-enabled";

diff --git a/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRestoreManager.java b/appserver/admin/backup/src/main/java/com/sun/enterprise/backup/BackupRestoreManager.java
@@ -75,7 +75,6 @@ void init() throws BackupException {
      * backupDir is set then it returns a path to backupDir + domainName.
      */
     protected File getBackupDirectory(BackupRequest request) {
-        File backupDir = null;
 
         // The v2 case.
         if (request.backupDir == null && request.backupConfig == null) {

diff --git a/...er/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java b/...er/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java
@@ -99,7 +99,6 @@ public static GadgetModule getGadgetModule(URL url) {
 // FIXME: Cache?
         // Get our parser...
         ConfigParser parser = new ConfigParser(GuiUtil.getHabitat());
-        String id = null;
 
         // Read the document...
         DomDocument doc = parser.parse(url);

diff --git a/.../admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java b/.../admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java
@@ -78,7 +78,6 @@ public static void getClusterStatusSummary(HandlerContext handlerCtx) {
         int running=0;
         int notRunning=0;
         int requireRestart=0;
-        int unknown = 0;
         try{
             for (Iterator it=statusMap.values().iterator(); it.hasNext(); ) {
                 Object value = it.next();
@@ -91,7 +90,6 @@ public static void getClusterStatusSummary(HandlerContext handlerCtx) {
                 if (value.toString().equals(InstanceState.StateType.RESTART_REQUIRED.getDescription())){
                     requireRestart++;
                 }else {
-                    unknown++;
                     GuiUtil.getLogger().severe("Unknown Status");
                 }
             }

diff --git a/.../admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java b/.../admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java
@@ -221,7 +221,6 @@ public static void getListElement(HandlerContext handlerCtx) {
     public static void removeListElement(HandlerContext handlerCtx) {
         List<String> list = (List) handlerCtx.getInputValue("list");
         String name = (String) handlerCtx.getInputValue("name");
-        String[] listItem = null;
         if (list != null) {
             list.remove(name);
         }

diff --git a/...er/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/...er/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java
@@ -1056,8 +1056,6 @@ public static void createPropertyString(HandlerContext handlerCtx) {
 
     /* This is copied from within javaToJSON() */
     public static String escapePropertyValue(String str){
-        String chStr;
-        int len;
         StringCharacterIterator it = new StringCharacterIterator(str);
         char ch = it.first();
         StringBuilder builder =  new StringBuilder(str.length() << 2);

diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/JSONUtil.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/util/JSONUtil.java
@@ -573,7 +573,6 @@ private static Object readConstant(JsonChars json, String constant) {
         byte[] good = constant.getBytes();
         int len = good.length;
         char ch;
-        boolean match = true;
         for (int idx=1; idx<len; idx++) {
             ch = json.next();
             if (ch != good[idx]) {

diff --git a/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java b/appserver/admingui/core/src/main/java/org/glassfish/admingui/handlers/WoodstockHandler.java
@@ -443,7 +443,6 @@ public void populateApplicationsMonitorDropDown(HandlerContext handlerCtx) {
         String monitorURL = (String) handlerCtx.getInputValue("monitorURL");
         ArrayList menuList = new ArrayList();
         String firstItem = null;
-        String title = null;
         if (aList != null) {
             ListIterator al = aList.listIterator();
             while (al.hasNext()) {

diff --git a/...ient/acc-config/src/test/java/org/glassfish/appclient/client/acc/config/util/XMLTest.java b/...ient/acc-config/src/test/java/org/glassfish/appclient/client/acc/config/util/XMLTest.java
@@ -137,7 +137,6 @@ private enum ACC_INFO {
             }
         }
 
-        private static final String SYSTEM_ID_PREFIX = "http://glassfish.org/";
         private static final String LOCAL_PATH_PREFIX = "/glassfish/lib/";
 
         private static final Map<String, String> publicIdToLocalPathMap = initPublicIdToLocalPathMap();

diff --git a/...pclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java b/...pclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java
@@ -122,15 +122,14 @@ public boolean exists() {
         if (exists != null) {
             return exists.booleanValue();
         }
-        InputStream is = null;
+
         exists = Boolean.FALSE;
-        try {
-            is = archiveURL.openStream();
+        try (InputStream is = archiveURL.openStream()) {
             exists = Boolean.TRUE;
-            is.close();
-        } finally {
-            return exists.booleanValue();
+        } catch (IOException e) {
+            // Ignore, exists is false.
         }
+        return exists.booleanValue();
     }
 
     @Override

diff --git a/...ient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java b/...ient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java
@@ -36,14 +36,12 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.jar.Attributes;
-import java.util.logging.Logger;
 
 import org.glassfish.api.admin.ServerEnvironment;
 import org.glassfish.api.deployment.DeploymentContext;
 import org.glassfish.api.deployment.MetaData;
 import org.glassfish.api.deployment.UndeployCommandParameters;
 import org.glassfish.appclient.server.core.jws.JWSAdapterManager;
-import org.glassfish.appclient.server.core.jws.JavaWebStartInfo;
 import org.glassfish.appclient.server.core.jws.servedcontent.ASJarSigner;
 import org.glassfish.deployment.common.Artifacts;
 import org.glassfish.deployment.common.DeploymentException;
@@ -120,8 +118,6 @@ public class AppClientDeployer
         extends JavaEEDeployer<AppClientContainerStarter, AppClientServerApplication>
         implements PostConstruct {
 
-    private Logger logger;
-
     public static final String APPCLIENT_FACADE_CLASS_FILE =
             "org/glassfish/appclient/client/AppClientFacade.class";
     public static final String APPCLIENT_AGENT_MAIN_CLASS_FILE =
@@ -186,8 +182,6 @@ public AppClientDeployer() {
 
     @Override
     public void postConstruct() {
-        logger = Logger.getLogger(JavaWebStartInfo.APPCLIENT_SERVER_MAIN_LOGGER,
-                JavaWebStartInfo.APPCLIENT_SERVER_LOGMESSAGE_RESOURCE);
         for (HK2Module module : modulesRegistry.getModules(GF_CLIENT_MODULE_NAME)) {
             gfClientModuleClassLoader = module.getClassLoader();
         }

diff --git a/...rver/core/src/main/java/org/glassfish/appclient/server/core/jws/AppClientHTTPAdapter.java b/...rver/core/src/main/java/org/glassfish/appclient/server/core/jws/AppClientHTTPAdapter.java
@@ -55,8 +55,6 @@ public class AppClientHTTPAdapter extends RestrictedContentAdapter {
     public final static String GF_JWS_SESSION_CACHED_JNLP_NAME = "org.glassfish.jws.mainJNLP";
     public final static String GF_JWS_SESSION_IS_MAIN_PROCESSED_NAME = "org.glassfish.jws.isMainProcessed";
 
-    private final static String IF_UNMODIFIED_SINCE = "If-Unmodified-Since";
-
     private static final String ARG_QUERY_PARAM_NAME = "arg";
     private static final String PROP_QUERY_PARAM_NAME = "prop";
     private static final String VMARG_QUERY_PARAM_NAME = "vmarg";

diff --git a/...t/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java b/...t/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java
@@ -81,8 +81,6 @@
 @PerLookup
 public class JavaWebStartInfo implements ConfigListener {
 
-    private final static String GLASSFISH_DIRECTORY_PREFIX = "glassfish/";
-
     @Inject
     private JWSAdapterManager jwsAdapterManager;
 
@@ -190,7 +188,6 @@ public class JavaWebStartInfo implements ConfigListener {
 
     private String developerJNLPDoc;
 
-    private static LocalStringsImpl localStrings = new LocalStringsImpl(JavaWebStartInfo.class);
     private static LocalStringsImpl servedContentLocalStrings =
             new LocalStringsImpl(TokenHelper.class);
 

diff --git a/...ssfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java b/...ssfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java
@@ -90,8 +90,6 @@ public class BatchRuntimeHelper
 
     private AtomicBoolean initialized = new AtomicBoolean(false);
 
-    private static final String CREATE_TABLE_DDL_NAME = "/jsr352-";
-
     public void checkAndInitializeBatchRuntime() {
         if (!initialized.get()) {
             synchronized (this) {

diff --git a/...kartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java b/...kartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java
@@ -135,7 +135,7 @@ public <T extends ConfigBeanProxy> NotProcessed changed(TYPE type, Class<T> chan
                         final DASJ2EEServerImpl impl = new DASJ2EEServerImpl(getJ2EEDomain(), meta);
                         ObjectName serverObjectName = new ObjectNameBuilder(mMBeanServer, getJ2EEDomain()).buildChildObjectName(J2EETypes.J2EE_SERVER, serverName);
                         try {
-                            ObjectName instance = mMBeanServer.registerMBean(impl, serverObjectName).getObjectName();
+                            mMBeanServer.registerMBean(impl, serverObjectName).getObjectName();
                         }
                         catch (JMException e) {
                             throw new Error(e);

diff --git a/...ain/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java b/...ain/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java
@@ -335,7 +335,7 @@ public void unloadManagedBeans(Application app) {
                             + " with jndi name " + jndiName, ne);
                     }
                 } else {
-                    appClientManagedBeans.remove(jndiName);
+                    appClientManagedBeans.remove(jndiName.toString());
                 }
 
                 managedBeanDescriptor.clearAllBeanInstanceInfo();

diff --git a/...nnectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java b/...nnectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java
@@ -16,7 +16,6 @@
 
 package org.glassfish.connectors.admin.cli;
 
-import com.sun.enterprise.util.LocalStringManagerImpl;
 import org.glassfish.api.I18n;
 import org.glassfish.connectors.config.ConnectorConnectionPool;
 import org.glassfish.connectors.config.SecurityMap;
@@ -33,8 +32,6 @@
 @I18n("create.connector.security.map")
 public class ConnectorSecurityMap {
 
-    final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(ConnectorSecurityMap.class);
-
     boolean doesPoolNameExist(String poolName, Collection<ConnectorConnectionPool> ccPools) {
         //check if the poolname exists.If it does not then throw an exception.
         boolean doesPoolExist = false;

diff --git a/.../src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java b/.../src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java
@@ -17,21 +17,13 @@
 
 package com.sun.enterprise.resource.deployer;
 
-import com.sun.appserv.connectors.internal.api.ConnectorConstants;
-import com.sun.enterprise.config.serverbeans.Resource;
-import com.sun.enterprise.config.serverbeans.Resources;
-import com.sun.enterprise.deployment.JMSDestinationDefinitionDescriptor;
-import com.sun.logging.LogDomains;
-
-import jakarta.inject.Inject;
-import jakarta.inject.Provider;
+import static com.sun.appserv.connectors.internal.api.ConnectorsUtil.deriveResourceName;
 
 import java.beans.PropertyVetoException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Properties;
-import java.util.logging.Logger;
 
 import org.glassfish.api.naming.SimpleJndiName;
 import org.glassfish.connectors.config.AdminObjectResource;
@@ -43,7 +35,13 @@
 import org.jvnet.hk2.config.TransactionFailure;
 import org.jvnet.hk2.config.types.Property;
 
-import static com.sun.appserv.connectors.internal.api.ConnectorsUtil.deriveResourceName;
+import com.sun.appserv.connectors.internal.api.ConnectorConstants;
+import com.sun.enterprise.config.serverbeans.Resource;
+import com.sun.enterprise.config.serverbeans.Resources;
+import com.sun.enterprise.deployment.JMSDestinationDefinitionDescriptor;
+
+import jakarta.inject.Inject;
+import jakarta.inject.Provider;
 
 @Service
 @ResourceDeployerInfo(JMSDestinationDefinitionDescriptor.class)
@@ -52,7 +50,6 @@ public class JMSDestinationDefinitionDeployer implements ResourceDeployer<JMSDes
     @Inject
     private Provider<org.glassfish.resourcebase.resources.util.ResourceManagerFactory> resourceManagerFactoryProvider;
 
-    private static final Logger LOG = LogDomains.getLogger(JMSDestinationDefinitionDeployer.class, LogDomains.RSR_LOGGER);
     static final String PROPERTY_PREFIX = "org.glassfish.jms-destination.";
 
     @Override

diff --git a/...ectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java b/...ectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java
@@ -17,11 +17,6 @@
 
 package com.sun.enterprise.resource.pool;
 
-import com.sun.enterprise.connectors.ConnectorRuntime;
-import com.sun.enterprise.resource.ResourceHandle;
-import com.sun.enterprise.util.i18n.StringManager;
-import com.sun.logging.LogDomains;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -32,6 +27,10 @@
 
 import org.glassfish.resourcebase.resources.api.PoolInfo;
 
+import com.sun.enterprise.connectors.ConnectorRuntime;
+import com.sun.enterprise.resource.ResourceHandle;
+import com.sun.logging.LogDomains;
+
 /**
  * Connection leak detector, book keeps the caller stack-trace during getConnection()<br>
  * Once the leak-timeout expires, assumes a connection leak and prints the caller stack-trace<br>
@@ -52,7 +51,6 @@ public class ConnectionLeakDetector {
     private final Object connectionLeakLock;
 
     private final static Logger _logger = LogDomains.getLogger(ConnectionLeakDetector.class, LogDomains.RSR_LOGGER);
-    private final static StringManager localStrings = StringManager.getManager(ConnectionPool.class);
 
     public ConnectionLeakDetector(PoolInfo poolInfo, boolean leakTracing, long leakTimeoutInMillis, boolean leakReclaim) {
         connectionPoolInfo = poolInfo;

diff --git a/...rs/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java b/...rs/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java
@@ -17,6 +17,27 @@
 
 package com.sun.enterprise.resource.pool;
 
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Level.WARNING;
+import static javax.transaction.xa.XAResource.TMSUCCESS;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.glassfish.api.invocation.ComponentInvocation;
+import org.glassfish.api.invocation.ComponentInvocationHandler;
+import org.glassfish.api.invocation.InvocationException;
+import org.glassfish.api.naming.SimpleJndiName;
+import org.glassfish.resourcebase.resources.api.PoolInfo;
+import org.jvnet.hk2.annotations.Service;
+
 import com.sun.appserv.connectors.internal.api.ConnectorConstants.PoolType;
 import com.sun.appserv.connectors.internal.api.ConnectorRuntime;
 import com.sun.appserv.connectors.internal.api.PoolingException;
@@ -36,7 +57,6 @@
 import com.sun.enterprise.resource.rm.SystemResourceManagerImpl;
 import com.sun.enterprise.transaction.api.JavaEETransaction;
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
-import com.sun.enterprise.util.i18n.StringManager;
 import com.sun.logging.LogDomains;
 
 import jakarta.inject.Inject;
@@ -49,35 +69,13 @@
 import jakarta.transaction.Synchronization;
 import jakarta.transaction.Transaction;
 
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.glassfish.api.invocation.ComponentInvocation;
-import org.glassfish.api.invocation.ComponentInvocationHandler;
-import org.glassfish.api.invocation.InvocationException;
-import org.glassfish.api.naming.SimpleJndiName;
-import org.glassfish.resourcebase.resources.api.PoolInfo;
-import org.jvnet.hk2.annotations.Service;
-
-import static java.util.logging.Level.FINE;
-import static java.util.logging.Level.INFO;
-import static java.util.logging.Level.SEVERE;
-import static java.util.logging.Level.WARNING;
-import static javax.transaction.xa.XAResource.TMSUCCESS;
-
 /**
  * @author Tony Ng, Aditya Gore
  */
 @Service
 public class PoolManagerImpl extends AbstractPoolManager implements ComponentInvocationHandler {
 
     private static final Logger LOG = LogDomains.getLogger(PoolManagerImpl.class, LogDomains.RSR_LOGGER);
-    private static final StringManager MESSAGES = StringManager.getManager(PoolManagerImpl.class);
 
     private final ConcurrentHashMap<PoolInfo, ResourcePool> poolTable;
     private final ResourceManager resourceManager;

diff --git a/...erprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionListHandler.java b/...erprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionListHandler.java
@@ -21,7 +21,6 @@
 import jakarta.enterprise.concurrent.ManagedScheduledExecutorDefinition;
 import jakarta.inject.Inject;
 
-import java.lang.System.Logger;
 import java.util.Set;
 
 import org.glassfish.apf.AnnotationHandlerFor;
@@ -33,7 +32,6 @@
 @Service
 @AnnotationHandlerFor(ManagedScheduledExecutorDefinition.List.class)
 public class ManagedScheduledExecutorDefinitionListHandler extends AbstractResourceHandler {
-    private static final Logger LOG = System.getLogger(ManagedScheduledExecutorDefinitionListHandler.class.getName());
 
     @Inject
     private ManagedScheduledExecutorDefinitionConverter converter;

diff --git a/...r/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java b/...r/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java
@@ -43,7 +43,6 @@
 public abstract class AbstractBundleNode<T extends RootDeploymentDescriptor>
         extends DisplayableComponentNode<T> implements BundleNode, RootXMLNode<T> {
 
-    private static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
     protected static final String W3C_XML_SCHEMA_INSTANCE = "http://www.w3.org/2001/XMLSchema-instance";
     protected static final String SCHEMA_LOCATION_TAG = "xsi:schemaLocation";
 

diff --git a/...artaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java b/...artaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java
@@ -19,7 +19,6 @@
 import org.glassfish.api.Param;
 import org.glassfish.internal.data.ApplicationInfo;
 import org.glassfish.internal.data.ApplicationRegistry;
-import com.sun.enterprise.util.LocalStringManagerImpl;
 import com.sun.enterprise.deployment.Application;
 import com.sun.enterprise.deployment.BundleDescriptor;
 import org.glassfish.deployment.common.DeploymentProperties;
@@ -50,8 +49,6 @@
 })
 public class GetContextRootCommand implements AdminCommand {
 
-    final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(GetContextRootCommand.class);
-
     @Param(primary=true)
     private String modulename = null;