From 958d04a42b0b073a220c9fdf7d45d3bc228556de Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Sat, 10 Nov 2012 06:47:59 +0900
Subject: [PATCH] Remove redundant throws clauses / Suppress inspections for
 some false positives

---
 .../netty/util/internal/SystemPropertyUtil.java  |  1 +
 .../SecureChatTrustManagerFactory.java           | 16 ++++++----------
 .../transport/socket/SocketSslEchoTest.java      |  7 ++-----
 .../main/java/com/sun/nio/sctp/SctpChannel.java  |  1 +
 .../java/com/sun/nio/sctp/SctpServerChannel.java |  2 +-
 5 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java b/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java
index 5ca340099c..0974cdf11a 100644
--- a/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java
+++ b/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
  */
 public final class SystemPropertyUtil {
 
+    @SuppressWarnings("all")
     private static boolean initializedLogger;
     private static final InternalLogger logger;
     private static boolean loggedException;
diff --git a/example/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java
index cfa8a37262..28dafea70f 100644
--- a/example/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java
+++ b/example/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java
@@ -15,16 +15,14 @@
  */
 package io.netty.example.securechat;
 
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-
 import javax.net.ssl.ManagerFactoryParameters;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactorySpi;
 import javax.net.ssl.X509TrustManager;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.cert.X509Certificate;
 
 /**
  * Bogus {@link TrustManagerFactorySpi} which accepts any certificate
@@ -39,8 +37,7 @@ public class SecureChatTrustManagerFactory extends TrustManagerFactorySpi {
         }
 
         @Override
-        public void checkClientTrusted(
-                X509Certificate[] chain, String authType) throws CertificateException {
+        public void checkClientTrusted(X509Certificate[] chain, String authType) {
             // Always trust - it is an example.
             // You should do something in the real world.
             // You will reach here only if you enabled client certificate auth,
@@ -50,8 +47,7 @@ public class SecureChatTrustManagerFactory extends TrustManagerFactorySpi {
         }
 
         @Override
-        public void checkServerTrusted(
-                X509Certificate[] chain, String authType) throws CertificateException {
+        public void checkServerTrusted(X509Certificate[] chain, String authType) {
             // Always trust - it is an example.
             // You should do something in the real world.
             System.err.println(
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
index a99530aaaf..2a963235a3 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketSslEchoTest.java
@@ -43,7 +43,6 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.Security;
-import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -275,14 +274,12 @@ public class SocketSslEchoTest extends AbstractSocketTest {
             }
 
             @Override
-            public void checkClientTrusted(
-                    X509Certificate[] chain, String authType) throws CertificateException {
+            public void checkClientTrusted(X509Certificate[] chain, String authType) {
                 // NOOP
             }
 
             @Override
-            public void checkServerTrusted(
-                    X509Certificate[] chain, String authType) throws CertificateException {
+            public void checkServerTrusted(X509Certificate[] chain, String authType) {
                 // NOOP
             }
         };
diff --git a/transport/src/main/java/com/sun/nio/sctp/SctpChannel.java b/transport/src/main/java/com/sun/nio/sctp/SctpChannel.java
index 4d0c906d0e..8545ecd7ef 100644
--- a/transport/src/main/java/com/sun/nio/sctp/SctpChannel.java
+++ b/transport/src/main/java/com/sun/nio/sctp/SctpChannel.java
@@ -23,6 +23,7 @@ import java.nio.channels.spi.AbstractSelectableChannel;
 import java.nio.channels.spi.SelectorProvider;
 import java.util.Set;
 
+@SuppressWarnings("all")
 public abstract class SctpChannel extends AbstractSelectableChannel {
     static {
         UnsupportedOperatingSystemException.raise();
diff --git a/transport/src/main/java/com/sun/nio/sctp/SctpServerChannel.java b/transport/src/main/java/com/sun/nio/sctp/SctpServerChannel.java
index 2b47d1daf3..0a2818488d 100644
--- a/transport/src/main/java/com/sun/nio/sctp/SctpServerChannel.java
+++ b/transport/src/main/java/com/sun/nio/sctp/SctpServerChannel.java
@@ -27,7 +27,7 @@ public abstract class SctpServerChannel extends AbstractSelectableChannel {
         UnsupportedOperatingSystemException.raise();
     }
 
-    public static SctpServerChannel open() throws IOException {
+    public static SctpServerChannel open() {
         return null;
     }