This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.9
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.9 by this push:
new 4eb83fc3d ZOOKEEPER-4974: Remove enforced JDK 17 compilation warnings
4eb83fc3d is described below
commit 4eb83fc3df78ca3d28e61166c9a6d077ba249cb4
Author: Andor Molnár <[email protected]>
AuthorDate: Fri Sep 12 15:04:13 2025 -0500
ZOOKEEPER-4974: Remove enforced JDK 17 compilation warnings
Reviewers: ctubbsii
Author: anmolnar
Closes #2312 from anmolnar/ZOOKEEPER-4974
(cherry picked from commit 63bec256238e47d688638e3a308597a24a734bf0)
Signed-off-by: Andor Molnar <[email protected]>
---
.../java/org/apache/zookeeper/server/WorkerService.java | 14 +++-----------
.../apache/zookeeper/server/quorum/QuorumCnxManager.java | 5 +----
.../java/org/apache/zookeeper/common/X509TestHelpers.java | 4 ++--
.../org/apache/zookeeper/server/quorum/QuorumSSLTest.java | 2 +-
.../test/java/org/apache/zookeeper/test/X509AuthTest.java | 2 ++
5 files changed, 9 insertions(+), 18 deletions(-)
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/WorkerService.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/WorkerService.java
index 305d0e2ec..788506813 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/WorkerService.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/WorkerService.java
@@ -167,7 +167,6 @@ public void run() {
*/
private static class DaemonThreadFactory implements ThreadFactory {
- final ThreadGroup group;
final AtomicInteger threadNumber = new AtomicInteger(1);
final String namePrefix;
@@ -177,22 +176,15 @@ private static class DaemonThreadFactory implements
ThreadFactory {
DaemonThreadFactory(String name, int firstThreadNum) {
threadNumber.set(firstThreadNum);
- SecurityManager s = System.getSecurityManager();
- group = (s != null) ? s.getThreadGroup() :
Thread.currentThread().getThreadGroup();
namePrefix = name + "-";
}
+ @Override
public Thread newThread(Runnable r) {
- Thread t = new Thread(group, r, namePrefix +
threadNumber.getAndIncrement(), 0);
- if (!t.isDaemon()) {
- t.setDaemon(true);
- }
- if (t.getPriority() != Thread.NORM_PRIORITY) {
- t.setPriority(Thread.NORM_PRIORITY);
- }
+ Thread t = new Thread(r, namePrefix +
threadNumber.getAndIncrement());
+ t.setDaemon(true);
return t;
}
-
}
public void start() {
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
index db7f0090d..764b962ac 100644
---
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
+++
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
@@ -344,10 +344,7 @@ public QuorumCnxManager(QuorumPeer self, final long mySid,
Map<Long, QuorumPeer.
// can take extra time)
private void initializeConnectionExecutor(final long mySid, final int
quorumCnxnThreadsSize) {
final AtomicInteger threadIndex = new AtomicInteger(1);
- SecurityManager s = System.getSecurityManager();
- final ThreadGroup group = (s != null) ? s.getThreadGroup() :
Thread.currentThread().getThreadGroup();
-
- final ThreadFactory daemonThFactory = runnable -> new Thread(group,
runnable,
+ final ThreadFactory daemonThFactory = runnable -> new Thread(runnable,
String.format("QuorumConnectionThread-[myid=%d]-%d", mySid,
threadIndex.getAndIncrement()));
this.connectionExecutor = new ThreadPoolExecutor(3,
quorumCnxnThreadsSize, 60, TimeUnit.SECONDS,
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509TestHelpers.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509TestHelpers.java
index b9f2f6db9..067bf26bc 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509TestHelpers.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/common/X509TestHelpers.java
@@ -134,7 +134,7 @@ public static X509Certificate newCert(
throw new IllegalArgumentException("CA private key does not match
the public key in the CA cert");
}
Date now = new Date();
- X509v3CertificateBuilder builder = initCertBuilder(new
X500Name(caCert.getIssuerDN().getName()), now, new Date(
+ X509v3CertificateBuilder builder = initCertBuilder(new
X500Name(caCert.getIssuerX500Principal().getName()), now, new Date(
now.getTime()
+ expirationMillis), certSubject, certPublicKey);
builder.addExtension(Extension.basicConstraints, true, new
BasicConstraints(false)); // not a CA
@@ -346,7 +346,7 @@ public static byte[] certToBCFKSTrustStoreBytes(
private static byte[] certToTrustStoreBytes(X509Certificate cert, String
keyPassword, KeyStore trustStore) throws IOException, GeneralSecurityException {
char[] keyPasswordChars = keyPassword == null ? new char[0] :
keyPassword.toCharArray();
trustStore.load(null, keyPasswordChars);
- trustStore.setCertificateEntry(cert.getSubjectDN().toString(), cert);
+
trustStore.setCertificateEntry(cert.getSubjectX500Principal().toString(), cert);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
trustStore.store(outputStream, keyPasswordChars);
outputStream.flush();
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
index 820394bf8..5a3c55413 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/QuorumSSLTest.java
@@ -200,7 +200,7 @@ public void setup() throws Exception {
// Write the truststore
KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
trustStore.load(null, PASSWORD);
-
trustStore.setCertificateEntry(rootCertificate.getSubjectDN().toString(),
rootCertificate);
+
trustStore.setCertificateEntry(rootCertificate.getSubjectX500Principal().toString(),
rootCertificate);
FileOutputStream outputStream = new FileOutputStream(truststorePath);
trustStore.store(outputStream, PASSWORD);
outputStream.flush();
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/X509AuthTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/X509AuthTest.java
index 65925ec89..31477b543 100644
--- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/X509AuthTest.java
+++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/X509AuthTest.java
@@ -182,10 +182,12 @@ public BigInteger getSerialNumber() {
return null;
}
@Override
+ @Deprecated
public Principal getIssuerDN() {
return null;
}
@Override
+ @Deprecated
public Principal getSubjectDN() {
return null;
}
