Skip to content

Commit 349c95d

Browse files
pongadpongad
authored
---
yaml --- r: 7805 b: refs/heads/tswast-patch-1 c: a381426 h: refs/heads/master i: 7803: 28be438
1 parent 78057cb commit 349c95d

129 files changed

Lines changed: 17310 additions & 861 deletions

File tree

Some content is hidden

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

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 36e609e5fea47870e697f83bd41920822b5ea6f3
60+
refs/heads/tswast-patch-1: a381426fa596b4999e3092f506b974b7c28dacae
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ If you are using Maven, add this to your pom.xml file
4343
<dependency>
4444
<groupId>com.google.cloud</groupId>
4545
<artifactId>google-cloud</artifactId>
46-
<version>0.8.0</version>
46+
<version>0.8.2-alpha</version>
4747
</dependency>
4848
```
4949
If you are using Gradle, add this to your dependencies
5050
```Groovy
51-
compile 'com.google.cloud:google-cloud:0.8.0'
51+
compile 'com.google.cloud:google-cloud:0.8.2-alpha'
5252
```
5353
If you are using SBT, add this to your dependencies
5454
```Scala
55-
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.8.0"
55+
libraryDependencies += "com.google.cloud" % "google-cloud" % "0.8.2-alpha"
5656
```
5757

5858
Example Applications

‎branches/tswast-patch-1/google-cloud-bigquery/README.md‎

Lines changed: 4 additions & 4 deletions
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.8.0-beta</version>
25+
<version>0.8.2-beta</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.8.0-beta'
30+
compile 'com.google.cloud:google-cloud-bigquery:0.8.2-beta'
3131
```
3232
If you are using SBT, add this to your dependencies
3333
```Scala
34-
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.8.0-beta"
34+
libraryDependencies += "com.google.cloud" % "google-cloud-bigquery" % "0.8.2-beta"
3535
```
3636

3737
Example Application
@@ -189,7 +189,7 @@ QueryRequest queryRequest =
189189
.build();
190190
// Request query to be executed and wait for results
191191
QueryResponse queryResponse = bigquery.query(queryRequest);
192-
while (!queryResponse.jobComplete()) {
192+
while (!queryResponse.jobCompleted()) {
193193
Thread.sleep(1000L);
194194
queryResponse = bigquery.getQueryResults(queryResponse.getJobId());
195195
}

‎branches/tswast-patch-1/google-cloud-bigquery/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-pom</artifactId>
15-
<version>0.8.1-SNAPSHOT</version>
15+
<version>0.8.2-alpha</version>
1616
</parent>
1717
<properties>
1818
<site.installationModule>google-cloud-bigquery</site.installationModule>

‎branches/tswast-patch-1/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/FormatOptions.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public class FormatOptions implements Serializable {
3232
static final String CSV = "CSV";
3333
static final String JSON = "NEWLINE_DELIMITED_JSON";
3434
static final String DATASTORE_BACKUP = "DATASTORE_BACKUP";
35+
static final String AVRO = "AVRO";
3536
private static final long serialVersionUID = -443376052020423691L;
3637

3738
private final String type;
@@ -94,6 +95,13 @@ public static FormatOptions datastoreBackup() {
9495
return new FormatOptions(DATASTORE_BACKUP);
9596
}
9697

98+
/**
99+
* Default options for AVRO format.
100+
*/
101+
public static FormatOptions avro() {
102+
return new FormatOptions(AVRO);
103+
}
104+
97105
/**
98106
* Default options for the provided format.
99107
*/

‎branches/tswast-patch-1/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/FormatOptionsTest.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,29 @@ public void testConstructor() {
3030
assertEquals(FormatOptions.JSON, options.getType());
3131
options = new FormatOptions(FormatOptions.DATASTORE_BACKUP);
3232
assertEquals(FormatOptions.DATASTORE_BACKUP, options.getType());
33+
options = new FormatOptions(FormatOptions.AVRO);
34+
assertEquals(FormatOptions.AVRO, options.getType());
3335
}
3436

3537
@Test
38+
@SuppressWarnings("deprecation")
3639
public void testConstructorDeprecated() {
3740
FormatOptions options = new FormatOptions(FormatOptions.CSV);
3841
assertEquals(FormatOptions.CSV, options.type());
3942
options = new FormatOptions(FormatOptions.JSON);
4043
assertEquals(FormatOptions.JSON, options.type());
4144
options = new FormatOptions(FormatOptions.DATASTORE_BACKUP);
4245
assertEquals(FormatOptions.DATASTORE_BACKUP, options.type());
46+
options = new FormatOptions(FormatOptions.AVRO);
47+
assertEquals(FormatOptions.AVRO, options.type());
4348
}
4449

4550
@Test
4651
public void testFactoryMethods() {
4752
assertEquals(FormatOptions.CSV, FormatOptions.csv().getType());
4853
assertEquals(FormatOptions.JSON, FormatOptions.json().getType());
4954
assertEquals(FormatOptions.DATASTORE_BACKUP, FormatOptions.datastoreBackup().getType());
55+
assertEquals(FormatOptions.AVRO, FormatOptions.avro().getType());
5056
}
5157

5258
@Test

‎branches/tswast-patch-1/google-cloud-compute/README.md‎

Lines changed: 3 additions & 3 deletions
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-compute</artifactId>
25-
<version>0.8.0</version>
25+
<version>0.8.2-alpha</version>
2626
</dependency>
2727
```
2828
If you are using Gradle, add this to your dependencies
2929
```Groovy
30-
compile 'com.google.cloud:google-cloud-compute:0.8.0'
30+
compile 'com.google.cloud:google-cloud-compute:0.8.2-alpha'
3131
```
3232
If you are using SBT, add this to your dependencies
3333
```Scala
34-
libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.8.0"
34+
libraryDependencies += "com.google.cloud" % "google-cloud-compute" % "0.8.2-alpha"
3535
```
3636

3737
Example Application

‎branches/tswast-patch-1/google-cloud-compute/pom.xml‎

Lines changed: 1 addition & 1 deletion
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.8.1-SNAPSHOT</version>
14+
<version>0.8.2-alpha</version>
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-compute</site.installationModule>

‎branches/tswast-patch-1/google-cloud-contrib/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ If you are using Maven, add this to your pom.xml file
2525
<dependency>
2626
<groupId>com.google.cloud</groupId>
2727
<artifactId>google-cloud-contrib</artifactId>
28-
<version>0.8.0</version>
28+
<version>0.8.2-alpha</version>
2929
</dependency>
3030
```
3131
If you are using Gradle, add this to your dependencies
3232
```Groovy
33-
compile 'com.google.cloud:google-cloud-contrib:0.8.0'
33+
compile 'com.google.cloud:google-cloud-contrib:0.8.2-alpha'
3434
```
3535
If you are using SBT, add this to your dependencies
3636
```Scala
37-
libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.8.0"
37+
libraryDependencies += "com.google.cloud" % "google-cloud-contrib" % "0.8.2-alpha"
3838
```
3939

4040
### google-cloud-nio-examples

‎branches/tswast-patch-1/google-cloud-contrib/google-cloud-nio-examples/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ To run this example:
2222
4. Run the sample with:
2323
2424
```
25-
java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.7.1-SNAPSHOT-shaded.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.7.1-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
25+
java -cp google-cloud-contrib/google-cloud-nio/target/google-cloud-nio-0.8.3-alpha-SNAPSHOT-shaded.jar:google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.8.3-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
2626
```
2727
2828
Notice that it lists Google Cloud Storage, which it wouldn't if you ran it without the NIO jar:
2929
```
30-
java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.7.1-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
30+
java -cp google-cloud-contrib/google-cloud-nio-examples/target/google-cloud-nio-examples-0.8.3-alpha-SNAPSHOT.jar com.google.cloud.nio.examples.ListFilesystems
3131
```
3232
3333
The sample doesn't have anything about Google Cloud Storage in it. It gets that ability from the NIO

0 commit comments

Comments
 (0)