-- Remove raw type usage, add type check parameter.

-- Remove unused variable and unused imports.

webgoat-container/src/main/java/org/owasp/webgoat/Catcher.java

@@ -96,7 +96,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
 			// property file. No other control parameters are supported at this time.
 			if (!property.equals(EMPTY_STRING))
 			{
-				Enumeration e = session.getParser().getParameterNames();
+				Enumeration<String> e = session.getParser().getParameterNames();
 
 				while (e.hasMoreElements())
 				{

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";
 
     /**
      *

webgoat-container/src/main/java/org/owasp/webgoat/application/WebGoatServletListener.java

@@ -5,32 +5,31 @@
  */
 package org.owasp.webgoat.application;
 
-import com.google.common.collect.Maps;
-import org.owasp.webgoat.HammerHead;
-import org.owasp.webgoat.lessons.LessonServletMapping;
-import org.owasp.webgoat.plugins.PluginsLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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;
 
+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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+
 /**
  * Web application lifecycle listener.
  *
@@ -55,7 +54,6 @@ public void contextInitialized(ServletContextEvent sce) {
 
     private void loadServlets(ServletContextEvent sce) {
         final ServletContext servletContext = sce.getServletContext();
-        Map<String, Class> controllers = Maps.newHashMap();
         ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(
                 false);
         provider.addIncludeFilter(new AnnotationTypeFilter(LessonServletMapping.class));

webgoat-container/src/main/java/org/owasp/webgoat/session/ParameterParser.java

@@ -467,7 +467,7 @@ public String[] getMissingParameters(String[] requestuired) {
      *
      * @return The parameterNames value
      */
-    public Enumeration getParameterNames() {
+    public Enumeration<String> getParameterNames() {
         if (request == null) {
             return (null);
         }