[jbossws-commits] JBossWS SVN: r13243 - stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084.

Author: richard.opalka(a)jboss.com Date: 2010-11-08 06:45:28 -0500 (Mon, 08 Nov 2010) New Revision: 13243 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/ServiceImpl.java Log: [JBWS-3084] refactoring - removing dependencies on Apache CXF proprietary API Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/ServiceImpl.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/ServiceImpl.java 2010-11-08 11:34:20 UTC (rev 13242) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/ServiceImpl.java 2010-11-08 11:45:28 UTC (rev 13243) @@ -22,6 +22,7 @@ package org.jboss.test.ws.saaj.jbws3084; import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.util.Arrays; import java.util.HashMap; @@ -34,9 +35,7 @@ import javax.xml.ws.WebServiceContext; import javax.xml.ws.handler.MessageContext; -import org.apache.cxf.helpers.CastUtils; -import org.apache.cxf.helpers.IOUtils; -import org.apache.cxf.helpers.LoadingByteArrayOutputStream; +import org.jboss.wsf.common.IOUtils; @WebService(portName = "SaajServicePort", serviceName = "SaajService", wsdlLocation = "WEB-INF/wsdl/SaajService.wsdl", targetNamespace = "http://www.jboss.org/jbossws/saaj", endpointInterface = "org.jboss.test.ws.saaj.jbws3084.ServiceIface") public class ServiceImpl implements ServiceIface @@ -44,10 +43,11 @@ @Resource private WebServiceContext context; + @SuppressWarnings("unchecked") public String sayHello() { - Map<String, List<String>> reqHeaders = CastUtils.cast((Map<?, ?>) context.getMessageContext().get( - MessageContext.HTTP_REQUEST_HEADERS)); + Map<String, List<String>> reqHeaders = (Map<String, List<String>>) context.getMessageContext().get( + MessageContext.HTTP_REQUEST_HEADERS); boolean chunkedEncodingDisabled = reqHeaders.get("transfer-encoding-disabled") != null; @@ -70,8 +70,8 @@ { throw new RuntimeException("Unexpected Transfer-Encoding header"); } - Map<String, List<String>> respHeaders = CastUtils.cast((Map<?, ?>) context.getMessageContext().get( - MessageContext.HTTP_RESPONSE_HEADERS)); + Map<String, List<String>> respHeaders = (Map<String, List<String>>) context.getMessageContext().get( + MessageContext.HTTP_RESPONSE_HEADERS); if (respHeaders == null) { respHeaders = new HashMap<String, List<String>>(); @@ -80,11 +80,11 @@ respHeaders.put("Transfer-Encoding-Disabled", Arrays.asList("true")); } - Map<String, DataHandler> dataHandlers = CastUtils.cast((Map<?, ?>) context.getMessageContext().get( - MessageContext.INBOUND_MESSAGE_ATTACHMENTS)); + Map<String, DataHandler> dataHandlers = (Map<String, DataHandler>) context.getMessageContext().get( + MessageContext.INBOUND_MESSAGE_ATTACHMENTS); - Map<String, DataHandler> outDataHandlers = CastUtils.cast((Map<?, ?>) context.getMessageContext().get( - MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS)); + Map<String, DataHandler> outDataHandlers = (Map<String, DataHandler>) context.getMessageContext().get( + MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); int index = 0; try @@ -92,11 +92,11 @@ for (Map.Entry<String, DataHandler> entry : dataHandlers.entrySet()) { InputStream is = entry.getValue().getInputStream(); - LoadingByteArrayOutputStream bous = new LoadingByteArrayOutputStream(); - IOUtils.copy(is, bous); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + IOUtils.copyStream(baos, is); String name = Integer.toString(index++); - DataHandler handler = new DataHandler(new InputStreamDataSource(bous.createInputStream(), "text/plain", - name)); + DataHandler handler = new DataHandler(new InputStreamDataSource( + new ByteArrayInputStream(baos.toByteArray()), "text/plain", name)); outDataHandlers.put(name, handler); } } @@ -108,12 +108,13 @@ return "Hello World!"; } + @SuppressWarnings("unchecked") public String greetMe() { try { - Map<String, DataHandler> outDataHandlers = CastUtils.cast((Map<?, ?>) context.getMessageContext().get( - MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS)); + Map<String, DataHandler> outDataHandlers = (Map<String, DataHandler>) context.getMessageContext().get( + MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS); final char[] content = new char[16 * 1024]; Arrays.fill(content, 'A');