diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-11-07 21:11:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-07 21:11:53 +0000 |
commit | b24da5c2f0737c7dc64f32229e9e177df6e34054 (patch) | |
tree | 4300a50c714136d14b9f92447ae310191c755304 /src | |
parent | 41eb241914073ab662b26813b0be61d2a1e4c75f (diff) | |
parent | b113f5d84d16d2161fbe47a791f1f8e27d8017a6 (diff) | |
download | dashboard-b24da5c2f0737c7dc64f32229e9e177df6e34054.tar.gz |
Merge "Return result message for the user who uploaded the proto message file"
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/android/vts/api/CoverageRestServlet.java | 2 | ||||
-rw-r--r-- | src/main/java/com/android/vts/api/DatastoreRestServlet.java | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/main/java/com/android/vts/api/CoverageRestServlet.java b/src/main/java/com/android/vts/api/CoverageRestServlet.java index 165db8d..aebd3e5 100644 --- a/src/main/java/com/android/vts/api/CoverageRestServlet.java +++ b/src/main/java/com/android/vts/api/CoverageRestServlet.java @@ -106,10 +106,8 @@ public class CoverageRestServlet extends BaseApiServlet { List<List<String>> allCoveredHalApiList = new ArrayList(); Key<TestPlanRunEntity> key = Key.create(urlSafeKey); - System.out.println("urlSafekey => " + urlSafeKey); TestPlanRunEntity testPlanRunEntity = ofy().load().key(key).safe(); - System.out.println("testPlanRunEntity => " + testPlanRunEntity); for (Key<TestRunEntity> testRunKey : testPlanRunEntity.getTestRuns()) { List<ApiCoverageEntity> apiCoverageEntityList = ofy().load().type(ApiCoverageEntity.class).ancestor(testRunKey).list(); diff --git a/src/main/java/com/android/vts/api/DatastoreRestServlet.java b/src/main/java/com/android/vts/api/DatastoreRestServlet.java index 5ddf18d..fb5ac65 100644 --- a/src/main/java/com/android/vts/api/DatastoreRestServlet.java +++ b/src/main/java/com/android/vts/api/DatastoreRestServlet.java @@ -87,6 +87,7 @@ public class DatastoreRestServlet extends BaseApiServlet { return; } + String resultMsg = ""; // Verify service account access token. if (postMessage.hasAccessToken()) { String accessToken = postMessage.getAccessToken(); @@ -109,15 +110,21 @@ public class DatastoreRestServlet extends BaseApiServlet { } response.setStatus(HttpServletResponse.SC_OK); + resultMsg = "Success!!"; } else { log.warn("service_client_id didn't match!"); log.debug("SERVICE_CLIENT_ID => " + tokenInfo.getIssuedTo()); + resultMsg = "Your SERVICE_CLIENT_ID is incorrect!"; response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); } } else { log.error("postMessage do not contain any accessToken!"); + resultMsg = "Your message do not have access token!"; response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); } + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write("{'result_msg': " + resultMsg + "}"); } /** @@ -446,13 +453,6 @@ public class DatastoreRestServlet extends BaseApiServlet { Map<com.googlecode.objectify.Key<TestRunEntity>, TestRunEntity> testRunEntityMap = ofy().load().keys(() -> testRunKeyList.iterator()); - testRunKeyList.forEach( - (v) -> { - log.debug("TestRunEntity key value => " + v); - }); - log.debug("testRunEntityMap value => " + testRunEntityMap.values()); - log.debug("testRunEntityMap keySet => " + testRunEntityMap.keySet()); - long passCount = 0; long failCount = 0; long startTimestamp = -1; |