[Draft] Resolve #646 - remove lombok

pom.xml

@@ -135,12 +135,6 @@
     <dependency.skip>false</dependency.skip>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.18.12</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
@@ -415,4 +409,4 @@
     <artifactId>oss-parent</artifactId>
     <version>7</version>
   </parent>
-</project>
+</project>

src/main/java/com/twilio/jwt/taskrouter/Policy.java

@@ -6,18 +6,14 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.twilio.http.HttpMethod;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
 import java.util.Objects;
 
-import lombok.ToString;
-
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class Policy {
 
     @JsonProperty("url")
@@ -100,7 +96,11 @@ public int hashCode() {
         return Objects.hash(url, method, queryFilter, postFilter, allowed);
     }
 
-    public static class Builder {
+  public String toString() {
+    return "Policy(url=" + this.getUrl() + ", method=" + this.getMethod() + ", queryFilter=" + this.getQueryFilter() + ", postFilter=" + this.getPostFilter() + ", allowed=" + this.isAllowed() + ")";
+  }
+
+  public static class Builder {
         private String url;
         private HttpMethod method = HttpMethod.GET;
         private Map<String, FilterRequirement> queryFilter;

src/main/java/com/twilio/rest/accounts/v1/AuthTokenPromotion.java

@@ -17,23 +17,13 @@
 import com.twilio.converter.DateConverter;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
-import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class AuthTokenPromotion extends Resource {
     private static final long serialVersionUID = 204657511452107L;
 
@@ -184,4 +174,8 @@ public int hashCode() {
                             dateUpdated,
                             url);
     }
-}
+
+  public String toString() {
+    return "AuthTokenPromotion(accountSid=" + this.getAccountSid() + ", authToken=" + this.getAuthToken() + ", dateCreated=" + this.getDateCreated() + ", dateUpdated=" + this.getDateUpdated() + ", url=" + this.getUrl() + ")";
+  }
+}

src/main/java/com/twilio/rest/accounts/v1/SecondaryAuthToken.java

@@ -17,23 +17,13 @@
 import com.twilio.converter.DateConverter;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
-import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class SecondaryAuthToken extends Resource {
     private static final long serialVersionUID = 162357599411604L;
 
@@ -193,4 +183,8 @@ public int hashCode() {
                             secondaryAuthToken,
                             url);
     }
-}
+
+  public String toString() {
+    return "SecondaryAuthToken(accountSid=" + this.getAccountSid() + ", dateCreated=" + this.getDateCreated() + ", dateUpdated=" + this.getDateUpdated() + ", secondaryAuthToken=" + this.getSecondaryAuthToken() + ", url=" + this.getUrl() + ")";
+  }
+}

src/main/java/com/twilio/rest/accounts/v1/credential/Aws.java

@@ -17,23 +17,13 @@
 import com.twilio.converter.DateConverter;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
-import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class Aws extends Resource {
     private static final long serialVersionUID = 108884981918794L;
 
@@ -236,4 +226,8 @@ public int hashCode() {
                             dateUpdated,
                             url);
     }
-}
+
+  public String toString() {
+    return "Aws(sid=" + this.getSid() + ", accountSid=" + this.getAccountSid() + ", friendlyName=" + this.getFriendlyName() + ", dateCreated=" + this.getDateCreated() + ", dateUpdated=" + this.getDateUpdated() + ", url=" + this.getUrl() + ")";
+  }
+}

src/main/java/com/twilio/rest/accounts/v1/credential/PublicKey.java

@@ -17,23 +17,13 @@
 import com.twilio.converter.DateConverter;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
-import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class PublicKey extends Resource {
     private static final long serialVersionUID = 108884981918794L;
 
@@ -237,4 +227,8 @@ public int hashCode() {
                             dateUpdated,
                             url);
     }
-}
+
+  public String toString() {
+    return "PublicKey(sid=" + this.getSid() + ", accountSid=" + this.getAccountSid() + ", friendlyName=" + this.getFriendlyName() + ", dateCreated=" + this.getDateCreated() + ", dateUpdated=" + this.getDateUpdated() + ", url=" + this.getUrl() + ")";
+  }
+}

src/main/java/com/twilio/rest/api/v2010/Account.java

@@ -18,26 +18,21 @@
 import com.twilio.converter.Promoter;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
-import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.ZonedDateTime;
 import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class Account extends Resource {
     private static final long serialVersionUID = 82837000699633L;
 
-    public enum Status {
+  public String toString() {
+    return "Account(authToken=" + this.getAuthToken() + ", dateCreated=" + this.getDateCreated() + ", dateUpdated=" + this.getDateUpdated() + ", friendlyName=" + this.getFriendlyName() + ", ownerAccountSid=" + this.getOwnerAccountSid() + ", sid=" + this.getSid() + ", status=" + this.getStatus() + ", subresourceUris=" + this.getSubresourceUris() + ", type=" + this.getType() + ", uri=" + this.getUri() + ")";
+  }
+
+  public enum Status {
         ACTIVE("active"),
         SUSPENDED("suspended"),
         CLOSED("closed");
@@ -352,4 +347,4 @@ public int hashCode() {
                             type,
                             uri);
     }
-}
+}

src/main/java/com/twilio/rest/api/v2010/account/Address.java

@@ -17,22 +17,12 @@
 import com.twilio.converter.DateConverter;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
-import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class Address extends Resource {
     private static final long serialVersionUID = 59858064655653L;
 
@@ -453,4 +443,8 @@ public int hashCode() {
                             validated,
                             verified);
     }
-}
+
+  public String toString() {
+    return "Address(accountSid=" + this.getAccountSid() + ", city=" + this.getCity() + ", customerName=" + this.getCustomerName() + ", dateCreated=" + this.getDateCreated() + ", dateUpdated=" + this.getDateUpdated() + ", friendlyName=" + this.getFriendlyName() + ", isoCountry=" + this.getIsoCountry() + ", postalCode=" + this.getPostalCode() + ", region=" + this.getRegion() + ", sid=" + this.getSid() + ", street=" + this.getStreet() + ", uri=" + this.getUri() + ", emergencyEnabled=" + this.getEmergencyEnabled() + ", validated=" + this.getValidated() + ", verified=" + this.getVerified() + ")";
+  }
+}

src/main/java/com/twilio/rest/api/v2010/account/Application.java

@@ -17,23 +17,14 @@
 import com.twilio.converter.DateConverter;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
 import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.time.ZonedDateTime;
-import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class Application extends Resource {
     private static final long serialVersionUID = 30273898590025L;
 
@@ -507,4 +498,8 @@ public int hashCode() {
                             voiceMethod,
                             voiceUrl);
     }
-}
+
+  public String toString() {
+    return "Application(accountSid=" + this.getAccountSid() + ", apiVersion=" + this.getApiVersion() + ", dateCreated=" + this.getDateCreated() + ", dateUpdated=" + this.getDateUpdated() + ", friendlyName=" + this.getFriendlyName() + ", messageStatusCallback=" + this.getMessageStatusCallback() + ", sid=" + this.getSid() + ", smsFallbackMethod=" + this.getSmsFallbackMethod() + ", smsFallbackUrl=" + this.getSmsFallbackUrl() + ", smsMethod=" + this.getSmsMethod() + ", smsStatusCallback=" + this.getSmsStatusCallback() + ", smsUrl=" + this.getSmsUrl() + ", statusCallback=" + this.getStatusCallback() + ", statusCallbackMethod=" + this.getStatusCallbackMethod() + ", uri=" + this.getUri() + ", voiceCallerIdLookup=" + this.getVoiceCallerIdLookup() + ", voiceFallbackMethod=" + this.getVoiceFallbackMethod() + ", voiceFallbackUrl=" + this.getVoiceFallbackUrl() + ", voiceMethod=" + this.getVoiceMethod() + ", voiceUrl=" + this.getVoiceUrl() + ")";
+  }
+}

src/main/java/com/twilio/rest/api/v2010/account/AuthorizedConnectApp.java

@@ -18,28 +18,22 @@
 import com.twilio.converter.Promoter;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
-import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.time.ZonedDateTime;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class AuthorizedConnectApp extends Resource {
     private static final long serialVersionUID = 67218777245125L;
 
-    public enum Permission {
+  public String toString() {
+    return "AuthorizedConnectApp(accountSid=" + this.getAccountSid() + ", connectAppCompanyName=" + this.getConnectAppCompanyName() + ", connectAppDescription=" + this.getConnectAppDescription() + ", connectAppFriendlyName=" + this.getConnectAppFriendlyName() + ", connectAppHomepageUrl=" + this.getConnectAppHomepageUrl() + ", connectAppSid=" + this.getConnectAppSid() + ", dateCreated=" + this.getDateCreated() + ", dateUpdated=" + this.getDateUpdated() + ", permissions=" + this.getPermissions() + ", uri=" + this.getUri() + ")";
+  }
+
+  public enum Permission {
         GET_ALL("get-all"),
         POST_ALL("post-all");
 
@@ -316,4 +310,4 @@ public int hashCode() {
                             permissions,
                             uri);
     }
-}
+}

src/main/java/com/twilio/rest/api/v2010/account/AvailablePhoneNumberCountry.java

@@ -16,22 +16,13 @@
 import com.twilio.base.Resource;
 import com.twilio.exception.ApiConnectionException;
 import com.twilio.exception.ApiException;
-import com.twilio.exception.RestException;
-import com.twilio.http.HttpMethod;
-import com.twilio.http.Request;
-import com.twilio.http.Response;
-import com.twilio.http.TwilioRestClient;
-import com.twilio.rest.Domains;
-import lombok.ToString;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 import java.util.Objects;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-@ToString
 public class AvailablePhoneNumberCountry extends Resource {
     private static final long serialVersionUID = 118317602820324L;
 
@@ -217,4 +208,8 @@ public int hashCode() {
                             beta,
                             subresourceUris);
     }
-}
+
+  public String toString() {
+    return "AvailablePhoneNumberCountry(countryCode=" + this.getCountryCode() + ", country=" + this.getCountry() + ", uri=" + this.getUri() + ", beta=" + this.getBeta() + ", subresourceUris=" + this.getSubresourceUris() + ")";
+  }
+}