Skip to content

Commit 97f7ec6

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 0c65bcf + f76f1c9 commit 97f7ec6

File tree

632 files changed

+33083
-13858
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

632 files changed

+33083
-13858
lines changed

README.md

+26-26
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ If you are using Maven, add this to your pom.xml file
4040
<dependency>
4141
<groupId>com.google.cloud</groupId>
4242
<artifactId>google-cloud</artifactId>
43-
<version>0.3.0</version>
43+
<version>0.4.0</version>
4444
</dependency>
4545
```
4646
If you are using Gradle, add this to your dependencies
4747
```Groovy
48-
compile 'com.google.cloud:google-cloud:0.3.0'
48+
compile 'com.google.cloud:google-cloud:0.4.0'
4949
```
5050
If you are using SBT, add this to your dependencies
5151
```Scala
52-
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.3.0"
52+
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.4.0"
5353
```
5454

5555
Example Applications
@@ -186,7 +186,7 @@ if (table == null) {
186186
System.out.println("Loading data into table " + tableId);
187187
Job loadJob = table.load(FormatOptions.csv(), "gs://bucket/path");
188188
loadJob = loadJob.waitFor();
189-
if (loadJob.status().error() != null) {
189+
if (loadJob.getStatus().getError() != null) {
190190
System.out.println("Job completed with errors");
191191
} else {
192192
System.out.println("Job succeeded");
@@ -222,7 +222,7 @@ if (disk != null) {
222222
String snapshotName = "disk-name-snapshot";
223223
Operation operation = disk.createSnapshot(snapshotName);
224224
operation = operation.waitFor();
225-
if (operation.errors() == null) {
225+
if (operation.getErrors() == null) {
226226
// use snapshot
227227
Snapshot snapshot = compute.getSnapshot(snapshotName);
228228
}
@@ -252,7 +252,7 @@ MachineTypeId machineTypeId = MachineTypeId.of("us-central1-a", "n1-standard-1")
252252
Operation operation =
253253
compute.create(InstanceInfo.of(instanceId, machineTypeId, attachedDisk, networkInterface));
254254
operation = operation.waitFor();
255-
if (operation.errors() == null) {
255+
if (operation.getErrors() == null) {
256256
// use instance
257257
Instance instance = compute.getInstance(instanceId);
258258
}
@@ -282,9 +282,9 @@ import com.google.cloud.datastore.Key;
282282
import com.google.cloud.datastore.KeyFactory;
283283
284284
Datastore datastore = DatastoreOptions.defaultInstance().service();
285-
KeyFactory keyFactory = datastore.newKeyFactory().kind("keyKind");
285+
KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
286286
Key key = keyFactory.newKey("keyName");
287-
Entity entity = Entity.builder(key)
287+
Entity entity = Entity.newBuilder(key)
288288
.set("name", "John Doe")
289289
.set("age", 30)
290290
.set("access_time", DateTime.now())
@@ -303,12 +303,12 @@ import com.google.cloud.datastore.Key;
303303
import com.google.cloud.datastore.KeyFactory;
304304
305305
Datastore datastore = DatastoreOptions.defaultInstance().service();
306-
KeyFactory keyFactory = datastore.newKeyFactory().kind("keyKind");
306+
KeyFactory keyFactory = datastore.newKeyFactory().setKind("keyKind");
307307
Key key = keyFactory.newKey("keyName");
308308
Entity entity = datastore.get(key);
309309
if (entity != null) {
310310
System.out.println("Updating access_time for " + entity.getString("name"));
311-
entity = Entity.builder(entity)
311+
entity = Entity.newBuilder(entity)
312312
.set("access_time", DateTime.now())
313313
.build();
314314
datastore.update(entity);
@@ -359,19 +359,19 @@ Dns dns = DnsOptions.defaultInstance().service();
359359
String zoneName = "my-unique-zone";
360360
Zone zone = dns.getZone(zoneName);
361361
String ip = "12.13.14.15";
362-
RecordSet toCreate = RecordSet.builder("www.someexampledomain.com.", RecordSet.Type.A)
363-
.ttl(24, TimeUnit.HOURS)
362+
RecordSet toCreate = RecordSet.newBuilder("www.someexampledomain.com.", RecordSet.Type.A)
363+
.setTtl(24, TimeUnit.HOURS)
364364
.addRecord(ip)
365365
.build();
366-
ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.builder().add(toCreate);
366+
ChangeRequestInfo.Builder changeBuilder = ChangeRequestInfo.newBuilder().add(toCreate);
367367
368368
// Verify that the record does not exist yet.
369369
// If it does exist, we will overwrite it with our prepared record.
370370
Iterator<RecordSet> recordSetIterator = zone.listRecordSets().iterateAll();
371371
while (recordSetIterator.hasNext()) {
372372
RecordSet current = recordSetIterator.next();
373-
if (toCreate.name().equals(current.name()) &&
374-
toCreate.type().equals(current.type())) {
373+
if (toCreate.name().equals(current.getName()) &&
374+
toCreate.type().equals(current.getType())) {
375375
changeBuilder.delete(current);
376376
}
377377
}
@@ -412,9 +412,9 @@ import java.util.Iterator;
412412
LoggingOptions options = LoggingOptions.defaultInstance();
413413
try(Logging logging = options.service()) {
414414
415-
LogEntry firstEntry = LogEntry.builder(StringPayload.of("message"))
416-
.logName("test-log")
417-
.resource(MonitoredResource.builder("global")
415+
LogEntry firstEntry = LogEntry.newBuilder(StringPayload.of("message"))
416+
.setLogName("test-log")
417+
.setResource(MonitoredResource.builder("global")
418418
.addLabel("project_id", options.projectId())
419419
.build())
420420
.build();
@@ -477,7 +477,7 @@ try (PubSub pubsub = PubSubOptions.defaultInstance().service()) {
477477
MessageProcessor callback = new MessageProcessor() {
478478
@Override
479479
public void process(Message message) throws Exception {
480-
System.out.printf("Received message \"%s\"%n", message.payloadAsString());
480+
System.out.printf("Received message \"%s\"%n", message.getPayloadAsString());
481481
}
482482
};
483483
// Create a message consumer and pull messages (for 60 seconds)
@@ -512,13 +512,13 @@ if (project != null) {
512512
.addLabel("launch-status", "in-development")
513513
.build()
514514
.replace();
515-
System.out.println("Updated the labels of project " + newProject.projectId()
516-
+ " to be " + newProject.labels());
515+
System.out.println("Updated the labels of project " + newProject.getProjectId()
516+
+ " to be " + newProject.getLabels());
517517
}
518518
Iterator<Project> projectIterator = resourceManager.list().iterateAll();
519519
System.out.println("Projects I can view:");
520520
while (projectIterator.hasNext()) {
521-
System.out.println(projectIterator.next().projectId());
521+
System.out.println(projectIterator.next().getProjectId());
522522
}
523523
```
524524
@@ -548,7 +548,7 @@ import com.google.cloud.storage.StorageOptions;
548548
549549
Storage storage = StorageOptions.defaultInstance().service();
550550
BlobId blobId = BlobId.of("bucket", "blob_name");
551-
BlobInfo blobInfo = BlobInfo.builder(blobId).contentType("text/plain").build();
551+
BlobInfo blobInfo = BlobInfo.newBuiler(blobId).setContentType("text/plain").build();
552552
Blob blob = storage.create(blobInfo, "Hello, Cloud Storage!".getBytes(UTF_8));
553553
```
554554
The second snippet shows how to update a Storage blob if it exists. Complete source code can be
@@ -569,7 +569,7 @@ Storage storage = StorageOptions.defaultInstance().service();
569569
BlobId blobId = BlobId.of("bucket", "blob_name");
570570
Blob blob = storage.get(blobId);
571571
if (blob != null) {
572-
byte[] prevContent = blob.content();
572+
byte[] prevContent = blob.getContent();
573573
System.out.println(new String(prevContent, UTF_8));
574574
WritableByteChannel channel = blob.writer();
575575
channel.write(ByteBuffer.wrap("Updated content".getBytes(UTF_8)));
@@ -601,14 +601,14 @@ import com.google.cloud.translate.Translation;
601601
Translate translate = TranslateOptions.defaultInstance().service();
602602
603603
Detection detection = translate.detect("Hola");
604-
String detectedLanguage = detection.language();
604+
String detectedLanguage = detection.getLanguage();
605605
606606
Translation translation = translate.translate(
607607
"World",
608608
TranslateOption.sourceLanguage("en"),
609609
TranslateOption.targetLanguage(detectedLanguage));
610610
611-
System.out.printf("Hola %s%n", translation.translatedText());
611+
System.out.printf("Hola %s%n", translation.getTranslatedText());
612612
```
613613
614614
Troubleshooting

TESTING.md

+10-9
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ Here is an example that uses the `RemoteBigQueryHelper` to create a dataset.
2727
```java
2828
RemoteBigQueryHelper bigqueryHelper =
2929
RemoteBigQueryHelper.create(PROJECT_ID, new FileInputStream("/path/to/my/JSON/key.json"));
30-
BigQuery bigquery = bigqueryHelper.options().service();
30+
BigQuery bigquery = bigqueryHelper.getOptions().service();
3131
String dataset = RemoteBigQueryHelper.generateDatasetName();
32-
bigquery.create(DatasetInfo.builder(dataset).build());
32+
bigquery.create(DatasetInfo.newBuilder(dataset).build());
3333
```
3434

3535
4. Run your tests.
@@ -84,7 +84,7 @@ You can test against a temporary local Datastore by following these steps:
8484

8585
2. Create and use a `Datastore` object with the options given by the `LocalDatastoreHelper` instance. For example:
8686
```java
87-
Datastore localDatastore = helper.options().service();
87+
Datastore localDatastore = helper.getOptions().service();
8888
```
8989

9090
3. Run your tests.
@@ -131,10 +131,11 @@ You can test against an in-memory local DNS by following these steps:
131131
The `delay` parameter determines if change requests should be processed synchronously
132132
(value `0`) or in a separate thread with a minimum of delay of `delay` milliseconds.
133133

134-
2. In your program, create the DNS service by using the helper's `options()` method. For example:
134+
2. In your program, create the DNS service by using the helper's `getOptions()` method.
135+
For example:
135136

136137
```java
137-
Dns dns = LocalDnsHelper.options().service();
138+
Dns dns = LocalDnsHelper.getOptions().service();
138139
```
139140

140141
3. Run your tests.
@@ -163,7 +164,7 @@ uses the `RemoteLoggingHelper` to create a metric.
163164
```java
164165
RemoteLoggingHelper loggingHelper =
165166
RemoteLoggingHelper.create(PROJECT_ID, new FileInputStream("/path/to/my/JSON/key.json"));
166-
Logging logging = loggingHelper.options().service();
167+
Logging logging = loggingHelper.getOptions().service();
167168
// Pick a name for the resource with low probability of clashing
168169
String metricName = RemoteLoggingHelper.formatForTest("test-metric");
169170
MetricInfo metricInfo = MetricInfo.of(name, "logName:syslog");
@@ -189,7 +190,7 @@ and `start` methods. This will bind a port for communication with the local Pub/
189190
2. Create and use a `PubSub` object with the options given by the `LocalPubSubHelper` instance. For
190191
example:
191192
```java
192-
PubSub localPubsub = helper.options().service();
193+
PubSub localPubsub = helper.getOptions().service();
193194
```
194195

195196
3. Run your tests.
@@ -257,7 +258,7 @@ Here is an example that uses the `RemoteStorageHelper` to create a bucket.
257258
```java
258259
RemoteStorageHelper helper =
259260
RemoteStorageHelper.create(PROJECT_ID, new FileInputStream("/path/to/my/JSON/key.json"));
260-
Storage storage = helper.options().service();
261+
Storage storage = helper.getOptions().service();
261262
String bucket = RemoteStorageHelper.generateBucketName();
262263
storage.create(BucketInfo.of(bucket));
263264
```
@@ -284,7 +285,7 @@ key.
284285
that uses the `RemoteTranslateHelper` to list supported languages.
285286
```java
286287
RemoteTranslateHelper translateHelper = RemoteTranslateHelper.create(PROJECT_ID, API_KEY);
287-
Translate translate = translateHelper.options().service();
288+
Translate translate = translateHelper.getOptions().service();
288289
List<Language> languages = translate.listSupportedLanguages();
289290
```
290291

appveyor.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# build version
2+
version: '{build}'
3+
4+
# branches to build
5+
branches:
6+
# blacklist
7+
except:
8+
- gh-pages
9+
- travis
10+
- appveyor
11+
12+
# Do not build on tags
13+
skip_tags: true
14+
15+
# enviroment settings
16+
environment:
17+
matrix:
18+
- JAVA_HOME: C:\Program Files\Java\jdk1.7.0
19+
GOOGLE_CLOUD_PROJECT:
20+
secure: uFZ/+vyRarW3Xot03J4h5w==
21+
SECRET:
22+
secure: aiT7rDn1EzWK6imZcF/1q8NqPP5rLf7T9dUB+QFna8Zpa4k4ezMX/ZFYhFz02Aia3VLV8uD8M5esqBVB3NB9aozx7PTXmr/JKJNOTEVhTylGne5I7Sm2i1x/hcsKK5N0M5ptQzMHxjc7UtSKB+t0GPLWhWLqmdf+5qRpLjD2YsIXNofPeZlr+HoXSV3qW2ixCq76PGAq32qsb/DfIsaKwuL2k2n9gl4SEu2xPUa8ORU=
23+
GOOGLE_API_KEY:
24+
secure: v/wAbkBCQm25Yqk4n/+7II/Klsibax+kymVIJREJgGTjBYR5AlIkpTT2oECy0Z+B
25+
26+
# install required tools (maven, secure-file, encrypted files)
27+
install:
28+
- cmd: echo %JAVA_HOME%
29+
- cmd: echo %M2_HOME%
30+
- ps: $origin = git config --get remote.origin.url; git clone --quiet -b appveyor $origin appveyor
31+
- cmd: nuget install secure-file -ExcludeVersion
32+
- cmd: IF DEFINED SECRET (secure-file\tools\secure-file -decrypt appveyor\key.json.enc -secret %SECRET% -out appveyor\key.json)
33+
- cmd: IF DEFINED SECRET (SET GOOGLE_APPLICATION_CREDENTIALS=%APPVEYOR_BUILD_FOLDER%\appveyor\key.json)
34+
- cmd: ECHO %GOOGLE_APPLICATION_CREDENTIALS%
35+
36+
# build and install artifacts
37+
build_script:
38+
- mvn clean install -DskipTests
39+
40+
# verify artifacts (no integration tests on PR)
41+
test_script:
42+
- IF DEFINED APPVEYOR_PULL_REQUEST_NUMBER (mvn verify -DskipITs) ELSE (mvn verify)
43+
44+
# preserve dependencies between builds
45+
cache:
46+
- C:\maven\
47+
- C:\Users\appveyor\.m2

google-cloud-bigquery/README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ If you are using Maven, add this to your pom.xml file
2222
<dependency>
2323
<groupId>com.google.cloud</groupId>
2424
<artifactId>google-cloud-bigquery</artifactId>
25-
<version>0.3.0</version>
25+
<version>0.4.0</version>
2626
</dependency>
2727
```
2828
If you are using Gradle, add this to your dependencies
2929
```Groovy
30-
compile 'com.google.cloud:google-cloud-bigquery:0.3.0'
30+
compile 'com.google.cloud:google-cloud-bigquery:0.4.0'
3131
```
3232
If you are using SBT, add this to your dependencies
3333
```Scala
34-
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.3.0"
34+
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.4.0"
3535
```
3636

3737
Example Application
@@ -103,7 +103,7 @@ Then, to create the dataset, use the following code:
103103
```java
104104
// Create a dataset
105105
String datasetId = "my_dataset_id";
106-
bigquery.create(DatasetInfo.builder(datasetId).build());
106+
bigquery.create(DatasetInfo.newBuilder(datasetId).build());
107107
```
108108

109109
#### Creating a table
@@ -153,7 +153,7 @@ Map<String, Object> secondRow = new HashMap<>();
153153
firstRow.put("StringField", "value1");
154154
secondRow.put("StringField", "value2");
155155
// Create an insert request
156-
InsertAllRequest insertRequest = InsertAllRequest.builder(tableId)
156+
InsertAllRequest insertRequest = InsertAllRequest.newBuilder(tableId)
157157
.addRow(firstRow)
158158
.addRow(secondRow)
159159
.build();
@@ -183,18 +183,18 @@ Then add the following code to run the query and wait for the result:
183183
```java
184184
// Create a query request
185185
QueryRequest queryRequest =
186-
QueryRequest.builder("SELECT * FROM my_dataset_id.my_table_id")
187-
.maxWaitTime(60000L)
188-
.pageSize(1000L)
186+
QueryRequest.newBuilder("SELECT * FROM my_dataset_id.my_table_id")
187+
.setMaxWaitTime(60000L)
188+
.setPageSize(1000L)
189189
.build();
190190
// Request query to be executed and wait for results
191191
QueryResponse queryResponse = bigquery.query(queryRequest);
192192
while (!queryResponse.jobComplete()) {
193193
Thread.sleep(1000L);
194-
queryResponse = bigquery.getQueryResults(queryResponse.jobId());
194+
queryResponse = bigquery.getQueryResults(queryResponse.getJobId());
195195
}
196196
// Read rows
197-
Iterator<List<FieldValue>> rowIterator = queryResponse.result().iterateAll();
197+
Iterator<List<FieldValue>> rowIterator = queryResponse.getResult().iterateAll();
198198
System.out.println("Table rows:");
199199
while (rowIterator.hasNext()) {
200200
System.out.println(rowIterator.next());

google-cloud-bigquery/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-pom</artifactId>
14-
<version>0.3.1-SNAPSHOT</version>
14+
<version>0.4.1-SNAPSHOT</version>
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-bigquery</site.installationModule>

0 commit comments

Comments
 (0)