From 129aee8a920361dec1a1c3dabac62f58e25cf143 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 8 Aug 2016 11:47:47 +0200 Subject: [PATCH] Remove unused imports and not needed throws declarations. Motivation: In latest refeactoring we failed to cleanup imports and also there are some throws declarations which are not needed. Modifications: Cleanup imports and throws declarations Result: Cleaner code. --- .../io/netty/handler/ssl/OpenSslContext.java | 2 -- .../io/netty/handler/ssl/OpenSslEngine.java | 2 -- .../netty/handler/ssl/PemX509Certificate.java | 25 +++++-------------- .../ReferenceCountedOpenSslServerContext.java | 2 +- 4 files changed, 7 insertions(+), 24 deletions(-) diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSslContext.java b/handler/src/main/java/io/netty/handler/ssl/OpenSslContext.java index 5e9d36c7e1..46c0807d7f 100644 --- a/handler/src/main/java/io/netty/handler/ssl/OpenSslContext.java +++ b/handler/src/main/java/io/netty/handler/ssl/OpenSslContext.java @@ -16,8 +16,6 @@ package io.netty.handler.ssl; import io.netty.buffer.ByteBufAllocator; -import io.netty.util.internal.logging.InternalLogger; -import io.netty.util.internal.logging.InternalLoggerFactory; import java.security.cert.Certificate; diff --git a/handler/src/main/java/io/netty/handler/ssl/OpenSslEngine.java b/handler/src/main/java/io/netty/handler/ssl/OpenSslEngine.java index 3ab4232629..6155177f49 100644 --- a/handler/src/main/java/io/netty/handler/ssl/OpenSslEngine.java +++ b/handler/src/main/java/io/netty/handler/ssl/OpenSslEngine.java @@ -16,8 +16,6 @@ package io.netty.handler.ssl; import io.netty.buffer.ByteBufAllocator; -import io.netty.util.internal.logging.InternalLogger; -import io.netty.util.internal.logging.InternalLoggerFactory; import javax.net.ssl.SSLEngine; diff --git a/handler/src/main/java/io/netty/handler/ssl/PemX509Certificate.java b/handler/src/main/java/io/netty/handler/ssl/PemX509Certificate.java index 1d60c732f5..f5f3ee07da 100644 --- a/handler/src/main/java/io/netty/handler/ssl/PemX509Certificate.java +++ b/handler/src/main/java/io/netty/handler/ssl/PemX509Certificate.java @@ -16,16 +16,9 @@ package io.netty.handler.ssl; import java.math.BigInteger; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; import java.security.Principal; import java.security.PublicKey; -import java.security.SignatureException; import java.security.cert.CertificateEncodingException; -import java.security.cert.CertificateException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Date; @@ -261,7 +254,7 @@ public final class PemX509Certificate extends X509Certificate implements PemEnco } @Override - public byte[] getEncoded() throws CertificateEncodingException { + public byte[] getEncoded() { throw new UnsupportedOperationException(); } @@ -286,14 +279,12 @@ public final class PemX509Certificate extends X509Certificate implements PemEnco } @Override - public void checkValidity() throws CertificateExpiredException, - CertificateNotYetValidException { + public void checkValidity() { throw new UnsupportedOperationException(); } @Override - public void checkValidity(Date date) throws CertificateExpiredException, - CertificateNotYetValidException { + public void checkValidity(Date date) { throw new UnsupportedOperationException(); } @@ -328,7 +319,7 @@ public final class PemX509Certificate extends X509Certificate implements PemEnco } @Override - public byte[] getTBSCertificate() throws CertificateEncodingException { + public byte[] getTBSCertificate() { throw new UnsupportedOperationException(); } @@ -373,16 +364,12 @@ public final class PemX509Certificate extends X509Certificate implements PemEnco } @Override - public void verify(PublicKey key) - throws CertificateException, NoSuchAlgorithmException, - InvalidKeyException, NoSuchProviderException, SignatureException { + public void verify(PublicKey key) { throw new UnsupportedOperationException(); } @Override - public void verify(PublicKey key, String sigProvider) - throws CertificateException, NoSuchAlgorithmException, - InvalidKeyException, NoSuchProviderException, SignatureException { + public void verify(PublicKey key, String sigProvider) { throw new UnsupportedOperationException(); } diff --git a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslServerContext.java b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslServerContext.java index c0740298e6..a814e1392a 100644 --- a/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslServerContext.java +++ b/handler/src/main/java/io/netty/handler/ssl/ReferenceCountedOpenSslServerContext.java @@ -37,7 +37,7 @@ import static io.netty.util.internal.ObjectUtil.checkNotNull; *

Instances of this class must be {@link #release() released} or else native memory will leak! */ public final class ReferenceCountedOpenSslServerContext extends ReferenceCountedOpenSslContext { - private static final byte[] ID = new byte[] {'n', 'e', 't', 't', 'y'}; + private static final byte[] ID = {'n', 'e', 't', 't', 'y'}; private final OpenSslServerSessionContext sessionContext; private final OpenSslKeyMaterialManager keyMaterialManager;