Merge pull request #98 from TwilioDevEd/DEVEDSB-98-update-tutorials

Devedsb 98 update tutorials

Author: jefflinwood

.env.example

@@ -1,3 +1,3 @@
-export TWILIO_ACCOUNT_SID=
-export TWILIO_API_KEY=
-export TWILIO_API_SECRET=
+TWILIO_ACCOUNT_SID=
+TWILIO_API_KEY=
+TWILIO_API_SECRET=

.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

pom.xml

@@ -34,6 +34,16 @@
             <artifactId>logback-classic</artifactId>
             <version>1.2.2</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.cdimascio</groupId>
+            <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>

src/main/java/com/twilio/Webapp.java

@@ -9,16 +9,36 @@
 
 import static spark.Spark.afterAfter;
 import static spark.Spark.get;
+import static spark.Spark.staticFileLocation;
+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();
 
   public static void main(String[] args) throws Exception {
-    // Load the .env file into environment
-    dotenv();
-
     // Log all requests and responses
     afterAfter(new LoggingFilter());
 
+    // 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) -> {
       // Generate a random username for the connecting client
@@ -32,24 +52,12 @@ public static void main(String[] args) throws Exception {
 
       // Create access token
       final AccessToken token = new AccessToken.Builder(
-        System.getProperty("TWILIO_ACCOUNT_SID"),
-        System.getProperty("TWILIO_API_KEY"),
-        System.getProperty("TWILIO_API_SECRET")
+        env.get("TWILIO_ACCOUNT_SID"),
+        env.get("TWILIO_API_KEY"),
+        env.get("TWILIO_API_SECRET")
       ).identity(identity).grant(grant).build();
 
       return token.toJwt();
     });
   }
-
-  private static void dotenv() throws Exception {
-    final File env = new File(".env");
-    if (!env.exists()) {
-      return;
-    }
-
-    final Properties props = new Properties();
-    props.load(new FileInputStream(env));
-    props.putAll(System.getenv());
-    props.entrySet().forEach(p -> System.setProperty(p.getKey().toString(), p.getValue().toString()));
-  }
 }

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>