From 61b616c043af995441589a23e28facf6d8cef235 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Fri, 24 Mar 2017 12:10:04 +1100
Subject: [PATCH] Issue #1423

---
 jetty-gcloud/pom.xml                                 |  2 +-
 .../gcloud/session/GCloudSessionTestSupport.java     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml
index 999f3658442..d0f7b42d0a8 100644
--- a/jetty-gcloud/pom.xml
+++ b/jetty-gcloud/pom.xml
@@ -13,7 +13,7 @@
   <name>Jetty :: GCloud</name>
 
   <properties>
-    <gcloud.version>0.9.4-beta</gcloud.version>
+    <gcloud.version>0.10.0-beta</gcloud.version>
   </properties>
 
   <modules>
diff --git a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java
index 1878b6c1a5e..306826e6ddc 100644
--- a/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java
+++ b/tests/test-sessions/test-gcloud-sessions/src/test/java/org/eclipse/jetty/gcloud/session/GCloudSessionTestSupport.java
@@ -80,8 +80,8 @@ public class GCloudSessionTestSupport
 
     public GCloudSessionTestSupport ()
     {
-        DatastoreOptions options = _helper.options();
-        _ds = options.service();
+        DatastoreOptions options = _helper.getOptions();
+        _ds = options.getService();
     }
 
 
@@ -115,7 +115,7 @@ public class GCloudSessionTestSupport
     public Set<String> getSessionIds () throws Exception
     {
         HashSet<String> ids = new HashSet<String>();
-        GqlQuery.Builder builder = Query.gqlQueryBuilder(ResultType.ENTITY, "select * from "+GCloudSessionDataStore.EntityDataModel.KIND);
+        GqlQuery.Builder builder = Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from "+GCloudSessionDataStore.EntityDataModel.KIND);
        
         Query<Entity> query = builder.build();
     
@@ -133,7 +133,7 @@ public class GCloudSessionTestSupport
     public void listSessions () throws Exception
     {
 
-        GqlQuery.Builder builder = Query.gqlQueryBuilder(ResultType.ENTITY, "select * from "+GCloudSessionDataStore.EntityDataModel.KIND);
+        GqlQuery.Builder builder = Query.newGqlQueryBuilder(ResultType.ENTITY, "select * from "+GCloudSessionDataStore.EntityDataModel.KIND);
        
         Query<Entity> query = builder.build();
     
@@ -151,7 +151,7 @@ public class GCloudSessionTestSupport
     
     public void assertSessions(int count) throws Exception
     {        
-        Query<Key> query = Query.keyQueryBuilder().kind(GCloudSessionDataStore.EntityDataModel.KIND).build();
+        Query<Key> query = Query.newKeyQueryBuilder().setKind(GCloudSessionDataStore.EntityDataModel.KIND).build();
         QueryResults<Key> results = _ds.run(query);
         assertNotNull(results);
         int actual = 0;
@@ -165,7 +165,7 @@ public class GCloudSessionTestSupport
 
     public void deleteSessions () throws Exception
     {
-        Query<Key> query = Query.keyQueryBuilder().kind(GCloudSessionDataStore.EntityDataModel.KIND).build();
+        Query<Key> query = Query.newKeyQueryBuilder().setKind(GCloudSessionDataStore.EntityDataModel.KIND).build();
         QueryResults<Key> results = _ds.run(query);
 
         if (results != null)