Repository: cxf Updated Branches: refs/heads/master 5f32866fc -> ce2dfb8f8
Start removing calls to method we'd like to deprecate Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce2dfb8f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce2dfb8f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce2dfb8f Branch: refs/heads/master Commit: ce2dfb8f84175df5fb1c2241b80b6342ca4eeb55 Parents: 5f32866 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Aug 15 16:36:56 2017 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Aug 15 16:36:56 2017 -0400 ---------------------------------------------------------------------- .../apache/cxf/attachment/AttachmentUtil.java | 3 +- .../cxf/endpoint/AbstractConduitSelector.java | 3 +- .../cxf/endpoint/AbstractEndpointFactory.java | 4 +-- .../cxf/interceptor/FIStaxInInterceptor.java | 2 +- .../cxf/interceptor/FIStaxOutInterceptor.java | 4 +-- .../interceptor/OneWayProcessorInterceptor.java | 4 +-- .../transform/TransformOutInterceptor.java | 2 +- .../apache/cxf/phase/PhaseInterceptorChain.java | 2 +- .../soap/interceptor/SoapOutInterceptor.java | 3 +- .../interceptors/MessageModeOutInterceptor.java | 4 +-- .../org/apache/cxf/jaxws/spi/ProviderImpl.java | 4 +-- .../org/apache/cxf/frontend/WSDLGetUtils.java | 5 ++- .../org/apache/cxf/transport/http/Headers.java | 6 ++-- .../jaxrs/BookStoreNoAnnotationsImpl.java | 4 +-- .../cxf/systest/jaxws/ClientServerTest.java | 33 ++------------------ 15 files changed, 27 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java index 051ed09..c11fa63 100644 --- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java +++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java @@ -156,8 +156,7 @@ public final class AttachmentUtil { } public static boolean isMtomEnabled(Message message) { - Object prop = message.getContextualProperty(Message.MTOM_ENABLED); - return MessageUtils.isTrue(prop); + return MessageUtils.getContextualBoolean(message, Message.MTOM_ENABLED, false); } public static void setStreamedAttachmentProperties(Message message, CachedOutputStream bos) http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java index f9c6884..8d434cd 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java +++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java @@ -26,6 +26,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.apache.cxf.BusException; +import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Exchange; @@ -197,7 +198,7 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea // will need to keep low level conduits operating on InputStreams open // and will be responsible for closing the streams - if (MessageUtils.isTrue(exchange.get(KEEP_CONDUIT_ALIVE))) { + if (PropertyUtils.isTrue(exchange.get(KEEP_CONDUIT_ALIVE))) { return; } try { http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java b/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java index 6f50eb3..4f076f6 100644 --- a/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java +++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java @@ -34,12 +34,12 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.binding.BindingConfiguration; import org.apache.cxf.binding.BindingFactory; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.databinding.DataBinding; import org.apache.cxf.feature.Feature; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider; import org.apache.cxf.interceptor.AnnotationInterceptors; -import org.apache.cxf.message.MessageUtils; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.ws.addressing.EndpointReferenceType; @@ -212,7 +212,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr */ @SuppressWarnings("unchecked") protected boolean checkPrivateEndpoint(Endpoint ep) { - if (MessageUtils.isTrue(ep.get(PRIVATE_ENDPOINT))) { + if (PropertyUtils.isTrue(ep.get(PRIVATE_ENDPOINT))) { List<String> addresses = (List<String>)getBus().getProperty(PRIVATE_ENDPOINTS); if (addresses == null) { http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java index d7d56f1..5e6b0ba 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java @@ -92,7 +92,7 @@ public class FIStaxInInterceptor extends AbstractPhaseInterceptor<Message> { protected boolean isHttpVerbSupported(Message message) { if (isGET(message)) { return isRequestor(message) - && MessageUtils.isTrue(message.getContextualProperty(FI_GET_SUPPORTED)); + && MessageUtils.getContextualBoolean(message, FI_GET_SUPPORTED, false); } return true; } http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java index 14efe15..2a98430 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java @@ -33,9 +33,9 @@ import javax.xml.stream.XMLStreamWriter; import com.sun.xml.fastinfoset.stax.StAXDocumentSerializer; import org.apache.cxf.common.logging.LogUtils; +import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.message.Message; -import org.apache.cxf.message.MessageUtils; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; @@ -112,7 +112,7 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> { } if (force - || MessageUtils.isTrue(o)) { + || PropertyUtils.isTrue(o)) { StAXDocumentSerializer serializer = getOutput(out); message.setContent(XMLStreamWriter.class, serializer); http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java index 7764f94..ac3804f 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java @@ -80,10 +80,10 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message final InterceptorChain chain = message.getInterceptorChain(); boolean robust = - MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY)); + MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false); boolean useOriginalThread = - MessageUtils.isTrue(message.getContextualProperty(USE_ORIGINAL_THREAD)); + MessageUtils.getContextualBoolean(message, USE_ORIGINAL_THREAD, false); if (!useOriginalThread && !robust) { //need to suck in all the data from the input stream as http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java index ef2f4ca..71f4183 100644 --- a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java +++ b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java @@ -88,7 +88,7 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> { } if (skipOnFault && null != message.getContent(Exception.class) - || MessageUtils.isTrue(message.getContextualProperty(TRANSFORM_SKIP))) { + || MessageUtils.getContextualBoolean(message, TRANSFORM_SKIP, false)) { return; } http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java index 0187e8a..4d6e83b 100644 --- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java +++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java @@ -432,7 +432,7 @@ public class PhaseInterceptorChain implements InterceptorChain { } private boolean isRobustOneWay(Message message) { - return MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY)); + return MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false); } /** http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java index 27852e1..4de8350 100644 --- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java +++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java @@ -40,6 +40,7 @@ import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.SoapVersion; import org.apache.cxf.binding.soap.model.SoapHeaderInfo; import org.apache.cxf.common.i18n.BundleUtils; +import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.databinding.DataBinding; import org.apache.cxf.databinding.DataWriter; @@ -82,7 +83,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor { public void handleMessage(SoapMessage message) { // Yes this is ugly, but it avoids us from having to implement any kind of caching strategy - boolean wroteStart = MessageUtils.isTrue(message.get(WROTE_ENVELOPE_START)); + boolean wroteStart = PropertyUtils.isTrue(message.get(WROTE_ENVELOPE_START)); if (!wroteStart) { writeSoapEnvelopeStart(message); http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java index 7efb556..884db9b 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java @@ -53,6 +53,7 @@ import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor.SAAJOutEndingInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJStreamWriter; import org.apache.cxf.binding.soap.saaj.SAAJUtils; +import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.helpers.DOMUtils; import org.apache.cxf.helpers.IOUtils; import org.apache.cxf.helpers.ServiceUtils; @@ -63,7 +64,6 @@ import org.apache.cxf.io.CachedOutputStream; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageContentsList; import org.apache.cxf.message.MessageImpl; -import org.apache.cxf.message.MessageUtils; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.service.model.BindingFaultInfo; @@ -272,7 +272,7 @@ public class MessageModeOutInterceptor extends AbstractPhaseInterceptor<Message> try { Object xmlDec = soapMessage.getProperty(SOAPMessage.WRITE_XML_DECLARATION); if (xmlDec != null) { - boolean b = MessageUtils.isTrue(xmlDec); + boolean b = PropertyUtils.isTrue(xmlDec); message.put(StaxOutInterceptor.FORCE_START_DOCUMENT, b); } } catch (SOAPException e) { http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java index e9691cf..4622a79 100644 --- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java +++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/spi/ProviderImpl.java @@ -280,8 +280,8 @@ public class ProviderImpl extends javax.xml.ws.spi.Provider { boolean includeLocationOnly = false; org.apache.cxf.message.Message message = PhaseInterceptorChain.getCurrentMessage(); if (message != null) { - includeLocationOnly = MessageUtils.isTrue( - message.getContextualProperty("org.apache.cxf.wsa.metadata.wsdlLocationOnly")); + includeLocationOnly = MessageUtils + .getContextualBoolean(message, "org.apache.cxf.wsa.metadata.wsdlLocationOnly", false); } String attrubuteValue = serviceName != null && !includeLocationOnly ? serviceName.getNamespaceURI() + " " + wsdlDocumentLocation http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java ---------------------------------------------------------------------- diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java index 9327c81..c155ac7 100644 --- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java +++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java @@ -294,7 +294,7 @@ public class WSDLGetUtils { base), e); } - boolean rewriteAllSoapAddress = MessageUtils.isTrue(message.getContextualProperty(AUTO_REWRITE_ADDRESS_ALL)); + boolean rewriteAllSoapAddress = MessageUtils.getContextualBoolean(message, AUTO_REWRITE_ADDRESS_ALL, false); if (rewriteAllSoapAddress) { List<Element> portList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(), "http://schemas.xmlsoap.org/wsdl/";, @@ -305,8 +305,7 @@ public class WSDLGetUtils { rewriteAddressProtocolHostPort(base, el, basePath, "http://schemas.xmlsoap.org/wsdl/soap12/";); } } - Object rewriteSoapAddress = message.getContextualProperty(AUTO_REWRITE_ADDRESS); - if (rewriteSoapAddress == null || MessageUtils.isTrue(rewriteSoapAddress) || rewriteAllSoapAddress) { + if (MessageUtils.getContextualBoolean(message, AUTO_REWRITE_ADDRESS, true) || rewriteAllSoapAddress) { List<Element> serviceList = DOMUtils.findAllElementsByTagNameNS(doc.getDocumentElement(), "http://schemas.xmlsoap.org/wsdl/";, "service"); http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java index d0f945f..f25b31d 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java @@ -402,8 +402,7 @@ public class Headers { * from the PROTOCOL_HEADERS in the message. */ private void transferProtocolHeadersToURLConnection(URLConnection connection) { - boolean addHeaders = MessageUtils.isTrue( - message.getContextualProperty(ADD_HEADERS_PROPERTY)); + boolean addHeaders = MessageUtils.getContextualBoolean(message, ADD_HEADERS_PROPERTY, false); for (Map.Entry<String, List<String>> entry : headers.entrySet()) { String header = entry.getKey(); List<String> headerList = entry.getValue(); @@ -512,8 +511,7 @@ public class Headers { response.setContentType(contentType); } - boolean addHeaders = MessageUtils.isTrue( - message.getContextualProperty(ADD_HEADERS_PROPERTY)); + boolean addHeaders = MessageUtils.getContextualBoolean(message, ADD_HEADERS_PROPERTY, false); for (Map.Entry<String, List<String>> entry : headers.entrySet()) { String header = entry.getKey(); List<?> headerList = entry.getValue(); http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java index d0667df..3a49550 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStoreNoAnnotationsImpl.java @@ -29,7 +29,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import org.apache.cxf.message.MessageUtils; +import org.apache.cxf.common.util.PropertyUtils; public class BookStoreNoAnnotationsImpl implements BookStoreNoAnnotationsInterface, HttpHeadersContext { @@ -55,7 +55,7 @@ public class BookStoreNoAnnotationsImpl implements BookStoreNoAnnotationsInterfa if (hs == null) { throw new WebApplicationException(Response.serverError().build()); } - boolean springProxy = MessageUtils.isTrue(hs.getHeaderString("SpringProxy")); + boolean springProxy = PropertyUtils.isTrue(hs.getHeaderString("SpringProxy")); if (!springProxy && ui == null) { throw new WebApplicationException(Response.serverError().build()); } http://git-wip-us.apache.org/repos/asf/cxf/blob/ce2dfb8f/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java index f013933..ced9d49 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java @@ -28,7 +28,6 @@ import java.lang.reflect.UndeclaredThrowableException; import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; @@ -40,7 +39,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Logger; import java.util.zip.GZIPInputStream; -import javax.xml.bind.JAXBContext; import javax.xml.namespace.QName; import javax.xml.transform.stream.StreamSource; import javax.xml.ws.AsyncHandler; @@ -59,6 +57,7 @@ import org.apache.cxf.common.logging.LogUtils; import org.apache.cxf.configuration.security.AuthorizationPolicy; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.dynamic.DynamicClientFactory; +import org.apache.cxf.ext.logging.LoggingFeature; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.jaxws.DispatchImpl; import org.apache.cxf.message.Message; @@ -881,23 +880,6 @@ public class ClientServerTest extends AbstractBusClientServerTestBase { } - /* - @Test - public void testDynamicClientFactory2() throws Exception { - String wsdlUrl = "http://sdpwsparam.strikeiron.com/sdpNFLTeams?WSDL";; - - //TODO test fault exceptions - DynamicClientFactory dcf = DynamicClientFactory.newInstance(); - Client client = dcf.createClient(wsdlUrl); - Object o = Class.forName("com.strikeiron.GetTeamInfoByCity", true, - Thread.currentThread().getContextClassLoader()).newInstance(); - Object[] result = client.invoke("GetTeamInfoByCity", "a", "b", "New England"); - - - //System.out.println(Arrays.asList(result)); - - } - */ @Test public void testDynamicClientFactory() throws Exception { URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl"); @@ -905,7 +887,6 @@ public class ClientServerTest extends AbstractBusClientServerTestBase { String wsdlUrl = null; wsdlUrl = wsdl.toURI().toString(); - //TODO test fault exceptions DynamicClientFactory dcf = DynamicClientFactory.newInstance(); Client client = dcf.createClient(wsdlUrl, serviceName, portName); updateAddressPort(client, PORT); @@ -913,17 +894,9 @@ public class ClientServerTest extends AbstractBusClientServerTestBase { Object[] result = client.invoke("sayHi"); assertNotNull("no response received from service", result); assertEquals("Bonjour", result[0]); - //TODO: the following isn't a real test. We need to test against a service - // that would actually notice the difference. At least it ensures that - // specifying the property does not explode. - Map<String, Object> jaxbContextProperties = new HashMap<>(); - if (JAXBContext.newInstance(String.class).getClass().getName().contains("internal")) { - jaxbContextProperties.put("com.sun.xml.internal.bind.defaultNamespaceRemap", "uri:ultima:thule"); - } else { - jaxbContextProperties.put("com.sun.xml.bind.defaultNamespaceRemap", "uri:ultima:thule"); - } - dcf.setJaxbContextProperties(jaxbContextProperties); + client = dcf.createClient(wsdlUrl, serviceName, portName); + new LoggingFeature().initialize(client, client.getBus()); updateAddressPort(client, PORT); client.invoke("greetMe", "test"); result = client.invoke("sayHi");
