Skip to content

Commit 9bc569c

Browse files
Merge pull request sendgrid#306 from btrajkovski/fix-java-packages
Fix java package names
2 parents 777abfd + ff0dc1b commit 9bc569c

21 files changed

+91
-41
lines changed

src/main/java/com/sendgrid/helpers/mail/Mail.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail;
22

3-
import com.fasterxml.jackson.annotation.JsonCreator;
4-
import com.fasterxml.jackson.annotation.JsonIgnore;
5-
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
63
import com.fasterxml.jackson.annotation.JsonInclude;
74
import com.fasterxml.jackson.annotation.JsonInclude.Include;
8-
95
import com.fasterxml.jackson.annotation.JsonProperty;
10-
import com.fasterxml.jackson.databind.JsonNode;
116
import com.fasterxml.jackson.databind.ObjectMapper;
12-
import com.fasterxml.jackson.databind.ObjectWriter;
137
import com.fasterxml.jackson.databind.SerializationFeature;
8+
import com.sendgrid.helpers.mail.objects.*;
149

1510
import java.io.IOException;
1611
import java.util.ArrayList;

src/main/java/com/sendgrid/helpers/mail/objects/ASM.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/sendgrid/helpers/mail/objects/Attachments.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonIgnoreType;
44
import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/com/sendgrid/helpers/mail/objects/BccSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/sendgrid/helpers/mail/objects/ClickTrackingSetting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/sendgrid/helpers/mail/objects/Content.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/sendgrid/helpers/mail/objects/Email.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/sendgrid/helpers/mail/objects/FooterSetting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/sendgrid/helpers/mail/objects/GoogleAnalyticsSetting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;

src/main/java/com/sendgrid/helpers/mail/objects/MailSettings.java

Lines changed: 60 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
package com.sendgrid;
1+
package com.sendgrid.helpers.mail.objects;
22

33
import com.fasterxml.jackson.annotation.JsonInclude;
44
import com.fasterxml.jackson.annotation.JsonInclude.Include;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66

7+
/**
8+
* An object representing a collection of different mail
9+
* settings that you can use to specify how you would
10+
* like this email to be handled.
11+
*/
12+
713
@JsonInclude(Include.NON_DEFAULT)
814
public class MailSettings {
915
@JsonProperty("bcc") private BccSettings bccSettings;
@@ -16,11 +22,24 @@ public class MailSettings {
1622
public BccSettings getBccSettings() {
1723
return bccSettings;
1824
}
19-
25+
26+
/**
27+
* Set the BCC settings.
28+
* @param bccSettings the BCC settings.
29+
*/
2030
public void setBccSettings(BccSettings bccSettings) {
2131
this.bccSettings = bccSettings;
2232
}
23-
33+
34+
/**
35+
* A setting that allows you to bypass all unsubscribe
36+
* groups and suppressions to ensure that the email is
37+
* delivered to every single recipient. This should only
38+
* be used in emergencies when it is absolutely necessary
39+
* that every recipient receives your email.
40+
* @return the bypass list setting.
41+
*/
42+
2443
@JsonProperty("bypass_list_management")
2544
public Setting getBypassListManagement() {
2645
return bypassListManagement;
@@ -29,30 +48,62 @@ public Setting getBypassListManagement() {
2948
public void setBypassListManagement(Setting bypassListManagement) {
3049
this.bypassListManagement = bypassListManagement;
3150
}
32-
51+
52+
/**
53+
* Get the the footer settings that you would like included on every email.
54+
* @return the setting.
55+
*/
56+
3357
@JsonProperty("footer")
3458
public FooterSetting getFooterSetting() {
3559
return footerSetting;
3660
}
37-
61+
62+
/**
63+
* Set the the footer settings that you would like included on every email.
64+
* @param footerSetting the setting.
65+
*/
3866
public void setFooterSetting(FooterSetting footerSetting) {
3967
this.footerSetting = footerSetting;
4068
}
41-
69+
70+
/**
71+
* Get sandbox mode. This allows you to send a test email to
72+
* ensure that your request body is valid and formatted correctly.
73+
* @return the sandbox mode setting.
74+
*/
75+
4276
@JsonProperty("sandbox_mode")
4377
public Setting getSandBoxMode() {
4478
return sandBoxMode;
4579
}
46-
80+
81+
/**
82+
* Set sandbox mode.
83+
* @param sandBoxMode the sandbox mode setting.
84+
*/
85+
@JsonProperty("sandbox_mode")
4786
public void setSandboxMode(Setting sandBoxMode) {
4887
this.sandBoxMode = sandBoxMode;
4988
}
50-
89+
90+
/**
91+
* Get the spam check setting. This allows you to test the
92+
* content of your email for spam.
93+
* @return the spam check setting.
94+
*/
95+
5196
@JsonProperty("spam_check")
5297
public SpamCheckSetting getSpamCheck() {
5398
return spamCheckSetting;
5499
}
55-
100+
101+
/**
102+
* Set the spam check setting. This allows you to test the
103+
* content of your email for spam.
104+
* @param spamCheckSetting the spam check setting.
105+
*/
106+
56107
public void setSpamCheckSetting(SpamCheckSetting spamCheckSetting) {
57108
this.spamCheckSetting = spamCheckSetting;
58109
}

0 commit comments

Comments
 (0)