From 986348ad3bb35b2f22bb96fff23dcc5dc76fe434 Mon Sep 17 00:00:00 2001 From: carycheng Date: Wed, 2 Jan 2019 16:26:34 -0800 Subject: [PATCH 1/2] added invite email field --- .../java/com/box/sdk/BoxCollaboration.java | 10 ++++++++++ ...viteEmailAttributesOnCollaboration200.json | 5 +++++ .../com/box/sdk/BoxCollaborationTest.java | 20 +++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 src/test/Fixtures/BoxCollaboration/GetInviteEmailAttributesOnCollaboration200.json diff --git a/src/main/java/com/box/sdk/BoxCollaboration.java b/src/main/java/com/box/sdk/BoxCollaboration.java index ed7c9076f..a154d46da 100644 --- a/src/main/java/com/box/sdk/BoxCollaboration.java +++ b/src/main/java/com/box/sdk/BoxCollaboration.java @@ -200,6 +200,7 @@ public class Info extends BoxResource.Info { private Date acknowledgedAt; private BoxFolder.Info item; private BoxFile.Info fileItem; + private String inviteEmail; private boolean canViewPath; /** @@ -269,6 +270,12 @@ public boolean getCanViewPath() { return this.canViewPath; } + /** + * The email address used to invite an un-registered collaborator, if they are not a registered user. + * @return the email for the un-registed collaborator. + */ + public String getInviteEmail() { return this.inviteEmail; } + /** * Gets the status of the collaboration. * @@ -396,6 +403,9 @@ protected void parseJSONMember(JsonObject.Member member) { } else if (memberName.equals("can_view_path")) { this.canViewPath = value.asBoolean(); + } else if (memberName.equals("invite_email")) { + this.inviteEmail = value.asString(); + } else if (memberName.equals("item")) { JsonObject folderJSON = value.asObject(); if (this.item == null) { diff --git a/src/test/Fixtures/BoxCollaboration/GetInviteEmailAttributesOnCollaboration200.json b/src/test/Fixtures/BoxCollaboration/GetInviteEmailAttributesOnCollaboration200.json new file mode 100644 index 000000000..f50fadf46 --- /dev/null +++ b/src/test/Fixtures/BoxCollaboration/GetInviteEmailAttributesOnCollaboration200.json @@ -0,0 +1,5 @@ +{ + "type": "collaboration", + "id": "12345", + "invite_email": "example@test.com" +} diff --git a/src/test/java/com/box/sdk/BoxCollaborationTest.java b/src/test/java/com/box/sdk/BoxCollaborationTest.java index fe016323a..05f1c3758 100644 --- a/src/test/java/com/box/sdk/BoxCollaborationTest.java +++ b/src/test/java/com/box/sdk/BoxCollaborationTest.java @@ -412,4 +412,24 @@ public void testGetAccessibleLoginSucceeds() throws IOException { Assert.assertEquals(accessiblyByLogin, collabInfo.getAccessibleBy().getLogin()); } + + @Test + @Category(UnitTest.class) + public void testGetInviteEmailSucceeds() throws IOException { + String result = ""; + final String collabID = "12345"; + final String inviteEmail = "example@test.com"; + final String getCollaborationURL = "/collaborations/" + collabID; + + result = TestConfig.getFixture("BoxCollaboration/GetInviteEmailAttributesOnCollaboration200"); + + WIRE_MOCK_CLASS_RULE.stubFor(WireMock.get(WireMock.urlPathEqualTo(getCollaborationURL)) + .willReturn(WireMock.aResponse() + .withHeader("Content-Type", "application/json") + .withBody(result))); + + BoxCollaboration.Info collabInfo = new BoxCollaboration(this.api, collabID).getInfo("invite_email"); + + Assert.assertEquals(inviteEmail, collabInfo.getInviteEmail()); + } } From a5811bfebffb6fb2cf121746c1bcc4d8688ad2ff Mon Sep 17 00:00:00 2001 From: carycheng Date: Thu, 3 Jan 2019 15:21:00 -0800 Subject: [PATCH 2/2] added newline --- src/main/java/com/box/sdk/BoxCollaboration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/box/sdk/BoxCollaboration.java b/src/main/java/com/box/sdk/BoxCollaboration.java index a154d46da..1df3bd320 100644 --- a/src/main/java/com/box/sdk/BoxCollaboration.java +++ b/src/main/java/com/box/sdk/BoxCollaboration.java @@ -274,7 +274,9 @@ public boolean getCanViewPath() { * The email address used to invite an un-registered collaborator, if they are not a registered user. * @return the email for the un-registed collaborator. */ - public String getInviteEmail() { return this.inviteEmail; } + public String getInviteEmail() { + return this.inviteEmail; + } /** * Gets the status of the collaboration.