diff options
author | Young Gyu Park <younggyu@google.com> | 2018-05-29 19:07:27 +0900 |
---|---|---|
committer | Young Gyu Park <younggyu@google.com> | 2018-06-01 14:43:39 +0900 |
commit | 3ff7fcf07115812ffe5ec50525e23eda3577ac75 (patch) | |
tree | 549fd84e5a8c0043d951dcdf1e924e2accdda36d /src/main/java/com/android/vts/servlet/BaseServlet.java | |
parent | 7a9b488cfbfd8b3944142b6d4ba1a9f5eb43c7cd (diff) | |
download | dashboard-3ff7fcf07115812ffe5ec50525e23eda3577ac75.tar.gz |
Project managing tool change from maven to gradleandroid-o-mr1-iot-release-1.0.1
Test: go/vts-web/show_plan_release?plan=cts-on-gsi&type=suite&testCategoryType=4
Bug: 80407473
Change-Id: I6dfcd329d4c33cd5f3edf25c45caed80196c8f99
Diffstat (limited to 'src/main/java/com/android/vts/servlet/BaseServlet.java')
-rw-r--r-- | src/main/java/com/android/vts/servlet/BaseServlet.java | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/src/main/java/com/android/vts/servlet/BaseServlet.java b/src/main/java/com/android/vts/servlet/BaseServlet.java index 14983cc..7b4c624 100644 --- a/src/main/java/com/android/vts/servlet/BaseServlet.java +++ b/src/main/java/com/android/vts/servlet/BaseServlet.java @@ -16,18 +16,26 @@ package com.android.vts.servlet; +import com.android.vts.entity.TestSuiteResultEntity; +import com.android.vts.util.EmailHelper; +import com.android.vts.util.GcsHelper; import com.google.appengine.api.users.User; import com.google.appengine.api.users.UserService; import com.google.appengine.api.users.UserServiceFactory; import com.google.gson.Gson; + +import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; +import javax.servlet.ServletConfig; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -39,10 +47,10 @@ public abstract class BaseServlet extends HttpServlet { protected String ERROR_MESSAGE_JSP = "WEB-INF/jsp/error_msg.jsp"; // Environment variables - protected static final String GERRIT_URI = System.getProperty("GERRIT_URI"); - protected static final String GERRIT_SCOPE = System.getProperty("GERRIT_SCOPE"); - protected static final String CLIENT_ID = System.getProperty("CLIENT_ID"); - protected static final String ANALYTICS_ID = System.getProperty("ANALYTICS_ID"); + protected static String GERRIT_URI; + protected static String GERRIT_SCOPE; + protected static String CLIENT_ID; + protected static String ANALYTICS_ID; protected static final String TREE_DEFAULT_PARAM = "treeDefault"; @@ -128,6 +136,35 @@ public abstract class BaseServlet extends HttpServlet { */ public abstract List<Page> getBreadcrumbLinks(HttpServletRequest request); + /** System Configuration Property class */ + protected static Properties systemConfigProp = new Properties(); + + @Override + public void init(ServletConfig cfg) throws ServletException { + super.init(cfg); + + try { + InputStream defaultInputStream = + BaseServlet.class + .getClassLoader() + .getResourceAsStream("config.properties"); + systemConfigProp.load(defaultInputStream); + + GERRIT_URI = systemConfigProp.getProperty("gerrit.uri"); + GERRIT_SCOPE = systemConfigProp.getProperty("gerrit.scope"); + CLIENT_ID = systemConfigProp.getProperty("appengine.clientID"); + ANALYTICS_ID = systemConfigProp.getProperty("analytics.id"); + + TestSuiteResultEntity.setPropertyValues(systemConfigProp); + EmailHelper.setPropertyValues(systemConfigProp); + GcsHelper.setGcsProjectId(systemConfigProp.getProperty("gcs.projectID")); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { // If the user is logged out, allow them to log back in and return to the page. |