> bindings() {
+ return bindings;
+ }
+
+ /**
+ * The policy's etag.
+ *
+ * Etags are used for optimistic concurrency control as a way to help prevent simultaneous
+ * updates of a policy from overwriting each other. It is strongly suggested that systems make
+ * use of the etag in the read-modify-write cycle to perform policy updates in order to avoid
+ * race conditions. An etag is returned in the response to getIamPolicy, and systems are
+ * expected to put that etag in the request to setIamPolicy to ensure that their change will be
+ * applied to the same version of the policy. If no etag is provided in the call to
+ * setIamPolicy, then the existing policy is overwritten blindly.
+ */
+ public String etag() {
+ return etag;
+ }
+
+ /**
+ * Sets the version of the policy. The default version is 0, meaning only the "owner", "editor",
+ * and "viewer" roles are permitted. If the version is 1, you may also use other roles.
+ */
+ public Integer version() {
+ return version;
+ }
+
+ @Override
+ public final int hashCode() {
+ return Objects.hash(getClass(), bindings, etag, version);
+ }
+
+ @Override
+ public final boolean equals(Object obj) {
+ if (obj == null || !getClass().equals(obj.getClass())) {
+ return false;
+ }
+ @SuppressWarnings("rawtypes")
+ IamPolicy other = (IamPolicy) obj;
+ return Objects.equals(bindings, other.bindings())
+ && Objects.equals(etag, other.etag())
+ && Objects.equals(version, other.version());
+ }
+}
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Identity.java b/gcloud-java-core/src/main/java/com/google/gcloud/Identity.java
new file mode 100644
index 000000000000..687a76ffc42c
--- /dev/null
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Identity.java
@@ -0,0 +1,225 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gcloud;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.base.CaseFormat;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * An identity in an {@link IamPolicy}. The following types of identities are permitted in IAM
+ * policies:
+ *
+ * - Google account
+ *
- Service account
+ *
- Google group
+ *
- Google Apps domain
+ *
+ *
+ * There are also two special identities that represent all users and all Google-authenticated
+ * accounts.
+ *
+ * @see Concepts
+ * related to identity
+ */
+public final class Identity implements Serializable {
+
+ private static final long serialVersionUID = -8181841964597657446L;
+
+ private final Type type;
+ private final String value;
+
+ /**
+ * The types of IAM identities.
+ */
+ public enum Type {
+
+ /**
+ * Represents anyone who is on the internet; with or without a Google account.
+ */
+ ALL_USERS,
+
+ /**
+ * Represents anyone who is authenticated with a Google account or a service account.
+ */
+ ALL_AUTHENTICATED_USERS,
+
+ /**
+ * Represents a specific Google account.
+ */
+ USER,
+
+ /**
+ * Represents a service account.
+ */
+ SERVICE_ACCOUNT,
+
+ /**
+ * Represents a Google group.
+ */
+ GROUP,
+
+ /**
+ * Represents all the users of a Google Apps domain name.
+ */
+ DOMAIN
+ }
+
+ private Identity(Type type, String value) {
+ this.type = type;
+ this.value = value;
+ }
+
+ public Type type() {
+ return type;
+ }
+
+ /**
+ * Returns the string identifier for this identity. The value corresponds to:
+ *
+ * - email address (for identities of type {@code USER}, {@code SERVICE_ACCOUNT}, and
+ * {@code GROUP})
+ *
- domain (for identities of type {@code DOMAIN})
+ *
- {@code null} (for identities of type {@code ALL_USERS} and
+ * {@code ALL_AUTHENTICATED_USERS})
+ *
+ */
+ public String value() {
+ return value;
+ }
+
+ /**
+ * Returns a new identity representing anyone who is on the internet; with or without a Google
+ * account.
+ */
+ public static Identity allUsers() {
+ return new Identity(Type.ALL_USERS, null);
+ }
+
+ /**
+ * Returns a new identity representing anyone who is authenticated with a Google account or a
+ * service account.
+ */
+ public static Identity allAuthenticatedUsers() {
+ return new Identity(Type.ALL_AUTHENTICATED_USERS, null);
+ }
+
+ /**
+ * Returns a new user identity.
+ *
+ * @param email An email address that represents a specific Google account. For example,
+ * alice@gmail.com or joe@example.com.
+ */
+ public static Identity user(String email) {
+ return new Identity(Type.USER, checkNotNull(email));
+ }
+
+ /**
+ * Returns a new service account identity.
+ *
+ * @param email An email address that represents a service account. For example,
+ * my-other-app@appspot.gserviceaccount.com.
+ */
+ public static Identity serviceAccount(String email) {
+ return new Identity(Type.SERVICE_ACCOUNT, checkNotNull(email));
+ }
+
+ /**
+ * Returns a new group identity.
+ *
+ * @param email An email address that represents a Google group. For example,
+ * admins@example.com.
+ */
+ public static Identity group(String email) {
+ return new Identity(Type.GROUP, checkNotNull(email));
+ }
+
+ /**
+ * Returns a new domain identity.
+ *
+ * @param domain A Google Apps domain name that represents all the users of that domain. For
+ * example, google.com or example.com.
+ */
+ public static Identity domain(String domain) {
+ return new Identity(Type.DOMAIN, checkNotNull(domain));
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(value, type);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof Identity)) {
+ return false;
+ }
+ Identity other = (Identity) obj;
+ return Objects.equals(value, other.value()) && Objects.equals(type, other.type());
+ }
+
+ /**
+ * Returns the string value associated with the identity. Used primarily for converting from
+ * {@code Identity} objects to strings for protobuf-generated policies.
+ */
+ public String strValue() {
+ switch (type) {
+ case ALL_USERS:
+ return "allUsers";
+ case ALL_AUTHENTICATED_USERS:
+ return "allAuthenticatedUsers";
+ case USER:
+ return "user:" + value;
+ case SERVICE_ACCOUNT:
+ return "serviceAccount:" + value;
+ case GROUP:
+ return "group:" + value;
+ case DOMAIN:
+ return "domain:" + value;
+ default:
+ throw new IllegalStateException("Unexpected identity type: " + type);
+ }
+ }
+
+ /**
+ * Converts a string to an {@code Identity}. Used primarily for converting protobuf-generated
+ * policy identities to {@code Identity} objects.
+ */
+ public static Identity valueOf(String identityStr) {
+ String[] info = identityStr.split(":");
+ Type type = Type.valueOf(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, info[0]));
+ switch (type) {
+ case ALL_USERS:
+ return Identity.allUsers();
+ case ALL_AUTHENTICATED_USERS:
+ return Identity.allAuthenticatedUsers();
+ case USER:
+ return Identity.user(info[1]);
+ case SERVICE_ACCOUNT:
+ return Identity.serviceAccount(info[1]);
+ case GROUP:
+ return Identity.group(info[1]);
+ case DOMAIN:
+ return Identity.domain(info[1]);
+ default:
+ throw new IllegalStateException("Unexpected identity type " + type);
+ }
+ }
+}
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
index 90633c70046f..0b573522e370 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/Restorable.java
@@ -21,14 +21,14 @@
*
*
* A typical capture usage:
- *
{@code
+ * {@code
* X restorableObj; // X instanceof Restorable
* RestorableState state = restorableObj.capture();
* .. persist state
* }
*
* A typical restore usage:
- * {@code
+ * {@code
* RestorableState state = ... // read from persistence
* X restorableObj = state.restore();
* ...
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
index 31e543809464..d45069434a26 100644
--- a/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/ServiceOptions.java
@@ -523,9 +523,10 @@ public RetryParams retryParams() {
* options.
*/
public HttpRequestInitializer httpRequestInitializer() {
- final HttpRequestInitializer delegate = authCredentials() != null
- ? new HttpCredentialsAdapter(authCredentials().credentials().createScoped(scopes()))
- : null;
+ final HttpRequestInitializer delegate =
+ authCredentials() != null && authCredentials.credentials() != null
+ ? new HttpCredentialsAdapter(authCredentials().credentials().createScoped(scopes()))
+ : null;
return new HttpRequestInitializer() {
@Override
public void initialize(HttpRequest httpRequest) throws IOException {
diff --git a/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java b/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java
new file mode 100644
index 000000000000..d527640c99f9
--- /dev/null
+++ b/gcloud-java-core/src/main/java/com/google/gcloud/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Core classes for the {@code gcloud-java} library.
+ */
+package com.google.gcloud;
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BaseSerializationTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BaseSerializationTest.java
new file mode 100644
index 000000000000..e9ab3d47984b
--- /dev/null
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BaseSerializationTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gcloud;
+
+import static com.google.common.base.MoreObjects.firstNonNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+/**
+ * Base class for serialization tests. To use this class in your tests override the
+ * {@code serializableObjects()} method to return all objects that must be serializable. Also
+ * override {@code restorableObjects()} method to return all restorable objects whose state must be
+ * tested for proper serialization. Both methods can return {@code null} if no such object needs to
+ * be tested.
+ */
+public abstract class BaseSerializationTest {
+
+ /**
+ * Returns all objects for which correct serialization must be tested.
+ */
+ protected abstract Serializable[] serializableObjects();
+
+ /**
+ * Returns all restorable objects whose state must be tested for proper serialization.
+ */
+ protected abstract Restorable[] restorableObjects();
+
+ @Test
+ public void testSerializableObjects() throws Exception {
+ for (Serializable obj : firstNonNull(serializableObjects(), new Serializable[0])) {
+ Object copy = serializeAndDeserialize(obj);
+ assertEquals(obj, obj);
+ assertEquals(obj, copy);
+ assertEquals(obj.hashCode(), copy.hashCode());
+ assertEquals(obj.toString(), copy.toString());
+ assertNotSame(obj, copy);
+ assertEquals(copy, copy);
+ }
+ }
+
+ @Test
+ public void testRestorableObjects() throws Exception {
+ for (Restorable restorable : firstNonNull(restorableObjects(), new Restorable[0])) {
+ RestorableState state = restorable.capture();
+ RestorableState deserializedState = serializeAndDeserialize(state);
+ assertEquals(state, deserializedState);
+ assertEquals(state.hashCode(), deserializedState.hashCode());
+ assertEquals(state.toString(), deserializedState.toString());
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public T serializeAndDeserialize(T obj) throws IOException, ClassNotFoundException {
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ try (ObjectOutputStream output = new ObjectOutputStream(bytes)) {
+ output.writeObject(obj);
+ }
+ try (ObjectInputStream input =
+ new ObjectInputStream(new ByteArrayInputStream(bytes.toByteArray()))) {
+ return (T) input.readObject();
+ }
+ }
+}
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java
index e49a17b019e0..6d5306a3bc7f 100644
--- a/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/BaseWriteChannelTest.java
@@ -32,6 +32,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
import java.util.Arrays;
import java.util.Random;
@@ -102,8 +103,7 @@ public void testClose() throws IOException {
@Test
public void testValidateOpen() throws IOException {
channel.close();
- thrown.expect(IOException.class);
- thrown.expectMessage("stream is closed");
+ thrown.expect(ClosedChannelException.class);
channel.write(ByteBuffer.allocate(42));
}
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/IamPolicyTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/IamPolicyTest.java
new file mode 100644
index 000000000000..235c2c2b1c85
--- /dev/null
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/IamPolicyTest.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gcloud;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class IamPolicyTest {
+
+ private static final Identity ALL_USERS = Identity.allUsers();
+ private static final Identity ALL_AUTH_USERS = Identity.allAuthenticatedUsers();
+ private static final Identity USER = Identity.user("abc@gmail.com");
+ private static final Identity SERVICE_ACCOUNT =
+ Identity.serviceAccount("service-account@gmail.com");
+ private static final Identity GROUP = Identity.group("group@gmail.com");
+ private static final Identity DOMAIN = Identity.domain("google.com");
+ private static final Map> BINDINGS = ImmutableMap.of(
+ "viewer",
+ ImmutableSet.of(USER, SERVICE_ACCOUNT, ALL_USERS),
+ "editor",
+ ImmutableSet.of(ALL_AUTH_USERS, GROUP, DOMAIN));
+ private static final PolicyImpl SIMPLE_POLICY = PolicyImpl.builder()
+ .addIdentity("viewer", USER, SERVICE_ACCOUNT, ALL_USERS)
+ .addIdentity("editor", ALL_AUTH_USERS, GROUP, DOMAIN)
+ .build();
+ private static final PolicyImpl FULL_POLICY =
+ new PolicyImpl.Builder(SIMPLE_POLICY.bindings(), "etag", 1).build();
+
+ static class PolicyImpl extends IamPolicy {
+
+ static class Builder extends IamPolicy.Builder {
+
+ private Builder() {}
+
+ private Builder(Map> bindings, String etag, Integer version) {
+ bindings(bindings).etag(etag).version(version);
+ }
+
+ @Override
+ public PolicyImpl build() {
+ return new PolicyImpl(this);
+ }
+ }
+
+ PolicyImpl(Builder builder) {
+ super(builder);
+ }
+
+ @Override
+ public Builder toBuilder() {
+ return new Builder(bindings(), etag(), version());
+ }
+
+ static Builder builder() {
+ return new Builder();
+ }
+ }
+
+ @Test
+ public void testBuilder() {
+ assertEquals(BINDINGS, FULL_POLICY.bindings());
+ assertEquals("etag", FULL_POLICY.etag());
+ assertEquals(1, FULL_POLICY.version().intValue());
+ Map> editorBinding =
+ ImmutableMap.>builder().put("editor", BINDINGS.get("editor")).build();
+ PolicyImpl policy = FULL_POLICY.toBuilder().bindings(editorBinding).build();
+ assertEquals(editorBinding, policy.bindings());
+ assertEquals("etag", policy.etag());
+ assertEquals(1, policy.version().intValue());
+ policy = SIMPLE_POLICY.toBuilder().removeRole("editor").build();
+ assertEquals(ImmutableMap.of("viewer", BINDINGS.get("viewer")), policy.bindings());
+ assertNull(policy.etag());
+ assertNull(policy.version());
+ policy = policy.toBuilder()
+ .removeIdentity("viewer", USER, ALL_USERS)
+ .addIdentity("viewer", DOMAIN, GROUP)
+ .build();
+ assertEquals(ImmutableMap.of("viewer", ImmutableSet.of(SERVICE_ACCOUNT, DOMAIN, GROUP)),
+ policy.bindings());
+ assertNull(policy.etag());
+ assertNull(policy.version());
+ policy = PolicyImpl.builder()
+ .removeIdentity("viewer", USER)
+ .addIdentity("owner", USER, SERVICE_ACCOUNT)
+ .addIdentity("editor", GROUP)
+ .removeIdentity("editor", GROUP)
+ .build();
+ assertEquals(
+ ImmutableMap.of("owner", ImmutableSet.of(USER, SERVICE_ACCOUNT)), policy.bindings());
+ assertNull(policy.etag());
+ assertNull(policy.version());
+ }
+
+ @Test
+ public void testIllegalPolicies() {
+ try {
+ PolicyImpl.builder().addIdentity(null, USER);
+ fail("Null role should cause exception.");
+ } catch (NullPointerException ex) {
+ assertEquals("The role cannot be null.", ex.getMessage());
+ }
+ try {
+ PolicyImpl.builder().addIdentity("viewer", null, USER);
+ fail("Null identity should cause exception.");
+ } catch (NullPointerException ex) {
+ assertEquals("Null identities are not permitted.", ex.getMessage());
+ }
+ try {
+ PolicyImpl.builder().addIdentity("viewer", USER, (Identity[]) null);
+ fail("Null identity should cause exception.");
+ } catch (NullPointerException ex) {
+ assertEquals("Null identities are not permitted.", ex.getMessage());
+ }
+ try {
+ PolicyImpl.builder().bindings(null);
+ fail("Null bindings map should cause exception.");
+ } catch (NullPointerException ex) {
+ assertEquals("The provided map of bindings cannot be null.", ex.getMessage());
+ }
+ try {
+ Map> bindings = new HashMap<>();
+ bindings.put("viewer", null);
+ PolicyImpl.builder().bindings(bindings);
+ fail("Null set of identities should cause exception.");
+ } catch (NullPointerException ex) {
+ assertEquals("A role cannot be assigned to a null set of identities.", ex.getMessage());
+ }
+ try {
+ Map> bindings = new HashMap<>();
+ Set identities = new HashSet<>();
+ identities.add(null);
+ bindings.put("viewer", identities);
+ PolicyImpl.builder().bindings(bindings);
+ fail("Null identity should cause exception.");
+ } catch (IllegalArgumentException ex) {
+ assertEquals("Null identities are not permitted.", ex.getMessage());
+ }
+ }
+
+ @Test
+ public void testEqualsHashCode() {
+ assertNotNull(FULL_POLICY);
+ PolicyImpl emptyPolicy = PolicyImpl.builder().build();
+ AnotherPolicyImpl anotherPolicy = new AnotherPolicyImpl.Builder().build();
+ assertNotEquals(emptyPolicy, anotherPolicy);
+ assertNotEquals(emptyPolicy.hashCode(), anotherPolicy.hashCode());
+ assertNotEquals(FULL_POLICY, SIMPLE_POLICY);
+ assertNotEquals(FULL_POLICY.hashCode(), SIMPLE_POLICY.hashCode());
+ PolicyImpl copy = SIMPLE_POLICY.toBuilder().build();
+ assertEquals(SIMPLE_POLICY, copy);
+ assertEquals(SIMPLE_POLICY.hashCode(), copy.hashCode());
+ }
+
+ @Test
+ public void testBindings() {
+ assertTrue(PolicyImpl.builder().build().bindings().isEmpty());
+ assertEquals(BINDINGS, SIMPLE_POLICY.bindings());
+ }
+
+ @Test
+ public void testEtag() {
+ assertNull(SIMPLE_POLICY.etag());
+ assertEquals("etag", FULL_POLICY.etag());
+ }
+
+ @Test
+ public void testVersion() {
+ assertNull(SIMPLE_POLICY.version());
+ assertEquals(1, FULL_POLICY.version().intValue());
+ }
+
+ static class AnotherPolicyImpl extends IamPolicy {
+
+ static class Builder extends IamPolicy.Builder {
+
+ private Builder() {}
+
+ @Override
+ public AnotherPolicyImpl build() {
+ return new AnotherPolicyImpl(this);
+ }
+ }
+
+ AnotherPolicyImpl(Builder builder) {
+ super(builder);
+ }
+
+ @Override
+ public Builder toBuilder() {
+ return new Builder();
+ }
+ }
+}
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/IdentityTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/IdentityTest.java
new file mode 100644
index 000000000000..a42bc9db7abd
--- /dev/null
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/IdentityTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gcloud;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Test;
+
+public class IdentityTest {
+
+ private static final Identity ALL_USERS = Identity.allUsers();
+ private static final Identity ALL_AUTH_USERS = Identity.allAuthenticatedUsers();
+ private static final Identity USER = Identity.user("abc@gmail.com");
+ private static final Identity SERVICE_ACCOUNT =
+ Identity.serviceAccount("service-account@gmail.com");
+ private static final Identity GROUP = Identity.group("group@gmail.com");
+ private static final Identity DOMAIN = Identity.domain("google.com");
+
+ @Test
+ public void testAllUsers() {
+ assertEquals(Identity.Type.ALL_USERS, ALL_USERS.type());
+ assertNull(ALL_USERS.value());
+ }
+
+ @Test
+ public void testAllAuthenticatedUsers() {
+ assertEquals(Identity.Type.ALL_AUTHENTICATED_USERS, ALL_AUTH_USERS.type());
+ assertNull(ALL_AUTH_USERS.value());
+ }
+
+ @Test
+ public void testUser() {
+ assertEquals(Identity.Type.USER, USER.type());
+ assertEquals("abc@gmail.com", USER.value());
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testUserNullEmail() {
+ Identity.user(null);
+ }
+
+ @Test
+ public void testServiceAccount() {
+ assertEquals(Identity.Type.SERVICE_ACCOUNT, SERVICE_ACCOUNT.type());
+ assertEquals("service-account@gmail.com", SERVICE_ACCOUNT.value());
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testServiceAccountNullEmail() {
+ Identity.serviceAccount(null);
+ }
+
+ @Test
+ public void testGroup() {
+ assertEquals(Identity.Type.GROUP, GROUP.type());
+ assertEquals("group@gmail.com", GROUP.value());
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testGroupNullEmail() {
+ Identity.group(null);
+ }
+
+ @Test
+ public void testDomain() {
+ assertEquals(Identity.Type.DOMAIN, DOMAIN.type());
+ assertEquals("google.com", DOMAIN.value());
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testDomainNullId() {
+ Identity.domain(null);
+ }
+
+ @Test
+ public void testIdentityToAndFromPb() {
+ compareIdentities(ALL_USERS, Identity.valueOf(ALL_USERS.strValue()));
+ compareIdentities(ALL_AUTH_USERS, Identity.valueOf(ALL_AUTH_USERS.strValue()));
+ compareIdentities(USER, Identity.valueOf(USER.strValue()));
+ compareIdentities(SERVICE_ACCOUNT, Identity.valueOf(SERVICE_ACCOUNT.strValue()));
+ compareIdentities(GROUP, Identity.valueOf(GROUP.strValue()));
+ compareIdentities(DOMAIN, Identity.valueOf(DOMAIN.strValue()));
+ }
+
+ private void compareIdentities(Identity expected, Identity actual) {
+ assertEquals(expected, actual);
+ assertEquals(expected.type(), actual.type());
+ assertEquals(expected.value(), actual.value());
+ }
+}
diff --git a/gcloud-java-core/src/test/java/com/google/gcloud/SerializationTest.java b/gcloud-java-core/src/test/java/com/google/gcloud/SerializationTest.java
new file mode 100644
index 000000000000..3255a17333aa
--- /dev/null
+++ b/gcloud-java-core/src/test/java/com/google/gcloud/SerializationTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2016 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.gcloud;
+
+import com.google.common.collect.ImmutableList;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.Serializable;
+
+public class SerializationTest extends BaseSerializationTest {
+
+ private static class SomeIamPolicy extends IamPolicy {
+
+ private static final long serialVersionUID = 271243551016958285L;
+
+ private static class Builder extends IamPolicy.Builder {
+
+ @Override
+ public SomeIamPolicy build() {
+ return new SomeIamPolicy(this);
+ }
+ }
+
+ protected SomeIamPolicy(Builder builder) {
+ super(builder);
+ }
+
+ @Override
+ public Builder toBuilder() {
+ return new Builder();
+ }
+ }
+
+ private static final BaseServiceException BASE_SERVICE_EXCEPTION =
+ new BaseServiceException(42, "message", "reason", true);
+ private static final ExceptionHandler EXCEPTION_HANDLER = ExceptionHandler.defaultInstance();
+ private static final Identity IDENTITY = Identity.allAuthenticatedUsers();
+ private static final PageImpl PAGE =
+ new PageImpl<>(null, "cursor", ImmutableList.of("string1", "string2"));
+ private static final RetryParams RETRY_PARAMS = RetryParams.defaultInstance();
+ private static final SomeIamPolicy SOME_IAM_POLICY = new SomeIamPolicy.Builder().build();
+ private static final String JSON_KEY = "{\n"
+ + " \"private_key_id\": \"somekeyid\",\n"
+ + " \"private_key\": \"-----BEGIN PRIVATE KEY-----\\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggS"
+ + "kAgEAAoIBAQC+K2hSuFpAdrJI\\nnCgcDz2M7t7bjdlsadsasad+fvRSW6TjNQZ3p5LLQY1kSZRqBqylRkzteMOyHg"
+ + "aR\\n0Pmxh3ILCND5men43j3h4eDbrhQBuxfEMalkG92sL+PNQSETY2tnvXryOvmBRwa/\\nQP/9dJfIkIDJ9Fw9N4"
+ + "Bhhhp6mCcRpdQjV38H7JsyJ7lih/oNjECgYAt\\nknddadwkwewcVxHFhcZJO+XWf6ofLUXpRwiTZakGMn8EE1uVa2"
+ + "LgczOjwWHGi99MFjxSer5m9\\n1tCa3/KEGKiS/YL71JvjwX3mb+cewlkcmweBKZHM2JPTk0ZednFSpVZMtycjkbLa"
+ + "\\ndYOS8V85AgMBewECggEBAKksaldajfDZDV6nGqbFjMiizAKJolr/M3OQw16K6o3/\\n0S31xIe3sSlgW0+UbYlF"
+ + "4U8KifhManD1apVSC3csafaspP4RZUHFhtBywLO9pR5c\\nr6S5aLp+gPWFyIp1pfXbWGvc5VY/v9x7ya1VEa6rXvL"
+ + "sKupSeWAW4tMj3eo/64ge\\nsdaceaLYw52KeBYiT6+vpsnYrEkAHO1fF/LavbLLOFJmFTMxmsNaG0tuiJHgjshB\\"
+ + "n82DpMCbXG9YcCgI/DbzuIjsdj2JC1cascSP//3PmefWysucBQe7Jryb6NQtASmnv\\nCdDw/0jmZTEjpe4S1lxfHp"
+ + "lAhHFtdgYTvyYtaLZiVVkCgYEA8eVpof2rceecw/I6\\n5ng1q3Hl2usdWV/4mZMvR0fOemacLLfocX6IYxT1zA1FF"
+ + "JlbXSRsJMf/Qq39mOR2\\nSpW+hr4jCoHeRVYLgsbggtrevGmILAlNoqCMpGZ6vDmJpq6ECV9olliDvpPgWOP+\\nm"
+ + "YPDreFBGxWvQrADNbRt2dmGsrsCgYEAyUHqB2wvJHFqdmeBsaacewzV8x9WgmeX\\ngUIi9REwXlGDW0Mz50dxpxcK"
+ + "CAYn65+7TCnY5O/jmL0VRxU1J2mSWyWTo1C+17L0\\n3fUqjxL1pkefwecxwecvC+gFFYdJ4CQ/MHHXU81Lwl1iWdF"
+ + "Cd2UoGddYaOF+KNeM\\nHC7cmqra+JsCgYEAlUNywzq8nUg7282E+uICfCB0LfwejuymR93CtsFgb7cRd6ak\\nECR"
+ + "8FGfCpH8ruWJINllbQfcHVCX47ndLZwqv3oVFKh6pAS/vVI4dpOepP8++7y1u\\ncoOvtreXCX6XqfrWDtKIvv0vjl"
+ + "HBhhhp6mCcRpdQjV38H7JsyJ7lih/oNjECgYAt\\nkndj5uNl5SiuVxHFhcZJO+XWf6ofLUregtevZakGMn8EE1uVa"
+ + "2AY7eafmoU/nZPT\\n00YB0TBATdCbn/nBSuKDESkhSg9s2GEKQZG5hBmL5uCMfo09z3SfxZIhJdlerreP\\nJ7gSi"
+ + "dI12N+EZxYd4xIJh/HFDgp7RRO87f+WJkofMQKBgGTnClK1VMaCRbJZPriw\\nEfeFCoOX75MxKwXs6xgrw4W//AYG"
+ + "GUjDt83lD6AZP6tws7gJ2IwY/qP7+lyhjEqN\\nHtfPZRGFkGZsdaksdlaksd323423d+15/UvrlRSFPNj1tWQmNKk"
+ + "XyRDW4IG1Oa2p\\nrALStNBx5Y9t0/LQnFI4w3aG\\n-----END PRIVATE KEY-----\\n\",\n"
+ + " \"client_email\": \"someclientid@developer.gserviceaccount.com\",\n"
+ + " \"client_id\": \"someclientid.apps.googleusercontent.com\",\n"
+ + " \"type\": \"service_account\"\n"
+ + "}";
+
+ @Override
+ protected Serializable[] serializableObjects() {
+ return new Serializable[]{BASE_SERVICE_EXCEPTION, EXCEPTION_HANDLER, IDENTITY, PAGE,
+ RETRY_PARAMS, SOME_IAM_POLICY};
+ }
+
+ @Override
+ protected Restorable[] restorableObjects() {
+ try {
+ return new Restorable[]{AuthCredentials.createForAppEngine(), AuthCredentials.noAuth(),
+ AuthCredentials.createForJson(new ByteArrayInputStream(JSON_KEY.getBytes()))};
+ } catch (IOException ex) {
+ // never reached
+ throw new RuntimeException(ex);
+ }
+ }
+}
diff --git a/gcloud-java-datastore/README.md b/gcloud-java-datastore/README.md
index 8c0ae1950e77..0d89a0a07e3e 100644
--- a/gcloud-java-datastore/README.md
+++ b/gcloud-java-datastore/README.md
@@ -7,6 +7,7 @@ Java idiomatic client for [Google Cloud Datastore] (https://cloud.google.com/dat
[](https://coveralls.io/r/GoogleCloudPlatform/gcloud-java?branch=master)
[]( https://img.shields.io/maven-central/v/com.google.gcloud/gcloud-java-datastore.svg)
[](https://www.codacy.com/app/mziccard/gcloud-java)
+[](https://www.versioneye.com/user/projects/56bd8ee72a29ed002d2b0969)
- [Homepage] (https://googlecloudplatform.github.io/gcloud-java/)
- [API Documentation] (http://googlecloudplatform.github.io/gcloud-java/apidocs/index.html?com/google/gcloud/datastore/package-summary.html)
@@ -21,21 +22,21 @@ If you are using Maven, add this to your pom.xml file
com.google.gcloud
gcloud-java-datastore
- 0.1.3
+ 0.1.5
```
If you are using Gradle, add this to your dependencies
```Groovy
-compile 'com.google.gcloud:gcloud-java-datastore:0.1.3'
+compile 'com.google.gcloud:gcloud-java-datastore:0.1.5'
```
If you are using SBT, add this to your dependencies
```Scala
-libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.3"
+libraryDependencies += "com.google.gcloud" % "gcloud-java-datastore" % "0.1.5"
```
Example Application
--------------------
-[`DatastoreExample`](../gcloud-java-examples/src/main/java/com/google/gcloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`gcloud-java-examples` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/DatastoreExample.html).
+[`DatastoreExample`](../gcloud-java-examples/src/main/java/com/google/gcloud/examples/datastore/DatastoreExample.java) is a simple command line interface for the Cloud Datastore. Read more about using the application on the [`DatastoreExample` docs page](http://googlecloudplatform.github.io/gcloud-java/apidocs/?com/google/gcloud/examples/datastore/DatastoreExample.html).
Authentication
--------------
diff --git a/gcloud-java-datastore/pom.xml b/gcloud-java-datastore/pom.xml
index a76e4f9d9cbd..f3b46e22b3c8 100644
--- a/gcloud-java-datastore/pom.xml
+++ b/gcloud-java-datastore/pom.xml
@@ -10,7 +10,7 @@
com.google.gcloud
gcloud-java-pom
- 0.1.4-SNAPSHOT
+ 0.1.6-SNAPSHOT
gcloud-java-datastore
@@ -24,7 +24,7 @@
com.google.apis
google-api-services-datastore-protobuf
- v1beta2-rev1-2.1.2
+ v1beta2-rev1-4.0.0
compile
@@ -33,6 +33,13 @@
+
+ ${project.groupId}
+ gcloud-java-core
+ ${project.version}
+ test-jar
+ test
+
junit
junit
@@ -42,7 +49,7 @@
org.easymock
easymock
- 3.3
+ 3.4
test
diff --git a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java
index d674a5e242ad..20c0b13e5001 100644
--- a/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java
+++ b/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/BaseEntity.java
@@ -33,6 +33,7 @@
import com.google.protobuf.InvalidProtocolBufferException;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -128,61 +129,286 @@ public B remove(String name) {
return self();
}
+ /**
+ * Sets a property.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, Value value) {
properties.put(name, value);
return self();
}
+ /**
+ * Sets a property of type {@link StringValue}.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, String value) {
properties.put(name, of(value));
return self();
}
+ /**
+ * Sets a list property containing elements of type {@link StringValue}.
+ *
+ * @param name name of the property
+ * @param first the first string in the list
+ * @param second the second string in the list
+ * @param others other strings in the list
+ */
+ public B set(String name, String first, String second, String... others) {
+ List values = new LinkedList<>();
+ values.add(of(first));
+ values.add(of(second));
+ for (String other : others) {
+ values.add(of(other));
+ }
+ properties.put(name, of(values));
+ return self();
+ }
+
+ /**
+ * Sets a property of type {@link LongValue}.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, long value) {
properties.put(name, of(value));
return self();
}
+ /**
+ * Sets a list property containing elements of type {@link LongValue}.
+ *
+ * @param name name of the property
+ * @param first the first long in the list
+ * @param second the second long in the list
+ * @param others other longs in the list
+ */
+ public B set(String name, long first, long second, long... others) {
+ List values = new LinkedList<>();
+ values.add(of(first));
+ values.add(of(second));
+ for (long other : others) {
+ values.add(of(other));
+ }
+ properties.put(name, of(values));
+ return self();
+ }
+
+ /**
+ * Sets a property of type {@link DoubleValue}.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, double value) {
properties.put(name, of(value));
return self();
}
+ /**
+ * Sets a list property containing elements of type {@link DoubleValue}.
+ *
+ * @param name name of the property
+ * @param first the first double in the list
+ * @param second the second double in the list
+ * @param others other doubles in the list
+ */
+ public B set(String name, double first, double second, double... others) {
+ List values = new LinkedList<>();
+ values.add(of(first));
+ values.add(of(second));
+ for (double other : others) {
+ values.add(of(other));
+ }
+ properties.put(name, of(values));
+ return self();
+ }
+
+ /**
+ * Sets a property of type {@link BooleanValue}.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, boolean value) {
properties.put(name, of(value));
return self();
}
+ /**
+ * Sets a list property containing elements of type {@link BooleanValue}.
+ *
+ * @param name name of the property
+ * @param first the first boolean in the list
+ * @param second the second boolean in the list
+ * @param others other booleans in the list
+ */
+ public B set(String name, boolean first, boolean second, boolean... others) {
+ List values = new LinkedList<>();
+ values.add(of(first));
+ values.add(of(second));
+ for (boolean other : others) {
+ values.add(of(other));
+ }
+ properties.put(name, of(values));
+ return self();
+ }
+
+ /**
+ * Sets a property of type {@link DateTimeValue}.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, DateTime value) {
properties.put(name, of(value));
return self();
}
+ /**
+ * Sets a list property containing elements of type {@link DateTimeValue}.
+ *
+ * @param name name of the property
+ * @param first the first {@link DateTime} in the list
+ * @param second the second {@link DateTime} in the list
+ * @param others other {@link DateTime}s in the list
+ */
+ public B set(String name, DateTime first, DateTime second, DateTime... others) {
+ List values = new LinkedList<>();
+ values.add(of(first));
+ values.add(of(second));
+ for (DateTime other : others) {
+ values.add(of(other));
+ }
+ properties.put(name, of(values));
+ return self();
+ }
+
+ /**
+ * Sets a property of type {@link KeyValue}.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, Key value) {
properties.put(name, of(value));
return self();
}
+ /**
+ * Sets a list property containing elements of type {@link KeyValue}.
+ *
+ * @param name name of the property
+ * @param first the first {@link Key} in the list
+ * @param second the second {@link Key} in the list
+ * @param others other {@link Key}s in the list
+ */
+ public B set(String name, Key first, Key second, Key... others) {
+ List values = new LinkedList<>();
+ values.add(of(first));
+ values.add(of(second));
+ for (Key other : others) {
+ values.add(of(other));
+ }
+ properties.put(name, of(values));
+ return self();
+ }
+
+ /**
+ * Sets a property of type {@link EntityValue}.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, FullEntity value) {
properties.put(name, of(value));
return self();
}
+ /**
+ * Sets a list property containing elements of type {@link EntityValue}.
+ *
+ * @param name name of the property
+ * @param first the first {@link FullEntity} in the list
+ * @param second the second {@link FullEntity} in the list
+ * @param others other entities in the list
+ */
+ public B set(String name, FullEntity first, FullEntity second, FullEntity... others) {
+ List values = new LinkedList<>();
+ values.add(of(first));
+ values.add(of(second));
+ for (FullEntity other : others) {
+ values.add(of(other));
+ }
+ properties.put(name, of(values));
+ return self();
+ }
+
+ /**
+ * Sets a property of type {@link ListValue}.
+ *
+ * @param name name of the property
+ * @param values list of values associated with the property
+ */
public B set(String name, List> values) {
properties.put(name, of(values));
return self();
}
- public B set(String name, Value value, Value... other) {
- properties.put(name, of(value, other));
+ /**
+ * Sets a property of type {@link ListValue}.
+ *
+ * @param name name of the property
+ * @param first the first value in the list
+ * @param second the second value in the list
+ * @param others other values in the list
+ */
+ public B set(String name, Value first, Value second, Value... others) {
+ properties.put(name, ListValue.builder().addValue(first).addValue(second, others).build());
return self();
}
+ /**
+ * Sets a property of type {@link BlobValue}.
+ *
+ * @param name name of the property
+ * @param value value associated with the property
+ */
public B set(String name, Blob value) {
properties.put(name, of(value));
return self();
}
+ /**
+ * Sets a list property containing elements of type {@link BlobValue}.
+ *
+ * @param name name of the property
+ * @param first the first {@link Blob} in the list
+ * @param second the second {@link Blob} in the list
+ * @param others other {@link Blob}s in the list
+ */
+ public B set(String name, Blob first, Blob second, Blob... others) {
+ List values = new LinkedList<>();
+ values.add(of(first));
+ values.add(of(second));
+ for (Blob other : others) {
+ values.add(of(other));
+ }
+ properties.put(name, of(values));
+ return self();
+ }
+
+ /**
+ * Sets a property of type {@code NullValue}.
+ *
+ * @param name name of the property
+ */
public B setNull(String name) {
properties.put(name, of());
return self();
@@ -348,8 +574,8 @@ public FullEntity getEntity(String name) {
* @throws ClassCastException if value is not a list of values
*/
@SuppressWarnings("unchecked")
- public List> getList(String name) {
- return ((Value>>) getValue(name)).get();
+ public > List getList(String name) {
+ return (List