diff --git a/src/main/java/org/gservlet/ContainerManager.java b/src/main/java/org/gservlet/ContainerManager.java index 5b2ffd6..7af1f1c 100644 --- a/src/main/java/org/gservlet/ContainerManager.java +++ b/src/main/java/org/gservlet/ContainerManager.java @@ -134,8 +134,7 @@ public void init(String directory, List listeners) throws Servle * */ protected void loadScripts(File folder) throws ServletException, ScriptException { - File[] files = folder.listFiles(); - for (File file : files) { + for (File file : folder.listFiles()) { if (file.isFile()) { register(scriptManager.createObject(file)); } else { @@ -314,13 +313,13 @@ public void onModified(FileEvent event) { * * Processes a script file * - * @param script the script file + * @param file the given file * */ - protected void process(File script) { + protected void process(File file) { try { - logger.log(Level.INFO, "processing script {0}", script.getName()); - process(scriptManager.createObject(script)); + logger.log(Level.INFO, "processing script {0}", file.getName()); + process(scriptManager.createObject(file)); } catch (Exception e) { logger.log(Level.SEVERE, "exception when reloading script", e); } @@ -409,8 +408,7 @@ protected void reloadFilter(AbstractFilter filter) throws ServletException { * */ protected void reloadScripts(File folder) throws ServletException, ScriptException { - File[] files = folder.listFiles(); - for (File file : files) { + for (File file : folder.listFiles()) { if (file.isFile()) { Object object = scriptManager.createObject(file); if (isServlet(object) || isFilter(object) || isListener(object)) { diff --git a/src/main/java/org/gservlet/ScriptManager.java b/src/main/java/org/gservlet/ScriptManager.java index 72a73b2..6a24e4b 100644 --- a/src/main/java/org/gservlet/ScriptManager.java +++ b/src/main/java/org/gservlet/ScriptManager.java @@ -98,14 +98,14 @@ public ScriptManager(File folder) throws ScriptException { * * Creates an object from a groovy script file * - * @param script the groovy script file + * @param file the groovy script file * @return the instantiated object * @throws ScriptException the ScriptException * */ - public Object createObject(File script) throws ScriptException { + public Object createObject(File file) throws ScriptException { try { - Class clazz = loadClass(script); + Class clazz = loadClass(file); if (!clazz.isInterface() && Stream.of(clazz.getConstructors()).anyMatch(c -> c.getParameterCount() == 0)) { Object object = clazz.getConstructor().newInstance(); listeners.forEach(listener -> listener.onCreated(object));