You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/06/02 11:08:28 UTC

[3/5] karaf git commit: Various code cleanup

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java
index d998cf6..87dde8f 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCacheTest.java
@@ -73,7 +73,7 @@ public class LdapCacheTest extends AbstractLdapTestUnit {
             FileInputStream inputStream = new FileInputStream(f);
             String content = IOUtils.toString(inputStream, "UTF-8");
             inputStream.close();
-            content = content.replaceAll("portno", "" + super.getLdapServer().getPort());
+            content = content.replaceAll("portno", "" + getLdapServer().getPort());
 
             File f2 = new File(basedir + "/target/test-classes/org/apache/karaf/jaas/modules/ldap/ldap.properties");
             FileOutputStream outputStream = new FileOutputStream(f2);

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java
index ac5ba0e..e4d2035 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapCaseInsensitiveDNTest.java
@@ -67,7 +67,7 @@ public class LdapCaseInsensitiveDNTest extends LdapLoginModuleTest {
             FileInputStream inputStream = new FileInputStream(f);
             String content = IOUtils.toString(inputStream, "UTF-8");
             inputStream.close();
-            content = content.replaceAll("portno", "" + super.getLdapServer().getPort());
+            content = content.replaceAll("portno", "" + getLdapServer().getPort());
 
             File f2 = new File(basedir + "/target/test-classes/org/apache/karaf/jaas/modules/ldap/ldapCaseInsensitiveDN.properties");
             FileOutputStream outputStream = new FileOutputStream(f2);

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java
index a514283..e2c374a 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleTest.java
@@ -74,7 +74,7 @@ public class LdapLoginModuleTest extends AbstractLdapTestUnit {
             FileInputStream inputStream = new FileInputStream(f);
             String content = IOUtils.toString(inputStream, "UTF-8");
             inputStream.close();
-            content = content.replaceAll("portno", "" + super.getLdapServer().getPort());
+            content = content.replaceAll("portno", "" + getLdapServer().getPort());
 
             File f2 = new File(basedir + "/target/test-classes/org/apache/karaf/jaas/modules/ldap/ldap.properties");
             FileOutputStream outputStream = new FileOutputStream(f2);

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleWithEscapesTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleWithEscapesTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleWithEscapesTest.java
index 017eb27..9dc2272 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleWithEscapesTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapLoginModuleWithEscapesTest.java
@@ -56,7 +56,7 @@ public class LdapLoginModuleWithEscapesTest extends LdapLoginModuleTest {
             FileInputStream inputStream = new FileInputStream(f);
             String content = IOUtils.toString(inputStream, "UTF-8");
             inputStream.close();
-            content = content.replaceAll("portno", "" + super.getLdapServer().getPort());
+            content = content.replaceAll("portno", "" + getLdapServer().getPort());
 
             File f2 = new File(basedir + "/target/test-classes/org/apache/karaf/jaas/modules/ldap/ldap.properties");
             FileOutputStream outputStream = new FileOutputStream(f2);

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapSpecialCharsInPasswordTest.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapSpecialCharsInPasswordTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapSpecialCharsInPasswordTest.java
index f02bc53..7f5a90a 100644
--- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapSpecialCharsInPasswordTest.java
+++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/ldap/LdapSpecialCharsInPasswordTest.java
@@ -65,7 +65,7 @@ public class LdapSpecialCharsInPasswordTest extends LdapLoginModuleTest {
             FileInputStream inputStream = new FileInputStream(f);
             String content = IOUtils.toString(inputStream, "UTF-8");
             inputStream.close();
-            content = content.replaceAll("portno", "" + super.getLdapServer().getPort());
+            content = content.replaceAll("portno", "" + getLdapServer().getPort());
 
             File f2 = new File(basedir + "/target/test-classes/org/apache/karaf/jaas/modules/ldap/ldap_special_char_in_password.properties");
             FileOutputStream outputStream = new FileOutputStream(f2);
@@ -86,7 +86,7 @@ public class LdapSpecialCharsInPasswordTest extends LdapLoginModuleTest {
     
     @Before
     public void changeAdminPassword() throws Exception {
-        LdapConnection connection = new LdapNetworkConnection( "localhost", super.getLdapServer().getPort() );
+        LdapConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
         connection.bind( "uid=admin,ou=system", "secret");
         Dn adminDn = new Dn( "uid=admin,ou=system" );
         ModifyRequest modReq = new ModifyRequestImpl();
@@ -96,7 +96,7 @@ public class LdapSpecialCharsInPasswordTest extends LdapLoginModuleTest {
         connection.close();
         
         // check that we actually changed the admin connection password
-        connection = new LdapNetworkConnection( "localhost", super.getLdapServer().getPort() );
+        connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
         connection.bind( "uid=admin,ou=system", NEW_CONNECTION_PASSWORD);
         connection.close();
     }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jdbc/src/main/java/org/apache/karaf/jdbc/command/completers/SqlCompleter.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/karaf/jdbc/command/completers/SqlCompleter.java b/jdbc/src/main/java/org/apache/karaf/jdbc/command/completers/SqlCompleter.java
index eb3015d..75d8b2c 100644
--- a/jdbc/src/main/java/org/apache/karaf/jdbc/command/completers/SqlCompleter.java
+++ b/jdbc/src/main/java/org/apache/karaf/jdbc/command/completers/SqlCompleter.java
@@ -24,7 +24,6 @@ import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.apache.karaf.shell.api.console.CommandLine;
 import org.apache.karaf.shell.api.console.Completer;
 import org.apache.karaf.shell.api.console.Session;
-import org.apache.karaf.shell.support.completers.StringsCompleter;
 
 /**
  * Completer SQL

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jms/core/src/main/java/org/apache/karaf/jms/internal/JmsConnector.java
----------------------------------------------------------------------
diff --git a/jms/core/src/main/java/org/apache/karaf/jms/internal/JmsConnector.java b/jms/core/src/main/java/org/apache/karaf/jms/internal/JmsConnector.java
index 63ff95a..75c52ce 100644
--- a/jms/core/src/main/java/org/apache/karaf/jms/internal/JmsConnector.java
+++ b/jms/core/src/main/java/org/apache/karaf/jms/internal/JmsConnector.java
@@ -19,7 +19,6 @@ package org.apache.karaf.jms.internal;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 
 import javax.jms.Connection;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jms/core/src/main/java/org/apache/karaf/jms/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/jms/core/src/main/java/org/apache/karaf/jms/internal/osgi/Activator.java b/jms/core/src/main/java/org/apache/karaf/jms/internal/osgi/Activator.java
index 863a092..1dd1c09 100644
--- a/jms/core/src/main/java/org/apache/karaf/jms/internal/osgi/Activator.java
+++ b/jms/core/src/main/java/org/apache/karaf/jms/internal/osgi/Activator.java
@@ -7,7 +7,6 @@ import org.apache.karaf.shell.api.console.CommandLoggingFilter;
 import org.apache.karaf.shell.support.RegexCommandLoggingFilter;
 import org.apache.karaf.util.tracker.BaseActivator;
 import org.apache.karaf.util.tracker.annotation.ProvideService;
-import org.apache.karaf.util.tracker.annotation.RequireService;
 import org.apache.karaf.util.tracker.annotation.Services;
 
 @Services(

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java
----------------------------------------------------------------------
diff --git a/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java b/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java
index fe72394..941732e 100644
--- a/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java
+++ b/jms/pool/src/main/java/org/apache/karaf/jms/pool/internal/PooledSession.java
@@ -46,7 +46,6 @@ import javax.jms.TopicSubscriber;
 import javax.jms.XASession;
 import javax.transaction.xa.XAResource;
 import java.io.Serializable;
-import java.util.Iterator;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class PooledSession implements Session, TopicSession, QueueSession, XASession {

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jndi/src/main/java/org/apache/karaf/jndi/JndiMBean.java
----------------------------------------------------------------------
diff --git a/jndi/src/main/java/org/apache/karaf/jndi/JndiMBean.java b/jndi/src/main/java/org/apache/karaf/jndi/JndiMBean.java
index 2a4f4f9..ff5c619 100644
--- a/jndi/src/main/java/org/apache/karaf/jndi/JndiMBean.java
+++ b/jndi/src/main/java/org/apache/karaf/jndi/JndiMBean.java
@@ -31,7 +31,7 @@ public interface JndiMBean {
      * @return The MBean attribute containing the {@link Map} of names/class names.
      * @throws MBeanException If the MBean fails.
      */
-    public Map<String, String> getNames() throws MBeanException;
+    Map<String, String> getNames() throws MBeanException;
 
     /**
      * Get a list of JNDI sub-contexts (as attribute).
@@ -39,7 +39,7 @@ public interface JndiMBean {
      * @return The MBean attribute containing the {@link List} of sub-contexts.
      * @throws MBeanException If the MBean fails.
      */
-    public List<String> getContexts() throws MBeanException;
+    List<String> getContexts() throws MBeanException;
 
     /**
      * Get a {@link Map} of JNDI names/class names children of a given base context.
@@ -48,7 +48,7 @@ public interface JndiMBean {
      * @return The {@link Map} of names/class names.
      * @throws MBeanException If the MBean fails.
      */
-    public Map<String, String> getNames(String context) throws MBeanException;
+    Map<String, String> getNames(String context) throws MBeanException;
 
     /**
      * Get a {@link List} of JNDI sub-contexts children of a given base context.
@@ -57,7 +57,7 @@ public interface JndiMBean {
      * @return The {@link List} of sub-contexts.
      * @throws MBeanException If the MBean fails.
      */
-    public List<String> getContexts(String context) throws MBeanException;
+    List<String> getContexts(String context) throws MBeanException;
 
     /**
      * Create a JNDI sub-context.
@@ -65,7 +65,7 @@ public interface JndiMBean {
      * @param context The JNDI sub-context name.
      * @throws MBeanException If the MBean fails.
      */
-    public void create(String context) throws MBeanException;
+    void create(String context) throws MBeanException;
 
     /**
      * Delete a JNDI sub-context.
@@ -73,7 +73,7 @@ public interface JndiMBean {
      * @param context The JNDI sub-context name.
      * @throws MBeanException If the MBean fails.
      */
-    public void delete(String context) throws MBeanException;
+    void delete(String context) throws MBeanException;
 
     /**
      * Create another JNDI name (alias) for a given one.
@@ -82,7 +82,7 @@ public interface JndiMBean {
      * @param alias The JNDI alias name.
      * @throws MBeanException If the MBean fails.
      */
-    public void alias(String name, String alias) throws MBeanException;
+    void alias(String name, String alias) throws MBeanException;
 
     /**
      * Bind an OSGi service with a JNDI name.
@@ -91,7 +91,7 @@ public interface JndiMBean {
      * @param name The JNDI name.
      * @throws MBeanException If the MBean fails.
      */
-    public void bind(Long serviceId, String name) throws MBeanException;
+    void bind(Long serviceId, String name) throws MBeanException;
 
     /**
      * Unbind a given JNDI name.
@@ -99,6 +99,6 @@ public interface JndiMBean {
      * @param name The JNDI name.
      * @throws MBeanException If the MBean fails.
      */
-    public void unbind(String name) throws MBeanException;
+    void unbind(String name) throws MBeanException;
 
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
----------------------------------------------------------------------
diff --git a/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java b/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
index 83afe4e..9df0f33 100644
--- a/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
+++ b/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
@@ -241,7 +241,7 @@ public class JndiServiceImpl implements JndiService {
                 ServiceReference<?>[] services = bundle.getRegisteredServices();
                 if (services != null) {
                     for (ServiceReference service : services) {
-                        if (service.getProperty(OSGI_JNDI_SERVICE_PROPERTY) != null && ((String) service.getProperty(OSGI_JNDI_SERVICE_PROPERTY)).equals(name.substring(OSGI_JNDI_CONTEXT_PREFIX.length() + 1))) {
+                        if (service.getProperty(OSGI_JNDI_SERVICE_PROPERTY) != null && service.getProperty(OSGI_JNDI_SERVICE_PROPERTY).equals(name.substring(OSGI_JNDI_CONTEXT_PREFIX.length() + 1))) {
                             Object actualService = bundleContext.getService(service);
                             try {
                                 if (proxyManager.isProxy(actualService)) {

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
----------------------------------------------------------------------
diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
index c4d459f..22e45c4 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/Kar.java
@@ -20,7 +20,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
----------------------------------------------------------------------
diff --git a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
index c8f270c..c48b029 100644
--- a/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
+++ b/kar/src/main/java/org/apache/karaf/kar/internal/KarServiceImpl.java
@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -365,7 +364,7 @@ public class KarServiceImpl implements KarService {
         return featureSet;
     }
 
-    private Manifest createNonAutoStartManifest(URI repoUri) throws UnsupportedEncodingException, IOException {
+    private Manifest createNonAutoStartManifest(URI repoUri) throws IOException {
         String manifestSt = "Manifest-Version: 1.0\n" +
             Kar.MANIFEST_ATTR_KARAF_FEATURE_START +": false\n" +
             Kar.MANIFEST_ATTR_KARAF_FEATURE_REPOS + ": " + repoUri.toString() + "\n";

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/log/src/main/java/org/apache/karaf/log/command/LoadTest.java
----------------------------------------------------------------------
diff --git a/log/src/main/java/org/apache/karaf/log/command/LoadTest.java b/log/src/main/java/org/apache/karaf/log/command/LoadTest.java
index ab8514f..c6dbead 100644
--- a/log/src/main/java/org/apache/karaf/log/command/LoadTest.java
+++ b/log/src/main/java/org/apache/karaf/log/command/LoadTest.java
@@ -16,11 +16,9 @@
  */
 package org.apache.karaf.log.command;
 
-import org.apache.karaf.log.core.LogService;
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Command;
 import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.apache.karaf.shell.api.action.lifecycle.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/log/src/main/java/org/apache/karaf/log/core/LogEventFormatter.java
----------------------------------------------------------------------
diff --git a/log/src/main/java/org/apache/karaf/log/core/LogEventFormatter.java b/log/src/main/java/org/apache/karaf/log/core/LogEventFormatter.java
index 71fe275..b27fc3a 100644
--- a/log/src/main/java/org/apache/karaf/log/core/LogEventFormatter.java
+++ b/log/src/main/java/org/apache/karaf/log/core/LogEventFormatter.java
@@ -20,6 +20,6 @@ import org.ops4j.pax.logging.spi.PaxLoggingEvent;
 
 public interface LogEventFormatter {
 
-    public abstract String format(PaxLoggingEvent event, String overridenPattern, boolean noColor);
+    String format(PaxLoggingEvent event, String overridenPattern, boolean noColor);
 
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java b/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
index 6d8c99a..a0c7a39 100644
--- a/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
+++ b/main/src/main/java/org/apache/karaf/main/KarafActivatorManager.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.jar.Manifest;
-import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/main/src/main/java/org/apache/karaf/main/Status.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/Status.java b/main/src/main/java/org/apache/karaf/main/Status.java
index 4ac8b1a..10ccf51 100644
--- a/main/src/main/java/org/apache/karaf/main/Status.java
+++ b/main/src/main/java/org/apache/karaf/main/Status.java
@@ -72,7 +72,7 @@ public class Status {
         }
     }
 
-    private static int getPortFromShutdownPortFile(String portFile) throws FileNotFoundException, IOException {
+    private static int getPortFromShutdownPortFile(String portFile) throws IOException {
         int port;
         BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(portFile)));
         String portStr = r.readLine();

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/main/src/main/java/org/apache/karaf/main/Stop.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/Stop.java b/main/src/main/java/org/apache/karaf/main/Stop.java
index d6af16d..060854f 100644
--- a/main/src/main/java/org/apache/karaf/main/Stop.java
+++ b/main/src/main/java/org/apache/karaf/main/Stop.java
@@ -72,7 +72,7 @@ public class Stop {
 
     }
 
-    private static int getPortFromShutdownPortFile(String portFile) throws FileNotFoundException, IOException {
+    private static int getPortFromShutdownPortFile(String portFile) throws IOException {
         int port;
         BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(portFile)));
         String portStr = r.readLine();

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
----------------------------------------------------------------------
diff --git a/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java b/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
index 3fa02b8..d32e081 100644
--- a/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
+++ b/management/server/src/main/java/org/apache/karaf/management/ConnectorServerFactory.java
@@ -44,7 +44,7 @@ import javax.rmi.ssl.SslRMIClientSocketFactory;
 
 public class ConnectorServerFactory {
 
-    private enum AuthenticatorType {NONE, PASSWORD, CERTIFICATE};
+    private enum AuthenticatorType {NONE, PASSWORD, CERTIFICATE}
 
     private MBeanServer server;
     private KarafMBeanServerGuard guard;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/management/server/src/main/java/org/apache/karaf/management/JMXSecurityMBean.java
----------------------------------------------------------------------
diff --git a/management/server/src/main/java/org/apache/karaf/management/JMXSecurityMBean.java b/management/server/src/main/java/org/apache/karaf/management/JMXSecurityMBean.java
index 93dc784..5068766 100644
--- a/management/server/src/main/java/org/apache/karaf/management/JMXSecurityMBean.java
+++ b/management/server/src/main/java/org/apache/karaf/management/JMXSecurityMBean.java
@@ -33,13 +33,13 @@ public interface JMXSecurityMBean {
      * {@link #CAN_INVOKE_RESULT_ROW_TYPE} entries.
      * It has a composite key composed by the "ObjectName" and "Method" columns.
      */
-    static final TabularType CAN_INVOKE_TABULAR_TYPE = SecurityMBeanOpenTypeInitializer.TABULAR_TYPE;
+    TabularType CAN_INVOKE_TABULAR_TYPE = SecurityMBeanOpenTypeInitializer.TABULAR_TYPE;
 
     /**
      * A row as returned by the {@link #CAN_INVOKE_TABULAR_TYPE}. The columns of the row are defined
      * by {@link #CAN_INVOKE_RESULT_COLUMNS}
      */
-    static final CompositeType CAN_INVOKE_RESULT_ROW_TYPE = SecurityMBeanOpenTypeInitializer.ROW_TYPE;
+    CompositeType CAN_INVOKE_RESULT_ROW_TYPE = SecurityMBeanOpenTypeInitializer.ROW_TYPE;
 
     /**
      * The columns contained in a {@link #CAN_INVOKE_RESULT_ROW_TYPE}. The data types for these columns are
@@ -50,7 +50,7 @@ public interface JMXSecurityMBean {
      *     <li>"CanInvoke": {@link SimpleType#BOOLEAN}</li>
      * </ul>
      */
-    static final String[] CAN_INVOKE_RESULT_COLUMNS = SecurityMBeanOpenTypeInitializer.COLUMNS;
+    String[] CAN_INVOKE_RESULT_COLUMNS = SecurityMBeanOpenTypeInitializer.COLUMNS;
 
     /**
      * Checks whether the current user can invoke any methods on a JMX MBean.
@@ -109,7 +109,7 @@ public interface JMXSecurityMBean {
     TabularData canInvoke(Map<String, List<String>> bulkQuery) throws Exception;
 
     // a member class is used to initialize final fields, as this needs to do some exception handling...
-    static class SecurityMBeanOpenTypeInitializer {
+    class SecurityMBeanOpenTypeInitializer {
 
         private static final String[] COLUMNS = new String[]{ "ObjectName", "Method", "CanInvoke" };
         private static final CompositeType ROW_TYPE;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
----------------------------------------------------------------------
diff --git a/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java b/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
index 360b9cd..a08ef20 100644
--- a/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
+++ b/management/server/src/main/java/org/apache/karaf/management/RmiRegistryFactory.java
@@ -20,7 +20,6 @@ import org.osgi.framework.BundleContext;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
-import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.UnknownHostException;
@@ -35,9 +34,6 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
 
-import javax.net.ServerSocketFactory;
-import javax.net.SocketFactory;
-
 public class RmiRegistryFactory {
 
     private int port = Registry.REGISTRY_PORT;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/package/src/main/java/org/apache/karaf/packages/core/PackageService.java
----------------------------------------------------------------------
diff --git a/package/src/main/java/org/apache/karaf/packages/core/PackageService.java b/package/src/main/java/org/apache/karaf/packages/core/PackageService.java
index 0e68b43..b6ef349 100644
--- a/package/src/main/java/org/apache/karaf/packages/core/PackageService.java
+++ b/package/src/main/java/org/apache/karaf/packages/core/PackageService.java
@@ -17,7 +17,6 @@
 package org.apache.karaf.packages.core;
 
 import java.util.List;
-import java.util.SortedMap;
 
 public interface PackageService {
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/package/src/main/java/org/apache/karaf/packages/core/internal/PackageServiceImpl.java
----------------------------------------------------------------------
diff --git a/package/src/main/java/org/apache/karaf/packages/core/internal/PackageServiceImpl.java b/package/src/main/java/org/apache/karaf/packages/core/internal/PackageServiceImpl.java
index ce80ffa..9bb7bd5 100644
--- a/package/src/main/java/org/apache/karaf/packages/core/internal/PackageServiceImpl.java
+++ b/package/src/main/java/org/apache/karaf/packages/core/internal/PackageServiceImpl.java
@@ -17,8 +17,6 @@
 package org.apache.karaf.packages.core.internal;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/package/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java
----------------------------------------------------------------------
diff --git a/package/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java b/package/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java
index 57d098f..a929ec2 100644
--- a/package/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java
+++ b/package/src/main/java/org/apache/karaf/packages/core/internal/PackagesMBeanImpl.java
@@ -17,7 +17,6 @@
 package org.apache.karaf.packages.core.internal;
 
 import java.util.List;
-import java.util.SortedMap;
 
 import javax.management.NotCompliantMBeanException;
 import javax.management.StandardMBean;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/package/src/main/java/org/apache/karaf/packages/core/internal/filter/SimpleItem.java
----------------------------------------------------------------------
diff --git a/package/src/main/java/org/apache/karaf/packages/core/internal/filter/SimpleItem.java b/package/src/main/java/org/apache/karaf/packages/core/internal/filter/SimpleItem.java
index 6c71341..6563c44 100644
--- a/package/src/main/java/org/apache/karaf/packages/core/internal/filter/SimpleItem.java
+++ b/package/src/main/java/org/apache/karaf/packages/core/internal/filter/SimpleItem.java
@@ -17,7 +17,8 @@
 package org.apache.karaf.packages.core.internal.filter;
 
 public class SimpleItem implements Expression {
-    enum FilterType { equal, gt, lt }; 
+    enum FilterType { equal, gt, lt }
+
     public String attr;
     public FilterType filterType;
     public String value;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/package/src/test/java/org/apache/karaf/packages/command/PackageImportTest.java
----------------------------------------------------------------------
diff --git a/package/src/test/java/org/apache/karaf/packages/command/PackageImportTest.java b/package/src/test/java/org/apache/karaf/packages/command/PackageImportTest.java
index 311dcf0..65dfc39 100644
--- a/package/src/test/java/org/apache/karaf/packages/command/PackageImportTest.java
+++ b/package/src/test/java/org/apache/karaf/packages/command/PackageImportTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.karaf.packages.command;
 
-import org.apache.karaf.packages.core.internal.filter.Expression;
-import org.apache.karaf.packages.core.internal.filter.FilterParser;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class PackageImportTest {

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 604b00d..790846f 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -53,7 +53,6 @@ import java.util.zip.ZipInputStream;
 
 import org.apache.felix.resolver.ResolverImpl;
 import org.apache.felix.utils.manifest.Clause;
-import org.apache.felix.utils.properties.InterpolationHelper;
 import org.apache.felix.utils.properties.Properties;
 import org.apache.felix.utils.version.VersionRange;
 import org.apache.felix.utils.version.VersionTable;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/profile/src/main/java/org/apache/karaf/profile/assembly/CustomDownloadManager.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/CustomDownloadManager.java b/profile/src/main/java/org/apache/karaf/profile/assembly/CustomDownloadManager.java
index b8bf017..ff49f11 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/CustomDownloadManager.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/CustomDownloadManager.java
@@ -19,7 +19,6 @@ package org.apache.karaf.profile.assembly;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
 
-import org.apache.karaf.features.FeaturesService;
 import org.apache.karaf.features.internal.download.Downloader;
 import org.apache.karaf.features.internal.download.impl.AbstractDownloadTask;
 import org.apache.karaf.features.internal.download.impl.MavenDownloadManager;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/profile/src/main/java/org/apache/karaf/profile/command/ProfileEdit.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/command/ProfileEdit.java b/profile/src/main/java/org/apache/karaf/profile/command/ProfileEdit.java
index 553d9fa..1b986ee 100644
--- a/profile/src/main/java/org/apache/karaf/profile/command/ProfileEdit.java
+++ b/profile/src/main/java/org/apache/karaf/profile/command/ProfileEdit.java
@@ -16,8 +16,6 @@
  */
 package org.apache.karaf.profile.command;
 
-import java.io.IOException;
-import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.Dictionary;
 import java.util.Enumeration;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/profile/src/main/java/org/apache/karaf/profile/impl/PlaceholderResolvers.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/impl/PlaceholderResolvers.java b/profile/src/main/java/org/apache/karaf/profile/impl/PlaceholderResolvers.java
index dc46a23..898a619 100644
--- a/profile/src/main/java/org/apache/karaf/profile/impl/PlaceholderResolvers.java
+++ b/profile/src/main/java/org/apache/karaf/profile/impl/PlaceholderResolvers.java
@@ -21,8 +21,6 @@ import java.util.Map;
 import org.apache.karaf.profile.PlaceholderResolver;
 import org.osgi.framework.BundleContext;
 
-import static org.apache.karaf.profile.impl.Utils.assertNotNull;
-
 public final class PlaceholderResolvers {
 
     private PlaceholderResolvers() { }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java
----------------------------------------------------------------------
diff --git a/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java b/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java
index a0e2315..623a2ca 100644
--- a/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java
+++ b/profile/src/test/java/org/apache/karaf/profile/assembly/BuilderTest.java
@@ -18,7 +18,6 @@ package org.apache.karaf.profile.assembly;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.Writer;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java
----------------------------------------------------------------------
diff --git a/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java b/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java
index 90bd766..7bb3a8b 100644
--- a/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java
+++ b/scheduler/src/main/java/org/apache/karaf/scheduler/Scheduler.java
@@ -17,7 +17,6 @@
 package org.apache.karaf.scheduler;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 import org.quartz.SchedulerException;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
----------------------------------------------------------------------
diff --git a/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java b/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
index 47315db..480eecf 100644
--- a/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
+++ b/scr/management/src/main/java/org/apache/karaf/scr/management/internal/ScrServiceMBeanImpl.java
@@ -128,7 +128,7 @@ public class ScrServiceMBeanImpl extends StandardMBean implements ScrServiceMBea
 
     public boolean isComponentActive(String componentName) throws MBeanException {
         try {
-            return (componentState(componentName) == Component.STATE_ACTIVE) ? true : false;
+            return componentState(componentName) == Component.STATE_ACTIVE;
         } catch (Exception e) {
             throw new MBeanException(null, e.toString());
         }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/service/guard/src/main/java/org/apache/karaf/service/guard/tools/ACLConfigurationParser.java
----------------------------------------------------------------------
diff --git a/service/guard/src/main/java/org/apache/karaf/service/guard/tools/ACLConfigurationParser.java b/service/guard/src/main/java/org/apache/karaf/service/guard/tools/ACLConfigurationParser.java
index 55e4577..2bf6f03 100644
--- a/service/guard/src/main/java/org/apache/karaf/service/guard/tools/ACLConfigurationParser.java
+++ b/service/guard/src/main/java/org/apache/karaf/service/guard/tools/ACLConfigurationParser.java
@@ -29,7 +29,7 @@ public class ACLConfigurationParser {
         NAME_MATCH,
         WILDCARD_MATCH,
         NO_MATCH
-    };
+    }
 
     static String compulsoryRoles;
     

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
----------------------------------------------------------------------
diff --git a/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java b/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
index 64e51ec..9045ec9 100644
--- a/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
+++ b/service/guard/src/test/java/org/apache/karaf/service/guard/impl/GuardProxyCatalogTest.java
@@ -280,7 +280,7 @@ public class GuardProxyCatalogTest {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @Test
     public void testAssignRoles3() throws Exception {
-        abstract class MyAbstractClass implements TestServiceAPI, TestServiceAPI2 {};
+        abstract class MyAbstractClass implements TestServiceAPI, TestServiceAPI2 {}
 
         Dictionary<String, Object> config = new Hashtable<>();
         config.put(Constants.SERVICE_PID, "foobar");
@@ -406,7 +406,7 @@ public class GuardProxyCatalogTest {
             public String doit() {
                 return "Doing it";
             }
-        };
+        }
 
         Dictionary<String, Object> c1 = new Hashtable<>();
         c1.put(Constants.SERVICE_PID, "foobar");
@@ -613,7 +613,7 @@ public class GuardProxyCatalogTest {
             public String getName() {
                 return "role1";
             }
-        };
+        }
 
         Dictionary<String, Object> c1 = new Hashtable<>();
         c1.put(Constants.SERVICE_PID, "foobar");

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/services/coordinator/src/main/java/org/eclipse/osgi/util/NLS.java
----------------------------------------------------------------------
diff --git a/services/coordinator/src/main/java/org/eclipse/osgi/util/NLS.java b/services/coordinator/src/main/java/org/eclipse/osgi/util/NLS.java
index 7466346..517963d 100644
--- a/services/coordinator/src/main/java/org/eclipse/osgi/util/NLS.java
+++ b/services/coordinator/src/main/java/org/eclipse/osgi/util/NLS.java
@@ -82,7 +82,7 @@ public class NLS {
                     try {
                         number = Integer.parseInt(message.substring(i, index));
                     } catch (NumberFormatException e) {
-                        throw (IllegalArgumentException) new IllegalArgumentException().initCause(e);
+                        throw new IllegalArgumentException(e);
                     }
                     if (bindings == null || number >= bindings.length || number < 0) {
                         buffer.append("<missing argument>"); //$NON-NLS-1$

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
index c2c7589..020badd 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/InfoBundleTrackerCustomizer.java
@@ -18,7 +18,6 @@ package org.apache.karaf.shell.commands.impl.info;
 
 import org.apache.karaf.shell.commands.info.InfoProvider;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.util.tracker.BundleTrackerCustomizer;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
index b66cfae..d6bd0ab 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/info/InfoProvider.java
@@ -23,8 +23,8 @@ import java.util.Properties;
  */
 public interface InfoProvider {
 
-    public String getName();
+    String getName();
 
-    public Properties getProperties();
+    Properties getProperties();
 
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java b/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
index 33c15bf..6916da8 100644
--- a/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
+++ b/shell/console/src/main/java/org/apache/felix/gogo/commands/Argument.java
@@ -31,7 +31,7 @@ import java.lang.annotation.ElementType;
 @Deprecated
 public @interface Argument {
 
-    public static final String DEFAULT_STRING = "DEFAULT";
+    String DEFAULT_STRING = "DEFAULT";
 
     String DEFAULT = "##default";
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java b/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
index 1ce6f75..166fd5e 100644
--- a/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
+++ b/shell/console/src/main/java/org/apache/felix/gogo/commands/Option.java
@@ -31,7 +31,7 @@ import java.lang.annotation.ElementType;
 @Deprecated
 public @interface Option {
 
-    public static final String DEFAULT_STRING = "DEFAULT";
+    String DEFAULT_STRING = "DEFAULT";
 
     String name();
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java
index d878cec..ca5679a 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java
@@ -31,7 +31,7 @@ import java.lang.annotation.ElementType;
 @Deprecated
 public @interface Argument
 {
-    public static final String DEFAULT_STRING= "DEFAULT";
+    String DEFAULT_STRING= "DEFAULT";
 
     String DEFAULT = "##default";
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
index 2945e83..00af0ec 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
@@ -24,8 +24,8 @@ import java.util.Properties;
 @Deprecated
 public interface InfoProvider {
 
-	public String getName();
+	String getName();
 
-	public Properties getProperties();
+	Properties getProperties();
 
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java
index 44a3e0a..58c5400 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java
@@ -31,7 +31,7 @@ import java.lang.annotation.Target;
 @Deprecated
 public @interface Option
 {
-    public static final String DEFAULT_STRING= "DEFAULT";
+    String DEFAULT_STRING= "DEFAULT";
 
     String name();
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
index fd97055..7b561e5 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
@@ -43,7 +43,6 @@ import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.HelpOption;
 import org.apache.karaf.shell.commands.Option;
-import org.apache.karaf.shell.commands.ansi.SimpleAnsi;
 import org.apache.karaf.shell.console.Completer;
 
 public class ActionMetaData {

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java
index 4ca0d6b..3c1b4d1 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java
@@ -35,7 +35,6 @@ import java.util.Set;
 import org.apache.felix.gogo.commands.Action;
 import org.apache.felix.service.command.CommandSession;
 import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.CommandWithAction;
 import org.apache.karaf.shell.commands.CompleterValues;
 import org.apache.karaf.shell.commands.HelpOption;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java b/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
index 90d5b21..0511324 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
@@ -82,9 +82,6 @@ public class NameScoping {
             return false;
 
         Object value = session.get(MULTI_SCOPE_MODE_KEY);
-        if (value != null && value.equals("false")) {
-            return false;
-        }
-        return true;
+        return !(value != null && value.equals("false"));
     }
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/api/action/Argument.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/api/action/Argument.java b/shell/core/src/main/java/org/apache/karaf/shell/api/action/Argument.java
index 6fc25b3..b0268a2 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/api/action/Argument.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/api/action/Argument.java
@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 public @interface Argument
 {
-    public static final String DEFAULT_STRING= "DEFAULT";
+    String DEFAULT_STRING= "DEFAULT";
 
     String DEFAULT = "##default";
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java b/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
index 62c9510..bd15244 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/api/action/Option.java
@@ -44,7 +44,7 @@ import java.lang.annotation.Target;
 @Target({ElementType.FIELD})
 public @interface Option
 {
-    public static final String DEFAULT_STRING= "DEFAULT";
+    String DEFAULT_STRING= "DEFAULT";
 
     /**
      * The name of this option.  Usually starting with a '-'.

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java b/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java
index a4b59af..f8224dd 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java
@@ -70,7 +70,7 @@ public enum Signal {
 
     private final int numeric;
 
-    private Signal(int numeric) {
+    Signal(int numeric) {
         this.numeric = numeric;
     }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
index a1f3c60..d32703a 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
@@ -112,7 +112,7 @@ public class DefaultActionPreparator {
                 paramValue = (String)param;
             }
             if (param instanceof Token) {
-                paramValue = ((Token)param).toString();
+                paramValue = param.toString();
             }
 
             if (processOptions

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
index b5004bc..f6eec8e 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/KarafTerminal.java
@@ -22,17 +22,12 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
 
 import org.apache.karaf.shell.api.console.Terminal;
 import org.jline.terminal.Attributes;
 import org.jline.terminal.Size;
 import org.jline.terminal.impl.AbstractTerminal;
 import org.jline.utils.InfoCmp;
-import org.jline.utils.InfoCmp.Capability;
 import org.jline.utils.NonBlockingReader;
 
 public class KarafTerminal extends AbstractTerminal implements org.jline.terminal.Terminal {

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java
index 6c0cad4..0b87ccc 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java
@@ -27,12 +27,10 @@ import org.apache.felix.gogo.runtime.EOFError;
 import org.apache.felix.gogo.runtime.Parser.Program;
 import org.apache.felix.gogo.runtime.Parser.Statement;
 import org.apache.felix.gogo.runtime.SyntaxError;
-import org.apache.felix.gogo.runtime.Token;
 import org.apache.karaf.shell.api.console.Command;
 import org.apache.karaf.shell.api.console.CommandLine;
 import org.apache.karaf.shell.api.console.Parser;
 import org.apache.karaf.shell.api.console.Session;
-import org.apache.karaf.shell.support.parsing.DefaultParser;
 import org.jline.reader.ParsedLine;
 
 public class KarafParser implements org.jline.reader.Parser {

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
index b37178a..ee29c82 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
@@ -24,10 +24,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.Reader;
-import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/support/NameScoping.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/NameScoping.java b/shell/core/src/main/java/org/apache/karaf/shell/support/NameScoping.java
index 4249fed..561f39d 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/support/NameScoping.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/support/NameScoping.java
@@ -81,9 +81,6 @@ public class NameScoping {
             return false;
 
         Object value = session.get(MULTI_SCOPE_MODE_KEY);
-        if (value != null && value.equals("false")) {
-            return false;
-        }
-        return true;
+        return !(value != null && value.equals("false"));
     }
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/core/src/main/java/org/apache/karaf/shell/support/terminal/SignalSupport.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/terminal/SignalSupport.java b/shell/core/src/main/java/org/apache/karaf/shell/support/terminal/SignalSupport.java
index b0c2b8c..42afbb9 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/support/terminal/SignalSupport.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/support/terminal/SignalSupport.java
@@ -19,7 +19,6 @@
 package org.apache.karaf.shell.support.terminal;
 
 import java.util.EnumSet;
-import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
index c5d1781..ab254aa 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java
@@ -32,7 +32,6 @@ import org.apache.karaf.util.tracker.BaseActivator;
 import org.apache.karaf.util.tracker.annotation.Managed;
 import org.apache.karaf.util.tracker.annotation.RequireService;
 import org.apache.karaf.util.tracker.annotation.Services;
-import org.apache.sshd.common.NamedFactory;
 import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.forward.AcceptAllForwardingFilter;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java
index 38a25e1..0f3e4e4 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafAgentFactory.java
@@ -40,7 +40,6 @@ import org.apache.sshd.common.channel.Channel;
 import org.apache.sshd.common.session.ConnectionService;
 import org.apache.sshd.common.session.Session;
 import org.apache.sshd.server.session.ServerSession;
-import org.omg.PortableInterceptor.INACTIVE;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
index 364bafe..2a11a88 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/ShellFactoryImpl.java
@@ -24,14 +24,12 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
-import java.security.PrivilegedAction;
 import java.util.Map;
 
 import javax.security.auth.Subject;
 
 import org.apache.karaf.shell.api.console.Session;
 import org.apache.karaf.shell.api.console.SessionFactory;
-import org.apache.karaf.shell.api.console.Terminal;
 import org.apache.karaf.shell.support.ShellUtil;
 import org.apache.karaf.util.jaas.JaasHelper;
 import org.apache.sshd.common.Factory;
@@ -109,7 +107,7 @@ public class ShellFactoryImpl implements Factory<Command> {
                 JaasHelper.runAs(subject, () ->
                     new Thread(shell, "Karaf ssh console user " + ShellUtil.getCurrentUserName()).start());
             } catch (Exception e) {
-                throw (IOException) new IOException("Unable to start shell").initCause(e);
+                throw new IOException("Unable to start shell", e);
             }
         }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
index 256bb3b..badbf1b 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshAction.java
@@ -304,7 +304,7 @@ public class SshAction implements Action {
         return term != null ? term.getHeight() : 25;
     }
 
-    private static ClientSession connectWithRetries(SshClient client, String username, String host, int port, int maxAttempts) throws Exception, InterruptedException {
+    private static ClientSession connectWithRetries(SshClient client, String username, String host, int port, int maxAttempts) throws Exception {
         ClientSession session = null;
         int retries = 0;
         do {

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java
----------------------------------------------------------------------
diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java
index bc2bb41..7985e25 100644
--- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java
+++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java
@@ -25,7 +25,6 @@ import java.util.List;
 import org.apache.sshd.server.ServerBuilder;
 import org.apache.sshd.server.SshServer;
 import org.apache.sshd.common.NamedFactory;
-import org.apache.sshd.common.cipher.BuiltinCiphers;
 import org.apache.sshd.common.cipher.Cipher;
 import org.apache.sshd.common.compression.Compression;
 import org.apache.sshd.common.kex.KeyExchange;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/subsystem/src/main/java/org/apache/karaf/subsystem/commands/ListAction.java
----------------------------------------------------------------------
diff --git a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/ListAction.java b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/ListAction.java
index 8b7ee12..4d5c976 100644
--- a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/ListAction.java
+++ b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/ListAction.java
@@ -13,12 +13,6 @@
  */
 package org.apache.karaf.subsystem.commands;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Command;
 import org.apache.karaf.shell.api.action.lifecycle.Service;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java
----------------------------------------------------------------------
diff --git a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java
index fa22350..dc970b1 100644
--- a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java
+++ b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java
@@ -24,7 +24,6 @@ import java.util.regex.Pattern;
 
 import org.apache.karaf.shell.api.action.lifecycle.Reference;
 import org.osgi.service.subsystem.Subsystem;
-import org.osgi.service.subsystem.SubsystemConstants;
 
 public abstract class SubsystemSupport {
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/system/src/main/java/org/apache/karaf/system/SystemService.java
----------------------------------------------------------------------
diff --git a/system/src/main/java/org/apache/karaf/system/SystemService.java b/system/src/main/java/org/apache/karaf/system/SystemService.java
index ce4d9ef..fc930f4 100644
--- a/system/src/main/java/org/apache/karaf/system/SystemService.java
+++ b/system/src/main/java/org/apache/karaf/system/SystemService.java
@@ -24,7 +24,7 @@ public interface SystemService {
     /**
      * Types defining what to remove on a restart of Karaf
      */
-    public enum Swipe {
+    enum Swipe {
         /** Delete nothing; simple restart */
         NONE,
         /** Delete only the cache; everything else remains */

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
index 16023bf..f9d965a 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/RunMojo.java
@@ -26,9 +26,6 @@ import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
 import org.apache.commons.compress.utils.IOUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.karaf.features.BootFinished;
-import org.apache.karaf.features.Feature;
-import org.apache.karaf.features.FeaturesListener;
-import org.apache.karaf.features.FeaturesService;
 import org.apache.karaf.main.Main;
 import org.apache.karaf.tooling.utils.MojoSupport;
 import org.apache.maven.artifact.Artifact;
@@ -43,7 +40,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
 
 import java.io.*;
 import java.util.regex.Matcher;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
index 7ab1908..6819944 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
@@ -51,11 +51,7 @@ import java.io.ObjectInputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URL;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.security.KeyPair;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
index fec7490..c1faa3a 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java
@@ -20,7 +20,6 @@ package org.apache.karaf.tooling.commands;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -32,7 +31,6 @@ import java.util.TreeSet;
 
 import org.apache.karaf.shell.api.action.Action;
 import org.apache.karaf.shell.api.action.Command;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -163,8 +161,8 @@ public class GenerateHelpMojo extends AbstractMojo {
         }
     }
 
-    private ClassFinder createFinder(String classloaderType) throws DependencyResolutionRequiredException, MalformedURLException,
-        Exception, MojoFailureException {
+    private ClassFinder createFinder(String classloaderType) throws
+            Exception {
         ClassFinder finder;
         if ("project".equals(classloaderType)) {
             List<URL> urls = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
index 74768c7..76878f0 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
@@ -751,7 +751,7 @@ public class GenerateDescriptorMojo extends MojoSupport {
     @Parameter
     protected Map<String, String> systemProperties;
 
-    private void checkChanges(Features newFeatures, ObjectFactory objectFactory) throws Exception, IOException, JAXBException, XMLStreamException {
+    private void checkChanges(Features newFeatures, ObjectFactory objectFactory) throws Exception {
         if (checkDependencyChange) {
             //combine all the dependencies to one feature and strip out versions
             Features features = objectFactory.createFeaturesRoot();

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
index 533eb26..29e1464 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
@@ -184,7 +184,7 @@ public class Dependency30Helper implements DependencyHelper {
 
     private static class Scanner {
 
-        private static enum Accept {
+        private enum Accept {
             ACCEPT(true, true),
             PROVIDED(true, false),
             STOP(false, false);
@@ -192,7 +192,7 @@ public class Dependency30Helper implements DependencyHelper {
             private final boolean more;
             private final boolean local;
 
-            private Accept(boolean more, boolean local) {
+            Accept(boolean more, boolean local) {
                 this.more = more;
                 this.local = local;
             }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
index 89a1762..232f680 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency31Helper.java
@@ -183,7 +183,7 @@ public class Dependency31Helper implements DependencyHelper {
 
     private static class Scanner {
 
-        private static enum Accept {
+        private enum Accept {
             ACCEPT(true, true),
             PROVIDED(true, false),
             STOP(false, false);
@@ -191,7 +191,7 @@ public class Dependency31Helper implements DependencyHelper {
             private final boolean more;
             private final boolean local;
 
-            private Accept(boolean more, boolean local) {
+            Accept(boolean more, boolean local) {
                 this.more = more;
                 this.local = local;
             }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelper.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelper.java
index 62e5a68..0657f7e 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelper.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelper.java
@@ -36,27 +36,27 @@ import org.apache.maven.project.ProjectBuildingRequest;
  */
 public interface DependencyHelper {
 
-    public abstract Collection<LocalDependency> getLocalDependencies();
+    Collection<LocalDependency> getLocalDependencies();
 
-    public abstract String getTreeListing();
+    String getTreeListing();
 
-    public abstract void getDependencies(MavenProject project, boolean useTransitiveDependencies) throws MojoExecutionException;
+    void getDependencies(MavenProject project, boolean useTransitiveDependencies) throws MojoExecutionException;
 
-    public boolean isArtifactAFeature(Object artifact);
+    boolean isArtifactAFeature(Object artifact);
 
-    public abstract String getArtifactId(Object artifact);
+    String getArtifactId(Object artifact);
 
-	public abstract String getBaseVersion(Object artifact);
+	String getBaseVersion(Object artifact);
 
-	public abstract String getGroupId(Object artifact);
+	String getGroupId(Object artifact);
     
-    public abstract String getClassifier(Object artifact);
+    String getClassifier(Object artifact);
 
-    public abstract File resolve(Object artifact, Log log);
+    File resolve(Object artifact, Log log);
 
-    public abstract File resolveById(String id, Log log) throws MojoFailureException;
+    File resolveById(String id, Log log) throws MojoFailureException;
 
-    public abstract void setRepositorySession(ProjectBuildingRequest request) throws MojoExecutionException;
+    void setRepositorySession(ProjectBuildingRequest request) throws MojoExecutionException;
     
     /**
      * Convert a Maven <code>Artifact</code> into a PAX URL mvn format.
@@ -65,7 +65,7 @@ public interface DependencyHelper {
      * @return The corresponding PAX URL mvn format (mvn:groupId/artifactId/version/type/classifier)
      * @throws MojoExecutionException If the plugin execution fails.
      */
-    public String artifactToMvn(Artifact artifact, String versionOrRange) throws MojoExecutionException;
+    String artifactToMvn(Artifact artifact, String versionOrRange) throws MojoExecutionException;
 
     /**
      * Convert an Aether (Sonatype or Eclipse) artifact into a PAX URL mvn format.
@@ -74,9 +74,9 @@ public interface DependencyHelper {
      * @return The corresponding PAX URL mvn format (mvn:groupId/artifactId/version/type/classifier).
      * @throws MojoExecutionException If the plugin execution fails.
      */
-    public String artifactToMvn(Object object, String versionOrRange) throws MojoExecutionException;
+    String artifactToMvn(Object object, String versionOrRange) throws MojoExecutionException;
 
-    public Artifact mvnToArtifact(String name) throws MojoExecutionException;
+    Artifact mvnToArtifact(String name) throws MojoExecutionException;
 
     /**
      * Convert a PAX URL mvn format into a filesystem path.
@@ -85,7 +85,7 @@ public interface DependencyHelper {
      * @return The filesystem path.
      * @throws MojoExecutionException If the plugin execution fails.
      */
-    public String pathFromMaven(String name) throws MojoExecutionException;
+    String pathFromMaven(String name) throws MojoExecutionException;
 
     /**
      * Convert an Aether coordinate format into a filesystem path.
@@ -94,5 +94,5 @@ public interface DependencyHelper {
      * @return The filesystem path.
      * @throws MojoExecutionException If the plugin execution fails.
      */
-    public String pathFromAether(String name) throws MojoExecutionException;
+    String pathFromAether(String name) throws MojoExecutionException;
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/VerifyMojoTest.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/VerifyMojoTest.java b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/VerifyMojoTest.java
index 78683e1..ce51e27 100644
--- a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/VerifyMojoTest.java
+++ b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/VerifyMojoTest.java
@@ -22,7 +22,6 @@ import org.apache.karaf.tooling.VerifyMojo;
 import org.junit.Test;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.regex.Pattern;
 
 import static org.junit.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java
index 0eecbd0..3a4a010 100644
--- a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java
+++ b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/features/GenerateDescriptorMojoTest.java
@@ -22,7 +22,6 @@ package org.apache.karaf.tooling.features;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.net.URL;
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java b/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
index 203108d..ba4fac1 100644
--- a/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
+++ b/tooling/karaf-services-maven-plugin/src/main/java/org/apache/karaf/tooling/tracker/GenerateServiceMetadata.java
@@ -17,7 +17,6 @@
 package org.apache.karaf.tooling.tracker;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLClassLoader;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/util/src/main/java/org/apache/karaf/util/collections/CopyOnWriteArrayIdentityList.java
----------------------------------------------------------------------
diff --git a/util/src/main/java/org/apache/karaf/util/collections/CopyOnWriteArrayIdentityList.java b/util/src/main/java/org/apache/karaf/util/collections/CopyOnWriteArrayIdentityList.java
index f3da875..3548db1 100644
--- a/util/src/main/java/org/apache/karaf/util/collections/CopyOnWriteArrayIdentityList.java
+++ b/util/src/main/java/org/apache/karaf/util/collections/CopyOnWriteArrayIdentityList.java
@@ -282,10 +282,7 @@ public class CopyOnWriteArrayIdentityList<E> implements List<E>, RandomAccess, C
                 return false;
             }
         }
-        if (ourIt.hasNext()) {
-            return false;
-        }
-        return true;
+        return !ourIt.hasNext();
     }
 
     public E get(int index) {
@@ -740,10 +737,7 @@ public class CopyOnWriteArrayIdentityList<E> implements List<E>, RandomAccess, C
         }
 
         public boolean hasNext() {
-            if (current < size) {
-                return true;
-            }
-            return false;
+            return current < size;
         }
 
         public boolean hasPrevious() {

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/util/src/test/java/org/apache/karaf/util/BundleUtilsTest.java
----------------------------------------------------------------------
diff --git a/util/src/test/java/org/apache/karaf/util/BundleUtilsTest.java b/util/src/test/java/org/apache/karaf/util/BundleUtilsTest.java
index 39f45f5..08f134b 100644
--- a/util/src/test/java/org/apache/karaf/util/BundleUtilsTest.java
+++ b/util/src/test/java/org/apache/karaf/util/BundleUtilsTest.java
@@ -21,7 +21,6 @@ import org.junit.Test;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.net.URL;
 
 public class BundleUtilsTest {
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
----------------------------------------------------------------------
diff --git a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
index 7b285c1..d95af9c 100644
--- a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
+++ b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/GogoPlugin.java
@@ -201,7 +201,7 @@ public class GogoPlugin extends AbstractWebConsolePlugin {
                 throw e;
             } catch (Exception e) {
                 e.printStackTrace();
-                throw (IOException) new IOException().initCause(e);
+                throw new IOException(e);
             }
             new Thread(this).start();
         }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
----------------------------------------------------------------------
diff --git a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
index e7fe2a8..c916c0b 100644
--- a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
+++ b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/WebTerminal.java
@@ -21,7 +21,6 @@ package org.apache.karaf.webconsole.gogo;
  import java.io.OutputStream;
  import java.util.EnumSet;
 
- import org.apache.karaf.shell.api.console.Signal;
  import org.apache.karaf.shell.api.console.SignalListener;
  import org.apache.karaf.shell.api.console.Terminal;
  import org.jline.terminal.impl.ExternalTerminal;

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
----------------------------------------------------------------------
diff --git a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
index 60bca0c..70793a9 100644
--- a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
+++ b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java
@@ -230,7 +230,7 @@ public class InstancePlugin extends AbstractWebConsolePlugin {
         }
     }
 
-    private void instanceInfo(JSONWriter jw, Instance instance) throws IOException, Exception {
+    private void instanceInfo(JSONWriter jw, Instance instance) throws Exception {
         jw.object();
         jw.key("pid");
         jw.value(instance.getPid());

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java
----------------------------------------------------------------------
diff --git a/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java b/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java
index 88e243f..3ba4c87 100644
--- a/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java
+++ b/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java
@@ -47,7 +47,7 @@ public class InstancePluginTest extends TestCase {
     @SuppressWarnings("unchecked")
     private List<String> testParseStringList(String s) throws Exception {
         InstancePlugin ap = new InstancePlugin();
-        Method m = ap.getClass().getDeclaredMethod("parseStringList", new Class [] {String.class});
+        Method m = ap.getClass().getDeclaredMethod("parseStringList", String.class);
         m.setAccessible(true);
         return (List<String>) m.invoke(ap, s);
     }

http://git-wip-us.apache.org/repos/asf/karaf/blob/d5d25169/wrapper/src/main/java/org/apache/karaf/wrapper/WrapperService.java
----------------------------------------------------------------------
diff --git a/wrapper/src/main/java/org/apache/karaf/wrapper/WrapperService.java b/wrapper/src/main/java/org/apache/karaf/wrapper/WrapperService.java
index 814e9a2..767eb54 100644
--- a/wrapper/src/main/java/org/apache/karaf/wrapper/WrapperService.java
+++ b/wrapper/src/main/java/org/apache/karaf/wrapper/WrapperService.java
@@ -28,7 +28,7 @@ public interface WrapperService {
      *
      * @throws Exception If the wrapper install fails.
      */
-    public void install() throws Exception;
+    void install() throws Exception;
 
     /**
      * Install the Karaf container as a system service in the OS.
@@ -40,7 +40,7 @@ public interface WrapperService {
      * @return An array containing the wrapper configuration file (index 0) and the service file (index 1).
      * @throws Exception If the wrapper install fails.
      */
-    public File[] install(String name, String displayName, String description, String startType) throws Exception;
+    File[] install(String name, String displayName, String description, String startType) throws Exception;
     
     /**
      * Install the Karaf container as a system service in the OS.
@@ -54,6 +54,6 @@ public interface WrapperService {
      * @return An array containing the wrapper configuration file (index 0) and the service file (index 1).
      * @throws Exception If the wrapper install fails.
      */
-    public File[] install(String name, String displayName, String description, String startType, String[] envs, String[] includes) throws Exception;
+    File[] install(String name, String displayName, String description, String startType, String[] envs, String[] includes) throws Exception;
 
 }