From 21a2a9d41be545ce393432fc10687db9e4e0dc36 Mon Sep 17 00:00:00 2001 From: ChristBian1 Date: Mon, 5 Mar 2018 01:21:02 -0500 Subject: [PATCH 1/2] Changes based on PR feedback --- src/java/fp/v11/Splints/FootPrints11.java | 16 ++++++++++++---- src/java/fp/v11/Splints/ISplints.java | 6 ++++-- .../v11/Splints/PromptCredentialsProvider.java | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/java/fp/v11/Splints/FootPrints11.java b/src/java/fp/v11/Splints/FootPrints11.java index c6f998d..b460820 100644 --- a/src/java/fp/v11/Splints/FootPrints11.java +++ b/src/java/fp/v11/Splints/FootPrints11.java @@ -1,5 +1,6 @@ package fp.v11.splints; +import java.util.Collection; import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPConnection; @@ -8,6 +9,8 @@ import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; import javax.xml.soap.Text; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * @@ -200,9 +203,10 @@ public String createIssue() { } @Override - public void getIssueDetails() { + public NodeList getIssueDetails() { String projectId = "PROJECT_ID"; String ticketNumber = "TICKET_NUMBER"; + NodeList result = null; try { /* @@ -268,6 +272,7 @@ public void getIssueDetails() { } DumpSOAPElement(replybody, 0); + result = replybody.getChildNodes(); } catch (Exception ex) { @@ -276,16 +281,18 @@ public void getIssueDetails() { } System.out.println("Done"); + return result; } @Override - public void linkIssues() { + public NodeList linkIssues() { String linkType = "LINK_TYPE"; String projectId1 = "PROJECT_ID1"; String ticketNumber1 = "TICKET_NUMBER1"; String projectId2 = "PROJECT_ID2"; String ticketNumber2 = "TICKET_NUMBER2"; - + NodeList result = null; + try { /* // Comment this out for NO proxy. @@ -364,7 +371,7 @@ public void linkIssues() { //reply.writeTo( System.out ); // Get result SOAPBody replybody = reply.getSOAPPart().getEnvelope().getBody(); - + result = replybody.getChildNodes(); // Check for error if (replybody.hasFault()) { throw new Exception(replybody.getFault().getFaultString()); @@ -381,6 +388,7 @@ public void linkIssues() { } catch (Exception ex) { ex.printStackTrace(); } + return result; } /** diff --git a/src/java/fp/v11/Splints/ISplints.java b/src/java/fp/v11/Splints/ISplints.java index 4dec3be..5a93f2d 100644 --- a/src/java/fp/v11/Splints/ISplints.java +++ b/src/java/fp/v11/Splints/ISplints.java @@ -1,5 +1,7 @@ package fp.v11.splints; +import org.w3c.dom.NodeList; + /** * Interface for interacting with Splints * @author soen487-w18-team03 @@ -16,11 +18,11 @@ public interface ISplints { * Gets issue details * */ - public void getIssueDetails(); + public NodeList getIssueDetails(); /** * Links two issues * */ - public void linkIssues(); + public NodeList linkIssues(); } diff --git a/src/java/fp/v11/Splints/PromptCredentialsProvider.java b/src/java/fp/v11/Splints/PromptCredentialsProvider.java index 8f9b181..1f70eee 100644 --- a/src/java/fp/v11/Splints/PromptCredentialsProvider.java +++ b/src/java/fp/v11/Splints/PromptCredentialsProvider.java @@ -13,8 +13,8 @@ public class PromptCredentialsProvider { private final Console console; private final Scanner scanner; - private final String USERNAME_INPUT_TEXT = "Your username: "; - private final String PASSWORD_INPUT_TEXT = "Your password: "; + public static final String USERNAME_INPUT_TEXT = "Your username: "; + public static final String PASSWORD_INPUT_TEXT = "Your password: "; public PromptCredentialsProvider() { this.scanner = new Scanner(System.in); From 505bdc28f02cea72b57ad61431498f67b8246f71 Mon Sep 17 00:00:00 2001 From: ChristBian1 Date: Mon, 5 Mar 2018 01:50:42 -0500 Subject: [PATCH 2/2] Renamed splints directory --- src/java/fp/v11/{Splints => splints}/Config.java | 0 src/java/fp/v11/{Splints => splints}/FootPrints11.java | 0 src/java/fp/v11/{Splints => splints}/ISplints.java | 0 .../fp/v11/{Splints => splints}/PromptCredentialsProvider.java | 0 src/java/fp/v11/{Splints => splints}/splints.java | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename src/java/fp/v11/{Splints => splints}/Config.java (100%) rename src/java/fp/v11/{Splints => splints}/FootPrints11.java (100%) rename src/java/fp/v11/{Splints => splints}/ISplints.java (100%) rename src/java/fp/v11/{Splints => splints}/PromptCredentialsProvider.java (100%) rename src/java/fp/v11/{Splints => splints}/splints.java (100%) diff --git a/src/java/fp/v11/Splints/Config.java b/src/java/fp/v11/splints/Config.java similarity index 100% rename from src/java/fp/v11/Splints/Config.java rename to src/java/fp/v11/splints/Config.java diff --git a/src/java/fp/v11/Splints/FootPrints11.java b/src/java/fp/v11/splints/FootPrints11.java similarity index 100% rename from src/java/fp/v11/Splints/FootPrints11.java rename to src/java/fp/v11/splints/FootPrints11.java diff --git a/src/java/fp/v11/Splints/ISplints.java b/src/java/fp/v11/splints/ISplints.java similarity index 100% rename from src/java/fp/v11/Splints/ISplints.java rename to src/java/fp/v11/splints/ISplints.java diff --git a/src/java/fp/v11/Splints/PromptCredentialsProvider.java b/src/java/fp/v11/splints/PromptCredentialsProvider.java similarity index 100% rename from src/java/fp/v11/Splints/PromptCredentialsProvider.java rename to src/java/fp/v11/splints/PromptCredentialsProvider.java diff --git a/src/java/fp/v11/Splints/splints.java b/src/java/fp/v11/splints/splints.java similarity index 100% rename from src/java/fp/v11/Splints/splints.java rename to src/java/fp/v11/splints/splints.java