Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
256 commits
Select commit Hold shift + click to select a range
e5471ae
Version Bump v3.0.6: Added troubleshooting section
thinkingserious Jul 26, 2016
feffaab
Android compatability
thinkingserious Aug 4, 2016
7492ee0
Version Bump v3.0.7: Error handling improvements
thinkingserious Aug 8, 2016
7dd02e9
Version Bump v2.3.4: Fix Response Charset to UTF-8
thinkingserious Aug 9, 2016
f19ba88
Add Table of Contents to README and create USE_CASES section
thinkingserious Aug 24, 2016
8c4c157
Merge pull request #132 from sendgrid/toc-template
thinkingserious Aug 24, 2016
d6ca1b4
Version Bump v3.0.9: Added TOC to README, Added USE_CASES.md
thinkingserious Aug 24, 2016
9d14b95
Breaking Changes Update
thinkingserious Sep 12, 2016
09d9114
[Enhancement] allow using custom Client
dmaicher Oct 11, 2016
4a82ea0
Merge pull request #158 from dmaicher/client-customization
thinkingserious Oct 11, 2016
168bef6
Version Bump v3.1.0: PR #158, Solves #138 [Enhancement] allow using c…
thinkingserious Oct 11, 2016
8ceea42
Update testing instructions
thinkingserious Oct 12, 2016
207a872
Formating adjustment
thinkingserious Oct 12, 2016
c04e25f
Fix #134. Adds an attachment builder class that supports passing cont…
dmitraver Oct 18, 2016
f2b1cea
Simplified `makeCall()` method.
rafalwrzeszcz Dec 1, 2016
6c96eea
Merge pull request #160 from dmitraver/read-attachments-from-inputstr…
thinkingserious Mar 22, 2017
bec414f
Version Bump v3.2.0: #160 Adds an attachment builder that supports In…
thinkingserious Mar 22, 2017
3cabc41
Update CLA process
Apr 4, 2017
ed4245d
Merge pull request #175 from rafalwrzeszcz/feature/simplify
thinkingserious Apr 13, 2017
719a66f
Version Bump v3.2.1: #175 Simplified method.
thinkingserious Apr 13, 2017
e6c8356
Modify SendGrid class to use getters and setters, let the tests use s…
diegoc-am Oct 19, 2016
91edbe6
Modified examples to use java-http-client version 4.0.0
diegoc-am Oct 20, 2016
9a25e07
Update documentation for java-http-client version 4.0.0
diegoc-am Oct 20, 2016
a513999
Bump version of java-http-client dependency to 4.1.0
diegoc-am Apr 23, 2017
275326d
Return correct Email in getFrom
May 17, 2017
48dc3a9
Update README.md
thinkingserious May 18, 2017
575b0f4
Update README.md
thinkingserious May 18, 2017
7cff48d
Merge pull request #162 from belfazt/update-java-http-client-dependen…
thinkingserious May 19, 2017
3c3ca49
Version Bump v4.0.0: PR #162 Update java http client dependency to 4.…
thinkingserious May 19, 2017
aeda576
Update CHANGELOG.md
thinkingserious May 19, 2017
45e4b0d
Merge pull request #199 from jareddellitt/fix-get-from
thinkingserious May 22, 2017
0ed95fa
Version Bump v4.0.1: PR #199 Return correct Email in getFrom
thinkingserious May 22, 2017
2a86519
Update README.md
thinkingserious May 22, 2017
d85382c
Update test to match Hello World in README
thinkingserious Jun 28, 2017
17ecf95
Merge pull request #203 from sendgrid/hello_world_test
thinkingserious Jun 28, 2017
708d3ec
Update README.md
thinkingserious Jul 25, 2017
f178ff0
Ignore .settings
thinkingserious Jul 25, 2017
1882915
Update link to fat jar download
thinkingserious Jul 25, 2017
82a9445
Fix upload script
thinkingserious Jul 25, 2017
e172779
Use https
thinkingserious Jul 25, 2017
b68c90a
Update USAGE.md
thinkingserious Jul 27, 2017
a207d28
Return empty collections in place of nulls
TBuc Jul 31, 2017
de0369a
Add release notifications
gabrielkrell Jul 31, 2017
1797421
Merge pull request #210 from gabrielkrell/master
thinkingserious Aug 1, 2017
c6539fc
Returning immutable empty Collections
TBuc Aug 2, 2017
87e50af
Merge pull request #211 from TBuc/patch-1
thinkingserious Aug 17, 2017
a1f9c5b
Version Bump: v4.1.0: PR #211 Return empty collections in place of nulls
thinkingserious Aug 17, 2017
d9f421f
Travis
thinkingserious Aug 17, 2017
e817ee4
Travis
thinkingserious Aug 17, 2017
daa4ae4
Mail Helper Refactor Proposal
thinkingserious Sep 17, 2017
f5e32f6
Update mail-helper-refactor.md
thinkingserious Sep 17, 2017
338cb04
Update mail-helper-refactor.md
thinkingserious Sep 17, 2017
6d5b126
Alway serialize click-tracking parameters
mbarbon Sep 19, 2017
3acee9f
The license file is put into the release jar.
sccalabr Oct 1, 2017
e61af6c
Adding SendGridApi interface.
sccalabr Oct 1, 2017
b8af1fc
Fixing Mail deserialization issue.
sccalabr Oct 1, 2017
4d0394e
CONTIBUTING.md broken link fixed.
p3trur0 Oct 2, 2017
473fb56
contributing.md broken link fixed
p3trur0 Oct 2, 2017
2c0183d
Changes serialization type for settings to serialize values only if t…
dmitraver Oct 3, 2017
2199f12
Adds prism installation script to travis.
dmitraver Oct 3, 2017
008b04a
Creates gradle task to download and start prism locally.
dmitraver Oct 4, 2017
a6036a1
Update README.md
ciceropablo Oct 6, 2017
ad6a529
Update TROUBLESHOOTING.md
ciceropablo Oct 6, 2017
9ed5220
Update USAGE.md
ciceropablo Oct 6, 2017
3a1733f
Update USAGE.md
ciceropablo Oct 7, 2017
c0eb49d
Update USAGE.md with one period
excfergodst Oct 9, 2017
7469b42
fix the disappear logo
excfergodst Oct 9, 2017
09cd7e4
Merge pull request #242 from ciceropablo/patch-3
thinkingserious Oct 9, 2017
16a7b53
Merge pull request #244 from excfergodst/patch-2
thinkingserious Oct 9, 2017
fb66720
Merge pull request #243 from excfergodst/patch-1
thinkingserious Oct 9, 2017
0bb8107
Merge pull request #241 from ciceropablo/patch-2
thinkingserious Oct 9, 2017
fd05b94
Adding Docker support.
andy-trimble Oct 10, 2017
b785ae2
Addressing comments
sccalabr Oct 10, 2017
dc35aba
Rename SendGridApi.java to SendGridAPI.java
sccalabr Oct 10, 2017
c983fe4
Added javadocs.
andy-trimble Oct 10, 2017
083f524
Adds new lines to the end of the files.
dmitraver Oct 10, 2017
a21f3da
Makes prism script executable.
dmitraver Oct 10, 2017
68d82d9
Merge pull request #247 from sendgrid/javadoc
thinkingserious Oct 10, 2017
0000925
Initial implementation.
andy-trimble Oct 10, 2017
6e6d7b5
Fixed test race condition, and compile issue.
andy-trimble Oct 10, 2017
2afa519
Version Bump v4.1.1: PR #247 Added Javadocs.
thinkingserious Oct 10, 2017
725d0f9
Added CODE_OF_CONDUCT.md
jr-frazier Oct 10, 2017
10a0ea2
Adding @return @throws @param and formatting file.
sccalabr Oct 11, 2017
665b0b4
Fixes prism startup script. Attempts to fix travis build.
dmitraver Oct 11, 2017
8895f22
Update .travis.yml
thinkingserious Oct 11, 2017
02c6f4e
Update .travis.yml
thinkingserious Oct 11, 2017
195739b
Merge pull request #252 from JRFrazier/patch-1
thinkingserious Oct 11, 2017
9e8c2b8
Merge pull request #226 from P3trur0/contributing-update-1
thinkingserious Oct 12, 2017
5a0da48
Fixes field naming in tests.
dmitraver Oct 12, 2017
a43392f
Checks if the prism port is in use.
dmitraver Oct 12, 2017
9b3f92c
Reverts back to running prism in background.
dmitraver Oct 12, 2017
76596eb
Merge branch 'master' into tracking-settings-bug-216
thinkingserious Oct 12, 2017
2464dd8
Adding new line at the end of the file.
sccalabr Oct 13, 2017
e28455d
Adding new line at the end of the file.
sccalabr Oct 13, 2017
a061b8c
Prints debug statement and exception.
dmitraver Oct 13, 2017
6a626f3
Rethrow exception in a test.
dmitraver Oct 13, 2017
1ae3ed2
Reverts debugging statements.
dmitraver Oct 15, 2017
c866a49
Sets MOCK_HOST env variable in travis.
dmitraver Oct 15, 2017
db3f6c7
Update USE_CASES.md
shubheksha Oct 16, 2017
56e8770
Add a way to verify that the content doesn't contain sensitive inform…
diegoc-am Oct 16, 2017
a2e2213
Add links in the table of contents, fix repo name in links
shubheksha Oct 16, 2017
ba59272
add "viewing request body" section to troubleshooting
pushkyn Oct 17, 2017
6517d4a
Update USAGE.md and CONTRIBUTING.md
pushkyn Oct 17, 2017
8948b7f
Merge pull request #281 from pushkyn/update-usage-and-contributing
thinkingserious Oct 17, 2017
66d264b
Merge pull request #280 from pushkyn/troubleshooting-review-request-body
thinkingserious Oct 17, 2017
25fafa8
Prints TRVIS and MOCK_HOST env variables.
dmitraver Oct 20, 2017
ff020fa
Removes TRAVIS related logic from 10 tests.
dmitraver Oct 20, 2017
377892c
More SEO Friendly Section links
pushkyn Oct 20, 2017
0b9c047
Add/Update Badges on README
Oct 20, 2017
802f36d
Removes TRAVIS related logic from all tests.
dmitraver Oct 21, 2017
1df94b5
Update readme - added maven central badge
pushkyn Oct 21, 2017
e224ab2
Spelling corrections in .md files
brandon93s Oct 22, 2017
a74a8df
Making ReadMe/Doc sections more SEO Friendly
shashank135sharma Oct 22, 2017
ab34668
Making README/Doc sections more SEO friendly
shashank135sharma Oct 22, 2017
bbf0d51
Making README/Doc sections more SEO friendly
shashank135sharma Oct 22, 2017
8000a36
Making README/Doc sections more SEO friendly
shashank135sharma Oct 22, 2017
ff37ee0
Update .travis.yml
thinkingserious Oct 22, 2017
37dabf0
Merge pull request #229 from dmitraver/automate-prism-service-159
thinkingserious Oct 22, 2017
f438e94
Merge pull request #299 from brandon93s/spelling
Oct 22, 2017
009fed1
Merge pull request #294 from pushkyn/seo-friendly-section-links
Oct 22, 2017
86e42e6
Merge branch 'master' into master
Oct 22, 2017
b054d96
Merge pull request #300 from shashank135sharma/master
Oct 22, 2017
14dd8c5
Merge pull request #295 from mptap/update-readme
Oct 22, 2017
8820e8d
Merge pull request #296 from pushkyn/readme-maven-badge
Oct 22, 2017
5671dca
update readme - logo on separate line
pushkyn Oct 22, 2017
e0b14ab
Merge pull request #302 from pushkyn/readme-fix-logo
Oct 22, 2017
ce32558
Merge branch 'master' into api
sccalabr Oct 22, 2017
f9b1b92
Addressing comments.
sccalabr Oct 22, 2017
65ce199
Update README.md
shra1cumar Oct 23, 2017
6286caa
Merge branch 'master' of github.com:sendgrid/sendgrid-java into rate_…
andy-trimble Oct 23, 2017
48234ed
Merge branch 'master' of github.com:sendgrid/sendgrid-java into docker
andy-trimble Oct 23, 2017
ac1a990
Fix java package names
btrajkovski Oct 23, 2017
a0a51af
Fix a typo
ajiteshr7 Oct 23, 2017
bd28104
Remove redundant word 'the' from USAGE.md.
Szelmat Oct 23, 2017
447fd60
Merge branch 'master' into add-doc-sections
thinkingserious Oct 23, 2017
484328c
Merge pull request #265 from shubheksha/add-doc-sections
thinkingserious Oct 23, 2017
9b45d75
Merge pull request #305 from shra1cumar/master
Oct 24, 2017
45ac0f2
Merge branch 'master' into patch-1
Oct 24, 2017
fb5368c
Merge pull request #240 from ciceropablo/patch-1
Oct 24, 2017
db0635f
Merge pull request #307 from ajiteshr7/patch-1
Oct 24, 2017
c5df9b8
Merge pull request #308 from Szelmat/patch-1
Oct 24, 2017
22aee87
correction of typo in USAGE.md
pooja7b Oct 24, 2017
e6b838a
Create PULL_REQUEST_TEMPLATE
nishithshah2211 Oct 26, 2017
b9ddb85
Add .env_sample file
thiagobbt Oct 27, 2017
7507c05
Merge pull request #311 from pooja7b/patch-1
Oct 27, 2017
2f198a2
split examples by endpoint
Oct 27, 2017
7112179
split lists/recipients endpoint
Oct 27, 2017
1ca8320
split whitelabel examples by endpoint
Oct 27, 2017
61de103
[issue#336] Possible fix the duplciated code
luan-cestari Oct 28, 2017
7cb6fb1
[issue#336] Fix a generic type mismatch
luan-cestari Oct 28, 2017
aaa28b3
[issue#336] Fix a generic type mismatch
luan-cestari Oct 28, 2017
dc40bc9
Addressing comments.
sccalabr Oct 28, 2017
a61ffe1
Merge pull request #337 from teisena/master
Oct 28, 2017
1844839
Update CONTRIBUTING.md
rkaranam Oct 28, 2017
8500b76
Merge pull request #350 from rkaranam/patch-2
thinkingserious Oct 28, 2017
ccad505
Fix for issue #335
jnmau Oct 28, 2017
b02c534
Added README.md
jnmau Oct 28, 2017
b845405
update LICENSE - fix year
pushkyn Oct 28, 2017
7e4f255
Merge pull request #356 from pushkyn/update-license
Oct 28, 2017
6a32211
Changed file names
jnmau Oct 28, 2017
f638e77
Fixed Typo in README.md
jnmau Oct 28, 2017
2c3455d
Merge pull request #315 from nishithshah2211/pull_req_template
Oct 28, 2017
c81edde
Added unittest to check for specific repo files
Oct 28, 2017
6b64358
Merge pull request #245 from sendgrid/docker
Oct 28, 2017
6380cec
Quick and dirty changes to wait for prism
Oct 28, 2017
dd5ef8c
Updating fix for https://github.com/travis-ci/travis-ci/issues/5227
andy-trimble Oct 28, 2017
b85634b
Merge pull request #366 from sendgrid/mbernier-patch-1
Oct 29, 2017
7640de9
Merge branch 'master' of https://github.com/sendgrid/sendgrid-java in…
mbernier Oct 29, 2017
3e54539
Merge branch 'master' of https://github.com/sendgrid/sendgrid-java in…
mbernier Oct 29, 2017
66cdfb3
Merge branch 'master' of https://github.com/sendgrid/sendgrid-java in…
mbernier Oct 29, 2017
2051122
Merge branch 'master' of https://github.com/sendgrid/sendgrid-java
mbernier Oct 29, 2017
7041d1a
Merge branch 'master' into add-a-verification-before-adding-the-conte…
mbernier Oct 29, 2017
36a2361
remove sudo: false to make prism work
InfiniteCoder Oct 29, 2017
2a71672
update travis.yml to change openjdk7 to openjdk8
InfiniteCoder Oct 29, 2017
06b381e
Fix similar-code issue in examples/accesssettings/accesssettings.java
bhargodevarya Oct 28, 2017
c9e948a
Fix file_lines issue in examples/mailsettings/mailsettings.java
mithunsasidharan Oct 29, 2017
7c4e2e5
Merge pull request #368 from InfiniteCoder/master
thinkingserious Oct 29, 2017
7435a68
Merge pull request #338 from teisena/split_whitelabel
Oct 30, 2017
141848e
Break up the examples in examples/subusers/subusers.java to their own…
huytranrjc Oct 30, 2017
9092169
Fix "similar-code" issue in examples/whitelabel/ips.java
huytranrjc Oct 30, 2017
fdc7dea
Fix "similar-code" issue in examples/whitelabel/ips.java
huytranrjc Oct 30, 2017
6ea8a4d
Merge pull request #1 from sendgrid/master
mithunsasidharan Oct 30, 2017
4423627
update github PR template
pushkyn Oct 30, 2017
3ef1bb0
Merge pull request #381 from pushkyn/simplify-github-pr-template
Oct 30, 2017
91725bf
Refactoring suppression examples
pushkyn Oct 28, 2017
fb8fe56
Merge pull request #339 from luan-cestari/master
Oct 30, 2017
e6a5459
Addressed comments
Oct 30, 2017
c50d75c
Merge pull request #361 from bhargodevarya/333
Oct 31, 2017
056dd67
Changed license file path to .md from .txt
Oct 31, 2017
f4426b1
Merge pull request #362 from mptap/add-test-files-exist
Oct 31, 2017
d3f4f89
Merge pull request #220 from mbarbon/master
thinkingserious Oct 31, 2017
82b2867
Version Bump v4.1.2: PR #220 Alway serialize click-tracking parameters
thinkingserious Oct 31, 2017
fabd726
Add .codeclimate.yml file
rzats Oct 28, 2017
7637df1
Merge pull request #224 from sccalabr/api
thinkingserious Oct 31, 2017
0746a05
Merge branch 'master' into mailTest
thinkingserious Oct 31, 2017
a7f9823
Merge pull request #223 from sccalabr/license
thinkingserious Oct 31, 2017
34f49be
Merge branch 'master' into tracking-settings-bug-216
thinkingserious Oct 31, 2017
f9b4ac4
added source command
Oct 31, 2017
62e1137
Merge pull request #319 from thiagobbt/master
Oct 31, 2017
a6249d6
Merge pull request #373 from mithunsasidharan/master
Nov 1, 2017
2110e54
Merge pull request #228 from dmitraver/tracking-settings-bug-216
thinkingserious Nov 1, 2017
ae18ce7
Merge branch 'master' of github.com:sendgrid/sendgrid-java into rate_…
andy-trimble Nov 2, 2017
9722ac1
Updates jackson dependencies to the latest version.
dmitraver Nov 14, 2017
7c543a4
Merge pull request #345 from rzats/feat/codeclimate-yml
Nov 16, 2017
da70e5a
Merge pull request #359 from pushkyn/refactoring-example-suppression
Nov 16, 2017
e3a9cdf
Test to check year in license file
pushkyn Oct 28, 2017
fe032c9
Merge pull request #365 from pushkyn/test-license-date-range
Nov 21, 2017
22ba9e9
Merge branch 'master' into mailTest
thinkingserious Nov 28, 2017
4d58fcb
Merge pull request #225 from sccalabr/mailTest
thinkingserious Nov 28, 2017
6656b54
Merge pull request #379 from huytranrjc/master
Dec 11, 2017
b98bbd8
Merge pull request #380 from huytranrjc/FIX_374
Dec 11, 2017
0f23918
Merge pull request #249 from sendgrid/rate_limit
thinkingserious Dec 21, 2017
43429da
Merge branch 'master' into add-a-verification-before-adding-the-conte…
thinkingserious Dec 21, 2017
0b7f335
Merge pull request #275 from belfazt/add-a-verification-before-adding…
thinkingserious Dec 21, 2017
1ef503a
Merge pull request #410 from dmitraver/jackson-version-update
thinkingserious May 4, 2018
258f80b
Version Bump v4.2.0: Hacktoberfest rollup release
thinkingserious May 4, 2018
816451f
Version Bump v4.2.1: Update to latest Jackson recommended dependency
thinkingserious May 8, 2018
5437db4
Added dynamic_template_data property
Jul 30, 2018
27206d0
Included generation of dynamic_template_data in testKitchenSink
Jul 30, 2018
56c293f
Updated to demonstrate new Dynamic Templates using helper and renamed…
Jul 30, 2018
c271344
Changed type parameter of dynamicTemplateData
Jul 31, 2018
b871043
Included generation of more complex dynamic template data to testKitc…
Jul 31, 2018
74962e5
Refactor in getDynamicemplateData
Aug 2, 2018
07b0be2
Added coders tag
af4ro Aug 7, 2018
2008480
Merge pull request #451 from sendgrid/af4ro-patch-1
thinkingserious Aug 8, 2018
cced93c
Readability update
af4ro Aug 10, 2018
9a8e3c3
Merge pull request #453 from sendgrid/af4ro-patch-2
thinkingserious Aug 13, 2018
96655f3
Update USE_CASES.md
thinkingserious Aug 21, 2018
23f7c40
Merge branch 'master' into fix-java-packages
af4ro Aug 21, 2018
ff0dc1b
Fixed import errors
af4ro Aug 21, 2018
994fdba
examples and minor code changes
af4ro Aug 21, 2018
83c449a
Update README.md
thatfiredev Sep 30, 2018
18d1dce
Link to the online version of CLA in README.md
bharatr21 Oct 1, 2018
62851d5
Fix alphabetical order
bharatr21 Oct 3, 2018
a448f48
Fix email mention
bharatr21 Oct 3, 2018
e90fd4a
Merge pull request #461 from rosariopfernandes/update-readme
thinkingserious Oct 4, 2018
ca9be79
Fix formatting of README in examples/accesssettings
nathan78906 Oct 5, 2018
ed13646
Merge pull request #463 from Bharat123rox/patch-1
thinkingserious Oct 5, 2018
ffa5a96
Merge pull request #358 from derjayjay/issue-335
thinkingserious Oct 6, 2018
557a150
Merge pull request #475 from nathan78906/patch-1
thinkingserious Oct 11, 2018
bd65fc7
Merge pull request #449 from Markuus13/dynamic-templates-support
thinkingserious Oct 11, 2018
c23507d
Update Docker run path
thinkingserious Oct 11, 2018
4deb2f4
Merge branch 'master' of https://github.com/sendgrid/sendgrid-java
thinkingserious Oct 11, 2018
7591ceb
Version Bump v4.3.0: Dynamic Template support
thinkingserious Oct 11, 2018
8a97abe
Update USE_CASES.md
kylearoberts Oct 12, 2018
58ae93a
Update USE_CASES.md
kylearoberts Oct 12, 2018
777abfd
Merge pull request #497 from sendgrid/kylearoberts-patch-1
thinkingserious Oct 13, 2018
e160d8f
Update CONTRIBUTING - using gitflow workflow, development branch inst…
pushkyn Oct 13, 2018
9bc569c
Merge pull request #306 from btrajkovski/fix-java-packages
thinkingserious Oct 23, 2018
7560a8d
Merge pull request #500 from pushkyn/contibuting-gitflow-workflow
thinkingserious Oct 29, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
plugins:
checkstyle:
enabled: true
fixme:
enabled: true
pmd:
enabled: true
1 change: 1 addition & 0 deletions .env_sample
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export SENDGRID_API_KEY=''
24 changes: 24 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!--
We appreciate the effort for this pull request but before that please make sure you read the contribution guidelines given above, then fill out the blanks below.


Please enter each Issue number you are resolving in your PR after one of the following words [Fixes, Closes, Resolves]. This will auto-link these issues and close them when this PR is merged!
e.g.
Fixes #1
Closes #2
-->
# Fixes #

### Checklist
- [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
- [ ] I have read the [Contribution Guide] and my PR follows them.
- [ ] I updated my branch with the development branch.
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] I have added necessary documentation about the functionality in the appropriate .md file
- [ ] I have added in line documentation to the code I modified

### Short description of what this PR does:
-
-

If you have questions, please send an email to [Sendgrid](mailto:dx@sendgrid.com), or file a Github Issue in this repository.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,9 @@ repo
gradle.properties
target
*.class
examples/Example.java
examples/Example.java
.settings
.classpath
.project
.env
.vscode
23 changes: 16 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
language: java
sudo: false
jdk:
- oraclejdk8
- oraclejdk7
- openjdk7
matrix:
include:
- jdk: openjdk8
- jdk: oraclejdk8
before_script:
- "./scripts/startPrism.sh &"
- sleep 20
before_install:
- cat /etc/hosts # optionally check the content *before*
- sudo hostname "$(hostname | cut -c1-63)"
- sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts > /tmp/hosts
- sudo mv /tmp/hosts /etc/hosts
- cat /etc/hosts # optionally check the content *after*
after_script:
- "./gradlew build"
- "./scripts/s3upload.sh"
- lsof -i :4010 -S # adds some debugging statements
- "./gradlew build"
- "./scripts/upload.sh"
env:
global:
- S3_POLICY: ewogICJleHBpcmF0aW9uIjogIjIxMDAtMDEtMDFUMTI6MDA6MDAuMDAwWiIsCiAgImNvbmRpdGlvbnMiOiBbCiAgICB7ImFjbCI6ICJwdWJsaWMtcmVhZCIgfSwKICAgIHsiYnVja2V0IjogInNlbmRncmlkLW9wZW4tc291cmNlIiB9LAogICAgWyJzdGFydHMtd2l0aCIsICIka2V5IiwgInNlbmRncmlkLWphdmEvIl0sCiAgICBbImNvbnRlbnQtbGVuZ3RoLXJhbmdlIiwgMjA0OCwgMjY4NDM1NDU2XSwKICAgIFsiZXEiLCAiJENvbnRlbnQtVHlwZSIsICJhcHBsaWNhdGlvbi96aXAiXQogIF0KfQo=
Expand Down
140 changes: 139 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,144 @@
# Change Log
All notable changes to this project will be documented in this file.

## [4.3.0] - 2018-10-11
### Added
- [PR #449](https://github.com/sendgrid/sendgrid-java/pull/449/files): Dynamic Templates support -- BIG thanks to [Marcus Vinícius](https://github.com/Markuus13)
- [PR #451](https://github.com/sendgrid/sendgrid-java/pull/451/files): Added CodeTriage tag -- BIG thanks to [Anshul Singhal](https://github.com/af4ro)
- [PR #453](https://github.com/sendgrid/sendgrid-java/pull/453/files): Documentation readability update -- BIG thanks to [Anshul Singhal](https://github.com/af4ro)
- [PR #461](https://github.com/sendgrid/sendgrid-java/pull/461/files): Update README to use implementation instead of compile -- BIG thanks to [Rosário Pereira Fernandes](https://github.com/rosariopfernandes)
- [PR #463](https://github.com/sendgrid/sendgrid-java/pull/463/files): Link to the online version of CLA in README.md -- BIG thanks to [Bharat Raghunathan](https://github.com/Bharat123rox)

### Fix
- [PR #358](https://github.com/sendgrid/sendgrid-java/pull/358): Fixing similar code issue in examples/ips/ips.java -- BIG thanks to [Julian Jacques Maurer](https://github.com/derjayjay)
- [PR #475](https://github.com/sendgrid/sendgrid-java/pull/475): Fix formatting of README in examples/accesssettings -- BIG thanks to [Nathan Seebarran](https://github.com/nathan78906)

## [4.2.1] - 2018-05-08
### Security Fix
- Update to latest Jackson recommended dependency, based on [this article](https://medium.com/@cowtowncoder/on-jackson-cves-dont-panic-here-is-what-you-need-to-know-54cd0d6e8062).

## [4.2.0] - 2018-05-04
### Added
- [PR #275](https://github.com/sendgrid/sendgrid-java/pull/275/files): Add a way to verify that the content doesn't contain sensitive information -- BIG thanks to [Diego Camargo](https://github.com/belfazt)
- [PR #249](https://github.com/sendgrid/sendgrid-java/pull/249): Add optional rate limit support -- BIG thanks to [Andy Trimble](https://github.com/andy-trimble)
- [PR #379](https://github.com/sendgrid/sendgrid-java/pull/379): Break up the examples in examples/subusers/subusers.java to their own files -- BIG thanks to [huytranrjc](https://github.com/huytranrjc)
- [PR #365](https://github.com/sendgrid/sendgrid-java/pull/365): Test to check year in license file -- BIG thanks to [Alex](https://github.com/pushkyn)
- [PR #345](https://github.com/sendgrid/sendgrid-java/pull/345): Add .codeclimate.yml file -- BIG thanks to [Rostyslav Zatserkovnyi](https://github.com/rzats)
- [PR #319](https://github.com/sendgrid/sendgrid-java/pull/319): Add .env_sample file -- BIG thanks to [Thiago Barbato](https://github.com/thiagobbt)
- [PR #223](https://github.com/sendgrid/sendgrid-java/pull/223): The license file is now in the release jar -- BIG thanks to [sccalabr](https://github.com/sccalabr)
- [PR #224](https://github.com/sendgrid/sendgrid-java/pull/224): Adding SendGridApi interface -- BIG thanks to [sccalabr](https://github.com/sccalabr)

### Fix
- [PR #410](https://github.com/sendgrid/sendgrid-java/pull/410): Update Jackson dependencies to the latest version -- BIG thanks to [Dmitry Avershin](https://github.com/dmitraver)
- [PR #380](https://github.com/sendgrid/sendgrid-java/pull/380): Fix "similar-code" issue in examples/whitelabel/ips.java -- BIG thanks to [huytranrjc](https://github.com/huytranrjc)
- [PR #255](https://github.com/sendgrid/sendgrid-java/pull/225): Fix Mail deserialization issue -- BIG thanks to [sccalabr](https://github.com/sccalabr)
- [PR #359](https://github.com/sendgrid/sendgrid-java/pull/359): Fix code issue in examples/suppression/suppression.java -- BIG thanks to [Alex](https://github.com/pushkyn)
- [PR #228](https://github.com/sendgrid/sendgrid-java/pull/228): Changes serialization type from default to non-empty -- BIG thanks to [Dmitry Avershin](https://github.com/dmitraver)
- [PR #373](https://github.com/sendgrid/sendgrid-java/pull/373): Fix file_lines issue in examples/mailsettings/mailsettings.java -- BIG thanks to [Mithun Sasidharan](https://github.com/mithunsasidharan)


## [4.1.2] - 2017-10-30
### Added
- PR #220 Alway serialize click-tracking parameters.
- BIG thanks to [Mattia Barbon](https://github.com/mbarbon)

## [4.1.1] - 2017-10-10
### Added
- PR #247 Added Javadocs.
- BIG thanks to [Andy Trimble](https://github.com/andy-trimble)

## [4.1.0] - 2017-08-16
### Added
- PR #211 Return empty collections in place of nulls
- BIG thanks to [Antonio Bucciol](https://github.com/TBuc)

## [4.0.1] - 2017-05-22
### Fix
- PR #199 Return correct Email in getFrom
- BIG thanks to [Jared Dellitt](https://github.com/jareddellitt)

## [4.0.0] - 2017-04-18
### BREAKING CHANGE
- PR #162 Update java http client dependency to [4.1.0 from 2.3.4](https://github.com/sendgrid/java-http-client/releases)
- BIG thanks to [Diego Camargo](https://github.com/belfazt) for the pull request!
- The breaking change is that variables that were public are now private and accessible only via getters and setters
- The `Request` object attributes are now only accessible through getters/setters
- `request.method` is now `request.setMethod(string)`
- `request.endpoint` is now `request.setEndpoint(string)`
- `request.body` is now `request.setBody(string)`
- The `Response` object attributes are now only accessible through getters/setters
- `response.statusCode` is now `response.getStatusCode()`
- `response.body` is now `response.getBody()`
- `response.headers` is now `response.getHeaders()`
- Adding a query parameter goes from:

```java
Map<String,String> queryParams = new HashMap<String, String>();
request.addQueryParam("limit", "1");
queryParams.put("limit", "1");
request.queryParams = queryParams;
```

to:

```java
request.addQueryParam("limit", "1");
```

## [3.2.1] - 2017-04-13
### Added
- PR #175
- Simplified `makeCall()` method.
- BIG thanks to [Rafał Wrzeszcz](https://github.com/rafalwrzeszcz) for the pull request!

## [3.2.0] - 2017-03-22
### Added
- PR #160
- [Enhancement] Adds an attachment builder that supports InputStream content
- BIG thanks to [Dmitry Avershin](https://github.com/dmitraver) for the pull request!

## [3.1.0] - 2016-10-11
### Added
- PR #158, Solves #138
- [Enhancement] allow using custom Client, http proxy support
- BIG thanks to [David Maicher](https://github.com/dmaicher) for the pull request!

## [3.0.9] - 2016-08-24
### Added
- Table of Contents in the README
- Added a [USE_CASES.md](https://github.com/sendgrid/sendgrid-java/blob/master/USE_CASES.md) section, with the first use case example for transactional templates

## [3.0.8] - 2016-08-09
### Fixed
- Updated dependency for [java-http-client](https://github.com/sendgrid/java-http-client/releases/tag/v2.3.4)
- [Pull #7](https://github.com/sendgrid/java-http-client/pull/7): Fix Response Charset to UTF-8
- Fixes [issue #6](https://github.com/sendgrid/java-http-client/issues/6): Multi-byte character got garbled on received mail
- BIG thanks to [Yoichi Kikuta](https://github.com/kikutaro) for the pull request!

## [3.0.7] - 2016-08-08
### Added
- Updated dependency for [java-http-client](https://github.com/sendgrid/java-http-client/releases/tag/v2.3.3)
- Pull request [#11](https://github.com/sendgrid/java-http-client/pull/11)
- Solves [issue #10](https://github.com/sendgrid/java-http-client/issues/10): Improve Error Handling
- Now error messages are passed through from the SendGrid server
- BIG thanks to [shuron](https://github.com/shuron) / [Alexander Holbreich](https://github.com/aholbreich) for the pull request!

## [3.0.6] - 2016-07-26
### Added
- [Troubleshooting](https://github.com/sendgrid/sendgrid-python/blob/master/TROUBLESHOOTING.md) section

## [3.0.5] - 2016-07-20
### Added
- README updates
- Update introduction blurb to include information regarding our forward path
- Update the v3 /mail/send example to include non-helper usage
- Update the generic v3 example to include non-fluent interface usage

## [3.0.4] - 2016-07-19
### Fixed
- [Fix for issue #120](https://github.com/sendgrid/sendgrid-java/issues/120): Unsupported Media Type if subject has letters with accent (like 'é' )
- Updated [java-http-client](https://github.com/sendgrid/java-http-client) dependency to [2.3.2](https://github.com/sendgrid/java-http-client/releases/tag/v2.3.2)

## [3.0.3] - 2016-07-12
### Added
- Update docs, unit tests and examples to include Sender ID
Expand All @@ -21,7 +159,7 @@ All notable changes to this project will be documented in this file.

## [2.2.2] - 2015-5-23
### Fixed
- Subsitution orders being swapped via [#65](https://github.com/sendgrid/sendgrid-java/pull/65)
- Substitution orders being swapped via [#65](https://github.com/sendgrid/sendgrid-java/pull/65)

## [2.2.1] - 2015-5-14
### Changed
Expand Down
42 changes: 42 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

# SendGrid Community Code of Conduct

The SendGrid open source community is made up of members from around the globe with a diverse set of skills, personalities, and experiences. It is through these differences that our community experiences successes and continued growth. When you're working with members of the community, we encourage you to follow these guidelines, which help steer our interactions and strive to maintain a positive, successful and growing community.

### Be Open
Members of the community are open to collaboration, whether it's on pull requests, code reviews, approvals, issues or otherwise. We're receptive to constructive comments and criticism, as the experiences and skill sets of all members contribute to the whole of our efforts. We're accepting of all who wish to take part in our activities, fostering an environment where anyone can participate, and everyone can make a difference.

### Be Considerate
Members of the community are considerate of their peers, which include other contributors and users of SendGrid. We're thoughtful when addressing the efforts of others, keeping in mind that often the labor was completed with the intent of the good of the community. We're attentive in our communications, whether in person or online, and we're tactful when approaching differing views.

### Be Respectful
Members of the community are respectful. We're respectful of others, their positions, their skills, their commitments and their efforts. We're respectful of the volunteer efforts that permeate the SendGrid community. We're respectful of the processes outlined in the community, and we work within them. When we disagree, we are courteous in raising our issues. Overall, we're good to each other. We contribute to this community not because we have to, but because we want to. If we remember that, these guidelines will come naturally.

## Additional Guidance

### Disclose Potential Conflicts of Interest
Community discussions often involve interested parties. We expect participants to be aware when they are conflicted due to employment or other projects they are involved in and disclose those interests to other project members. When in doubt, over-disclose. Perceived conflicts of interest are important to address so that the community’s decisions are credible even when unpopular, difficult or favorable to the interests of one group over another.

### Interpretation
This Code is not exhaustive or complete. It is not a rulebook; it serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter. When in doubt, try to abide by [SendGrid’s cultural values](https://sendgrid.com/blog/employee-engagement-the-4h-way) defined by our “4H’s”: Happy, Hungry, Humble and Honest.

### Enforcement
Most members of the SendGrid community always comply with this Code, not because of the existence of this Code, but because they have long experience participating in open source communities where the conduct described above is normal and expected. However, failure to observe this Code may be grounds for suspension, reporting the user for abuse or changing permissions for outside contributors.

## If you have concerns about someone’s conduct
**Initiate Direct Contact** - It is always appropriate to email a community member (if contact information is available), mention that you think their behavior was out of line, and (if necessary) point them to this Code.

**Discuss Publicly** - Discussing publicly is always acceptable. Note, though, that approaching the person directly may be better, as it tends to make them less defensive, and it respects the time of other community members, so you probably want to try direct contact first.

**Contact the Moderators** - You can reach the SendGrid moderators by emailing dx@sendgrid.com.

## Submission to SendGrid Repositories
Finally, just a reminder, changes to the SendGrid repositories will only be accepted upon completion of the [SendGrid Contributor Agreement](https://cla.sendgrid.com).

## Attribution

SendGrid thanks the following, on which it draws for content and inspiration:

* [Python Community Code of Conduct](https://www.python.org/psf/codeofconduct/)
* [Open Source Initiative General Code of Conduct](https://opensource.org/codeofconduct)
* [Apache Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)
Loading