Add @deprecated anotation, re-add tests using deprecated setters

Author: nikolaseu

src/main/java/com/auth0/json/mgmt/guardian/EnrollmentTicket.java

@@ -68,7 +68,6 @@ public EnrollmentTicket(String userId, Boolean sendEmail, String email) {
      * Getter for the id of the User this ticket was made for.
      *
      * @return the user id.
-     * @deprecated
      */
     @JsonProperty("user_id")
     public String getUserId() {
@@ -81,6 +80,7 @@ public String getUserId() {
      * @param userId the user id to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("user_id")
     public void setUserId(String userId) {
         this.userId = userId;
@@ -90,7 +90,6 @@ public void setUserId(String userId) {
      * Whether to send and email for enrollment or not.
      *
      * @return true is this ticket will send an email upon enrollment, false otherwise.
-     * @deprecated
      */
     @JsonProperty("send_mail")
     public Boolean willSendEmail() {
@@ -103,6 +102,7 @@ public Boolean willSendEmail() {
      * @param sendEmail whether this ticket will send an email upon enrollment or not.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("send_mail")
     public void setSendEmail(Boolean sendEmail) {
         this.sendEmail = sendEmail;
@@ -112,7 +112,6 @@ public void setSendEmail(Boolean sendEmail) {
      * Getter for the email to which the ticket will be sent.
      *
      * @return the email.
-     * @deprecated
      */
     @JsonProperty("email")
     public String getEmail() {
@@ -125,6 +124,7 @@ public String getEmail() {
      * @param email the email to sent the ticket to.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("email")
     public void setEmail(String email) {
         this.email = email;

src/main/java/com/auth0/json/mgmt/guardian/SNSFactorProvider.java

@@ -25,6 +25,15 @@ public class SNSFactorProvider {
     @JsonProperty("sns_gcm_platform_application_arn")
     private String snsGCMPlatformApplicationArn;
 
+    /**
+     * Creates an empty SNS settings object
+     *
+     * @deprecated use the full constructor instead
+     */
+    @Deprecated
+    public SNSFactorProvider() {
+    }
+
     /**
      * Creates a SNS settings object
      *
@@ -59,6 +68,7 @@ public String getAWSAccessKeyId() {
      * @param awsAccessKeyId the AWS access key id to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("aws_access_key_id")
     public void setAWSAccessKeyId(String awsAccessKeyId) {
         this.awsAccessKeyId = awsAccessKeyId;
@@ -80,6 +90,7 @@ public String getAWSSecretAccessKey() {
      * @param awsSecretAccessKey the AWS secret access key to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("aws_secret_access_key")
     public void setAWSSecretAccessKey(String awsSecretAccessKey) {
         this.awsSecretAccessKey = awsSecretAccessKey;
@@ -101,6 +112,7 @@ public String getAWSRegion() {
      * @param awsRegion the AWS region to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("aws_region")
     public void setAWSRegion(String awsRegion) {
         this.awsRegion = awsRegion;
@@ -122,6 +134,7 @@ public String getSNSAPNSPlatformApplicationARN() {
      * @param apnARN the SNS APNs ARN to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("sns_apns_platform_application_arn")
     public void setSNSAPNSPlatformApplicationARN(String apnARN) {
         this.snsAPNSPlatformApplicationArn = apnARN;
@@ -143,6 +156,7 @@ public String getSNSGCMPlatformApplicationARN() {
      * @param gcmARN the SNS GCM ARN to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("sns_gcm_platform_application_arn")
     public void setSNSGCMPlatformApplicationARN(String gcmARN) {
         this.snsGCMPlatformApplicationArn = gcmARN;

src/main/java/com/auth0/json/mgmt/guardian/TwilioFactorProvider.java

@@ -23,6 +23,15 @@ public class TwilioFactorProvider {
     @JsonProperty("sid")
     private String sid;
 
+    /**
+     * Creates an empty Twilio settings object
+     *
+     * @deprecated use the full constructor instead
+     */
+    @Deprecated
+    public TwilioFactorProvider() {
+    }
+
     /**
      * Creates a Twilio settings object
      *
@@ -55,6 +64,7 @@ public String getFrom() {
      * @param from the from number to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("from")
     public void setFrom(String from) {
         this.from = from;
@@ -76,6 +86,7 @@ public String getMessagingServiceSID() {
      * @param messagingServiceSID the messaging service SID.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("messaging_service_sid")
     public void setMessagingServiceSID(String messagingServiceSID) {
         this.messagingServiceSID = messagingServiceSID;
@@ -97,6 +108,7 @@ public String getAuthToken() {
      * @param authToken the Twilio auth token to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("auth_token")
     public void setAuthToken(String authToken) {
         this.authToken = authToken;
@@ -118,6 +130,7 @@ public String getSID() {
      * @param SID the Twilio SID to set.
      * @deprecated use the constructor instead
      */
+    @Deprecated
     @JsonProperty("sid")
     public void setSID(String SID) {
         this.sid = SID;

src/test/java/com/auth0/json/mgmt/guardian/SNSFactorProviderTest.java

@@ -12,6 +12,24 @@ public class SNSFactorProviderTest extends JsonTest<SNSFactorProvider> {
 
     private static final String json = "{\"aws_access_key_id\":\"akey\",\"aws_secret_access_key\":\"secretakey\",\"aws_region\":\"ar\",\"sns_apns_platform_application_arn\":\"arn1\",\"sns_gcm_platform_application_arn\":\"arn2\"}";
 
+    @Test
+    public void shouldSerializeWithDeprecatedSetters() throws Exception {
+        SNSFactorProvider provider = new SNSFactorProvider();
+        provider.setAWSRegion("ar");
+        provider.setAWSAccessKeyId("akey");
+        provider.setAWSSecretAccessKey("secretakey");
+        provider.setSNSAPNSPlatformApplicationARN("arn1");
+        provider.setSNSGCMPlatformApplicationARN("arn2");
+
+        String serialized = toJSON(provider);
+        assertThat(serialized, is(notNullValue()));
+        assertThat(serialized, JsonMatcher.hasEntry("aws_access_key_id", "akey"));
+        assertThat(serialized, JsonMatcher.hasEntry("aws_secret_access_key", "secretakey"));
+        assertThat(serialized, JsonMatcher.hasEntry("aws_region", "ar"));
+        assertThat(serialized, JsonMatcher.hasEntry("sns_apns_platform_application_arn", "arn1"));
+        assertThat(serialized, JsonMatcher.hasEntry("sns_gcm_platform_application_arn", "arn2"));
+    }
+
     @Test
     public void shouldSerialize() throws Exception {
         SNSFactorProvider provider = new SNSFactorProvider("akey", "secretakey", "ar", "arn1", "arn2");

src/test/java/com/auth0/json/mgmt/guardian/TwilioFactorProviderTest.java

@@ -12,6 +12,22 @@ public class TwilioFactorProviderTest extends JsonTest<TwilioFactorProvider> {
 
     private static final String json = "{\"from\":\"+12356789\",\"messaging_service_sid\":\"id321\",\"auth_token\":\"atokEn\",\"sid\":\"id123\"}";
 
+    @Test
+    public void shouldSerializeWithDeprecatedSetters() throws Exception {
+        TwilioFactorProvider provider = new TwilioFactorProvider();
+        provider.setAuthToken("atokEn");
+        provider.setFrom("+12356789");
+        provider.setMessagingServiceSID("id321");
+        provider.setSID("id123");
+
+        String serialized = toJSON(provider);
+        assertThat(serialized, is(notNullValue()));
+        assertThat(serialized, JsonMatcher.hasEntry("from", "+12356789"));
+        assertThat(serialized, JsonMatcher.hasEntry("messaging_service_sid", "id321"));
+        assertThat(serialized, JsonMatcher.hasEntry("auth_token", "atokEn"));
+        assertThat(serialized, JsonMatcher.hasEntry("sid", "id123"));
+    }
+
     @Test
     public void shouldSerialize() throws Exception {
         TwilioFactorProvider provider = new TwilioFactorProvider("+12356789", "id321", "atokEn", "id123");