commit 8fcb553bb91302cc83261790cf8ea6443ccf1748
author lberki <lberki@google.com> Fri Aug 24 03:45:32 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Fri Aug 24 03:48:08 2018 -0700
tree a227624880edc2982e57de0257f808948560eb14
parent fb2ef0e20ff69c8a1d740ababd0604619f217492

Make Bazel compile with JDK 8 again.

Apparently, this is https://bugs.openjdk.java.net/browse/JDK-8056066 triggered by https://github.com/bazelbuild/bazel/commit/deccc485603c004daad959fd747f1c0c9efc4f00 (fixed in http://openjdk.java.net/jeps/216 but that doesn't help JDK 8)

RELNOTES: None.
PiperOrigin-RevId: 210078552

src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java b/src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java
index b272173..a2c6687 100644
--- a/src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java
+++ b/src/test/java/com/google/devtools/build/lib/remote/blobstore/http/HttpBlobStoreTest.java
@@ -29,7 +29,6 @@
 import com.google.api.client.util.Preconditions;
 import com.google.auth.Credentials;
 import com.google.common.base.Charsets;
-import com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
@@ -296,11 +295,15 @@
 
   @Test
   public void expiredAuthTokensShouldBeRetried_get() throws Exception {
-    expiredAuthTokensShouldBeRetried_get(ErrorType.UNAUTHORIZED);
-    expiredAuthTokensShouldBeRetried_get(ErrorType.INVALID_TOKEN);
+    expiredAuthTokensShouldBeRetried_get(
+        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.UNAUTHORIZED);
+    expiredAuthTokensShouldBeRetried_get(
+        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_TOKEN);
   }
 
-  private void expiredAuthTokensShouldBeRetried_get(ErrorType errorType) throws Exception {
+  private void expiredAuthTokensShouldBeRetried_get(
+      com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType)
+      throws Exception {
     ServerChannel server = null;
     try {
       server = testServer.start(new NotAuthorizedHandler(errorType));
@@ -324,11 +327,14 @@
 
   @Test
   public void expiredAuthTokensShouldBeRetried_put() throws Exception {
-    expiredAuthTokensShouldBeRetried_put(ErrorType.UNAUTHORIZED);
-    expiredAuthTokensShouldBeRetried_put(ErrorType.INVALID_TOKEN);
+    expiredAuthTokensShouldBeRetried_put(
+        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.UNAUTHORIZED);
+    expiredAuthTokensShouldBeRetried_put(
+        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_TOKEN);
   }
 
-  private void expiredAuthTokensShouldBeRetried_put(ErrorType errorType) throws Exception {
+  private void expiredAuthTokensShouldBeRetried_put(
+      com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) throws Exception {
     ServerChannel server = null;
     try {
       server = testServer.start(new NotAuthorizedHandler(errorType));
@@ -350,11 +356,14 @@
 
   @Test
   public void errorCodesThatShouldNotBeRetried_get() {
-    errorCodeThatShouldNotBeRetried_get(ErrorType.INSUFFICIENT_SCOPE);
-    errorCodeThatShouldNotBeRetried_get(ErrorType.INVALID_REQUEST);
+    errorCodeThatShouldNotBeRetried_get(
+        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INSUFFICIENT_SCOPE);
+    errorCodeThatShouldNotBeRetried_get(
+        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_REQUEST);
   }
 
-  private void errorCodeThatShouldNotBeRetried_get(ErrorType errorType) {
+  private void errorCodeThatShouldNotBeRetried_get(
+      com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) {
     ServerChannel server = null;
     try {
       server = testServer.start(new NotAuthorizedHandler(errorType));
@@ -375,11 +384,14 @@
 
   @Test
   public void errorCodesThatShouldNotBeRetried_put() {
-    errorCodeThatShouldNotBeRetried_put(ErrorType.INSUFFICIENT_SCOPE);
-    errorCodeThatShouldNotBeRetried_put(ErrorType.INVALID_REQUEST);
+    errorCodeThatShouldNotBeRetried_put(
+        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INSUFFICIENT_SCOPE);
+    errorCodeThatShouldNotBeRetried_put(
+        com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType.INVALID_REQUEST);
   }
 
-  private void errorCodeThatShouldNotBeRetried_put(ErrorType errorType) {
+  private void errorCodeThatShouldNotBeRetried_put(
+      com.google.devtools.build.lib.remote.blobstore.http.HttpBlobStoreTest.NotAuthorizedHandler.ErrorType errorType) {
     ServerChannel server = null;
     try {
       server = testServer.start(new NotAuthorizedHandler(errorType));