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 511d1ce3e0e..e5eb2f7ec73 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 4bc9e46bbb7..1634cf08720 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 @@ -751,7 +751,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/microprofile/config/pom.xml b/appserver/microprofile/config/pom.xml index fd0b17e1758..2bf1f453c58 100644 --- a/appserver/microprofile/config/pom.xml +++ b/appserver/microprofile/config/pom.xml @@ -77,10 +77,8 @@ - org.glassfish.microprofile.config, - io.helidon.common.config, + io.helidon.config, io.helidon.config.mp, - io.helidon.config @@ -88,31 +86,14 @@ - groupId=io.helidon.microprofile.config, - groupId=io.helidon.config;artifactId=helidon-config-mp, - groupId=io.helidon.common;artifactId=helidon-common, - groupId=io.helidon.common;artifactId=helidon-common-service-loader, - groupId=io.helidon.config;artifactId=helidon-config-yaml-mp, - groupId=io.helidon.config;artifactId=helidon-config, - groupId=io.helidon.inject;artifactId=helidon-inject-api, - groupId=io.helidon.logging;artifactId=helidon-logging-common, - groupId=io.helidon.common;artifactId=helidon-common-types, - groupId=io.helidon.builder;artifactId=helidon-builder-api, - groupId=io.helidon.common;artifactId=helidon-common-config, - groupId=io.helidon.common;artifactId=helidon-common-mapper, - - groupId=io.helidon.common;artifactId=helidon-common-media-type, + groupId=io.helidon.config;artifactId=helidon-config-mp, + groupId=io.helidon.common;artifactId=helidon-common, + groupId=io.helidon.common;artifactId=helidon-common-service-loader, + groupId=io.helidon.config;artifactId=helidon-config-yaml-mp, + groupId=io.helidon.config;artifactId=helidon-config, + groupId=io.helidon.common;artifactId=helidon-common-media-type, groupId=io.helidon.config;artifactId=helidon-config-yaml, - artifactId=snakeyaml, - + artifactId=snakeyaml, 2.50.0 diff --git a/appserver/tests/tck/cdi/cdi-model/pom.xml b/appserver/tests/tck/cdi/cdi-model/pom.xml index 1f0984bfdf8..da72efc9464 100644 --- a/appserver/tests/tck/cdi/cdi-model/pom.xml +++ b/appserver/tests/tck/cdi/cdi-model/pom.xml @@ -1,7 +1,7 @@ 2.50.0 diff --git a/appserver/tests/tck/concurrency/pom.xml b/appserver/tests/tck/concurrency/pom.xml index 85541c02cdd..99de1478718 100644 --- a/appserver/tests/tck/concurrency/pom.xml +++ b/appserver/tests/tck/concurrency/pom.xml @@ -1,7 +1,7 @@