[DEVEDSB-98] Add custom error view and dotenv configuration

alejandrovivanco0o · alejandrovivanco0o · commit b89693b3dc7e · 2021-11-08T18:59:49.000-05:00
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -0,0 +1,32 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.platform }}
+    strategy:
+      max-parallel: 3
+      matrix:
+        platform: [windows-latest, macos-latest, ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+        cache: maven
+    - name: Build with Maven
+      run: mvn package
+    - name: Run tests
+      run: mvn clean test
diff --git a/pom.xml b/pom.xml
@@ -39,6 +39,11 @@
             <artifactId>dotenv-java</artifactId>
             <version>2.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-template-thymeleaf</artifactId>
+            <version>2.7.1</version>
+        </dependency>
     </dependencies>
     
     <build>
diff --git a/src/main/java/com/twilio/Webapp.java b/src/main/java/com/twilio/Webapp.java
@@ -13,6 +13,10 @@
 import static spark.Spark.internalServerError;
 import static spark.Spark.notFound;
 import io.github.cdimascio.dotenv.Dotenv;
+import spark.ModelAndView;
+import spark.template.thymeleaf.ThymeleafTemplateEngine;
+import java.util.HashMap;
+import java.util.Map;
 
 public class Webapp {
   private static Dotenv env = Dotenv.configure().ignoreIfMissing().load();
@@ -23,9 +27,20 @@ public static void main(String[] args) throws Exception {
 
     // Log all requests and responses
     afterAfter(new LoggingFilter());
-    // Using string/html to handle errors
-    internalServerError("<html><body><h1>Something went wrong!</h1><h2>Our Engineers are on it</h2><a href='/'>Go Home</a></body></html>");
-    notFound("<html><body><h1>Page not found</h1><a href='/'>Go Home</a></body></html>");
+
+    // Handle errors
+    internalServerError((request, response) -> {
+      Map<String, Object> model = new HashMap<String, Object>();
+      return new ThymeleafTemplateEngine().render(
+          new ModelAndView(model, "error")
+      );
+    });
+    notFound((request, response) -> {
+        Map<String, Object> model = new HashMap<String, Object>();
+        return new ThymeleafTemplateEngine().render(
+            new ModelAndView(model, "error")
+        );
+    });
 
     // Create an access token using our Twilio credentials
     get("/", (request, response) -> {
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+
+<html>
+  <body>
+    <h1>Something went wrong! </h1>
+    <h2>Our Engineers are on it</h2>
+    <a href="/">Go Home</a>
+  </body>
+</html>
