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:46 UTC
[41/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/helpers/IOUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
index 5c4d189..f6feeae 100644
--- a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
@@ -43,7 +43,7 @@ public final class IOUtils {
private IOUtils() {
}
-
+
public static boolean isEmpty(InputStream is) throws IOException {
if (is == null) {
return true;
@@ -56,7 +56,7 @@ public final class IOUtils {
} catch (IOException ex) {
// ignore
}
-
+
final byte[] bytes = new byte[1];
try {
if (is.markSupported()) {
@@ -85,7 +85,7 @@ public final class IOUtils {
return result == -1;
}
/**
- * Use this function instead of new String(byte[], String) to avoid surprises from
+ * Use this function instead of new String(byte[], String) to avoid surprises from
* non-standard default encodings.
* @param bytes
* @param charsetName
@@ -94,24 +94,24 @@ public final class IOUtils {
try {
return new String(bytes, charsetName);
} catch (UnsupportedEncodingException e) {
- throw
+ throw
new RuntimeException("Impossible failure: Charset.forName(\""
+ charsetName + "\") returns invalid name.");
}
}
-
-
+
+
/**
* Use this function instead of new String(byte[]) to avoid surprises from non-standard default encodings.
* @param bytes
*/
public static String newStringFromBytes(byte[] bytes) {
- return newStringFromBytes(bytes, UTF8_CHARSET.name());
+ return newStringFromBytes(bytes, UTF8_CHARSET.name());
}
-
+
/**
- * Use this function instead of new String(byte[], int, int, String)
+ * Use this function instead of new String(byte[], int, int, String)
* to avoid surprises from non-standard default encodings.
* @param bytes
* @param charsetName
@@ -122,7 +122,7 @@ public final class IOUtils {
try {
return new String(bytes, start, length, charsetName);
} catch (UnsupportedEncodingException e) {
- throw
+ throw
new RuntimeException("Impossible failure: Charset.forName(\""
+ charsetName + "\") returns invalid name.");
@@ -130,7 +130,7 @@ public final class IOUtils {
}
/**
- * Use this function instead of new String(byte[], int, int)
+ * Use this function instead of new String(byte[], int, int)
* to avoid surprises from non-standard default encodings.
* @param bytes
* @param start
@@ -168,7 +168,7 @@ public final class IOUtils {
input.close();
}
}
-
+
public static void copyAndCloseInput(final Reader input,
final Writer output) throws IOException {
try {
@@ -185,7 +185,7 @@ public final class IOUtils {
} finally {
input.close();
}
- }
+ }
public static int copy(final InputStream input, final OutputStream output,
int bufferSize) throws IOException {
@@ -210,16 +210,16 @@ public final class IOUtils {
}
return total;
}
-
+
/**
* Copy at least the specified number of bytes from the input to the output
- * or until the inputstream is finished.
+ * or until the inputstream is finished.
* @param input
* @param output
* @param atLeast
* @throws IOException
*/
- public static void copyAtLeast(final InputStream input,
+ public static void copyAtLeast(final InputStream input,
final OutputStream output,
int atLeast) throws IOException {
final byte[] buffer = new byte[4096];
@@ -238,8 +238,8 @@ public final class IOUtils {
n = input.read(buffer, 0, n);
}
}
-
- public static void copyAtLeast(final Reader input,
+
+ public static void copyAtLeast(final Reader input,
final Writer output,
int atLeast) throws IOException {
final char[] buffer = new char[4096];
@@ -269,7 +269,7 @@ public final class IOUtils {
n = input.read(buffer);
}
}
-
+
public static void transferTo(InputStream inputStream, File destinationFile) throws IOException {
if (Transferable.class.isAssignableFrom(inputStream.getClass())) {
((Transferable)inputStream).transferTo(destinationFile);
@@ -294,12 +294,12 @@ public final class IOUtils {
public static String toString(final InputStream input, int bufferSize, String charset)
throws IOException {
-
+
int avail = input.available();
if (avail > bufferSize) {
bufferSize = avail;
}
- Reader reader = charset == null ? new InputStreamReader(input, UTF8_CHARSET)
+ Reader reader = charset == null ? new InputStreamReader(input, UTF8_CHARSET)
: new InputStreamReader(input, charset);
return toString(reader, bufferSize);
}
@@ -335,7 +335,7 @@ public final class IOUtils {
/**
* Load the InputStream into memory and return a ByteArrayInputStream that
* represents it. Closes the in stream.
- *
+ *
* @param in
* @throws IOException
*/
@@ -350,12 +350,12 @@ public final class IOUtils {
in.close();
return bout.createInputStream();
}
-
+
public static void consume(InputStream in) throws IOException {
int i = in.available();
if (i == 0) {
//if i is 0, then we MAY have already hit the end of the stream
- //so try a read and return rather than allocate a buffer and such
+ //so try a read and return rather than allocate a buffer and such
int i2 = in.read();
if (i2 == -1) {
return;
@@ -374,14 +374,14 @@ public final class IOUtils {
//nothing - just discarding
}
}
-
+
/**
* Consumes at least the given number of bytes from the input stream
* @param input
* @param atLeast
* @throws IOException
*/
- public static void consume(final InputStream input,
+ public static void consume(final InputStream input,
int atLeast) throws IOException {
final byte[] buffer = new byte[4096];
int n = atLeast > buffer.length ? buffer.length : atLeast;
@@ -397,7 +397,7 @@ public final class IOUtils {
n = atLeast > buffer.length ? buffer.length : atLeast;
n = input.read(buffer, 0, n);
}
- }
+ }
public static byte[] readBytesFromStream(InputStream in) throws IOException {
int i = in.available();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java b/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java
index b489039..9b5b7aa 100644
--- a/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/JavaUtils.java
@@ -48,14 +48,14 @@ public final class JavaUtils {
private JavaUtils() {
}
-
+
/**
* checks if the input string is a valid java keyword.
- *
+ *
* @return boolean true/false
*/
public static boolean isJavaKeyword(String keyword) {
- return KEYWORDS.contains(keyword);
+ return KEYWORDS.contains(keyword);
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/LoadingByteArrayOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/LoadingByteArrayOutputStream.java b/core/src/main/java/org/apache/cxf/helpers/LoadingByteArrayOutputStream.java
index f981611..39607fe 100644
--- a/core/src/main/java/org/apache/cxf/helpers/LoadingByteArrayOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/helpers/LoadingByteArrayOutputStream.java
@@ -32,11 +32,11 @@ import org.apache.cxf.io.Transferable;
/**
* Subclass of ByteArrayOutputStream that allows creation of a
* ByteArrayInputStream directly without creating a copy of the byte[].
- *
+ *
* Also, on "toByteArray()" it truncates it's buffer to the current size
- * and returns the new buffer directly. Multiple calls to toByteArray()
+ * and returns the new buffer directly. Multiple calls to toByteArray()
* will return the exact same byte[] unless a write is called in between.
- *
+ *
* Note: once the InputStream is created, the output stream should
* no longer be used. In particular, make sure not to call reset()
* and then write as that may overwrite the data that the InputStream
@@ -49,7 +49,7 @@ public class LoadingByteArrayOutputStream extends ByteArrayOutputStream {
public LoadingByteArrayOutputStream(int i) {
super(i);
}
-
+
private static class LoadedByteArrayInputStream extends ByteArrayInputStream implements Transferable {
LoadedByteArrayInputStream(byte[] buf, int length) {
super(buf, 0, length);
@@ -62,31 +62,31 @@ public class LoadingByteArrayOutputStream extends ByteArrayOutputStream {
public void transferTo(File file) throws IOException {
FileOutputStream fout = new FileOutputStream(file);
FileChannel channel = fout.getChannel();
- ByteBuffer bb = ByteBuffer.wrap(buf, 0, count);
+ ByteBuffer bb = ByteBuffer.wrap(buf, 0, count);
while (bb.hasRemaining()) {
channel.write(bb);
}
channel.close();
fout.close();
}
-
+
}
-
+
public ByteArrayInputStream createInputStream() {
return new LoadedByteArrayInputStream(buf, count);
}
-
+
public void setSize(int i) {
count = i;
}
-
+
public byte[] toByteArray() {
if (count != buf.length) {
buf = super.toByteArray();
}
return buf;
}
-
+
public byte[] getRawBytes() {
return buf;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java b/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
index 6e1c92d..65f6415 100644
--- a/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
+++ b/core/src/main/java/org/apache/cxf/helpers/MapNamespaceContext.java
@@ -72,7 +72,7 @@ public final class MapNamespaceContext implements NamespaceContext {
if (uri != null) {
return uri;
}
-
+
}
return namespaces.get(prefix);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/NSStack.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/NSStack.java b/core/src/main/java/org/apache/cxf/helpers/NSStack.java
index e9267d9..a96690a 100644
--- a/core/src/main/java/org/apache/cxf/helpers/NSStack.java
+++ b/core/src/main/java/org/apache/cxf/helpers/NSStack.java
@@ -28,8 +28,8 @@ public class NSStack {
private static final String NS_PREFIX_PREFIX = "ns";
private final List<List<NSDecl>> stack = new ArrayList<List<NSDecl>>();
- private List<NSDecl> top;
- private int size;
+ private List<NSDecl> top;
+ private int size;
private int nsPrefixCount = 1;
public synchronized void push() {
@@ -107,7 +107,7 @@ public class NSStack {
}
return null;
}
-
+
/**
* Return the namespace name associated with the given prefix by
* looking thru all the namespace declarations that are in scope.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
index 22b9a53..f3a3559 100644
--- a/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/ServiceUtils.java
@@ -37,14 +37,14 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.OperationInfo;
public final class ServiceUtils {
-
+
private ServiceUtils() {
}
-
+
/**
* A short cut method to be able to test for if Schema Validation should be enabled
* for IN or OUT without having to check BOTH and IN or OUT.
- *
+ *
* @param message
* @param type
*/
@@ -65,30 +65,30 @@ public final class ServiceUtils {
validationType = SchemaValidationType.OUT;
}
}
-
- return validationType.equals(type)
+
+ return validationType.equals(type)
|| ((SchemaValidationType.IN.equals(type) || SchemaValidationType.OUT.equals(type))
&& SchemaValidationType.BOTH.equals(validationType));
}
/**
* A convenience method to check for schema validation config in the message context, and then in the service model.
* Does not modify the Message context (other than what is done in the getContextualProperty itself)
- *
+ *
* @param message
*/
public static SchemaValidationType getSchemaValidationType(Message message) {
SchemaValidationType validationType = getOverrideSchemaValidationType(message);
if (validationType == null) {
validationType = getSchemaValidationTypeFromModel(message);
- }
-
+ }
+
if (validationType == null) {
validationType = SchemaValidationType.NONE;
}
-
+
return validationType;
}
-
+
private static SchemaValidationType getOverrideSchemaValidationType(Message message) {
Object obj = message.getContextualProperty(Message.SCHEMA_VALIDATION_ENABLED);
if (obj != null) {
@@ -98,35 +98,35 @@ public final class ServiceUtils {
return null;
}
}
-
+
private static SchemaValidationType getSchemaValidationTypeFromModel(Message message) {
Exchange exchange = message.getExchange();
-
+
if (exchange != null) {
BindingOperationInfo boi = exchange.getBindingOperationInfo();
Endpoint endpoint = exchange.getEndpoint();
-
+
if (boi != null && endpoint != null) {
SchemaValidationType validationType = null;
OperationInfo opInfo = boi.getOperationInfo();
EndpointInfo ep = endpoint.getEndpointInfo();
-
+
if (validationType == null && opInfo != null) {
validationType = getSchemaValidationTypeFromModel(opInfo);
-
+
if (validationType == null && ep != null) {
validationType = getSchemaValidationTypeFromModel(ep);
}
}
-
+
return validationType;
}
}
-
+
// else
return null;
}
-
+
private static SchemaValidationType getSchemaValidationTypeFromModel(
AbstractPropertiesHolder properties) {
Object obj = properties.getProperty(Message.SCHEMA_VALIDATION_TYPE);
@@ -136,11 +136,11 @@ public final class ServiceUtils {
return null;
}
}
-
+
public static SchemaValidationType getSchemaValidationType(Object obj) {
if (obj instanceof SchemaValidationType) {
return (SchemaValidationType)obj;
- } else if (obj != null) {
+ } else if (obj != null) {
String value = obj.toString().toUpperCase(); // handle boolean values as well
if ("TRUE".equals(value)) {
return SchemaValidationType.BOTH;
@@ -150,15 +150,15 @@ public final class ServiceUtils {
return SchemaValidationType.valueOf(value);
}
}
-
+
// fall through default value
return SchemaValidationType.NONE;
}
-
+
/**
* Generates a suitable service name from a given class. The returned name
* is the simple name of the class, i.e. without the package name.
- *
+ *
* @param clazz the class.
* @return the name.
*/
@@ -210,7 +210,7 @@ public final class ServiceUtils {
* <code>org.codehaus.xfire.services.Echo</code>, and the protocol is
* <code>http</code>, the resulting namespace would be
* <code>http://services.xfire.codehaus.org</code>.
- *
+ *
* @param className the class name
* @param protocol the protocol (eg. <code>http</code>)
* @return the namespace
@@ -249,7 +249,7 @@ public final class ServiceUtils {
/**
* Method makePackageName
- *
+ *
* @param namespace
*/
public static String makePackageName(String namespace) {
@@ -317,7 +317,7 @@ public final class ServiceUtils {
* Massage <tt>word</tt> into a form suitable for use in a Java package
* name. Append it to the target string buffer with a <tt>.</tt> delimiter
* iff <tt>word</tt> is not the first word in the package name.
- *
+ *
* @param sb the buffer to append to
* @param word the word to append
* @param firstWord a flag indicating whether this is the first word
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java b/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
index cb67d4a..bd4ee02 100644
--- a/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
@@ -35,11 +35,11 @@ import org.apache.cxf.common.classloader.ClassLoaderUtils.ClassLoaderHolder;
public class XPathUtils {
-
+
private static XPathFactory xpathFactory = XPathFactory.newInstance();
private XPath xpath;
-
+
public XPathUtils() {
xpath = xpathFactory.newXPath();
}
@@ -58,7 +58,7 @@ public class XPathUtils {
}
public Object getValue(String xpathExpression, Node node, QName type) {
- ClassLoaderHolder loader
+ ClassLoaderHolder loader
= ClassLoaderUtils.setThreadContextClassloader(xpath.getClass().getClassLoader());
try {
return xpath.evaluate(xpathExpression, node, type);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
index 24244db..fb20cb4 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
@@ -29,23 +29,23 @@ public abstract class AbstractAttributedInterceptorProvider extends ConcurrentHa
implements InterceptorProvider {
private static final long serialVersionUID = -1915876045710441978L;
- private List<Interceptor<? extends Message>> in
+ private List<Interceptor<? extends Message>> in
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> out
+ private List<Interceptor<? extends Message>> out
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> outFault
+ private List<Interceptor<? extends Message>> outFault
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> inFault
+ private List<Interceptor<? extends Message>> inFault
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
-
+
public Object put(String s, Object o) {
if (o == null) {
return super.remove(s);
}
return super.put(s, o);
}
-
+
public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
return outFault;
}
@@ -87,6 +87,6 @@ public abstract class AbstractAttributedInterceptorProvider extends ConcurrentHa
public int hashCode() { //NOPMD
return super.hashCode();
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
index 6051b13..a0970b1 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractBasicInterceptorProvider.java
@@ -26,15 +26,15 @@ import org.apache.cxf.message.Message;
public abstract class AbstractBasicInterceptorProvider implements InterceptorProvider {
- private List<Interceptor<? extends Message>> in
+ private List<Interceptor<? extends Message>> in
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> out
+ private List<Interceptor<? extends Message>> out
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> outFault
+ private List<Interceptor<? extends Message>> outFault
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
- private List<Interceptor<? extends Message>> inFault
+ private List<Interceptor<? extends Message>> inFault
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
-
+
public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
return outFault;
}
@@ -70,6 +70,6 @@ public abstract class AbstractBasicInterceptorProvider implements InterceptorPr
outFault.clear();
outFault.addAll(interceptors);
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
index 93230e8..629de73 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
@@ -38,9 +38,9 @@ import org.apache.cxf.service.model.BindingFaultInfo;
import org.apache.cxf.transport.MessageObserver;
public abstract class AbstractFaultChainInitiatorObserver implements MessageObserver {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(AbstractFaultChainInitiatorObserver.class);
-
+
private Bus bus;
private ClassLoader loader;
@@ -52,30 +52,30 @@ public abstract class AbstractFaultChainInitiatorObserver implements MessageObse
}
public void onMessage(Message message) {
-
+
assert null != message;
-
+
Bus origBus = BusFactory.getAndSetThreadDefaultBus(bus);
ClassLoaderHolder origLoader = null;
try {
if (loader != null) {
origLoader = ClassLoaderUtils.setThreadContextClassloader(loader);
}
-
+
Exchange exchange = message.getExchange();
-
+
Message faultMessage = null;
-
+
// now that we have switched over to the fault chain,
- // prevent any further operations on the in/out message
-
+ // prevent any further operations on the in/out message
+
if (isOutboundObserver()) {
Exception ex = message.getContent(Exception.class);
if (!(ex instanceof Fault)) {
ex = new Fault(ex);
}
FaultMode mode = message.get(FaultMode.class);
-
+
faultMessage = exchange.getOutMessage();
if (null == faultMessage) {
faultMessage = new MessageImpl();
@@ -100,13 +100,13 @@ public abstract class AbstractFaultChainInitiatorObserver implements MessageObse
faultMessage = message;
exchange.setInMessage(null);
exchange.setInFaultMessage(faultMessage);
- }
-
-
+ }
+
+
// setup chain
PhaseInterceptorChain chain = new PhaseInterceptorChain(getPhases());
initializeInterceptors(faultMessage.getExchange(), chain);
-
+
faultMessage.setInterceptorChain(chain);
try {
chain.doIntercept(faultMessage);
@@ -132,7 +132,7 @@ public abstract class AbstractFaultChainInitiatorObserver implements MessageObse
protected abstract SortedSet<Phase> getPhases();
protected void initializeInterceptors(Exchange ex, PhaseInterceptorChain chain) {
-
+
}
public Bus getBus() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
index 938a412..b6d99af 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractInDatabindingInterceptor.java
@@ -54,19 +54,19 @@ import org.apache.ws.commons.schema.constants.Constants;
public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInterceptor<Message> {
- public static final String NO_VALIDATE_PARTS = AbstractInDatabindingInterceptor.class.getName()
+ public static final String NO_VALIDATE_PARTS = AbstractInDatabindingInterceptor.class.getName()
+ ".novalidate-parts";
private static final ResourceBundle BUNDLE = BundleUtils
.getBundle(AbstractInDatabindingInterceptor.class);
-
+
public AbstractInDatabindingInterceptor(String phase) {
super(phase);
}
public AbstractInDatabindingInterceptor(String i, String phase) {
super(i, phase);
}
-
+
protected boolean supportsDataReader(Message message, Class<?> input) {
Service service = ServiceModelUtil.getService(message.getExchange());
Class<?> cls[] = service.getDataBinding().getSupportedReaderFormats();
@@ -81,7 +81,7 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
Service service = ServiceModelUtil.getService(message.getExchange());
DataReader<T> dataReader = service.getDataBinding().createReader(input);
if (dataReader == null) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("NO_DATAREADER",
+ throw new Fault(new org.apache.cxf.common.i18n.Message("NO_DATAREADER",
BUNDLE, service.getName()));
}
dataReader.setAttachments(message.getAttachments());
@@ -90,7 +90,7 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
setDataReaderValidation(service, message, dataReader);
return dataReader;
}
-
+
protected DataReader<XMLStreamReader> getDataReader(Message message) {
return getDataReader(message, XMLStreamReader.class);
}
@@ -102,11 +102,11 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
protected boolean shouldValidate(Message message) {
return ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message);
}
-
+
/**
* Based on the Schema Validation configuration, will initialise the
* DataReader with or without the schema set.
- *
+ *
* Can also be called to override schema validation at operation level, thus the reader.setSchema(null)
* to remove schema validation
*/
@@ -120,12 +120,12 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
reader.setSchema(null); // if this is being called for an operation, then override the service level
}
}
-
+
protected void setOperationSchemaValidation(Message message) {
SchemaValidationType validationType = ServiceUtils.getSchemaValidationType(message);
message.put(Message.SCHEMA_VALIDATION_ENABLED, validationType);
}
-
+
protected DepthXMLStreamReader getXMLStreamReader(Message message) {
XMLStreamReader xr = message.getContent(XMLStreamReader.class);
if (xr == null) {
@@ -143,7 +143,7 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
* Find the next possible message part in the message. If an operation in
* the list of operations is no longer a viable match, it will be removed
* from the Collection.
- *
+ *
* @param exchange
* @param operations
* @param name
@@ -176,7 +176,7 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
itr.remove();
continue;
}
-
+
Collection<MessagePartInfo> bodyParts = msgInfo.getMessageParts();
if (bodyParts.size() == 0 || bodyParts.size() <= index) {
itr.remove();
@@ -203,19 +203,19 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
}
}
if (lastChoice != null) {
- setMessage(message, lastBoi, client, lastBoi.getBinding().getService(),
+ setMessage(message, lastBoi, client, lastBoi.getBinding().getService(),
lastMsgInfo.getMessageInfo());
}
return lastChoice;
}
-
+
protected MessageInfo setMessage(Message message, BindingOperationInfo operation,
boolean requestor, ServiceInfo si,
MessageInfo msgInfo) {
message.put(MessageInfo.class, msgInfo);
Exchange ex = message.getExchange();
-
+
ex.put(BindingOperationInfo.class, operation);
ex.setOneWay(operation.getOperationInfo().isOneWay());
@@ -227,7 +227,7 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
// configure endpoint and operation level schema validation
setOperationSchemaValidation(message);
-
+
QName serviceQName = si.getName();
message.put(Message.WSDL_SERVICE, serviceQName);
@@ -238,7 +238,7 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
QName portQName = endpointInfo.getName();
message.put(Message.WSDL_PORT, portQName);
-
+
URI wsdlDescription = endpointInfo.getProperty("URI", URI.class);
if (wsdlDescription == null) {
String address = endpointInfo.getAddress();
@@ -253,14 +253,14 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
return msgInfo;
}
-
-
-
+
+
+
/**
- * Returns a BindingOperationInfo if the operation is indentified as
- * a wrapped method, return null if it is not a wrapped method
+ * Returns a BindingOperationInfo if the operation is indentified as
+ * a wrapped method, return null if it is not a wrapped method
* (i.e., it is a bare method)
- *
+ *
* @param exchange
* @param name
* @param client
@@ -274,13 +274,13 @@ public abstract class AbstractInDatabindingInterceptor extends AbstractPhaseInte
// TODO: Allow overridden methods.
BindingOperationInfo bop = ServiceModelUtil.getOperation(exchange, local);
-
+
if (bop != null) {
exchange.put(BindingOperationInfo.class, bop);
}
return bop;
}
-
+
protected MessageInfo getMessageInfo(Message message, BindingOperationInfo operation) {
return getMessageInfo(message, operation, isRequestor(message));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
index c9fcf02..a120247 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
@@ -66,31 +66,31 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
BINARY_CONTENT_MEDIA_TYPES.add("image/jpeg");
BINARY_CONTENT_MEDIA_TYPES.add("image/gif");
}
-
+
protected int limit = DEFAULT_LIMIT;
protected long threshold = -1;
protected PrintWriter writer;
protected boolean prettyLogging;
private boolean showBinaryContent;
private boolean showMultipartContent = true;
-
+
public AbstractLoggingInterceptor(String phase) {
super(phase);
}
public AbstractLoggingInterceptor(String id, String phase) {
super(id, phase);
}
-
+
protected static boolean isLoggingDisabledNow(Message message) throws Fault {
Object liveLoggingProp = message.getContextualProperty(LIVE_LOGGING_PROP);
return liveLoggingProp != null && PropertyUtils.isFalse(liveLoggingProp);
}
-
+
protected abstract Logger getLogger();
-
+
Logger getMessageLogger(Message message) {
if (isLoggingDisabledNow(message)) {
- return null;
+ return null;
}
Endpoint ep = message.getExchange().getEndpoint();
if (ep == null || ep.getEndpointInfo() == null) {
@@ -106,7 +106,7 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
InterfaceInfo iface = endpoint.getService().getInterface();
String portName = endpoint.getName().getLocalPart();
String portTypeName = iface.getName().getLocalPart();
- String logName = "org.apache.cxf.services." + serviceName + "."
+ String logName = "org.apache.cxf.services." + serviceName + "."
+ portName + "." + portTypeName;
logger = LogUtils.getL7dLogger(this.getClass(), null, logName);
endpoint.setProperty("MessageLogger", logger);
@@ -120,7 +120,7 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
} else if ("<stdout>".equals(s)) {
writer = new PrintWriter(System.out, true);
} else if ("<stderr>".equals(s)) {
- writer = new PrintWriter(System.err, true);
+ writer = new PrintWriter(System.err, true);
} else {
try {
URI uri = new URI(s);
@@ -131,27 +131,27 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
}
}
}
-
+
public void setPrintWriter(PrintWriter w) {
writer = w;
}
-
+
public PrintWriter getPrintWriter() {
return writer;
}
-
+
public void setLimit(int lim) {
limit = lim;
}
-
+
public int getLimit() {
return limit;
}
-
+
public void setPrettyLogging(boolean flag) {
prettyLogging = flag;
}
-
+
public boolean isPrettyLogging() {
return prettyLogging;
}
@@ -165,10 +165,10 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
}
protected void writePayload(StringBuilder builder, CachedOutputStream cos,
- String encoding, String contentType)
+ String encoding, String contentType)
throws Exception {
// Just transform the XML message when the cos has content
- if (isPrettyLogging() && contentType != null && contentType.contains("xml")
+ if (isPrettyLogging() && contentType != null && contentType.contains("xml")
&& !contentType.toLowerCase().contains("multipart/related") && cos.size() > 0) {
StringWriter swriter = new StringWriter();
@@ -188,7 +188,7 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
}
in.close();
}
-
+
String result = swriter.toString();
if (result.length() < limit || limit == -1) {
builder.append(result);
@@ -204,19 +204,19 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
}
}
}
- protected void writePayload(StringBuilder builder,
+ protected void writePayload(StringBuilder builder,
StringWriter stringWriter,
- String contentType)
+ String contentType)
throws Exception {
- if (isPrettyLogging()
- && contentType != null
+ if (isPrettyLogging()
+ && contentType != null
&& contentType.contains("xml")
&& stringWriter.getBuffer().length() > 0) {
try {
writePrettyPayload(builder, stringWriter, contentType);
return;
- } catch (Exception ex) {
- // log it as is
+ } catch (Exception ex) {
+ // log it as is
}
}
StringBuffer buffer = stringWriter.getBuffer();
@@ -226,18 +226,18 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
builder.append(buffer);
}
}
- protected void writePrettyPayload(StringBuilder builder,
+ protected void writePrettyPayload(StringBuilder builder,
StringWriter stringWriter,
- String contentType)
+ String contentType)
throws Exception {
// Just transform the XML message when the cos has content
-
+
StringWriter swriter = new StringWriter();
XMLStreamWriter xwriter = StaxUtils.createXMLStreamWriter(swriter);
xwriter = new PrettyPrintXMLStreamWriter(xwriter, 2);
StaxUtils.copy(new StreamSource(new StringReader(stringWriter.getBuffer().toString())), xwriter);
xwriter.close();
-
+
String result = swriter.toString();
if (result.length() < limit || limit == -1) {
builder.append(swriter.toString());
@@ -248,16 +248,16 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
/**
- * Transform the string before display. The implementation in this class
- * does nothing. Override this method if you wish to change the contents of the
- * logged message before it is delivered to the output.
+ * Transform the string before display. The implementation in this class
+ * does nothing. Override this method if you wish to change the contents of the
+ * logged message before it is delivered to the output.
* For example, you can use this to mask out sensitive information.
* @param originalLogString the raw log message.
* @return transformed data
*/
protected String transform(String originalLogString) {
return originalLogString;
- }
+ }
protected void log(Logger logger, String message) {
message = transform(message);
@@ -291,5 +291,5 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
protected boolean isMultipartContent(String contentType) {
return contentType != null && contentType.startsWith(MULTIPART_CONTENT_MEDIA_TYPE);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/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 9dcb29f..a34f942 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AbstractOutDatabindingInterceptor.java
@@ -52,14 +52,14 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt
public static final String DISABLE_OUTPUTSTREAM_OPTIMIZATION = "disable.outputstream.optimization";
public static final String OUT_BUFFERING = "org.apache.cxf.output.buffering";
-
+
public AbstractOutDatabindingInterceptor(String phase) {
super(phase);
}
public AbstractOutDatabindingInterceptor(String id, String phase) {
super(id, phase);
}
-
+
protected boolean shouldBuffer(Message message) {
Object en = message.getContextualProperty(OUT_BUFFERING);
boolean allowBuffer = true;
@@ -71,19 +71,19 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt
// need to cache the events in case validation fails or buffering is enabled
return buffer || (allowBuffer && shouldValidate(message) && !isRequestor(message));
}
-
- protected void writeParts(Message message, Exchange exchange,
- BindingOperationInfo operation, MessageContentsList objs,
+
+ protected void writeParts(Message message, Exchange exchange,
+ BindingOperationInfo operation, MessageContentsList objs,
List<MessagePartInfo> parts) {
OutputStream out = message.getContent(OutputStream.class);
XMLStreamWriter origXmlWriter = message.getContent(XMLStreamWriter.class);
Service service = exchange.getService();
XMLStreamWriter xmlWriter = origXmlWriter;
CachingXmlEventWriter cache = null;
-
+
// configure endpoint and operation level schema validation
setOperationSchemaValidation(message);
-
+
// need to cache the events in case validation fails or buffering is enabled
if (shouldBuffer(message)) {
if (!(xmlWriter instanceof CachingXmlEventWriter)) {
@@ -97,8 +97,8 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt
}
out = null;
}
-
- if (out != null
+
+ if (out != null
&& writeToOutputStream(message, operation.getBinding(), service)
&& !MessageUtils.isTrue(message.getContextualProperty(DISABLE_OUTPUTSTREAM_OPTIMIZATION))) {
if (xmlWriter != null) {
@@ -109,18 +109,18 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt
throw new Fault(e);
}
}
-
+
DataWriter<OutputStream> osWriter = getDataWriter(message, service, OutputStream.class);
for (MessagePartInfo part : parts) {
if (objs.hasValue(part)) {
Object o = objs.get(part);
- osWriter.write(o, part, out);
+ osWriter.write(o, part, out);
}
}
} else {
DataWriter<XMLStreamWriter> dataWriter = getDataWriter(message, service, XMLStreamWriter.class);
-
+
for (MessagePartInfo part : parts) {
if (objs.hasValue(part)) {
NamespaceContext c = null;
@@ -155,47 +155,47 @@ public abstract class AbstractOutDatabindingInterceptor extends AbstractPhaseInt
}
}
}
-
+
protected void setOperationSchemaValidation(Message message) {
SchemaValidationType validationType = ServiceUtils.getSchemaValidationType(message);
message.put(Message.SCHEMA_VALIDATION_ENABLED, validationType);
}
-
+
protected boolean shouldValidate(Message m) {
return ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, m);
}
-
+
protected boolean writeToOutputStream(Message m, BindingInfo info, Service s) {
/**
* Yes, all this code is EXTREMELY ugly. But it gives about a 60-70% performance
- * boost with the JAXB RI, so its worth it.
+ * boost with the JAXB RI, so its worth it.
*/
-
+
if (s == null) {
return false;
}
-
+
String enc = (String)m.get(Message.ENCODING);
- return info.getClass().getName().equals("org.apache.cxf.binding.soap.model.SoapBindingInfo")
+ return info.getClass().getName().equals("org.apache.cxf.binding.soap.model.SoapBindingInfo")
&& s.getDataBinding().getClass().getName().equals("org.apache.cxf.jaxb.JAXBDataBinding")
&& !MessageUtils.isDOMPresent(m)
&& (enc == null || StandardCharsets.UTF_8.name().equals(enc));
}
-
+
protected <T> DataWriter<T> getDataWriter(Message message, Service service, Class<T> output) {
DataWriter<T> writer = service.getDataBinding().createWriter(output);
-
+
Collection<Attachment> atts = message.getAttachments();
if (MessageUtils.isTrue(message.getContextualProperty(Message.MTOM_ENABLED))
&& atts == null) {
atts = new ArrayList<>();
message.setAttachments(atts);
}
-
+
writer.setAttachments(atts);
writer.setProperty(DataWriter.ENDPOINT, message.getExchange().getEndpoint());
writer.setProperty(Message.class.getName(), message);
-
+
setDataWriterValidation(service, message, writer);
return writer;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
index bdc9d9f..daa6af3 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
@@ -31,17 +31,17 @@ import org.apache.cxf.feature.Features;
import org.apache.cxf.message.Message;
public class AnnotationInterceptors {
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(AnnotationInterceptors.class);
-
+
private Class<?> clazzes[];
-
+
public AnnotationInterceptors(Class<?> ... clz) {
clazzes = clz;
}
-
+
private <T> List<T> getAnnotationObject(Class<? extends Annotation> annotationClazz, Class<T> type) {
-
+
for (Class<?> cls : clazzes) {
Annotation annotation = cls.getAnnotation(annotationClazz);
if (annotation != null) {
@@ -50,7 +50,7 @@ public class AnnotationInterceptors {
}
return null;
}
-
+
private <T> List<T> initializeAnnotationObjects(Annotation annotation,
Class<T> type) {
List<T> list = new ArrayList<>();
@@ -60,9 +60,9 @@ public class AnnotationInterceptors {
for (Class<? extends T> cn : getAnnotationObjectClasses(annotation, type)) {
list.add(initializeAnnotationObject(cn));
}
- return list;
+ return list;
}
-
+
@SuppressWarnings("unchecked")
private <T> Class<? extends T>[] getAnnotationObjectClasses(Annotation ann, Class<T> type) { //NOPMD
if (ann instanceof InFaultInterceptors) {
@@ -91,10 +91,10 @@ public class AnnotationInterceptors {
} else if (ann instanceof Features) {
return ((Features)ann).features();
}
-
+
throw new UnsupportedOperationException("Doesn't support the annotation: " + ann);
}
-
+
private <T> T initializeAnnotationObject(String annObjectName, Class<T> type) {
Object object = null;
try {
@@ -102,7 +102,7 @@ public class AnnotationInterceptors {
return type.cast(object);
} catch (Throwable e) {
throw new Fault(new org.apache.cxf.common.i18n.Message(
- "COULD_NOT_CREATE_ANNOTATION_OBJECT",
+ "COULD_NOT_CREATE_ANNOTATION_OBJECT",
BUNDLE, annObjectName), e);
}
}
@@ -113,11 +113,11 @@ public class AnnotationInterceptors {
return type.cast(object);
} catch (Throwable e) {
throw new Fault(new org.apache.cxf.common.i18n.Message(
- "COULD_NOT_CREATE_ANNOTATION_OBJECT",
+ "COULD_NOT_CREATE_ANNOTATION_OBJECT",
BUNDLE, type.getName()), e);
}
}
-
+
private List<Interceptor<? extends Message>> getAnnotationInterceptorList(Class<? extends Annotation> t) {
@SuppressWarnings("rawtypes")
List<Interceptor> i = getAnnotationObject(t, Interceptor.class);
@@ -146,7 +146,7 @@ public class AnnotationInterceptors {
public List<Interceptor<? extends Message>> getOutInterceptors() {
return getAnnotationInterceptorList(OutInterceptors.class);
}
-
+
public List<Feature> getFeatures() {
return getAnnotationObject(Features.class, Feature.class);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java
index bae17e8..6d578f9 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java
@@ -41,7 +41,7 @@ public class AttachmentInInterceptor extends AbstractPhaseInterceptor<Message> {
public AttachmentInInterceptor() {
super(Phase.RECEIVE);
}
-
+
public void handleMessage(Message message) {
if (isGET(message)) {
LOG.fine("AttachmentInInterceptor skipped in HTTP GET method");
@@ -50,7 +50,7 @@ public class AttachmentInInterceptor extends AbstractPhaseInterceptor<Message> {
if (message.getContent(InputStream.class) == null) {
return;
}
-
+
String contentType = (String) message.get(Message.CONTENT_TYPE);
if (AttachmentUtil.isTypeSupported(contentType, getSupportedTypes())) {
AttachmentDeserializer ad = new AttachmentDeserializer(message, getSupportedTypes());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/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 8543960..9f37275 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AttachmentOutInterceptor.java
@@ -37,23 +37,23 @@ import org.apache.cxf.phase.Phase;
public class AttachmentOutInterceptor extends AbstractPhaseInterceptor<Message> {
public static final String WRITE_ATTACHMENTS = "write.attachments";
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(AttachmentOutInterceptor.class);
private AttachmentOutEndingInterceptor ending = new AttachmentOutEndingInterceptor();
-
+
public AttachmentOutInterceptor() {
super(Phase.PRE_STREAM);
}
public void handleMessage(Message 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))
|| (message.getAttachments() != null && !message.getAttachments().isEmpty());
-
+
if (!mtomEnabled && !writeAtts) {
return;
}
@@ -61,8 +61,8 @@ public class AttachmentOutInterceptor extends AbstractPhaseInterceptor<Message>
return;
}
- AttachmentSerializer serializer =
- new AttachmentSerializer(message,
+ AttachmentSerializer serializer =
+ new AttachmentSerializer(message,
getMultipartType(),
writeOptionalTypeParameters(),
getRootHeaders());
@@ -72,30 +72,30 @@ public class AttachmentOutInterceptor extends AbstractPhaseInterceptor<Message>
if (contentTransferEncoding != null) {
serializer.setContentTransferEncoding(contentTransferEncoding);
}
-
+
try {
serializer.writeProlog();
} catch (IOException e) {
throw new Fault(new org.apache.cxf.common.i18n.Message("WRITE_ATTACHMENTS", BUNDLE), e);
- }
+ }
message.setContent(AttachmentSerializer.class, serializer);
-
+
// Add a final interceptor to write attachements
- message.getInterceptorChain().add(ending);
+ message.getInterceptorChain().add(ending);
}
-
+
protected String getMultipartType() {
return "multipart/related";
}
-
+
protected boolean writeOptionalTypeParameters() {
return true;
}
-
+
protected Map<String, List<String>> getRootHeaders() {
return Collections.emptyMap();
}
-
+
public class AttachmentOutEndingInterceptor extends AbstractPhaseInterceptor<Message> {
public AttachmentOutEndingInterceptor() {
super(Phase.PRE_STREAM_ENDING);
@@ -113,6 +113,6 @@ public class AttachmentOutInterceptor extends AbstractPhaseInterceptor<Message>
}
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
index cd9fc2e..4834340 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/ClientFaultConverter.java
@@ -75,7 +75,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
public void handleMessage(Message msg) {
Fault fault = (Fault) msg.getContent(Exception.class);
- if (fault.getDetail() != null
+ if (fault.getDetail() != null
&& !MessageUtils.getContextualBoolean(msg,
DISABLE_FAULT_MAPPING,
false)) {
@@ -96,7 +96,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
}
}
}
-
+
msg.getExchange().put(FaultMode.class, faultMode);
}
@@ -164,19 +164,19 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
reader.setProperty(DataReader.FAULT, fault);
e = reader.read(part, xsr);
}
-
+
if (!(e instanceof Exception)) {
-
+
try {
Class<?> exClass = faultWanted.getProperty(Class.class.getName(), Class.class);
if (exClass == null) {
return;
}
- if (e == null) {
+ if (e == null) {
Constructor<?> constructor = exClass.getConstructor(new Class[]{String.class});
e = constructor.newInstance(new Object[]{fault.getMessage()});
} else {
-
+
try {
Constructor<?> constructor = getConstructor(exClass, e);
e = constructor.newInstance(new Object[]{fault.getMessage(), e});
@@ -203,7 +203,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
msg.setContent(Exception.class, e);
}
}
-
+
private Constructor<?> getConstructor(Class<?> faultClass, Object e) throws NoSuchMethodException {
Class<?> beanClass = e.getClass();
Constructor<?> cons[] = faultClass.getConstructors();
@@ -236,7 +236,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
}
return supportsDOM;
}
-
+
private void setStackTrace(Fault fault, Message msg) {
Throwable cause = null;
Map<String, String> ns = new HashMap<String, String>();
@@ -309,13 +309,13 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
res.setStackTrace(stackTraceList.toArray(stackTraceElement));
return res;
}
-
+
private static StackTraceElement parseStackTrackLine(String oneLine) {
StringTokenizer stInner = new StringTokenizer(oneLine, "!");
return new StackTraceElement(stInner.nextToken(), stInner.nextToken(),
stInner.nextToken(), Integer.parseInt(stInner.nextToken()));
}
-
+
private Class<?> getPrimitiveClass(Class<?> cls) {
if (cls.isPrimitive()) {
return cls;
@@ -332,13 +332,13 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
}
return null;
}
-
+
private Exception convertFaultBean(Class<?> exClass, Object faultBean, Fault fault) throws Exception {
Constructor<?> constructor = exClass.getConstructor(new Class[]{String.class});
Exception e = (Exception)constructor.newInstance(new Object[]{fault.getMessage()});
//Copy fault bean fields to exception
- for (Class<?> obj = exClass; !obj.equals(Object.class); obj = obj.getSuperclass()) {
+ for (Class<?> obj = exClass; !obj.equals(Object.class); obj = obj.getSuperclass()) {
Field[] fields = obj.getDeclaredFields();
for (Field f : fields) {
try {
@@ -349,7 +349,7 @@ public class ClientFaultConverter extends AbstractInDatabindingInterceptor {
} catch (NoSuchFieldException e1) {
//do nothing
}
- }
+ }
}
//also use/try public getter/setter methods
Method meth[] = faultBean.getClass().getMethods();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java
index caa71d8..1ae9b97 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/FIStaxInInterceptor.java
@@ -37,16 +37,16 @@ import org.apache.cxf.phase.Phase;
*/
public class FIStaxInInterceptor extends AbstractPhaseInterceptor<Message> {
public static final String FI_GET_SUPPORTED = "org.apache.cxf.fastinfoset.get.supported";
-
+
public FIStaxInInterceptor() {
this(Phase.POST_STREAM);
}
-
+
public FIStaxInInterceptor(String phase) {
super(phase);
addBefore(StaxInInterceptor.class.getName());
}
-
+
protected boolean isRequestor(Message message) {
return Boolean.TRUE.equals(message.containsKey(Message.REQUESTOR_ROLE));
}
@@ -58,7 +58,7 @@ public class FIStaxInInterceptor extends AbstractPhaseInterceptor<Message> {
parser.setInputStream(in);
return parser;
}
-
+
public void handleMessage(Message message) {
if (message.getContent(XMLStreamReader.class) != null
|| !isHttpVerbSupported(message)) {
@@ -66,32 +66,32 @@ public class FIStaxInInterceptor extends AbstractPhaseInterceptor<Message> {
}
String ct = (String)message.get(Message.CONTENT_TYPE);
- if (ct != null && ct.indexOf("fastinfoset") != -1
+ if (ct != null && ct.indexOf("fastinfoset") != -1
&& message.getContent(InputStream.class) != null
&& message.getContent(XMLStreamReader.class) == null) {
message.setContent(XMLStreamReader.class, getParser(message.getContent(InputStream.class)));
//add the StaxInEndingInterceptor which will close the reader
message.getInterceptorChain().add(StaxInEndingInterceptor.INSTANCE);
-
+
ct = ct.replace("fastinfoset", "xml");
if (ct.contains("application/xml")) {
- ct = ct.replace("application/xml", "text/xml");
+ ct = ct.replace("application/xml", "text/xml");
}
message.put(Message.CONTENT_TYPE, ct);
-
+
message.getExchange().put(FIStaxOutInterceptor.FI_ENABLED, Boolean.TRUE);
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(FIStaxOutInterceptor.FI_ENABLED, Boolean.TRUE);
}
}
}
-
+
protected boolean isHttpVerbSupported(Message message) {
if (isGET(message)) {
- return isRequestor(message)
+ return isRequestor(message)
&& MessageUtils.isTrue(message.getContextualProperty(FI_GET_SUPPORTED));
} else {
return true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
index 4aaee1f..14efe15 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/FIStaxOutInterceptor.java
@@ -67,7 +67,7 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
this();
force = f;
}
-
+
@Override
public void handleFault(Message message) {
super.handleFault(message);
@@ -76,14 +76,14 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
message.setContent(OutputStream.class, os);
}
}
-
+
public void handleMessage(Message message) {
OutputStream out = message.getContent(OutputStream.class);
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
if (out == null || writer != null) {
return;
- }
-
+ }
+
boolean req = isRequestor(message);
Object o = message.getContextualProperty(FI_ENABLED);
if (!req) {
@@ -95,7 +95,7 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
}
} else {
- Map<String, List<String>> headers
+ Map<String, List<String>> headers
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
List<String> accepts = headers.get("Accept");
if (accepts == null) {
@@ -110,12 +110,12 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
accepts.add(a);
}
}
-
- if (force
+
+ if (force
|| MessageUtils.isTrue(o)) {
StAXDocumentSerializer serializer = getOutput(out);
message.setContent(XMLStreamWriter.class, serializer);
-
+
message.removeContent(OutputStream.class);
message.put(OUTPUT_STREAM_HOLDER, out);
message.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION,
@@ -128,7 +128,7 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
} else {
message.put(Message.CONTENT_TYPE, "application/fastinfoset");
}
-
+
try {
serializer.writeStartDocument();
} catch (XMLStreamException e) {
@@ -137,7 +137,7 @@ public class FIStaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
message.getInterceptorChain().add(ENDING);
}
}
-
+
private StAXDocumentSerializer getOutput(OutputStream out) {
/*
StAXDocumentSerializer serializer = (StAXDocumentSerializer)m.getExchange().getEndpoint()
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/Fault.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/Fault.java b/core/src/main/java/org/apache/cxf/interceptor/Fault.java
index 3c40a48..0a21bc2 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/Fault.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/Fault.java
@@ -41,7 +41,7 @@ public class Fault extends UncheckedException {
public static final String STACKTRACE = "stackTrace";
private static final int DEFAULT_HTTP_RESPONSE_CODE = HttpURLConnection.HTTP_INTERNAL_ERROR;
private static final long serialVersionUID = -1583932965031558864L;
-
+
private Element detail;
private String messageString;
private QName code;
@@ -56,7 +56,7 @@ public class Fault extends UncheckedException {
this.messageString = message.toString();
code = FAULT_CODE_SERVER;
}
-
+
public Fault(Message message) {
super(message);
this.messageString = message.toString();
@@ -81,7 +81,7 @@ public class Fault extends UncheckedException {
public Fault(String message, ResourceBundle b, Throwable t, Object ... params) {
this(new Message(message, b, params), t);
}
-
+
public Fault(Throwable t) {
super(t);
if (message != null) {
@@ -91,13 +91,13 @@ public class Fault extends UncheckedException {
}
code = FAULT_CODE_SERVER;
}
-
+
public Fault(Message message, Throwable throwable, QName fc) {
super(message, throwable);
this.messageString = message.toString();
code = fc;
}
-
+
public Fault(Message message, QName fc) {
super(message);
this.messageString = message.toString();
@@ -121,11 +121,11 @@ public class Fault extends UncheckedException {
public void setMessage(String message) {
this.messageString = message;
}
-
+
public QName getFaultCode() {
return code;
}
-
+
public Fault setFaultCode(QName c) {
code = c;
return this;
@@ -141,7 +141,7 @@ public class Fault extends UncheckedException {
/**
* Sets a details <code>Node</code> on this fault.
- *
+ *
* @param details the detail node.
*/
public void setDetail(Element details) {
@@ -150,7 +150,7 @@ public class Fault extends UncheckedException {
/**
* Indicates whether this fault has a detail message.
- *
+ *
* @return <code>true</code> if this fault has a detail message;
* <code>false</code> otherwise.
*/
@@ -161,7 +161,7 @@ public class Fault extends UncheckedException {
/**
* Returns the detail node. If no detail node has been set, an empty
* <code><detail></code> is created.
- *
+ *
* @return the detail node.
*/
public Element getOrCreateDetail() {
@@ -170,7 +170,7 @@ public class Fault extends UncheckedException {
}
return detail;
}
-
+
/**
* Returns http header status code.
* @return status code.
@@ -178,10 +178,10 @@ public class Fault extends UncheckedException {
public int getStatusCode() {
return this.statusCode;
}
-
+
/**
* Set http header status code on this fault.
- *
+ *
* @param statusCode
*/
public void setStatusCode(int statusCode) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
index 2a9cf80..94ba7f7 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/FaultOutInterceptor.java
@@ -42,17 +42,17 @@ import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
public class FaultOutInterceptor extends AbstractPhaseInterceptor<Message> {
- private static final Logger LOG = LogUtils.getL7dLogger(FaultOutInterceptor.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(FaultOutInterceptor.class);
/**
* Marker interfaces for Exceptions that have a
- * getFaultInfo() method that returns some sort
+ * getFaultInfo() method that returns some sort
* of object that the FaultOutInterceptor can
* marshal into a fault detail element
*/
public interface FaultInfoException {
}
-
+
public FaultOutInterceptor() {
super(Phase.PRE_PROTOCOL);
}
@@ -67,7 +67,7 @@ public class FaultOutInterceptor extends AbstractPhaseInterceptor<Message> {
if (cause == null) {
return;
}
-
+
BindingOperationInfo bop = message.getExchange().getBindingOperationInfo();
if (bop == null) {
return;
@@ -111,7 +111,7 @@ public class FaultOutInterceptor extends AbstractPhaseInterceptor<Message> {
f.setMessage(ex.getMessage());
} catch (Exception fex) {
//ignore - if any exceptions occur here, we'll ignore them
- //and let the default fault handling of the binding convert
+ //and let the default fault handling of the binding convert
//the fault like it was an unchecked exception.
LOG.log(Level.WARNING, "EXCEPTION_WHILE_WRITING_FAULT", fex);
}
@@ -146,7 +146,7 @@ public class FaultOutInterceptor extends AbstractPhaseInterceptor<Message> {
/**
* Find the correct Fault part for a particular exception.
- *
+ *
* @param op
* @param class1
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java b/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
index 906003e..ed6ca7b 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
@@ -41,7 +41,7 @@ public class InFaultChainInitiatorObserver extends AbstractFaultChainInitiatorOb
Endpoint e = ex.getEndpoint();
Client c = ex.get(Client.class);
InterceptorProvider ip = ex.get(InterceptorProvider.class);
-
+
chain.add(getBus().getInFaultInterceptors());
if (c != null) {
chain.add(c.getInFaultInterceptors());
@@ -54,25 +54,25 @@ public class InFaultChainInitiatorObserver extends AbstractFaultChainInitiatorOb
if (e.getService().getDataBinding() instanceof InterceptorProvider) {
chain.add(((InterceptorProvider)e.getService().getDataBinding()).getInFaultInterceptors());
}
-
+
addToChain(chain, ex.getInFaultMessage());
addToChain(chain, ex.getOutMessage());
}
private void addToChain(PhaseInterceptorChain chain, Message m) {
- Collection<InterceptorProvider> providers
+ Collection<InterceptorProvider> providers
= CastUtils.cast((Collection<?>)m.get(Message.INTERCEPTOR_PROVIDERS));
if (providers != null) {
for (InterceptorProvider p : providers) {
chain.add(p.getInFaultInterceptors());
}
}
- Collection<Interceptor<? extends Message>> is
+ Collection<Interceptor<? extends Message>> is
= CastUtils.cast((Collection<?>)m.get(Message.FAULT_IN_INTERCEPTORS));
if (is != null) {
chain.add(is);
}
}
-
+
protected SortedSet<Phase> getPhases() {
return getBus().getExtension(PhaseManager.class).getInPhases();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/InFaultInterceptors.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/InFaultInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/InFaultInterceptors.java
index 57e13c6..5160082 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/InFaultInterceptors.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/InFaultInterceptors.java
@@ -26,15 +26,15 @@ import java.lang.annotation.Target;
import org.apache.cxf.message.Message;
/**
- * Specifies a list of classes that are added to the inbound fault
- * interceptor chain. This annotation effects SEI classes and service
+ * Specifies a list of classes that are added to the inbound fault
+ * interceptor chain. This annotation effects SEI classes and service
* implementation classes.
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface InFaultInterceptors {
-
+
String[] interceptors() default { };
-
+
Class<? extends Interceptor<? extends Message>>[] classes() default { };
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/InInterceptors.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/InInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/InInterceptors.java
index dfb35ba..ce20876 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/InInterceptors.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/InInterceptors.java
@@ -28,15 +28,15 @@ import org.apache.cxf.message.Message;
/**
- * Specifies a list of classes that are added to the inbound interceptor
- * chain. This annotation effects SEI classes and service implementation
+ * Specifies a list of classes that are added to the inbound interceptor
+ * chain. This annotation effects SEI classes and service implementation
* classes.
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface InInterceptors {
-
+
String[] interceptors() default { };
-
+
Class<? extends Interceptor<? extends Message>>[] classes() default { };
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/Interceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/Interceptor.java b/core/src/main/java/org/apache/cxf/interceptor/Interceptor.java
index e3278de..2644033 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/Interceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/Interceptor.java
@@ -26,20 +26,20 @@ import org.apache.cxf.message.Message;
*/
public interface Interceptor<T extends Message> {
/**
- * Intercepts a message.
+ * Intercepts a message.
* Interceptors should NOT invoke handleMessage or handleFault
* on the next interceptor - the interceptor chain will
* take care of this.
- *
+ *
* @param message
*/
void handleMessage(T message) throws Fault;
-
+
/**
* Called for all interceptors (in reverse order) on which handleMessage
* had been successfully invoked, when normal execution of the chain was
* aborted for some reason.
- *
+ *
* @param message
*/
void handleFault(T message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java b/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
index d5e3025..9ed7b10 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/InterceptorChain.java
@@ -28,13 +28,13 @@ import org.apache.cxf.transport.MessageObserver;
/**
* Base interface for all interceptor chains. An interceptor chain is an
* ordered list of interceptors associated with one portion of the message
- * processing pipeline. Interceptor chains are defined for a client's request
- * processing, response processing, and incoming SOAP fault processing. Interceptor
- * chains are defined for a service's request processing, response processing, and
+ * processing pipeline. Interceptor chains are defined for a client's request
+ * processing, response processing, and incoming SOAP fault processing. Interceptor
+ * chains are defined for a service's request processing, response processing, and
* outgoing SOAP fault processing.
*/
public interface InterceptorChain extends Iterable<Interceptor<? extends Message>> {
-
+
enum State {
PAUSED,
SUSPENDED,
@@ -42,27 +42,27 @@ public interface InterceptorChain extends Iterable<Interceptor<? extends Message
COMPLETE,
ABORTED,
};
-
+
String STARTING_AFTER_INTERCEPTOR_ID = "starting_after_interceptor_id";
String STARTING_AT_INTERCEPTOR_ID = "starting_at_interceptor_id";
-
+
/**
* Adds a single interceptor to the interceptor chain.
- *
+ *
* @param i the interceptor to add
*/
void add(Interceptor<? extends Message> i);
-
+
/**
- * Adds multiple interceptors to the interceptor chain.
+ * Adds multiple interceptors to the interceptor chain.
* @param i the interceptors to add to the chain
*/
void add(Collection<Interceptor<? extends Message>> i);
-
+
void remove(Interceptor<? extends Message> i);
-
+
boolean doIntercept(Message message);
-
+
boolean doInterceptStartingAfter(Message message, String startingAfterInterceptorID);
boolean doInterceptStartingAt(Message message, String startingAtInterceptorID);
@@ -79,7 +79,7 @@ public interface InterceptorChain extends Iterable<Interceptor<? extends Message
* be re-entered) and then throw a SuspendedInvocationException to the caller
*/
void suspend();
-
+
/**
* Resumes the chain. The chain will use the current thread to continue processing
* the last message that was passed into doIntercept
@@ -94,15 +94,15 @@ public interface InterceptorChain extends Iterable<Interceptor<? extends Message
*/
void unpause();
-
+
void reset();
-
+
State getState();
-
+
ListIterator<Interceptor<? extends Message>> getIterator();
MessageObserver getFaultObserver();
-
+
void setFaultObserver(MessageObserver i);
void abort();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java b/core/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java
index bfdb88b..e0ecf48 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/InterceptorProvider.java
@@ -24,27 +24,27 @@ import java.util.List;
import org.apache.cxf.message.Message;
/**
- * The <code>InterceptorProvider</code> interface is implemented by objects
- * that have interceptor chains associated with them. The methods in this
+ * The <code>InterceptorProvider</code> interface is implemented by objects
+ * that have interceptor chains associated with them. The methods in this
* interface provide the ability to add and remove interceptors to the chains
* of the InterceptorProvider.
*/
public interface InterceptorProvider {
-
+
/**
* Returns the list of interceptors attached to the incoming interceptor
* chain of the object.
* @return <code>List<Interceptor></code> incoming interceptor chain
*/
List<Interceptor<? extends Message>> getInInterceptors();
-
+
/**
* Returns the list of interceptors attached to the outgoing interceptor
* chain of the object.
* @return <code>List<Interceptor></code> outgoing interceptor chain
*/
List<Interceptor<? extends Message>> getOutInterceptors();
-
+
/**
* Returns the list of interceptors attached to the incoming fault interceptor
* chain of the object.
@@ -58,5 +58,5 @@ public interface InterceptorProvider {
* @return <code>List<Interceptor></code> outgoing fault interceptor chain
*/
List<Interceptor<? extends Message>> getOutFaultInterceptors();
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
index d214f46..b26b5d3 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingInInterceptor.java
@@ -45,11 +45,11 @@ import org.apache.cxf.phase.Phase;
@Deprecated
public class LoggingInInterceptor extends AbstractLoggingInterceptor {
private static final Logger LOG = LogUtils.getLogger(LoggingInInterceptor.class);
-
+
public LoggingInInterceptor() {
super(Phase.RECEIVE);
}
-
+
public LoggingInInterceptor(String phase) {
super(phase);
}
@@ -75,7 +75,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
this(id, Phase.RECEIVE);
this.writer = w;
}
-
+
public void handleMessage(Message message) throws Fault {
Logger logger = getMessageLogger(message);
if (logger != null && (writer != null || logger.isLoggable(Level.INFO))) {
@@ -93,7 +93,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
message.getExchange().put(LoggingMessage.ID_KEY, id);
}
message.put(LoggingMessage.ID_KEY, id);
- final LoggingMessage buffer
+ final LoggingMessage buffer
= new LoggingMessage("Inbound Message\n----------------------------", id);
if (!Boolean.TRUE.equals(message.get(Message.DECOUPLED_CHANNEL_MESSAGE))) {
@@ -129,7 +129,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
if (uri != null && uri.startsWith("/")) {
if (address != null && !address.startsWith(uri)) {
if (address.endsWith("/") && address.length() > 1) {
- address = address.substring(0, address.length());
+ address = address.substring(0, address.length());
}
uri = address + uri;
}
@@ -144,7 +144,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
buffer.getAddress().append("?").append(query);
}
}
-
+
if (!isShowBinaryContent() && isBinaryContent(ct)) {
buffer.getMessage().append(BINARY_CONTENT_MESSAGE).append('\n');
log(logger, buffer.toString());
@@ -155,7 +155,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
log(logger, buffer.toString());
return;
}
-
+
InputStream is = message.getContent(InputStream.class);
if (is != null) {
logInputStream(message, is, buffer, encoding, ct);
@@ -173,7 +173,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
CachedWriter writer = new CachedWriter();
IOUtils.copyAndCloseInput(reader, writer);
message.setContent(Reader.class, writer.getReader());
-
+
if (writer.getTempFile() != null) {
//large thing on disk...
buffer.getMessage().append("\nMessage (saved to tmp file):\n");
@@ -195,16 +195,16 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
}
try {
// use the appropriate input stream and restore it later
- InputStream bis = is instanceof DelegatingInputStream
+ InputStream bis = is instanceof DelegatingInputStream
? ((DelegatingInputStream)is).getInputStream() : is;
-
+
//only copy up to the limit since that's all we need to log
//we can stream the rest
IOUtils.copyAtLeast(bis, bos, limit == -1 ? Integer.MAX_VALUE : limit);
bos.flush();
bis = new SequenceInputStream(bos.getInputStream(), bis);
-
+
// restore the delegating input stream or the input stream
if (is instanceof DelegatingInputStream) {
((DelegatingInputStream)is).setInputStream(bis);
@@ -220,8 +220,8 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
if (bos.size() > limit && limit != -1) {
buffer.getMessage().append("(message truncated to " + limit + " bytes)\n");
}
- writePayload(buffer.getPayload(), bos, encoding, ct);
-
+ writePayload(buffer.getPayload(), bos, encoding, ct);
+
bos.close();
} catch (Exception e) {
throw new Fault(e);