Author: bfitzpat Date: 2010-05-13 17:19:38 -0400 (Thu, 13 May 2010) New Revision: 22071 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java Log: OPEN - issue JBIDE-6280: [tester] full response (body and headers) should be shown for REST requests https://jira.jboss.org/jira/browse/JBIDE-6280 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java 2010-05-13 18:12:30 UTC (rev 22070) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/JAXRSTester.java 2010-05-13 21:19:38 UTC (rev 22071) @@ -11,6 +11,7 @@ package org.jboss.tools.ws.ui.utils; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; @@ -208,16 +209,34 @@ } // retrieve result and put string results into the response - InputStream is = (InputStream) httpurlc.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));//$NON-NLS-1$ - StringBuilder sb = new StringBuilder(); - String line; - while ((line = br.readLine()) != null) { - sb.append(line); - sb.append("\n");//$NON-NLS-1$ + InputStream is = null; + try { + is = httpurlc.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));//$NON-NLS-1$ + StringBuilder sb = new StringBuilder(); + String line; + while ((line = br.readLine()) != null) { + sb.append(line); + sb.append("\n");//$NON-NLS-1$ + } + br.close(); + resultBody = sb.toString(); + } catch (IOException ie) { + try { + is = httpurlc.getErrorStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(is, "UTF-8"));//$NON-NLS-1$ + StringBuilder sb = new StringBuilder(); + String line; + while ((line = br.readLine()) != null) { + sb.append(line); + sb.append("\n");//$NON-NLS-1$ + } + br.close(); + resultBody = sb.toString(); + } catch (IOException ie2) { + resultBody = ie2.getLocalizedMessage(); + } } - br.close(); - resultBody = sb.toString(); resultHeaders = httpurlc.getHeaderFields(); Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-13 18:12:30 UTC (rev 22070) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-13 21:19:38 UTC (rev 22071) @@ -652,11 +652,11 @@ } } + JAXRSTester tester = new JAXRSTester(); + // now actually call it try { - JAXRSTester tester = new JAXRSTester(); - // call the service tester.doTest(address, parameters, headers, method, body); @@ -693,12 +693,43 @@ return status; } catch (Exception e) { - WSTestStatus status = new WSTestStatus(IStatus.ERROR, + String result = tester.getResultBody(); + + // put the results in the result text field + String cleanedUp = WSTestUtils.addNLsToXML(result); + + WSTestStatus status = new WSTestStatus(IStatus.OK, JBossWSUIPlugin.PLUGIN_ID, - JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage()); - status.setResultsText(e.toString()); - e.printStackTrace(); + JBossWSUIMessages.JAXRSWSTestView_JAXRS_Success_Status); + status.setResultsText(cleanedUp); + + String listText = EMPTY_STRING; + if (tester.getResultHeaders() != null) { + Iterator<?> iter = tester.getResultHeaders().entrySet().iterator(); + while (iter.hasNext()) { + String text = EMPTY_STRING; + Entry<?, ?> entry = (Entry<?, ?>) iter.next(); + if (entry.getKey() == null) + text = entry.getValue().toString(); + else + text = text + entry.toString(); + listText = listText + text; + if (iter.hasNext()) { + listText = listText + RESULT_HEADER_DELIMITER; + } + } + } + + System.out.println(listText); + status.setHeadersList(listText); + monitor.worked(10); return status; +// WSTestStatus status = new WSTestStatus(IStatus.ERROR, +// JBossWSUIPlugin.PLUGIN_ID, +// JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMessage()); +// status.setResultsText(e.toString()); +// e.printStackTrace(); +// return status; } }