Add missing content_disposition field in File and Fix Message NPE (#149)

# Description
This PR adds the missing `content_disposition` field in the `File` class
and also fixes a NPE occurrence when calling `Message.toString()`
sometimes.

# License
<!-- Your PR comment must contain the following line for us to merge the
PR. -->
I confirm that this contribution is made under the terms of the MIT
license and that I have the authority necessary to make this
contribution on behalf of its copyright owner.

Author: mrashed-dev

CHANGELOG.md

@@ -6,12 +6,16 @@ This section contains changes that have been committed but not yet released.
 
 ### Added
 
+* Added missing `content_disposition` field in `File`
+
 ### Changed
 
 ### Deprecated
 
 ### Fixed
 
+* Fixed NullPointerException sporadically occurring when calling `Message.toString()`
+
 ### Removed
 
 ### Security

src/main/java/com/nylas/File.java

@@ -10,6 +10,7 @@ public class File extends AccountOwnedModel implements JsonObject {
 	private String content_type;
 	private List<String> message_ids = Collections.emptyList();
 	private String content_id;
+	private String content_disposition;
 
 	@Override
 	public String getObjectType() {
@@ -36,10 +37,15 @@ public String getContentId() {
 		return content_id;
 	}
 
+	public String getContentDisposition() {
+		return content_disposition;
+	}
+
 	@Override
 	public String toString() {
 		return "File [id=" + getId() + ", filename=" + filename + ", size=" + size + ", content_type=" + content_type
-				+ ", message_ids=" + message_ids + ", content_id=" + content_id + "]";
+				+ ", message_ids=" + message_ids + ", content_id=" + content_id
+				+ ", content_disposition=" + content_disposition + "]";
 	}
 
 

src/main/java/com/nylas/Message.java

@@ -111,7 +111,7 @@ public String toString() {
 		return "Message [id=" + getId() + ", account_id=" + getAccountId() + ", thread_id=" + thread_id + ", subject="
 				+ subject + ", from=" + from + ", to=" + to + ", cc=" + cc + ", bcc=" + bcc + ", reply_to=" + reply_to
 				+ ", date=" + getDate() + ", unread=" + unread + ", starred=" + starred + ", snippet=" + snippet
-				+ ", body.length=" + body.length() + ", files=" + files + ", events=" + events + ", folder=" + folder
+				+ ", files=" + files + ", events=" + events + ", folder=" + folder
 				+ ", labels=" + labels + ", headers=" + headers + ", metadata=" + metadata + "]";
 	}
 

src/test/java/com/nylas/MessageTest.java

@@ -71,7 +71,7 @@ public void testGetters() {
         assertEquals(message.getLabels().size(), 1);
         assertEquals(message.getMetadata().size(), 1);
         assertEquals(message.getHeaders().size(), 1);
-        assertEquals(message.toString(), "Message [id=null, account_id=null, thread_id=okdvc089, subject=That thing I sent you, from=[NameEmail [name=Peter Potamus, email=potamus.peter@sebbebandsebben.com]], to=[NameEmail [name=Blue Falcone, email=falcone.blue@sebbebandsebben.com]], cc=[NameEmail [name=Harvey Birdman, email=harvey.birdman@sebbebandsebben.com]], bcc=[NameEmail [name=Christie, email=christie@sebbebandsebben.com]], reply_to=[NameEmail [name=Peter Potamus, email=potamus.peter@sebbebandsebben.com]], date=2022-11-10T12:28:00Z, unread=true, starred=true, snippet=Did you get that thing..., body.length=46, files=[File [id=null, filename=logo.jpg, size=12334, content_type=image/jpeg, message_ids=[odjashjcv89], content_id=osdivcnm90834e]], events=[Event [id='null', calendar_id='null', ical_uid='null', master_event_id='null', event_collection_id='null', title='null', description='null', location='null', owner='null', status='null', capacity=null, read_only=null, busy=null, hide_participants=null, original_start_time=null, when=null, conferencing=null, recurrence=null, round_robin_order=[], notifications=[], participants=[], visibility=null, metadata={}]], folder=Folder [id=null, name=null, display_name=null], labels=[Label [id=null, name=null, display_name=null]], headers={header1=value}, metadata={key1=value}]");
+        assertEquals(message.toString(), "Message [id=null, account_id=null, thread_id=okdvc089, subject=That thing I sent you, from=[NameEmail [name=Peter Potamus, email=potamus.peter@sebbebandsebben.com]], to=[NameEmail [name=Blue Falcone, email=falcone.blue@sebbebandsebben.com]], cc=[NameEmail [name=Harvey Birdman, email=harvey.birdman@sebbebandsebben.com]], bcc=[NameEmail [name=Christie, email=christie@sebbebandsebben.com]], reply_to=[NameEmail [name=Peter Potamus, email=potamus.peter@sebbebandsebben.com]], date=2022-11-10T12:28:00Z, unread=true, starred=true, snippet=Did you get that thing..., files=[File [id=null, filename=logo.jpg, size=12334, content_type=image/jpeg, message_ids=[odjashjcv89], content_id=osdivcnm90834e, content_disposition=attachment]], events=[Event [id='null', calendar_id='null', ical_uid='null', master_event_id='null', event_collection_id='null', title='null', description='null', location='null', owner='null', status='null', capacity=null, read_only=null, busy=null, hide_participants=null, original_start_time=null, when=null, conferencing=null, recurrence=null, round_robin_order=[], notifications=[], participants=[], visibility=null, metadata={}]], folder=Folder [id=null, name=null, display_name=null], labels=[Label [id=null, name=null, display_name=null]], headers={header1=value}, metadata={key1=value}]");
     }
 
 
@@ -91,6 +91,7 @@ private File getFile(String filename, String contentType) throws NoSuchFieldExce
         FieldReflectionUtils.setField("content_type", contentType, file);
         FieldReflectionUtils.setField("message_ids", Arrays.asList("odjashjcv89"), file);
         FieldReflectionUtils.setField("content_id", "osdivcnm90834e", file);
+        FieldReflectionUtils.setField("content_disposition", "attachment", file);
 
         return file;
     }

src/test/java/com/nylas/ThreadTest.java

@@ -88,7 +88,7 @@ public void testGetters() {
         assertEquals(thread.getDraftIds().size(), 1);
         assertEquals(thread.getMessages().size(), 1);
         assertEquals(thread.getDrafts().size(), 1);
-        assertEquals(thread.toString(), "Thread [id=solidkvjnopisd903, account_id=null,subject=That thing I sent you, unread=true, starred=true, last_message_timestamp=2022-11-23T16:03:08Z, last_message_received_timestamp=2022-11-23T16:03:15Z, last_message_sent_timestamp=2022-11-23T16:03:04Z, first_message_timestamp=2022-11-23T15:59:48Z, participants=[NameEmail [name=Peter, Potamus, email=ppotamus@gmail.com]], snippet=this is a preview, version=1, folders=[Folder [id=null, name=null, display_name=null]], labels=[Label [id=null, name=null, display_name=null]], has_attachments=true, message_ids=[sldfkvj893w, losdkvj933], draft_ids=[sdklcvj93], messages=[Message [id=null, account_id=null, thread_id=null, subject=null, from=[], to=[], cc=[], bcc=[], reply_to=[], date=null, unread=null, starred=null, snippet=null, body.length=14, files=[], events=[], folder=null, labels=[], headers={}, metadata={}]], drafts=[Draft [reply_to_message_id=null, version=null, account_id=null, thread_id=null, subject=null, from=[], to=[], cc=[], bcc=[], reply_to=[], date=null, unread=null, starred=null, snippet=null, body=null, files=[], folder=null, labels=[], tracking=null, metadata={}]]]");
+        assertEquals(thread.toString(), "Thread [id=solidkvjnopisd903, account_id=null,subject=That thing I sent you, unread=true, starred=true, last_message_timestamp=2022-11-23T16:03:08Z, last_message_received_timestamp=2022-11-23T16:03:15Z, last_message_sent_timestamp=2022-11-23T16:03:04Z, first_message_timestamp=2022-11-23T15:59:48Z, participants=[NameEmail [name=Peter, Potamus, email=ppotamus@gmail.com]], snippet=this is a preview, version=1, folders=[Folder [id=null, name=null, display_name=null]], labels=[Label [id=null, name=null, display_name=null]], has_attachments=true, message_ids=[sldfkvj893w, losdkvj933], draft_ids=[sdklcvj93], messages=[Message [id=null, account_id=null, thread_id=null, subject=null, from=[], to=[], cc=[], bcc=[], reply_to=[], date=null, unread=null, starred=null, snippet=null, files=[], events=[], folder=null, labels=[], headers={}, metadata={}]], drafts=[Draft [reply_to_message_id=null, version=null, account_id=null, thread_id=null, subject=null, from=[], to=[], cc=[], bcc=[], reply_to=[], date=null, unread=null, starred=null, snippet=null, body=null, files=[], folder=null, labels=[], tracking=null, metadata={}]]]");
     }
 
     @Test