minor refactoring and 1.0.2.Final release.

AdeptJ · Nov 5, 2016 · b81e1c5 · b81e1c5
1 parent 8f2b02f
commit b81e1c5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.adeptj</groupId>
 	<artifactId>adeptj-modularweb-runtime</artifactId>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2.Final</version>
 	<packaging>jar</packaging>
 	<name>AdeptJ ModularWeb Runtime</name>
 	<description>Provision AdeptJ ModularWeb Runtime</description>

diff --git a/src/main/java/com/adeptj/modularweb/runtime/servlet/AdminDashboardServlet.java b/src/main/java/com/adeptj/modularweb/runtime/servlet/AdminDashboardServlet.java
@@ -28,8 +28,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import com.adeptj.modularweb.runtime.viewengine.Models;
-import com.adeptj.modularweb.runtime.viewengine.ViewEngine;
 import com.adeptj.modularweb.runtime.viewengine.ViewEngineContext;
+import com.adeptj.modularweb.runtime.viewengine.ViewEngines;
 
 /**
  * OSGi AdminDashboardServlet renders the admin dashboard page.
@@ -48,7 +48,7 @@ public class AdminDashboardServlet extends HttpServlet {
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		ViewEngineContext.Builder builder = new ViewEngineContext.Builder();
 		builder.view("auth/dashboard").models(new Models()).request(req).response(resp).locale(req.getLocale());
-		ViewEngine.THYMELEAF.processView(builder.build());
+		ViewEngines.THYMELEAF.processView(builder.build());
 	}
 
 	@Override

diff --git a/src/main/java/com/adeptj/modularweb/runtime/servlet/AdminErrorServlet.java b/src/main/java/com/adeptj/modularweb/runtime/servlet/AdminErrorServlet.java
@@ -31,11 +31,13 @@
 import org.thymeleaf.exceptions.TemplateInputException;
 
 import com.adeptj.modularweb.runtime.viewengine.Models;
-import com.adeptj.modularweb.runtime.viewengine.ViewEngine;
 import com.adeptj.modularweb.runtime.viewengine.ViewEngineContext;
+import com.adeptj.modularweb.runtime.viewengine.ViewEngines;
 
 /**
- * OSGi AdminErrorServlet that serves the error page w.r.t status(401, 403, 404, 500 etc.).
+ * AdminErrorServlet that serves the error page w.r.t status(401, 403, 404, 500 etc.) for admin related operations.
+ * 
+ * Note: This is independent of OSGi and directly managed by Undertow. 
  *
  * @author Rakesh.Kumar, AdeptJ
  */
@@ -51,18 +53,18 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 		Models models = new Models();
 		builder.models(models).request(req).response(resp).locale(req.getLocale());
 		if ("/admin/error".equals(requestURI)) {
-			ViewEngine.THYMELEAF.processView(builder.view("error/generic").build());
+			ViewEngines.THYMELEAF.processView(builder.view("error/generic").build());
 		} else {
 			Object exception = req.getAttribute(RequestDispatcher.ERROR_EXCEPTION);
 			String statusCode = this.getStatusCode(requestURI);
 			if (exception != null && "500".equals(statusCode)) {
 				models.put("exception", req.getAttribute(RequestDispatcher.ERROR_EXCEPTION));
-				ViewEngine.THYMELEAF.processView(builder.view("error/500").build());
+				ViewEngines.THYMELEAF.processView(builder.view("error/500").build());
 			} else {
 				try {
-					ViewEngine.THYMELEAF.processView(builder.view(String.format("error/%s", statusCode)).build());
+					ViewEngines.THYMELEAF.processView(builder.view(String.format("error/%s", statusCode)).build());
 				} catch (TemplateInputException ex) {
-					ViewEngine.THYMELEAF.processView(builder.view("error/404").build());
+					ViewEngines.THYMELEAF.processView(builder.view("error/404").build());
 				}
 			}
 		}

diff --git a/src/main/java/com/adeptj/modularweb/runtime/servlet/AdminLoginServlet.java b/src/main/java/com/adeptj/modularweb/runtime/servlet/AdminLoginServlet.java
@@ -28,8 +28,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import com.adeptj.modularweb.runtime.viewengine.Models;
-import com.adeptj.modularweb.runtime.viewengine.ViewEngine;
 import com.adeptj.modularweb.runtime.viewengine.ViewEngineContext;
+import com.adeptj.modularweb.runtime.viewengine.ViewEngines;
 
 /**
  * OSGi AdminLoginServlet serves the login page.
@@ -48,7 +48,7 @@ public class AdminLoginServlet extends HttpServlet {
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
 		ViewEngineContext.Builder builder = new ViewEngineContext.Builder();
 		builder.view("auth/login").models(new Models()).request(req).response(resp).locale(req.getLocale());
-		ViewEngine.THYMELEAF.processView(builder.build());
+		ViewEngines.THYMELEAF.processView(builder.build());
 	}
 
 	/**
@@ -60,6 +60,6 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 		Models models = new Models();
 		models.put("validation", "Invalid credentials!!");
 		builder.view("auth/login").models(models).request(req).response(resp).locale(req.getLocale());
-		ViewEngine.THYMELEAF.processView(builder.build());
+		ViewEngines.THYMELEAF.processView(builder.build());
 	}
 }
diff --git a/src/main/java/com/adeptj/modularweb/runtime/servlet/OSGiGenericErrorSevlet.java b/src/main/java/com/adeptj/modularweb/runtime/servlet/OSGiGenericErrorSevlet.java
@@ -30,8 +30,8 @@
 
 import com.adeptj.modularweb.runtime.config.Configs;
 import com.adeptj.modularweb.runtime.viewengine.Models;
-import com.adeptj.modularweb.runtime.viewengine.ViewEngine;
 import com.adeptj.modularweb.runtime.viewengine.ViewEngineContext;
+import com.adeptj.modularweb.runtime.viewengine.ViewEngines;
 
 /**
  * OSGiGenericErrorSevlet handles the system wide error codes and exceptions.
@@ -58,11 +58,11 @@ private void handleError(HttpServletRequest req, HttpServletResponse resp) throw
 		ViewEngineContext.Builder builder = new ViewEngineContext.Builder();
 		builder.models(this.models(req, statusCode)).request(req).response(resp).locale(req.getLocale());
 		if (Integer.valueOf(500).equals(statusCode)) {
-			ViewEngine.THYMELEAF.processView(builder.view("error/500").build());
+			ViewEngines.THYMELEAF.processView(builder.view("error/500").build());
 		} else if (Configs.INSTANCE.undertow().getIntList("common.status-codes").contains(statusCode)) {
-			ViewEngine.THYMELEAF.processView(builder.view(String.format("error/%s", statusCode)).build());
+			ViewEngines.THYMELEAF.processView(builder.view(String.format("error/%s", statusCode)).build());
 		} else {
-			ViewEngine.THYMELEAF.processView(builder.view("error/generic").build());
+			ViewEngines.THYMELEAF.processView(builder.view("error/generic").build());
 		}
 	}
 

diff --git a/...larweb/runtime/viewengine/ViewEngine.java → ...arweb/runtime/viewengine/ViewEngines.java b/...larweb/runtime/viewengine/ViewEngine.java → ...arweb/runtime/viewengine/ViewEngines.java
@@ -31,11 +31,11 @@
 import com.typesafe.config.Config;
 
 /**
- * ViewEngine.
+ * ViewEngines.
  * 
  * @author Rakesh.Kumar, AdeptJ.
  */
-public enum ViewEngine {
+public enum ViewEngines {
 
 	THYMELEAF {
 
@@ -77,7 +77,7 @@ public void processView(ViewEngineContext ctx) throws ViewEngineException {
 		}
 	};
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(ViewEngine.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ViewEngines.class);
 
 	public abstract void processView(ViewEngineContext engineContext) throws ViewEngineException;
 }