Small cleanup for Servlet programmatic sample

Signed-off-by: arjantijms <[email protected]>

Author: arjantijms

servlet/programmatic-registration/pom.xml

@@ -6,10 +6,8 @@
         <groupId>org.javaee7</groupId>
         <artifactId>servlet</artifactId>
         <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
   </parent>
 
-    <groupId>org.javaee7</groupId>
     <artifactId>servlet-programmatic-registration</artifactId>
     <packaging>war</packaging>
 

servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/DynamicServlet.java

@@ -1,23 +1,22 @@
 package org.javaee7.servlet.programmatic.registration;
 
+import java.io.IOException;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 /**
  * @author OrelGenya
  */
 public class DynamicServlet extends HttpServlet {
 
+    private static final long serialVersionUID = 8310377560908221629L;
+
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
         resp.getWriter().print("dynamic GET");
     }
 
-    @Override
-    public String getServletInfo() {
-        return "My dynamic awesome servlet!";
-    }
 }

servlet/programmatic-registration/src/main/java/org/javaee7/servlet/programmatic/registration/SimpleServletContextListener.java

@@ -2,7 +2,6 @@
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import javax.servlet.ServletRegistration;
 import javax.servlet.annotation.WebListener;
 
 /**
@@ -12,14 +11,15 @@
 public class SimpleServletContextListener implements ServletContextListener {
 
     @Override
-    public void contextInitialized(ServletContextEvent sce) {
-        System.out.println("Servlet context initialized: " + sce.getServletContext().getContextPath());
-        ServletRegistration.Dynamic registration = sce.getServletContext().addServlet("dynamic", DynamicServlet.class);
-        registration.addMapping("/dynamic");
+    public void contextInitialized(ServletContextEvent contextEvent) {
+        System.out.println("Servlet context initialized: " + contextEvent.getServletContext().getContextPath());
+        
+        contextEvent.getServletContext().addServlet("dynamic", DynamicServlet.class)
+                               .addMapping("/dynamic");
     }
 
     @Override
-    public void contextDestroyed(ServletContextEvent sce) {
-        System.out.println("Servlet context destroyed: " + sce.getServletContext().getContextPath());
+    public void contextDestroyed(ServletContextEvent contextEvent) {
+        System.out.println("Servlet context destroyed: " + contextEvent.getServletContext().getContextPath());
     }
 }

servlet/programmatic-registration/src/test/java/org/javaee7/servlet/programmatic/registration/DynamicServletTest.java

@@ -1,7 +1,10 @@
 package org.javaee7.servlet.programmatic.registration;
 
-import com.gargoylesoftware.htmlunit.TextPage;
-import com.gargoylesoftware.htmlunit.WebClient;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.URL;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
@@ -12,10 +15,8 @@
 import org.junit.runner.RunWith;
 import org.xml.sax.SAXException;
 
-import java.io.IOException;
-import java.net.URL;
-
-import static org.junit.Assert.assertEquals;
+import com.gargoylesoftware.htmlunit.TextPage;
+import com.gargoylesoftware.htmlunit.WebClient;
 
 /**
  * @author OrelGenya
@@ -30,10 +31,10 @@ public class DynamicServletTest {
 
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
-        WebArchive war = ShrinkWrap.create(WebArchive.class).
-            addClass(DynamicServlet.class).
-            addClass(SimpleServletContextListener.class);
-        return war;
+        return ShrinkWrap.create(WebArchive.class).
+            addClasses(
+                DynamicServlet.class, 
+                SimpleServletContextListener.class);
     }
 
     @Before
@@ -44,6 +45,7 @@ public void setup() {
     @Test
     public void testChildServlet() throws IOException, SAXException {
         TextPage page = webClient.getPage(base + "dynamic");
+        
         assertEquals("dynamic GET", page.getContent());
     }
 }