Skip to content

Commit 7f53ea0

Browse files
committed
Revert "feat: Support for token based authentication and no auth rest calls (#587)"""
This reverts commit 4d002b8.
1 parent 4d002b8 commit 7f53ea0

36 files changed

+179
-1678
lines changed

examples/java/src/main/java/com/twilio/rest/api/v2010/AccountCreator.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.api.v2010;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Creator;
1819
import com.twilio.constant.EnumConstants;
1920
import com.twilio.converter.Promoter;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.exception.ApiException;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831
import java.math.BigDecimal;
2932
import java.util.List;
@@ -49,10 +52,6 @@
4952

5053
import java.net.URI;
5154

52-
import com.twilio.base.Creator;
53-
import com.twilio.http.Request;
54-
import com.twilio.http.TwilioRestClient;
55-
5655
public class AccountCreator extends Creator<Account>{
5756
private Account.XTwilioWebhookEnabled xTwilioWebhookEnabled;
5857
private URI recordingStatusCallback;

examples/java/src/main/java/com/twilio/rest/api/v2010/AccountDeleter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.api.v2010;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Deleter;
1819
import com.twilio.converter.Promoter;
1920
import com.twilio.constant.EnumConstants;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.converter.Converter;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831
import java.time.LocalDate;
2932
import java.io.IOException;
@@ -42,10 +45,6 @@
4245

4346
import lombok.ToString;
4447

45-
import com.twilio.base.Deleter;
46-
import com.twilio.http.Request;
47-
import com.twilio.http.TwilioRestClient;
48-
4948
public class AccountDeleter extends Deleter<Account> {
5049
private String pathSid;
5150

examples/java/src/main/java/com/twilio/rest/api/v2010/AccountFetcher.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.api.v2010;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Fetcher;
1819
import com.twilio.constant.EnumConstants;
1920
import com.twilio.converter.Promoter;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.exception.ApiException;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831

2932
import java.io.IOException;
@@ -43,10 +46,6 @@
4346

4447
import lombok.ToString;
4548

46-
import com.twilio.base.Fetcher;
47-
import com.twilio.http.Request;
48-
import com.twilio.http.TwilioRestClient;
49-
5049
public class AccountFetcher extends Fetcher<Account> {
5150
private String pathSid;
5251

@@ -72,7 +71,7 @@ public Account fetch(final TwilioRestClient client) {
7271
Response response = client.request(request);
7372

7473
if (response == null) {
75-
throw new ApiConnectionException("Account fetch failed: Unable to connect to server");
74+
throw new ApiConnectionException("Account fetch failed: Unable to connect to server");
7675
} else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) {
7776
RestException restException = RestException.fromJson(response.getStream(), client.getObjectMapper());
7877
if (restException == null) {

examples/java/src/main/java/com/twilio/rest/api/v2010/AccountReader.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@
1515
package com.twilio.rest.api.v2010;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Reader;
1819
import com.twilio.constant.EnumConstants;
20+
import com.twilio.base.ResourceSet;
1921
import com.twilio.converter.Promoter;
2022
import com.twilio.exception.ApiConnectionException;
2123
import com.twilio.converter.PrefixedCollapsibleMap;
2224
import com.twilio.converter.Converter;
2325
import com.twilio.exception.ApiException;
2426
import com.twilio.exception.RestException;
2527
import com.twilio.http.HttpMethod;
28+
import com.twilio.http.Request;
2629
import com.twilio.http.Response;
30+
import com.twilio.http.TwilioRestClient;
2731
import com.twilio.rest.Domains;
32+
import com.twilio.base.Page;
2833
import java.time.LocalDate;
2934
import java.time.ZonedDateTime;
3035
import java.io.IOException;
@@ -42,12 +47,6 @@
4247

4348
import lombok.ToString;
4449

45-
import com.twilio.base.Page;
46-
import com.twilio.base.Reader;
47-
import com.twilio.base.ResourceSet;
48-
import com.twilio.http.Request;
49-
import com.twilio.http.TwilioRestClient;
50-
5150
public class AccountReader extends Reader<Account> {
5251
private ZonedDateTime dateCreated;
5352
private LocalDate dateTest;

examples/java/src/main/java/com/twilio/rest/api/v2010/AccountUpdater.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.api.v2010;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Updater;
1819
import com.twilio.constant.EnumConstants;
1920
import com.twilio.converter.Promoter;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.exception.ApiException;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831
import java.time.format.DateTimeFormatter;
2932
import com.twilio.converter.DateConverter;
@@ -43,11 +46,6 @@
4346

4447
import lombok.ToString;
4548

46-
import com.twilio.base.Updater;
47-
import com.twilio.http.Request;
48-
import com.twilio.http.TwilioRestClient;
49-
50-
5149
public class AccountUpdater extends Updater<Account>{
5250
private Account.Status status;
5351
private String pathSid;
@@ -98,7 +96,6 @@ public Account update(final TwilioRestClient client){
9896

9997
return Account.fromJson(response.getStream(), client.getObjectMapper());
10098
}
101-
10299
private void addPostParams(final Request request) {
103100
if (pauseBehavior != null) {
104101
request.addPostParam("PauseBehavior", pauseBehavior);

examples/java/src/main/java/com/twilio/rest/api/v2010/account/CallCreator.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.api.v2010.account;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Creator;
1819
import com.twilio.constant.EnumConstants;
1920
import com.twilio.converter.Promoter;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.exception.ApiException;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831
import java.math.BigDecimal;
2932
import java.util.List;
@@ -49,10 +52,6 @@
4952

5053
import java.net.URI;
5154

52-
import com.twilio.base.Creator;
53-
import com.twilio.http.Request;
54-
import com.twilio.http.TwilioRestClient;
55-
5655
public class CallCreator extends Creator<Call>{
5756
private String requiredStringProperty;
5857
private HttpMethod testMethod;

examples/java/src/main/java/com/twilio/rest/api/v2010/account/CallDeleter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.api.v2010.account;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Deleter;
1819
import com.twilio.converter.Promoter;
1920
import com.twilio.constant.EnumConstants;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.converter.Converter;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831
import java.time.LocalDate;
2932
import java.io.IOException;
@@ -42,10 +45,6 @@
4245

4346
import lombok.ToString;
4447

45-
import com.twilio.base.Deleter;
46-
import com.twilio.http.Request;
47-
import com.twilio.http.TwilioRestClient;
48-
4948
public class CallDeleter extends Deleter<Call> {
5049
private Integer pathTestInteger;
5150
private String pathAccountSid;

examples/java/src/main/java/com/twilio/rest/api/v2010/account/CallFetcher.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.api.v2010.account;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Fetcher;
1819
import com.twilio.constant.EnumConstants;
1920
import com.twilio.converter.Promoter;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.exception.ApiException;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831

2932
import java.io.IOException;
@@ -43,10 +46,6 @@
4346

4447
import lombok.ToString;
4548

46-
import com.twilio.base.Fetcher;
47-
import com.twilio.http.Request;
48-
import com.twilio.http.TwilioRestClient;
49-
5049
public class CallFetcher extends Fetcher<Call> {
5150
private Integer pathTestInteger;
5251
private String pathAccountSid;
@@ -76,7 +75,7 @@ public Call fetch(final TwilioRestClient client) {
7675
Response response = client.request(request);
7776

7877
if (response == null) {
79-
throw new ApiConnectionException("Call fetch failed: Unable to connect to server");
78+
throw new ApiConnectionException("Call fetch failed: Unable to connect to server");
8079
} else if (!TwilioRestClient.SUCCESS.test(response.getStatusCode())) {
8180
RestException restException = RestException.fromJson(response.getStream(), client.getObjectMapper());
8281
if (restException == null) {

examples/java/src/main/java/com/twilio/rest/api/v2010/account/call/FeedbackCallSummaryUpdater.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.api.v2010.account.call;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Updater;
1819
import com.twilio.constant.EnumConstants;
1920
import com.twilio.converter.Promoter;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.exception.ApiException;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831
import java.time.format.DateTimeFormatter;
2932
import com.twilio.converter.DateConverter;
@@ -43,11 +46,6 @@
4346

4447
import lombok.ToString;
4548

46-
import com.twilio.base.Updater;
47-
import com.twilio.http.Request;
48-
import com.twilio.http.TwilioRestClient;
49-
50-
5149
public class FeedbackCallSummaryUpdater extends Updater<FeedbackCallSummary>{
5250
private String pathSid;
5351
private LocalDate endDate;
@@ -110,7 +108,6 @@ public FeedbackCallSummary update(final TwilioRestClient client){
110108

111109
return FeedbackCallSummary.fromJson(response.getStream(), client.getObjectMapper());
112110
}
113-
114111
private void addPostParams(final Request request) {
115112
if (accountSid != null) {
116113
request.addPostParam("AccountSid", accountSid);

examples/java/src/main/java/com/twilio/rest/flexapi/v1/CallUpdater.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.twilio.rest.flexapi.v1;
1616

1717
import com.fasterxml.jackson.databind.ObjectMapper;
18+
import com.twilio.base.Updater;
1819
import com.twilio.constant.EnumConstants;
1920
import com.twilio.converter.Promoter;
2021
import com.twilio.exception.ApiConnectionException;
@@ -23,7 +24,9 @@
2324
import com.twilio.exception.ApiException;
2425
import com.twilio.exception.RestException;
2526
import com.twilio.http.HttpMethod;
27+
import com.twilio.http.Request;
2628
import com.twilio.http.Response;
29+
import com.twilio.http.TwilioRestClient;
2730
import com.twilio.rest.Domains;
2831
import java.time.format.DateTimeFormatter;
2932
import com.twilio.converter.DateConverter;
@@ -43,11 +46,6 @@
4346

4447
import lombok.ToString;
4548

46-
import com.twilio.base.Updater;
47-
import com.twilio.http.Request;
48-
import com.twilio.http.TwilioRestClient;
49-
50-
5149
public class CallUpdater extends Updater<Call>{
5250
private String pathSid;
5351

@@ -80,5 +78,4 @@ public Call update(final TwilioRestClient client){
8078

8179
return Call.fromJson(response.getStream(), client.getObjectMapper());
8280
}
83-
8481
}

0 commit comments

Comments
 (0)