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 index 0a9c9fb85c5..17d3f421e5b 100644 --- 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 index 28658134023..1a4f56b8d29 100644 --- 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/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java index 643a1070f68..e5cb0663e6f 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/gadget/GadgetHandlers.java +++ b/appserver/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/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java index 1d3d4ecf851..c6402789e29 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/ClusterHandler.java +++ b/appserver/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/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java index 5fcefead45e..a5488af3845 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/CommonHandlers.java +++ b/appserver/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 list = (List) handlerCtx.getInputValue("list"); String name = (String) handlerCtx.getInputValue("name"); - String[] listItem = null; if (list != null) { list.remove(name); } diff --git a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java b/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java index 058ee3aa163..ba8ae8ee2e1 100644 --- a/appserver/admingui/common/src/main/java/org/glassfish/admingui/common/handlers/UtilHandlers.java +++ b/appserver/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 index 9ac7c9daaa6..b9d0e2d5bb3 100644 --- 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 publicIdToLocalPathMap = initPublicIdToLocalPathMap(); diff --git a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java b/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java index 4640a53a945..ac54eb838e2 100644 --- a/appserver/appclient/client/acc/src/main/java/org/glassfish/appclient/client/acc/HTTPInputArchive.java +++ b/appserver/appclient/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/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java index 432f6e1195e..65dd8beaf3a 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/AppClientDeployer.java +++ b/appserver/appclient/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 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/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/AppClientHTTPAdapter.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/AppClientHTTPAdapter.java index 62ed1411358..8a8a1d97eb8 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/AppClientHTTPAdapter.java +++ b/appserver/appclient/server/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/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java b/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java index 992e69dc11d..8d233b5bccb 100644 --- a/appserver/appclient/server/core/src/main/java/org/glassfish/appclient/server/core/jws/JavaWebStartInfo.java +++ b/appserver/appclient/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/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java b/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java index 61da406e55e..582c8f1b247 100644 --- a/appserver/batch/glassfish-batch-connector/src/main/java/org/glassfish/batch/spi/impl/BatchRuntimeHelper.java +++ b/appserver/batch/glassfish-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/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java index 9ba0bdb4742..f9bcb64f6fc 100644 --- a/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java +++ b/appserver/common/amx-jakartaee/src/main/java/org/glassfish/admin/amx/impl/j2ee/loader/AMXJ2EEStartupService.java @@ -135,7 +135,7 @@ public NotProcessed changed(TYPE type, Class 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/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java b/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java index cbe496c68f1..e2f746aa289 100644 --- a/appserver/common/container-common/src/main/java/com/sun/enterprise/container/common/impl/managedbean/ManagedBeanManagerImpl.java +++ b/appserver/common/container-common/src/main/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/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java b/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java index 209ce0f7418..904115dd6fd 100644 --- a/appserver/connectors/admin/src/main/java/org/glassfish/connectors/admin/cli/ConnectorSecurityMap.java +++ b/appserver/connectors/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 ccPools) { //check if the poolname exists.If it does not then throw an exception. boolean doesPoolExist = false; diff --git a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java index 9884da3cb9a..0b6dd398db0 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/deployer/JMSDestinationDefinitionDeployer.java +++ b/appserver/connectors/connectors-runtime/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 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/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java index 8d4fe4463c2..6cec3cb203b 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/ConnectionLeakDetector.java +++ b/appserver/connectors/connectors-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()
* Once the leak-timeout expires, assumes a connection leak and prints the caller stack-trace
@@ -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/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java b/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java index 557e5909822..7a926156e2c 100644 --- a/appserver/connectors/connectors-runtime/src/main/java/com/sun/enterprise/resource/pool/PoolManagerImpl.java +++ b/appserver/connectors/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,27 +69,6 @@ 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 */ @@ -77,7 +76,6 @@ 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 poolTable; private final ResourceManager resourceManager; diff --git a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionListHandler.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionListHandler.java index 8d3ca510b63..79e4263efcc 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/annotation/handlers/ManagedScheduledExecutorDefinitionListHandler.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/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/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java index 1e624ac9ea4..46795e3d234 100644 --- a/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java +++ b/appserver/deployment/dol/src/main/java/com/sun/enterprise/deployment/node/AbstractBundleNode.java @@ -43,7 +43,6 @@ public abstract class AbstractBundleNode extends DisplayableComponentNode implements BundleNode, RootXMLNode { - 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/appserver/deployment/jakartaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java b/appserver/deployment/jakartaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java index b0bae4f655b..ac49bba18d2 100644 --- a/appserver/deployment/jakartaee-core/src/main/java/org/glassfish/javaee/core/deployment/GetContextRootCommand.java +++ b/appserver/deployment/jakartaee-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; diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalObjectImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalObjectImpl.java index 4a2bb16c211..84754d3c5e9 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalObjectImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBLocalObjectImpl.java @@ -17,18 +17,19 @@ package com.sun.ejb.containers; +import java.io.IOException; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.rmi.RemoteException; +import java.util.HashMap; + import com.sun.enterprise.container.common.spi.util.IndirectlySerializable; import com.sun.enterprise.container.common.spi.util.SerializableObjectFactory; + import jakarta.ejb.EJBException; import jakarta.ejb.EJBLocalHome; import jakarta.ejb.EJBLocalObject; import jakarta.ejb.RemoveException; -import java.io.IOException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.rmi.RemoteException; -import java.util.HashMap; -import java.util.logging.Logger; /** * Implementation of the EJBLocalObject interface. @@ -42,7 +43,6 @@ public abstract class EJBLocalObjectImpl extends EJBLocalRemoteObject implements EJBLocalObject, IndirectlySerializable { - private static final Logger _logger = EjbContainerUtilImpl.getLogger(); private static final Method REMOVE_METHOD = getRemoveMethod(); private static Method getRemoveMethod() { diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java index ae99daa8d9c..922a3c6e8a7 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/EJBObjectImpl.java @@ -16,18 +16,18 @@ package com.sun.ejb.containers; -import java.rmi.RemoteException; import java.lang.reflect.Method; - -import jakarta.ejb.*; -import com.sun.ejb.portable.*; - -import com.sun.enterprise.util.LocalStringManagerImpl; - -import java.util.Map; +import java.rmi.RemoteException; import java.util.HashMap; +import java.util.Map; +import java.util.logging.Level; + +import com.sun.ejb.portable.HandleImpl; -import java.util.logging.*; +import jakarta.ejb.EJBHome; +import jakarta.ejb.EJBObject; +import jakarta.ejb.Handle; +import jakarta.ejb.RemoveException; /** * EJBObjectImpl implements EJBObject methods for EJBs. @@ -44,8 +44,6 @@ public abstract class EJBObjectImpl implements EJBObject { private static Class[] NO_PARAMS = new Class[] {}; - private static LocalStringManagerImpl localStrings = - new LocalStringManagerImpl(EJBObjectImpl.class); private static Method REMOVE_METHOD = null; static { diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java index 497bdf14adc..a1302bfffc8 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/StatefulSessionContainer.java @@ -3134,8 +3134,6 @@ static class EEMRefInfo implements IndirectlySerializable, SerializableObjectFac private transient EntityManagerFactory emf; - private int hc; - EEMRefInfo(String emRefName, String uName, SynchronizationType synchronizationType, long containerID, Object instanceKey, EntityManager eem, EntityManagerFactory emf) { this.eemRefInfoKey = new EEMRefInfoKey(emRefName, containerID, instanceKey); diff --git a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorManager.java b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorManager.java index 6f1e2ad7468..92fc1c62de4 100644 --- a/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorManager.java +++ b/appserver/ejb/ejb-container/src/main/java/com/sun/ejb/containers/interceptors/InterceptorManager.java @@ -785,7 +785,6 @@ public String toString() { } class BeanAroundInvokeInterceptor extends AroundInvokeInterceptor { - private static final Object[] NULL_ARGS = null; BeanAroundInvokeInterceptor(Method method) { super(-1, method); diff --git a/appserver/extras/embedded/common/bootstrap/src/main/java/org/glassfish/uberjar/bootstrap/Util.java b/appserver/extras/embedded/common/bootstrap/src/main/java/org/glassfish/uberjar/bootstrap/Util.java index c3d05b930d9..28be6662647 100644 --- a/appserver/extras/embedded/common/bootstrap/src/main/java/org/glassfish/uberjar/bootstrap/Util.java +++ b/appserver/extras/embedded/common/bootstrap/src/main/java/org/glassfish/uberjar/bootstrap/Util.java @@ -96,9 +96,8 @@ public static boolean isUber(URI uri) { private static final String JARENTRY_PREFIX = "!/"; public static List getModuleJarURLs(File modulesJarFile) { - List moduleJarURLs = new ArrayList(); - try { - JarFile modulesJar = new JarFile(modulesJarFile); + List moduleJarURLs = new ArrayList<>(); + try (JarFile modulesJar = new JarFile(modulesJarFile)) { Enumeration entries = modulesJar.entries(); while (entries.hasMoreElements()) { JarEntry entry = entries.nextElement(); diff --git a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolAppStatsProvider.java b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolAppStatsProvider.java index 92d3f74a6f2..7b9e4a5e5cc 100644 --- a/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolAppStatsProvider.java +++ b/appserver/jdbc/jdbc-runtime/src/main/java/org/glassfish/jdbc/pool/monitor/JdbcConnPoolAppStatsProvider.java @@ -87,7 +87,7 @@ public String getAppName() { @ProbeListener(JDBC_APP_PROBE_LISTENER + "decrementConnectionUsedEvent") public void decrementConnectionUsedEvent(@ProbeParam("poolName") String poolName, @ProbeParam("appName") String appName) { // handle the num conn used decrement event - if ((poolName != null) && (poolName.equals(this.poolName))) { + if ((poolName != null) && (poolName.equals(this.poolName.toString()))) { if (appName != null && appName.equals(this.appName)) { // Decrement numConnUsed counter synchronized (numConnUsed) { @@ -106,7 +106,7 @@ public void decrementConnectionUsedEvent(@ProbeParam("poolName") String poolName @ProbeListener(JDBC_APP_PROBE_LISTENER + "connectionUsedEvent") public void connectionUsedEvent(@ProbeParam("poolName") String poolName, @ProbeParam("appName") String appName) { // handle the connection used event - if ((poolName != null) && (poolName.equals(this.poolName))) { + if ((poolName != null) && (poolName.equals(this.poolName.toString()))) { if (appName != null && appName.equals(this.appName)) { // increment numConnUsed synchronized (numConnUsed) { @@ -121,7 +121,7 @@ public void connectionUsedEvent(@ProbeParam("poolName") String poolName, @ProbeP */ @ProbeListener(JDBC_APP_PROBE_LISTENER + "connectionAcquiredEvent") public void connectionAcquiredEvent(@ProbeParam("poolName") String poolName, @ProbeParam("appName") String appName) { - if ((poolName != null) && (poolName.equals(this.poolName))) { + if ((poolName != null) && (poolName.equals(this.poolName.toString()))) { if (appName != null && appName.equals(this.appName)) { numConnAcquired.increment(); } @@ -133,7 +133,7 @@ public void connectionAcquiredEvent(@ProbeParam("poolName") String poolName, @Pr */ @ProbeListener(JDBC_APP_PROBE_LISTENER + "connectionReleasedEvent") public void connectionReleasedEvent(@ProbeParam("poolName") String poolName, @ProbeParam("appName") String appName) { - if ((poolName != null) && (poolName.equals(this.poolName))) { + if ((poolName != null) && (poolName.equals(this.poolName.toString()))) { if (appName != null && appName.equals(this.appName)) { numConnReleased.increment(); } diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/CaptureSchema.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/CaptureSchema.java index 8a078604db5..0d268599b29 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/CaptureSchema.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/CaptureSchema.java @@ -22,23 +22,22 @@ package com.sun.jdo.api.persistence.mapping.ejb; -import org.netbeans.modules.dbschema.*; -import org.netbeans.modules.dbschema.jdbcimpl.*; -import org.netbeans.modules.dbschema.util.*; - -import java.io.*; - -import java.util.ResourceBundle; - -import java.sql.ResultSet; +import java.io.FileOutputStream; +import java.io.OutputStream; import java.sql.DatabaseMetaData; -import java.util.Map; +import java.sql.ResultSet; +import java.text.MessageFormat; import java.util.HashMap; -import java.util.List; -import java.util.LinkedList; import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; -import java.text.MessageFormat; +import org.netbeans.modules.dbschema.DBIdentifier; +import org.netbeans.modules.dbschema.SchemaElement; +import org.netbeans.modules.dbschema.jdbcimpl.ConnectionProvider; +import org.netbeans.modules.dbschema.jdbcimpl.SchemaElementImpl; /** * diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingFile.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingFile.java index e463441a6ad..de32e2fac9d 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingFile.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/MappingFile.java @@ -544,8 +544,7 @@ private void createMappingForUnknownPKClass(EntityMapping mapping, PersistenceFieldElement pfe = createPersistenceField(mce, fieldName); pfe.setKey(true); - MappingFieldElement mfe = createMappingField(mce, fieldName, - candidatePK); + createMappingField(mce, fieldName, candidatePK); } else { // There is no column which meets primary key criteria. @@ -621,8 +620,7 @@ private void createMappingForConsistency(EntityMapping mapping, // Since 8.1 release only support one version column per bean, // use prefix as the version field name String fieldName = helper.getGeneratedVersionFieldNamePrefix(); - PersistenceFieldElement pfe = createPersistenceField(mce, - fieldName); + createPersistenceField(mce, fieldName); MappingFieldElement mfe = createMappingField(mce, fieldName, versionCol); mfe.setVersion(true); diff --git a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/beans/CheckVersionOfAccessedInstances.java b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/beans/CheckVersionOfAccessedInstances.java index 71057cd46ff..1e93f720a90 100644 --- a/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/beans/CheckVersionOfAccessedInstances.java +++ b/appserver/persistence/cmp/ejb-mapping/src/main/java/com/sun/jdo/api/persistence/mapping/ejb/beans/CheckVersionOfAccessedInstances.java @@ -100,8 +100,6 @@ public static void removeComparator(org.netbeans.modules.schema2beans.BeanCompar comparators.remove(c); } public void validate() throws org.netbeans.modules.schema2beans.ValidateException { - boolean restrictionFailure = false; - boolean restrictionPassed = false; // Validating property columnName if (sizeColumnName() == 0) { throw new org.netbeans.modules.schema2beans.ValidateException("sizeColumnName() == 0", org.netbeans.modules.schema2beans.ValidateException.FailureType.NULL_VALUE, "columnName", this); // NOI18N @@ -110,9 +108,7 @@ public void validate() throws org.netbeans.modules.schema2beans.ValidateExceptio // Dump the content of this bean returning it as a String public void dump(StringBuffer str, String indent){ - String s; Object o; - org.netbeans.modules.schema2beans.BaseBean n; str.append(indent); str.append("ColumnName["+this.sizeColumnName()+"]"); // NOI18N for(int i=0; i 0) { diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/CMPHelper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/CMPHelper.java index cfa90ade4ab..c52629dcfa0 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/CMPHelper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/CMPHelper.java @@ -23,22 +23,20 @@ import java.util.ResourceBundle; -import jakarta.ejb.EJBObject; -import jakarta.ejb.EJBLocalObject; -import jakarta.ejb.EJBContext; -import jakarta.ejb.EntityContext; +import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.api.persistence.support.JDOFatalInternalException; import com.sun.jdo.api.persistence.support.PersistenceManager; import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; import com.sun.jdo.api.persistence.support.Transaction; - -import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperPersistenceManager; import com.sun.jdo.spi.persistence.support.sqlstore.impl.PersistenceManagerImpl; import com.sun.jdo.spi.persistence.support.sqlstore.impl.PersistenceManagerWrapper; +import jakarta.ejb.EJBContext; +import jakarta.ejb.EJBLocalObject; +import jakarta.ejb.EJBObject; +import jakarta.ejb.EntityContext; + /** Provides helper methods for CMP support implementation with the * application server specific information. Calls corresponding methods * on the registered class which implements ContainerHelper interface. @@ -50,9 +48,6 @@ public class CMPHelper { "com.sun.jdo.spi.persistence.support.sqlstore.Bundle", // NOI18N CMPHelper.class.getClassLoader()); - /** The logger */ - private static Logger logger = LogHelperPersistenceManager.getLogger(); - /** Reference to a class that implements ContainerHelper interface for this * particular application server. In a non-managed environment the * will throw JDOFatalInternalException for any method invocation. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/EJBHelper.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/EJBHelper.java index d88a1566809..0a04bc9d6be 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/EJBHelper.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/ejb/EJBHelper.java @@ -23,12 +23,17 @@ import java.util.ResourceBundle; -import jakarta.transaction.*; import org.glassfish.persistence.common.I18NHelper; -import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; + import com.sun.jdo.api.persistence.support.JDOFatalInternalException; -import com.sun.jdo.spi.persistence.utility.logging.Logger; -import com.sun.jdo.spi.persistence.support.sqlstore.LogHelperPersistenceManager; +import com.sun.jdo.api.persistence.support.PersistenceManagerFactory; + +import jakarta.transaction.RollbackException; +import jakarta.transaction.Synchronization; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; /** Provides helper methods for a Forte for Java implementation with the * application server specific information in the distributed transaction @@ -42,9 +47,6 @@ public class EJBHelper { "com.sun.jdo.spi.persistence.support.sqlstore.Bundle", // NOI18N EJBHelper.class.getClassLoader()); - /** The logger */ - private static Logger logger = LogHelperPersistenceManager.getLogger(); - /** Reference to a class that implements TransactionHelper interface for this * particular application server, or DefaultTransactionHelper for a non-managed * environment. diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/TransactionImpl.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/TransactionImpl.java index 2ed3bd13a17..f6c0c3d6f26 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/TransactionImpl.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/impl/TransactionImpl.java @@ -1520,9 +1520,6 @@ private int commitConnection() { * @return String describing contents of this Transaction object. */ public String toString() { - int i; - Object o; - String s = " Transaction: \n status = " + this.statusString(this.status)+ "\n" // NOI18N + " Transaction Object = Transaction@" + this.hashCode() + "\n" // NOI18N + " threads = " + this.threads + "\n"; // NOI18N diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNew.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNew.java index c77a20e0bd2..1f772aa3233 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNew.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/AutoPersistentNew.java @@ -20,18 +20,9 @@ package com.sun.jdo.spi.persistence.support.sqlstore.state; -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import java.util.ResourceBundle; - public class AutoPersistentNew extends LifeCycleState { - /** - * I18N message handler - */ - private final static ResourceBundle messages = I18NHelper.loadBundle( - "com.sun.jdo.spi.persistence.support.sqlstore.Bundle", // NOI18N - AutoPersistentNew.class.getClassLoader()); public AutoPersistentNew() { // these flags are set only in the constructor diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/Hollow.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/Hollow.java index 33a6998643c..71a8628d5b3 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/Hollow.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/Hollow.java @@ -20,19 +20,9 @@ package com.sun.jdo.spi.persistence.support.sqlstore.state; -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import java.util.ResourceBundle; - - public class Hollow extends LifeCycleState { - /** - * I18N message handler - */ - private final static ResourceBundle messages = I18NHelper.loadBundle( - "com.sun.jdo.spi.persistence.support.sqlstore.Bundle", // NOI18N - Hollow.class.getClassLoader()); public Hollow() { // these flags are set only in the constructor diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentClean.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentClean.java index 18b729c103a..28584ae0788 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentClean.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentClean.java @@ -20,18 +20,9 @@ package com.sun.jdo.spi.persistence.support.sqlstore.state; -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import java.util.ResourceBundle; - public class PersistentClean extends LifeCycleState { - /** - * I18N message handler - */ - private final static ResourceBundle messages = I18NHelper.loadBundle( - "com.sun.jdo.spi.persistence.support.sqlstore.Bundle", // NOI18N - PersistentClean.class.getClassLoader()); public PersistentClean() { // these flags are set only in the constructor diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNew.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNew.java index e5ab56719b9..2f70091249e 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNew.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNew.java @@ -20,18 +20,9 @@ package com.sun.jdo.spi.persistence.support.sqlstore.state; -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import java.util.ResourceBundle; - public class PersistentNew extends LifeCycleState { - /** - * I18N message handler - */ - private final static ResourceBundle messages = I18NHelper.loadBundle( - "com.sun.jdo.spi.persistence.support.sqlstore.Bundle", // NOI18N - PersistentNew.class.getClassLoader()); public PersistentNew() { // these flags are set only in the constructor diff --git a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNonTransactional.java b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNonTransactional.java index 05a0fd6a926..a95f8540922 100644 --- a/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNonTransactional.java +++ b/appserver/persistence/cmp/support-sqlstore/src/main/java/com/sun/jdo/spi/persistence/support/sqlstore/state/PersistentNonTransactional.java @@ -20,18 +20,9 @@ package com.sun.jdo.spi.persistence.support.sqlstore.state; -import org.glassfish.persistence.common.I18NHelper; import com.sun.jdo.spi.persistence.support.sqlstore.ActionDesc; -import java.util.ResourceBundle; - public class PersistentNonTransactional extends LifeCycleState { - /** - * I18N message handler - */ - private final static ResourceBundle messages = I18NHelper.loadBundle( - "com.sun.jdo.spi.persistence.support.sqlstore.Bundle", // NOI18N - PersistentNonTransactional.class.getClassLoader()); public PersistentNonTransactional() { // these flags are set only in the constructor diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/NullSemaphore.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/NullSemaphore.java index 6f551a9b095..59c73121bad 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/NullSemaphore.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/NullSemaphore.java @@ -16,9 +16,7 @@ package com.sun.jdo.spi.persistence.utility; -import java.util.ResourceBundle; import com.sun.jdo.spi.persistence.utility.logging.Logger; -import org.glassfish.persistence.common.I18NHelper; /** Implements a simple semaphore that does not do any * semaphore-ing. That is, the methods just immediately return. @@ -36,12 +34,6 @@ public class NullSemaphore implements Semaphore { */ private final String _owner; - /** - * I18N message handler - */ - private final static ResourceBundle messages = - I18NHelper.loadBundle(SemaphoreImpl.class); - public NullSemaphore(String owner) { _owner = owner; diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLogger.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLogger.java index cc84d6b60af..798a5117643 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLogger.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/AbstractLogger.java @@ -131,7 +131,6 @@ private static synchronized Properties getLoggingProperties () if (fileName != null) { InputStream inputStream = null; - File file = null; try { diff --git a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LogHelper.java b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LogHelper.java index 1f043329eed..38ff3124716 100644 --- a/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LogHelper.java +++ b/appserver/persistence/cmp/utility/src/main/java/com/sun/jdo/spi/persistence/utility/logging/LogHelper.java @@ -78,7 +78,7 @@ public static void registerLoggerFactory (LoggerFactory factory) { */ public static boolean isJDK14() { try { - Class logger = Class.forName("java.util.logging.Logger"); //NOI18N + Class.forName("java.util.logging.Logger"); //NOI18N return true; } catch (ClassNotFoundException ex) { return false; diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java index 09a211761ea..5f5965d5806 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/EntityContainer.java @@ -441,9 +441,6 @@ protected void initializeHome() { ObjectFactory entityCtxFactory = new EntityContextFactory(this); - int steadyPoolSize = 0; - int resizeQuantity = 10; - int idleTimeoutInSeconds = Integer.MAX_VALUE-1; poolProp = new PoolProperties(this); super.initializeHome(); @@ -2425,12 +2422,10 @@ protected void callEJBStore(EntityBean ejb, EntityContextImpl context) throws Ex protected void callEJBRemove(EntityBean ejb, EntityContextImpl context) throws Exception { - Exception exc = null; try { // TODO - check if it is needed: context.setInEjbRemove(true); ejb.ejbRemove(); - } catch ( Exception ex ) { - exc = ex; + } catch (Exception ex) { throw ex; } finally { // TODO - check if it is needed: context.setInEjbRemove(false); @@ -2702,7 +2697,6 @@ protected void createReadyStore(int cacheSize, int numberOfVictimsToSelect, protected void createEJBObjectStores(int cacheSize, int numberOfVictimsToSelect, long idleTimeout) throws Exception { - EJBObjectCache lru = null; String ejbName = ejbDescriptor.getName(); idleTimeout = (idleTimeout <= 0) ? -1 : idleTimeout; diff --git a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/FIFOEJBObjectCache.java b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/FIFOEJBObjectCache.java index 8779f3c5edd..39064d443c9 100644 --- a/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/FIFOEJBObjectCache.java +++ b/appserver/persistence/entitybean-container/src/main/java/org/glassfish/persistence/ejb/entitybean/container/cache/FIFOEJBObjectCache.java @@ -204,7 +204,6 @@ protected Object internalPut(int hashCode, Object key, Object value, CacheItem item, oldItem = null, overflow = null; EJBObjectCacheItem newItem = null; Object oldValue = null; - int oldSize = 0; // lookup the item synchronized (bucketLocks[index]) { diff --git a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestAlgorithmParameterImpl.java b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestAlgorithmParameterImpl.java index 2c036fcfaca..393b9de2272 100644 --- a/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestAlgorithmParameterImpl.java +++ b/appserver/security/core-ee/src/main/java/com/sun/enterprise/security/ee/authentication/glassfish/digest/impl/DigestAlgorithmParameterImpl.java @@ -24,7 +24,7 @@ public class DigestAlgorithmParameterImpl implements com.sun.enterprise.security.auth.digest.api.DigestAlgorithmParameter { - private static byte[] delimeter = ":".getBytes(); + private byte[] delimiter = ":".getBytes(); private String algorithm = ""; private byte[] data = null; private String name = ""; @@ -36,7 +36,7 @@ public DigestAlgorithmParameterImpl(String name, byte[] data) { public DigestAlgorithmParameterImpl(String name, byte[] data, byte delimiter) { this.data = data; - DigestAlgorithmParameterImpl.delimeter = delimeter; + this.delimiter = new byte[] { delimiter }; this.name = name; } @@ -49,7 +49,7 @@ public DigestAlgorithmParameterImpl(String name, String algorithm, byte[] data) public DigestAlgorithmParameterImpl(String name, String algorithm, byte[] data, byte[] delimiter) { this.algorithm = algorithm; this.data = data; - DigestAlgorithmParameterImpl.delimeter = delimeter; + this.delimiter = delimiter; this.name = name; } @@ -65,7 +65,7 @@ public byte[] getValue() { @Override public byte[] getDelimiter() { - return delimeter; + return delimiter; } @Override diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java index f7b8007d0d2..95937654584 100644 --- a/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java +++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java @@ -61,9 +61,6 @@ @TestMethodOrder(OrderAnnotation.class) public class ClusterITest { - // this name needs to match the filename generated by the Maven build - private static final String TEST_WAR_FILENAME = "admin-tests-clusterit.war"; - private static final String TEST_WAR_LOCATION = "testapps"; private static final String TEST_APP_NAME = "testapp"; private static final String PORT1 = "55123"; private static final String PORT2 = "55124"; diff --git a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciIndexedRecord.java b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciIndexedRecord.java index 70541b3a7f5..2fdd0b1a2b3 100644 --- a/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciIndexedRecord.java +++ b/appserver/tests/appserv-tests/cciblackbox-tx/src/main/java/com/sun/connector/cciblackbox/CciIndexedRecord.java @@ -58,7 +58,7 @@ public String getRecordShortDescription() { } public void setRecordShortDescription(String description) { - description = description; + this.description = description; } public boolean equals(Object other) { diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DSManagedConnectionFactory.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DSManagedConnectionFactory.java index 073384bb66f..75c148025cb 100755 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DSManagedConnectionFactory.java +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/DSManagedConnectionFactory.java @@ -604,7 +604,7 @@ private boolean isEqual(PasswordCredential pc, String user, String password) { } } - if (user.equals(pc.getUserName()) && password.equals(pc.getPassword())) { + if (user.equals(pc.getUserName()) && password.equals(new String(pc.getPassword()))) { return true; } diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/LocalTransaction.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/LocalTransaction.java index 8b54780484d..15ad60100b9 100755 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/LocalTransaction.java +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/LocalTransaction.java @@ -66,7 +66,6 @@ public void begin() throws ResourceException { */ @Override public void commit() throws ResourceException { - Exception e = null; try { mc.getActualConnection().commit(); mc.getActualConnection().setAutoCommit(true); diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionFactory.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionFactory.java index 1b05a72d9d8..270199950ae 100755 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionFactory.java +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionFactory.java @@ -50,7 +50,7 @@ public abstract class ManagedConnectionFactory implements jakarta.resource.spi.M static { _logger = Logger.getAnonymousLogger(); } - private final boolean debug = false; + /** * Creates a Connection Factory instance. The ConnectionManager implementation * of the resource adapter is used here. @@ -311,7 +311,7 @@ protected void isValidByMetaData(java.sql.Connection con) throws ResourceExcepti } try { - java.sql.DatabaseMetaData dmd = con.getMetaData(); + con.getMetaData(); } catch(Exception sqle) { _logger.log(Level.SEVERE, "jdbc.exc_md"); throw new ResourceException("The connection is not valid as " @@ -336,7 +336,7 @@ protected void isValidByTableQuery(java.sql.Connection con, try { java.sql.Statement stmt = con.createStatement(); - java.sql.ResultSet rs = stmt.executeQuery("SELECT * FROM " + tableName); + stmt.executeQuery("SELECT * FROM " + tableName); } catch(Exception sqle) { _logger.log(Level.SEVERE, "jdbc.exc_execute"); throw new ResourceException("The connection is not valid as " diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionMetaData.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionMetaData.java index 79d57bd854e..9198d5d9cb7 100755 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionMetaData.java +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/ManagedConnectionMetaData.java @@ -39,7 +39,7 @@ public class ManagedConnectionMetaData implements jakarta.resource.spi.ManagedCo static { _logger = Logger.getAnonymousLogger(); } - private final boolean debug = false; + /** * Constructor for ManagedConnectionMetaData * diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAManagedConnectionFactory.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAManagedConnectionFactory.java index e0e662475de..eb375ab5c5c 100755 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAManagedConnectionFactory.java +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/spi/XAManagedConnectionFactory.java @@ -560,7 +560,7 @@ private boolean isEqual(PasswordCredential pc, String user, String password) { } } - if (user.equals(pc.getUserName()) && password.equals(pc.getPassword())) { + if (user.equals(pc.getUserName()) && password.equals(new String(pc.getPassword()))) { return true; } diff --git a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/MethodExecutor.java b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/MethodExecutor.java index 423665ab468..73bd99f11c9 100755 --- a/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/MethodExecutor.java +++ b/appserver/tests/appserv-tests/connectors-ra-redeploy/jars/src/main/java/com/sun/jdbcra/util/MethodExecutor.java @@ -37,7 +37,7 @@ public class MethodExecutor implements java.io.Serializable{ static { _logger = Logger.getAnonymousLogger(); } - private final boolean debug = false; + /** * Exceute a simple set Method. * diff --git a/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java b/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java index 27b624ea7f0..08ccf0b8652 100644 --- a/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java +++ b/appserver/tests/embedded/ejb/basic/src/main/java/org/glassfish/tests/embedded/ejb/basic/TimerEjb.java @@ -33,7 +33,7 @@ public void createTimer() throws Exception { System.err.println("In SimpleEjb:createTimer()"); TimerService timerSvc = (TimerService) new InitialContext().lookup( "java:comp/TimerService"); - Timer t = timerSvc.createTimer(2, "timer01"); + timerSvc.createTimer(2, "timer01"); } public boolean verifyTimer() { diff --git a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java index 30a4c6344a3..9c8a74435a7 100644 --- a/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/applicationDispatcher/src/main/java/test/ServletTest.java @@ -22,7 +22,6 @@ public class ServletTest extends HttpServlet{ - private ServletContext context; private static String status = "ApplicationDispatcher::PASS"; public void init(ServletConfig config) throws ServletException { diff --git a/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java b/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java index e3ade60ba16..13dccfbcc5c 100644 --- a/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java +++ b/appserver/tests/embedded/maven-plugin/dirListing/src/main/java/test/ServletTest.java @@ -16,13 +16,16 @@ package test; -import java.io.*; -import jakarta.servlet.*; -import jakarta.servlet.http.*; +import java.io.IOException; -public class ServletTest extends HttpServlet implements HttpSessionListener { +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSessionListener; - private ServletContext context; +public class ServletTest extends HttpServlet implements HttpSessionListener { public void init(ServletConfig config) throws ServletException { super.init(config); diff --git a/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java b/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java index abfaa358512..c239d0f6c4c 100644 --- a/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java +++ b/appserver/tests/embedded/maven-plugin/dirListing/src/test/java/org/glassfish/tests/dirListing/WebTest.java @@ -51,8 +51,7 @@ private static void goGet(String host, int port, BufferedReader in = new BufferedReader(new InputStreamReader( yc.getInputStream())); String line = null; - int index=0, lineNum=0; - String cookies = ""; + int lineNum=0; while ((line = in.readLine()) != null) { System.out.println(lineNum + ": " + line); if (line.indexOf("Directory Listing") != -1){ diff --git a/appserver/tests/embedded/web/servlet/src/test/java/org/glassfish/tests/embedded/web/servlet/ServletMain.java b/appserver/tests/embedded/web/servlet/src/test/java/org/glassfish/tests/embedded/web/servlet/ServletMain.java index d9d53cbe576..3bfff8e9e31 100644 --- a/appserver/tests/embedded/web/servlet/src/test/java/org/glassfish/tests/embedded/web/servlet/ServletMain.java +++ b/appserver/tests/embedded/web/servlet/src/test/java/org/glassfish/tests/embedded/web/servlet/ServletMain.java @@ -67,8 +67,8 @@ public void test() throws Exception { server.addContainer(server.createConfig(ContainerBuilder.Type.web)); DeployCommandParameters dp = new DeployCommandParameters(f); String appName = server.getDeployer().deploy(war, dp); - WebClient webClient = new WebClient(); - try { + + try (WebClient webClient = new WebClient()) { Page page = webClient.getPage("http://localhost:8882/classes/hello"); System.out.println("Got response " + page.getWebResponse().getContentAsString()); Assert.assertTrue("Servlet returne wrong content", page.getWebResponse().getContentAsString().startsWith("Hello World")); diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java index 66bf40e2add..135e70694ae 100644 --- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java +++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java @@ -227,9 +227,8 @@ private boolean isRecovering(String logDir, String instance, long timestamp, Str } boolean result = false; - try { - _logger.log(INFO, "Checking Lock File " + recoveryLockFile); - RandomAccessFile raf = new RandomAccessFile(recoveryLockFile, "rw"); + _logger.log(INFO, "Checking Lock File " + recoveryLockFile); + try (RandomAccessFile raf = new RandomAccessFile(recoveryLockFile, "rw")) { FileLock lock = raf.getChannel().lock(); try { reader = new BufferedReader(new FileReader(recoveryLockFile)); @@ -297,8 +296,7 @@ private String doneRecovering(String logPath, String instance, String prefix) { return null; } - try { - RandomAccessFile raf = new RandomAccessFile(recoveryLockFile, "rw"); + try (RandomAccessFile raf = new RandomAccessFile(recoveryLockFile, "rw")) { FileLock lock = raf.getChannel().lock(); try { reader = new BufferedReader(new FileReader(recoveryLockFile)); @@ -389,8 +387,7 @@ private void registerRecovery(String logPath, String instance, String prefix) { return; } - try { - RandomAccessFile raf = new RandomAccessFile(recoveryLockFile, "rw"); + try (RandomAccessFile raf = new RandomAccessFile(recoveryLockFile, "rw")) { FileLock lock = raf.getChannel().lock(); try { writer = new FileWriter(recoveryLockFile, true); diff --git a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ExpandWar.java b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ExpandWar.java index 6a09077b8bc..a6b41b8854c 100644 --- a/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ExpandWar.java +++ b/appserver/web/web-core/src/main/java/org/apache/catalina/startup/ExpandWar.java @@ -297,30 +297,14 @@ public static boolean copy(File src, File dest) { if (fileSrc.isDirectory()) { result = copy(fileSrc, fileDest); } else { - FileChannel ic = null; - FileChannel oc = null; - try { - ic = (new FileInputStream(fileSrc)).getChannel(); - oc = (new FileOutputStream(fileDest)).getChannel(); + try (FileChannel ic = (new FileInputStream(fileSrc)).getChannel(); + FileChannel oc = (new FileOutputStream(fileDest)).getChannel()) { ic.transferTo(0, ic.size(), oc); } catch (IOException e) { String msg = MessageFormat.format(rb.getString(LogFacade.ERROR_COPYING_EXCEPTION), new Object[] {fileSrc, fileDest}); log.log(Level.SEVERE, msg, e); result = false; - } finally { - if (ic != null) { - try { - ic.close(); - } catch (IOException e) { - } - } - if (oc != null) { - try { - oc.close(); - } catch (IOException e) { - } - } } } } diff --git a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/EmptyVisitor.java b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/EmptyVisitor.java index 9b3d5baf8f8..d7cd56400f2 100644 --- a/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/EmptyVisitor.java +++ b/nucleus/admin/cli/src/main/java/com/sun/enterprise/admin/cli/schemadoc/EmptyVisitor.java @@ -99,7 +99,7 @@ public void visitIincInsn(int i, int i1) { } @Override - public void visitTableSwitchInsn(int i, int i1, Label label, Label[] labels) { + public void visitTableSwitchInsn(int i, int i1, Label label, Label... labels) { } @Override diff --git a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheckValidator.java b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheckValidator.java index c9596a1ace1..e5932f46a1f 100644 --- a/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheckValidator.java +++ b/nucleus/admin/config-api/src/main/java/com/sun/enterprise/config/serverbeans/customvalidators/JDBCRealmPropertyCheckValidator.java @@ -30,7 +30,6 @@ public class JDBCRealmPropertyCheckValidator implements ConstraintValidator { private static final String JDBC_REALM = "com.sun.enterprise.security.ee.authentication.glassfish.jdbc.JDBCRealm"; - private static final String DEFAULT_DIGEST_ALGORITHM = "MD5"; public void initialize(final JDBCRealmPropertyCheck fqcn) { } diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java index 9aef40470a0..96b60624f68 100644 --- a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java +++ b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXml.java @@ -21,7 +21,6 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.module.ModulesRegistry; import com.sun.enterprise.module.bootstrap.StartupContext; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.io.FileUtils; @@ -299,6 +298,4 @@ public Object resolveEntity(String publicID, String systemID, String baseURI, St } protected abstract DomDocument getDomDocument(); - - private final static LocalStringsImpl strings = new LocalStringsImpl(DomainXml.class); } diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientGenerator.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientGenerator.java index 13961d059ef..9f46e271499 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientGenerator.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/JavaClientGenerator.java @@ -153,9 +153,8 @@ private void gatherFiles(File file, List list) throws IOException { private void addPom(String versionString) { FileWriter writer = null; - try { - String pom = new Scanner(Thread.currentThread().getContextClassLoader().getResourceAsStream("/client/pom.template.xml")) - .useDelimiter("\\Z").next(); + try (Scanner scanner = new Scanner(Thread.currentThread().getContextClassLoader().getResourceAsStream("/client/pom.template.xml"))) { + String pom = scanner.useDelimiter("\\Z").next(); pom = pom.replace("{{glassfish.version}}", versionString); File out = File.createTempFile("pom", "xml"); out.deleteOnExit(); diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientGenerator.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientGenerator.java index 8e0051740f6..9e3d0aefb72 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientGenerator.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/generator/client/PythonClientGenerator.java @@ -104,10 +104,10 @@ public ClientClassWriter getClassWriter(ConfigModel model, String className, Cla } private String getFileContents(String fileName) { - String contents = new Scanner(getClass().getClassLoader().getResourceAsStream("/client/python/" + fileName)).useDelimiter("\\Z") - .next(); - - return contents.replace("VERSION", Version.getVersionNumber()); + try (Scanner scanner = new Scanner(getClass().getClassLoader().getResourceAsStream("/client/python/" + fileName))) { + String contents = scanner.useDelimiter("\\Z").next(); + return contents.replace("VERSION", Version.getVersionNumber()); + } } private void addFileFromClasspath(String targetDir, String fileName, ZipOutputStream zip) throws IOException { diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AbstractStaxProvider.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AbstractStaxProvider.java index 682a2138f26..6ef38d074cf 100644 --- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AbstractStaxProvider.java +++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/provider/AbstractStaxProvider.java @@ -45,7 +45,6 @@ public abstract class AbstractStaxProvider extends BaseProvider { private static final XMLOutputFactory XML_FACTORY = XMLOutputFactory.newInstance(); private static final MappedNamespaceConvention JSON_CONVENTION = new MappedNamespaceConvention(); - private static final MediaType ANY_XML_MEDIATYPE = new MediaType(MediaType.MEDIA_TYPE_WILDCARD, "xml"); protected class PrePostFixedWriter { private String prefix; diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java index fda7f0c7e6c..85221fb1d80 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/progress/CommandProgressImpl.java @@ -88,10 +88,9 @@ public String getContextString() { } private LastChangedMessage lastMessage; - private long eTag = 0; private Date startTime; private Date endTime; - //TODO: Set after resurection + //TODO: Set after resurrection private transient AdminCommandEventBroker eventBroker; private boolean spinner = false; @@ -114,7 +113,6 @@ protected synchronized void fireEvent(ProgressStatusEvent event) { if (event instanceof ProgressStatusEventProgress) { this.spinner = ((ProgressStatusEventProgress) event).isSpinner(); } - eTag++; if (eventBroker != null) { eventBroker.fireEvent(EVENT_PROGRESSSTATUS_CHANGE, event); } diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteResponseManager.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteResponseManager.java index 42c730c231e..122f8aeba73 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteResponseManager.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteResponseManager.java @@ -17,8 +17,7 @@ package com.sun.enterprise.admin.remote; -import com.sun.enterprise.universal.i18n.LocalStringsImpl; -import com.sun.enterprise.util.io.FileUtils; +import static com.sun.enterprise.util.StringUtils.ok; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -26,10 +25,10 @@ import java.io.InputStream; import java.util.Collections; import java.util.Map; -import java.util.jar.Manifest; import java.util.logging.Logger; -import static com.sun.enterprise.util.StringUtils.ok; +import com.sun.enterprise.universal.i18n.LocalStringsImpl; +import com.sun.enterprise.util.io.FileUtils; /** * This class is responsible for handling the Remote Server response. Note that an unusul paradigm is used here. Success @@ -50,7 +49,6 @@ public class RemoteResponseManager implements ResponseManager { private final Logger logger; private final InputStream responseStream; private final String response; - private Manifest m; private Map mainAtts = Collections.emptyMap(); public RemoteResponseManager(InputStream in, int code, Logger logger) throws RemoteException, IOException { diff --git a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteRestAdminCommand.java b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteRestAdminCommand.java index 12830039824..1ef518cd580 100644 --- a/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteRestAdminCommand.java +++ b/nucleus/admin/util/src/main/java/com/sun/enterprise/admin/remote/RemoteRestAdminCommand.java @@ -110,7 +110,6 @@ public class RemoteRestAdminCommand extends AdminCommandEventBrokerImpl EMPTY_String_AMX = Collections.emptyMap(); private final static Class[] NOTIFICATION_LISTENER_SIG1 = new Class[] { NotificationListener.class @@ -290,8 +288,6 @@ private static String toString(Object o) private static final String METHOD_TYPE = "type"; private static final String METHOD_PARENT_PATH = "parentPath"; /** proxy method */ - private static final String METHOD_CHILDREN = "children"; - /** proxy method */ private static final String METHOD_CHILDREN_MAP = "childrenMap"; /** proxy method */ private static final String METHOD_CHILDREN_MAPS = "childrenMaps"; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/ProxyFactory.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/ProxyFactory.java index 10760dd72ee..9d72b197d99 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/ProxyFactory.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/core/proxy/ProxyFactory.java @@ -169,7 +169,6 @@ public void handleNotification( debug("ProxyFactory.handleNotification: UNKNOWN notification: ", notifIn); } } - private final static String DOMAIN_ROOT_KEY = "DomainRoot"; public DomainRoot createDomainRoot() throws IOException { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupport.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupport.java index ae5cba94985..376b9a23def 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupport.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/config/ConfigBeanJMXSupport.java @@ -476,8 +476,6 @@ private static boolean isRemoteableType(final Class clazz) private static boolean isRemoteableDefaultMethod(final Method m) { - boolean isRemotable = true; - final Class returnType = m.getReturnType(); if (!isRemoteableType(returnType)) { diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java index c8c9c89c273..c0f3087a8aa 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/AMXImplBase.java @@ -350,7 +350,6 @@ protected boolean attributeTypeMatches(final String attributeName, final Class queryServerLogInternal( public Map[] getErrorInfo() { unimplemented(); - final List> infos = null; //getLogMBean().getErrorInformation(); + final List> infos = new ArrayList<>(); //getLogMBean().getErrorInformation(); final Map[] results = TypeCast.asArray(new HashMap[infos.size()]); diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java index 4c0da186353..7985064e16b 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/RealmsImpl.java @@ -345,7 +345,6 @@ public Map getUserAttributes(final String realmName, final String } private static final String ADMIN_REALM = "admin-realm"; - private static final String ANONYMOUS_USER = "anonymous"; private static final String FILE_REALM_CLASSNAME = "com.sun.enterprise.security.auth.realm.file.FileRealm"; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoImpl.java index 016aa59cb5b..b8886ba8cef 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/SystemInfoImpl.java @@ -72,8 +72,6 @@ public String[] getFeatureNames() { } public boolean supportsFeature(final String key) { - boolean supports = false; - Boolean result = mFeatures.get(key); if (result == null) { result = Boolean.FALSE; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java index 8a166c6f4ce..c87c9e29291 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/mbean/ToolsImpl.java @@ -37,8 +37,6 @@ public class ToolsImpl extends AMXImplBase // implements Tools { - private static final String NL = StringUtil.NEWLINE(); - public ToolsImpl(final ObjectName parent) { super(parent, Tools.class); } diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java index 93821eec8f0..1c977aac1bb 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/impl/util/ObjectNameBuilder.java @@ -56,7 +56,6 @@ public ObjectNameBuilder(final MBeanServer mbeanServer, final ObjectName parent) public String getJMXDomain() { return (mJMXDomain); } - private static final String[] EMPTY_STRING_ARRAY = new String[0]; public static String makeWild(String props) { return (Util.concatenateProps(props, JMXUtil.WILD_PROP)); diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java index fd24b22158d..958fe06dea2 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/FeatureAvailability.java @@ -223,8 +223,6 @@ public Object waitForFeature(final String featureName, final String callerInfo) // if we had to create a CountDownLatch, calling thread must now await() if (latch != null) { - final long start = System.currentTimeMillis(); - try { //debug( "waitForFeature: \"" + featureName + "\" by " + callerInfo ); diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/JMXUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/JMXUtil.java index fe5660d66ef..ea8fd067624 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/JMXUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/JMXUtil.java @@ -1026,7 +1026,6 @@ public static boolean isIsOrGetter(Method method) public static String getAttributeName(final Method method) { final String methodName = method.getName(); - String attrName = null; int prefixLength; diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanOperationInfoComparator.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanOperationInfoComparator.java index 8e02f6a435c..65b37d3375a 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanOperationInfoComparator.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanOperationInfoComparator.java @@ -17,8 +17,9 @@ package org.glassfish.admin.amx.util.jmx; import java.io.Serializable; + import javax.management.MBeanOperationInfo; -import org.glassfish.admin.amx.util.jmx.stringifier.MBeanFeatureInfoStringifierOptions; + import org.glassfish.admin.amx.util.jmx.stringifier.MBeanOperationInfoStringifier; /** @@ -27,9 +28,6 @@ public final class MBeanOperationInfoComparator implements java.util.Comparator, Serializable { - private static final MBeanOperationInfoStringifier OPERATION_INFO_STRINGIFIER = - new MBeanOperationInfoStringifier(new MBeanFeatureInfoStringifierOptions(false, ",")); - public static final MBeanOperationInfoComparator INSTANCE = new MBeanOperationInfoComparator(); private MBeanOperationInfoComparator() diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java index 14e2e4e3ebf..ae59667611a 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/MBeanProxyHandler.java @@ -284,8 +284,6 @@ public AttributeList setAttributes(final AttributeList requested) return (results); } - private final String LOG_LEVEL_NAME = "LogLevel"; - protected void postGetAttributeHook( final String name, final Object value) diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java index 1cc9e6e11d9..434512e106d 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/NotificationEmitterSupport.java @@ -121,8 +121,6 @@ public int getNotificationTypeListenerCount(final String type) return (resultCount); } - private static final String[] NO_TYPES = new String[0]; - private static final String WILDCARD_TYPE = "***"; private static final String[] ALL_TYPES = new String[] diff --git a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/OpenMBeanUtil.java b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/OpenMBeanUtil.java index 3f8cc270a77..88084868a21 100644 --- a/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/OpenMBeanUtil.java +++ b/nucleus/common/amx-core/src/main/java/org/glassfish/admin/amx/util/jmx/OpenMBeanUtil.java @@ -91,10 +91,6 @@ static public SimpleType getSimpleType(final Class c) } - private static final String[] EMPTY_STRING_ARRAY = new String[0]; - - private static final OpenType[] EMPTY_OPENTYPES = new OpenType[0]; - /** Get any non-null array element from the array. */ diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManager.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManager.java index 6b421fcbb07..0f0b5698a96 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManager.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManager.java @@ -44,7 +44,7 @@ public interface LocalStringManager { * @param defaultValue The default return value if not found * @return The localized value for the resource */ - public String getLocalString( + String getLocalString( Class callerClass, String key, String defaultValue @@ -58,12 +58,12 @@ public String getLocalString( * @param arguments The set of arguments to provide to the formatter * @return A formatted localized string */ - public String getLocalString( + String getLocalString( Class callerClass, String key, String defaultFormat, - Object arguments[] + Object... arguments ); - public String getLocalString(String key, String defaultValue); + String getLocalString(String key, String defaultValue); } diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManagerImpl.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManagerImpl.java index b65584efb9a..bb2049ee6fa 100644 --- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManagerImpl.java +++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/util/LocalStringManagerImpl.java @@ -61,6 +61,7 @@ public LocalStringManagerImpl(Class defaultClass) { * @param defaultValue The default return value if not found * @return The localized value for the resource */ + @Override public String getLocalString( Class callerClass, String key, @@ -107,6 +108,7 @@ public String getLocalString( * @param defaultValue The default return value if not found * @return The localized string */ + @Override public String getLocalString(String key, String defaultValue) { return getLocalString(null, key, defaultValue); } @@ -119,7 +121,7 @@ public String getLocalString(String key, String defaultValue) { * @param arguments The set of arguments to provide to the formatter * @return A formatted localized string */ - + @Override public String getLocalString( Class callerClass, String key, diff --git a/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/FileLockTest.java b/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/FileLockTest.java index d628068a4ea..f7e8a9c98ac 100644 --- a/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/FileLockTest.java +++ b/nucleus/common/common-util/src/test/java/org/glassfish/common/util/admin/locking/FileLockTest.java @@ -270,7 +270,7 @@ public void lockAndReadTest() throws Exception { Lock fl = managed.accessRead(); try (FileReader fr = new FileReader(f)) { char[] chars = new char[1024]; - int length = fr.read(chars); + fr.read(chars); } fl.unlock(); diff --git a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/ScatteredArchive.java b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/ScatteredArchive.java index 0c1496546bb..4b09c3f515a 100644 --- a/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/ScatteredArchive.java +++ b/nucleus/common/internal-api/src/main/java/org/glassfish/internal/embedded/ScatteredArchive.java @@ -310,14 +310,15 @@ public Enumeration entries() { f = new File(url.getPath()); } if (f.isFile()) { - JarFile jar = new JarFile(f); - Enumeration jarEntries = jar.entries(); - while (jarEntries.hasMoreElements()) { - JarEntry jarEntry = jarEntries.nextElement(); - if (jarEntry.isDirectory()) { - continue; + try (JarFile jar = new JarFile(f)) { + Enumeration jarEntries = jar.entries(); + while (jarEntries.hasMoreElements()) { + JarEntry jarEntry = jarEntries.nextElement(); + if (jarEntry.isDirectory()) { + continue; + } + entries.add(jarEntry.getName()); } - entries.add(jarEntry.getName()); } } else { getListOfFiles(f, prefix, entries); diff --git a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/BootAMX.java b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/BootAMX.java index 556fb705dc1..4f53fdb190e 100644 --- a/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/BootAMX.java +++ b/nucleus/common/mbeanserver/src/main/java/org/glassfish/admin/mbeanserver/BootAMX.java @@ -16,15 +16,14 @@ package org.glassfish.admin.mbeanserver; -import java.util.logging.Logger; import javax.management.JMException; import javax.management.MBeanServer; -import javax.management.StandardMBean; import javax.management.ObjectName; +import javax.management.StandardMBean; import javax.management.remote.JMXServiceURL; -import org.glassfish.external.amx.BootAMXMBean; import org.glassfish.external.amx.AMXGlassfish; +import org.glassfish.external.amx.BootAMXMBean; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.logging.annotation.LogMessageInfo; @@ -35,20 +34,11 @@ */ final class BootAMX implements BootAMXMBean { - private static final Logger JMX_LOGGER = Util.JMX_LOGGER; - private final MBeanServer mMBeanServer; private final ObjectName mObjectName; private final ServiceLocator mHabitat; private ObjectName mDomainRootObjectName; - - private static void debug(final String s) - { - System.out.println(s); - } - - private BootAMX( final ServiceLocator habitat, final MBeanServer mbeanServer) diff --git a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java index 0710370703e..9a0b0d0973f 100644 --- a/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java +++ b/nucleus/core/kernel/src/main/java/com/sun/enterprise/v3/server/ApplicationConfigListener.java @@ -46,7 +46,6 @@ import com.sun.enterprise.config.serverbeans.Server; import com.sun.enterprise.config.serverbeans.ServerTags; import com.sun.enterprise.module.bootstrap.StartupContext; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.v3.common.HTMLActionReporter; import jakarta.inject.Inject; @@ -56,8 +55,6 @@ @RunLevel(PostStartupRunLevel.VAL) public class ApplicationConfigListener implements TransactionListener, PostConstruct { - final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(ApplicationConfigListener.class); - final private Logger logger = KernelLoggerInfo.getLogger(); @Inject diff --git a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java index d3548b23ec1..a52d5934347 100644 --- a/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java +++ b/nucleus/core/kernel/src/main/java/org/glassfish/kernel/embedded/PortImpl.java @@ -70,7 +70,7 @@ public void close() { private void removeListener() { try { ConfigSupport.apply(new ConfigCode() { - public Object run(ConfigBeanProxy[] params) throws PropertyVetoException, TransactionFailure { + public Object run(ConfigBeanProxy... params) throws PropertyVetoException, TransactionFailure { final NetworkListeners nt = (NetworkListeners) params[0]; final VirtualServer vs = (VirtualServer) params[1]; final Protocols protocols = (Protocols) params[2]; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java index 36246f98a62..4a153e57cf8 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetApplicationLaunchURLsCommand.java @@ -16,38 +16,48 @@ package org.glassfish.deployment.admin; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import javax.security.auth.Subject; + import org.glassfish.api.ActionReport; +import org.glassfish.api.Param; +import org.glassfish.api.admin.AccessRequired.AccessCheck; import org.glassfish.api.admin.AdminCommand; import org.glassfish.api.admin.AdminCommandContext; +import org.glassfish.api.admin.AdminCommandSecurity; import org.glassfish.api.admin.CommandLock; -import org.glassfish.api.Param; -import org.jvnet.hk2.annotations.Service; +import org.glassfish.api.admin.CommandRunner; import org.glassfish.api.admin.ExecuteOn; +import org.glassfish.api.admin.ParameterMap; +import org.glassfish.api.admin.RestEndpoint; +import org.glassfish.api.admin.RestEndpoints; import org.glassfish.api.admin.RuntimeType; +import org.glassfish.config.support.PropertyResolver; import org.glassfish.deployment.common.DeploymentProperties; import org.glassfish.deployment.common.DeploymentUtils; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; -import org.glassfish.hk2.api.PerLookup; -import org.glassfish.config.support.PropertyResolver; -import com.sun.enterprise.util.StringUtils; -import com.sun.enterprise.config.serverbeans.*; import org.glassfish.grizzly.config.dom.NetworkListener; import org.glassfish.grizzly.config.dom.Protocol; -import org.glassfish.api.admin.RestEndpoints; -import org.glassfish.api.admin.RestEndpoint; -import java.util.List; -import java.util.ArrayList; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.net.URL; -import java.util.Collection; -import org.glassfish.api.admin.AccessRequired.AccessCheck; -import org.glassfish.api.admin.AdminCommandSecurity; -import org.glassfish.api.admin.CommandRunner; -import org.glassfish.api.admin.ParameterMap; +import org.glassfish.hk2.api.PerLookup; +import org.jvnet.hk2.annotations.Service; + +import com.sun.enterprise.config.serverbeans.Application; +import com.sun.enterprise.config.serverbeans.Applications; +import com.sun.enterprise.config.serverbeans.Cluster; +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Domain; +import com.sun.enterprise.config.serverbeans.HttpService; +import com.sun.enterprise.config.serverbeans.Node; +import com.sun.enterprise.config.serverbeans.Server; +import com.sun.enterprise.config.serverbeans.VirtualServer; +import com.sun.enterprise.util.StringUtils; + +import jakarta.inject.Inject; @Service(name="_get-application-launch-urls") @ExecuteOn(value={RuntimeType.DAS}) @@ -67,8 +77,6 @@ public class GetApplicationLaunchURLsCommand implements AdminCommand, AdminComma @Inject CommandRunner commandRunner; - final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(GetApplicationLaunchURLsCommand.class); - private List servers; @Override diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java index 1920b7a1195..fbb477bc77a 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetDeploymentConfigurationsCommand.java @@ -17,11 +17,6 @@ package org.glassfish.deployment.admin; -import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.util.LocalStringManagerImpl; - -import jakarta.inject.Inject; - import java.io.IOException; import java.util.Map; @@ -47,6 +42,10 @@ import org.glassfish.internal.data.ModuleInfo; import org.jvnet.hk2.annotations.Service; +import com.sun.enterprise.config.serverbeans.Application; + +import jakarta.inject.Inject; + /** * Get deployment configurations command */ @@ -64,8 +63,6 @@ @AccessRequired(resource=DeploymentCommandUtils.APPLICATION_RESOURCE_NAME + "/$appname", action="read") public class GetDeploymentConfigurationsCommand implements AdminCommand { - final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(GetDeploymentConfigurationsCommand.class); - @Param(primary = true) private String appname; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java index 2f27e914add..6a89b1691b6 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/GetHostAndPortCommand.java @@ -28,7 +28,6 @@ import com.sun.enterprise.config.serverbeans.VirtualServer; import com.sun.enterprise.config.serverbeans.Cluster; import com.sun.enterprise.util.HostAndPort; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.StringUtils; import java.util.Collection; import org.glassfish.grizzly.config.dom.Http; @@ -82,8 +81,6 @@ public class GetHostAndPortCommand implements AdminCommand, AdminCommandSecurity private Config config; - final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(GetHostAndPortCommand.class); - @Override public Collection getAccessChecks() { final List accessChecks = new ArrayList(); diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java index 8a2e44a15ff..b81b9083450 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceDeployCommand.java @@ -84,7 +84,6 @@ public class InstanceDeployCommand extends InstanceDeployCommandParameters implements AdminCommand, AdminCommandSecurity.AccessCheckProvider { final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(InstanceDeployCommand.class); - private final static String LS = System.getProperty("line.separator"); @Inject Deployment deployment; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java index c6797a371e6..7df5ddc40f4 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/InstanceLifecycleModuleCommand.java @@ -32,7 +32,6 @@ import org.glassfish.hk2.api.PerLookup; import org.jvnet.hk2.config.Transaction; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.config.serverbeans.Applications; import com.sun.enterprise.config.serverbeans.Application; import com.sun.enterprise.config.serverbeans.Domain; @@ -61,8 +60,6 @@ }) public class InstanceLifecycleModuleCommand implements AdminCommand, AdminCommandSecurity.AccessCheckProvider { - final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(InstanceLifecycleModuleCommand.class); - @Param(primary=true) public String name = null; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java index e413ae25ca8..bafd494a364 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/IsSnifferUserVisibleCommand.java @@ -17,7 +17,6 @@ package org.glassfish.deployment.admin; import com.sun.enterprise.config.serverbeans.Application; -import com.sun.enterprise.util.LocalStringManagerImpl; import org.glassfish.api.ActionReport; import org.glassfish.api.Param; import org.glassfish.api.admin.AdminCommand; @@ -48,8 +47,6 @@ @AccessRequired(resource="domain/sniffers/$sniffername", action="read") public class IsSnifferUserVisibleCommand implements AdminCommand { - final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(IsSnifferUserVisibleCommand.class); - @Param(primary=true) public String sniffername = null; diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java index 64fb034b2e8..c1dd3c64bfc 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListAppRefsCommand.java @@ -31,7 +31,6 @@ import com.sun.enterprise.config.serverbeans.Module; import org.glassfish.api.admin.ExecuteOn; import org.glassfish.api.admin.RuntimeType; -import com.sun.enterprise.util.LocalStringManagerImpl; import java.util.Collection; import jakarta.inject.Inject; @@ -83,9 +82,6 @@ public Collection getAccessChecks() { } - - final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(ListAppRefsCommand.class); - public void execute(AdminCommandContext context) { final ActionReport report = context.getActionReport(); diff --git a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java index 76c29faf6b5..646c5c8b5ef 100644 --- a/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java +++ b/nucleus/deployment/admin/src/main/java/org/glassfish/deployment/admin/ListLibrariesCommand.java @@ -30,7 +30,6 @@ import org.glassfish.hk2.api.PerLookup; import jakarta.inject.Inject; -import com.sun.enterprise.util.LocalStringManagerImpl; import com.sun.enterprise.util.io.FileUtils; import com.sun.enterprise.config.serverbeans.Domain; @@ -53,8 +52,6 @@ public class ListLibrariesCommand implements AdminCommand { @Inject ServerEnvironment env; - final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(ListLibrariesCommand.class); - public void execute(AdminCommandContext context) { final ActionReport report = context.getActionReport(); diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployDirectoryScanner.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployDirectoryScanner.java index 89def6f3fbb..9a6b06b7d61 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployDirectoryScanner.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoDeployDirectoryScanner.java @@ -23,13 +23,13 @@ package org.glassfish.deployment.autodeploy; -import com.sun.enterprise.util.LocalStringManagerImpl; import java.io.File; -import java.util.Set; import java.util.HashSet; -import java.util.logging.Logger; -import java.util.logging.LogRecord; +import java.util.Set; import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; + import org.glassfish.logging.annotation.LogMessageInfo; /** @@ -49,8 +49,6 @@ public class AutoDeployDirectoryScanner implements DirectoryScanner{ @LogMessageInfo(message = "Error occurred: {0}", cause="An exception was caught when the operation was attempted", action="See the exception to determine how to fix the error", level="SEVERE") private static final String EXCEPTION_OCCURRED = "NCLS-DEPLOYMENT-00040"; - private static final LocalStringManagerImpl localStrings = new LocalStringManagerImpl(AutoDeployDirectoryScanner.class); - public AutoDeployDirectoryScanner() { } diff --git a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java index 7c627dd60ae..361aaafefaa 100644 --- a/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java +++ b/nucleus/deployment/autodeploy/src/main/java/org/glassfish/deployment/autodeploy/AutoUndeploymentOperation.java @@ -73,8 +73,6 @@ static AutoUndeploymentOperation newInstance( return o; } - private String name; - private static final String COMMAND_NAME = "undeploy"; @Inject @@ -102,7 +100,6 @@ protected AutoUndeploymentOperation init( prepareUndeployActionProperties(name, target), COMMAND_NAME, undeployCommand); - this.name = name; return this; } diff --git a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplUnitTest.java b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplUnitTest.java index c03d9eab41b..dce9ac0dbe8 100644 --- a/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplUnitTest.java +++ b/nucleus/diagnostics/context/src/test/java/org/glassfish/diagnostics/context/impl/ContextImplUnitTest.java @@ -95,8 +95,8 @@ public void testConstructorsLocation() { public void testDelegationOfPut() { expect(view.put("KeyForString-Value1-true", "Value1", defaultSetOneway())).andReturn(null); expect(view.put("KeyForString-Value2-false", "Value2", EnumSet.of(LOCAL))).andReturn(null); - expect(view.put("KeyForNumber-5-true", 5, defaultSetOneway())).andReturn(null); - expect(view.put("KeyForNumber-7-false", 7, EnumSet.of(LOCAL))).andReturn(null); + expect(view.put("KeyForNumber-5-true", Integer.valueOf(5), defaultSetOneway())).andReturn(null); + expect(view.put("KeyForNumber-7-false", Integer.valueOf(7), EnumSet.of(LOCAL))).andReturn(null); replay(view, location); diff --git a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java index 1e70348c5cb..ed6448d1aa7 100644 --- a/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java +++ b/nucleus/security/services/src/main/java/org/glassfish/security/services/impl/AuthenticationServiceImpl.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.logging.Logger; import jakarta.inject.Inject; import jakarta.inject.Singleton; @@ -76,9 +75,6 @@ public class AuthenticationServiceImpl implements AuthenticationService, PostCon @Inject private ImpersonationService impersonationService; - private static final Logger LOG = Logger.getLogger(AuthenticationServiceImpl.class.getName()); - - // Authentication Service Configuration Information private String name = null; private String realmName = null;