You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/16 18:55:52 UTC
[3/5] cxf git commit: More removal of call to MessageUtils.itTrue
More removal of call to MessageUtils.itTrue
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ed84806e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ed84806e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ed84806e
Branch: refs/heads/master
Commit: ed84806e535197032021f6719e71968a40c1b173
Parents: 56fc03c
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Aug 16 11:20:07 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 16 14:22:17 2017 -0400
----------------------------------------------------------------------
.../cxf/interceptor/AbstractOutDatabindingInterceptor.java | 4 ++--
.../apache/cxf/interceptor/AttachmentOutInterceptor.java | 2 +-
.../apache/cxf/interceptor/OneWayProcessorInterceptor.java | 5 ++---
core/src/main/java/org/apache/cxf/message/MessageUtils.java | 3 +++
.../java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 4 ++--
.../org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 2 +-
.../main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java | 2 +-
.../main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 4 ++--
.../apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 4 ++--
.../apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java | 5 +++--
.../org/apache/cxf/jaxrs/provider/BinaryDataProvider.java | 4 ++--
.../org/apache/cxf/jaxrs/provider/MultipartProvider.java | 8 ++++----
.../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 2 +-
.../cxf/jaxrs/security/KerberosAuthenticationFilter.java | 4 ++--
.../cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 5 +++--
.../cxf/transport/http/netty/client/NettyHttpConduit.java | 5 +++--
.../apache/cxf/transport/http/AbstractHTTPDestination.java | 2 +-
.../apache/cxf/ws/addressing/impl/InternalContextUtils.java | 2 +-
.../rm/src/main/java/org/apache/cxf/ws/rm/Destination.java | 4 ++--
.../main/java/org/apache/cxf/ws/rm/DestinationSequence.java | 6 +++---
.../java/org/apache/cxf/ws/rm/InternalContextUtils.java | 3 +--
.../java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java | 4 ++--
.../java/org/apache/cxf/ws/rm/RMDeliveryInterceptor.java | 2 +-
.../src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java | 9 +++++----
.../cxf/ws/security/wss4j/AbstractTokenInterceptor.java | 2 +-
25 files changed, 51 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
index a34f942..c17cb36 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
@@ -100,7 +100,7 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt
if (out != null
&& writeToOutputStream(message, operation.getBinding(), service)
- && !MessageUtils.isTrue(message.getContextualProperty(DISABLE_OUTPUTSTREAM_OPTIMIZATION))) {
+ && !MessageUtils.getContextualBoolean(message, DISABLE_OUTPUTSTREAM_OPTIMIZATION, false)) {
if (xmlWriter != null) {
try {
xmlWriter.writeCharacters("");
@@ -186,7 +186,7 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt
DataWriter<T> writer = service.getDataBinding().createWriter(output);
Collection<Attachment> atts = message.getAttachments();
- if (MessageUtils.isTrue(message.getContextualProperty(Message.MTOM_ENABLED))
+ if (MessageUtils.getContextualBoolean(message, Message.MTOM_ENABLED, false)
&& atts == null) {
atts = new ArrayList<>();
message.setAttachments(atts);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
index 1f189a9..7371716 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
@@ -51,7 +51,7 @@ public class AttachmentOutInterceptor extends AbstractPhaseInterceptor<Message>
// Make it possible to step into this process in spite of Eclipse
// by declaring the Object.
boolean mtomEnabled = AttachmentUtil.isMtomEnabled(message);
- boolean writeAtts = MessageUtils.isTrue(message.getContextualProperty(WRITE_ATTACHMENTS))
+ boolean writeAtts = MessageUtils.getContextualBoolean(message, WRITE_ATTACHMENTS, false)
|| (message.getAttachments() != null && !message.getAttachments().isEmpty());
if (!mtomEnabled && !writeAtts) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/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 ac3804f..9ca7dda 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
@@ -147,9 +147,8 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message
"Executor queue is full, run the oneway invocation task in caller thread."
+ " Users can specify a larger executor queue to avoid this.");
// only block the thread if the prop is unset or set to false, otherwise let it go
- if (!MessageUtils.isTrue(
- message.getContextualProperty(
- "org.apache.cxf.oneway.rejected_execution_exception"))) {
+ if (!MessageUtils.getContextualBoolean(message,
+ "org.apache.cxf.oneway.rejected_execution_exception", false)) {
//the executor queue is full, so run the task in the caller thread
chain.unpause();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/core/src/main/java/org/apache/cxf/message/MessageUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
index 4939905..339a450 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
@@ -129,6 +129,9 @@ public final class MessageUtils {
return PropertyUtils.isTrue(value);
}
+ public static boolean getContextualBoolean(Message m, String key) {
+ return getContextualBoolean(m, key, false);
+ }
public static boolean getContextualBoolean(Message m, String key, boolean defaultValue) {
if (m != null) {
Object o = m.getContextualProperty(key);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
index b38b5b1..c69e8e1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
@@ -167,7 +167,7 @@ public class HttpHeadersImpl implements HttpHeaders {
public MultivaluedMap<String, String> getRequestHeaders() {
boolean splitIndividualValue
- = MessageUtils.isTrue(message.getContextualProperty(HEADER_SPLIT_PROPERTY));
+ = MessageUtils.getContextualBoolean(message, HEADER_SPLIT_PROPERTY, false);
if (splitIndividualValue) {
Map<String, List<String>> newHeaders =
new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
@@ -215,7 +215,7 @@ public class HttpHeadersImpl implements HttpHeaders {
public List<String> getRequestHeader(String name) {
boolean splitIndividualValue
- = MessageUtils.isTrue(message.getContextualProperty(HEADER_SPLIT_PROPERTY));
+ = MessageUtils.getContextualBoolean(message, HEADER_SPLIT_PROPERTY, false);
List<String> values = headers.get(name);
if (!splitIndividualValue
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index a78f930..2f0c696 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -175,7 +175,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
Message message = PhaseInterceptorChain.getCurrentMessage();
if (message != null
- && !MessageUtils.isTrue(message.getContextualProperty(STRICT_MEDIA_TYPE_CHECK))) {
+ && !MessageUtils.getContextualBoolean(message, STRICT_MEDIA_TYPE_CHECK, false)) {
MediaType mt = null;
if (mType.equals(MediaType.TEXT_PLAIN_TYPE.getType())) {
mt = MediaType.TEXT_PLAIN_TYPE;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index ceaeb5c..e3a3acf 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -429,7 +429,7 @@ public final class ResponseImpl extends Response {
protected void autoClose(Class<?> cls, boolean exception) {
if (!entityBufferred && !JAXRSUtils.isStreamingOutType(cls)
- && (exception || MessageUtils.isTrue(outMessage.getContextualProperty("response.stream.auto.close")))) {
+ && (exception || MessageUtils.getContextualBoolean(outMessage, "response.stream.auto.close"))) {
close();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
index 8a7dd6e..569ec2b 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
@@ -64,9 +64,9 @@ public class UriInfoImpl implements UriInfo {
if (m != null) {
this.stack = m.get(OperationResourceInfoStack.class);
this.caseInsensitiveQueries =
- MessageUtils.isTrue(m.getContextualProperty(CASE_INSENSITIVE_QUERIES));
+ MessageUtils.getContextualBoolean(m, CASE_INSENSITIVE_QUERIES);
this.queryValueIsCollection =
- MessageUtils.isTrue(m.getContextualProperty(PARSE_QUERY_VALUE_AS_COLLECTION));
+ MessageUtils.getContextualBoolean(m, PARSE_QUERY_VALUE_AS_COLLECTION);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
index 4474456..d7be9b3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
@@ -34,6 +34,7 @@ import javax.ws.rs.core.Response;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.interceptor.Fault;
@@ -53,7 +54,6 @@ import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
-import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
@@ -247,7 +247,7 @@ public class JAXRSInInterceptor extends AbstractPhaseInterceptor<Message> {
exchange.put(RESOURCE_OPERATION_NAME, plainOperationName);
if (ori.isOneway()
- || MessageUtils.isTrue(HttpUtils.getProtocolHeader(message, Message.ONE_WAY_REQUEST, null))) {
+ || PropertyUtils.isTrue(HttpUtils.getProtocolHeader(message, Message.ONE_WAY_REQUEST, null))) {
exchange.setOneWay(true);
}
ResourceProvider rp = cri.getResourceProvider();
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
index 2c3db9e..ccc05db 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
@@ -47,6 +47,7 @@ import javax.xml.stream.events.XMLEvent;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.io.CachedOutputStream;
@@ -323,7 +324,7 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor {
WriterInterceptor last = writers.get(writers.size() - 1);
MessageBodyWriter<Object> w = ((WriterInterceptorMBW)last).getMBW();
Object outBuf = m.getContextualProperty(OUT_BUFFERING);
- boolean enabled = MessageUtils.isTrue(outBuf);
+ boolean enabled = PropertyUtils.isTrue(outBuf);
boolean configurableProvider = w instanceof AbstractConfigurableProvider;
if (!enabled && outBuf == null && configurableProvider) {
enabled = ((AbstractConfigurableProvider)w).getEnableBuffering();
@@ -485,7 +486,7 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor {
// method is modifiable. Thus we do need to know if the initial copy has already
// occurred: for now we will just use to ensure the correct status is set
private boolean isResponseHeadersCopied(Message message) {
- return MessageUtils.isTrue(message.get(AbstractHTTPDestination.RESPONSE_HEADERS_COPIED));
+ return PropertyUtils.isTrue(message.get(AbstractHTTPDestination.RESPONSE_HEADERS_COPIED));
}
public void handleFault(Message message) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
index dc4987f..f920988 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/BinaryDataProvider.java
@@ -49,6 +49,7 @@ import javax.ws.rs.ext.MessageBodyWriter;
import org.apache.cxf.annotations.UseNio;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.MessageDigestInputStream;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.continuations.Continuation;
import org.apache.cxf.continuations.ContinuationProvider;
import org.apache.cxf.helpers.FileUtils;
@@ -62,7 +63,6 @@ import org.apache.cxf.jaxrs.utils.AnnotationUtils;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.PhaseInterceptorChain;
public class BinaryDataProvider<T> extends AbstractConfigurableProvider
@@ -243,7 +243,7 @@ public class BinaryDataProvider<T> extends AbstractConfigurableProvider
protected boolean isRangeSupported() {
Message message = PhaseInterceptorChain.getCurrentMessage();
if (message != null) {
- return MessageUtils.isTrue(message.get(HTTP_RANGE_PROPERTY));
+ return PropertyUtils.isTrue(message.get(HTTP_RANGE_PROPERTY));
}
return false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
index fe6aaff..89b4970 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/MultipartProvider.java
@@ -55,6 +55,7 @@ import org.apache.cxf.attachment.ByteDataSource;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PrimitiveUtils;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
@@ -70,7 +71,6 @@ import org.apache.cxf.jaxrs.utils.InjectionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.jaxrs.utils.multipart.AttachmentUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
@Provider
@Consumes({"multipart/related", "multipart/mixed", "multipart/alternative", "multipart/form-data" })
@@ -131,7 +131,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
|| Collection.class.isAssignableFrom(type)
|| Map.class.isAssignableFrom(type) && type != MultivaluedMap.class
|| AnnotationUtils.getAnnotation(anns, Multipart.class) != null
- || MessageUtils.isTrue(mc.getContextualProperty(SUPPORT_TYPE_AS_MULTIPART)));
+ || PropertyUtils.isTrue(mc.getContextualProperty(SUPPORT_TYPE_AS_MULTIPART)));
}
protected void checkContentLength() {
@@ -171,7 +171,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
if (multipart != null) {
if (collectionExpected
&& !mediaTypeSupported(multipart.getContentType())
- && !MessageUtils.isTrue(mc.getContextualProperty(SINGLE_PART_IS_COLLECTION))) {
+ && !PropertyUtils.isTrue(mc.getContextualProperty(SINGLE_PART_IS_COLLECTION))) {
List<Attachment> allMultiparts = AttachmentUtils.getMatchingAttachments(id, infos);
return getAttachmentCollection(t, allMultiparts, anns);
}
@@ -426,7 +426,7 @@ public class MultipartProvider extends AbstractConfigurableProvider
mimeType = id.type();
}
if (mimeType == null) {
- if (MessageUtils.isTrue(mc.getContextualProperty(Message.MTOM_ENABLED))) {
+ if (PropertyUtils.isTrue(mc.getContextualProperty(Message.MTOM_ENABLED))) {
mimeType = "text/xml";
} else {
mimeType = MediaType.APPLICATION_OCTET_STREAM;
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index ac5b8dc..e21b5c1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -293,7 +293,7 @@ public abstract class ProviderFactory {
Class<?> mapperClass = ClassHelper.getRealClass(bus, em.getProvider());
Type[] types = null;
- if (m != null && MessageUtils.isTrue(m.getContextualProperty(IGNORE_TYPE_VARIABLES))) {
+ if (m != null && MessageUtils.getContextualBoolean(m, IGNORE_TYPE_VARIABLES)) {
types = new Type[]{mapperClass};
} else {
types = getGenericInterfaces(mapperClass, expectedType);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
index af3e844..0111022 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/security/KerberosAuthenticationFilter.java
@@ -40,12 +40,12 @@ import org.apache.cxf.common.security.SimplePrincipal;
import org.apache.cxf.common.security.SimpleSecurityContext;
import org.apache.cxf.common.util.Base64Exception;
import org.apache.cxf.common.util.Base64Utility;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.security.SecurityContext;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSException;
@@ -128,7 +128,7 @@ public class KerberosAuthenticationFilter implements ContainerRequestFilter {
}
protected GSSContext createGSSContext() throws GSSException {
- boolean useKerberosOid = MessageUtils.isTrue(
+ boolean useKerberosOid = PropertyUtils.isTrue(
messageContext.getContextualProperty(PROPERTY_USE_KERBEROS_OID));
Oid oid = new Oid(useKerberosOid ? KERBEROS_OID : SPNEGO_OID);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 5675115..0100452 100755
--- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -49,6 +49,7 @@ import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;
import org.apache.cxf.Bus;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.jsse.SSLUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
@@ -182,7 +183,7 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
//the SSLSocketFactory.
o = false;
}
- if (!MessageUtils.isTrue(o)) {
+ if (!PropertyUtils.isTrue(o)) {
message.put(USE_ASYNC, Boolean.FALSE);
super.setupConnection(message, addressChanged ? new Address(uriString, uri) : address, csPolicy);
return;
@@ -307,7 +308,7 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
protected void setProtocolHeaders() throws IOException {
Headers h = new Headers(outMessage);
basicEntity.setContentType(h.determineContentType());
- boolean addHeaders = MessageUtils.isTrue(outMessage.getContextualProperty(Headers.ADD_HEADERS_PROPERTY));
+ boolean addHeaders = MessageUtils.getContextualBoolean(outMessage, Headers.ADD_HEADERS_PROPERTY, false);
for (Map.Entry<String, List<String>> header : h.headerMap().entrySet()) {
if (HttpHeaderHelper.CONTENT_TYPE.equalsIgnoreCase(header.getKey())) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
index 0dcd6e8..d11da9c 100644
--- a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
+++ b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
@@ -41,6 +41,7 @@ import javax.net.ssl.SSLSession;
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.jsse.TLSClientParameters;
import org.apache.cxf.helpers.HttpHeaderHelper;
@@ -143,7 +144,7 @@ public class NettyHttpConduit extends URLConnectionHTTPConduit implements BusLif
//the SSLSocketFactory.
o = false;
}
- if (!MessageUtils.isTrue(o)) {
+ if (!PropertyUtils.isTrue(o)) {
message.put(USE_ASYNC, Boolean.FALSE);
super.setupConnection(message, addressChanged ? new Address(uriString, uri) : address, csPolicy);
return;
@@ -411,7 +412,7 @@ public class NettyHttpConduit extends URLConnectionHTTPConduit implements BusLif
protected void setProtocolHeaders() throws IOException {
Headers h = new Headers(outMessage);
entity.getRequest().headers().set(Message.CONTENT_TYPE, h.determineContentType());
- boolean addHeaders = MessageUtils.isTrue(outMessage.getContextualProperty(Headers.ADD_HEADERS_PROPERTY));
+ boolean addHeaders = MessageUtils.getContextualBoolean(outMessage, Headers.ADD_HEADERS_PROPERTY, false);
for (Map.Entry<String, List<String>> header : h.headerMap().entrySet()) {
if (HttpHeaderHelper.CONTENT_TYPE.equalsIgnoreCase(header.getKey())) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index 892e8f0..d958e33 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -585,7 +585,7 @@ public abstract class AbstractHTTPDestination
}
Object o = inMessage.get("cxf.io.cacheinput");
DelegatingInputStream in = inMessage.getContent(DelegatingInputStream.class);
- if (MessageUtils.isTrue(o)) {
+ if (PropertyUtils.isTrue(o)) {
Collection<Attachment> atts = inMessage.getAttachments();
if (atts != null) {
for (Attachment a : atts) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
index 77d36f7..c1dd82a 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/impl/InternalContextUtils.java
@@ -236,7 +236,7 @@ final class InternalContextUtils {
partialResponse.put(Message.PARTIAL_RESPONSE_MESSAGE, Boolean.TRUE);
partialResponse.put(Message.EMPTY_PARTIAL_RESPONSE_MESSAGE, Boolean.TRUE);
boolean robust =
- MessageUtils.isTrue(inMessage.getContextualProperty(Message.ROBUST_ONEWAY));
+ MessageUtils.getContextualBoolean(inMessage, Message.ROBUST_ONEWAY, false);
if (robust) {
BindingOperationInfo boi = exchange.getBindingOperationInfo();
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
index 73edab8..d40c7e6 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/Destination.java
@@ -27,13 +27,13 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.rm.persistence.RMStore;
@@ -125,7 +125,7 @@ public class Destination extends AbstractEndpoint {
if (null != seq) {
if (seq.applyDeliveryAssurance(sequenceType.getMessageNumber(), message)) {
- if (MessageUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) {
+ if (PropertyUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) {
return;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
index a7cc5df..b45020f 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/DestinationSequence.java
@@ -183,7 +183,7 @@ public class DestinationSequence extends AbstractSequence {
if (updated) {
RMStore store = destination.getManager().getStore();
- if (null != store && !MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))) {
+ if (null != store && !MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false)) {
try {
RMMessage msg = new RMMessage();
CachedOutputStream cos = (CachedOutputStream)message
@@ -272,10 +272,10 @@ public class DestinationSequence extends AbstractSequence {
boolean robustDelivering = false;
boolean inOrder = mn - nextInOrder == 1;
if (message != null) {
- robust = MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY));
+ robust = MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false);
if (robust) {
robustDelivering =
- MessageUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY));
+ MessageUtils.getContextualBoolean(message, RMMessageConstants.DELIVERING_ROBUST_ONEWAY, false);
}
}
if (robust && !robustDelivering) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java
index e63208f..5fd979f 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java
@@ -161,8 +161,7 @@ final class InternalContextUtils {
if (backChannel != null) {
partialResponse.put(Message.PARTIAL_RESPONSE_MESSAGE, Boolean.TRUE);
partialResponse.put(Message.EMPTY_PARTIAL_RESPONSE_MESSAGE, Boolean.TRUE);
- boolean robust =
- MessageUtils.isTrue(inMessage.getContextualProperty(Message.ROBUST_ONEWAY));
+ boolean robust = MessageUtils.getContextualBoolean(inMessage, Message.ROBUST_ONEWAY, false);
if (robust) {
BindingOperationInfo boi = exchange.getBindingOperationInfo();
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
index dce6807..805485d 100755
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMCaptureInInterceptor.java
@@ -64,7 +64,7 @@ public class RMCaptureInInterceptor extends AbstractRMInterceptor<Message> {
// all messages are initially captured as they cannot be distinguished at this phase
// Non application messages temp files are released (cos.releaseTempFileHold()) in RMInInterceptor
- if (!isGET(message) && !MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))
+ if (!isGET(message) && !MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false)
&& (getManager().getStore() != null || (getManager().getDestinationPolicy() != null && getManager()
.getDestinationPolicy().getRetryPolicy() != null))) {
@@ -163,7 +163,7 @@ public class RMCaptureInInterceptor extends AbstractRMInterceptor<Message> {
public void handleMessage(Message message) {
LOG.entering(getClass().getName(), "handleMessage");
// Capturing the soap envelope. In case of WSS was activated, decrypted envelope is captured.
- if (!MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY))
+ if (!MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false)
&& isApplicationMessage(message)
&& (getManager().getStore() != null || (getManager().getDestinationPolicy() != null && getManager()
.getDestinationPolicy().getRetryPolicy() != null))) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMDeliveryInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMDeliveryInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMDeliveryInterceptor.java
index 4c0f159..95a1c01 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMDeliveryInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMDeliveryInterceptor.java
@@ -56,7 +56,7 @@ public class RMDeliveryInterceptor extends AbstractRMInterceptor<Message> {
LOG.entering(getClass().getName(), "handleMessage");
Destination dest = getManager().getDestination(message);
final boolean robust =
- MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY));
+ MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false);
if (robust) {
message.remove(RMMessageConstants.DELIVERING_ROBUST_ONEWAY);
dest.acknowledge(message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
index cfd6af8..6438c47 100644
--- a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
+++ b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMInInterceptor.java
@@ -24,6 +24,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.PropertyUtils;
import org.apache.cxf.io.CachedOutputStream;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -52,7 +53,7 @@ public class RMInInterceptor extends AbstractRMInterceptor<Message> {
public void handleFault(Message message) {
message.put(MAPAggregator.class.getName(), true);
if (RMContextUtils.getProtocolVariation(message) != null) {
- if (MessageUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) {
+ if (PropertyUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) {
// revert the delivering entry from the destination sequence
try {
Destination destination = getManager().getDestination(message);
@@ -70,7 +71,7 @@ public class RMInInterceptor extends AbstractRMInterceptor<Message> {
// make sure the fault is returned for an ws-rm related fault or an invalid ws-rm message
// note that OneWayProcessingInterceptor handles the robust case, hence not handled here.
if (isProtocolFault(message)
- && !MessageUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) {
+ && !PropertyUtils.isTrue(message.get(RMMessageConstants.DELIVERING_ROBUST_ONEWAY))) {
Exchange exchange = message.getExchange();
exchange.setOneWay(false);
@@ -116,7 +117,7 @@ public class RMInInterceptor extends AbstractRMInterceptor<Message> {
private boolean isRedeliveryEnabled(Message message) {
// deprecated redelivery mode check
- if (MessageUtils.isTrue(message.getContextualProperty("org.apache.cxf.ws.rm.destination.redeliver"))) {
+ if (MessageUtils.getContextualBoolean(message, "org.apache.cxf.ws.rm.destination.redeliver", false)) {
LOG.warning("Use RetryPolicy to enable the redelivery mode");
return true;
}
@@ -255,7 +256,7 @@ public class RMInInterceptor extends AbstractRMInterceptor<Message> {
void processSequence(Destination destination, Message message)
throws SequenceFault, RMException {
final boolean robust =
- MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY));
+ MessageUtils.getContextualBoolean(message, Message.ROBUST_ONEWAY, false);
if (robust) {
// set this property to change the acknowledging behavior
message.put(RMMessageConstants.DELIVERING_ROBUST_ONEWAY, Boolean.TRUE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/ed84806e/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
index 3176e43..40c477e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
@@ -81,7 +81,7 @@ public abstract class AbstractTokenInterceptor extends AbstractSoapInterceptor {
public void handleMessage(SoapMessage message) throws Fault {
boolean enableStax =
- MessageUtils.isTrue(message.getContextualProperty(SecurityConstants.ENABLE_STREAMING_SECURITY));
+ MessageUtils.getContextualBoolean(message, SecurityConstants.ENABLE_STREAMING_SECURITY, false);
if (enableStax) {
return;
}