Skip to content

fix: add some missing annotations and fix equals/hashcode for DatastoreOptions #1106

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
merged 2 commits into from
Jun 9, 2023
Merged

fix: add some missing annotations and fix equals/hashcode for DatastoreOptions #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94bee72
chore(multi db): add some missing annotations and fix equals/hashcode…
kolea2 Jun 8, 2023
fcbf460
add some tests
kolea2 Jun 8, 2023
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
1 change: 1 addition & 0 deletions datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ public String getProjectId() {
return projectId;
}

@BetaApi
public String getDatabaseId() {
return databaseId;
}
Expand Down
1 change: 1 addition & 0 deletions google-cloud-datastore/src/main/java/com/google/cloud/datastore/BaseKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ public String getNamespace() {
return namespace;
}

@BetaApi
public String getDatabaseId() {
return databaseId;
}
Expand Down
7 changes: 5 additions & 2 deletions google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ public String getNamespace() {
return namespace;
}

@BetaApi
public String getDatabaseId() {
return this.databaseId;
}
Expand Down Expand Up @@ -193,7 +194,7 @@ public Builder toBuilder() {

@Override
public int hashCode() {
return Objects.hash(baseHashCode(), namespace);
return Objects.hash(baseHashCode(), namespace, databaseId);
}

@Override
Expand All @@ -202,7 +203,9 @@ public boolean equals(Object obj) {
return false;
}
DatastoreOptions other = (DatastoreOptions) obj;
return baseEquals(other) && Objects.equals(namespace, other.namespace);
return baseEquals(other)
&& Objects.equals(namespace, other.namespace)
&& Objects.equals(databaseId, other.databaseId);
}

public static Builder newBuilder() {
Expand Down
8 changes: 7 additions & 1 deletion google-cloud-datastore/src/test/java/com/google/cloud/datastore/DatastoreOptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.google.cloud.datastore;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
Expand All @@ -38,7 +39,6 @@ public class DatastoreOptionsTest {
private DatastoreRpc datastoreRpc;
private DatastoreOptions.Builder options;

// todo parameterize
@Before
public void setUp() {
datastoreRpcFactory = EasyMock.createMock(DatastoreRpcFactory.class);
Expand Down Expand Up @@ -90,6 +90,12 @@ public void testToBuilder() {
assertEquals(original.getHost(), copy.getHost());
assertEquals(original.getRetrySettings(), copy.getRetrySettings());
assertEquals(original.getCredentials(), copy.getCredentials());
assertEquals(original, copy);
assertEquals(original.hashCode(), copy.hashCode());

DatastoreOptions newOptions = options.setDatabaseId("new-database-id").build();
assertNotEquals(original, newOptions);
assertNotEquals(original.hashCode(), newOptions.hashCode());
}

@Test
Expand Down