From cc27cb9fc50a32e5947fd676cedab156f076a8b8 Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 14:41:03 -0500 Subject: [PATCH 01/10] Create REReturnType.java --- .../relationship_extraction/v1/REReturnType.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java new file mode 100644 index 00000000000..2d85ff24207 --- /dev/null +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java @@ -0,0 +1,4 @@ +public enum REReturnType { + XML, + JSON +} From eca25cc9d652852fe44557cf264def7e558ab68d Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 14:59:26 -0500 Subject: [PATCH 02/10] Update REReturnType.java --- .../relationship_extraction/v1/REReturnType.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java index 2d85ff24207..8be2e90bd5d 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java @@ -1,3 +1,5 @@ +package com.ibm.watson.developer_cloud.relationship_extraction.rereturntype; + public enum REReturnType { XML, JSON From 1e45a23d72b700c2481c532df0f2f8539ed62c6a Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 15:01:37 -0500 Subject: [PATCH 03/10] Update REReturnType.java --- .../relationship_extraction/v1/REReturnType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java index 8be2e90bd5d..e4706c5e15f 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java @@ -1,4 +1,4 @@ -package com.ibm.watson.developer_cloud.relationship_extraction.rereturntype; +package com.ibm.watson.developer_cloud.relationship_extraction.v1; public enum REReturnType { XML, From 73b1e0c3392b2f0ccf505d6b6b2ad1e8715bfe78 Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 15:10:52 -0500 Subject: [PATCH 04/10] Update RelationshipExtraction.java --- .../v1/RelationshipExtraction.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java index c18051bd5bd..361f45f9a9d 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java @@ -38,6 +38,9 @@ public class RelationshipExtraction extends WatsonService { /** The dataset. */ private Dataset dataset; + + /** The return type. */ + private String returnType; /** * Instantiates a new relationship extraction service. @@ -65,7 +68,7 @@ public RelationshipExtraction() { * * @param text the text to analyze * - * @return the result as XML string + * @return the result as an XML/JSON string */ public String extract(final String text) { Validate.notNull(dataset, "dataset cannot be null"); @@ -73,7 +76,7 @@ public String extract(final String text) { final Request request = RequestBuilder.post("/v1/sire/0") - .withForm("sid", dataset.getId(), "rt", "xml", "txt", text).build(); + .withForm("sid", dataset.getId(), "rt", returnType, "txt", text).build(); final Response response = execute(request); return ResponseUtil.getString(response); } @@ -96,5 +99,18 @@ public Dataset getDataset() { public void setDataset(final Dataset dataset) { this.dataset = dataset; } + + /** + * Sets the returnType. + * + * @param returnType the new returnType + */ + public void setReturnType(final REReturnType returnType) { + if (returnType == REReturnType.XML) { + this.returnType = "xml"; + } else if (returnType == REReturnType.JSON) { + this.returnType = "json"; + } + } } From abd876a4b6eb554e89f11f8f8ffed712fa0b52d6 Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 15:13:33 -0500 Subject: [PATCH 05/10] Update RelationshipExtraction.java --- .../relationship_extraction/v1/RelationshipExtraction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java index 361f45f9a9d..cdf1c5e2923 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java @@ -40,7 +40,7 @@ public class RelationshipExtraction extends WatsonService { private Dataset dataset; /** The return type. */ - private String returnType; + private String returnType = "xml"; /** * Instantiates a new relationship extraction service. From c2cb059fc9067e33db63b5c5831a3c2d52c5c9c3 Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 15:37:47 -0500 Subject: [PATCH 06/10] Update REReturnType.java --- .../relationship_extraction/v1/REReturnType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java index e4706c5e15f..b4a9dfa5523 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java @@ -1,6 +1,6 @@ package com.ibm.watson.developer_cloud.relationship_extraction.v1; -public enum REReturnType { +public enum ReturnType { XML, JSON } From 850d4c5e2495f8c9697be44661a4dcb2e42b0df0 Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 15:38:03 -0500 Subject: [PATCH 07/10] Update RelationshipExtraction.java --- .../relationship_extraction/v1/RelationshipExtraction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java index cdf1c5e2923..32303a7a678 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java @@ -105,7 +105,7 @@ public void setDataset(final Dataset dataset) { * * @param returnType the new returnType */ - public void setReturnType(final REReturnType returnType) { + public void setReturnType(final ReturnType returnType) { if (returnType == REReturnType.XML) { this.returnType = "xml"; } else if (returnType == REReturnType.JSON) { From 88b27b4aef1f5f99927613aa48f7f1ef3585e8fd Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 15:41:14 -0500 Subject: [PATCH 08/10] Rename REReturnType.java to ReturnType.java --- .../v1/{REReturnType.java => ReturnType.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/{REReturnType.java => ReturnType.java} (100%) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/ReturnType.java similarity index 100% rename from src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/REReturnType.java rename to src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/ReturnType.java From 81e80b5470d994e71ea2b544342dd32559809cde Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 15:42:59 -0500 Subject: [PATCH 09/10] Update RelationshipExtraction.java --- .../relationship_extraction/v1/RelationshipExtraction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java index 32303a7a678..85423ac7343 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java @@ -111,6 +111,6 @@ public void setReturnType(final ReturnType returnType) { } else if (returnType == REReturnType.JSON) { this.returnType = "json"; } - } + } } From cbb5fd595eaeef7c47c8b86af447bbdab1620975 Mon Sep 17 00:00:00 2001 From: tanmayb123 Date: Tue, 9 Feb 2016 15:45:34 -0500 Subject: [PATCH 10/10] Update RelationshipExtraction.java --- .../relationship_extraction/v1/RelationshipExtraction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java index 85423ac7343..e55cb181120 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java +++ b/src/main/java/com/ibm/watson/developer_cloud/relationship_extraction/v1/RelationshipExtraction.java @@ -106,9 +106,9 @@ public void setDataset(final Dataset dataset) { * @param returnType the new returnType */ public void setReturnType(final ReturnType returnType) { - if (returnType == REReturnType.XML) { + if (returnType == ReturnType.XML) { this.returnType = "xml"; - } else if (returnType == REReturnType.JSON) { + } else if (returnType == ReturnType.JSON) { this.returnType = "json"; } }