From 0acc57d582d63079c4df2ffe6ef5231835b290b5 Mon Sep 17 00:00:00 2001
From: Jerjou <jerjou@users.noreply.github.com>
Date: Tue, 29 Nov 2016 20:43:49 -0800
Subject: [PATCH] deprecated methods -> undeprecated versions. (#428)

---
 .../java/com/example/guestbook/Greeting.java  |   6 +-
 .../java/com/example/guestbook/Guestbook.java |  10 +-
 .../com/example/guestbook/Persistence.java    |   5 +-
 .../java/com/example/guestbook/TestUtils.java |   5 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml |   2 +-
 appengine/helloworld-new-plugins/README.md    |   4 +-
 .../appengine/images/ImagesServlet.java       |   4 +-
 appengine/logs/README.md                      |   4 +-
 .../example/appengine/logs/LogsServlet.java   |  12 +-
 .../src/main/webapp/WEB-INF/appengine-web.xml |   2 +-
 .../oauth2/src/main/webapp/WEB-INF/web.xml    |   2 +-
 .../requests/LoggingServletTest.java          |   6 +-
 .../requests/RequestsServletTest.java         |   2 +-
 .../example/bigquery/QuickstartSample.java    |   6 +-
 .../java/com/example/bigquery/SimpleApp.java  |  20 +-
 .../com/example/bigquery/SyncQuerySample.java |  14 +-
 .../example/bigquery/QuickstartSampleIT.java  |   2 +-
 .../src/main/java/ComputeEngineSample.java    |   2 +-
 compute/error-reporting/README.md             |   2 +-
 .../example/datastore/QuickstartSample.java   |   6 +-
 .../example/datastore/QuickstartSampleIT.java |   4 +-
 .../google/datastore/snippets/TaskList.java   |  18 +-
 .../datastore/snippets/ConceptsTest.java      | 319 +++++++++---------
 flexible/async-rest/README.md                 |  14 +-
 .../example/cloudstorage/UploadServlet.java   |   6 +-
 .../example/datastore/DatastoreServlet.java   |  12 +-
 flexible/helloworld/README.md                 |   2 +-
 .../com/google/appengine/sparkdemo/Main.java  |   4 +-
 .../appengine/sparkdemo/UserService.java      |   8 +-
 .../appengine/sparkdemo/UserServiceTest.java  |  10 +-
 monitoring/v3/README.md                       |  14 +-
 .../com/example/pubsub/QuickstartSample.java  |   4 +-
 .../example/pubsub/QuickstartSampleIT.java    |   2 +-
 .../com/example/storage/QuickstartSample.java |   4 +-
 .../example/storage/QuickstartSampleIT.java   |   2 +-
 storage/storage-transfer/README.md            |   6 +-
 .../src/main/webapp/WEB-INF/web.xml           |   2 +-
 translate/README.md                           |   8 +-
 .../example/translate/QuickstartSample.java   |   2 +-
 .../translate/samples/TranslateText.java      |   2 +-
 .../translate/samples/TranslateTextTest.java  |   4 +-
 41 files changed, 284 insertions(+), 279 deletions(-)

diff --git a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
index 12eb3d6c6de..a32777318c3 100644
--- a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
+++ b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
@@ -54,7 +54,7 @@ public Greeting(String book, String content, String id, String email) {
   }
 
   public Greeting(Entity entity) {
-    key = entity.hasKey() ? entity.key() : null;
+    key = entity.hasKey() ? entity.getKey() : null;
     authorEmail = entity.contains("authorEmail") ? entity.getString("authorEmail") : null;
     authorId = entity.contains("authorId") ? entity.getString("authorId") : null;
     date = entity.contains("date") ? entity.getDateTime("date").toDate() : null;
@@ -66,7 +66,7 @@ public void save() {
       key = getDatastore().allocateId(makeIncompleteKey()); // Give this greeting a unique ID
     }
 
-    Builder<Key> builder = FullEntity.builder(key);
+    Builder<Key> builder = FullEntity.newBuilder(key);
 
     if (authorEmail != null) {
       builder.set("authorEmail", authorEmail);
@@ -84,7 +84,7 @@ public void save() {
 
   private IncompleteKey makeIncompleteKey() {
     // The book is our ancestor key.
-    return Key.builder(book.getKey(), "Greeting").build();
+    return Key.newBuilder(book.getKey(), "Greeting").build();
   }
 
   @Override
diff --git a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
index ae407175ecb..218a7e292b8 100644
--- a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
+++ b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
@@ -52,11 +52,11 @@ public Key getKey() {
   public List<Greeting> getGreetings() {
     // This query requires the index defined in index.yaml to work because of the orderBy on date.
     EntityQuery query =
-        Query.entityQueryBuilder()
-            .kind("Greeting")
-            .filter(hasAncestor(key))
-            .orderBy(desc("date"))
-            .limit(5)
+        Query.newEntityQueryBuilder()
+            .setKind("Greeting")
+            .setFilter(hasAncestor(key))
+            .setOrderBy(desc("date"))
+            .setLimit(5)
             .build();
 
     QueryResults<Entity> results = getDatastore().run(query);
diff --git a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
index 3dbc2285743..bb6b53a16fe 100644
--- a/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
+++ b/appengine/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
@@ -25,7 +25,8 @@ public class Persistence {
 
   public static Datastore getDatastore() {
     if (datastore.get() == null) {
-      datastore.set(DatastoreOptions.builder().projectId("your-project-id-here").build().service());
+      datastore.set(DatastoreOptions.newBuilder().setProjectId("your-project-id-here")
+          .build().getService());
     }
 
     return datastore.get();
@@ -36,7 +37,7 @@ public static void setDatastore(Datastore datastore) {
   }
 
   public static KeyFactory getKeyFactory(Class<?> c) {
-    return getDatastore().newKeyFactory().kind(c.getSimpleName());
+    return getDatastore().newKeyFactory().setKind(c.getSimpleName());
   }
 }
 //[END all]
diff --git a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
index 7a9716e467b..3780f0266f2 100644
--- a/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
+++ b/appengine/guestbook-cloud-datastore/src/test/java/com/example/guestbook/TestUtils.java
@@ -18,7 +18,7 @@ public class TestUtils {
   public static void startDatastore() {
     try {
       datastore.start();
-      Persistence.setDatastore(datastore.options().service());
+      Persistence.setDatastore(datastore.getOptions().getService());
     } catch (IOException | InterruptedException e) {
       throw new RuntimeException(e);
     }
@@ -35,7 +35,8 @@ public static void stopDatastore() {
 
   public static void wipeDatastore() {
     Datastore datastore = getDatastore();
-    QueryResults<Key> guestbooks = datastore.run(Query.keyQueryBuilder().kind("Greeting").build());
+    QueryResults<Key> guestbooks = datastore.run(Query.newKeyQueryBuilder().setKind("Greeting")
+        .build());
     ArrayList<Key> keys = Lists.newArrayList(guestbooks);
 
     if (!keys.isEmpty()) {
diff --git a/appengine/guestbook-objectify/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/guestbook-objectify/src/main/webapp/WEB-INF/appengine-web.xml
index 8bf645d1013..4d46047edb6 100644
--- a/appengine/guestbook-objectify/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/guestbook-objectify/src/main/webapp/WEB-INF/appengine-web.xml
@@ -3,7 +3,7 @@
     <application>your-app-id</application>
     <version>${appengine.app.version}</version>
     <threadsafe>true</threadsafe>
-    
+
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>
diff --git a/appengine/helloworld-new-plugins/README.md b/appengine/helloworld-new-plugins/README.md
index fe76dd711f2..c3624160fb0 100644
--- a/appengine/helloworld-new-plugins/README.md
+++ b/appengine/helloworld-new-plugins/README.md
@@ -18,7 +18,7 @@ Use either:
 ### Running locally
 
     $ mvn appengine:run
-  
+
 ### Deploying
 
     $ mvn appengine:deploy
@@ -36,7 +36,7 @@ If you do not have gradle installed, you can run using `./gradlew appengineRun`.
 
 If you do not have gradle installed, you can deploy using `./gradlew appengineDeploy`.
 
-<!-- 
+<!--
 ## Intelij Idea
 Limitations - Appengine Standard support in the Intellij plugin is only available for the Ultimate Edition of Idea.
 
diff --git a/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java b/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
index b7c9d853447..211f7664b65 100644
--- a/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
+++ b/appengine/images/src/main/java/com/example/appengine/images/ImagesServlet.java
@@ -61,7 +61,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     FileChannel fileChannel = fileInputStream.getChannel();
     ByteBuffer byteBuffer = ByteBuffer.allocate((int)fileChannel.size());
     fileChannel.read(byteBuffer);
-    
+
     byte[] imageBytes = byteBuffer.array();
 
     // Write the original image to Cloud Storage
@@ -103,7 +103,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
     //[END rotate]
 
     // Output some simple HTML to display the images we wrote to Cloud Storage
-    // in the browser. 
+    // in the browser.
     PrintWriter out = resp.getWriter();
     out.println("<html><body>\n");
     out.println("<img src='//storage.cloud.google.com/" + bucket
diff --git a/appengine/logs/README.md b/appengine/logs/README.md
index 0d07745e5e8..99ceed34420 100644
--- a/appengine/logs/README.md
+++ b/appengine/logs/README.md
@@ -6,12 +6,12 @@ Engine][ae-docs].
 [log-docs]: https://cloud.google.com/appengine/docs/java/logs/
 [ae-docs]: https://cloud.google.com/appengine/docs/java/
 
-## Running locally 
+## Running locally
 
 The Logs API only generates output for deployed apps, so this program should not be run locally.
 
 ## Deploying
- 
+
 This example uses the
 [Maven gcloud plugin](https://cloud.google.com/appengine/docs/java/managed-vms/maven).
 
diff --git a/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java b/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
index 6ab30b504bd..ad6e13ba10f 100644
--- a/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
+++ b/appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java
@@ -34,7 +34,7 @@
 // a time, using a Next link to cycle through to the next 5.
 public class LogsServlet extends HttpServlet {
   @Override
-  public void doGet(HttpServletRequest req, HttpServletResponse resp) 
+  public void doGet(HttpServletRequest req, HttpServletResponse resp)
          throws IOException {
 
     resp.setContentType("text/html");
@@ -42,7 +42,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
     writer.println("<!DOCTYPE html>");
     writer.println("<meta charset=\"utf-8\">");
     writer.println("<title>App Engine Logs Sample</title>");
-  
+
     // We use this to break out of our iteration loop, limiting record
     // display to 5 request logs at a time.
     int limit = 5;
@@ -81,17 +81,17 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
         writer.println(String.format("<br>Date: %s", appTime.toString()));
         writer.println("<br>Level: " + appLog.getLogLevel() + "<br>");
         writer.println("Message: " + appLog.getLogMessage() + "<br> <br>");
-      } 
+      }
 
       if (++count >= limit) {
         break;
       }
-    } 
+    }
 
     // When the user clicks this link, the offset is processed in the
     // GET handler and used to cycle through to the next 5 request logs.
     writer.println(String.format("<br><a href=\"/?offset=%s\">Next</a>", lastOffset));
-  }  
-} 
+  }
+}
 // [END logs_API_example]
 
diff --git a/appengine/multitenancy/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/multitenancy/src/main/webapp/WEB-INF/appengine-web.xml
index 8bf645d1013..4d46047edb6 100644
--- a/appengine/multitenancy/src/main/webapp/WEB-INF/appengine-web.xml
+++ b/appengine/multitenancy/src/main/webapp/WEB-INF/appengine-web.xml
@@ -3,7 +3,7 @@
     <application>your-app-id</application>
     <version>${appengine.app.version}</version>
     <threadsafe>true</threadsafe>
-    
+
     <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
     </system-properties>
diff --git a/appengine/oauth2/src/main/webapp/WEB-INF/web.xml b/appengine/oauth2/src/main/webapp/WEB-INF/web.xml
index 1884992f5f7..183e631c600 100644
--- a/appengine/oauth2/src/main/webapp/WEB-INF/web.xml
+++ b/appengine/oauth2/src/main/webapp/WEB-INF/web.xml
@@ -20,7 +20,7 @@
     <servlet-name>hello</servlet-name>
     <url-pattern>/hello</url-pattern>
   </servlet-mapping>
-  
+
   <welcome-file-list>
     <welcome-file>index.html</welcome-file>
   </welcome-file-list>
diff --git a/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java b/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
index dab88cfec7e..d2f0055116c 100644
--- a/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
+++ b/appengine/requests/src/test/java/com/example/appengine/requests/LoggingServletTest.java
@@ -63,9 +63,9 @@ public void setUp() throws Exception {
     servletUnderTest = new LoggingServlet();
   }
 
-  @After 
+  @After
   public void tearDown() {
-    //  Restore stderr  
+    //  Restore stderr
     System.setErr(LoggingServletTest.REAL_ERR);
   }
 
@@ -74,7 +74,7 @@ public void testListLogs() throws Exception {
     servletUnderTest.doGet(mockRequest, mockResponse);
 
     String out = stderr.toString();
-    
+
     // We expect three log messages to be created
     // with the following messages.
     assertThat(out).contains("An informational message.");
diff --git a/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java b/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
index 4e27eebbb3b..d2dbec7e016 100644
--- a/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
+++ b/appengine/requests/src/test/java/com/example/appengine/requests/RequestsServletTest.java
@@ -52,7 +52,7 @@ public void setUp() throws Exception {
 
     servletUnderTest = new RequestsServlet();
   }
- 
+
   @Test
   public void doGet_writesResponse() throws Exception {
     servletUnderTest.doGet(mockRequest, mockResponse);
diff --git a/bigquery/cloud-client/src/main/java/com/example/bigquery/QuickstartSample.java b/bigquery/cloud-client/src/main/java/com/example/bigquery/QuickstartSample.java
index aa727880cf9..e1b40c4e7cd 100644
--- a/bigquery/cloud-client/src/main/java/com/example/bigquery/QuickstartSample.java
+++ b/bigquery/cloud-client/src/main/java/com/example/bigquery/QuickstartSample.java
@@ -26,19 +26,19 @@
 public class QuickstartSample {
   public static void main(String... args) throws Exception {
     // Instantiates a client
-    BigQuery bigquery = BigQueryOptions.defaultInstance().service();
+    BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
 
     // The name for the new dataset
     String datasetName = "my_new_dataset";
 
     // Prepares a new dataset
     Dataset dataset = null;
-    DatasetInfo datasetInfo = DatasetInfo.builder(datasetName).build();
+    DatasetInfo datasetInfo = DatasetInfo.newBuilder(datasetName).build();
 
     // Creates the dataset
     dataset = bigquery.create(datasetInfo);
 
-    System.out.printf("Dataset %s created.%n", dataset.datasetId().dataset());
+    System.out.printf("Dataset %s created.%n", dataset.getDatasetId().getDataset());
   }
 }
 // [END bigquery_quickstart]
diff --git a/bigquery/cloud-client/src/main/java/com/example/bigquery/SimpleApp.java b/bigquery/cloud-client/src/main/java/com/example/bigquery/SimpleApp.java
index 4aa355d7baf..d8cfe398ba6 100644
--- a/bigquery/cloud-client/src/main/java/com/example/bigquery/SimpleApp.java
+++ b/bigquery/cloud-client/src/main/java/com/example/bigquery/SimpleApp.java
@@ -32,46 +32,46 @@
 public class SimpleApp {
   public static void main(String... args) throws Exception {
     // [START create_client]
-    BigQuery bigquery = BigQueryOptions.defaultInstance().service();
+    BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
     // [END create_client]
     // [START run_query]
     QueryRequest queryRequest =
         QueryRequest
-            .builder(
+            .newBuilder(
                 "SELECT "
                     + "APPROX_TOP_COUNT(corpus, 10) as title, "
                     + "COUNT(*) as unique_words "
                     + "FROM `publicdata.samples.shakespeare`;")
             // Use standard SQL syntax for queries.
             // See: https://cloud.google.com/bigquery/sql-reference/
-            .useLegacySql(false)
+            .setUseLegacySql(false)
             .build();
     QueryResponse response = bigquery.query(queryRequest);
     // [END run_query]
 
     // [START print_results]
-    QueryResult result = response.result();
+    QueryResult result = response.getResult();
 
     while (result != null) {
       Iterator<List<FieldValue>> iter = result.iterateAll();
 
       while (iter.hasNext()) {
         List<FieldValue> row = iter.next();
-        List<FieldValue> titles = row.get(0).repeatedValue();
+        List<FieldValue> titles = row.get(0).getRepeatedValue();
         System.out.println("titles:");
 
         for (FieldValue titleValue : titles) {
-          List<FieldValue> titleRecord = titleValue.recordValue();
-          String title = titleRecord.get(0).stringValue();
-          long uniqueWords = titleRecord.get(1).longValue();
+          List<FieldValue> titleRecord = titleValue.getRecordValue();
+          String title = titleRecord.get(0).getStringValue();
+          long uniqueWords = titleRecord.get(1).getLongValue();
           System.out.printf("\t%s: %d\n", title, uniqueWords);
         }
 
-        long uniqueWords = row.get(1).longValue();
+        long uniqueWords = row.get(1).getLongValue();
         System.out.printf("total unique words: %d\n", uniqueWords);
       }
 
-      result = result.nextPage();
+      result = result.getNextPage();
     }
     // [END print_results]
   }
diff --git a/bigquery/cloud-client/src/main/java/com/example/bigquery/SyncQuerySample.java b/bigquery/cloud-client/src/main/java/com/example/bigquery/SyncQuerySample.java
index 4ff9bf54c62..9cde1155d80 100644
--- a/bigquery/cloud-client/src/main/java/com/example/bigquery/SyncQuerySample.java
+++ b/bigquery/cloud-client/src/main/java/com/example/bigquery/SyncQuerySample.java
@@ -84,27 +84,27 @@ public static void run(
       final long waitTime,
       final boolean useLegacySql) throws IOException {
     BigQuery bigquery =
-        new BigQueryOptions.DefaultBigqueryFactory().create(BigQueryOptions.defaultInstance());
+        new BigQueryOptions.DefaultBigqueryFactory().create(BigQueryOptions.getDefaultInstance());
 
     QueryRequest queryRequest =
-        QueryRequest.builder(queryString)
-            .maxWaitTime(waitTime)
+        QueryRequest.newBuilder(queryString)
+            .setMaxWaitTime(waitTime)
             // Use standard SQL syntax or legacy SQL syntax for queries.
             // See: https://cloud.google.com/bigquery/sql-reference/
-            .useLegacySql(useLegacySql)
+            .setUseLegacySql(useLegacySql)
             .build();
     QueryResponse response = bigquery.query(queryRequest);
 
     if (response.hasErrors()) {
       throw new RuntimeException(
           response
-              .executionErrors()
+              .getExecutionErrors()
               .stream()
-              .<String>map(err -> err.message())
+              .<String>map(err -> err.getMessage())
               .collect(Collectors.joining("\n")));
     }
 
-    QueryResult result = response.result();
+    QueryResult result = response.getResult();
     Iterator<List<FieldValue>> iter = result.iterateAll();
     while (iter.hasNext()) {
       List<FieldValue> row = iter.next();
diff --git a/bigquery/cloud-client/src/test/java/com/example/bigquery/QuickstartSampleIT.java b/bigquery/cloud-client/src/test/java/com/example/bigquery/QuickstartSampleIT.java
index 9632de23bc6..25f2902eed3 100644
--- a/bigquery/cloud-client/src/test/java/com/example/bigquery/QuickstartSampleIT.java
+++ b/bigquery/cloud-client/src/test/java/com/example/bigquery/QuickstartSampleIT.java
@@ -41,7 +41,7 @@ public class QuickstartSampleIT {
   private PrintStream out;
 
   private static final void deleteMyNewDataset() {
-    BigQuery bigquery = BigQueryOptions.defaultInstance().service();
+    BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
     String datasetName = "my_new_dataset";
     DatasetId datasetId = DatasetId.of(datasetName);
     DatasetDeleteOption deleteContents = DatasetDeleteOption.deleteContents();
diff --git a/compute/cmdline/src/main/java/ComputeEngineSample.java b/compute/cmdline/src/main/java/ComputeEngineSample.java
index 1a389e81392..836097a1c2e 100644
--- a/compute/cmdline/src/main/java/ComputeEngineSample.java
+++ b/compute/cmdline/src/main/java/ComputeEngineSample.java
@@ -152,7 +152,7 @@ public static boolean printInstances(Compute compute) throws IOException {
     return found;
   }
   // [END list_instances]
-  
+
   // [START create_instances]
   public static Operation startInstance(Compute compute, String instanceName) throws IOException {
     System.out.println("================== Starting New Instance ==================");
diff --git a/compute/error-reporting/README.md b/compute/error-reporting/README.md
index 56448476ac9..4e6aad5c7af 100644
--- a/compute/error-reporting/README.md
+++ b/compute/error-reporting/README.md
@@ -18,7 +18,7 @@ This sample demonstrates how to use [Stackdriver](https://cloud.google.com/error
 1. Restart the logging agent
 
     `sudo service google-fluentd restart`
-    
+
 1. Clone the repo
 
     `git clone https://github.com/GoogleCloudPlatform/java-docs-samples.git`
diff --git a/datastore/cloud-client/src/main/java/com/example/datastore/QuickstartSample.java b/datastore/cloud-client/src/main/java/com/example/datastore/QuickstartSample.java
index f163222afaf..a8e0614fe04 100644
--- a/datastore/cloud-client/src/main/java/com/example/datastore/QuickstartSample.java
+++ b/datastore/cloud-client/src/main/java/com/example/datastore/QuickstartSample.java
@@ -33,17 +33,17 @@ public static void main(String... args) throws Exception {
     // The name/ID for the new entity
     String name = "sampletask1";
     // The Cloud Datastore key for the new entity
-    Key taskKey = datastore.newKeyFactory().kind(kind).newKey(name);
+    Key taskKey = datastore.newKeyFactory().setKind(kind).newKey(name);
 
     // Prepares the new entity
-    Entity task = Entity.builder(taskKey)
+    Entity task = Entity.newBuilder(taskKey)
         .set("description", "Buy milk")
         .build();
 
     // Saves the entity
     datastore.put(task);
 
-    System.out.printf("Saved %s: %s%n", task.key().name(), task.getString("description"));
+    System.out.printf("Saved %s: %s%n", task.getKey().getName(), task.getString("description"));
   }
 }
 // [END datastore_quickstart]
diff --git a/datastore/cloud-client/src/test/java/com/example/datastore/QuickstartSampleIT.java b/datastore/cloud-client/src/test/java/com/example/datastore/QuickstartSampleIT.java
index cd7d8adc00d..8257a208228 100644
--- a/datastore/cloud-client/src/test/java/com/example/datastore/QuickstartSampleIT.java
+++ b/datastore/cloud-client/src/test/java/com/example/datastore/QuickstartSampleIT.java
@@ -40,10 +40,10 @@ public class QuickstartSampleIT {
   private PrintStream out;
 
   private static final void deleteTestEntity() {
-    Datastore datastore = DatastoreOptions.defaultInstance().service();
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
     String kind = "Task";
     String name = "sampletask1";
-    Key taskKey = datastore.newKeyFactory().kind(kind).newKey(name);
+    Key taskKey = datastore.newKeyFactory().setKind(kind).newKey(name);
     datastore.delete(taskKey);
   }
 
diff --git a/datastore/src/main/java/com/google/datastore/snippets/TaskList.java b/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
index 8ff5b53059a..495864f2364 100644
--- a/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
+++ b/datastore/src/main/java/com/google/datastore/snippets/TaskList.java
@@ -39,10 +39,10 @@ public class TaskList {
 
   // [START build_service]
   // Create an authorized Datastore service using Application Default Credentials.
-  private final Datastore datastore = DatastoreOptions.defaultInstance().service();
+  private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
 
   // Create a Key factory to construct keys associated with this project.
-  private final KeyFactory keyFactory = datastore.newKeyFactory().kind("Task");
+  private final KeyFactory keyFactory = datastore.newKeyFactory().setKind("Task");
   // [END build_service]
 
   // [START add_entity]
@@ -55,8 +55,8 @@ public class TaskList {
    */
   Key addTask(String description) {
     Key key = datastore.allocateId(keyFactory.newKey());
-    Entity task = Entity.builder(key)
-        .set("description", StringValue.builder(description).excludeFromIndexes(true).build())
+    Entity task = Entity.newBuilder(key)
+        .set("description", StringValue.newBuilder(description).setExcludeFromIndexes(true).build())
         .set("created", DateTime.now())
         .set("done", false)
         .build();
@@ -78,12 +78,12 @@ boolean markDone(long id) {
     try {
       Entity task = transaction.get(keyFactory.newKey(id));
       if (task != null) {
-        transaction.put(Entity.builder(task).set("done", true).build());
+        transaction.put(Entity.newBuilder(task).set("done", true).build());
       }
       transaction.commit();
       return task != null;
     } finally {
-      if (transaction.active()) {
+      if (transaction.isActive()) {
         transaction.rollback();
       }
     }
@@ -98,7 +98,7 @@ boolean markDone(long id) {
    */
   Iterator<Entity> listTasks() {
     Query<Entity> query =
-        Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.asc("created")).build();
+        Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.asc("created")).build();
     return datastore.run(query);
   }
   // [END retrieve_entities]
@@ -128,9 +128,9 @@ static List<String> formatTasks(Iterator<Entity> tasks) {
       Entity task = tasks.next();
       if (task.getBoolean("done")) {
         strings.add(
-            String.format("%d : %s (done)", task.key().id(), task.getString("description")));
+            String.format("%d : %s (done)", task.getKey().getId(), task.getString("description")));
       } else {
-        strings.add(String.format("%d : %s (created %s)", task.key().id(),
+        strings.add(String.format("%d : %s (created %s)", task.getKey().getId(),
             task.getString("description"), task.getDateTime("created")));
       }
     }
diff --git a/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java b/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
index b518ffb5324..e00b09011e6 100644
--- a/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
+++ b/datastore/src/test/java/com/google/datastore/snippets/ConceptsTest.java
@@ -80,7 +80,7 @@
 public class ConceptsTest {
 
   private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0);
-  private static final FullEntity<IncompleteKey> TEST_FULL_ENTITY = FullEntity.builder().build();
+  private static final FullEntity<IncompleteKey> TEST_FULL_ENTITY = FullEntity.newBuilder().build();
 
   private Datastore datastore;
   private KeyFactory keyFactory;
@@ -110,13 +110,13 @@ public static void beforeClass() throws IOException, InterruptedException {
    */
   @Before
   public void setUp() {
-    datastore = HELPER.options().toBuilder().namespace("ghijklmnop").build().service();
-    StructuredQuery<Key> query = Query.keyQueryBuilder().build();
+    datastore = HELPER.getOptions().toBuilder().setNamespace("ghijklmnop").build().getService();
+    StructuredQuery<Key> query = Query.newKeyQueryBuilder().build();
     QueryResults<Key> result = datastore.run(query);
     datastore.delete(Iterators.toArray(result, Key.class));
-    keyFactory = datastore.newKeyFactory().kind("Task");
+    keyFactory = datastore.newKeyFactory().setKind("Task");
     taskKey = keyFactory.newKey("some-arbitrary-key");
-    testEntity = Entity.builder(taskKey, TEST_FULL_ENTITY).build();
+    testEntity = Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build();
     Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
     calendar.set(1990, JANUARY, 1);
     startDate = DateTime.copyFrom(calendar);
@@ -138,13 +138,13 @@ public static void afterClass() throws IOException, InterruptedException {
   }
 
   private void assertValidKey(Key taskKey) {
-    datastore.put(Entity.builder(taskKey, TEST_FULL_ENTITY).build());
+    datastore.put(Entity.newBuilder(taskKey, TEST_FULL_ENTITY).build());
   }
 
   @Test
   public void testIncompleteKey() {
     // [START incomplete_key]
-    KeyFactory keyFactory = datastore.newKeyFactory().kind("Task");
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind("Task");
     Key taskKey = datastore.allocateId(keyFactory.newKey());
     // [END incomplete_key]
     assertValidKey(taskKey);
@@ -153,7 +153,7 @@ public void testIncompleteKey() {
   @Test
   public void testNamedKey() {
     // [START named_key]
-    Key taskKey = datastore.newKeyFactory().kind("Task").newKey("sampleTask");
+    Key taskKey = datastore.newKeyFactory().setKind("Task").newKey("sampleTask");
     // [END named_key]
     assertValidKey(taskKey);
   }
@@ -162,8 +162,8 @@ public void testNamedKey() {
   public void testKeyWithParent() {
     // [START key_with_parent]
     Key taskKey = datastore.newKeyFactory()
-        .ancestors(PathElement.of("TaskList", "default"))
-        .kind("Task")
+        .addAncestors(PathElement.of("TaskList", "default"))
+        .setKind("Task")
         .newKey("sampleTask");
     // [END key_with_parent]
     assertValidKey(taskKey);
@@ -173,8 +173,8 @@ public void testKeyWithParent() {
   public void testKeyWithMultilevelParent() {
     // [START key_with_multilevel_parent]
     KeyFactory keyFactory = datastore.newKeyFactory()
-        .ancestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default"))
-        .kind("Task");
+        .addAncestors(PathElement.of("User", "Alice"), PathElement.of("TaskList", "default"))
+        .setKind("Task");
     Key taskKey = keyFactory.newKey("sampleTask");
     // [END key_with_multilevel_parent]
     assertValidKey(taskKey);
@@ -182,17 +182,17 @@ public void testKeyWithMultilevelParent() {
 
   private void assertValidEntity(Entity original) {
     datastore.put(original);
-    assertEquals(original, datastore.get(original.key()));
+    assertEquals(original, datastore.get(original.getKey()));
   }
 
   @Test
   public void testEntityWithParent() {
     // [START entity_with_parent]
     Key taskKey = datastore.newKeyFactory()
-        .ancestors(PathElement.of("TaskList", "default"))
-        .kind("Task")
+        .addAncestors(PathElement.of("TaskList", "default"))
+        .setKind("Task")
         .newKey("sampleTask");
-    Entity task = Entity.builder(taskKey)
+    Entity task = Entity.newBuilder(taskKey)
         .set("category", "Personal")
         .set("done", false)
         .set("priority", 4)
@@ -205,14 +205,14 @@ public void testEntityWithParent() {
   @Test
   public void testProperties() {
     // [START properties]
-    Entity task = Entity.builder(taskKey)
+    Entity task = Entity.newBuilder(taskKey)
         .set("category", "Personal")
         .set("created", DateTime.now())
         .set("done", false)
         .set("priority", 4)
         .set("percent_complete", 10.0)
         .set("description",
-          StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build())
+          StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
         .build();
     // [END properties]
     assertValidEntity(task);
@@ -221,7 +221,7 @@ public void testProperties() {
   @Test
   public void testArrayValue() {
     // [START array_value]
-    Entity task = Entity.builder(taskKey)
+    Entity task = Entity.newBuilder(taskKey)
         .set("tags", "fun", "programming")
         .set("collaborators", "alice", "bob")
         .build();
@@ -232,7 +232,7 @@ public void testArrayValue() {
   @Test
   public void testBasicEntity() {
     // [START basic_entity]
-    Entity task = Entity.builder(taskKey)
+    Entity task = Entity.newBuilder(taskKey)
         .set("category", "Personal")
         .set("done", false)
         .set("priority", 4)
@@ -245,18 +245,18 @@ public void testBasicEntity() {
   @Test
   public void testUpsert() {
     // [START upsert]
-    Entity task = Entity.builder(keyFactory.newKey("sampleTask")).build();
+    Entity task = Entity.newBuilder(keyFactory.newKey("sampleTask")).build();
     datastore.put(task);
     // [END upsert]
-    assertEquals(task, datastore.get(task.key()));
+    assertEquals(task, datastore.get(task.getKey()));
   }
 
   @Test
   public void testInsert() {
     // [START insert]
-    Key taskKey = datastore.add(FullEntity.builder(keyFactory.newKey()).build()).key();
+    Key taskKey = datastore.add(FullEntity.newBuilder(keyFactory.newKey()).build()).getKey();
     // [END insert]
-    assertEquals(FullEntity.builder(taskKey).build(), datastore.get(taskKey));
+    assertEquals(FullEntity.newBuilder(taskKey).build(), datastore.get(taskKey));
   }
 
   @Test
@@ -272,7 +272,7 @@ public void testLookup() {
   public void testUpdate() {
     datastore.put(testEntity);
     // [START update]
-    Entity task = Entity.builder(datastore.get(taskKey)).set("priority", 5).build();
+    Entity task = Entity.newBuilder(datastore.get(taskKey)).set("priority", 5).build();
     datastore.update(task);
     // [END update]
     assertEquals(task, datastore.get(taskKey));
@@ -288,13 +288,13 @@ public void testDelete() {
   }
 
   private List<Entity> setUpBatchTests(Key taskKey1, Key taskKey2) {
-    Entity task1 = Entity.builder(taskKey1)
+    Entity task1 = Entity.newBuilder(taskKey1)
         .set("category", "Personal")
         .set("done", false)
         .set("priority", 4)
         .set("description", "Learn Cloud Datastore")
         .build();
-    Entity task2 = Entity.builder(taskKey2)
+    Entity task2 = Entity.newBuilder(taskKey2)
         .set("category", "Personal")
         .set("done", false)
         .set("priority", 5)
@@ -307,24 +307,24 @@ private List<Entity> setUpBatchTests(Key taskKey1, Key taskKey2) {
   @Test
   public void testBatchUpsert() {
     // [START batch_upsert]
-    FullEntity<IncompleteKey> task1 = FullEntity.builder(keyFactory.newKey())
+    FullEntity<IncompleteKey> task1 = FullEntity.newBuilder(keyFactory.newKey())
         .set("category", "Personal")
         .set("done", false)
         .set("priority", 4)
         .set("description", "Learn Cloud Datastore")
         .build();
-    FullEntity<IncompleteKey> task2 = Entity.builder(keyFactory.newKey())
+    FullEntity<IncompleteKey> task2 = Entity.newBuilder(keyFactory.newKey())
         .set("category", "Personal")
         .set("done", false)
         .set("priority", 5)
         .set("description", "Integrate Cloud Datastore")
         .build();
     List<Entity> tasks = datastore.add(task1, task2);
-    Key taskKey1 = tasks.get(0).key();
-    Key taskKey2 = tasks.get(1).key();
+    Key taskKey1 = tasks.get(0).getKey();
+    Key taskKey2 = tasks.get(1).getKey();
     // [END batch_upsert]
-    assertEquals(Entity.builder(taskKey1, task1).build(), datastore.get(taskKey1));
-    assertEquals(Entity.builder(taskKey2, task2).build(), datastore.get(taskKey2));
+    assertEquals(Entity.newBuilder(taskKey1, task1).build(), datastore.get(taskKey1));
+    assertEquals(Entity.newBuilder(taskKey2, task2).build(), datastore.get(taskKey2));
   }
 
   @Test
@@ -353,10 +353,10 @@ public void testBatchDelete() {
 
   private void setUpQueryTests() {
     Key taskKey = datastore.newKeyFactory()
-        .kind("Task")
-        .ancestors(PathElement.of("TaskList", "default"))
+        .setKind("Task")
+        .addAncestors(PathElement.of("TaskList", "default"))
         .newKey("someTask");
-    datastore.put(Entity.builder(taskKey)
+    datastore.put(Entity.newBuilder(taskKey)
         .set("category", "Personal")
         .set("done", false)
         .set("completed", false)
@@ -364,7 +364,7 @@ private void setUpQueryTests() {
         .set("created", includedDate)
         .set("percent_complete", 10.0)
         .set("description",
-            StringValue.builder("Learn Cloud Datastore").excludeFromIndexes(true).build())
+            StringValue.newBuilder("Learn Cloud Datastore").setExcludeFromIndexes(true).build())
         .set("tag", "fun", "l", "programming")
         .build());
   }
@@ -385,11 +385,11 @@ private <V> void assertInvalidQuery(Query<V> query) {
   public void testBasicQuery() {
     setUpQueryTests();
     // [START basic_query]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(CompositeFilter.and(
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(CompositeFilter.and(
             PropertyFilter.eq("done", false), PropertyFilter.ge("priority", 4)))
-        .orderBy(OrderBy.desc("priority"))
+        .setOrderBy(OrderBy.desc("priority"))
         .build();
     // [END basic_query]
     assertValidQuery(query);
@@ -398,7 +398,7 @@ public void testBasicQuery() {
   @Test
   public void testRunQuery() {
     setUpQueryTests();
-    Query<Entity> query = Query.entityQueryBuilder().kind("Task").build();
+    Query<Entity> query = Query.newEntityQueryBuilder().setKind("Task").build();
     // [START run_query]
     QueryResults<Entity> tasks = datastore.run(query);
     // [END run_query]
@@ -411,7 +411,8 @@ public void testPropertyFilter() {
     setUpQueryTests();
     // [START property_filter]
     Query<Entity> query =
-        Query.entityQueryBuilder().kind("Task").filter(PropertyFilter.eq("done", false)).build();
+        Query.newEntityQueryBuilder().setKind("Task").setFilter(PropertyFilter.eq("done", false))
+        .build();
     // [END property_filter]
     assertValidQuery(query);
   }
@@ -420,9 +421,9 @@ public void testPropertyFilter() {
   public void testCompositeFilter() {
     setUpQueryTests();
     // [START composite_filter]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(
             CompositeFilter.and(PropertyFilter.eq("done", false), PropertyFilter.eq("priority", 4)))
         .build();
     // [END composite_filter]
@@ -433,9 +434,9 @@ public void testCompositeFilter() {
   public void testKeyFilter() {
     setUpQueryTests();
     // [START key_filter]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask")))
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(PropertyFilter.gt("__key__", keyFactory.newKey("someTask")))
         .build();
     // [END key_filter]
     assertValidQuery(query);
@@ -446,7 +447,7 @@ public void testAscendingSort() {
     setUpQueryTests();
     // [START ascending_sort]
     Query<Entity> query =
-        Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.asc("created")).build();
+        Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.asc("created")).build();
     // [END ascending_sort]
     assertValidQuery(query);
   }
@@ -456,7 +457,7 @@ public void testDescendingSort() {
     setUpQueryTests();
     // [START descending_sort]
     Query<Entity> query =
-        Query.entityQueryBuilder().kind("Task").orderBy(OrderBy.desc("created")).build();
+        Query.newEntityQueryBuilder().setKind("Task").setOrderBy(OrderBy.desc("created")).build();
     // [END descending_sort]
     assertValidQuery(query);
   }
@@ -465,9 +466,9 @@ public void testDescendingSort() {
   public void testMultiSort() {
     setUpQueryTests();
     // [START multi_sort]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .orderBy(OrderBy.desc("priority"), OrderBy.asc("created"))
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setOrderBy(OrderBy.desc("priority"), OrderBy.asc("created"))
         .build();
     // [END multi_sort]
     assertValidQuery(query);
@@ -479,7 +480,7 @@ public void testKindlessQuery() {
     setUpQueryTests();
     // [START kindless_query]
     Query<Entity> query =
-        Query.entityQueryBuilder().filter(PropertyFilter.gt("__key__", lastSeenKey)).build();
+        Query.newEntityQueryBuilder().setFilter(PropertyFilter.gt("__key__", lastSeenKey)).build();
     // [END kindless_query]
     assertValidQuery(query);
   }
@@ -488,10 +489,10 @@ public void testKindlessQuery() {
   public void testAncestorQuery() {
     setUpQueryTests();
     // [START ancestor_query]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(PropertyFilter.hasAncestor(
-            datastore.newKeyFactory().kind("TaskList").newKey("default")))
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(PropertyFilter.hasAncestor(
+            datastore.newKeyFactory().setKind("TaskList").newKey("default")))
         .build();
     // [END ancestor_query]
     assertValidQuery(query);
@@ -501,9 +502,9 @@ public void testAncestorQuery() {
   public void testProjectionQuery() {
     setUpQueryTests();
     // [START projection_query]
-    Query<ProjectionEntity> query = Query.projectionEntityQueryBuilder()
-        .kind("Task")
-        .projection("priority", "percent_complete")
+    Query<ProjectionEntity> query = Query.newProjectionEntityQueryBuilder()
+        .setKind("Task")
+        .setProjection("priority", "percent_complete")
         .build();
     // [END projection_query]
     assertValidQuery(query);
@@ -512,9 +513,9 @@ public void testProjectionQuery() {
   @Test
   public void testRunProjectionQuery() {
     setUpQueryTests();
-    Query<ProjectionEntity> query = Query.projectionEntityQueryBuilder()
-        .kind("Task")
-        .projection("priority", "percent_complete")
+    Query<ProjectionEntity> query = Query.newProjectionEntityQueryBuilder()
+        .setKind("Task")
+        .setProjection("priority", "percent_complete")
         .build();
     // [START run_query_projection]
     List<Long> priorities = new LinkedList<>();
@@ -534,7 +535,7 @@ public void testRunProjectionQuery() {
   public void testKeysOnlyQuery() {
     setUpQueryTests();
     // [START keys_only_query]
-    Query<Key> query = Query.keyQueryBuilder().kind("Task").build();
+    Query<Key> query = Query.newKeyQueryBuilder().setKind("Task").build();
     // [END keys_only_query]
     assertValidQuery(query);
   }
@@ -542,7 +543,7 @@ public void testKeysOnlyQuery() {
   @Test
   public void testRunKeysOnlyQuery() {
     setUpQueryTests();
-    Query<Key> query = Query.keyQueryBuilder().kind("Task").build();
+    Query<Key> query = Query.newKeyQueryBuilder().setKind("Task").build();
     // [START run_keys_only_query]
     QueryResults<Key> taskKeys = datastore.run(query);
     // [END run_keys_only_query]
@@ -554,11 +555,11 @@ public void testRunKeysOnlyQuery() {
   public void testDistinctQuery() {
     setUpQueryTests();
     // [START distinct_query]
-    Query<ProjectionEntity> query = Query.projectionEntityQueryBuilder()
-        .kind("Task")
-        .projection("category", "priority")
-        .distinctOn("category", "priority")
-        .orderBy(OrderBy.asc("category"), OrderBy.asc("priority"))
+    Query<ProjectionEntity> query = Query.newProjectionEntityQueryBuilder()
+        .setKind("Task")
+        .setProjection("category", "priority")
+        .setDistinctOn("category", "priority")
+        .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority"))
         .build();
     // [END distinct_query]
     assertValidQuery(query);
@@ -568,11 +569,11 @@ public void testDistinctQuery() {
   public void testDistinctOnQuery() {
     setUpQueryTests();
     // [START distinct_on_query]
-    Query<ProjectionEntity> query = Query.projectionEntityQueryBuilder()
-        .kind("Task")
-        .projection("category", "priority")
-        .distinctOn("category")
-        .orderBy(OrderBy.asc("category"), OrderBy.asc("priority"))
+    Query<ProjectionEntity> query = Query.newProjectionEntityQueryBuilder()
+        .setKind("Task")
+        .setProjection("category", "priority")
+        .setDistinctOn("category")
+        .setOrderBy(OrderBy.asc("category"), OrderBy.asc("priority"))
         .build();
     // [END distinct_on_query]
     assertValidQuery(query);
@@ -582,9 +583,9 @@ public void testDistinctOnQuery() {
   public void testArrayValueInequalityRange() {
     setUpQueryTests();
     // [START array_value_inequality_range]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(CompositeFilter.and(
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(CompositeFilter.and(
             PropertyFilter.gt("tag", "learn"), PropertyFilter.lt("tag", "math")))
         .build();
     // [END array_value_inequality_range]
@@ -596,9 +597,9 @@ public void testArrayValueInequalityRange() {
   public void testArrayValueEquality() {
     setUpQueryTests();
     // [START array_value_equality]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(CompositeFilter.and(
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(CompositeFilter.and(
             PropertyFilter.eq("tag", "fun"), PropertyFilter.eq("tag", "programming")))
         .build();
     // [END array_value_equality]
@@ -609,9 +610,9 @@ public void testArrayValueEquality() {
   public void testInequalityRange() {
     setUpQueryTests();
     // [START inequality_range]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(CompositeFilter.and(
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(CompositeFilter.and(
             PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate)))
         .build();
     // [END inequality_range]
@@ -621,9 +622,9 @@ public void testInequalityRange() {
   @Test
   public void testInequalityInvalid() {
     // [START inequality_invalid]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(CompositeFilter.and(
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(CompositeFilter.and(
             PropertyFilter.gt("created", startDate), PropertyFilter.gt("priority", 3)))
         .build();
     // [END inequality_invalid]
@@ -634,9 +635,9 @@ public void testInequalityInvalid() {
   public void testEqualAndInequalityRange() {
     setUpQueryTests();
     // [START equal_and_inequality_range]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(CompositeFilter.and(PropertyFilter.eq("priority", 4),
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(CompositeFilter.and(PropertyFilter.eq("priority", 4),
             PropertyFilter.gt("created", startDate), PropertyFilter.lt("created", endDate)))
         .build();
     // [END equal_and_inequality_range]
@@ -647,10 +648,10 @@ public void testEqualAndInequalityRange() {
   public void testInequalitySort() {
     setUpQueryTests();
     // [START inequality_sort]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(PropertyFilter.gt("priority", 3))
-        .orderBy(OrderBy.asc("priority"), OrderBy.asc("created"))
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(PropertyFilter.gt("priority", 3))
+        .setOrderBy(OrderBy.asc("priority"), OrderBy.asc("created"))
         .build();
     // [END inequality_sort]
     assertValidQuery(query);
@@ -659,10 +660,10 @@ public void testInequalitySort() {
   @Test
   public void testInequalitySortInvalidNotSame() {
     // [START inequality_sort_invalid_not_same]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(PropertyFilter.gt("priority", 3))
-        .orderBy(OrderBy.asc("created"))
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(PropertyFilter.gt("priority", 3))
+        .setOrderBy(OrderBy.asc("created"))
         .build();
     // [END inequality_sort_invalid_not_same]
     assertInvalidQuery(query);
@@ -671,10 +672,10 @@ public void testInequalitySortInvalidNotSame() {
   @Test
   public void testInequalitySortInvalidNotFirst() {
     // [START inequality_sort_invalid_not_first]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(PropertyFilter.gt("priority", 3))
-        .orderBy(OrderBy.asc("created"), OrderBy.asc("priority"))
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(PropertyFilter.gt("priority", 3))
+        .setOrderBy(OrderBy.asc("created"), OrderBy.asc("priority"))
         .build();
     // [END inequality_sort_invalid_not_first]
     assertInvalidQuery(query);
@@ -684,7 +685,7 @@ public void testInequalitySortInvalidNotFirst() {
   public void testLimit() {
     setUpQueryTests();
     // [START limit]
-    Query<Entity> query = Query.entityQueryBuilder().kind("Task").limit(5).build();
+    Query<Entity> query = Query.newEntityQueryBuilder().setKind("Task").setLimit(5).build();
     // [END limit]
     assertValidQuery(query);
   }
@@ -701,16 +702,17 @@ public void testCursorPaging() {
 
   private Cursor cursorPaging(int pageSize, Cursor pageCursor) {
     // [START cursor_paging]
-    EntityQuery.Builder queryBuilder = Query.entityQueryBuilder().kind("Task").limit(pageSize);
+    EntityQuery.Builder queryBuilder = Query.newEntityQueryBuilder().setKind("Task")
+        .setLimit(pageSize);
     if (pageCursor != null) {
-      queryBuilder.startCursor(pageCursor);
+      queryBuilder.setStartCursor(pageCursor);
     }
     QueryResults<Entity> tasks = datastore.run(queryBuilder.build());
     while (tasks.hasNext()) {
       Entity task = tasks.next();
       // do something with the task
     }
-    Cursor nextPageCursor = tasks.cursorAfter();
+    Cursor nextPageCursor = tasks.getCursorAfter();
     // [END cursor_paging]
     return nextPageCursor;
   }
@@ -719,10 +721,10 @@ private Cursor cursorPaging(int pageSize, Cursor pageCursor) {
   public void testEventualConsistentQuery() {
     setUpQueryTests();
     // [START eventual_consistent_query]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(PropertyFilter.hasAncestor(
-            datastore.newKeyFactory().kind("TaskList").newKey("default")))
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(PropertyFilter.hasAncestor(
+            datastore.newKeyFactory().setKind("TaskList").newKey("default")))
         .build();
     datastore.run(query, ReadOption.eventualConsistency());
     // [END eventual_consistent_query]
@@ -733,9 +735,9 @@ public void testEventualConsistentQuery() {
   public void testUnindexedPropertyQuery() {
     setUpQueryTests();
     // [START unindexed_property_query]
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("Task")
-        .filter(PropertyFilter.eq("description", "A task description"))
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("Task")
+        .setFilter(PropertyFilter.eq("description", "A task description"))
         .build();
     // [END unindexed_property_query]
     QueryResults<Entity> results = datastore.run(query);
@@ -745,7 +747,7 @@ public void testUnindexedPropertyQuery() {
   @Test
   public void testExplodingProperties() {
     // [START exploding_properties]
-    Entity task = Entity.builder(taskKey)
+    Entity task = Entity.newBuilder(taskKey)
         .set("tags", "fun", "programming", "learn")
         .set("collaborators", "alice", "bob", "charlie")
         .set("created", DateTime.now())
@@ -755,11 +757,11 @@ public void testExplodingProperties() {
   }
 
   private List<Key> setUpTransferTests() {
-    KeyFactory keyFactory = datastore.newKeyFactory().kind("People");
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind("People");
     Key from = keyFactory.newKey("from");
     Key to = keyFactory.newKey("to");
-    datastore.put(Entity.builder(from).set("balance", 100).build());
-    datastore.put(Entity.builder(to).set("balance", 0).build());
+    datastore.put(Entity.newBuilder(from).set("balance", 100).build());
+    datastore.put(Entity.newBuilder(to).set("balance", 0).build());
     return ImmutableList.of(from, to);
   }
 
@@ -782,13 +784,14 @@ void transferFunds(Key fromKey, Key toKey, long amount) {
       List<Entity> entities = txn.fetch(fromKey, toKey);
       Entity from = entities.get(0);
       Entity updatedFrom =
-          Entity.builder(from).set("balance", from.getLong("balance") - amount).build();
+          Entity.newBuilder(from).set("balance", from.getLong("balance") - amount).build();
       Entity to = entities.get(1);
-      Entity updatedTo = Entity.builder(to).set("balance", to.getLong("balance") + amount).build();
+      Entity updatedTo = Entity.newBuilder(to).set("balance", to.getLong("balance") + amount)
+          .build();
       txn.put(updatedFrom, updatedTo);
       txn.commit();
     } finally {
-      if (txn.active()) {
+      if (txn.isActive()) {
         txn.rollback();
       }
     }
@@ -826,12 +829,12 @@ public void testTransactionalGetOrCreate() {
     try {
       task = txn.get(taskKey);
       if (task == null) {
-        task = Entity.builder(taskKey).build();
+        task = Entity.newBuilder(taskKey).build();
         txn.put(task);
         txn.commit();
       }
     } finally {
-      if (txn.active()) {
+      if (txn.isActive()) {
         txn.rollback();
       }
     }
@@ -842,8 +845,8 @@ public void testTransactionalGetOrCreate() {
   @Test
   public void testTransactionalSingleEntityGroupReadOnly() {
     setUpQueryTests();
-    Key taskListKey = datastore.newKeyFactory().kind("TaskList").newKey("default");
-    Entity taskListEntity = Entity.builder(taskListKey).build();
+    Key taskListKey = datastore.newKeyFactory().setKind("TaskList").newKey("default");
+    Entity taskListEntity = Entity.newBuilder(taskListKey).build();
     datastore.put(taskListEntity);
     // [START transactional_single_entity_group_read_only]
     Entity taskList;
@@ -851,14 +854,14 @@ public void testTransactionalSingleEntityGroupReadOnly() {
     Transaction txn = datastore.newTransaction();
     try {
       taskList = txn.get(taskListKey);
-      Query<Entity> query = Query.entityQueryBuilder()
-          .kind("Task")
-          .filter(PropertyFilter.hasAncestor(taskListKey))
+      Query<Entity> query = Query.newEntityQueryBuilder()
+          .setKind("Task")
+          .setFilter(PropertyFilter.hasAncestor(taskListKey))
           .build();
       tasks = txn.run(query);
       txn.commit();
     } finally {
-      if (txn.active()) {
+      if (txn.isActive()) {
         txn.rollback();
       }
     }
@@ -872,19 +875,19 @@ public void testTransactionalSingleEntityGroupReadOnly() {
   public void testNamespaceRunQuery() {
     setUpQueryTests();
     // [START namespace_run_query]
-    KeyFactory keyFactory = datastore.newKeyFactory().kind("__namespace__");
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind("__namespace__");
     Key startNamespace = keyFactory.newKey("g");
     Key endNamespace = keyFactory.newKey("h");
-    Query<Key> query = Query.keyQueryBuilder()
-        .kind("__namespace__")
-        .filter(CompositeFilter.and(
+    Query<Key> query = Query.newKeyQueryBuilder()
+        .setKind("__namespace__")
+        .setFilter(CompositeFilter.and(
             PropertyFilter.gt("__key__", startNamespace),
             PropertyFilter.lt("__key__", endNamespace)))
         .build();
     List<String> namespaces = new ArrayList<>();
     QueryResults<Key> results = datastore.run(query);
     while (results.hasNext()) {
-      namespaces.add(results.next().name());
+      namespaces.add(results.next().getName());
     }
     // [END namespace_run_query]
     assertEquals(ImmutableList.of("ghijklmnop"), namespaces);
@@ -894,11 +897,11 @@ public void testNamespaceRunQuery() {
   public void testKindRunQuery() {
     setUpQueryTests();
     // [START kind_run_query]
-    Query<Key> query = Query.keyQueryBuilder().kind("__kind__").build();
+    Query<Key> query = Query.newKeyQueryBuilder().setKind("__kind__").build();
     List<String> kinds = new ArrayList<>();
     QueryResults<Key> results = datastore.run(query);
     while (results.hasNext()) {
-      kinds.add(results.next().name());
+      kinds.add(results.next().getName());
     }
     // [END kind_run_query]
     assertEquals(ImmutableList.of("Task"), kinds);
@@ -908,13 +911,13 @@ public void testKindRunQuery() {
   public void testPropertyRunQuery() {
     setUpQueryTests();
     // [START property_run_query]
-    Query<Key> query = Query.keyQueryBuilder().kind("__property__").build();
+    Query<Key> query = Query.newKeyQueryBuilder().setKind("__property__").build();
     QueryResults<Key> keys = datastore.run(query);
     Map<String, Collection<String>> propertiesByKind = new HashMap<>();
     while (keys.hasNext()) {
       Key key = keys.next();
-      String kind = key.parent().name();
-      String propertyName = key.name();
+      String kind = key.getParent().getName();
+      String propertyName = key.getName();
       Collection<String> properties = propertiesByKind.get(kind);
       if (properties == null) {
         properties = new HashSet<>();
@@ -932,16 +935,16 @@ public void testPropertyRunQuery() {
   public void testPropertyByKindRunQuery() {
     setUpQueryTests();
     // [START property_by_kind_run_query]
-    Key key = datastore.newKeyFactory().kind("__kind__").newKey("Task");
-    Query<Entity> query = Query.entityQueryBuilder()
-        .kind("__property__")
-        .filter(PropertyFilter.hasAncestor(key))
+    Key key = datastore.newKeyFactory().setKind("__kind__").newKey("Task");
+    Query<Entity> query = Query.newEntityQueryBuilder()
+        .setKind("__property__")
+        .setFilter(PropertyFilter.hasAncestor(key))
         .build();
     QueryResults<Entity> results = datastore.run(query);
     Map<String, Collection<String>> representationsByProperty = new HashMap<>();
     while (results.hasNext()) {
       Entity result = results.next();
-      String propertyName = result.key().name();
+      String propertyName = result.getKey().getName();
       List<StringValue> representations = result.getList("property_representation");
       Collection<String> currentRepresentations = representationsByProperty.get(propertyName);
       if (currentRepresentations == null) {
@@ -970,19 +973,19 @@ public void testPropertyFilteringRunQuery() {
     setUpQueryTests();
     // [START property_filtering_run_query]
     Key startKey = datastore.newKeyFactory()
-        .kind("__property__")
-        .ancestors(PathElement.of("__kind__", "Task"))
+        .setKind("__property__")
+        .addAncestors(PathElement.of("__kind__", "Task"))
         .newKey("priority");
-    Query<Key> query = Query.keyQueryBuilder()
-        .kind("__property__")
-        .filter(PropertyFilter.ge("__key__", startKey))
+    Query<Key> query = Query.newKeyQueryBuilder()
+        .setKind("__property__")
+        .setFilter(PropertyFilter.ge("__key__", startKey))
         .build();
     Map<String, Collection<String>> propertiesByKind = new HashMap<>();
     QueryResults<Key> keys = datastore.run(query);
     while (keys.hasNext()) {
       Key key = keys.next();
-      String kind = key.parent().name();
-      String propertyName = key.name();
+      String kind = key.getParent().getName();
+      String propertyName = key.getName();
       Collection<String> properties = propertiesByKind.get(kind);
       if (properties == null) {
         properties = new HashSet<String>();
@@ -1000,8 +1003,8 @@ public void testPropertyFilteringRunQuery() {
   public void testGqlRunQuery() {
     setUpQueryTests();
     // [START gql_run_query]
-    Query<Entity> query =
-        Query.gqlQueryBuilder(ResultType.ENTITY, "select * from Task order by created asc").build();
+    Query<Entity> query = Query.newGqlQueryBuilder(
+        ResultType.ENTITY, "select * from Task order by created asc").build();
     // [END gql_run_query]
     assertValidQuery(query);
   }
@@ -1011,7 +1014,7 @@ public void testGqlNamedBindingQuery() {
     setUpQueryTests();
     // [START gql_named_binding_query]
     Query<Entity> query =
-        Query.gqlQueryBuilder(
+        Query.newGqlQueryBuilder(
             ResultType.ENTITY,
             "select * from Task where completed = @completed and priority = @priority")
         .setBinding("completed", false)
@@ -1025,7 +1028,7 @@ public void testGqlNamedBindingQuery() {
   public void testGqlPositionalBindingQuery() {
     setUpQueryTests();
     // [START gql_positional_binding_query]
-    Query<Entity> query = Query.gqlQueryBuilder(
+    Query<Entity> query = Query.newGqlQueryBuilder(
           ResultType.ENTITY, "select * from Task where completed = @1 and priority = @2")
         .addBinding(false)
         .addBinding(4)
@@ -1038,9 +1041,9 @@ public void testGqlPositionalBindingQuery() {
   public void testGqlLiteralQuery() {
     setUpQueryTests();
     // [START gql_literal_query]
-    Query<Entity> query = Query.gqlQueryBuilder(
+    Query<Entity> query = Query.newGqlQueryBuilder(
             ResultType.ENTITY, "select * from Task where completed = false and priority = 4")
-        .allowLiteral(true)
+        .setAllowLiteral(true)
         .build();
     // [END gql_literal_query]
     assertValidQuery(query);
diff --git a/flexible/async-rest/README.md b/flexible/async-rest/README.md
index 8ab37ebf087..3e7c6e1c19a 100644
--- a/flexible/async-rest/README.md
+++ b/flexible/async-rest/README.md
@@ -16,7 +16,7 @@ First, complete the following steps:
 - Install the Cloud SDK `app-engine-java` component.
 - Authenticate wth the gcloud SDK: gcloud auth login.
 - Install [Maven](http://maven.apache.org/download.cgi) if you haven't already.
-   
+
 
 ## Providing your Google Places API key ##
 
@@ -28,21 +28,21 @@ To deploy to gcloud, you need to edit the src/main/appengine/app.yaml file and r
 
     PLACES_APPKEY: 'YOUR_PLACES_APP_KEY'
 
-    
+
 ## Running locally without the AppEngine environment ##
 
-The application does not use any AppEngine specific services, so you can run it simply on your local machine by doing: 
+The application does not use any AppEngine specific services, so you can run it simply on your local machine by doing:
 
-     mvn jetty:run 
+     mvn jetty:run
 
 Go to  http://localhost:8080 to see the webapp.
- 
+
 
 ## Deploying to the cloud as an AppEngine ManagedVM ##
 
-To automatically stage and deploy the webapp to your project in the cloud do:  
+To automatically stage and deploy the webapp to your project in the cloud do:
 
-    mvn appengine:deploy  
+    mvn appengine:deploy
 
 See here for more information on the [GCloud Maven Plugin](https://github.com/GoogleCloudPlatform/gcloud-maven-plugin).
 
diff --git a/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java b/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java
index 0935e72127a..6223073be4e 100644
--- a/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java
+++ b/flexible/cloudstorage/src/main/java/com/example/cloudstorage/UploadServlet.java
@@ -45,7 +45,7 @@ public class UploadServlet extends HttpServlet {
 
   @Override
   public void init() {
-    storage = StorageOptions.defaultInstance().service();
+    storage = StorageOptions.getDefaultInstance().getService();
   }
 
   @Override
@@ -60,11 +60,11 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
     // the inputstream is closed by default, so we don't need to close it here
     Blob blob =
         storage.create(
-            BlobInfo.builder(BUCKET_NAME, fileName).acl(acls).build(),
+            BlobInfo.newBuilder(BUCKET_NAME, fileName).setAcl(acls).build(),
             filePart.getInputStream());
 
     // return the public download link
-    resp.getWriter().print(blob.mediaLink());
+    resp.getWriter().print(blob.getMediaLink());
   }
 }
 // [END example]
diff --git a/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java b/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java
index 37aff9d5a34..ef9822cd1f8 100644
--- a/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java
+++ b/flexible/datastore/src/main/java/com/example/datastore/DatastoreServlet.java
@@ -58,18 +58,18 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
       userIp = userIp.substring(0, userIp.indexOf(".", userIp.indexOf(".") + 1)) + ".*.*";
     }
 
-    Datastore datastore = DatastoreOptions.defaultInstance().service();
-    KeyFactory keyFactory = datastore.newKeyFactory().kind("visit");
-    IncompleteKey key = keyFactory.kind("visit").newKey();
+    Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+    KeyFactory keyFactory = datastore.newKeyFactory().setKind("visit");
+    IncompleteKey key = keyFactory.setKind("visit").newKey();
 
     // Record a visit to the datastore, storing the IP and timestamp.
-    FullEntity<IncompleteKey> curVisit = FullEntity.builder(key)
+    FullEntity<IncompleteKey> curVisit = FullEntity.newBuilder(key)
         .set("user_ip", userIp).set("timestamp", DateTime.now()).build();
     datastore.add(curVisit);
 
     // Retrieve the last 10 visits from the datastore, ordered by timestamp.
-    Query<Entity> query = Query.entityQueryBuilder().kind("visit")
-        .orderBy(StructuredQuery.OrderBy.desc("timestamp")).limit(10).build();
+    Query<Entity> query = Query.newEntityQueryBuilder().setKind("visit")
+        .setOrderBy(StructuredQuery.OrderBy.desc("timestamp")).setLimit(10).build();
     QueryResults<Entity> results = datastore.run(query);
 
     resp.setContentType("text/plain");
diff --git a/flexible/helloworld/README.md b/flexible/helloworld/README.md
index c80bb2e51f6..84f224b4095 100644
--- a/flexible/helloworld/README.md
+++ b/flexible/helloworld/README.md
@@ -13,7 +13,7 @@ Use either:
 ### Running locally
 
     $ mvn clean jetty:run-exploded
-  
+
 ### Deploying
 
     $ mvn appengine:deploy
diff --git a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
index 745a31f6945..218733eb6fc 100644
--- a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
+++ b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/Main.java
@@ -35,7 +35,7 @@ public static void main(String[] args) {
         }
       }
     }
-    UserController userController =
-        new UserController(new UserService(DatastoreOptions.defaultInstance().service(), kind));
+    UserController userController = new UserController(new UserService(
+        DatastoreOptions.getDefaultInstance().getService(), kind));
   }
 }
diff --git a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
index b73acef4692..f7dd3bd0376 100644
--- a/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
+++ b/flexible/sparkjava/src/main/java/com/google/appengine/sparkdemo/UserService.java
@@ -42,7 +42,7 @@ public class UserService {
    */
   public UserService(Datastore datastore, String kind) {
     this.datastore = datastore;
-    this.keyFactory = datastore.newKeyFactory().kind(kind);
+    this.keyFactory = datastore.newKeyFactory().setKind(kind);
     this.kind = kind;
   }
 
@@ -51,7 +51,7 @@ public UserService(Datastore datastore, String kind) {
    */
   public List<User> getAllUsers() {
     Query<Entity> query =
-        Query.gqlQueryBuilder(Query.ResultType.ENTITY, "SELECT * FROM " + kind).build();
+        Query.newGqlQueryBuilder(Query.ResultType.ENTITY, "SELECT * FROM " + kind).build();
     QueryResults<Entity> results = datastore.run(query);
     List<User> users = new ArrayList<>();
     while (results.hasNext()) {
@@ -79,7 +79,7 @@ public User createUser(String name, String email) {
     failIfInvalid(name, email);
     User user = new User(name, email);
     Key key = keyFactory.newKey(user.getId());
-    Entity entity = Entity.builder(key)
+    Entity entity = Entity.newBuilder(key)
         .set("id", user.getId())
         .set("name", name)
         .set("email", email)
@@ -107,7 +107,7 @@ public User updateUser(String id, String name, String email) {
     if (entity == null) {
       throw new IllegalArgumentException("No user with id '" + id + "' found");
     } else {
-      entity = Entity.builder(entity)
+      entity = Entity.newBuilder(entity)
           .set("id", id)
           .set("name", name)
           .set("email", email)
diff --git a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
index 5d4ba6797a7..471f57384ab 100644
--- a/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
+++ b/flexible/sparkjava/src/test/java/com/google/appengine/sparkdemo/UserServiceTest.java
@@ -42,8 +42,8 @@
 public class UserServiceTest {
 
   private static final LocalDatastoreHelper HELPER = LocalDatastoreHelper.create(1.0);
-  private static final DatastoreOptions DATASTORE_OPTIONS = HELPER.options();
-  private static final Datastore DATASTORE = DATASTORE_OPTIONS.service();
+  private static final DatastoreOptions DATASTORE_OPTIONS = HELPER.getOptions();
+  private static final Datastore DATASTORE = DATASTORE_OPTIONS.getService();
   private static final String KIND = "DemoUser";
   private static final UserService USER_SERVICE = new UserService(DATASTORE, KIND);
   private static final String USER_ID = "myId";
@@ -51,8 +51,8 @@ public class UserServiceTest {
   private static final String USER_EMAIL = "my@email.com";
   private static final User USER = new User(USER_ID, USER_NAME, USER_EMAIL);
   private static final Key USER_KEY =
-      Key.builder(DATASTORE_OPTIONS.projectId(), KIND, USER_ID).build();
-  private static final Entity USER_RECORD = Entity.builder(USER_KEY)
+      Key.newBuilder(DATASTORE_OPTIONS.getProjectId(), KIND, USER_ID).build();
+  private static final Entity USER_RECORD = Entity.newBuilder(USER_KEY)
       .set("id", USER_ID)
       .set("name", USER_NAME)
       .set("email", USER_EMAIL)
@@ -65,7 +65,7 @@ public static void beforeClass() throws IOException, InterruptedException {
 
   @Before
   public void setUp() {
-    StructuredQuery<Key> query = Query.keyQueryBuilder().build();
+    StructuredQuery<Key> query = Query.newKeyQueryBuilder().build();
     QueryResults<Key> result = DATASTORE.run(query);
     DATASTORE.delete(Iterators.toArray(result, Key.class));
     DATASTORE.add(USER_RECORD);
diff --git a/monitoring/v3/README.md b/monitoring/v3/README.md
index b7ea5622ec6..ea3940663a7 100644
--- a/monitoring/v3/README.md
+++ b/monitoring/v3/README.md
@@ -17,29 +17,29 @@ write a TimeSeries value to it.
 Create local credentials by running the following command and following the oauth2 flow:
 
     gcloud beta auth application-default login
-    
+
 To run:
 
     * `mvn clean install`
-    * `./list_resources_example.sh <YOUR-PROJECT-ID>
-    * `./run_custom_metrics.sh <YOUR-PROJECT-ID>    
+    * `./list_resources_example.sh <YOUR-PROJECT-ID>`
+    * `./run_custom_metrics.sh <YOUR-PROJECT-ID>`
 
 ## Running on GCE, GAE, or other environments
 
 On Google App Engine, the credentials should be found automatically.
 
 On Google Compute Engine, the credentials should be found automatically, but require that
-you create the instance with the correct scopes. 
+you create the instance with the correct scopes.
 
     gcloud compute instances create --scopes="https://www.googleapis.com/auth/cloud-platform,https://www.googleapis.com/auth/compute,https://www.googleapis.com/auth/compute.readonly" test-instance
 
-If you did not create the instance with the right scopes, you can still upload a JSON service 
-account and set GOOGLE_APPLICATION_CREDENTIALS as described below.
+If you did not create the instance with the right scopes, you can still upload a JSON service
+account and set `GOOGLE_APPLICATION_CREDENTIALS` as described below.
 
 ## Using a Service Account
 
 In non-Google Cloud environments, GCE instances created without the correct scopes, or local
-workstations if the `gcloud beta auth application-default login` command fails, use a Service 
+workstations if the `gcloud beta auth application-default login` command fails, use a Service
 Account by doing the following:
 
 * Go to API Manager -> Credentials
diff --git a/pubsub/cloud-client/src/main/java/com/example/pubsub/QuickstartSample.java b/pubsub/cloud-client/src/main/java/com/example/pubsub/QuickstartSample.java
index c5d97ed5087..a4f2492c8c0 100644
--- a/pubsub/cloud-client/src/main/java/com/example/pubsub/QuickstartSample.java
+++ b/pubsub/cloud-client/src/main/java/com/example/pubsub/QuickstartSample.java
@@ -26,7 +26,7 @@
 public class QuickstartSample {
   public static void main(String... args) throws Exception {
     // Instantiates a client
-    PubSub pubsub = PubSubOptions.defaultInstance().service();
+    PubSub pubsub = PubSubOptions.getDefaultInstance().getService();
 
     // The name for the new topic
     String topicName = "my-new-topic";
@@ -34,7 +34,7 @@ public static void main(String... args) throws Exception {
     // Creates the new topic
     Topic topic = pubsub.create(TopicInfo.of(topicName));
 
-    System.out.printf("Topic %s created.%n", topic.name());
+    System.out.printf("Topic %s created.%n", topic.getName());
   }
 }
 // [END pubsub_quickstart]
diff --git a/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickstartSampleIT.java b/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickstartSampleIT.java
index a5adf198539..1973f038550 100644
--- a/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickstartSampleIT.java
+++ b/pubsub/cloud-client/src/test/java/com/example/pubsub/QuickstartSampleIT.java
@@ -39,7 +39,7 @@ public class QuickstartSampleIT {
   private PrintStream out;
 
   private static final void deleteTestTopic() {
-    PubSub pubsub = PubSubOptions.defaultInstance().service();
+    PubSub pubsub = PubSubOptions.getDefaultInstance().getService();
     String topicName = "my-new-topic";
     pubsub.deleteTopic(topicName);
   }
diff --git a/storage/cloud-client/src/main/java/com/example/storage/QuickstartSample.java b/storage/cloud-client/src/main/java/com/example/storage/QuickstartSample.java
index 23a4155a585..b1ab07e6a56 100644
--- a/storage/cloud-client/src/main/java/com/example/storage/QuickstartSample.java
+++ b/storage/cloud-client/src/main/java/com/example/storage/QuickstartSample.java
@@ -26,7 +26,7 @@
 public class QuickstartSample {
   public static void main(String... args) throws Exception {
     // Instantiates a client
-    Storage storage = StorageOptions.defaultInstance().service();
+    Storage storage = StorageOptions.getDefaultInstance().getService();
 
     // The name for the new bucket
     String bucketName = args[0];  // "my-new-bucket";
@@ -34,7 +34,7 @@ public static void main(String... args) throws Exception {
     // Creates the new bucket
     Bucket bucket = storage.create(BucketInfo.of(bucketName));
 
-    System.out.printf("Bucket %s created.%n", bucket.name());
+    System.out.printf("Bucket %s created.%n", bucket.getName());
   }
 }
 // [END storage_quickstart]
diff --git a/storage/cloud-client/src/test/java/com/example/storage/QuickstartSampleIT.java b/storage/cloud-client/src/test/java/com/example/storage/QuickstartSampleIT.java
index 3dd2b0ac69a..2265fa58b66 100644
--- a/storage/cloud-client/src/test/java/com/example/storage/QuickstartSampleIT.java
+++ b/storage/cloud-client/src/test/java/com/example/storage/QuickstartSampleIT.java
@@ -41,7 +41,7 @@ public class QuickstartSampleIT {
   private PrintStream out;
 
   private static final void deleteBucket(String bucketName) {
-    Storage storage = StorageOptions.defaultInstance().service();
+    Storage storage = StorageOptions.getDefaultInstance().getService();
     storage.delete(bucketName);
   }
 
diff --git a/storage/storage-transfer/README.md b/storage/storage-transfer/README.md
index d2550388e07..6c7fb8dd862 100644
--- a/storage/storage-transfer/README.md
+++ b/storage/storage-transfer/README.md
@@ -29,9 +29,9 @@ These samples are used on the following documentation pages:
      There should be a "Try It" section on that page, otherwise execute it in
      the [APIs
      Explorer](https://developers.google.com/apis-explorer/#p/storagetransfer/v1/storagetransfer.googleServiceAccounts.get).
-   
+
      It should output an email address like:
-    
+
      ```
      storage-transfer-1234567890@partnercontent.gserviceaccount.com
      ```
@@ -91,4 +91,4 @@ bucket for files untouched for 30 days.
 ## References
 
 - [Google Storage Transfer API Client
-  Library](https://developers.google.com/api-client-library/java/apis/storagetransfer/v1)
\ No newline at end of file
+  Library](https://developers.google.com/api-client-library/java/apis/storagetransfer/v1)
diff --git a/storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/web.xml b/storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/web.xml
index dea3c4ca7ec..98f20cd8ebb 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/web.xml
+++ b/storage/xml-api/serviceaccount-appengine-sample/src/main/webapp/WEB-INF/web.xml
@@ -19,5 +19,5 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
     <extension>xsl</extension>
     <mime-type>text/xsl</mime-type>
   </mime-mapping>
-  
+
 </web-app>
diff --git a/translate/README.md b/translate/README.md
index fed65c2f5a7..763bf36f59a 100644
--- a/translate/README.md
+++ b/translate/README.md
@@ -23,18 +23,18 @@ libraries.
 [maven-install]: https://maven.apache.org/install.html
 
 ## Authentication
-This sample uses API Key for authentication. 
+This sample uses API Key for authentication.
 
  * Visit the [Google Cloud Console](https://console.cloud.google.com) and navigate to:
  ```
   API Manager > Credentials > Create credentials > API Key
  ```
- 
- * Set the environment variable GOOGLE_API_KEY
+
+ * Set the environment variable `GOOGLE_API_KEY`
  ```
   export GOOGLE_API_KEY=<YOUR_PROJECT_API_KEY>
  ```
- 
+
 ## Run the sample
 
 To build the sample, we use Maven.
diff --git a/translate/cloud-client/src/main/java/com/example/translate/QuickstartSample.java b/translate/cloud-client/src/main/java/com/example/translate/QuickstartSample.java
index 8339650d077..ce9c01d4399 100644
--- a/translate/cloud-client/src/main/java/com/example/translate/QuickstartSample.java
+++ b/translate/cloud-client/src/main/java/com/example/translate/QuickstartSample.java
@@ -40,7 +40,7 @@ public static void main(String... args) throws Exception {
 
 
     System.out.printf("Text: %s%n", text);
-    System.out.printf("Translation: %s%n", translation.translatedText());
+    System.out.printf("Translation: %s%n", translation.getTranslatedText());
   }
 }
 // [END translate_quickstart]
diff --git a/translate/src/main/java/com/google/cloud/translate/samples/TranslateText.java b/translate/src/main/java/com/google/cloud/translate/samples/TranslateText.java
index 569c04eb180..71440d56480 100644
--- a/translate/src/main/java/com/google/cloud/translate/samples/TranslateText.java
+++ b/translate/src/main/java/com/google/cloud/translate/samples/TranslateText.java
@@ -109,7 +109,7 @@ public static void translateTextWithOptions(
     Translation translation = translate.translate(sourceText, srcLang, tgtLang);
     out.printf("Source Text:\n\tLang: %s, Text: %s\n", sourceLang, sourceText);
     out.printf("TranslatedText:\n\tLang: %s, Text: %s\n", targetLang,
-        translation.translatedText());
+        translation.getTranslatedText());
   }
 
   /**
diff --git a/translate/src/test/java/com/google/cloud/translate/samples/TranslateTextTest.java b/translate/src/test/java/com/google/cloud/translate/samples/TranslateTextTest.java
index 679f3edc36e..d88533713c0 100644
--- a/translate/src/test/java/com/google/cloud/translate/samples/TranslateTextTest.java
+++ b/translate/src/test/java/com/google/cloud/translate/samples/TranslateTextTest.java
@@ -82,8 +82,8 @@ public class TranslateTextTest {
         "Ouzbek", "Pachtô", "Panjabi", "Persan", "Polonais", "Portugais", "Roumain", "Russe",
         "Samoan", "Serbe", "Sesotho", "Shona", "Sindhî", "Slovaque", "Slovène", "Somali",
         "Soundanais", "Suédois", "Swahili", "Tadjik", "Tagalog", "Tamoul", "Tchèque", "Telugu",
-        "Thaï", "Turc", "Ukrainien", "Urdu", "Vietnamien", "Xhosa", "Yiddish", "Yorouba","Zoulou"); 
-  
+        "Thaï", "Turc", "Ukrainien", "Urdu", "Vietnamien", "Xhosa", "Yiddish", "Yorouba","Zoulou");
+
     // Arrange
     ByteArrayOutputStream bout = new ByteArrayOutputStream();
     PrintStream out = new PrintStream(bout);