Merge pull request #575 from csmith/plugin-tidying

Minor tidying in plugins

src/com/dmdirc/plugins/CorePluginExtractor.java

@@ -84,7 +84,7 @@ public class CorePluginExtractor {
                 }
 
                 final File newDir = new File(resourceName.substring(0,
-                        resourceName.lastIndexOf('/')) + "/");
+                        resourceName.lastIndexOf('/')) + '/');
 
                 if (!newDir.exists()) {
                     newDir.mkdirs();

src/com/dmdirc/plugins/CorePluginHelper.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.updater.Version;
 
 import javax.inject.Inject;
@@ -55,7 +55,7 @@ public class CorePluginHelper {
             final PluginManager pm,
             final String serviceType) {
         if (serviceManager.getServicesByType(serviceType).isEmpty()) {
-            corePluginExtractor.extractCorePlugins(serviceType + "_");
+            corePluginExtractor.extractCorePlugins(serviceType + '_');
             pm.refreshPlugins();
         }
     }
@@ -72,7 +72,7 @@ public class CorePluginHelper {
     public void checkBundledPlugins(
             final CorePluginExtractor corePluginExtractor,
             final PluginManager pm,
-            final AggregateConfigProvider config) {
+            final ReadOnlyConfigProvider config) {
         pm.getAllPlugins().stream().filter(plugin -> config
                 .hasOptionString("bundledplugins_versions", plugin.getName())).forEach(plugin -> {
             final Version bundled =

src/com/dmdirc/plugins/ExportInfo.java

@@ -52,8 +52,8 @@ public class ExportInfo {
     public ExportedService getExportedService() {
         try {
             final Class<?> c = pluginInfo.getPluginClassLoader().loadClass(className, false);
-            final Plugin p = className.equals(pluginInfo.getMetaData().getMainClass()) ? pluginInfo.
-                    getPlugin() : null;
+            final Plugin p = className.equals(pluginInfo.getMetaData().getMainClass())
+                    ? pluginInfo.getPlugin() : null;
             return new ExportedService(c, methodName, p);
         } catch (ClassNotFoundException | IllegalArgumentException cnfe) {
             return null;

src/com/dmdirc/plugins/ExportedService.java

@@ -25,6 +25,7 @@ package com.dmdirc.plugins;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -32,22 +33,12 @@ import org.slf4j.LoggerFactory;
  */
 public class ExportedService {
 
-    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ExportedService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ExportedService.class);
     /** Method we will be executing today! */
     private final Method method;
     /** Object we will be executing this method on. */
     private final Object object;
 
-    /**
-     * Create a new ExportedService object.
-     *
-     * @param myClass    class method is in.
-     * @param methodName Name of method
-     */
-    public ExportedService(final Class<?> myClass, final String methodName) {
-        this(myClass, methodName, null);
-    }
-
     /**
      * Create a new ExportedService object.
      *

src/com/dmdirc/plugins/Plugin.java

@@ -22,8 +22,10 @@
 
 package com.dmdirc.plugins;
 
+import com.dmdirc.ClientModule;
 import com.dmdirc.util.validators.ValidationResponse;
 
+import dagger.Module;
 import dagger.ObjectGraph;
 
 /**
@@ -62,18 +64,18 @@ public interface Plugin {
      *
      * <p>
      * Plugins wishing to use this form of dependency injection should define a new
-     * {@link dagger.Module} which specifies an {@link dagger.Module#addsTo()} argument of either:
+     * {@link Module} which specifies an {@link Module#addsTo()} argument of either:
      *
      * <ul>
      * <li>For plugins with no parents, or plugins which do not have a dependency on their parent,
-     * {@link com.dmdirc.ClientModule}.</li>
-     * <li>For plugins with dependencies on a parent plugin, that plugin's own {@link dagger.Module}
+     * {@link ClientModule}.</li>
+     * <li>For plugins with dependencies on a parent plugin, that plugin's own {@link Module}
      * implementation.</li>
      * </ul>
      *
      * <p>
      * The implementation of this method should then call
-     * {@link ObjectGraph#plus(java.lang.Object[])} with an instance of the plugin's own module.
+     * {@link ObjectGraph#plus(Object[])} with an instance of the plugin's own module.
      *
      * <p>
      * To expose dependencies to child plugins, the relevant {@link ObjectGraph} should be returned
@@ -96,7 +98,7 @@ public interface Plugin {
      *
      * <p>
      * This should always be an extension of the {@link ObjectGraph} provided to the
-     * {@link #load(com.dmdirc.plugins.PluginInfo, dagger.ObjectGraph)} method. If the plugin has no
+     * {@link #load(PluginInfo, ObjectGraph)} method. If the plugin has no
      * dependencies it wishes to expose, it may return {@code null} and any subplugins will be given
      * the global {@link ObjectGraph}.
      *

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -26,9 +26,9 @@ import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.List;
 
 public class PluginClassLoader extends ClassLoader {
 
@@ -53,17 +53,6 @@ public class PluginClassLoader extends ClassLoader {
         this.globalLoader = globalLoader;
     }
 
-    /**
-     * Get a PluginClassLoader that is a subclassloader of this one.
-     *
-     * @param info PluginInfo the new classloader will be for
-     *
-     * @return A classloader configured with this one as its parent
-     */
-    public PluginClassLoader getSubClassLoader(final PluginInfo info) {
-        return new PluginClassLoader(info, globalLoader, this);
-    }
-
     /**
      * Load the plugin with the given className.
      *
@@ -87,8 +76,7 @@ public class PluginClassLoader extends ClassLoader {
      * @return True if the specified class is loaded, false otherwise
      */
     public boolean isClassLoaded(final String name, final boolean checkGlobal) {
-        return findLoadedClass(name) != null || (checkGlobal
-                && globalLoader.isClassLoaded(name));
+        return findLoadedClass(name) != null || checkGlobal && globalLoader.isClassLoaded(name);
     }
 
     /**
@@ -178,10 +166,7 @@ public class PluginClassLoader extends ClassLoader {
     @Override
     protected URL findResource(final String name) {
         try {
-            final URL url = pluginInfo.getPath(name).toUri().toURL();
-            if (url != null) {
-                return url;
-            }
+            return pluginInfo.getPath(name).toUri().toURL();
         } catch (IOException ioe) {
             // Do nothing, fall through
         }
@@ -202,7 +187,7 @@ public class PluginClassLoader extends ClassLoader {
     protected Enumeration<URL> findResources(final String name)
             throws IOException {
         final URL resource = findResource(name);
-        final List<URL> resources = new ArrayList<>();
+        final Collection<URL> resources = new ArrayList<>();
 
         if (resource != null) {
             resources.add(resource);

src/com/dmdirc/plugins/PluginInfo.java

@@ -733,15 +733,6 @@ public class PluginInfo implements ServiceProvider {
         return metaData.getPersistentClasses().contains("*");
     }
 
-    /**
-     * Does this plugin contain any persistent classes?
-     *
-     * @return true if this plugin contains any persistent classes, else false
-     */
-    public boolean hasPersistent() {
-        return !metaData.getPersistentClasses().isEmpty();
-    }
-
     /**
      * Get a list of all persistent classes in this plugin
      *

src/com/dmdirc/plugins/PluginManager.java

@@ -158,9 +158,9 @@ public class PluginManager {
                 return false;
             }
 
-            if ((metadata.getUpdaterId() > 0 && metadata.getVersion().isValid())
-                    || (identityController.getGlobalConfiguration()
-                    .hasOptionInt("plugin-addonid", metadata.getName()))) {
+            if (metadata.getUpdaterId() > 0 && metadata.getVersion().isValid()
+                    || identityController.getGlobalConfiguration()
+                    .hasOptionInt("plugin-addonid", metadata.getName())) {
                 updateManager.addComponent(new PluginComponent(
                         identityController.getGlobalConfiguration(), pluginInfo));
             }

src/com/dmdirc/plugins/PluginMetaDataValidator.java

@@ -225,7 +225,7 @@ public class PluginMetaDataValidator {
                 if (target.getVersion().compareTo(new Version(data[1])) < 0) {
                     errors.add("Plugin '" + data[0]
                             + "' is too old (required version: " + data[1]
-                            + ", actual version: " + target.getVersion() + ")");
+                            + ", actual version: " + target.getVersion() + ')');
                 }
 
                 // Check plugin maximum version matches.
@@ -233,7 +233,7 @@ public class PluginMetaDataValidator {
                         new Version(data[2])) > 0) {
                     errors.add("Plugin '" + data[0]
                             + "' is too new (required version: " + data[2]
-                            + ", actual version: " + target.getVersion() + ")");
+                            + ", actual version: " + target.getVersion() + ')');
                 }
             }
         }

src/com/dmdirc/plugins/Service.java

@@ -150,7 +150,7 @@ public class Service {
 
     @Override
     public String toString() {
-        return "Service: " + type + "->" + name + " (Providers: " + serviceproviders.size() + ")";
+        return "Service: " + type + "->" + name + " (Providers: " + serviceproviders.size() + ')';
     }
 
 }

src/com/dmdirc/plugins/ServiceManagerImpl.java

@@ -77,16 +77,16 @@ public class ServiceManagerImpl implements ServiceManager {
             NoSuchProviderException {
         final Service service = getService(type, name);
         if (service != null) {
-            ServiceProvider provider = service.getActiveProvider();
-            if (provider != null) {
-                return provider;
-            } else {
+            final ServiceProvider provider = service.getActiveProvider();
+            if (provider == null) {
                 // Try to activate the service then try again.
                 service.activate();
-                provider = service.getActiveProvider();
-                if (provider != null) {
-                    return provider;
+                final ServiceProvider activeProvider = service.getActiveProvider();
+                if (activeProvider != null) {
+                    return activeProvider;
                 }
+            } else {
+                return provider;
             }
         }
 

src/com/dmdirc/plugins/implementations/BaseCommandPlugin.java

@@ -82,7 +82,7 @@ public abstract class BaseCommandPlugin extends BasePlugin {
      * <p>
      * This method will create a new instance of the specified command class using the
      * dependency-injection framework. It must only be called after
-     * {@link #setObjectGraph(dagger.ObjectGraph)}, and any command must be injectable using that
+     * {@link #setObjectGraph(ObjectGraph)}, and any command must be injectable using that
      * object graph.
      *
      * @param <T>         The type of the command that will be registered.