From 85c3e054c9e71c1baa440e4261e957ce2a0540c0 Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Fri, 19 Feb 2016 16:58:04 -0800 Subject: [PATCH 1/2] Set source/target to jdk 1.7 and use latest gcloud-java release features --- datastore/pom.xml | 6 +++--- .../google/datastore/snippets/Concepts.java | 20 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/datastore/pom.xml b/datastore/pom.xml index 68806fa3731..7f51d55b23b 100644 --- a/datastore/pom.xml +++ b/datastore/pom.xml @@ -15,7 +15,7 @@ com.google.gcloud gcloud-java-datastore - 0.1.3 + 0.1.4 junit @@ -31,8 +31,8 @@ maven-compiler-plugin 2.5.1 - 1.8 - 1.8 + 1.7 + 1.7 diff --git a/datastore/src/main/java/com/google/datastore/snippets/Concepts.java b/datastore/src/main/java/com/google/datastore/snippets/Concepts.java index 1f6295524c5..cf07e725d33 100644 --- a/datastore/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/datastore/src/main/java/com/google/datastore/snippets/Concepts.java @@ -104,7 +104,7 @@ public class Concepts { @BeforeClass public static void beforeClass() throws IOException, InterruptedException { if (!LocalGcdHelper.isActive(PROJECT_ID, PORT)) { - gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT); + gcdHelper = LocalGcdHelper.start(PROJECT_ID, PORT, 1.0); } } @@ -232,8 +232,8 @@ public void testProperties() { public void testArrayValue() { // [START array_value] Entity task = Entity.builder(taskKey) - .set("tags", StringValue.of("fun"), StringValue.of("programming")) - .set("collaborators", StringValue.of("alice"), StringValue.of("bob")) + .set("tags", "fun", "programming") + .set("collaborators", "alice", "bob") .build(); // [END array_value] assertValidEntity(task); @@ -374,7 +374,7 @@ private void setUpQueryTests() { .set("created", includedDate) .set("percent_complete", 10.0) .set("description", StringValue.builder("Learn Cloud Datastore").indexed(false).build()) - .set("tag", StringValue.of("fun"), StringValue.of("l"), StringValue.of("programming")) + .set("tag", "fun", "l", "programming") .build()); } @@ -748,9 +748,8 @@ public void testUnindexedPropertyQuery() { public void testExplodingProperties() { // [START exploding_properties] Entity task = Entity.builder(taskKey) - .set("tags", StringValue.of("fun"), StringValue.of("programming"), StringValue.of("learn")) - .set("collaborators", StringValue.of("alice"), StringValue.of("bob"), - StringValue.of("charlie")) + .set("tags", "fun", "programming", "learn") + .set("collaborators", "alice", "bob", "charlie") .set("created", DateTime.now()) .build(); // [END exploding_properties] @@ -916,7 +915,7 @@ public void testPropertyRunQuery() { Map> propertiesByKind = new HashMap<>(); while (results.hasNext()) { Key property = results.next(); - String kind = property.ancestors().get(property.ancestors().size() - 1).name(); + String kind = property.parent().name(); String propertyName = property.name(); Collection properties = propertiesByKind.get(kind); if (properties == null) { @@ -945,8 +944,7 @@ public void testPropertyByKindRunQuery() { while (results.hasNext()) { Entity property = results.next(); String propertyName = property.key().name(); - List representations = - (List) property.getList("property_representation"); + List representations = property.getList("property_representation"); Collection currentRepresentations = representationsByProperty.get(propertyName); if (currentRepresentations == null) { currentRepresentations = new HashSet<>(); @@ -985,7 +983,7 @@ public void testPropertyFilteringRunQuery() { QueryResults results = datastore.run(query); while (results.hasNext()) { Key property = results.next(); - String kind = property.ancestors().get(property.ancestors().size() - 1).name(); + String kind = property.parent().name(); String propertyName = property.name(); Collection properties = propertiesByKind.get(kind); if (properties == null) { From 7b59256626396cb32d912cb986ea11c20a0cc33c Mon Sep 17 00:00:00 2001 From: Ajay Kannan Date: Mon, 22 Feb 2016 08:08:55 -0800 Subject: [PATCH 2/2] Variable renames --- .../google/datastore/snippets/Concepts.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/datastore/src/main/java/com/google/datastore/snippets/Concepts.java b/datastore/src/main/java/com/google/datastore/snippets/Concepts.java index cf07e725d33..30954447e8b 100644 --- a/datastore/src/main/java/com/google/datastore/snippets/Concepts.java +++ b/datastore/src/main/java/com/google/datastore/snippets/Concepts.java @@ -911,12 +911,12 @@ public void testPropertyRunQuery() { setUpQueryTests(); // [START property_run_query] Query query = Query.keyQueryBuilder().kind("__property__").build(); - QueryResults results = datastore.run(query); + QueryResults keys = datastore.run(query); Map> propertiesByKind = new HashMap<>(); - while (results.hasNext()) { - Key property = results.next(); - String kind = property.parent().name(); - String propertyName = property.name(); + while (keys.hasNext()) { + Key key = keys.next(); + String kind = key.parent().name(); + String propertyName = key.name(); Collection properties = propertiesByKind.get(kind); if (properties == null) { properties = new HashSet<>(); @@ -942,9 +942,9 @@ public void testPropertyByKindRunQuery() { QueryResults results = datastore.run(query); Map> representationsByProperty = new HashMap<>(); while (results.hasNext()) { - Entity property = results.next(); - String propertyName = property.key().name(); - List representations = property.getList("property_representation"); + Entity result = results.next(); + String propertyName = result.key().name(); + List representations = result.getList("property_representation"); Collection currentRepresentations = representationsByProperty.get(propertyName); if (currentRepresentations == null) { currentRepresentations = new HashSet<>(); @@ -971,20 +971,20 @@ public void testPropertyByKindRunQuery() { public void testPropertyFilteringRunQuery() { setUpQueryTests(); // [START property_filtering_run_query] - Key key = datastore.newKeyFactory() + Key startKey = datastore.newKeyFactory() .kind("__property__") .ancestors(PathElement.of("__kind__", "Task")) .newKey("priority"); Query query = Query.keyQueryBuilder() .kind("__property__") - .filter(PropertyFilter.ge("__key__", key)) + .filter(PropertyFilter.ge("__key__", startKey)) .build(); Map> propertiesByKind = new HashMap<>(); - QueryResults results = datastore.run(query); - while (results.hasNext()) { - Key property = results.next(); - String kind = property.parent().name(); - String propertyName = property.name(); + QueryResults keys = datastore.run(query); + while (keys.hasNext()) { + Key key = keys.next(); + String kind = key.parent().name(); + String propertyName = key.name(); Collection properties = propertiesByKind.get(kind); if (properties == null) { properties = new HashSet();