Reverting previous merge (will replay it)

Author: dprothero

guides/voice/record-calls-guide/record-outgoing-call/example-1.7.x.java

@@ -15,13 +15,13 @@ public class Example {
     public static void main(String[] args) throws URISyntaxException {
         Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
-        Call call = Call.creator(
+        Call call = Call.create(
                 new PhoneNumber("+14155551212"),
                 new PhoneNumber("+15017250604"),
                 new URI("http://demo.twilio.com/docs/voice.xml")
                 )
                 .setRecord(true)
-                .create();
+                .execute();
 
         System.out.println(call.getSid());
     }

ip-messaging/rest/channels/create-channels/create-channels.7.x.java

@@ -13,10 +13,10 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Create the channel
-    Channel channel = Channel.creator(SERVICE_SID)
+    Channel channel = Channel.create(SERVICE_SID)
         .setFriendlyName("General")
         .setUniqueName("general")
-        .create();
+        .execute();
 
     System.out.println(channel.getAttributes());
   }

ip-messaging/rest/channels/delete-channels/delete-channels.7.x.java

@@ -13,7 +13,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Delete the channel
-    boolean didDelete = Channel.deleter(SERVICE_SID, "CHANNEL_SID").delete();
+    boolean didDelete = Channel.delete(SERVICE_SID, "CHANNEL_SID").execute();
 
     System.out.println(didDelete);
   }

ip-messaging/rest/channels/list-channels/list-channels.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the list of channels
-    ResourceSet<Channel> channels = Channel.reader(SERVICE_SID).read();
+    ResourceSet<Channel> channels = Channel.read(SERVICE_SID).execute();
 
     for (Channel channel : channels) {
       System.out.println(channel.getFriendlyName());

ip-messaging/rest/channels/retrieve-channels/retrieve-channels.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the channel
-    Channel channel = Channel.fetcher(SERVICE_SID, CHANNEL_SID).fetch();
+    Channel channel = Channel.fetch(SERVICE_SID, CHANNEL_SID).execute();
 
     System.out.println(channel.getFriendlyName());
   }

ip-messaging/rest/channels/update-channels/update-channels.7.x.java

@@ -15,9 +15,9 @@ public static void main(String[] args) {
 
     // Update the channel
     Channel channel = Channel
-        .updater(SERVICE_SID, CHANNEL_SID)
+        .update(SERVICE_SID, CHANNEL_SID)
         .setFriendlyName("ChannelName")
-        .update();
+        .execute();
 
     System.out.println(channel.getFriendlyName());
   }

ip-messaging/rest/credentials/create-credentials/create-credentials.7.x.java

@@ -13,10 +13,10 @@ public static void main(String[] args) {
 
     // Create a credential
     Credential credential = Credential
-        .creator(Credential.PushService.GCM)
+        .create(Credential.PushService.GCM)
         .setApiKey("XXX")
         .setFriendlyName("NAME")
-        .create();
+        .execute();
 
     System.out.println(credential.getFriendlyName());
   }

ip-messaging/rest/credentials/delete-credentials/delete-credentials.7.x.java

@@ -13,7 +13,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Delete the credential
-    boolean didDelete = Credential.deleter(CREDENTIAL_SID).delete();
+    boolean didDelete = Credential.delete(CREDENTIAL_SID).execute();
 
     System.out.println(didDelete);
   }

ip-messaging/rest/credentials/list-credentials/list-credentials.7.x.java

@@ -13,7 +13,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the list of credentials
-    ResourceSet<Credential> credentials = Credential.reader().read();
+    ResourceSet<Credential> credentials = Credential.read().execute();
 
     for (Credential credential : credentials) {
       System.out.println(credential.getSid());

ip-messaging/rest/credentials/retrieve-credentials/retrieve-credential.7.x.java

@@ -13,7 +13,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the credential
-    Credential credential = Credential.fetcher(CREDENTIAL_SID).fetch();
+    Credential credential = Credential.fetch(CREDENTIAL_SID).execute();
 
     System.out.println(credential.getFriendlyName());
   }

ip-messaging/rest/credentials/update-credentials/update-credentials.7.x.java

@@ -13,9 +13,9 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Update the credential
-    Credential credential = Credential.updater(CREDENTIAL_SID)
+    Credential credential = Credential.update(CREDENTIAL_SID)
         .setApiKey("NewApiKey")
-        .update();
+        .execute();
 
     System.out.println(credential.getFriendlyName());
   }

ip-messaging/rest/members/add-member/add-member.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Add a Member to the channel
-    Member member = Member.creator(SERVICE_SID, CHANNEL_SID, "identity").create();
+    Member member = Member.create(SERVICE_SID, CHANNEL_SID, "identity").execute();
 
     System.out.println(member.getDateCreated());
   }

ip-messaging/rest/members/list-members/list-members.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the list of members on that channel
-    ResourceSet<Member> members = Member.reader(SERVICE_SID, CHANNEL_SID).read();
+    ResourceSet<Member> members = Member.read(SERVICE_SID, CHANNEL_SID).execute();
 
     for (Member member : members) {
       System.out.println(member.getIdentity());

ip-messaging/rest/members/remove-member/remove-member.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Delete a a member from the channel
-    boolean deleted = Member.deleter(SERVICE_SID, CHANNEL_SID, MEMBER_SID).delete();
+    boolean deleted = Member.delete(SERVICE_SID, CHANNEL_SID, MEMBER_SID).execute();
 
     System.out.println(deleted);
   }

ip-messaging/rest/members/retrieve-member/retrieve-member.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the member
-    Member member = Member.fetcher(SERVICE_SID, CHANNEL_SID, MEMBER_SID).fetch();
+    Member member = Member.fetch(SERVICE_SID, CHANNEL_SID, MEMBER_SID).execute();
 
     System.out.println(member.getIdentity());
   }

ip-messaging/rest/messages/delete-messages/delete-messages.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Delete the message
-    boolean didDelete = Message.deleter(SERVICE_SID, CHANNEL_SID, MESSAGE_SID).delete();
+    boolean didDelete = Message.delete(SERVICE_SID, CHANNEL_SID, MESSAGE_SID).execute();
 
     System.out.println(didDelete);
   }

ip-messaging/rest/messages/list-messages/list-messages.7.x.java

@@ -16,7 +16,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // List the messages in the channel
-    ResourceSet<Message> messages = Message.reader(SERVICE_SID, CHANNEL_SID).read();
+    ResourceSet<Message> messages = Message.read(SERVICE_SID, CHANNEL_SID).execute();
 
     for (Message message : messages) {
       System.out.println(message.getBody());

ip-messaging/rest/messages/retrieve-messages/retrieve-messages.7.x.java

@@ -16,7 +16,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the message
-    Message message = Message.fetcher(SERVICE_SID, CHANNEL_SID, MESSAGE_SID).fetch();
+    Message message = Message.fetch(SERVICE_SID, CHANNEL_SID, MESSAGE_SID).execute();
 
     System.out.println(message.getBody());
   }

ip-messaging/rest/messages/send-messages/send-messages.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Create the message
-    Message message = Message.creator(SERVICE_SID, CHANNEL_SID, "MESSAGE").create();
+    Message message = Message.create(SERVICE_SID, CHANNEL_SID, "MESSAGE").execute();
 
     System.out.println(message.getFrom());
   }

ip-messaging/rest/messages/update-messages/update-messages.7.x.java

@@ -17,8 +17,8 @@ public static void main(String[] args) {
 
     // Update the message
     Message message = Message
-        .updater(SERVICE_SID, CHANNEL_SID, MESSAGE_SID, "New message body!")
-        .update();
+        .update(SERVICE_SID, CHANNEL_SID, MESSAGE_SID, "New message body!")
+        .execute();
 
     System.out.println(message.getBody());
   }

ip-messaging/rest/roles/create-role/create-role.7.x.java

@@ -20,8 +20,8 @@ public static void main(String[] args) {
 
     // Create a role
     Role role = Role
-        .creator(SERVICE_SID, "RoleName", Role.RoleType.DEPLOYMENT, permissions)
-        .create();
+        .create(SERVICE_SID, "RoleName", Role.RoleType.DEPLOYMENT, permissions)
+        .execute();
 
     System.out.println(role.getSid());
   }

ip-messaging/rest/roles/delete-role/delete-role.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Delete the role
-    boolean didDelete = Role.deleter(SERVICE_SID, "ROLE_SID").delete();
+    boolean didDelete = Role.delete(SERVICE_SID, "ROLE_SID").execute();
     System.out.println(didDelete);
   }
 }

ip-messaging/rest/roles/list-roles/list-roles.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     //List the roles
-    ResourceSet<Role> roles = Role.reader(SERVICE_SID).read();
+    ResourceSet<Role> roles = Role.read(SERVICE_SID).execute();
 
     for (Role role : roles) {
       System.out.println(role.getFriendlyName());

ip-messaging/rest/roles/retrieve-role/retrieve-role.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the role
-    Role role = Role.fetcher(SERVICE_SID, "ROLE_SID").fetch();
+    Role role = Role.fetch(SERVICE_SID, "ROLE_SID").execute();
 
     System.out.println(role.getFriendlyName());
   }

ip-messaging/rest/roles/update-role/update-role.7.x.java

@@ -19,6 +19,6 @@ public static void main(String[] args) {
     List<String> permissions = Arrays.asList("sendMessage", "leaveChannel");
 
     // Update the role
-    Role role = Role.updater(SERVICE_SID, "ROLE_SID", permissions).update();
+    Role role = Role.update(SERVICE_SID, "ROLE_SID", permissions).execute();
   }
 }

ip-messaging/rest/services/create-service/create-service.7.x.java

@@ -12,7 +12,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Create the service
-    Service service = Service.creator("ServiceName").create();
+    Service service = Service.create("ServiceName").execute();
 
     System.out.println(service.getFriendlyName());
   }

ip-messaging/rest/services/delete-service/delete-service.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Delete the service
-    boolean didDelete = Service.deleter(SERVICE_SID).delete();
+    boolean didDelete = Service.delete(SERVICE_SID).execute();
     System.out.println(didDelete);
   }
 }

ip-messaging/rest/services/list-service/list-service.7.x.java

@@ -13,7 +13,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // List the services
-    ResourceSet<Service> services = Service.reader().read();
+    ResourceSet<Service> services = Service.read().execute();
 
     for (Service service : services) {
       System.out.println(service.getFriendlyName());

ip-messaging/rest/services/retrieve-service/retrieve-service.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the service
-    Service service = Service.fetcher(SERVICE_SID).fetch();
+    Service service = Service.fetch(SERVICE_SID).execute();
 
     System.out.println(service.getFriendlyName());
   }

ip-messaging/rest/services/update-service/update-service.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Update the service
-    Service service = Service.updater(SERVICE_SID).setFriendlyName("NewServiceName").update();
+    Service service = Service.update(SERVICE_SID).setFriendlyName("NewServiceName").execute();
 
     System.out.println(service.getFriendlyName());
   }

ip-messaging/rest/users/create-user/create-user.7.x.java

@@ -14,7 +14,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Create the user
-    User user = User.creator(SERVICE_SID, "IDENTITY").create();
+    User user = User.create(SERVICE_SID, "IDENTITY").execute();
 
     System.out.println(user.getRoleSid());
   }

ip-messaging/rest/users/delete-user/delete-user.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Delete the user
-    boolean didDelete = User.deleter(SERVICE_SID, USER_SID).delete();
+    boolean didDelete = User.delete(SERVICE_SID, USER_SID).execute();
 
     System.out.println(didDelete);
   }

ip-messaging/rest/users/list-users/list-users.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // List the users
-    ResourceSet<User> users = User.reader(SERVICE_SID).read();
+    ResourceSet<User> users = User.read(SERVICE_SID).execute();
 
     for (User user : users) {
       System.out.println(user.getIdentity());

ip-messaging/rest/users/retrieve-user/retrieve-user.7.x.java

@@ -15,7 +15,7 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Retrieve the user
-    User user = User.fetcher(SERVICE_SID, USER_SID).fetch();
+    User user = User.fetch(SERVICE_SID, USER_SID).execute();
 
     System.out.println(user.getIdentity());
   }

ip-messaging/rest/users/update-user/update-user.7.x.java

@@ -15,9 +15,9 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     // Update the user
-    User user = User.updater(SERVICE_SID, USER_SID)
+    User user = User.update(SERVICE_SID, USER_SID)
         .setRoleSid("new_role_sid")
-        .update();
+        .execute();
 
     System.out.println(user.getRoleSid());
   }

lookups/lookup-get-addon-payfone-example-1/lookup-get-addon-payfone-1.7.x.java

@@ -21,11 +21,11 @@ public static void main(String[] args) {
     addOnData.put("payfone_tcpa_compliance", complianceData);
 
     PhoneNumber number = PhoneNumber
-        .fetcher(new com.twilio.type.PhoneNumber("+15108675309"))
+        .fetch(new com.twilio.type.PhoneNumber("+15108675309"))
         .setType("carrier")
         .setAddOns("payfone_tcpa_compliance")
         .setAddOnsData(addOnData)
-        .fetch();
+        .execute();
 
     System.out.println(number.getCarrier());
   }

lookups/lookup-get-basic-example-1/lookup-get-basic-example-1.7.x.java

@@ -14,9 +14,9 @@ public static void main(String[] args) {
     Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
     PhoneNumber number = PhoneNumber
-        .fetcher(new com.twilio.type.PhoneNumber("+15108675309"))
+        .fetch(new com.twilio.type.PhoneNumber("+15108675309"))
         .setType("carrier")
-        .fetch();
+        .execute();
 
     System.out.println(number.getCarrier().get("name"));
     System.out.println(number.getCarrier().get("type"));

lookups/lookup-get-basic-example-2/lookup-get-basic-example-2.7.x.java

@@ -16,10 +16,10 @@ public static void main(String[] args) throws UnsupportedEncodingException {
     String nationalNumber = URLEncoder.encode("(510) 867-5309", "UTF-8").replaceAll("\\+", "%20");
 
     PhoneNumber number = PhoneNumber
-        .fetcher(new com.twilio.type.PhoneNumber(nationalNumber))
+        .fetch(new com.twilio.type.PhoneNumber(nationalNumber))
         .setType("carrier")
         .setCountryCode("US")
-        .fetch();
+        .execute();
 
     System.out.println(number.getCarrier().get("name"));
     System.out.println(number.getCarrier().get("type"));

lookups/lookup-get-carrier-cname-example-1/lookup-get-carrier-cname-example-1.7.x.java

@@ -14,9 +14,9 @@ public static void main(String[] args) {
         Twilio.init(ACCOUNT_SID, AUTH_TOKEN);
 
         PhoneNumber number = PhoneNumber
-                .fetcher(new com.twilio.type.PhoneNumber("+15108675309"))
+                .fetch(new com.twilio.type.PhoneNumber("+15108675309"))
                 .setType(Arrays.asList("caller-name", "carrier"))
-                .fetch();
+                .execute();
 
         System.out.println(number.getCallerName());
     }