Skip to content

Commit c8fa3f7

Browse files
mziccardmziccard
committed
---
yaml --- r: 4429 b: refs/heads/gcs-nio c: d52d412 h: refs/heads/master i: 4427: f146697
1 parent a3adf69 commit c8fa3f7

13 files changed

Lines changed: 63 additions & 290 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ refs/tags/v0.0.12: 2fd8066e891fb3dfea69b65f6bf6461db79342b9
1111
refs/heads/compute-alpha: 969cba2627f1d53d352cc4a5ffe0879dacf65e6c
1212
refs/heads/dns-alpha: 2f90e7e338349287ace33375896907af0f032ca1
1313
refs/heads/dns-alpha-batch: 17442b07867021b85d0452f5f3eda29a3413288f
14-
refs/heads/gcs-nio: e92a9c61aa98c2d9b54e6f2c223fe18080d6e500
14+
refs/heads/gcs-nio: d52d412a2a15e50096846574ba352cd765e5200f
1515
refs/heads/logging-alpha: db5312bffa7fccac194f6a7feb8cc3066de16aff
1616
refs/tags/v0.1.0: a615317f7424ed58621b1f65d5c4d8cbbe8a6ed8
1717
refs/tags/v0.1.1: 7a7f6985fe465e9dd6a075af55493f42b4933be0

‎branches/gcs-nio/gcloud-java-contrib/README.md‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,29 @@ Packages that provide higher-level abstraction/functionality for common gcloud-j
1212
Contents
1313
--------
1414

15+
<<<<<<< HEAD
1516
* [gcloud-java-nio](./gcloud-java-nio/): NIO Filesystem Provider for Google Cloud Storage.
1617
* [gcloud-java-nio-examples](./gcloud-java-nio-examples/): How to add GCS NIO after the fact.
17-
18+
=======
1819
Quickstart
1920
----------
20-
21-
### gcloud-java-nio
22-
2321
If you are using Maven, add this to your pom.xml file
2422
```xml
2523
<dependency>
2624
<groupId>com.google.cloud</groupId>
27-
<artifactId>gcloud-java-nio</artifactId>
25+
<artifactId>gcloud-java-contrib</artifactId>
2826
<version>0.2.3</version>
2927
</dependency>
3028
```
3129
If you are using Gradle, add this to your dependencies
3230
```Groovy
33-
compile 'com.google.cloud:gcloud-java-nio:0.2.3'
31+
compile 'com.google.cloud:gcloud-java-contrib:0.2.3'
3432
```
3533
If you are using SBT, add this to your dependencies
3634
```Scala
3735
libraryDependencies += "com.google.cloud" % "gcloud-java-contrib" % "0.2.3"
3836
```
39-
40-
### gcloud-java-nio-examples
41-
42-
See its [README](./gcloud-java-nio-examples/README.md) for instructions on how to run it.
37+
>>>>>>> master
4338
4439
Java Versions
4540
-------------

‎branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio-examples/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,3 @@ facility, the [standard way](http://docs.oracle.com/javase/7/docs/technotes/guid
3939
If you have access to a project's source code you can also simply add gcloud-java-nio as
4040
a dependency and let Maven pull in the required dependencies (this is what the nio unit tests do).
4141
This approach is preferable as the fat jar approach may waste memory on multiple copies of dependencies.
42-
43-
[developers-console]:https://console.developers.google.com/

‎branches/gcs-nio/gcloud-java-contrib/gcloud-java-nio/README.md‎

Lines changed: 0 additions & 210 deletions
This file was deleted.

‎branches/gcs-nio/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java‎

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,35 +58,29 @@
5858
*
5959
* <p>This example demonstrates a simple/typical BigQuery usage.
6060
*
61-
* <p>Steps needed for running the example:
62-
* <ol>
63-
* <li>log in using gcloud SDK - {@code gcloud auth login}.</li>
64-
* <li>compile using maven - {@code cd gcloud-java-examples;
65-
* mvn package appassembler:assemble -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true}
66-
* </li>
67-
* <li>run -
61+
* <p>See the
62+
* <a href="https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/README.md">
63+
* README</a> for compilation instructions. Run this code with
6864
* <pre>{@code target/appassembler/bin/BigQueryExample [<project_id>]
69-
* list datasets |
70-
* list tables <dataset> |
71-
* list jobs |
72-
* list data <dataset> <table> |
73-
* info dataset <dataset> |
74-
* info table <dataset> <table> |
75-
* info job <job> |
76-
* create dataset <dataset> |
77-
* create table <dataset> <table> (<fieldName>:<primitiveType>)+ |
78-
* create view <dataset> <table> <query> |
79-
* create external-table <dataset> <table> <format> (<fieldName>:<primitiveType>)+ <sourceUri> |
80-
* delete dataset <dataset> |
81-
* delete table <dataset> <table> |
82-
* cancel <job> |
83-
* copy <sourceDataset> <sourceTable> <destinationDataset> <destinationTable> |
84-
* load <dataset> <table> <format> <sourceUri>+ |
85-
* extract <dataset> <table> <format> <destinationUri>+ |
86-
* query <query> |
87-
* load-file <dataset> <table> <format> <filePath>"}</pre>
88-
* </li>
89-
* </ol>
65+
* list datasets |
66+
* list tables <dataset> |
67+
* list jobs |
68+
* list data <dataset> <table> |
69+
* info dataset <dataset> |
70+
* info table <dataset> <table> |
71+
* info job <job> |
72+
* create dataset <dataset> |
73+
* create table <dataset> <table> (<fieldName>:<primitiveType>)+ |
74+
* create view <dataset> <table> <query> |
75+
* create external-table <dataset> <table> <format> (<fieldName>:<primitiveType>)+ <sourceUri> |
76+
* delete dataset <dataset> |
77+
* delete table <dataset> <table> |
78+
* cancel <job> |
79+
* copy <sourceDataset> <sourceTable> <destinationDataset> <destinationTable> |
80+
* load <dataset> <table> <format> <sourceUri>+ |
81+
* extract <dataset> <table> <format> <destinationUri>+ |
82+
* query <query> |
83+
* load-file <dataset> <table> <format> <filePath>}</pre>
9084
*
9185
* <p>The first parameter is an optional {@code project_id} (logged-in project will be used if not
9286
* supplied). Second parameter is a BigQuery operation and can be used to demonstrate its usage. For

‎branches/gcs-nio/gcloud-java-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,10 @@
8383
*
8484
* <p>This example demonstrates a simple/typical Compute usage.
8585
*
86-
* <p>See the README for the steps needed for compiling and running the example.
87-
* <p>Possible command-line arguments are:
88-
* <pre>{@code [<project_id>]
86+
* <p>See the
87+
* <a href="https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/README.md">
88+
* README</a> for compilation instructions. Run this code with
89+
* <pre>{@code target/appassembler/bin/ComputeExample [<project_id>]
8990
* list networks |
9091
* list region-operations <region> |
9192
* list instances <zone>? |
@@ -147,7 +148,7 @@
147148
* stop <zone> <instance> |
148149
* reset <zone> <instance> |
149150
* set-tags <zone> <instance> <tag>* |
150-
* set-metadata <zone> <instance> <key value>*"}</pre>
151+
* set-metadata <zone> <instance> <key value>*}</pre>
151152
*
152153
* <p>The first parameter is an optional {@code project_id} (logged-in project will be used if not
153154
* supplied). Second parameter is a Compute operation and can be used to demonstrate its usage. For

‎branches/gcs-nio/gcloud-java-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,11 @@
4141
* <p>This example adds, displays or clears comments for a given user. This example also sets
4242
* contact information for a user.
4343
*
44-
* <p>Steps needed for running the example:<ol>
45-
* <li>login using gcloud SDK - {@code gcloud auth login}.</li>
46-
* <li>compile using maven - {@code cd gcloud-java-examples;
47-
* mvn package appassembler:assemble -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true}
48-
* </li>
49-
* <li>run - {@code target/appassembler/bin/DatastoreExample
50-
* [projectId] [user] [delete|display|add comment]}</li>
51-
* </ol>
44+
* <p>See the
45+
* <a href="https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/README.md">
46+
* README</a> for compilation instructions. Run this code with
47+
* <pre>{@code target/appassembler/bin/DatastoreExample
48+
* [projectId] [user] [delete|display|add comment]}</pre>
5249
*
5350
* <p>If no action is provided {@code display} is executed.
5451
*/

‎branches/gcs-nio/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@
4242
* <p>This example creates, deletes, gets, and lists zones. It also creates and deletes
4343
* record sets of type A, and lists record sets.
4444
*
45-
* <p>See the README for steps needed for running the example.
46-
* <p>The command-line arguments can be:
47-
* <pre>{@code [<project_id>]
45+
* <p>See the
46+
* <a href="https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/README.md">
47+
* README</a> for compilation instructions. Run this code with
48+
* <pre>{@code target/appassembler/bin/DnsExample [<project_id>]
4849
* create <zone_name> <dns_name> <description> |
4950
* get <zone_name> |
5051
* delete <zone_name> |

‎branches/gcs-nio/gcloud-java-examples/src/main/java/com/google/cloud/examples/nio/CountBytes.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@
3737
* This class also shows how to read all of the file's contents using NIO,
3838
* computes a MD5 hash, and reports how long it took.
3939
*
40-
* <p>See the README for compilation instructions. Run this code with
41-
* {@code target/appassembler/bin/CountBytes <file>}
40+
* <p>See the
41+
* <a href="https://github.com/GoogleCloudPlatform/gcloud-java/blob/master/gcloud-java-examples/README.md">
42+
* README</a> for compilation instructions. Run this code with
43+
* <pre>{@code target/appassembler/bin/CountBytes <file>}</pre>
4244
*/
4345
public class CountBytes {
4446

0 commit comments

Comments
 (0)