Reformat code optimize imports

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/FindUserServlet.java

@@ -2,27 +2,26 @@ package com.adaapa.adaojek.servlets;
 
 import com.adaapa.adaojek.middlewares.CookieCheck;
 import com.adaapa.adaojek.services.ServiceConnector;
+import com.adaapa.bean.WebServiceBean;
 import com.google.gson.Gson;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.adaapa.bean.DriverBean;
-import com.adaapa.bean.WebServiceBean;
 import java.io.IOException;
 
 public class FindUserServlet extends HttpServlet {
 
-  @Override
-  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-          throws ServletException, IOException {
-    if (!CookieCheck.redirectIfTokenNotFound(req, resp, "login")) {
-      Gson gson = new Gson();
-      String user = ServiceConnector.getServiceClass().getProfile(CookieCheck.getCookie(req).getToken());
-      WebServiceBean userBean = gson.fromJson(user, WebServiceBean.class);
-      req.setAttribute("userProfile", userBean);
-      req.getRequestDispatcher("WEB-INF/find_user.jsp").forward(req, resp);
+    @Override
+    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+            throws ServletException, IOException {
+        if (!CookieCheck.redirectIfTokenNotFound(req, resp, "login")) {
+            Gson gson = new Gson();
+            String user = ServiceConnector.getServiceClass().getProfile(CookieCheck.getCookie(req).getToken());
+            WebServiceBean userBean = gson.fromJson(user, WebServiceBean.class);
+            req.setAttribute("userProfile", userBean);
+            req.getRequestDispatcher("WEB-INF/find_user.jsp").forward(req, resp);
+        }
     }
-  }
 }

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/LoginServlet.java

@@ -4,11 +4,9 @@ package com.adaapa.adaojek.servlets;
 import com.adaapa.adaojek.middlewares.CookieCheck;
 import com.adaapa.adaojek.services.DomainConfig;
 import com.adaapa.adaojek.services.RequestSender;
-import com.adaapa.adaojek.services.ServiceConnector;
 import com.adaapa.adaojek.stub.ApplicationCookie;
 import com.adaapa.bean.LoginRequestBean;
 import com.adaapa.bean.LoginResponseBean;
-import com.adaapa.ojekservice.OjekOnline;
 import com.google.gson.Gson;
 
 import javax.servlet.ServletException;

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_driver.jsp

@@ -42,7 +42,8 @@
                 </div>
                 <div class="panel-body txt-center">
                     <c:forEach items="${preferredDrivers}" var="item">
-                        <div class="driver-list-item ng-hide" ng-show="activeList.has(${item.getId()})" data-driver-id="${item.getId()}">
+                        <div class="driver-list-item ng-hide" ng-show="activeList.has(${item.getId()})"
+                             data-driver-id="${item.getId()}">
                             <div class="first">
                                 <c:choose>
                                     <c:when test="${item.getImage() != null}">
@@ -68,7 +69,8 @@
                             </div>
                             <div>
                                 <button name="driverId" value="${item.getUsername()}" class="submit-button">
-                                    <input type="hidden" name="driverId" ng-init="driverId=${item.getId()};" ng-value="driverId">
+                                    <input type="hidden" name="driverId" ng-init="driverId=${item.getId()};"
+                                           ng-value="driverId">
                                     I Choose You
                                 </button>
                             </div>
@@ -85,7 +87,8 @@
                 </div>
                 <div class="panel-body txt-center">
                     <c:forEach items="${foundDrivers}" var="item">
-                        <div class="driver-list-item ng-hide" ng-show="activeList.has(${item.getId()})" data-driver-id="${item.getId()}">
+                        <div class="driver-list-item ng-hide" ng-show="activeList.has(${item.getId()})"
+                             data-driver-id="${item.getId()}">
                             <div class="first">
                                 <c:choose>
                                     <c:when test="${item.getImage() != null}">
@@ -110,8 +113,10 @@
                                 </span>
                             </div>
                             <div>
-                                <button name="driverId" value="${item.getUsername()}" class="submit-button" ng-click="pickDriver()">
-                                    <input type="hidden" name="driverId" ng-init="driverId=${item.getId()};" ng-value="driverId">
+                                <button name="driverId" value="${item.getUsername()}" class="submit-button"
+                                        ng-click="pickDriver()">
+                                    <input type="hidden" name="driverId" ng-init="driverId=${item.getId()};"
+                                           ng-value="driverId">
                                     I Choose You
                                 </button>
                             </div>

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_user.jsp

@@ -3,7 +3,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
-<div class="container" ng-app="orderApp" >
+<div class="container" ng-app="orderApp">
     <div class="wrapper row">
         <div>
             <div class="page-title row txt-center height-fit float-container">
@@ -18,7 +18,8 @@
                 <h2 class="inline-block" ng-show="textFind">Finding Order....</h2>
             </div>
             <div class="txt-center">
-                <button class="form-input find-button" ng-hide="buttonFind" ng-click="activateFind()">FIND ORDER</button>
+                <button class="form-input find-button" ng-hide="buttonFind" ng-click="activateFind()">FIND ORDER
+                </button>
                 <button class="close-button-order" ng-show="buttonClose" ng-click="activateClose()">CLOSE</button>
             </div>
         </div>

TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/order.jsp

@@ -43,7 +43,8 @@
                     </tr>
                     <tr>
                         <td>Preferred Driver</td>
-                        <td><input type="text" name="preferredDriver" class="form-input" placeholder="Optional" optional></td>
+                        <td><input type="text" name="preferredDriver" class="form-input" placeholder="Optional"
+                                   optional></td>
                     </tr>
                 </table>
                 <div class="txt-center">

TugasBesar2_2017/WebApp/src/main/webapp/firebase-messaging-sw.js

@@ -7,7 +7,7 @@ importScripts('https://www.gstatic.com/firebasejs/4.6.2/firebase-messaging.js')
 // Initialize the Firebase app in the service worker by passing in the
 // messagingSenderId.
 firebase.initializeApp({
-  'messagingSenderId': '948017499394'
+    'messagingSenderId': '948017499394'
 })
 
 // Retrieve an instance of Firebase Messaging so that it can handle background

TugasBesar2_2017/WebApp/src/main/webapp/js/converse.js

 /* eslint-disable */
 
 let converse = function ($http) {
-  let apiUrl = 'http://localhost:8081'
-
-  // Initialize Firebase
-  let config = {
-    apiKey: "AIzaSyCUq3YUcVzUkUpIyXmpGd_L43JX_xKyq64",
-    authDomain: "tugasbesar3-2017.firebaseapp.com",
-    databaseURL: "https://tugasbesar3-2017.firebaseio.com",
-    projectId: "tugasbesar3-2017",
-    storageBucket: "tugasbesar3-2017.appspot.com",
-    messagingSenderId: "948017499394"
-  }
-
-  class Account {
-    constructor (id) {
-      this.id = id
-      this.onChat = (msg) => {
-        console.log(msg)
-      }
+    let apiUrl = 'http://localhost:8081'
+
+    // Initialize Firebase
+    let config = {
+        apiKey: "AIzaSyCUq3YUcVzUkUpIyXmpGd_L43JX_xKyq64",
+        authDomain: "tugasbesar3-2017.firebaseapp.com",
+        databaseURL: "https://tugasbesar3-2017.firebaseio.com",
+        projectId: "tugasbesar3-2017",
+        storageBucket: "tugasbesar3-2017.appspot.com",
+        messagingSenderId: "948017499394"
     }
 
-    async initAsync () {
-      firebase.initializeApp(config)
-      let messaging = firebase.messaging()
-
-      messaging.onMessage(msg => {
-        console.log(msg)
-        this.onChat(msg.data.message)
-      })
-
-      try {
-        await messaging.requestPermission()
-      } catch (e) {
-        console.log(e)
-        alert('Please grant notification permission.')
-      }
-
-      try {
-        let data = JSON.stringify({
-          'token': await messaging.getToken()
-        })
-        console.log(data)
-
-        let response = await $http.post(`${apiUrl}/chat/${this.id}/init`, data)
-        return response.data.chats
-      } catch (e) {
-        console.log(e)
-        alert('Unable to initialize chat service.')
-      }
+    class Account {
+        constructor(id) {
+            this.id = id
+            this.onChat = (msg) => {
+                console.log(msg)
+            }
+        }
+
+        async initAsync() {
+            firebase.initializeApp(config)
+            let messaging = firebase.messaging()
+
+            messaging.onMessage(msg => {
+                console.log(msg)
+                this.onChat(msg.data.message)
+            })
+
+            try {
+                await messaging.requestPermission()
+            } catch (e) {
+                console.log(e)
+                alert('Please grant notification permission.')
+            }
+
+            try {
+                let data = JSON.stringify({
+                    'token': await messaging.getToken()
+                })
+                console.log(data)
+
+                let response = await $http.post(`${apiUrl}/chat/${this.id}/init`, data)
+                return response.data.chats
+            } catch (e) {
+                console.log(e)
+                alert('Unable to initialize chat service.')
+            }
+        }
+
+        chatAsync(message) {
+            let data = JSON.stringify({
+                'message': message
+            })
+
+            return $http.post(`${apiUrl}/chat/${this.id}`, data)
+        }
     }
 
-    chatAsync (message) {
-      let data = JSON.stringify({
-        'message': message
-      })
+    class Driver extends Account {
+        async waitAsync(timeout) {
+            let response = await $http.post(`${apiUrl}/driver/${this.id}/wait`, '', {
+                timeout: timeout
+            })
 
-      return $http.post(`${apiUrl}/chat/${this.id}`, data)
+            return response.data.user_id
+        }
     }
-  }
 
-  class Driver extends Account {
-    async waitAsync (timeout) {
-      let response = await $http.post(`${apiUrl}/driver/${this.id}/wait`, '', {
-        timeout: timeout
-      })
+    class User extends Account {
+        async checkAsync(ids) {
+            let data = JSON.stringify({
+                'driver_ids': ids
+            })
 
-      return response.data.user_id
-    }
-  }
+            let response = await $http.post(`${apiUrl}/driver/check`, data)
+            return response.data.driver_ids
+        }
 
-  class User extends Account {
-    async checkAsync (ids) {
-      let data = JSON.stringify({
-        'driver_ids': ids
-      })
+        pickAsync(id) {
+            let data = JSON.stringify({
+                'user_id': this.id
+            })
 
-      let response = await $http.post(`${apiUrl}/driver/check`, data)
-      return response.data.driver_ids
+            return $http.post(`${apiUrl}/driver/${id}/pick`, data)
+        }
     }
 
-    pickAsync (id) {
-      let data = JSON.stringify({
-        'user_id': this.id
-      })
-
-      return $http.post(`${apiUrl}/driver/${id}/pick`, data)
+    return {
+        Driver: Driver,
+        User: User
     }
-  }
-
-  return {
-    Driver: Driver,
-    User: User
-  }
 }