Minor cleanups

Signed-off-by: David Matějček <[email protected]>

Author: dmatej

appserver/itest-tools/src/main/java/org/glassfish/main/itest/tools/GlassFishTestEnvironment.java

@@ -371,10 +371,6 @@ private static File findStartServ(String... optionalPrefix) {
         return new File(GF_ROOT, isWindows() ? prefix + "bin/startserv.bat" : prefix + "bin/startserv");
     }
 
-    private static File findKeyTool() {
-        return new File(System.getProperty(JAVA_HOME.getSystemPropertyName()), isWindows() ? "bin/keytool.exe" : "bin/keytool");
-    }
-
     private static File findJarSigner() {
         return new File(System.getProperty(JAVA_HOME.getSystemPropertyName()), isWindows() ? "bin/jarsigner.exe" : "bin/jarsigner");
     }

appserver/tests/application/src/test/java/org/glassfish/main/test/app/synchronize/SynchronizeStandaloneInstanceTest.java

@@ -89,4 +89,4 @@ private static File createDeployment() {
         webArchive.as(ZipExporter.class).exportTo(warFile, true);
         return warFile;
     }
-}
+}

appserver/tests/quicklook/adminconsole/pom.xml

@@ -98,10 +98,5 @@
             <version>3.1</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.common</groupId>
-            <artifactId>amx-core</artifactId>
-            <version>7.1.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>

nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/KeystoreManager.java

@@ -100,7 +100,7 @@ protected void createKeyStore(File keyStore, RepositoryConfig config, String mas
     }
 
 
-    protected void copyCertificatesToTrustStore(File configRoot, DomainConfig config, String masterPassword)
+    protected final void copyCertificatesToTrustStore(File configRoot, DomainConfig config, String masterPassword)
         throws DomainException {
         final File keyStore = new File(configRoot, KEYSTORE_FILENAME_DEFAULT);
         final File trustStore = new File(configRoot, TRUSTSTORE_FILENAME_DEFAULT);

nucleus/security/services/src/main/java/org/glassfish/security/services/impl/JCEKSPasswordAliasStore.java

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation.
  * Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -13,15 +14,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-
 package org.glassfish.security.services.impl;
 
 import com.sun.enterprise.security.store.PasswordAdapter;
 import com.sun.enterprise.util.Utility;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -33,6 +32,8 @@
 
 import org.glassfish.api.admin.PasswordAliasStore;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 /**
  * Provides the PasswordAliasStore behavior using a JCEKS keystore.
  * <p>
@@ -59,9 +60,7 @@
  */
 public class JCEKSPasswordAliasStore implements PasswordAliasStore {
 
-    private final static Charset utf8 = Charset.forName("UTF-8");
-
-    private PasswordAdapter pa = null;
+    private PasswordAdapter pa;
     private String pathToAliasStore;
     private char[] storePassword;
 
@@ -101,7 +100,7 @@ public void clear() {
     @Override
     public void put(String alias, char[] password) {
         final CharBuffer charBuffer = CharBuffer.wrap(password);
-        final ByteBuffer byteBuffer = utf8.encode(charBuffer);
+        final ByteBuffer byteBuffer = UTF_8.encode(charBuffer);
         try {
             pa().setPasswordForAlias(alias, Utility.toByteArray(byteBuffer));
         } catch (Exception ex) {
@@ -150,7 +149,7 @@ public char[] get(String alias) {
         try {
             final SecretKey secretKey = pa().getPasswordSecretKeyForAlias(alias);
             final ByteBuffer byteBuffer = ByteBuffer.wrap(secretKey.getEncoded());
-            return Utility.toCharArray(utf8.decode(byteBuffer));
+            return Utility.toCharArray(UTF_8.decode(byteBuffer));
         } catch (Exception ex) {
             throw new RuntimeException(ex);
         }