Skip to content

Commit f78394c

Browse files
author
Shun Fan
committed
Merge pull request #159 from GoogleCloudPlatform/update-gcloud-java-dependency
Update gcloud-java dependency and imports
2 parents db10bd9 + 16375ec commit f78394c

File tree

11 files changed

+96
-118
lines changed

11 files changed

+96
-118
lines changed

‎datastore/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
</description>
2222
<dependencies>
2323
<dependency>
24-
<groupId>com.google.gcloud</groupId>
24+
<groupId>com.google.cloud</groupId>
2525
<artifactId>gcloud-java-datastore</artifactId>
26-
<version>0.1.7</version>
26+
<version>0.2.0</version>
2727
</dependency>
2828
<dependency>
2929
<groupId>junit</groupId>

‎datastore/src/main/java/com/google/datastore/snippets/Concepts.java

+27-39
Original file line numberDiff line numberDiff line change
@@ -23,34 +23,33 @@
2323
import static org.junit.Assert.assertNotNull;
2424
import static org.junit.Assert.assertNull;
2525

26+
import com.google.cloud.datastore.Cursor;
27+
import com.google.cloud.datastore.Datastore;
28+
import com.google.cloud.datastore.DatastoreException;
29+
import com.google.cloud.datastore.DateTime;
30+
import com.google.cloud.datastore.Entity;
31+
import com.google.cloud.datastore.EntityQuery;
32+
import com.google.cloud.datastore.FullEntity;
33+
import com.google.cloud.datastore.IncompleteKey;
34+
import com.google.cloud.datastore.Key;
35+
import com.google.cloud.datastore.KeyFactory;
36+
import com.google.cloud.datastore.PathElement;
37+
import com.google.cloud.datastore.ProjectionEntity;
38+
import com.google.cloud.datastore.Query;
39+
import com.google.cloud.datastore.Query.ResultType;
40+
import com.google.cloud.datastore.QueryResults;
41+
import com.google.cloud.datastore.ReadOption;
42+
import com.google.cloud.datastore.StringValue;
43+
import com.google.cloud.datastore.StructuredQuery;
44+
import com.google.cloud.datastore.StructuredQuery.CompositeFilter;
45+
import com.google.cloud.datastore.StructuredQuery.OrderBy;
46+
import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
47+
import com.google.cloud.datastore.Transaction;
48+
import com.google.cloud.datastore.testing.LocalDatastoreHelper;
2649
import com.google.common.collect.ImmutableList;
2750
import com.google.common.collect.ImmutableMap;
2851
import com.google.common.collect.ImmutableSet;
2952
import com.google.common.collect.Iterators;
30-
import com.google.gcloud.datastore.Cursor;
31-
import com.google.gcloud.datastore.Datastore;
32-
import com.google.gcloud.datastore.DatastoreException;
33-
import com.google.gcloud.datastore.DatastoreOptions;
34-
import com.google.gcloud.datastore.DateTime;
35-
import com.google.gcloud.datastore.Entity;
36-
import com.google.gcloud.datastore.EntityQuery;
37-
import com.google.gcloud.datastore.FullEntity;
38-
import com.google.gcloud.datastore.IncompleteKey;
39-
import com.google.gcloud.datastore.Key;
40-
import com.google.gcloud.datastore.KeyFactory;
41-
import com.google.gcloud.datastore.PathElement;
42-
import com.google.gcloud.datastore.ProjectionEntity;
43-
import com.google.gcloud.datastore.Query;
44-
import com.google.gcloud.datastore.Query.ResultType;
45-
import com.google.gcloud.datastore.QueryResults;
46-
import com.google.gcloud.datastore.ReadOption;
47-
import com.google.gcloud.datastore.StringValue;
48-
import com.google.gcloud.datastore.StructuredQuery;
49-
import com.google.gcloud.datastore.StructuredQuery.CompositeFilter;
50-
import com.google.gcloud.datastore.StructuredQuery.OrderBy;
51-
import com.google.gcloud.datastore.StructuredQuery.PropertyFilter;
52-
import com.google.gcloud.datastore.Transaction;
53-
import com.google.gcloud.datastore.testing.LocalGcdHelper;
5453

5554
import org.junit.AfterClass;
5655
import org.junit.Before;
@@ -79,9 +78,7 @@
7978
*/
8079
public class Concepts {
8180

82-
private static final String PROJECT_ID = LocalGcdHelper.DEFAULT_PROJECT_ID;
83-
private static LocalGcdHelper gcdHelper;
84-
private static final int PORT = LocalGcdHelper.findAvailablePort(LocalGcdHelper.DEFAULT_PORT);
81+
private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0);
8582
private static final FullEntity<IncompleteKey> TEST_FULL_ENTITY = FullEntity.builder().build();
8683

8784
private Datastore datastore;
@@ -103,9 +100,7 @@ public class Concepts {
103100
*/
104101
@BeforeClass
105102
public static void beforeClass() throws IOException, InterruptedException {
106-
if (!LocalGcdHelper.isActive(PROJECT_ID, PORT)) {
107-
gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT, 1.0);
108-
}
103+
HELPER.start();
109104
}
110105

111106
/**
@@ -114,12 +109,7 @@ public static void beforeClass() throws IOException, InterruptedException {
114109
*/
115110
@Before
116111
public void setUp() {
117-
datastore = DatastoreOptions.builder()
118-
.projectId(PROJECT_ID)
119-
.namespace("ghijklmnop")
120-
.host("http://localhost:" + PORT)
121-
.build()
122-
.service();
112+
datastore = HELPER.options().toBuilder().namespace("ghijklmnop").build().service();
123113
StructuredQuery<Key> query = Query.keyQueryBuilder().build();
124114
QueryResults<Key> result = datastore.run(query);
125115
datastore.delete(Iterators.toArray(result, Key.class));
@@ -143,9 +133,7 @@ public void setUp() {
143133
*/
144134
@AfterClass
145135
public static void afterClass() throws IOException, InterruptedException {
146-
if (gcdHelper != null) {
147-
gcdHelper.stop();
148-
}
136+
HELPER.stop();
149137
}
150138

151139
private void assertValidKey(Key taskKey) {

‎datastore/src/main/java/com/google/datastore/snippets/TaskList.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616

1717
package com.google.datastore.snippets;
1818

19-
import com.google.gcloud.datastore.Datastore;
20-
import com.google.gcloud.datastore.DatastoreOptions;
21-
import com.google.gcloud.datastore.DateTime;
22-
import com.google.gcloud.datastore.Entity;
23-
import com.google.gcloud.datastore.Key;
24-
import com.google.gcloud.datastore.KeyFactory;
25-
import com.google.gcloud.datastore.Query;
26-
import com.google.gcloud.datastore.StringValue;
27-
import com.google.gcloud.datastore.StructuredQuery.OrderBy;
28-
import com.google.gcloud.datastore.Transaction;
19+
import com.google.cloud.datastore.Datastore;
20+
import com.google.cloud.datastore.DatastoreOptions;
21+
import com.google.cloud.datastore.DateTime;
22+
import com.google.cloud.datastore.Entity;
23+
import com.google.cloud.datastore.Key;
24+
import com.google.cloud.datastore.KeyFactory;
25+
import com.google.cloud.datastore.Query;
26+
import com.google.cloud.datastore.StringValue;
27+
import com.google.cloud.datastore.StructuredQuery.OrderBy;
28+
import com.google.cloud.datastore.Transaction;
2929

3030
import java.util.ArrayList;
3131
import java.util.Iterator;

‎managed_vms/cloudstorage/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
</dependency>
2525
<!-- [START dependencies] -->
2626
<dependency>
27-
<groupId>com.google.gcloud</groupId>
27+
<groupId>com.google.cloud</groupId>
2828
<artifactId>gcloud-java-storage</artifactId>
29-
<version>0.1.7</version>
29+
<version>0.2.0</version>
3030
</dependency>
3131
<!-- [END dependencies] -->
3232
</dependencies>

‎managed_vms/cloudstorage/src/main/java/com/example/managedvms/cloudstorage/UploadServlet.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package com.example.managedvms.cloudstorage;
1818

19-
import com.google.gcloud.storage.Acl;
20-
import com.google.gcloud.storage.Blob;
21-
import com.google.gcloud.storage.BlobInfo;
22-
import com.google.gcloud.storage.Storage;
23-
import com.google.gcloud.storage.StorageOptions;
19+
import com.google.cloud.storage.Acl;
20+
import com.google.cloud.storage.Blob;
21+
import com.google.cloud.storage.BlobInfo;
22+
import com.google.cloud.storage.Storage;
23+
import com.google.cloud.storage.StorageOptions;
2424

2525
import java.io.IOException;
2626
import java.util.ArrayList;

‎managed_vms/datastore/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
</dependency>
2525
<!-- [START dependencies] -->
2626
<dependency>
27-
<groupId>com.google.gcloud</groupId>
27+
<groupId>com.google.cloud</groupId>
2828
<artifactId>gcloud-java-datastore</artifactId>
29-
<version>0.1.7</version>
29+
<version>0.2.0</version>
3030
</dependency>
3131
<!-- [END dependencies] -->
3232
</dependencies>

‎managed_vms/datastore/src/main/java/com/example/managedvms/datastore/DatastoreServlet.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616

1717
package com.example.managedvms.datastore;
1818

19-
import com.google.gcloud.datastore.Datastore;
20-
import com.google.gcloud.datastore.DatastoreOptions;
21-
import com.google.gcloud.datastore.DateTime;
22-
import com.google.gcloud.datastore.Entity;
23-
import com.google.gcloud.datastore.FullEntity;
24-
import com.google.gcloud.datastore.IncompleteKey;
25-
import com.google.gcloud.datastore.KeyFactory;
26-
import com.google.gcloud.datastore.Query;
27-
import com.google.gcloud.datastore.QueryResults;
28-
import com.google.gcloud.datastore.StructuredQuery;
19+
import com.google.cloud.datastore.Datastore;
20+
import com.google.cloud.datastore.DatastoreOptions;
21+
import com.google.cloud.datastore.DateTime;
22+
import com.google.cloud.datastore.Entity;
23+
import com.google.cloud.datastore.FullEntity;
24+
import com.google.cloud.datastore.IncompleteKey;
25+
import com.google.cloud.datastore.KeyFactory;
26+
import com.google.cloud.datastore.Query;
27+
import com.google.cloud.datastore.QueryResults;
28+
import com.google.cloud.datastore.StructuredQuery;
2929

3030
import java.io.IOException;
3131
import java.io.PrintWriter;

‎managed_vms/sparkjava/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
<version>4.12</version>
3737
</dependency>
3838
<dependency>
39-
<groupId>com.google.gcloud</groupId>
39+
<groupId>com.google.cloud</groupId>
4040
<artifactId>gcloud-java</artifactId>
41-
<version>0.1.7</version>
41+
<version>0.2.0</version>
4242
</dependency>
4343
</dependencies>
4444
<build>

‎managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static spark.Spark.port;
2020

21-
import com.google.gcloud.datastore.DatastoreOptions;
21+
import com.google.cloud.datastore.DatastoreOptions;
2222

2323
public class Main {
2424

‎managed_vms/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
import static com.google.common.base.Preconditions.checkArgument;
2020

21-
import com.google.gcloud.datastore.Datastore;
22-
import com.google.gcloud.datastore.Entity;
23-
import com.google.gcloud.datastore.Key;
24-
import com.google.gcloud.datastore.KeyFactory;
25-
import com.google.gcloud.datastore.Query;
26-
import com.google.gcloud.datastore.QueryResults;
21+
import com.google.cloud.datastore.Datastore;
22+
import com.google.cloud.datastore.Entity;
23+
import com.google.cloud.datastore.Key;
24+
import com.google.cloud.datastore.KeyFactory;
25+
import com.google.cloud.datastore.Query;
26+
import com.google.cloud.datastore.QueryResults;
2727

2828
import java.util.ArrayList;
2929
import java.util.List;

‎managed_vms/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java

+29-39
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
import static org.junit.Assert.assertNull;
2222
import static org.junit.Assert.fail;
2323

24+
import com.google.cloud.datastore.Datastore;
25+
import com.google.cloud.datastore.DatastoreOptions;
26+
import com.google.cloud.datastore.Entity;
27+
import com.google.cloud.datastore.Key;
28+
import com.google.cloud.datastore.Query;
29+
import com.google.cloud.datastore.QueryResults;
30+
import com.google.cloud.datastore.StructuredQuery;
31+
import com.google.cloud.datastore.testing.LocalDatastoreHelper;
2432
import com.google.common.collect.Iterators;
25-
import com.google.gcloud.datastore.Datastore;
26-
import com.google.gcloud.datastore.DatastoreOptions;
27-
import com.google.gcloud.datastore.Entity;
28-
import com.google.gcloud.datastore.Key;
29-
import com.google.gcloud.datastore.Query;
30-
import com.google.gcloud.datastore.QueryResults;
31-
import com.google.gcloud.datastore.StructuredQuery;
32-
import com.google.gcloud.datastore.testing.LocalGcdHelper;
3333

3434
import org.junit.AfterClass;
3535
import org.junit.Before;
@@ -41,54 +41,44 @@
4141

4242
public class UserServiceTest {
4343

44-
private static final int PORT = LocalGcdHelper.findAvailablePort(LocalGcdHelper.DEFAULT_PORT);
45-
private static final String PROJECT_ID = LocalGcdHelper.DEFAULT_PROJECT_ID;
44+
private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0);
45+
private static final DatastoreOptions DATASTORE_OPTIONS = HELPER.options();
46+
private static final Datastore DATASTORE = DATASTORE_OPTIONS.service();
47+
private static final String KIND = "DemoUser";
48+
private static final UserService USER_SERVICE = new UserService(DATASTORE, KIND);
4649
private static final String USER_ID = "myId";
4750
private static final String USER_NAME = "myName";
4851
private static final String USER_EMAIL = "my@email.com";
4952
private static final User USER = new User(USER_ID, USER_NAME, USER_EMAIL);
50-
private static final String KIND = "DemoUser";
51-
private static final Key USER_KEY = Key.builder(PROJECT_ID, KIND, USER_ID).build();
53+
private static final Key USER_KEY =
54+
Key.builder(DATASTORE_OPTIONS.projectId(), KIND, USER_ID).build();
5255
private static final Entity USER_RECORD = Entity.builder(USER_KEY)
5356
.set("id", USER_ID)
5457
.set("name", USER_NAME)
5558
.set("email", USER_EMAIL)
5659
.build();
57-
private static LocalGcdHelper gcdHelper;
58-
private static Datastore datastore;
59-
private static UserService userService;
6060

6161
@BeforeClass
6262
public static void beforeClass() throws IOException, InterruptedException {
63-
if (!LocalGcdHelper.isActive(PROJECT_ID, PORT)) {
64-
gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT, 1.0);
65-
}
66-
datastore = DatastoreOptions.builder()
67-
.projectId(PROJECT_ID)
68-
.host("http://localhost:" + PORT)
69-
.build()
70-
.service();
71-
userService = new UserService(datastore, KIND);
63+
HELPER.start();
7264
}
7365

7466
@Before
7567
public void setUp() {
7668
StructuredQuery<Key> query = Query.keyQueryBuilder().build();
77-
QueryResults<Key> result = datastore.run(query);
78-
datastore.delete(Iterators.toArray(result, Key.class));
79-
datastore.add(USER_RECORD);
69+
QueryResults<Key> result = DATASTORE.run(query);
70+
DATASTORE.delete(Iterators.toArray(result, Key.class));
71+
DATASTORE.add(USER_RECORD);
8072
}
8173

8274
@AfterClass
8375
public static void afterClass() throws IOException, InterruptedException {
84-
if (gcdHelper != null) {
85-
gcdHelper.stop();
86-
}
76+
HELPER.stop();
8777
}
8878

8979
@Test
9080
public void testGetAllUsers() {
91-
List<User> allUsers = userService.getAllUsers();
81+
List<User> allUsers = USER_SERVICE.getAllUsers();
9282
assertEquals(1, allUsers.size());
9383
User actualUser = allUsers.get(0);
9484
assertEquals(USER.getId(), actualUser.getId());
@@ -100,18 +90,18 @@ public void testGetAllUsers() {
10090
public void testCreateUser() {
10191
String name = "myNewName";
10292
String email = "mynew@email.com";
103-
User actualUser = userService.createUser(name, email);
93+
User actualUser = USER_SERVICE.createUser(name, email);
10494
assertEquals(name, actualUser.getName());
10595
assertEquals(email, actualUser.getEmail());
10696
assertNotNull(actualUser.getId());
10797
try {
108-
userService.createUser(null, email);
98+
USER_SERVICE.createUser(null, email);
10999
fail("Expected to fail because name is null.");
110100
} catch (IllegalArgumentException e) {
111101
assertEquals("Parameter 'name' cannot be empty", e.getMessage());
112102
}
113103
try {
114-
userService.createUser(name, null);
104+
USER_SERVICE.createUser(name, null);
115105
fail("Expected to fail because email is null.");
116106
} catch (IllegalArgumentException e) {
117107
assertEquals("Parameter 'email' cannot be empty", e.getMessage());
@@ -120,27 +110,27 @@ public void testCreateUser() {
120110

121111
@Test
122112
public void testDeleteUser() {
123-
String result = userService.deleteUser(USER_ID);
113+
String result = USER_SERVICE.deleteUser(USER_ID);
124114
assertEquals("ok", result);
125-
assertNull(datastore.get(USER_KEY));
115+
assertNull(DATASTORE.get(USER_KEY));
126116
}
127117

128118
@Test
129119
public void testUpdateUser() {
130120
String newName = "myNewName";
131121
String newEmail = "mynew@email.com";
132-
User updatedUser = userService.updateUser(USER_ID, newName, newEmail);
122+
User updatedUser = USER_SERVICE.updateUser(USER_ID, newName, newEmail);
133123
assertEquals(USER_ID, updatedUser.getId());
134124
assertEquals(newName, updatedUser.getName());
135125
assertEquals(newEmail, updatedUser.getEmail());
136126
try {
137-
userService.updateUser(USER_ID, null, USER_EMAIL);
127+
USER_SERVICE.updateUser(USER_ID, null, USER_EMAIL);
138128
fail("Expected to fail because name is null.");
139129
} catch (IllegalArgumentException e) {
140130
assertEquals("Parameter 'name' cannot be empty", e.getMessage());
141131
}
142132
try {
143-
userService.updateUser(USER_ID, USER_NAME, null);
133+
USER_SERVICE.updateUser(USER_ID, USER_NAME, null);
144134
fail("Expected to fail because email is null.");
145135
} catch (IllegalArgumentException e) {
146136
assertEquals("Parameter 'email' cannot be empty", e.getMessage());

0 commit comments

Comments
 (0)