Rename actions to their verb

- Rename factory methods on resources to make it clear that the Worker is returned
- Update execute method on actions to be the name of the action
- Rename reader fitlers to be `set*`

Author: jingming

src/main/java/com/twilio/base/Creator.java

@@ -18,8 +18,8 @@ public abstract class Creator<T extends Resource> {
      *
      * @return future that resolves to requested object
      */
-    public ListenableFuture<T> async() {
-        return async(Twilio.getRestClient());
+    public ListenableFuture<T> createAsync() {
+        return createAsync(Twilio.getRestClient());
     }
 
     /**
@@ -28,10 +28,10 @@ public ListenableFuture<T> async() {
      * @param client client used to make request
      * @return future that resolves to requested object
      */
-    public ListenableFuture<T> async(final TwilioRestClient client) {
+    public ListenableFuture<T> createAsync(final TwilioRestClient client) {
         return Twilio.getExecutorService().submit(new Callable<T>() {
             public T call() {
-                return execute(client);
+                return create(client);
             }
         });
     }
@@ -41,8 +41,8 @@ public T call() {
      *
      * @return Requested object
      */
-    public T execute() {
-        return execute(Twilio.getRestClient());
+    public T create() {
+        return create(Twilio.getRestClient());
     }
 
     /**
@@ -51,5 +51,5 @@ public T execute() {
      * @param client client used to make request
      * @return Requested object
      */
-    public abstract T execute(final TwilioRestClient client);
+    public abstract T create(final TwilioRestClient client);
 }

src/main/java/com/twilio/base/Deleter.java

@@ -18,8 +18,8 @@ public abstract class Deleter<T extends Resource> {
      *
      * @return future that resolves to true if the object was deleted
      */
-    public ListenableFuture<Boolean> async() {
-        return async(Twilio.getRestClient());
+    public ListenableFuture<Boolean> deleteAsync() {
+        return deleteAsync(Twilio.getRestClient());
     }
 
     /**
@@ -28,10 +28,10 @@ public ListenableFuture<Boolean> async() {
      * @param client client used to make request
      * @return future that resolves to true if the object was deleted
      */
-    public ListenableFuture<Boolean> async(final TwilioRestClient client) {
+    public ListenableFuture<Boolean> deleteAsync(final TwilioRestClient client) {
         return Twilio.getExecutorService().submit(new Callable<Boolean>() {
             public Boolean call() {
-                return execute(client);
+                return delete(client);
             }
         });
     }
@@ -41,8 +41,8 @@ public Boolean call() {
      *
      * @return true if the object was deleted
      */
-    public boolean execute() {
-        return execute(Twilio.getRestClient());
+    public boolean delete() {
+        return delete(Twilio.getRestClient());
     }
 
     /**
@@ -51,5 +51,5 @@ public boolean execute() {
      * @param client client used to make request
      * @return true if the object was deleted
      */
-    public abstract boolean execute(final TwilioRestClient client);
+    public abstract boolean delete(final TwilioRestClient client);
 }

src/main/java/com/twilio/base/Fetcher.java

@@ -18,8 +18,8 @@ public abstract class Fetcher<T extends Resource> {
      *
      * @return future that resolves to requested object
      */
-    public ListenableFuture<T> async() {
-        return async(Twilio.getRestClient());
+    public ListenableFuture<T> fetchAsync() {
+        return fetchAsync(Twilio.getRestClient());
     }
 
     /**
@@ -28,10 +28,10 @@ public ListenableFuture<T> async() {
      * @param client client used to make request
      * @return future that resolves to requested object
      */
-    public ListenableFuture<T> async(final TwilioRestClient client) {
+    public ListenableFuture<T> fetchAsync(final TwilioRestClient client) {
         return Twilio.getExecutorService().submit(new Callable<T>() {
             public T call() {
-                return execute(client);
+                return fetch(client);
             }
         });
     }
@@ -41,8 +41,8 @@ public T call() {
      *
      * @return Requested object
      */
-    public T execute() {
-        return execute(Twilio.getRestClient());
+    public T fetch() {
+        return fetch(Twilio.getRestClient());
     }
 
     /**
@@ -51,5 +51,5 @@ public T execute() {
      * @param client client used to make request
      * @return Requested object
      */
-    public abstract T execute(final TwilioRestClient client);
+    public abstract T fetch(final TwilioRestClient client);
 }

src/main/java/com/twilio/base/Reader.java

@@ -23,8 +23,8 @@ public abstract class Reader<T extends Resource> {
      *
      * @return ResourceSet of objects
      */
-    public ResourceSet<T> execute() {
-        return execute(Twilio.getRestClient());
+    public ResourceSet<T> read() {
+        return read(Twilio.getRestClient());
     }
 
     /**
@@ -33,15 +33,15 @@ public ResourceSet<T> execute() {
      * @param client client used to make request
      * @return ResourceSet of objects
      */
-    public abstract ResourceSet<T> execute(final TwilioRestClient client);
+    public abstract ResourceSet<T> read(final TwilioRestClient client);
 
     /**
      * Execute an async request using default client.
      *
      * @return future that resolves to the ResourceSet of objects
      */
-    public ListenableFuture<ResourceSet<T>> async() {
-        return async(Twilio.getRestClient());
+    public ListenableFuture<ResourceSet<T>> readAsync() {
+        return readAsync(Twilio.getRestClient());
     }
 
     /**
@@ -50,10 +50,10 @@ public ListenableFuture<ResourceSet<T>> async() {
      * @param client client used to make request
      * @return future that resolves to the ResourceSet of objects
      */
-    public ListenableFuture<ResourceSet<T>> async(final TwilioRestClient client) {
+    public ListenableFuture<ResourceSet<T>> readAsync(final TwilioRestClient client) {
         return Twilio.getExecutorService().submit(new Callable<ResourceSet<T>>() {
             public ResourceSet<T> call() {
-                return execute(client);
+                return read(client);
             }
         });
     }

src/main/java/com/twilio/base/Updater.java

@@ -3,7 +3,6 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.twilio.Twilio;
 import com.twilio.http.TwilioRestClient;
-import com.twilio.base.Resource;
 
 import java.util.concurrent.Callable;
 
@@ -19,8 +18,8 @@ public abstract class Updater<T extends Resource> {
      *
      * @return future that resolves to requested object
      */
-    public ListenableFuture<T> async() {
-        return async(Twilio.getRestClient());
+    public ListenableFuture<T> updateAsync() {
+        return updateAsync(Twilio.getRestClient());
     }
 
     /**
@@ -29,10 +28,10 @@ public ListenableFuture<T> async() {
      * @param client client used to make request
      * @return future that resolves to requested object
      */
-    public ListenableFuture<T> async(final TwilioRestClient client) {
+    public ListenableFuture<T> updateAsync(final TwilioRestClient client) {
         return Twilio.getExecutorService().submit(new Callable<T>() {
             public T call() {
-                return execute(client);
+                return update(client);
             }
         });
     }
@@ -42,8 +41,8 @@ public T call() {
      *
      * @return Requested object
      */
-    public T execute() {
-        return execute(Twilio.getRestClient());
+    public T update() {
+        return update(Twilio.getRestClient());
     }
 
     /**
@@ -52,5 +51,5 @@ public T execute() {
      * @param client client used to make request
      * @return Requested object
      */
-    public abstract T execute(final TwilioRestClient client);
+    public abstract T update(final TwilioRestClient client);
 }

src/main/java/com/twilio/example/Example.java

@@ -52,7 +52,7 @@ public static void main(String[] args) throws TwiMLException {
             PHONE_NUMBER,
             number.getPhoneNumber(),
             "Hello world!"
-        ).execute();
+        ).create();
 
         System.out.println(message.getSid());
         System.out.println(message.getBody());
@@ -63,35 +63,35 @@ public static void main(String[] args) throws TwiMLException {
             PHONE_NUMBER,
             number.getPhoneNumber(),
             URI.create("https://twilio.com")
-        ).execute();
+        ).create();
         System.out.println(call.getSid());
 
         // Print all the messages
-        Iterable<Message> messages = new MessageReader().execute();
+        Iterable<Message> messages = new MessageReader().read();
         for (Message m : messages) {
             System.out.println(m.getSid());
             System.out.println(m.getBody());
         }
 
         // Get some calls
-        Iterable<Call> calls = new CallReader().pageSize(2).execute();
+        Iterable<Call> calls = new CallReader().pageSize(2).read();
         for (Call c : calls) {
             System.out.println(c.getSid());
         }
 
         Trunk trunk = new TrunkCreator()
             .setFriendlyName("shiny trunk")
             .setSecure(false)
-            .execute();
+            .create();
 
         System.out.println(trunk);
 
         // Delete a resource
-        Service service = Service.create().execute();
-        boolean result = Service.delete(service.getSid()).execute();
+        Service service = Service.creator().create();
+        boolean result = Service.deleter(service.getSid()).delete();
         System.out.println(result);
 
-        Iterable<Service> services = Service.read().pageSize(2).execute();
+        Iterable<Service> services = Service.reader().pageSize(2).read();
         int j = 0;
         for (Service s : services) {
             System.out.println("Service " + j + ": " + s.getSid());
@@ -108,7 +108,7 @@ public static void main(String[] args) throws TwiMLException {
 
     private static IncomingPhoneNumber buyNumber() {
         // Look up some phone numbers
-        Iterable<Local> numbers = new LocalReader(ACCOUNT_SID, "US").execute();
+        Iterable<Local> numbers = new LocalReader(ACCOUNT_SID, "US").read();
 
         // Buy the first phone number
         Iterator<Local> iter = numbers.iterator();
@@ -117,7 +117,7 @@ private static IncomingPhoneNumber buyNumber() {
             return new IncomingPhoneNumberCreator(
                 ACCOUNT_SID,
                 local.getPhoneNumber()
-            ).execute();
+            ).create();
         }
 
         return null;

src/main/java/com/twilio/example/resource/CallCreatorExample.java

@@ -22,14 +22,14 @@ public static void main(final String[] args) {
         try {
 
             CallCreator creator =
-                Call.create(
+                Call.creator(
                     "AC123",
                     new PhoneNumber("+14156085895"),
                     new PhoneNumber("+14154888928"),
                     new URI("http://twimlbin.com/4397e62f")
                 );
 
-            Call call = creator.execute();
+            Call call = creator.create();
 
             System.out.println(call.getSid());
             System.out.println(call.getStatus().toString());

src/main/java/com/twilio/example/resource/CallDeleterExample.java

@@ -17,8 +17,8 @@ public static void main(final String[] args) {
 
         try {
 
-            CallDeleter deleter = Call.delete("AC123", "CA123");
-            deleter.execute();
+            CallDeleter deleter = Call.deleter("AC123", "CA123");
+            deleter.delete();
 
         } catch (ApiException e) {
 

src/main/java/com/twilio/example/resource/CallFetcherExample.java

@@ -16,8 +16,8 @@ public static void main(String[] args) {
 
         try {
 
-            CallFetcher fetcher = Call.fetch("AC123", "CA123");
-            Call call = fetcher.execute();
+            CallFetcher fetcher = Call.fetcher("AC123", "CA123");
+            Call call = fetcher.fetch();
 
             System.out.print(call.getSid());
 

src/main/java/com/twilio/example/resource/CallReaderExample.java

@@ -17,8 +17,8 @@ public static void main(final String[] args) {
 
         try {
 
-            CallReader reader = Call.read("AC123");
-            ResourceSet<Call> calls = reader.execute();
+            CallReader reader = Call.reader("AC123");
+            ResourceSet<Call> calls = reader.read();
 
             int idx = 1;
             for (Call call : calls) {