diff --git a/gcloud-java-examples/README.md b/gcloud-java-examples/README.md index 98af1df5f3f2..84cb6d581d8a 100644 --- a/gcloud-java-examples/README.md +++ b/gcloud-java-examples/README.md @@ -81,6 +81,7 @@ To run examples from your command line: mvn exec:java -Dexec.mainClass="com.google.cloud.examples.datastore.DatastoreExample" -Dexec.args="your-project-id my_name add my\ comment" mvn exec:java -Dexec.mainClass="com.google.cloud.examples.datastore.DatastoreExample" -Dexec.args="your-project-id my_name display" mvn exec:java -Dexec.mainClass="com.google.cloud.examples.datastore.DatastoreExample" -Dexec.args="your-project-id my_name delete" + mvn exec:java -Dexec.mainClass="com.google.cloud.examples.datastore.DatastoreExample" -Dexec.args="your-project-id my_name set myname@mydomain.com 1234" ``` * Here's an example run of `DnsExample`. diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java index 5b15bbd6ec71..6acfb5bbef6d 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/bigquery/BigQueryExample.java @@ -108,7 +108,7 @@ public class BigQueryExample { private abstract static class BigQueryAction { - abstract void run(BigQuery bigquery, T request) throws Exception; + abstract void run(BigQuery bigquery, T arg) throws Exception; abstract T parse(String... args) throws Exception; @@ -775,18 +775,18 @@ public static void main(String... args) throws Exception { return; } BigQuery bigquery = optionsBuilder.build().service(); - Object request; + Object arg; try { - request = action.parse(args); + arg = action.parse(args); } catch (IllegalArgumentException ex) { - System.out.println("Invalid input for action '" + actionName + "'. " + ex.getMessage()); - System.out.println("Expected: " + action.params()); + System.out.printf("Invalid input for action '%s'. %s%n", actionName, ex.getMessage()); + System.out.printf("Expected: %s%n", action.params()); return; } catch (Exception ex) { - System.out.println("Failed to parse request."); + System.out.println("Failed to parse arguments."); ex.printStackTrace(); return; } - action.run(bigquery, request); + action.run(bigquery, arg); } } diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java index d7f8e671cb72..23421e197f58 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/compute/ComputeExample.java @@ -199,7 +199,7 @@ Z z() { private abstract static class ComputeAction { - abstract void run(Compute compute, T request) throws Exception; + abstract void run(Compute compute, T arg) throws Exception; abstract T parse(String... args) throws Exception; @@ -332,7 +332,7 @@ public void run(Compute compute, ZoneId zone) { private static class DiskTypeInfoAction extends ComputeAction { @Override public void run(Compute compute, DiskTypeId diskType) { - System.out.println("Disk type info: " + compute.getDiskType(diskType)); + System.out.printf("Disk type info: %s%n", compute.getDiskType(diskType)); } @Override @@ -387,7 +387,7 @@ public void run(Compute compute, ZoneId zone) { private static class MachineTypeInfoAction extends ComputeAction { @Override public void run(Compute compute, MachineTypeId machineType) { - System.out.println("Machine type info: " + compute.getMachineType(machineType)); + System.out.printf("Machine type info: %s%n", compute.getMachineType(machineType)); } @Override @@ -434,7 +434,7 @@ public void run(Compute compute, Void arg) { private static class RegionInfoAction extends ComputeAction { @Override public void run(Compute compute, RegionId region) { - System.out.println("Region info: " + compute.getRegion(region.region())); + System.out.printf("Region info: %s%n", compute.getRegion(region.region())); } @Override @@ -480,7 +480,7 @@ public void run(Compute compute, Void arg) { private static class ZoneInfoAction extends ComputeAction { @Override public void run(Compute compute, ZoneId zone) { - System.out.println("Zone info: " + compute.getZone(zone.zone())); + System.out.printf("Zone info: %s%n", compute.getZone(zone.zone())); } @Override @@ -511,7 +511,7 @@ public String params() { private static class LicenseInfoAction extends ComputeAction { @Override public void run(Compute compute, LicenseId license) { - System.out.println("License info: " + compute.getLicense(license.license())); + System.out.printf("License info: %s%n", compute.getLicense(license.license())); } @Override @@ -687,7 +687,7 @@ public String params() { private static class GlobalOperationInfoAction extends GlobalOperationAction { @Override public void run(Compute compute, GlobalOperationId operation) { - System.out.println("Operation info: " + compute.getOperation(operation)); + System.out.printf("Operation info: %s%n", compute.getOperation(operation)); } } @@ -700,7 +700,7 @@ public void run(Compute compute, GlobalOperationId operation) { private static class ZoneOperationInfoAction extends ZoneOperationAction { @Override public void run(Compute compute, ZoneOperationId operation) { - System.out.println("Operation info: " + compute.getOperation(operation)); + System.out.printf("Operation info: %s%n", compute.getOperation(operation)); } } @@ -713,7 +713,7 @@ public void run(Compute compute, ZoneOperationId operation) { private static class RegionOperationInfoAction extends RegionOperationAction { @Override public void run(Compute compute, RegionOperationId operation) { - System.out.println("Operation info: " + compute.getOperation(operation)); + System.out.printf("Operation info: %s%n", compute.getOperation(operation)); } } @@ -727,9 +727,9 @@ private static class DeleteGlobalOperationAction extends GlobalOperationAction { @Override public void run(Compute compute, GlobalOperationId operation) { if (compute.deleteOperation(operation)) { - System.out.println("Operation " + operation + " was deleted"); + System.out.printf("Operation %s was deleted%n", operation); } else { - System.out.println("Operation " + operation + " not found"); + System.out.printf("Operation %s not found%n", operation); } } } @@ -744,9 +744,9 @@ private static class DeleteZoneOperationAction extends ZoneOperationAction { @Override public void run(Compute compute, ZoneOperationId operation) { if (compute.deleteOperation(operation)) { - System.out.println("Operation " + operation + " was deleted"); + System.out.printf("Operation %s was deleted%n", operation); } else { - System.out.println("Operation " + operation + " not found"); + System.out.printf("Operation %s not found%n", operation); } } } @@ -761,9 +761,9 @@ private static class DeleteRegionOperationAction extends RegionOperationAction { @Override public void run(Compute compute, RegionOperationId operation) { if (compute.deleteOperation(operation)) { - System.out.println("Operation " + operation + " was deleted"); + System.out.printf("Operation %s was deleted%n", operation); } else { - System.out.println("Operation " + operation + " not found"); + System.out.printf("Operation %s not found%n", operation); } } } @@ -824,7 +824,7 @@ public String params() { private static class AddressInfoAction extends AddressAction { @Override public void run(Compute compute, AddressId address) { - System.out.println("Address info: " + compute.getAddress(address)); + System.out.printf("Address info: %s%n", compute.getAddress(address)); } } @@ -841,20 +841,20 @@ private static class DeleteAddressAction extends AddressAction { public void run(Compute compute, AddressId address) throws InterruptedException { Operation operation = compute.deleteAddress(address); if (operation == null) { - System.out.println("Address " + address + " does not exist"); + System.out.printf("Address %s does not exist%n", address); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Address " + address + " was deleted"); + System.out.printf("Address %s was deleted%n", address); } else { - System.out.println("Deletion of address " + address + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Deletion of address %s failed%n", address); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -872,16 +872,16 @@ private static class CreateAddressAction extends AddressAction { public void run(Compute compute, AddressId address) throws InterruptedException { Operation operation = compute.create(AddressInfo.of(address)); while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Address " + address + " was created"); + System.out.printf("Address %s was created%n", address); } else { - System.out.println("Creation of address " + address + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Creation of address %s failed%n", address); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -931,7 +931,7 @@ public String params() { private static class SnapshotInfoAction extends SnapshotAction { @Override public void run(Compute compute, SnapshotId snapshot) { - System.out.println("Snapshot info: " + compute.getSnapshot(snapshot.snapshot())); + System.out.printf("Snapshot info: %s%n", compute.getSnapshot(snapshot.snapshot())); } } @@ -946,20 +946,20 @@ private static class DeleteSnapshotAction extends SnapshotAction { public void run(Compute compute, SnapshotId snapshot) throws InterruptedException { Operation operation = compute.deleteSnapshot(snapshot.snapshot()); if (operation == null) { - System.out.println("Snapshot " + snapshot + " does not exist"); + System.out.printf("Snapshot %s does not exist%n", snapshot); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Snapshot " + snapshot + " was deleted"); + System.out.printf("Snapshot %s was deleted%n", snapshot); } else { - System.out.println("Deletion of snapshot " + snapshot + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Deletion of snapshot %s failed%n", snapshot); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -975,16 +975,16 @@ private static class CreateSnapshotAction extends ComputeAction { public void run(Compute compute, SnapshotInfo snapshot) throws InterruptedException { Operation operation = compute.create(snapshot); while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Snapshot " + snapshot.snapshotId() + " was created"); + System.out.printf("Snapshot %s was created%n", snapshot.snapshotId()); } else { - System.out.println("Creation of snapshot " + snapshot.snapshotId() + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Creation of snapshot %s failed%n", snapshot.snapshotId()); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -1055,7 +1055,7 @@ public String params() { private static class ImageInfoAction extends ImageAction { @Override public void run(Compute compute, ImageId image) { - System.out.println("Image info: " + compute.getImage(image)); + System.out.printf("Image info: %s%n", compute.getImage(image)); } } @@ -1070,20 +1070,20 @@ private static class DeleteImageAction extends ImageAction { public void run(Compute compute, ImageId image) throws InterruptedException { Operation operation = compute.deleteImage(image); if (operation == null) { - System.out.println("Image " + image + " does not exist"); + System.out.printf("Image %s does not exist%n", image); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Image " + image + " was deleted"); + System.out.printf("Image %s was deleted%n", image); } else { - System.out.println("Deletion of image " + image + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Deletion of image %s failed%n", image); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -1099,16 +1099,16 @@ private static class CreateImageAction extends ComputeAction { public void run(Compute compute, ImageInfo image) throws InterruptedException { Operation operation = compute.create(image); while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Image " + image.imageId() + " was created"); + System.out.printf("Image %s was created%n", image.imageId()); } else { - System.out.println("Creation of image " + image.imageId() + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Creation of image %s failed%n", image.imageId()); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -1163,7 +1163,7 @@ public String params() { private static class DiskInfoAction extends DiskAction { @Override public void run(Compute compute, DiskId disk) { - System.out.println("Disk info: " + compute.getDisk(disk)); + System.out.printf("Disk info: %s%n", compute.getDisk(disk)); } } @@ -1178,20 +1178,20 @@ private static class DeleteDiskAction extends DiskAction { public void run(Compute compute, DiskId disk) throws InterruptedException { Operation operation = compute.deleteDisk(disk); if (operation == null) { - System.out.println("Disk " + disk + " does not exist"); + System.out.printf("Disk %s does not exist%n", disk); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Disk " + disk + " was deleted"); + System.out.printf("Disk %s was deleted%n", disk); } else { - System.out.println("Deletion of disk " + disk + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Deletion of disk %s failed%n", disk); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -1217,16 +1217,16 @@ private abstract static class CreateDiskAction extends ComputeAction { public void run(Compute compute, DiskInfo disk) throws InterruptedException { Operation operation = compute.create(disk); while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Disk " + disk.diskId() + " was created"); + System.out.printf("Disk %s was created%n", disk.diskId()); } else { - System.out.println("Creation of disk " + disk.diskId() + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Creation of disk %s failed%n", disk.diskId()); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -1370,7 +1370,7 @@ public String params() { private static class NetworkInfoAction extends NetworkAction { @Override public void run(Compute compute, NetworkId network) { - System.out.println("Network info: " + compute.getNetwork(network.network())); + System.out.printf("Network info: %s%n", compute.getNetwork(network.network())); } } @@ -1385,20 +1385,20 @@ private static class DeleteNetworkAction extends NetworkAction { public void run(Compute compute, NetworkId network) throws InterruptedException { Operation operation = compute.deleteNetwork(network.network()); if (operation == null) { - System.out.println("Network " + network + " does not exist"); + System.out.printf("Network %s does not exist%n", network); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Network " + network + " was deleted"); + System.out.printf("Network %s was deleted%n", network); } else { - System.out.println("Deletion of network " + network + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Deletion of network %s failed%n", network); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -1408,16 +1408,16 @@ private abstract static class CreateNetworkAction extends ComputeAction { public void run(Compute compute, InstanceInfo instance) throws InterruptedException { Operation operation = compute.create(instance); while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Instance " + instance.instanceId() + " was created"); + System.out.printf("Instance %s was created%n", instance.instanceId()); } else { - System.out.println("Creation of instance " + instance.instanceId() + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Creation of instance %s failed%n", instance.instanceId()); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -1760,10 +1760,10 @@ public void run(Compute compute, Tuple instanceAndPort) Integer port = instanceAndPort.y(); String serialPortOutput; if (port != null) { - System.out.println("Getting serial port " + port + " output for instance " + instance); + System.out.printf("Getting serial port %d output for instance %s%n", port, instance); serialPortOutput = compute.getSerialPortOutput(instance, port); } else { - System.out.println("Getting serial port output for instance " + instance); + System.out.printf("Getting serial port output for instance %s%n", instance); serialPortOutput = compute.getSerialPortOutput(instance); } System.out.println(serialPortOutput); @@ -1813,22 +1813,22 @@ public void run(Compute compute, Triple interf AccessConfig accessConfig = interfaceAndConfig.z(); Operation operation = compute.addAccessConfig(instance, networkInterface, accessConfig); if (operation == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instance); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Access config added to network interface " + networkInterface - + " of instance " + instance); + System.out.printf("Access config added to network interface %s of instance %s%n", + networkInterface, instance); } else { - System.out.println("Attempt to add access config to network interface " + networkInterface - + " of instance " + instance + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to add access config to network interface %s of instance %s%n", + networkInterface, instance); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -1877,22 +1877,23 @@ public void run(Compute compute, Triple interfaceAnd String accessConfig = interfaceAndConfig.z(); Operation operation = compute.deleteAccessConfig(instance, networkInterface, accessConfig); if (operation == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instance); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Access config deleted from network interface " + networkInterface - + " of instance " + instance); + System.out.printf("Access config deleted from network interface %s of instance %s%n", + networkInterface, instance); } else { - System.out.println("Attempt to delete access config from network interface " - + networkInterface + " of instance " + instance + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf( + "Attempt to delete access config from network interface %s of instance %s failed%n", + networkInterface, instance); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -1934,20 +1935,20 @@ public void run(Compute compute, Triple instanceAndDevice) String deviceName = instanceAndDevice.y(); Operation operation = compute.detachDisk(instance, deviceName); if (operation == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instance); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Disk detached from instance " + instance); + System.out.printf("Disk detached from instance %s%n", instance); } else { - System.out.println("Attempt to detach disk from instance " + instance + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to detach disk from instance %s failed%n", instance); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -2045,21 +2046,21 @@ public void run(Compute compute, Triple deviceAndAu Boolean autoDelete = deviceAndAutoDelete.z(); Operation operation = compute.setDiskAutoDelete(instance, deviceName, autoDelete); if (operation == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instance); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Auto-delete set for device " + deviceName + " of instance " + instance); + System.out.printf("Auto-delete set for device %s of instance %s%n", deviceName, instance); } else { - System.out.println("Attempt to set auto-delete for device " + deviceName + " of instance " - + instance + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to set auto-delete for device %s of instance %s failed%n", + deviceName, instance); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -2111,20 +2112,20 @@ public void run(Compute compute, Tuple instanceAndTyp MachineTypeId machineType = instanceAndType.y(); Operation operation = compute.setMachineType(instance, machineType); if (operation == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instance); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Machine type set for instance " + instance); + System.out.printf("Machine type set for instance %s%n", instance); } else { - System.out.println("Attempt to set machine type for instance " + instance + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to set machine type for instance %s failed%n", instance); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -2164,21 +2165,21 @@ public void run(Compute compute, Tuple> instanceAndTags List tags = instanceAndTags.y(); Instance instance = compute.getInstance(instanceId); if (instance == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instanceId); return; } Operation operation = instance.setTags(tags); while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Tags set for instance " + instanceId); + System.out.printf("Tags set for instance %s%n", instanceId); } else { - System.out.println("Attempt to set tags for instance " + instanceId + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to set tags for instance %s failed%n", instanceId); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -2215,21 +2216,21 @@ public void run(Compute compute, Tuple> instance Map metadata = instanceAndMetadata.y(); Instance instance = compute.getInstance(instanceId); if (instance == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instanceId); return; } Operation operation = instance.setMetadata(metadata); while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Metadata set for instance " + instanceId); + System.out.printf("Metadata set for instance %s%n", instanceId); } else { - System.out.println("Attempt to set metadata for instance " + instanceId + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to set metadata for instance %s failed%n", instanceId); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -2271,21 +2272,21 @@ public void run(Compute compute, Tuple instanceAn SchedulingOptions schedulingOptions = instanceAndScheduling.y(); Operation operation = compute.setSchedulingOptions(instanceId, schedulingOptions); if (operation == null) { - System.out.println("Instance " + instanceId + " does not exist"); + System.out.printf("Instance %s does not exist%n", instanceId); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Scheduling options set for instance " + instanceId); + System.out.printf("Scheduling options set for instance %s%n", instanceId); } else { - System.out.println( - "Attempt to set scheduling options for instance " + instanceId + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf( + "Attempt to set scheduling options for instance %s failed%n", instanceId); + System.out.printf("Error: %s%n", operation.errors()); } } @@ -2337,20 +2338,20 @@ private static class ResetInstanceAction extends InstanceAction { public void run(Compute compute, InstanceId instance) throws InterruptedException { Operation operation = compute.reset(instance); if (operation == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instance); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Instance " + instance + " was reset"); + System.out.printf("Instance %s was reset%n", instance); } else { - System.out.println("Attempt to reset instance " + instance + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to reset instance %s failed%n", instance); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -2366,20 +2367,20 @@ private static class StopInstanceAction extends InstanceAction { public void run(Compute compute, InstanceId instance) throws InterruptedException { Operation operation = compute.stop(instance); if (operation == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instance); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Instance " + instance + " was stopped"); + System.out.printf("Instance %s was stopped%n", instance); } else { - System.out.println("Attempt to stop instance " + instance + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to stop instance %s failed%n", instance); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -2395,20 +2396,20 @@ private static class StartInstanceAction extends InstanceAction { public void run(Compute compute, InstanceId instance) throws InterruptedException { Operation operation = compute.start(instance); if (operation == null) { - System.out.println("Instance " + instance + " does not exist"); + System.out.printf("Instance %s does not exist%n", instance); return; } while (!operation.isDone()) { - System.out.println( - "Waiting for operation " + operation.operationId().operation() + " to complete"); + System.out.printf( + "Waiting for operation %s to complete%n", operation.operationId().operation()); Thread.sleep(1000L); } operation = operation.reload(); if (operation.errors() == null) { - System.out.println("Instance " + instance + " was started"); + System.out.printf("Instance %s was started%n", instance); } else { - System.out.println("Attempt to start instance " + instance + " failed"); - System.out.println("Error: " + operation.errors()); + System.out.printf("Attempt to start instance %s failed%n", instance); + System.out.printf("Error: %s%n", operation.errors()); } } } @@ -2522,18 +2523,18 @@ public static void main(String... args) throws Exception { return; } Compute compute = optionsBuilder.build().service(); - Object request; + Object arg; try { - request = action.parse(args); + arg = action.parse(args); } catch (IllegalArgumentException ex) { - System.out.println("Invalid input for action '" + actionName + "'. " + ex.getMessage()); - System.out.println("Expected: " + action.params()); + System.out.printf("Invalid input for action '%s'. %s%n", actionName, ex.getMessage()); + System.out.printf("Expected: %s%n", action.params()); return; } catch (Exception ex) { - System.out.println("Failed to parse request."); + System.out.println("Failed to parse arguments."); ex.printStackTrace(); return; } - action.run(compute, request); + action.run(compute, arg); } } diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java index cf0fee504bf8..4b83f04e7165 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/datastore/DatastoreExample.java @@ -38,15 +38,23 @@ /** * An example of using Google Cloud Datastore. * - *

This example adds, display or clear comments for a given user. + *

This example adds, displays or clears comments for a given user. This example also sets + * contact information for a user. * *

Steps needed for running the example:

    *
  1. login using gcloud SDK - {@code gcloud auth login}.
    2. *
  2. compile using maven - {@code mvn compile}
    3. - *
  3. run using maven - {@code mvn exec:java - * -Dexec.mainClass="com.google.cloud.examples.datastore.DatastoreExample" - * -Dexec.args="[projectId] [user] [delete|display|add comment]"}
    4. + *
  4. run using maven - + * 
    {@code mvn exec:java -Dexec.mainClass="com.google.cloud.examples.datastore.DatastoreExample"
+ *  -Dexec.args=" 
+ *  delete |
+ *  display |
+ *  add  |
+ *  set  }
    + *
    5. *
+ * + *

If no action is provided {@code display} is executed. */ public class DatastoreExample { @@ -56,15 +64,24 @@ public class DatastoreExample { private static final String DEFAULT_ACTION = "display"; private static final Map ACTIONS = new HashMap<>(); - private interface DatastoreAction { - void run(Transaction tx, Key userKey, String... args); + private abstract static class DatastoreAction { + + abstract void run(Transaction tx, Key userKey, T arg) throws Exception; - String getRequiredParams(); + abstract T parse(String... args) throws Exception; + + protected String params() { + return ""; + } } - private static class DeleteAction implements DatastoreAction { + /** + * This class demonstrates how to delete a user. This action also queries the keys of all comments + * associated with the user and uses them to delete comments. + */ + private static class DeleteAction extends DatastoreAction { @Override - public void run(Transaction tx, Key userKey, String... args) { + public void run(Transaction tx, Key userKey, Void arg) { Entity user = tx.get(userKey); if (user == null) { System.out.println("Nothing to delete, user does not exist."); @@ -86,19 +103,30 @@ public void run(Transaction tx, Key userKey, String... args) { } @Override - public String getRequiredParams() { - return ""; + Void parse(String... args) throws Exception { + return null; } } - private static class DisplayAction implements DatastoreAction { + /** + * This class demonstrates how to get a user. The action also queries all comments associated + * with the user. + */ + private static class DisplayAction extends DatastoreAction { @Override - public void run(Transaction tx, Key userKey, String... args) { + public void run(Transaction tx, Key userKey, Void arg) { Entity user = tx.get(userKey); if (user == null) { - System.out.println("No comments for '" + userKey.name() + "'."); + System.out.printf("User '%s' does not exist.%n", userKey.name()); return; } + if (user.contains("contact")) { + FullEntity contact = user.getEntity("contact"); + String email = contact.getString("email"); + String phone = contact.getString("phone"); + System.out.printf("User '%s' email is '%s', phone is '%s'.%n", + userKey.name(), email, phone); + } System.out.printf("User '%s' has %d comment[s].%n", userKey.name(), user.getLong("count")); int limit = 200; Map sortedComments = new TreeMap<>(); @@ -131,25 +159,37 @@ public void run(Transaction tx, Key userKey, String... args) { } @Override - public String getRequiredParams() { - return ""; + Void parse(String... args) throws Exception { + return null; } } - private static class AddAction implements DatastoreAction { + /** + * This class adds a comment for a user. If the user does not exist its entity is created. + */ + private static class AddCommentAction extends DatastoreAction { @Override - public void run(Transaction tx, Key userKey, String... args) { + public void run(Transaction tx, Key userKey, String content) { Entity user = tx.get(userKey); if (user == null) { System.out.println("Adding a new user."); - user = Entity.builder(userKey) - .set("count", 1L) - .build(); + user = Entity.builder(userKey).set("count", 1).build(); tx.add(user); } else { user = Entity.builder(user).set("count", user.getLong("count") + 1L).build(); tx.update(user); } + IncompleteKey commentKey = IncompleteKey.builder(userKey, COMMENT_KIND).build(); + FullEntity comment = FullEntity.builder(commentKey) + .set("content", content) + .set("timestamp", DateTime.now()) + .build(); + tx.addWithDeferredIdAllocation(comment); + System.out.printf("Adding a comment to user '%s'.%n", userKey.name()); + } + + @Override + String parse(String... args) throws Exception { String content = "No comment."; if (args.length > 0) { StringBuilder stBuilder = new StringBuilder(); @@ -159,28 +199,98 @@ public void run(Transaction tx, Key userKey, String... args) { stBuilder.setLength(stBuilder.length() - 1); content = stBuilder.toString(); } - IncompleteKey commentKey = IncompleteKey.builder(userKey, COMMENT_KIND).build(); - FullEntity comment = FullEntity.builder(commentKey) - .set("content", content) - .set("timestamp", DateTime.now()) + return content; + } + + @Override + protected String params() { + return ""; + } + } + + /** + * This class sets contact information (email and phone) for a user. If the user does not exist + * its entity is created. Contact information is saved as an entity embedded in the user entity. + */ + private static class SetContactAction extends DatastoreAction { + + static final class Contact { + + private final String email; + private final String phone; + + Contact(String email, String phone) { + this.email = email; + this.phone = phone; + } + + String email() { + return email; + } + + String phone() { + return phone; + } + } + + @Override + public void run(Transaction tx, Key userKey, Contact contact) { + Entity user = tx.get(userKey); + if (user == null) { + System.out.println("Adding a new user."); + user = Entity.builder(userKey).set("count", 0L).build(); + tx.add(user); + } + FullEntity contactEntity = FullEntity.builder() + .set("email", contact.email()) + .set("phone", contact.phone()) .build(); - tx.addWithDeferredIdAllocation(comment); - System.out.println("Adding a comment to user '" + userKey.name() + "'."); + tx.update(Entity.builder(user).set("contact", contactEntity).build()); + System.out.printf("Setting contact for user '%s'.%n", userKey.name()); + } + + @Override + Contact parse(String... args) throws Exception { + String message; + if (args.length == 2) { + return new Contact(args[0], args[1]); + } else if (args.length > 2) { + message = "Too many arguments."; + } else { + message = "Missing required email and phone."; + } + throw new IllegalArgumentException(message); } @Override - public String getRequiredParams() { - return "comment"; + protected String params() { + return " "; } } static { ACTIONS.put("delete", new DeleteAction()); - ACTIONS.put("add", new AddAction()); + ACTIONS.put("add", new AddCommentAction()); + ACTIONS.put("set", new SetContactAction()); ACTIONS.put("display", new DisplayAction()); } - public static void main(String... args) { + private static void printUsage() { + StringBuilder actionAndParams = new StringBuilder(); + for (Map.Entry entry : ACTIONS.entrySet()) { + actionAndParams.append("\n\t").append(entry.getKey()); + + String param = entry.getValue().params(); + if (param != null && !param.isEmpty()) { + actionAndParams.append(' ').append(param); + } + } + System.out.printf("Usage: %s operation *%s%n", + DatastoreExample.class.getSimpleName(), actionAndParams); + } + + @SuppressWarnings("unchecked") + public static void main(String... args) throws Exception { String projectId = args.length > 0 ? args[0] : null; // If you want to access a local Datastore running via the Google Cloud SDK, do // DatastoreOptions options = DatastoreOptions.builder() @@ -197,24 +307,26 @@ public static void main(String... args) { String actionName = args.length > 2 ? args[2].toLowerCase() : DEFAULT_ACTION; DatastoreAction action = ACTIONS.get(actionName); if (action == null) { - StringBuilder actionAndParams = new StringBuilder(); - for (Map.Entry entry : ACTIONS.entrySet()) { - actionAndParams.append(entry.getKey()); - String param = entry.getValue().getRequiredParams(); - if (param != null && !param.isEmpty()) { - actionAndParams.append(' ').append(param); - } - actionAndParams.append('|'); - } - actionAndParams.setLength(actionAndParams.length() - 1); - System.out.printf("Usage: %s [projectId] [user] [%s]%n", - DatastoreExample.class.getSimpleName(), actionAndParams); + System.out.println("Unrecognized action."); + printUsage(); return; } args = args.length > 3 ? Arrays.copyOfRange(args, 3, args.length) : new String []{}; Transaction tx = datastore.newTransaction(); + Object request; + try { + request = action.parse(args); + } catch (IllegalArgumentException ex) { + System.out.printf("Invalid input for action '%s'. %s%n", actionName, ex.getMessage()); + System.out.printf("Expected: %s%n", action.params()); + return; + } catch (Exception ex) { + System.out.println("Failed to parse request."); + ex.printStackTrace(); + return; + } try { - action.run(tx, key, args); + action.run(tx, key, request); tx.commit(); } finally { if (tx.active()) { diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java index 88b4b984e4c5..8b3c91cbd664 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/dns/DnsExample.java @@ -501,13 +501,13 @@ public static void main(String... args) throws Exception { try { valid = action.check(args); } catch (NumberFormatException ex) { - System.out.println("Invalid input for action '" + actionName + "'."); + System.out.printf("Invalid input for action '%s'.%n", actionName); System.out.println("Ttl must be an integer."); - System.out.println("Expected: " + action.params()); + System.out.printf("Expected: %s%n", action.params()); return; } catch (Exception ex) { System.out.println("Failed to parse request."); - System.out.println("Expected: " + action.params()); + System.out.printf("Expected: %s%n", action.params()); ex.printStackTrace(); return; } @@ -519,8 +519,8 @@ public static void main(String... args) throws Exception { Dns dns = optionsBuilder.build().service(); action.run(dns, args); } else { - System.out.println("Invalid input for action '" + actionName + "'"); - System.out.println("Expected: " + action.params()); + System.out.printf("Invalid input for action '%s'%n", actionName); + System.out.printf("Expected: %s%n", action.params()); } } } diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java index 1d688c414575..fd2eb3ed6d91 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/resourcemanager/ResourceManagerExample.java @@ -90,9 +90,9 @@ public void run(ResourceManager resourceManager, String... args) { Scanner scanner = new Scanner(System.in); if (scanner.nextLine().toLowerCase().equals("y")) { resourceManager.delete(projectId); - System.out.println("Successfully deleted project " + projectId + "."); + System.out.printf("Successfully deleted project %s.%n", projectId); } else { - System.out.println("Will not delete project " + projectId + "."); + System.out.printf("Will not delete project %s.%n", projectId); } scanner.close(); } diff --git a/gcloud-java-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java b/gcloud-java-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java index 01b864e7c8b8..1a6aafa60e9d 100644 --- a/gcloud-java-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java +++ b/gcloud-java-examples/src/main/java/com/google/cloud/examples/storage/StorageExample.java @@ -90,7 +90,7 @@ public class StorageExample { private abstract static class StorageAction { - abstract void run(Storage storage, T request) throws Exception; + abstract void run(Storage storage, T arg) throws Exception; abstract T parse(String... args) throws Exception; @@ -137,7 +137,7 @@ public void run(Storage storage, BlobId... blobIds) { System.out.println("No such bucket"); return; } - System.out.println("Bucket info: " + bucket); + System.out.printf("Bucket info: %s%n", bucket); } else { // get Blob Blob blob = storage.get(blobIds[0]); @@ -145,7 +145,7 @@ public void run(Storage storage, BlobId... blobIds) { System.out.println("No such object"); return; } - System.out.println("Blob info: " + blob); + System.out.printf("Blob info: %s%n", blob); } } else { // use batch to get multiple blobs. @@ -188,7 +188,7 @@ public void run(Storage storage, BlobId... blobIds) { for (Boolean deleted : deleteResults) { if (deleted) { // request order is maintained - System.out.println("Blob " + blobIds[index] + " was deleted"); + System.out.printf("Blob %s was deleted%n", blobIds[index]); } index++; } @@ -373,7 +373,7 @@ private static class CopyAction extends StorageAction { @Override public void run(Storage storage, CopyRequest request) { CopyWriter copyWriter = storage.copy(request); - System.out.println("Copied " + copyWriter.result()); + System.out.printf("Copied %s%n", copyWriter.result()); } @Override @@ -399,7 +399,7 @@ private static class ComposeAction extends StorageAction { @Override public void run(Storage storage, ComposeRequest request) { BlobInfo composedBlobInfo = storage.compose(request); - System.out.println("Composed " + composedBlobInfo); + System.out.printf("Composed %s%n", composedBlobInfo); } @Override @@ -442,7 +442,7 @@ private void run(Storage storage, BlobId blobId, Map metadata) { return; } Blob updateBlob = blob.toBuilder().metadata(metadata).build().update(); - System.out.println("Updated " + updateBlob); + System.out.printf("Updated %s%n", updateBlob); } @Override @@ -488,8 +488,8 @@ public void run(Storage storage, Tuple private void run(Storage storage, ServiceAccountAuthCredentials cred, BlobInfo blobInfo) { Blob blob = storage.get(blobInfo.blobId()); - System.out.println("Signed URL: " - + blob.signUrl(1, TimeUnit.DAYS, SignUrlOption.signWith(cred))); + System.out.printf("Signed URL: %s%n", + blob.signUrl(1, TimeUnit.DAYS, SignUrlOption.signWith(cred))); } @Override @@ -564,18 +564,18 @@ public static void main(String... args) throws Exception { return; } Storage storage = optionsBuilder.build().service(); - Object request; + Object arg; try { - request = action.parse(args); + arg = action.parse(args); } catch (IllegalArgumentException ex) { - System.out.println("Invalid input for action '" + actionName + "'"); - System.out.println("Expected: " + action.params()); + System.out.printf("Invalid input for action '%s'. %s%n", actionName, ex.getMessage()); + System.out.printf("Expected: %s%n", action.params()); return; } catch (Exception ex) { - System.out.println("Failed to parse request."); + System.out.println("Failed to parse arguments."); ex.printStackTrace(); return; } - action.run(storage, request); + action.run(storage, arg); } }