Changeset 2281 for trunk

Timestamp:

08/02/19 13:39:17 (5 years ago)

Author:

pharms

Message:

made plugin command loading work with Java 11 (hopefully) :-)

Location:

trunk

Files:

• autoquest-runner/src/main/java/de/ugoe/cs/autoquest/ui/Runner.java (modified) (2 diffs)
• java-utils-test/src/test/java/de/ugoe/cs/util/StopWatchTest.java (modified) (1 diff)
• java-utils-test/src/test/java/de/ugoe/cs/util/console/CommandExecuterTest.java (modified) (6 diffs)
• java-utils-test/src/test/java/de/ugoe/cs/util/console/defaultcommands/CMDlistCommandsTest.java (modified) (1 diff)
• java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java (modified) (15 diffs)

trunk/autoquest-runner/src/main/java/de/ugoe/cs/autoquest/ui/Runner.java

@@ -91 +91 @@
     public static void main(String[] args) {
         
-        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.commands.misc");
-        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.commands.sequences");
-        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.commands.usability");
-        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.commands.usage");
-        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.ui.swt.commands");
+        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.commands.misc", Runner.class.getClassLoader());
+        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.commands.sequences", Runner.class.getClassLoader());
+        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.commands.usability", Runner.class.getClassLoader());
+        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.commands.usage", Runner.class.getClassLoader());
+        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.autoquest.ui.swt.commands", Runner.class.getClassLoader());
 
         PluginLoader pluginLoader = new PluginLoader(new File("lib"));
@@ -102 +102 @@
         for (AutoQUESTPlugin plugin : pluginLoader.getPlugins()) {
             for (String commandPackage : plugin.getCommandPackages()) {
-                CommandExecuter.getInstance().addCommandPackage(commandPackage);
+                CommandExecuter.getInstance().addCommandPackage(commandPackage, plugin.getClass().getClassLoader());
             }
         }

trunk/java-utils-test/src/test/java/de/ugoe/cs/util/StopWatchTest.java

@@ -36 +36 @@
         stopWatch.stop(id);
         
-        assertTrue((95 < stopWatch.getDuration(id)) && (stopWatch.getDuration(id) < 105));
+        assertTrue((90 < stopWatch.getDuration(id)) && (stopWatch.getDuration(id) < 110));
     }
 

trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/CommandExecuterTest.java

@@ -34 +34 @@
                 CommandExecuter fixture = CommandExecuter.getInstance();
 
-                fixture.addCommandPackage("");
+                fixture.addCommandPackage("", this.getClass().getClassLoader());
         }
 
@@ -42 +42 @@
                 CommandExecuter fixture = CommandExecuter.getInstance();
                 
-                fixture.addCommandPackage(null);
+                fixture.addCommandPackage(null, this.getClass().getClassLoader());
         }
 
@@ -51 +51 @@
                 MockOutputListener mockListener = new MockOutputListener();
                 Console.getInstance().registerOutputListener(mockListener);
-                fixture.addCommandPackage("de.ugoe.cs.util.console.mock.commands");
+                fixture.addCommandPackage("de.ugoe.cs.util.console.mock.commands", this.getClass().getClassLoader());
                 String command = "mockCommand";
                 String expected = "mock command: run" + System.getProperty("line.separator");
@@ -66 +66 @@
                 MockOutputListener mockListener = new MockOutputListener();
                 Console.getInstance().registerOutputListener(mockListener);
-                fixture.addCommandPackage("de.ugoe.cs.util.console.mock.commands");
+                fixture.addCommandPackage("de.ugoe.cs.util.console.mock.commands", this.getClass().getClassLoader());
                 String command = "mockCommand param1";
                 String expected = "Usage: mock command: help" + System.getProperty("line.separator");
@@ -81 +81 @@
                 MockOutputListener mockListener = new MockOutputListener();
                 Console.getInstance().registerOutputListener(mockListener);
-                fixture.addCommandPackage("de.ugoe.cs.util.console.mock.commands");
+                fixture.addCommandPackage("de.ugoe.cs.util.console.mock.commands", this.getClass().getClassLoader());
                 String command = "mockCommand param1 param2";
 
@@ -93 +93 @@
                 MockOutputListener mockListener = new MockOutputListener();
                 Console.getInstance().registerOutputListener(mockListener);
-                fixture.addCommandPackage("de.ugoe.cs.util.console.mock.commands");
+                fixture.addCommandPackage("de.ugoe.cs.util.console.mock.commands", this.getClass().getClassLoader());
                 String command = "mockCommandddd";
                 String expected = "Unknown command" + System.getProperty("line.separator");

trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/defaultcommands/CMDlistCommandsTest.java

@@ -40 +40 @@
     @Test
     public void test() {
-        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.util.console.defaultcommands");
+        CommandExecuter.getInstance().addCommandPackage("de.ugoe.cs.util.console.defaultcommands", this.getClass().getClassLoader());
         CMDlistCommands command = new CMDlistCommands();
         command.run(null);

trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java

@@ -12 +12 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
-
 
 package de.ugoe.cs.util.console;
@@ -81 +80 @@
      * </p>
      */
-    private List<String> commandPackageList;
-    
+    private List<CommandPackage> commandPackageList;
+
     /**
      * <p>
@@ -108 +107 @@
      */
     private CommandExecuter() {
-        commandPackageList = new ArrayList<String>();
+        commandPackageList = new ArrayList<CommandPackage>();
     }
 
@@ -121 +120 @@
      *             thrown if the package name is null or empty string
      */
-    public void addCommandPackage(String pkg) {
+    public void addCommandPackage(String pkg, ClassLoader loader) {
         if ("".equals(pkg) || pkg == null) {
             throw new IllegalArgumentException("package name must not be null or empty string");
         }
-        commandPackageList.add(pkg);
+        commandPackageList.add(new CommandPackage(pkg, loader));
+        availableCommands = null;
     }
 
@@ -148 +148 @@
     public void exec(String command) {
         Console.commandNotification(command);
-        Command cmd = null;
         CommandParser parser = new CommandParser();
         parser.parse(command);
-        for (int i = 0; cmd == null && i < commandPackageList.size(); i++) {
-            cmd = loadCMD(commandPackageList.get(i) + "." + cmdPrefix + parser.getCommandName());
-        }
-        if (cmd == null) { // check if command is available as default command
-            cmd = loadCMD(defaultPackage + "." + cmdPrefix + parser.getCommandName());
-        }
+
+        Command cmd = getCMD(parser.getCommandName());
+
         if (cmd == null) {
             Console.println("Unknown command");
@@ -186 +182 @@
      *         otherwise
      */
-    public Command loadCMD(String className) {
-        Command cmd = null;
-        try {
-            Class<?> cmdClass = Class.forName(className);
-            cmd = (Command) cmdClass.getDeclaredConstructor().newInstance();
-        }
-        catch (NoClassDefFoundError e) {
-            String[] splitResult = e.getMessage().split("CMD");
-            String correctName = splitResult[splitResult.length - 1].replace(")", "");
-            Console.println("Did you mean " + correctName + "?");
-        }
-        catch (ClassNotFoundException e) {}
-        catch (IllegalAccessException e) {}
-        catch (InstantiationException e) {}
-        catch (InvocationTargetException e) {}
-        catch (NoSuchMethodException e) {}
-        catch (ClassCastException e) {
-            Console.traceln(Level.WARNING, className + "found, but does not implement Command");
-        }
-        return cmd;
-    }
-    
-    /**
-     * <p>
-     * Helper method that loads a class and tries to cast it to {@link Command}.
-     * </p>
-     * 
-     * @param className
-     *            qualified name of the class (including package name)
-     * @return if class is available and implement {@link Command} and instance of the class, null
-     *         otherwise
-     */
     public Command getCMD(String commandName) {
-        Command cmd = null;
-        for (int i = 0; cmd == null && i < commandPackageList.size(); i++) {
-            cmd = loadCMD(commandPackageList.get(i) + "." + cmdPrefix + commandName);
-        }
-        if (cmd == null) { // check if command is available as default command
-            cmd = loadCMD(defaultPackage + "." + cmdPrefix + commandName);
-        }
-        return cmd;
+        for (Command candidate : getAvailableCommands()) {
+            if (candidate.getClass().getSimpleName().equals(cmdPrefix + commandName)) {
+                return candidate;
+            }
+        }
+
+        return null;
     }
 
@@ -239 +202 @@
     public Command[] getAvailableCommands() {
         if (availableCommands == null) {
-            List<Command> commands = new ArrayList<Command>();
-            List<String> packages = new ArrayList<String>();
+            // List<Command> commands = new ArrayList<Command>();
+            List<CommandPackage> packages = new ArrayList<CommandPackage>();
             packages.addAll(commandPackageList);
-            packages.add(defaultPackage);
+            packages.add(new CommandPackage(defaultPackage, this.getClass().getClassLoader()));
 
             FilenameFilter filter = new FilenameFilter() {
                 @Override
                 public boolean accept(File dir, String name) {
-                    return
-                        (name != null) && (name.startsWith(cmdPrefix)) && (name.endsWith(".class"));
+                    return (name != null) && (name.startsWith(cmdPrefix)) &&
+                        (name.endsWith(".class"));
                 }
             };
 
-            SortedSet<String> classNames = new TreeSet<String>(new Comparator<String>() {
+            SortedSet<Command> commands = new TreeSet<Command>(new Comparator<Command>() {
                 @Override
-                public int compare(String arg1, String arg2) {
-                    String str1 = arg1.substring(arg1.lastIndexOf('.') + cmdPrefix.length() + 1);
-                    String str2 = arg2.substring(arg2.lastIndexOf('.') + cmdPrefix.length() + 1);
+                public int compare(Command arg1, Command arg2) {
+                    String str1 = arg1.getClass().getSimpleName().substring(cmdPrefix.length());
+                    String str2 = arg2.getClass().getSimpleName().substring(cmdPrefix.length());
                     return str1.compareTo(str2);
                 }
@@ -262 +225 @@
             });
 
-            for (String packageName : packages) {
-                String path = packageName.replace('.', '/');
+            for (CommandPackage commandPackage : packages) {
+                String path = commandPackage.getPackageName().replace('.', '/');
                 try {
-                    Enumeration<URL> resources = ClassLoader.getSystemResources(path);
+                    ClassLoader loader = commandPackage.getClassLoader();
+
+                    if (loader == null) {
+                        loader = ClassLoader.getSystemClassLoader();
+                    }
+
+                    Enumeration<URL> resources = loader.getResources(path);
 
                     while (resources.hasMoreElements()) {
@@ -272 +241 @@
 
                         if (packageDir.isDirectory()) {
-                                File[] classFiles = packageDir.listFiles(filter);
-                                if (classFiles != null) {
-                                        for (File classFile : classFiles) {
-                                                String className = classFile.getName().substring
-                                                                (0, classFile.getName().lastIndexOf('.'));
-                                                classNames.add(packageName + "." + className);
-                                        }
-                                }
+                            File[] classFiles = packageDir.listFiles(filter);
+                            if (classFiles != null) {
+                                for (File classFile : classFiles) {
+                                    String className = classFile.getName()
+                                        .substring(0, classFile.getName().lastIndexOf('.'));
+                                    Class<?> clazz =
+                                        loader.loadClass(commandPackage.getPackageName() + "." +
+                                            className);
+                                    if (Command.class.isAssignableFrom(clazz)) {
+                                      commands.add((Command) clazz.getConstructor().newInstance());
+                                    }
+                                }
+                            }
                         }
                         else {
@@ -298 +272 @@
                                         entry = jarInputStream.getNextJarEntry();
                                         if ((entry != null) && (!entry.isDirectory()) &&
-                                                (entry.getName().startsWith(path)))
+                                            (entry.getName().startsWith(path)))
                                         {
-                                            String className = entry.getName().substring
-                                                (path.length() + 1, entry.getName().lastIndexOf('.'));
-                                            classNames.add(packageName + "." + className);
+                                            String className = entry.getName()
+                                                .substring(path.length() + 1,
+                                                           entry.getName().lastIndexOf('.'));
+                                            Class<?> clazz =
+                                                loader.loadClass(commandPackage.getPackageName() +
+                                                    "." + className);
+                                            if (Command.class.isAssignableFrom(clazz)) {
+                                                commands.add((Command) clazz.getConstructor().newInstance());
+                                            }
                                         }
                                     }
@@ -309 +289 @@
                                 catch (Exception e) {
                                     e.printStackTrace();
-                                    Console.traceln(Level.WARNING, "could not read contents of " +
-                                                    "jar " + jarFile);
+                                    Console
+                                        .traceln(Level.WARNING,
+                                                 "could not read contents of " + "jar " + jarFile);
                                 }
                                 finally {
@@ -323 +304 @@
                 }
                 catch (IOException e) {
-                    Console.traceln
-                        (Level.WARNING, "could not read commands of package " + packageName);
+                    Console.traceln(Level.WARNING, "could not read commands of package " +
+                        commandPackage.getPackageName());
+                }
+                catch (ClassNotFoundException e) {
+                    Console.traceln(Level.WARNING, "could not load a command of package " +
+                        commandPackage.getPackageName() + ": " + e);
+                }
+                catch (InstantiationException e) {
+                    Console.traceln(Level.WARNING, "could not load a command of package " +
+                        commandPackage.getPackageName() + ": " + e);
+                }
+                catch (IllegalAccessException e) {
+                    Console.traceln(Level.WARNING, "could not load a command of package " +
+                        commandPackage.getPackageName() + ": " + e);
+                }
+                catch (IllegalArgumentException e) {
+                    Console.traceln(Level.WARNING, "could not load a command of package " +
+                        commandPackage.getPackageName() + ": " + e);
+                }
+                catch (InvocationTargetException e) {
+                    Console.traceln(Level.WARNING, "could not load a command of package " +
+                        commandPackage.getPackageName() + ": " + e);
+                }
+                catch (NoSuchMethodException e) {
+                    Console.traceln(Level.WARNING, "could not load a command of package " +
+                        commandPackage.getPackageName() + ": " + e);
+                }
+                catch (SecurityException e) {
+                    Console.traceln(Level.WARNING, "could not load a command of package " +
+                        commandPackage.getPackageName() + ": " + e);
                 }
             }
 
-            for (String className : classNames) {
-                // class may still be inner classes. Therefore load the command, to
-                // see if it is really available and a command.
-                Command cmd = loadCMD(className);
-                if (cmd != null) {
-                    commands.add(cmd);
-                }
-            }
-
             availableCommands = commands.toArray(new Command[commands.size()]);
         }
-        
+
         return Arrays.copyOf(availableCommands, availableCommands.length);
     }
-    
+
     /**
      * <p>
@@ -351 +351 @@
      */
     public List<String> getCommandPackages() {
-        List<String> commandPackageListCopy = new ArrayList<String>(commandPackageList);
-        commandPackageListCopy.add(0, defaultPackage);
+        List<String> commandPackageListCopy = new ArrayList<>();
+
+        commandPackageListCopy.add(defaultPackage);
+
+        for (CommandPackage pkg : commandPackageList) {
+            commandPackageListCopy.add(pkg.getPackageName());
+        }
+
         return commandPackageListCopy;
     }
@@ -359 +365 @@
      * <p>
      * this method method performs an auto completion of the provided String as far as possible
-     * regarding the available commands. It auto completes to the full command name, if only
-     * one command matches the given prefix. It auto completes to the common denominator, if
-     * several commands match the prefix
+     * regarding the available commands. It auto completes to the full command name, if only one
+     * command matches the given prefix. It auto completes to the common denominator, if several
+     * commands match the prefix
      * </p>
      *
-     * @param commandPrefix the prefix to be auto completed
+     * @param commandPrefix
+     *            the prefix to be auto completed
      * 
      * @return as described
@@ -370 +377 @@
     public String autoCompleteCommand(String commandPrefix) {
         Command[] commands = getAvailableCommands();
-        
+
         String[] completions = new String[commands.length];
-        
+
         for (int i = 0; i < commands.length; i++) {
             completions[i] = commands[i].getClass().getSimpleName().substring(3);
         }
-        
+
         return StringTools.autocomplete(commandPrefix, completions);
     }
+
+    /**
+     * represents a command package with a package name and the class loader to use
+     */
+    private class CommandPackage {
+        /**
+         * the name of the represented package
+         */
+        private String packageName;
+
+        /**
+         * the class loader to use to load the package
+         */
+        private ClassLoader classLoader;
+
+        /**
+         * <p>
+         * instantiate the fields
+         * </p>
+         */
+        public CommandPackage(String packageName, ClassLoader classLoader) {
+            super();
+            this.packageName = packageName;
+            this.classLoader = classLoader;
+        }
+
+        /**
+         * @return the packageName
+         */
+        public String getPackageName() {
+            return packageName;
+        }
+
+        /**
+         * @return the classLoader
+         */
+        public ClassLoader getClassLoader() {
+            return classLoader;
+        }
+
+    }
 }