fix credentials NPE bug (#1961)

neozwu · web-flow · commit ae3c7877c6e3 · 2017-04-24T09:08:02.000-07:00
* fix credentials NPE bug #1565 * use object reference equality for Singleton object * implement equals() method for NoCredentials class
diff --git a/google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java b/google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java
@@ -17,7 +17,6 @@
 package com.google.cloud;
 
 import com.google.auth.oauth2.OAuth2Credentials;
-
 import java.io.ObjectStreamException;
 
 /**
@@ -38,4 +37,12 @@ private Object readResolve() throws ObjectStreamException {
   public static NoCredentials getInstance() {
     return INSTANCE;
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (!(obj instanceof NoCredentials)) {
+      return false;
+    }
+    return this == obj;
+  }
 }
diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
@@ -19,7 +19,6 @@
 import static com.google.common.base.MoreObjects.firstNonNull;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.api.core.ApiClock;
 import com.google.api.core.CurrentMillisClock;
@@ -38,12 +37,9 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Locale;
 import java.util.Objects;
diff --git a/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java b/google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
@@ -16,6 +16,7 @@
 
 package com.google.cloud;
 
+import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertSame;
@@ -231,6 +232,9 @@ public void testBuilder() {
   @Test
   public void testBuilderNoCredentials() {
     assertEquals(NoCredentials.getInstance(), OPTIONS_NO_CREDENTIALS.getCredentials());
+    assertTrue(NoCredentials.getInstance().equals(OPTIONS_NO_CREDENTIALS.getCredentials()));
+    assertFalse(NoCredentials.getInstance().equals(OPTIONS.getCredentials()));
+    assertFalse(NoCredentials.getInstance().equals(null));
     assertSame(TEST_CLOCK, OPTIONS_NO_CREDENTIALS.getClock());
     assertEquals("host", OPTIONS_NO_CREDENTIALS.getHost());
     assertEquals("project-id", OPTIONS_NO_CREDENTIALS.getProjectId());
diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
@@ -82,7 +82,7 @@ public GrpcLoggingRpc(LoggingOptions options) throws IOException {
       ChannelProvider channelProvider;
       // todo(mziccard): ChannelProvider should support null/absent credentials for testing
       if (options.getHost().contains("localhost")
-          || options.getCredentials().equals(NoCredentials.getInstance())) {
+          || NoCredentials.getInstance().equals(options.getCredentials())) {
         ManagedChannel managedChannel = ManagedChannelBuilder.forTarget(options.getHost())
             .usePlaintext(true)
             .executor(executor)
