diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/Catcher.java b/webgoat-container/src/main/java/org/owasp/webgoat/Catcher.java index 857c22f06..074c61c91 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/Catcher.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/Catcher.java @@ -96,7 +96,7 @@ public class Catcher extends HammerHead // property file. No other control parameters are supported at this time. if (!property.equals(EMPTY_STRING)) { - Enumeration e = session.getParser().getParameterNames(); + Enumeration e = session.getParser().getParameterNames(); while (e.hasMoreElements()) { diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java b/webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java index 2c70201de..2c15bf538 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/HammerHead.java @@ -63,7 +63,6 @@ public class HammerHead extends HttpServlet { final Logger logger = LoggerFactory.getLogger(HammerHead.class); - private static final String WELCOMED = "welcomed"; /** * diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java b/webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java index 270dc434e..7999387e0 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java @@ -5,7 +5,22 @@ */ package org.owasp.webgoat.application; -import com.google.common.collect.Maps; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Paths; +import java.sql.Driver; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Enumeration; +import java.util.Set; +import java.util.jar.Attributes; +import java.util.jar.Manifest; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.servlet.ServletRegistration; + import org.owasp.webgoat.HammerHead; import org.owasp.webgoat.lessons.LessonServletMapping; import org.owasp.webgoat.plugins.PluginsLoader; @@ -15,22 +30,6 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.type.filter.AnnotationTypeFilter; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; -import javax.servlet.ServletRegistration; -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Paths; -import java.sql.Driver; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.Enumeration; -import java.util.Map; -import java.util.Set; -import java.util.jar.Attributes; -import java.util.jar.Manifest; - /** * Web application lifecycle listener. * @@ -55,7 +54,6 @@ public class WebGoatServletListener implements ServletContextListener { private void loadServlets(ServletContextEvent sce) { final ServletContext servletContext = sce.getServletContext(); - Map controllers = Maps.newHashMap(); ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider( false); provider.addIncludeFilter(new AnnotationTypeFilter(LessonServletMapping.class)); diff --git a/webgoat-container/src/main/java/org/owasp/webgoat/session/ParameterParser.java b/webgoat-container/src/main/java/org/owasp/webgoat/session/ParameterParser.java index 9540d0b1f..f0ac0b3f6 100644 --- a/webgoat-container/src/main/java/org/owasp/webgoat/session/ParameterParser.java +++ b/webgoat-container/src/main/java/org/owasp/webgoat/session/ParameterParser.java @@ -467,7 +467,7 @@ public class ParameterParser { * * @return The parameterNames value */ - public Enumeration getParameterNames() { + public Enumeration getParameterNames() { if (request == null) { return (null); }