You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:39 UTC
[34/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
index f5fe03f..6584b85 100644
--- a/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/transport/TransportURIResolver.java
@@ -41,7 +41,7 @@ import org.apache.cxf.resource.ExtendedURIResolver;
import org.apache.cxf.service.model.EndpointInfo;
/**
- *
+ *
*/
public class TransportURIResolver extends ExtendedURIResolver {
private static final Set<String> DEFAULT_URI_RESOLVER_HANDLES = new HashSet<>();
@@ -56,17 +56,17 @@ public class TransportURIResolver extends ExtendedURIResolver {
DEFAULT_URI_RESOLVER_HANDLES.add("zip");
}
protected Bus bus;
-
+
public TransportURIResolver(Bus b) {
super();
bus = b;
}
-
+
public InputSource resolve(String curUri, String baseUri) {
-
+
// Spaces must be encoded or URI.resolve() will choke
curUri = curUri.replace(" ", "%20");
-
+
InputSource is = null;
URI base;
try {
@@ -81,14 +81,14 @@ public class TransportURIResolver extends ExtendedURIResolver {
base = null;
}
try {
- if (base == null
+ if (base == null
|| DEFAULT_URI_RESOLVER_HANDLES.contains(base.getScheme())) {
is = super.resolve(curUri, baseUri);
}
} catch (Exception ex) {
//nothing
}
- if (is == null && base != null
+ if (is == null && base != null
&& base.getScheme() != null
&& !DEFAULT_URI_RESOLVER_HANDLES.contains(base.getScheme())) {
try {
@@ -97,7 +97,7 @@ public class TransportURIResolver extends ExtendedURIResolver {
if ("http".equals(base.getScheme()) || "https".equals(base.getScheme())) {
//common case, don't "search"
ci = mgr.getConduitInitiator("http://cxf.apache.org/transports/http");
- }
+ }
if (ci == null) {
ci = mgr.getConduitInitiatorForUri(base.toString());
}
@@ -110,7 +110,7 @@ public class TransportURIResolver extends ExtendedURIResolver {
Message message = new MessageImpl();
Exchange exch = new ExchangeImpl();
message.setExchange(exch);
-
+
message.put(Message.HTTP_REQUEST_METHOD, "GET");
c.setMessageObserver(new MessageObserver() {
public void onMessage(Message message) {
@@ -143,11 +143,11 @@ public class TransportURIResolver extends ExtendedURIResolver {
//ignore
}
}
- if (is == null
- && (base == null
- || base.getScheme() == null
+ if (is == null
+ && (base == null
+ || base.getScheme() == null
|| !DEFAULT_URI_RESOLVER_HANDLES.contains(base.getScheme()))) {
- is = super.resolve(curUri, baseUri);
+ is = super.resolve(curUri, baseUri);
}
return is;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
index bf0e69c..bd85bb9 100644
--- a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
+++ b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
@@ -42,27 +42,27 @@ import org.apache.cxf.message.Message;
* </jaxws:endpoint>
* ]]>
* </pre>
- * Attaching this feature to a client will cause outgoing request messages
- * to be compressed and incoming compressed responses to be uncompressed.
- * Accept-Encoding header is sent to let the service know
- * that your client can accept compressed responses.
+ * Attaching this feature to a client will cause outgoing request messages
+ * to be compressed and incoming compressed responses to be uncompressed.
+ * Accept-Encoding header is sent to let the service know
+ * that your client can accept compressed responses.
*/
@NoJSR250Annotations
public class GZIPFeature extends AbstractFeature {
private static final GZIPInInterceptor IN = new GZIPInInterceptor();
private static final GZIPOutInterceptor OUT = new GZIPOutInterceptor();
-
+
/**
* The compression threshold to pass to the outgoing interceptor.
*/
int threshold = -1;
-
+
/**
* Force GZIP instead of negotiate
*/
boolean force;
-
-
+
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
provider.getInInterceptors().add(IN);
@@ -93,24 +93,24 @@ public class GZIPFeature extends AbstractFeature {
public void setThreshold(int threshold) {
this.threshold = threshold;
}
-
+
public int getThreshold() {
return threshold;
}
-
-
+
+
/**
- * Set if GZIP is always used without negotiation
+ * Set if GZIP is always used without negotiation
* @param b
*/
public void setForce(boolean b) {
force = b;
}
-
+
/**
* Retrieve the value set with {@link #setForce(boolean)}.
*/
public boolean getForce() {
return force;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
index a0772e7..9d8f336 100644
--- a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
@@ -68,7 +68,7 @@ public class GZIPInInterceptor extends AbstractPhaseInterceptor<Message> {
Map<String, List<String>> protocolHeaders = CastUtils.cast((Map<?, ?>)message
.get(Message.PROTOCOL_HEADERS));
if (protocolHeaders != null) {
- List<String> contentEncoding = HttpHeaderHelper.getHeader(protocolHeaders,
+ List<String> contentEncoding = HttpHeaderHelper.getHeader(protocolHeaders,
HttpHeaderHelper.CONTENT_ENCODING);
if (contentEncoding == null) {
contentEncoding = protocolHeaders.get(GZIPOutInterceptor.SOAP_JMS_CONTENTENCODING);
@@ -93,9 +93,9 @@ public class GZIPInInterceptor extends AbstractPhaseInterceptor<Message> {
break;
}
}
-
+
if (isRequestor(message)) {
- //record the fact that is worked so future requests will
+ //record the fact that is worked so future requests will
//automatically be FI enabled
Endpoint ep = message.getExchange().getEndpoint();
ep.put(GZIPOutInterceptor.USE_GZIP_KEY, GZIPOutInterceptor.UseGzip.YES);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
index abac612..2b7808a 100644
--- a/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
@@ -67,13 +67,13 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
public enum UseGzip {
NO, YES, FORCE
}
-
+
/**
* regular expression that matches any encoding with a
* q-value of 0 (or 0.0, 0.00, etc.).
*/
public static final Pattern ZERO_Q = Pattern.compile(";\\s*q=0(?:\\.0+)?$");
-
+
/**
* regular expression which can split encodings
*/
@@ -99,7 +99,7 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
* given by the client in Accept-Encoding.
*/
public static final String GZIP_ENCODING_KEY = GZIPOutInterceptor.class.getName() + ".gzipEncoding";
-
+
public static final String SOAP_JMS_CONTENTENCODING = "SOAPJMS_contentEncoding";
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(GZIPOutInterceptor.class);
@@ -144,7 +144,7 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
message.put(USE_GZIP_KEY, use);
// new stream to cache the message
- GZipThresholdOutputStream cs
+ GZipThresholdOutputStream cs
= new GZipThresholdOutputStream(threshold,
os,
use == UseGzip.FORCE,
@@ -161,7 +161,7 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
* that gzip is not permitted. For the full gory details, see <a
* href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3">section
* 14.3 of RFC 2616</a> (HTTP 1.1).
- *
+ *
* @param message the outgoing message.
* @return whether to attempt gzip compression for this message.
* @throws Fault if the Accept-Encoding header does not allow any encoding
@@ -180,7 +180,7 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
permitted = force ? UseGzip.YES : UseGzip.NO;
}
message.put(GZIP_ENCODING_KEY, "gzip");
- addHeader(message, "Accept-Encoding", "gzip;q=1.0, identity; q=0.5, *;q=0");
+ addHeader(message, "Accept-Encoding", "gzip;q=1.0, identity; q=0.5, *;q=0");
} else {
LOG.fine("Response role, checking accept-encoding");
Exchange exchange = message.getExchange();
@@ -265,10 +265,10 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
return permitted;
}
-
+
static class GZipThresholdOutputStream extends AbstractThresholdOutputStream {
Message message;
-
+
GZipThresholdOutputStream(int t, OutputStream orig,
boolean force, Message msg) {
super(t);
@@ -278,9 +278,9 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
setupGZip();
}
}
-
+
private void setupGZip() {
-
+
}
@Override
@@ -298,20 +298,20 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
// if this is a response message, add the Vary header
if (!Boolean.TRUE.equals(message.get(Message.REQUESTOR_ROLE))) {
addHeader(message, "Vary", "Accept-Encoding");
- }
+ }
// gzip the result
GZIPOutputStream zipOutput = new GZIPOutputStream(wrappedStream);
wrappedStream = zipOutput;
}
}
-
+
/**
* Adds a value to a header. If the given header name is not currently
* set in the message, an entry is created with the given single value.
* If the header is already set, the value is appended to the first
* element of the list, following a comma.
- *
+ *
* @param message the message
* @param name the header to set
* @param value the value to add
@@ -336,6 +336,6 @@ public class GZIPOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
public void setForce(boolean force) {
this.force = force;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java b/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
index a7b25e0..0a04df1 100644
--- a/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/validation/AbstractBeanValidationInterceptor.java
@@ -33,11 +33,11 @@ public abstract class AbstractBeanValidationInterceptor extends AbstractValidati
protected Object getServiceObject(Message message) {
return checkNotNull(super.getServiceObject(message), "SERVICE_OBJECT_NULL");
}
-
+
protected Method getServiceMethod(Message message) {
return (Method)checkNotNull(super.getServiceMethod(message), "SERVICE_METHOD_NULL");
}
-
+
private Object checkNotNull(Object object, String name) {
if (object == null) {
String message = new org.apache.cxf.common.i18n.Message(name, BUNDLE).toString();
@@ -46,7 +46,7 @@ public abstract class AbstractBeanValidationInterceptor extends AbstractValidati
}
return object;
}
-
+
@Override
protected void handleValidation(final Message message, final Object resourceInstance,
final Method method, final List<Object> arguments) {
@@ -56,7 +56,7 @@ public abstract class AbstractBeanValidationInterceptor extends AbstractValidati
message.getExchange().put(BeanValidationProvider.class, provider);
}
}
-
+
protected List<Object> unwrapArgs(List<Object> arguments) {
return arguments;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java b/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
index 821d7d1..59e7af8 100644
--- a/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/validation/AbstractValidationInterceptor.java
@@ -38,41 +38,41 @@ import org.apache.cxf.service.model.BindingOperationInfo;
public abstract class AbstractValidationInterceptor extends AbstractPhaseInterceptor< Message > {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractValidationInterceptor.class);
protected static final ResourceBundle BUNDLE = BundleUtils.getBundle(AbstractValidationInterceptor.class);
-
+
private Object serviceObject;
private volatile BeanValidationProvider provider;
-
+
public AbstractValidationInterceptor(String phase) {
super(phase);
}
-
+
public void setServiceObject(Object object) {
this.serviceObject = object;
}
-
+
public void setProvider(BeanValidationProvider provider) {
this.provider = provider;
}
-
+
@Override
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) throws Fault {
final Object theServiceObject = getServiceObject(message);
if (theServiceObject == null) {
return;
}
-
+
final Method method = getServiceMethod(message);
if (method == null) {
return;
}
-
-
+
+
final List< Object > arguments = MessageContentsList.getContentsList(message);
-
+
handleValidation(message, theServiceObject, method, arguments);
-
+
}
-
+
protected Object getServiceObject(Message message) {
if (serviceObject != null) {
return serviceObject;
@@ -87,13 +87,13 @@ public abstract class AbstractValidationInterceptor extends AbstractPhaseInterce
if (invoker instanceof FactoryInvoker) {
FactoryInvoker factoryInvoker = (FactoryInvoker)invoker;
if (factoryInvoker.isSingletonFactory()) {
- return factoryInvoker.getServiceObject(message.getExchange());
+ return factoryInvoker.getServiceObject(message.getExchange());
}
}
}
return null;
}
-
+
protected Method getServiceMethod(Message message) {
Message inMessage = message.getExchange().getInMessage();
Method method = null;
@@ -102,7 +102,7 @@ public abstract class AbstractValidationInterceptor extends AbstractPhaseInterce
if (method == null) {
BindingOperationInfo bop = inMessage.getExchange().getBindingOperationInfo();
if (bop != null) {
- MethodDispatcher md = (MethodDispatcher)
+ MethodDispatcher md = (MethodDispatcher)
inMessage.getExchange().getService().get(MethodDispatcher.class.getName());
method = md.getMethod(bop);
}
@@ -113,7 +113,7 @@ public abstract class AbstractValidationInterceptor extends AbstractPhaseInterce
}
return method;
}
-
+
protected abstract void handleValidation(Message message, Object resourceInstance,
Method method, List<Object> arguments);
@@ -122,7 +122,7 @@ public abstract class AbstractValidationInterceptor extends AbstractPhaseInterce
if (provider == null) {
Object prop = message.getContextualProperty(BeanValidationProvider.class.getName());
if (prop != null) {
- provider = (BeanValidationProvider)prop;
+ provider = (BeanValidationProvider)prop;
} else {
provider = new BeanValidationProvider();
}
@@ -130,6 +130,6 @@ public abstract class AbstractValidationInterceptor extends AbstractPhaseInterce
return provider;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java b/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java
index f4f1ef1..26fe2a6 100644
--- a/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java
+++ b/core/src/main/java/org/apache/cxf/validation/BeanValidationFeature.java
@@ -29,7 +29,7 @@ import org.apache.cxf.interceptor.InterceptorProvider;
public class BeanValidationFeature extends AbstractFeature {
private BeanValidationProvider validationProvider;
-
+
@Override
protected void initializeProvider(InterceptorProvider interceptorProvider, Bus bus) {
BeanValidationInInterceptor in = new BeanValidationInInterceptor();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/validation/BeanValidationOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/validation/BeanValidationOutInterceptor.java b/core/src/main/java/org/apache/cxf/validation/BeanValidationOutInterceptor.java
index ed49524..c05736e 100644
--- a/core/src/main/java/org/apache/cxf/validation/BeanValidationOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/validation/BeanValidationOutInterceptor.java
@@ -32,7 +32,7 @@ public class BeanValidationOutInterceptor extends AbstractValidationInterceptor
public BeanValidationOutInterceptor(String phase) {
super(phase);
}
-
+
@Override
protected void handleValidation(final Message message, final Object resourceInstance,
final Method method, final List<Object> arguments) {
@@ -40,28 +40,28 @@ public class BeanValidationOutInterceptor extends AbstractValidationInterceptor
Object entity = unwrapEntity(arguments.get(0));
BeanValidationProvider theProvider = getOutProvider(message);
if (isEnforceOnlyBeanConstraints()) {
- theProvider.validateReturnValue(entity);
+ theProvider.validateReturnValue(entity);
} else {
theProvider.validateReturnValue(resourceInstance, method, entity);
}
- }
+ }
}
-
+
protected Object unwrapEntity(Object entity) {
return entity;
}
-
+
protected BeanValidationProvider getOutProvider(Message message) {
BeanValidationProvider provider = message.getExchange().get(BeanValidationProvider.class);
return provider == null ? getProvider(message) : provider;
}
-
+
public boolean isEnforceOnlyBeanConstraints() {
return enforceOnlyBeanConstraints;
}
public void setEnforceOnlyBeanConstraints(boolean enforceOnlyBeanConstraints) {
this.enforceOnlyBeanConstraints = enforceOnlyBeanConstraints;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java b/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
index da285a0..f105b1d 100644
--- a/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
+++ b/core/src/main/java/org/apache/cxf/validation/BeanValidationProvider.java
@@ -38,7 +38,7 @@ import org.apache.cxf.common.logging.LogUtils;
public class BeanValidationProvider {
private static final Logger LOG = LogUtils.getL7dLogger(BeanValidationProvider.class);
-
+
private final ValidatorFactory factory;
public BeanValidationProvider() {
@@ -49,11 +49,11 @@ public class BeanValidationProvider {
throw ex;
}
}
-
+
public BeanValidationProvider(ParameterNameProvider parameterNameProvider) {
this(new ValidationConfiguration(parameterNameProvider));
}
-
+
public BeanValidationProvider(ValidationConfiguration cfg) {
try {
Configuration<?> factoryCfg = Validation.byDefaultProvider().configure();
@@ -64,18 +64,18 @@ public class BeanValidationProvider {
throw ex;
}
}
-
+
public BeanValidationProvider(ValidatorFactory factory) {
if (factory == null) {
throw new NullPointerException("Factory is null");
}
this.factory = factory;
}
-
+
public BeanValidationProvider(ValidationProviderResolver resolver) {
this(resolver, null);
}
-
+
public <T extends Configuration<T>, U extends ValidationProvider<T>> BeanValidationProvider(
ValidationProviderResolver resolver,
Class<U> providerType) {
@@ -87,9 +87,9 @@ public class BeanValidationProvider {
Class<U> providerType,
ValidationConfiguration cfg) {
try {
- Configuration<?> factoryCfg = providerType != null
+ Configuration<?> factoryCfg = providerType != null
? Validation.byProvider(providerType).providerResolver(resolver).configure()
- : Validation.byDefaultProvider().providerResolver(resolver).configure();
+ : Validation.byDefaultProvider().providerResolver(resolver).configure();
initFactoryConfig(factoryCfg, cfg);
factory = factoryCfg.buildValidatorFactory();
} catch (final ValidationException ex) {
@@ -109,48 +109,48 @@ public class BeanValidationProvider {
}
}
}
-
+
public< T > void validateParameters(final T instance, final Method method, final Object[] arguments) {
-
+
final ExecutableValidator methodValidator = getExecutableValidator();
- final Set< ConstraintViolation< T > > violations = methodValidator.validateParameters(instance,
+ final Set< ConstraintViolation< T > > violations = methodValidator.validateParameters(instance,
method, arguments);
-
+
if (!violations.isEmpty()) {
throw new ConstraintViolationException(violations);
- }
+ }
}
-
+
public< T > void validateReturnValue(final T instance, final Method method, final Object returnValue) {
final ExecutableValidator methodValidator = getExecutableValidator();
- final Set<ConstraintViolation< T > > violations = methodValidator.validateReturnValue(instance,
+ final Set<ConstraintViolation< T > > violations = methodValidator.validateReturnValue(instance,
method, returnValue);
-
+
if (!violations.isEmpty()) {
throw new ResponseConstraintViolationException(violations);
- }
+ }
}
-
+
public< T > void validateReturnValue(final T bean) {
final Set<ConstraintViolation< T > > violations = doValidateBean(bean);
if (!violations.isEmpty()) {
throw new ResponseConstraintViolationException(violations);
- }
+ }
}
-
+
public< T > void validateBean(final T bean) {
final Set<ConstraintViolation< T > > violations = doValidateBean(bean);
if (!violations.isEmpty()) {
throw new ConstraintViolationException(violations);
- }
+ }
}
-
+
private< T > Set<ConstraintViolation< T > > doValidateBean(final T bean) {
return factory.getValidator().validate(bean);
}
-
+
private ExecutableValidator getExecutableValidator() {
-
+
return factory.getValidator().forExecutables();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java b/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java
index 67caff2..d975a3d 100644
--- a/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java
+++ b/core/src/main/java/org/apache/cxf/validation/ClientBeanValidationFeature.java
@@ -29,19 +29,19 @@ import org.apache.cxf.interceptor.InterceptorProvider;
public class ClientBeanValidationFeature extends AbstractFeature {
private BeanValidationProvider validationProvider;
-
+
@Override
protected void initializeProvider(InterceptorProvider interceptorProvider, Bus bus) {
ClientBeanValidationOutInterceptor out = new ClientBeanValidationOutInterceptor();
addInterceptor(interceptorProvider, out);
}
-
+
protected void addInterceptor(InterceptorProvider interceptorProvider, ClientBeanValidationOutInterceptor out) {
if (validationProvider != null) {
out.setProvider(validationProvider);
}
interceptorProvider.getOutInterceptors().add(out);
-
+
}
public void setProvider(BeanValidationProvider provider) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java b/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java
index 428cb7d..a9109be 100644
--- a/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java
+++ b/core/src/main/java/org/apache/cxf/validation/ValidationConfiguration.java
@@ -30,16 +30,16 @@ public class ValidationConfiguration {
private ParameterNameProvider parameterNameProvider;
private MessageInterpolator messageInterpolator;
private TraversableResolver traversableResolver;
- private ConstraintValidatorFactory constraintValidatorFactory;
+ private ConstraintValidatorFactory constraintValidatorFactory;
private Map<String, String> properties = Collections.emptyMap();
-
+
public ValidationConfiguration() {
-
+
}
public ValidationConfiguration(ParameterNameProvider parameterNameProvider) {
this.parameterNameProvider = parameterNameProvider;
}
-
+
public ParameterNameProvider getParameterNameProvider() {
return parameterNameProvider;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/version/Version.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/version/Version.java b/core/src/main/java/org/apache/cxf/version/Version.java
index 423ff61..bfffea5 100644
--- a/core/src/main/java/org/apache/cxf/version/Version.java
+++ b/core/src/main/java/org/apache/cxf/version/Version.java
@@ -28,7 +28,7 @@ public final class Version {
private static String name;
private static String fullVersion;
private static String buildNumber;
-
+
private static final String VERSION_BASE = "/org/apache/cxf/version/";
private Version() {
@@ -43,7 +43,7 @@ public final class Version {
}
return ins;
}
-
+
private static synchronized void loadProperties() {
if (version == null) {
Properties p = new Properties();
@@ -59,7 +59,7 @@ public final class Version {
version = p.getProperty("product.version", "<unknown>");
name = p.getProperty("product.name", "Apache CXF");
buildNumber = p.getProperty("build.number", "<unknown>");
- if (version.contains("SNAPSHOT")
+ if (version.contains("SNAPSHOT")
|| version.contains("<unknown>")) {
fullVersion = name + " " + version + "-" + buildNumber;
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueue.java b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueue.java
index c2c2485..9634aa0 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueue.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueue.java
@@ -24,17 +24,17 @@ public interface AutomaticWorkQueue extends WorkQueue {
* @return the name
*/
String getName();
-
+
/**
- * Initiates an orderly shutdown.
+ * Initiates an orderly shutdown.
* If <code>processRemainingWorkItems</code>
- * is true, waits for all active items to finish execution before returning, otherwise returns
+ * is true, waits for all active items to finish execution before returning, otherwise returns
* immediately after removing all non active items from the queue.
- *
+ *
* @param processRemainingWorkItems
*/
void shutdown(boolean processRemainingWorkItems);
-
+
/**
* Returns true if this object has been shut down.
* @return true if this object has been shut down.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
index d3b409e..3de1618 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
@@ -55,38 +55,38 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
static final int DEFAULT_MAX_QUEUE_SIZE = 256;
private static final Logger LOG =
LogUtils.getL7dLogger(AutomaticWorkQueueImpl.class);
-
+
String name = "default";
int maxQueueSize;
int initialThreads;
int lowWaterMark;
- int highWaterMark;
+ int highWaterMark;
long dequeueTimeout;
volatile int approxThreadCount;
ThreadPoolExecutor executor;
Method addWorkerMethod;
Object addWorkerArgs[];
-
+
AWQThreadFactory threadFactory;
ReentrantLock mainLock;
final ReentrantLock addThreadLock = new ReentrantLock();
-
+
DelayQueue<DelayedTaskWrapper> delayQueue;
WatchDog watchDog;
-
+
boolean shared;
int sharedCount;
-
+
private List<PropertyChangeListener> changeListenerList;
-
+
public AutomaticWorkQueueImpl() {
this(DEFAULT_MAX_QUEUE_SIZE);
- }
+ }
public AutomaticWorkQueueImpl(String name) {
this(DEFAULT_MAX_QUEUE_SIZE, name);
- }
+ }
public AutomaticWorkQueueImpl(int max) {
this(max, "default");
}
@@ -98,16 +98,16 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
2 * 60 * 1000L,
name);
}
- public AutomaticWorkQueueImpl(int mqs,
- int initialThreads,
- int highWaterMark,
+ public AutomaticWorkQueueImpl(int mqs,
+ int initialThreads,
+ int highWaterMark,
int lowWaterMark,
long dequeueTimeout) {
this(mqs, initialThreads, highWaterMark, lowWaterMark, dequeueTimeout, "default");
- }
- public AutomaticWorkQueueImpl(int mqs,
- int initialThreads,
- int highWaterMark,
+ }
+ public AutomaticWorkQueueImpl(int mqs,
+ int initialThreads,
+ int highWaterMark,
int lowWaterMark,
long dequeueTimeout,
String name) {
@@ -119,21 +119,21 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
this.name = name;
this.changeListenerList = new ArrayList<>();
}
-
+
public void addChangeListener(PropertyChangeListener listener) {
this.changeListenerList.add(listener);
}
-
+
public void removeChangeListener(PropertyChangeListener listener) {
this.changeListenerList.remove(listener);
}
-
+
public void notifyChangeListeners(PropertyChangeEvent event) {
for (PropertyChangeListener listener : changeListenerList) {
listener.propertyChange(event);
}
}
-
+
public void setShared(boolean shared) {
this.shared = shared;
}
@@ -149,14 +149,14 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
public int getShareCount() {
return sharedCount;
}
-
+
protected synchronized ThreadPoolExecutor getExecutor() {
if (executor == null) {
threadFactory = createThreadFactory(name);
- executor = new ThreadPoolExecutor(lowWaterMark,
+ executor = new ThreadPoolExecutor(lowWaterMark,
highWaterMark,
- TimeUnit.MILLISECONDS.toMillis(dequeueTimeout),
- TimeUnit.MILLISECONDS,
+ TimeUnit.MILLISECONDS.toMillis(dequeueTimeout),
+ TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(maxQueueSize),
threadFactory) {
@Override
@@ -170,8 +170,8 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
}
};
-
-
+
+
if (LOG.isLoggable(Level.FINE)) {
StringBuilder buf = new StringBuilder();
buf.append("Constructing automatic work queue with:\n");
@@ -181,15 +181,15 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
buf.append("highWaterMark: " + highWaterMark + "\n");
LOG.fine(buf.toString());
}
-
+
if (initialThreads > highWaterMark) {
initialThreads = highWaterMark;
}
-
+
// as we cannot prestart more core than corePoolSize initial threads, we temporarily
// change the corePoolSize to the number of initial threads
- // this is important as otherwise these threads will be created only when
- // the queue has filled up,
+ // this is important as otherwise these threads will be created only when
+ // the queue has filled up,
// potentially causing problems with starting up under heavy load
if (initialThreads < Integer.MAX_VALUE && initialThreads > 0) {
executor.setCorePoolSize(initialThreads);
@@ -200,7 +200,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
executor.setCorePoolSize(lowWaterMark);
}
-
+
ReentrantLock l = null;
try {
Field f = ThreadPoolExecutor.class.getDeclaredField("mainLock");
@@ -232,43 +232,43 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
private AWQThreadFactory createThreadFactory(final String nm) {
ThreadGroup group;
- try {
+ try {
//Try and find the highest level ThreadGroup that we're allowed to use.
- //That SHOULD allow the default classloader and thread locals and such
+ //That SHOULD allow the default classloader and thread locals and such
//to be the least likely to cause issues down the road.
group = AccessController.doPrivileged(
- new PrivilegedAction<ThreadGroup>() {
- public ThreadGroup run() {
- ThreadGroup group = Thread.currentThread().getThreadGroup();
+ new PrivilegedAction<ThreadGroup>() {
+ public ThreadGroup run() {
+ ThreadGroup group = Thread.currentThread().getThreadGroup();
ThreadGroup parent = group;
- try {
- while (parent != null) {
- group = parent;
- parent = parent.getParent();
- }
+ try {
+ while (parent != null) {
+ group = parent;
+ parent = parent.getParent();
+ }
} catch (SecurityException se) {
- //ignore - if we get here, the "group" is as high as
+ //ignore - if we get here, the "group" is as high as
//the security manager will allow us to go. Use that one.
}
return new ThreadGroup(group, nm + "-workqueue");
- }
+ }
}
);
- } catch (SecurityException e) {
+ } catch (SecurityException e) {
group = new ThreadGroup(nm + "-workqueue");
}
return new AWQThreadFactory(group, nm);
}
-
+
static class DelayedTaskWrapper implements Delayed, Runnable {
long trigger;
Runnable work;
-
+
DelayedTaskWrapper(Runnable work, long delay) {
this.work = work;
trigger = System.currentTimeMillis() + delay;
}
-
+
public long getDelay(TimeUnit unit) {
long n = trigger - System.currentTimeMillis();
return unit.convert(n, TimeUnit.MILLISECONDS);
@@ -290,23 +290,23 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
public void run() {
work.run();
}
-
+
}
-
+
class WatchDog extends Thread {
DelayQueue<DelayedTaskWrapper> delayQueue;
AtomicBoolean shutdown = new AtomicBoolean(false);
-
+
WatchDog(DelayQueue<DelayedTaskWrapper> queue) {
delayQueue = queue;
}
-
+
public void shutdown() {
shutdown.set(true);
// to exit the waiting thread
interrupt();
}
-
+
public void run() {
DelayedTaskWrapper task;
try {
@@ -327,21 +327,21 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
}
-
+
}
class AWQThreadFactory implements ThreadFactory {
final AtomicInteger threadNumber = new AtomicInteger(1);
ThreadGroup group;
String name;
ClassLoader loader;
-
+
AWQThreadFactory(ThreadGroup gp, String nm) {
group = gp;
name = nm;
//force the loader to be the loader of CXF, not the application loader
loader = AutomaticWorkQueueImpl.class.getClassLoader();
}
-
+
public Thread newThread(final Runnable r) {
if (group.isDestroyed()) {
group = new ThreadGroup(group.getParent(), name + "-workqueue");
@@ -356,8 +356,8 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
}
};
- final Thread t = new Thread(group,
- wrapped,
+ final Thread t = new Thread(group,
+ wrapped,
name + "-workqueue-" + threadNumber.getAndIncrement(),
0);
AccessController.doPrivileged(new PrivilegedAction<Boolean>() {
@@ -383,10 +383,10 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
} catch (Throwable t) {
//ignore
}
- }
+ }
}
}
-
+
public void setName(String s) {
name = s;
if (threadFactory != null) {
@@ -415,11 +415,11 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
buf.append("]");
return buf.toString();
}
-
+
public void execute(final Runnable command) {
- //Grab the context classloader of this thread. We'll make sure we use that
+ //Grab the context classloader of this thread. We'll make sure we use that
//on the thread the runnable actually runs on.
-
+
final ClassLoader loader = Thread.currentThread().getContextClassLoader();
Runnable r = new Runnable() {
public void run() {
@@ -434,14 +434,14 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
};
//The ThreadPoolExecutor in the JDK doesn't expand the number
- //of threads until the queue is full. However, we would
- //prefer the number of threads to expand immediately and
- //only uses the queue if we've reached the maximum number
+ //of threads until the queue is full. However, we would
+ //prefer the number of threads to expand immediately and
+ //only uses the queue if we've reached the maximum number
//of threads.
ThreadPoolExecutor ex = getExecutor();
ex.execute(r);
- if (addWorkerMethod != null
- && !ex.getQueue().isEmpty()
+ if (addWorkerMethod != null
+ && !ex.getQueue().isEmpty()
&& this.approxThreadCount < highWaterMark
&& addThreadLock.tryLock()) {
try {
@@ -450,7 +450,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
int ps = this.getPoolSize();
int sz = executor.getQueue().size();
int sz2 = this.getActiveCount();
-
+
if ((sz + sz2) > ps) {
ReflectionUtil.setAccessible(addWorkerMethod).invoke(executor, addWorkerArgs);
}
@@ -464,7 +464,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
}
}
-
+
// WorkQueue interface
public void execute(Runnable work, long timeout) {
try {
@@ -477,7 +477,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
} catch (InterruptedException ie) {
throw ree;
}
- }
+ }
}
public synchronized void schedule(final Runnable work, final long delay) {
@@ -489,9 +489,9 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
}
delayQueue.put(new DelayedTaskWrapper(work, delay));
}
-
+
// AutomaticWorkQueue interface
-
+
public void shutdown(boolean processRemainingWorkItems) {
if (executor != null) {
if (!processRemainingWorkItems) {
@@ -536,7 +536,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
int lwm = executor == null ? lowWaterMark : executor.getCorePoolSize();
return lwm == Integer.MAX_VALUE ? -1 : lwm;
}
-
+
public int getInitialSize() {
return this.initialThreads;
}
@@ -544,7 +544,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
public void setHighWaterMark(int hwm) {
highWaterMark = hwm < 0 ? Integer.MAX_VALUE : hwm;
if (executor != null) {
- notifyChangeListeners(new PropertyChangeEvent(this, "highWaterMark",
+ notifyChangeListeners(new PropertyChangeEvent(this, "highWaterMark",
this.executor.getMaximumPoolSize(), hwm));
executor.setMaximumPoolSize(highWaterMark);
}
@@ -554,7 +554,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
lowWaterMark = lwm < 0 ? 0 : lwm;
if (executor != null) {
notifyChangeListeners(new PropertyChangeEvent(this, "lowWaterMark",
- this.executor.getCorePoolSize(), lwm));
+ this.executor.getCorePoolSize(), lwm));
executor.setCorePoolSize(lowWaterMark);
}
}
@@ -563,17 +563,17 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
notifyChangeListeners(new PropertyChangeEvent(this, "initialSize", this.initialThreads, initialSize));
this.initialThreads = initialSize;
}
-
+
public void setQueueSize(int size) {
notifyChangeListeners(new PropertyChangeEvent(this, "queueSize", this.maxQueueSize, size));
this.maxQueueSize = size;
}
-
+
public void setDequeueTimeout(long l) {
notifyChangeListeners(new PropertyChangeEvent(this, "dequeueTimeout", this.dequeueTimeout, l));
this.dequeueTimeout = l;
}
-
+
public boolean isShutdown() {
if (executor == null) {
return false;
@@ -618,7 +618,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
s = config.get("queueSize");
if (s != null) {
this.maxQueueSize = Integer.parseInt(s);
- }
+ }
}
public Dictionary<String, String> getProperties() {
Dictionary<String, String> properties = new Hashtable<String, String>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java b/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
index f6d1545..8eca519 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/OneShotAsyncExecutor.java
@@ -27,21 +27,21 @@ import java.util.concurrent.Executor;
*/
public final class OneShotAsyncExecutor implements Executor {
- private static final OneShotAsyncExecutor INSTANCE
+ private static final OneShotAsyncExecutor INSTANCE
= new OneShotAsyncExecutor();
-
+
private OneShotAsyncExecutor() {
}
-
+
public void execute(Runnable command) {
new Thread(command).start();
}
-
+
public static OneShotAsyncExecutor getInstance() {
return INSTANCE;
}
-
+
public static boolean isA(Executor executor) {
- return executor == INSTANCE;
+ return executor == INSTANCE;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java b/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java
index dea870a..7832a8b 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/SynchronousExecutor.java
@@ -29,19 +29,19 @@ import java.util.concurrent.Executor;
public final class SynchronousExecutor implements Executor {
private static final SynchronousExecutor INSTANCE = new SynchronousExecutor();
-
+
private SynchronousExecutor() {
}
-
+
public void execute(Runnable command) {
command.run();
}
-
+
public static SynchronousExecutor getInstance() {
return INSTANCE;
}
-
+
public static boolean isA(Executor executor) {
- return executor == INSTANCE;
+ return executor == INSTANCE;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/workqueue/WorkQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/workqueue/WorkQueue.java b/core/src/main/java/org/apache/cxf/workqueue/WorkQueue.java
index d77e828..d14cec6 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/WorkQueue.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/WorkQueue.java
@@ -22,9 +22,9 @@ import java.util.concurrent.Executor;
public interface WorkQueue extends Executor {
/**
- * Submits a work item for execution at some time in the future, waiting for up to a
+ * Submits a work item for execution at some time in the future, waiting for up to a
* specified amount of time for the item to be accepted.
- *
+ *
* @param work the workitem to submit for execution.
* @param timeout the maximum amount of time (in milliseconds) to wait for it to be accepted.
*
@@ -32,10 +32,10 @@ public interface WorkQueue extends Executor {
* @throws <code>NullPointerException</code> if work item is null.
*/
void execute(Runnable work, long timeout);
-
+
/**
* Schedules a work item for execution at some time in the future.
- *
+ *
* @param work the task to submit for execution.
* @param delay the delay before the task is executed
*
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManager.java b/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManager.java
index 6a4a558..2bb97d2 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManager.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/WorkQueueManager.java
@@ -31,14 +31,14 @@ public interface WorkQueueManager {
* @return AutomaticWorkQueue
*/
AutomaticWorkQueue getNamedWorkQueue(String name);
-
+
/**
* Adds a named work queue
* @param name
* @param q
*/
void addNamedWorkQueue(String name, AutomaticWorkQueue q);
-
+
/**
* Shuts down the manager's work queue. If
* <code>processRemainingTasks</code> is true, waits for the work queue to
@@ -46,7 +46,7 @@ public interface WorkQueueManager {
* @param processRemainingTasks - whether or not to wait for completion
*/
void shutdown(boolean processRemainingTasks);
-
+
/**
* Only returns after workqueue has been shutdown.
*
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/AddressingConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/AddressingConstants.java b/core/src/main/java/org/apache/cxf/ws/addressing/AddressingConstants.java
index 41d2fa8..1231337 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/AddressingConstants.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/AddressingConstants.java
@@ -30,10 +30,10 @@ import org.apache.cxf.common.i18n.BundleUtils;
* Encapsulation of version-specific WS-Addressing constants.
*/
public class AddressingConstants {
- private static final ResourceBundle BUNDLE =
+ private static final ResourceBundle BUNDLE =
BundleUtils.getBundle(AddressingConstants.class);
-
-
+
+
public AddressingConstants() {
}
@@ -73,7 +73,7 @@ public class AddressingConstants {
public String getAnonymousURI() {
return Names.WSA_ANONYMOUS_ADDRESS;
}
-
+
/**
* @return None address URI
*/
@@ -87,21 +87,21 @@ public class AddressingConstants {
public QName getFromQName() {
return Names.WSA_FROM_QNAME;
}
-
+
/**
* @return QName of the To addressing header
- */
+ */
public QName getToQName() {
return Names.WSA_TO_QNAME;
}
-
+
/**
* @return QName of the ReplyTo addressing header
*/
public QName getReplyToQName() {
return Names.WSA_REPLYTO_QNAME;
}
-
+
/**
* @return QName of the FaultTo addressing header
*/
@@ -115,14 +115,14 @@ public class AddressingConstants {
public QName getActionQName() {
return Names.WSA_ACTION_QNAME;
}
-
+
/**
* @return QName of the MessageID addressing header
*/
public QName getMessageIDQName() {
return Names.WSA_MESSAGEID_QNAME;
}
-
+
/**
* @return Default value for RelationshipType indicating a reply
* to the related message
@@ -130,85 +130,85 @@ public class AddressingConstants {
public String getRelationshipReply() {
return Names.WSA_RELATIONSHIP_REPLY;
}
-
+
/**
* @return QName of the RelatesTo addressing header
*/
public QName getRelatesToQName() {
return Names.WSA_RELATESTO_QNAME;
}
-
+
/**
* @return QName of the Relationship addressing header
*/
public QName getRelationshipTypeQName() {
return Names.WSA_RELATIONSHIPTYPE_QNAME;
}
-
+
/**
* @return QName of the Metadata
*/
public QName getMetadataQName() {
return Names.WSA_METADATA_QNAME;
}
-
+
/**
* @return QName of the Address
*/
public QName getAddressQName() {
return Names.WSA_ADDRESS_QNAME;
}
-
-
+
+
/**
* @return QName of the reference parameter marker
*/
public QName getIsReferenceParameterQName() {
return Names.WSA_IS_REFERENCE_PARAMETER_QNAME;
}
-
+
/**
* @return QName of the Invalid Message Addressing Property fault subcode
*/
public QName getInvalidMapQName() {
return Names.INVALID_MAP_QNAME;
}
-
+
/**
* @return QName of the Message Addressing Property Required fault subcode
*/
public QName getMapRequiredQName() {
return Names.MAP_REQUIRED_QNAME;
}
-
+
/**
* @return QName of the Destination Unreachable fault subcode
*/
public QName getDestinationUnreachableQName() {
return Names.DESTINATION_UNREACHABLE_QNAME;
}
-
+
/**
* @return QName of the Action Not Supported fault subcode
*/
public QName getActionNotSupportedQName() {
return Names.ACTION_NOT_SUPPORTED_QNAME;
}
-
+
/**
* @return QName of the Endpoint Unavailable fault subcode
*/
public QName getEndpointUnavailableQName() {
return Names.ENDPOINT_UNAVAILABLE_QNAME;
}
-
+
/**
* @return Default Fault Action
*/
public String getDefaultFaultAction() {
return Names.WSA_DEFAULT_FAULT_ACTION;
}
-
+
/**
* @return Action Not Supported text
*/
@@ -222,24 +222,24 @@ public class AddressingConstants {
public String getDestinationUnreachableText() {
return BUNDLE.getString("DESTINATION_UNREACHABLE_MSG");
}
-
+
/**
* @return Endpoint Unavailable text
*/
public String getEndpointUnavailableText() {
return BUNDLE.getString("ENDPOINT_UNAVAILABLE_MSG");
}
-
+
/**
* @return Invalid Message Addressing Property text
- */
+ */
public String getInvalidMapText() {
return BUNDLE.getString("INVALID_MAP_MSG");
}
-
+
/**
* @return Message Addressing Property Required text
- */
+ */
public String getMapRequiredText() {
return BUNDLE.getString("MAP_REQUIRED_MSG");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java b/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java
index ffadebe..5b86702 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/AddressingProperties.java
@@ -25,7 +25,7 @@ import java.util.List;
import javax.xml.namespace.QName;
/**
- * Abstraction of Message Addressing Properties.
+ * Abstraction of Message Addressing Properties.
*/
public class AddressingProperties {
private EndpointReferenceType to;
@@ -49,7 +49,7 @@ public class AddressingProperties {
/**
* Constructor.
- *
+ *
* @param uri the namespace URI
*/
public AddressingProperties(String uri) {
@@ -70,7 +70,7 @@ public class AddressingProperties {
}
return toURIType;
}
-
+
/**
* Mutator for the <b>To</b> property.
* @param t new value for To property
@@ -150,7 +150,7 @@ public class AddressingProperties {
faultTo = ref;
}
-
+
/**
* Accessor for the <b>RelatesTo</b> property.
* @return current value of RelatesTo property
@@ -166,7 +166,7 @@ public class AddressingProperties {
public void setRelatesTo(RelatesToType rel) {
relatesTo = rel;
}
-
+
/**
* Accessor for the <b>Action</b> property.
* @return current value of Action property
@@ -182,16 +182,16 @@ public class AddressingProperties {
public void setAction(AttributedURIType iri) {
action = iri;
}
-
+
/**
* @return WS-Addressing namespace URI
*/
public String getNamespaceURI() {
return namespaceURI;
}
-
+
/**
- * Used to specify a different WS-Addressing namespace URI,
+ * Used to specify a different WS-Addressing namespace URI,
* so as to cause MAPs to be exposed (i.e. encoded in externalized
* message with a different WS-Addressing version).
*/
@@ -236,7 +236,7 @@ public class AddressingProperties {
buf.append(", ");
}
buf.append("To: ");
- buf.append(to.getAddress().getValue());
+ buf.append(to.getAddress().getValue());
}
if (null != replyTo) {
AttributedURIType address = replyTo.getAddress();
@@ -245,7 +245,7 @@ public class AddressingProperties {
buf.append(", ");
}
buf.append("ReplyTo: ");
- buf.append(address.getValue());
+ buf.append(address.getValue());
}
}
if (null != faultTo) {
@@ -255,7 +255,7 @@ public class AddressingProperties {
buf.append(", ");
}
buf.append("FaultTo: ");
- buf.append(address.getValue());
+ buf.append(address.getValue());
}
}
if (null != relatesTo) {
@@ -267,9 +267,9 @@ public class AddressingProperties {
}
buf.append("]");
return buf.toString();
-
- }
-
+
+ }
+
public AddressingProperties createCompatibleResponseProperties() {
return new AddressingProperties(getNamespaceURI());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
index 8c171b7..0e957f7 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/ContextUtils.java
@@ -58,37 +58,37 @@ public final class ContextUtils {
public static final ObjectFactory WSA_OBJECT_FACTORY = new ObjectFactory();
public static final String ACTION = ContextUtils.class.getName() + ".ACTION";
- private static final EndpointReferenceType NONE_ENDPOINT_REFERENCE =
+ private static final EndpointReferenceType NONE_ENDPOINT_REFERENCE =
EndpointReferenceUtils.getEndpointReference(Names.WSA_NONE_ADDRESS);
-
+
private static final Logger LOG = LogUtils.getL7dLogger(ContextUtils.class);
-
+
/**
* Used to fabricate a Uniform Resource Name from a UUID string
*/
private static final String URN_UUID = "urn:uuid:";
-
+
private static JAXBContext jaxbContext;
private static Set<Class<?>> jaxbContextClasses;
-
+
/**
* Used by MAPAggregator to cache bad MAP fault name
*/
- private static final String MAP_FAULT_NAME_PROPERTY =
+ private static final String MAP_FAULT_NAME_PROPERTY =
"org.apache.cxf.ws.addressing.map.fault.name";
/**
* Used by MAPAggregator to cache bad MAP fault reason
*/
- private static final String MAP_FAULT_REASON_PROPERTY =
+ private static final String MAP_FAULT_REASON_PROPERTY =
"org.apache.cxf.ws.addressing.map.fault.reason";
-
+
/**
* Indicates a partial response has already been sent
*/
private static final String PARTIAL_RESPONSE_SENT_PROPERTY =
"org.apache.cxf.ws.addressing.partial.response.sent";
-
+
/**
* Prevents instantiation.
*/
@@ -137,13 +137,13 @@ public final class ContextUtils {
*
* @param isRequestor true if the current messaging role is that of
* requestor
- * @param isProviderContext true if the binding provider request context
- * available to the client application as opposed to the message context
+ * @param isProviderContext true if the binding provider request context
+ * available to the client application as opposed to the message context
* visible to handlers
* @param isOutbound true if the message is outbound
* @return the property name to use when caching the MAPs in the context
*/
- public static String getMAPProperty(boolean isRequestor,
+ public static String getMAPProperty(boolean isRequestor,
boolean isProviderContext,
boolean isOutbound) {
if (isRequestor && isProviderContext) {
@@ -151,7 +151,7 @@ public final class ContextUtils {
}
return isOutbound
? ADDRESSING_PROPERTIES_OUTBOUND
- : ADDRESSING_PROPERTIES_INBOUND;
+ : ADDRESSING_PROPERTIES_INBOUND;
}
/**
@@ -176,11 +176,11 @@ public final class ContextUtils {
*/
public static void storeMAPs(AddressingProperties maps,
Message message,
- boolean isOutbound,
+ boolean isOutbound,
boolean isRequestor) {
storeMAPs(maps, message, isOutbound, isRequestor, false);
}
-
+
/**
* Store MAPs in the message.
*
@@ -188,11 +188,11 @@ public final class ContextUtils {
* @param message the current message
* @param isOutbound true if the message is outbound
* @param isRequestor true if the current messaging role is that of requestor
- * @param isProviderContext true if the binding provider request context
+ * @param isProviderContext true if the binding provider request context
*/
public static void storeMAPs(AddressingProperties maps,
Message message,
- boolean isOutbound,
+ boolean isOutbound,
boolean isRequestor,
boolean isProviderContext) {
if (maps != null) {
@@ -203,7 +203,7 @@ public final class ContextUtils {
message.put(mapProperty, maps);
}
}
-
+
/**
* @param message the current message
* @param isProviderContext true if the binding provider request context
@@ -213,7 +213,7 @@ public final class ContextUtils {
* @return the current addressing properties
*/
public static AddressingProperties retrieveMAPs(
- Message message,
+ Message message,
boolean isProviderContext,
boolean isOutbound) {
return retrieveMAPs(message, isProviderContext, isOutbound, true);
@@ -229,31 +229,31 @@ public final class ContextUtils {
* @return the current addressing properties
*/
public static AddressingProperties retrieveMAPs(
- Message message,
+ Message message,
boolean isProviderContext,
boolean isOutbound,
boolean warnIfMissing) {
boolean isRequestor = ContextUtils.isRequestor(message);
String mapProperty =
ContextUtils.getMAPProperty(isRequestor,
- isProviderContext,
+ isProviderContext,
isOutbound);
LOG.log(Level.FINE,
"retrieving MAPs from context property {0}",
mapProperty);
-
+
AddressingProperties maps =
(AddressingProperties)message.get(mapProperty);
if (maps == null && isOutbound && !isRequestor
- && message.getExchange() != null && message.getExchange().getInMessage() != null) {
- maps = (AddressingProperties)message.getExchange().getInMessage().get(mapProperty);
+ && message.getExchange() != null && message.getExchange().getInMessage() != null) {
+ maps = (AddressingProperties)message.getExchange().getInMessage().get(mapProperty);
}
-
+
if (maps != null) {
LOG.log(Level.FINE, "current MAPs {0}", maps);
} else if (!isProviderContext) {
- LogUtils.log(LOG, warnIfMissing ? Level.WARNING : Level.FINE,
- "MAPS_RETRIEVAL_FAILURE_MSG");
+ LogUtils.log(LOG, warnIfMissing ? Level.WARNING : Level.FINE,
+ "MAPS_RETRIEVAL_FAILURE_MSG");
}
return maps;
}
@@ -265,7 +265,7 @@ public final class ContextUtils {
* @return an AttributedURIType encapsulating the URI
*/
public static AttributedURIType getAttributedURI(String uri) {
- AttributedURIType attributedURI =
+ AttributedURIType attributedURI =
WSA_OBJECT_FACTORY.createAttributedURIType();
attributedURI.setValue(uri);
return attributedURI;
@@ -292,12 +292,12 @@ public final class ContextUtils {
* @return true if the address is generic
*/
public static boolean isGenericAddress(EndpointReferenceType ref) {
- return ref == null
+ return ref == null
|| ref.getAddress() == null
|| Names.WSA_ANONYMOUS_ADDRESS.equals(ref.getAddress().getValue())
|| Names.WSA_NONE_ADDRESS.equals(ref.getAddress().getValue());
}
-
+
/**
* Helper method to determine if an EPR address is anon (either null,
* anonymous).
@@ -306,11 +306,11 @@ public final class ContextUtils {
* @return true if the address is generic
*/
public static boolean isAnonymousAddress(EndpointReferenceType ref) {
- return ref == null
+ return ref == null
|| ref.getAddress() == null
|| Names.WSA_ANONYMOUS_ADDRESS.equals(ref.getAddress().getValue());
}
-
+
/**
* Helper method to determine if an EPR address is none.
*
@@ -318,7 +318,7 @@ public final class ContextUtils {
* @return true if the address is generic
*/
public static boolean isNoneAddress(EndpointReferenceType ref) {
- return ref != null
+ return ref != null
&& ref.getAddress() != null
&& Names.WSA_NONE_ADDRESS.equals(ref.getAddress().getValue());
}
@@ -333,18 +333,18 @@ public final class ContextUtils {
*/
public static boolean hasEmptyAction(AddressingProperties maps) {
boolean empty = maps.getAction() == null;
- if (maps.getAction() != null
+ if (maps.getAction() != null
&& maps.getAction().getValue().length() == 0) {
maps.setAction(null);
empty = false;
- }
+ }
return empty;
}
-
-
+
+
/**
* Propagate inbound MAPs onto full reponse & fault messages.
- *
+ *
* @param inMAPs the inbound MAPs
* @param exchange the current Exchange
*/
@@ -363,7 +363,7 @@ public final class ContextUtils {
/**
* Propogate inbound MAPs onto reponse message if applicable
* (not applicable for oneways).
- *
+ *
* @param inMAPs the inbound MAPs
* @param responseMessage
*/
@@ -374,14 +374,14 @@ public final class ContextUtils {
}
}
-
+
/**
* Store bad MAP fault name in the message.
*
* @param faultName the fault name to store
* @param message the current message
*/
- public static void storeMAPFaultName(String faultName,
+ public static void storeMAPFaultName(String faultName,
Message message) {
message.put(MAP_FAULT_NAME_PROPERTY, faultName);
}
@@ -402,7 +402,7 @@ public final class ContextUtils {
* @param reason the fault reason to store
* @param message the current message
*/
- public static void storeMAPFaultReason(String reason,
+ public static void storeMAPFaultReason(String reason,
Message message) {
message.put(MAP_FAULT_REASON_PROPERTY, reason);
}
@@ -416,7 +416,7 @@ public final class ContextUtils {
public static String retrieveMAPFaultReason(Message message) {
return (String)message.get(MAP_FAULT_REASON_PROPERTY);
}
-
+
/**
* Store an indication that a partial response has been sent.
* Relavant if *both* the replyTo & faultTo are decoupled,
@@ -449,7 +449,7 @@ public final class ContextUtils {
* @param message the current message
*/
public static void storeDeferUncorrelatedMessageAbort(Message message) {
- if (message.getExchange() != null) {
+ if (message.getExchange() != null) {
message.getExchange().put("defer.uncorrelated.message.abort", Boolean.TRUE);
}
}
@@ -459,10 +459,10 @@ public final class ContextUtils {
* supported
*
* @param message the current message
- * @return the retrieved indication
+ * @return the retrieved indication
*/
public static boolean retrieveDeferUncorrelatedMessageAbort(Message message) {
- Boolean ret = message.getExchange() != null
+ Boolean ret = message.getExchange() != null
? (Boolean)message.getExchange().get("defer.uncorrelated.message.abort")
: null;
return ret != null && ret.booleanValue();
@@ -475,7 +475,7 @@ public final class ContextUtils {
* @param message the current message
*/
public static void storeDeferredUncorrelatedMessageAbort(Message message) {
- if (message.getExchange() != null) {
+ if (message.getExchange() != null) {
message.getExchange().put("deferred.uncorrelated.message.abort", Boolean.TRUE);
}
}
@@ -485,10 +485,10 @@ public final class ContextUtils {
* occur.
*
* @param message the current message
- * @return the retrieved indication
+ * @return the retrieved indication
*/
public static boolean retrieveDeferredUncorrelatedMessageAbort(Message message) {
- Boolean ret = message.getExchange() != null
+ Boolean ret = message.getExchange() != null
? (Boolean)message.getExchange().get("deferred.uncorrelated.message.abort")
: null;
return ret != null && ret.booleanValue();
@@ -497,7 +497,7 @@ public final class ContextUtils {
/**
* Retrieve indication that an async post-response service invocation
* is required.
- *
+ *
* @param message the current message
* @return the retrieved indication that an async post-response service
* invocation is required.
@@ -506,21 +506,21 @@ public final class ContextUtils {
Boolean ret = (Boolean)message.get(Message.ASYNC_POST_RESPONSE_DISPATCH);
return ret != null && ret.booleanValue();
}
-
+
/**
* Retrieve a JAXBContext for marshalling and unmarshalling JAXB generated
* types.
*
- * @return a JAXBContext
+ * @return a JAXBContext
*/
public static JAXBContext getJAXBContext() throws JAXBException {
synchronized (ContextUtils.class) {
if (jaxbContext == null || jaxbContextClasses == null) {
Set<Class<?>> tmp = new HashSet<Class<?>>();
- JAXBContextCache.addPackage(tmp, WSA_OBJECT_FACTORY.getClass().getPackage().getName(),
+ JAXBContextCache.addPackage(tmp, WSA_OBJECT_FACTORY.getClass().getPackage().getName(),
WSA_OBJECT_FACTORY.getClass().getClassLoader());
JAXBContextCache.scanPackages(tmp);
- CachedContextAndSchemas ccs
+ CachedContextAndSchemas ccs
= JAXBContextCache.getCachedContextAndSchemas(tmp, null, null, null, false);
jaxbContextClasses = ccs.getClasses();
jaxbContext = ccs.getContext();
@@ -531,8 +531,8 @@ public final class ContextUtils {
/**
* Set the encapsulated JAXBContext (used by unit tests).
- *
- * @param ctx JAXBContext
+ *
+ * @param ctx JAXBContext
*/
public static void setJAXBContext(JAXBContext ctx) throws JAXBException {
synchronized (ContextUtils.class) {
@@ -540,18 +540,18 @@ public final class ContextUtils {
jaxbContextClasses = new HashSet<Class<?>>();
}
}
-
-
+
+
/**
* @return a generated UUID
*/
public static String generateUUID() {
return URN_UUID + UUID.randomUUID();
}
-
+
/**
* Retreive Conduit from Exchange if not already available
- *
+ *
* @param conduit the current value for the Conduit
* @param message the current message
* @return the Conduit if available
@@ -563,7 +563,7 @@ public final class ContextUtils {
}
return conduit;
}
-
+
public static EndpointReferenceType getNoneEndpointReference() {
return NONE_ENDPOINT_REFERENCE;
}
@@ -577,7 +577,7 @@ public final class ContextUtils {
/**
* Create a Binding specific Message.
- *
+ *
* @param exchange the current exchange
* @return the Method from the BindingOperationInfo
*/
@@ -593,8 +593,8 @@ public final class ContextUtils {
}
return msg;
}
-
- public static Destination createDecoupledDestination(Exchange exchange,
+
+ public static Destination createDecoupledDestination(Exchange exchange,
final EndpointReferenceType reference) {
final EndpointInfo ei = exchange.getEndpoint().getEndpointInfo();
return new Destination() {
@@ -606,7 +606,7 @@ public final class ContextUtils {
//this is a response targeting a decoupled endpoint. Treat it as a oneway so
//we don't wait for a response.
inMessage.getExchange().setOneWay(true);
- ConduitInitiator conduitInitiator
+ ConduitInitiator conduitInitiator
= bus.getExtension(ConduitInitiatorManager.class)
.getConduitInitiatorForUri(reference.getAddress().getValue());
if (conduitInitiator != null) {
@@ -636,5 +636,5 @@ public final class ContextUtils {
public void setMessageObserver(MessageObserver observer) {
}
};
- }
+ }
}