fix: Reuse twiliorestclient for orgs api

README.md

@@ -221,8 +221,8 @@ public class Example {
 We are introducing Client Credentials Flow-based OAuth 2.0 authentication. 
 This feature is currently in `beta` and its implementation is subject to change.
 
-- API examples [here](https://github.com/twilio/twilio-java/blob/main/examples/FetchMessageUsingOAuth.md)
-- Organisation API examples [here](https://github.com/twilio/twilio-java/blob/main/examples/BearerTokenAuthentication.md)
+- API examples [here](https://github.com/twilio/twilio-java/blob/main/examples/PublicOAuthExample.md)
+- Organisation API examples [here](https://github.com/twilio/twilio-java/blob/main/examples/OrgsAPIExample.md)
 
 ### Iterate through records
 

examples/OrgsAPIExample.md

@@ -0,0 +1,34 @@
+    class OrgsAPIExample {
+        public static void main {
+
+            private static final String GRANT_TYPE = "grant_type_to_be_used";
+            private static final String CLIENT_SID =
+            "client_id_of_the_organization";
+            private static final String CLIENT_SECRET = "client_secret_of_organization";
+            private static final String ORGANISATION_ID = "id_of_the_organization";
+
+            //Getting access token - Method #1
+            Twilio.init(new OrgsClientCredentialProvider(CLIENT_SID, CLIENT_SECRET));
+            fetchAccountDetails();
+
+
+            //Scenario: 2 If in case one doesn't want to change the existing stored credential
+            // Pass Custom TwilioRestClient
+            // TokenManager tokenManager = new OrgsTokenManager(GRANT_TYPE, CLIENT_SID, CLIENT_SECRET);
+            // TokenAuthStrategy tokenAuthStrategy = new TokenAuthStrategy(tokenManager);
+            // TwilioRestClient client = new TwilioRestClient.Builder(tokenAuthStrategy).build();
+            // fetchAccountDetailsWithClient(client);
+        }
+
+        private static void fetchAccountDetails() {
+           ResourceSet<Account> accountSet = Account.reader(ORGANISATION_ID).read();
+           String accountSid = accountSet.iterator().next().getAccountSid();
+           System.out.println(accountSid);
+        }
+
+        private static void fetchAccountDetailsWithClient(TwilioRestClient client) {
+           ResourceSet<Account> accountSet = Account.reader(ORGANISATION_ID).read(client);
+           String accountSid = accountSet.iterator().next().getAccountSid();
+           System.out.println(accountSid);
+        }
+    }

examples/PublicOAuthExample.md

@@ -0,0 +1,35 @@
+```
+class PublicOAuthExample {
+    public static void main {
+
+        private static final String GRANT_TYPE = "grant_type_to_be_used";
+        private static final String OAUTH_CLIENT_SID = "client_id";
+        private static final String OAUTH_CLIENT_SECRET = "client_secret";
+        private static final String ACCOUNT_SID = "account_sid";
+        private static final String MESSAGE_SID = "message_sid";
+
+        //Getting access token - Method #1
+        Twilio.init(new ClientCredentialProvider(OAUTH_CLIENT_SID, OAUTH_CLIENT_SECRET), ACCOUNT_SID);
+        fetchMessage(MESSAGE_SID);
+
+
+        //Scenario: 2 If in case one doesn't want to change the existing stored credential
+        // Pass Custom TwilioRestClient
+        // TokenManager tokenManager = new ApiTokenManager(GRANT_TYPE, OAUTH_CLIENT_SID, OAUTH_CLIENT_SECRET);
+        // TokenAuthStrategy tokenAuthStrategy = new TokenAuthStrategy(tokenManager);
+        // TwilioRestClient client = new TwilioRestClient.Builder(tokenAuthStrategy).accountSid(ACCOUNT_SID).build();
+        // fetchMessageWithClient(MESSAGE_SID, client);
+    }
+
+    public static void fetchMessage(String sid) {
+        Message message = Message.fetcher(sid).fetch();
+        System.out.println("Fetched Message SID: " + message.getSid());
+    }
+
+    public static void fetchMessageWithClient(String sid, TwilioRestClient client) {
+        Message message = Message.fetcher(sid).fetch(client);
+        System.out.println("Fetched Message SID: " + message.getSid());
+    }
+}
+```
+

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

@@ -169,8 +169,9 @@ private static <T> Page<T> buildPage(JsonNode root, List<T> results) {
 
     private static <T> Page<T> buildNextGenPage(JsonNode root, List<T> results) {
         JsonNode meta = root.get("meta");
-        Builder<T> builder = new Builder<T>().url(meta.get("url").asText());
-
+        Builder<T> builder = new Builder<>();
+        if(meta != null && meta.get("url") != null) {
+            builder = builder.url(meta.get("url").asText());
         JsonNode nextPageNode = meta.get("next_page_url");
         if (!nextPageNode.isNull()) {
             builder.nextPageUrl(nextPageNode.asText());
@@ -192,6 +193,7 @@ private static <T> Page<T> buildNextGenPage(JsonNode root, List<T> results) {
         } else {
             builder.pageSize(results.size());
         }
+        }
 
         return builder.records(results).build();
     }