Skip to content

fix credentials NPE bug #1961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neozwu merged 3 commits into from
Apr 24, 2017
Merged

fix credentials NPE bug #1961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3529a4
fix credentials NPE bug #1565
neozwu Apr 20, 2017
c4ed11e
use object reference equality for Singleton object
neozwu Apr 24, 2017
8d45c29
implement equals() method for NoCredentials class
neozwu Apr 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.google.cloud;

import com.google.auth.oauth2.OAuth2Credentials;

import java.io.ObjectStreamException;

/**
Expand All @@ -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;
}
}
4 changes: 0 additions & 4 deletions google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -37,12 +36,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;
Expand Down
4 changes: 4 additions & 0 deletions google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down