From eb6f0214ca6a08fbab2631e169667e7b6208be99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20R=C3=A4del?= <christian.raedel@gmail.com>
Date: Sat, 3 Sep 2016 20:13:55 +0200
Subject: [PATCH] BAEL-305: Simplified FrontControllerServlet. Removed unused
 JBoss deployment descriptor.

---
 .../controller/FrontControllerServlet.java    | 19 ++++++-------------
 .../src/main/webapp/WEB-INF/jboss-web.xml     |  6 ------
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 enterprise-patterns/front-controller-pattern/src/main/webapp/WEB-INF/jboss-web.xml

diff --git a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/FrontControllerServlet.java b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/FrontControllerServlet.java
index 4dfc12c050..a8962f5108 100644
--- a/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/FrontControllerServlet.java
+++ b/enterprise-patterns/front-controller-pattern/src/main/java/com/baeldung/enterprise/patterns/front/controller/FrontControllerServlet.java
@@ -22,24 +22,17 @@ public class FrontControllerServlet extends HttpServlet {
 
     private FrontCommand getCommand(HttpServletRequest request) {
         try {
-            return (FrontCommand) getCommandClass(request)
-              .asSubclass(FrontCommand.class)
-              .newInstance();
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to get command!", e);
-        }
-    }
-
-    private Class getCommandClass(HttpServletRequest request) {
-        try {
-            return Class.forName(
+            Class type = Class.forName(
               String.format(
                 "com.baeldung.enterprise.patterns.front.controller.commands.%sCommand",
                 request.getParameter("command")
               )
             );
-        } catch (ClassNotFoundException e) {
-            return UnknownCommand.class;
+            return (FrontCommand) type
+              .asSubclass(FrontCommand.class)
+              .newInstance();
+        } catch (Exception e) {
+            return new UnknownCommand();
         }
     }
 }
diff --git a/enterprise-patterns/front-controller-pattern/src/main/webapp/WEB-INF/jboss-web.xml b/enterprise-patterns/front-controller-pattern/src/main/webapp/WEB-INF/jboss-web.xml
deleted file mode 100644
index db2d804135..0000000000
--- a/enterprise-patterns/front-controller-pattern/src/main/webapp/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 5.0//EN"
-        "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
-<jboss-web>
-    <context-root>/front-controller/</context-root>
-</jboss-web>