deprecated methods -> undeprecated versions. (#428)

Author: jerjou

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

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);

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]

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()) {

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>

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.
 

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

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).
 

appengine/logs/src/main/java/com/example/appengine/logs/LogsServlet.java

@@ -34,15 +34,15 @@
 // 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");
     PrintWriter writer = resp.getWriter();
     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]
 

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>