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:06 UTC
[01/51] [partial] cxf git commit: Remove all trailing whitespaces
Repository: cxf
Updated Branches:
refs/heads/master c783e60a8 -> 8cea7c879
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
index 7adce74..97728f1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriInfoImpl.java
@@ -46,7 +46,7 @@ public class UriInfoImpl implements UriInfo {
private static final Logger LOG = LogUtils.getL7dLogger(UriInfoImpl.class);
private static final String CASE_INSENSITIVE_QUERIES = "org.apache.cxf.http.case_insensitive_queries";
private static final String PARSE_QUERY_VALUE_AS_COLLECTION = "parse.query.value.as.collection";
-
+
private MultivaluedMap<String, String> templateParams;
private Message message;
private OperationResourceInfoStack stack;
@@ -57,15 +57,15 @@ public class UriInfoImpl implements UriInfo {
public UriInfoImpl(Message m) {
this(m, (MultivaluedMap<String, String>)m.get(URITemplate.TEMPLATE_PARAMETERS));
}
-
+
public UriInfoImpl(Message m, MultivaluedMap<String, String> templateParams) {
this.message = m;
this.templateParams = templateParams;
if (m != null) {
this.stack = m.get(OperationResourceInfoStack.class);
- this.caseInsensitiveQueries =
+ this.caseInsensitiveQueries =
MessageUtils.isTrue(m.getContextualProperty(CASE_INSENSITIVE_QUERIES));
- this.queryValueIsCollection =
+ this.queryValueIsCollection =
MessageUtils.isTrue(m.getContextualProperty(PARSE_QUERY_VALUE_AS_COLLECTION));
}
}
@@ -94,7 +94,7 @@ public class UriInfoImpl implements UriInfo {
public String getPath(boolean decode) {
String value = doGetPath(decode, true);
- if (value.length() > 1 && value.startsWith("/")) {
+ if (value.length() > 1 && value.startsWith("/")) {
return value.substring(1);
} else {
return value;
@@ -114,12 +114,12 @@ public class UriInfoImpl implements UriInfo {
}
public MultivaluedMap<String, String> getQueryParameters(boolean decode) {
- MultivaluedMap<String, String> queries = !caseInsensitiveQueries
+ MultivaluedMap<String, String> queries = !caseInsensitiveQueries
? new MetadataMap<String, String>() : new MetadataMap<String, String>(false, true);
- JAXRSUtils.getStructuredParams(queries, (String)message.get(Message.QUERY_STRING),
+ JAXRSUtils.getStructuredParams(queries, (String)message.get(Message.QUERY_STRING),
"&", decode, decode, queryValueIsCollection);
return queries;
-
+
}
public URI getRequestUri() {
@@ -176,7 +176,7 @@ public class UriInfoImpl implements UriInfo {
List<String> uris = new LinkedList<String>();
StringBuilder sumPath = new StringBuilder("");
for (MethodInvocationInfo invocation : stack) {
- List<String> templateObjects = invocation.getTemplateValues();
+ List<String> templateObjects = invocation.getTemplateValues();
OperationResourceInfo ori = invocation.getMethodInfo();
URITemplate[] paths = {
ori.getClassResourceInfo().getURITemplate(),
@@ -186,7 +186,7 @@ public class UriInfoImpl implements UriInfo {
int count = paths[0].getVariables().size();
List<String> rootObjects = new ArrayList<>(count);
for (int i = 0; i < count && i < templateObjects.size(); i++) {
- rootObjects.add(templateObjects.get(i));
+ rootObjects.add(templateObjects.get(i));
}
uris.add(0, createMatchedPath(paths[0].getValue(), rootObjects, decode));
}
@@ -233,10 +233,10 @@ public class UriInfoImpl implements UriInfo {
URI resolved = HttpUtils.resolve(getBaseUriBuilder(), uri);
return HttpUtils.relativize(getRequestUri(), resolved);
}
-
+
@Override
public URI resolve(URI uri) {
return HttpUtils.resolve(getBaseUriBuilder(), uri);
}
-
+
}
[44/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
index 0260445..3220ad2 100644
--- a/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/UrlUtils.java
@@ -34,31 +34,31 @@ import java.util.StringTokenizer;
*
*/
public final class UrlUtils {
-
+
private static final int RADIX = 16;
private static final byte ESCAPE_CHAR = '%';
private static final byte PLUS_CHAR = '+';
-
+
private UrlUtils() {
-
+
}
public static String urlEncode(String value) {
-
+
return urlEncode(value, StandardCharsets.UTF_8.name());
}
-
+
public static String urlEncode(String value, String enc) {
-
+
try {
value = URLEncoder.encode(value, enc);
} catch (UnsupportedEncodingException ex) {
throw new RuntimeException(ex);
}
-
+
return value;
}
-
+
/**
* Decodes using URLDecoder - use when queries or form post values are decoded
* @param value value to decode
@@ -69,7 +69,7 @@ public final class UrlUtils {
}
private static String urlDecode(String value, String enc, boolean isPath) {
-
+
boolean needDecode = false;
int escapesCount = 0;
int i = 0;
@@ -120,11 +120,11 @@ public final class UrlUtils {
return i;
}
-
+
public static String urlDecode(String value) {
return urlDecode(value, StandardCharsets.UTF_8.name());
}
-
+
/**
* URL path segments may contain '+' symbols which should not be decoded into ' '
* This method replaces '+' with %2B and delegates to URLDecoder
@@ -133,8 +133,8 @@ public final class UrlUtils {
public static String pathDecode(String value) {
return urlDecode(value, StandardCharsets.UTF_8.name(), true);
}
-
-
+
+
/**
* Create a map from String to String that represents the contents of the query
* portion of a URL. For each x=y, x is the key and y is the value.
@@ -156,11 +156,11 @@ public final class UrlUtils {
}
return ht;
}
-
+
/**
* Return everything in the path up to the last slash in a URI.
* @param baseURI
- * @return the trailing
+ * @return the trailing
*/
public static String getStem(String baseURI) {
int idx = baseURI.lastIndexOf('/');
@@ -170,6 +170,6 @@ public final class UrlUtils {
}
return result;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java b/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
index bebea75..ba3c4ad 100644
--- a/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/WeakIdentityHashMap.java
@@ -33,14 +33,14 @@ import java.util.Set;
* Implements a combination of WeakHashMap and IdentityHashMap.
* Useful for caches that need to key off of a == comparison
* instead of a .equals.
- *
+ *
* <b>
* This class is not a general-purpose Map implementation! While
* this class implements the Map interface, it intentionally violates
* Map's general contract, which mandates the use of the equals method
* when comparing objects. This class is designed for use only in the
* rare cases wherein reference-equality semantics are required.
- *
+ *
* Note that this implementation is not synchronized.
* </b>
*/
@@ -150,7 +150,7 @@ public class WeakIdentityHashMap<K, V> implements Map<K, V> {
class IdentityWeakReference extends WeakReference<K> {
int hash;
-
+
@SuppressWarnings("unchecked")
IdentityWeakReference(Object obj) {
super((K)obj, queue);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java b/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java
index f9acb2b..28928d7 100644
--- a/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtils.java
@@ -31,7 +31,7 @@ public final class XmlSchemaPrimitiveUtils {
}
private XmlSchemaPrimitiveUtils() {
}
-
+
private static void initializeMap() {
registerPrimitiveClasses("int", Integer.class, int.class);
registerPrimitiveClasses("byte", Byte.class, byte.class);
@@ -40,28 +40,28 @@ public final class XmlSchemaPrimitiveUtils {
registerPrimitiveClasses("float", Float.class, float.class);
registerPrimitiveClasses("double", Double.class, double.class);
registerPrimitiveClasses("string", String.class);
-
- registerPrimitiveClasses("dateTime", java.sql.Date.class,
- java.util.Date.class,
+
+ registerPrimitiveClasses("dateTime", java.sql.Date.class,
+ java.util.Date.class,
Calendar.class,
java.sql.Timestamp.class);
registerPrimitiveClasses("time", java.sql.Time.class);
// add more as needed
}
-
+
private static void registerPrimitiveClasses(String value, Class<?> ... classes) {
for (Class<?> cls : classes) {
XML_SCHEMA_PRIMITIVE_MAP.put(cls, value);
}
}
-
+
public static String getSchemaRepresentation(Class<?> type) {
return getSchemaRepresentation(type, SCHEMA_NS_PREFIX);
}
-
+
public static String getSchemaRepresentation(Class<?> type, String xsdPrefix) {
String value = XML_SCHEMA_PRIMITIVE_MAP.get(type);
return value == null ? value : xsdPrefix + ":" + value;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java b/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
index 24b4fb9..bd10b13 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/InvalidXmlSchemaReferenceException.java
@@ -20,14 +20,14 @@
package org.apache.cxf.common.xmlschema;
/**
- * Exception thrown when we detect an attempt to set an impossible XML Schema reference.
+ * Exception thrown when we detect an attempt to set an impossible XML Schema reference.
*/
public class InvalidXmlSchemaReferenceException extends RuntimeException {
private static final long serialVersionUID = -2053958361555768873L;
/**
- *
+ *
*/
public InvalidXmlSchemaReferenceException() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java b/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java
index f48ed62..c95c36c 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/LSInputImpl.java
@@ -24,7 +24,7 @@ import java.io.Reader;
import org.w3c.dom.ls.LSInput;
/**
- * LSInput implementation that can be used in
+ * LSInput implementation that can be used in
* custom LSResourceResolver implementations for getting
* schema import and include references resolved.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
index a66aceb..c6d8509 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
@@ -298,7 +298,7 @@ public class SchemaCollection {
addCrossImports(schema, complexType.getContentModel());
addCrossImportsAttributeList(schema, complexType.getAttributes());
// could it be a choice or something else?
-
+
if (complexType.getParticle() instanceof XmlSchemaChoice) {
XmlSchemaChoice choice = (XmlSchemaChoice)complexType.getParticle();
addCrossImports(schema, choice);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
index 7db5aba..3f17d46 100644
--- a/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/xmlschema/XmlSchemaUtils.java
@@ -51,7 +51,7 @@ import org.apache.ws.commons.schema.constants.Constants;
*/
public final class XmlSchemaUtils {
public static final String XSI_NIL = "xsi:nil='true'";
-
+
private static final Logger LOG = LogUtils.getL7dLogger(XmlSchemaUtils.class);
private XmlSchemaUtils() {
@@ -238,7 +238,7 @@ public final class XmlSchemaUtils {
return ext.getAttributes();
}
- public static List<XmlSchemaAnnotated> getContentAttributes(XmlSchemaComplexType type,
+ public static List<XmlSchemaAnnotated> getContentAttributes(XmlSchemaComplexType type,
SchemaCollection collection) {
List<XmlSchemaAnnotated> results = new ArrayList<>();
QName baseTypeName = getBaseType(type);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/Configurable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/Configurable.java b/core/src/main/java/org/apache/cxf/configuration/Configurable.java
index ad7152c..acde841 100644
--- a/core/src/main/java/org/apache/cxf/configuration/Configurable.java
+++ b/core/src/main/java/org/apache/cxf/configuration/Configurable.java
@@ -20,15 +20,15 @@
package org.apache.cxf.configuration;
/**
* A configurable interface for obtaining a bean's name
- *
- * A class which implements this interface should return the
- * unique bean name for configuration to use
+ *
+ * A class which implements this interface should return the
+ * unique bean name for configuration to use
*/
public interface Configurable {
-
+
/**
* Get the configurable object's Bean name
- * @return the bean name
+ * @return the bean name
*/
- String getBeanName();
+ String getBeanName();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java b/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java
index 22bb23f..0f78211 100644
--- a/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/configuration/ConfiguredBeanLocator.java
@@ -23,10 +23,10 @@ import java.util.Collection;
import java.util.List;
/**
- *
+ *
*/
public interface ConfiguredBeanLocator {
-
+
/**
* Gets the names of all the configured beans of the specific type. Does
* not cause them to be loaded.
@@ -34,8 +34,8 @@ public interface ConfiguredBeanLocator {
* @return List of all the bean names for the given type
*/
List<String> getBeanNamesOfType(Class<?> type);
-
-
+
+
/**
* Gets the bean of the given name and type
* @param name
@@ -43,19 +43,19 @@ public interface ConfiguredBeanLocator {
* @return the bean
*/
<T> T getBeanOfType(String name, Class<T> type);
-
+
/**
* Gets all the configured beans of the specific types. Causes them
- * all to be loaded.
+ * all to be loaded.
* @param type
* @return The collection of all the configured beans of the given type
*/
<T> Collection<? extends T> getBeansOfType(Class<T> type);
-
+
/**
* Iterates through the beans of the given type, calling the listener
- * to determine if it should be loaded or not.
+ * to determine if it should be loaded or not.
* @param type
* @param listener
* @return true if beans of the type were loaded
@@ -64,22 +64,22 @@ public interface ConfiguredBeanLocator {
/**
* For supporting "legacy" config, checks the configured bean to see if
- * it has a property configured with the given name/value. Mostly used
- * for supporting things configured with "activationNamespaces" set.
+ * it has a property configured with the given name/value. Mostly used
+ * for supporting things configured with "activationNamespaces" set.
* @param beanName
* @param propertyName
* @param value
* @return true if the bean has the given property/value
*/
boolean hasConfiguredPropertyValue(String beanName, String propertyName, String value);
-
+
interface BeanLoaderListener<T> {
/**
- * Return true to have the loader go ahead and load the bean. If false,
+ * Return true to have the loader go ahead and load the bean. If false,
* the loader will just skip to the next bean
* @param name
* @param type
- * @return true if the bean should be loaded
+ * @return true if the bean should be loaded
*/
boolean loadBean(String name, Class<? extends T> type);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/Configurer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/Configurer.java b/core/src/main/java/org/apache/cxf/configuration/Configurer.java
index ccdbdb6..e4b1945 100644
--- a/core/src/main/java/org/apache/cxf/configuration/Configurer.java
+++ b/core/src/main/java/org/apache/cxf/configuration/Configurer.java
@@ -21,16 +21,16 @@ package org.apache.cxf.configuration;
/**
* The configurer's interface
- *
- * A class that implements this interface will perform a
+ *
+ * A class that implements this interface will perform a
* bean's configuration work
*/
-public interface Configurer {
-
+public interface Configurer {
+
String DEFAULT_USER_CFG_FILE = "cxf.xml";
String USER_CFG_FILE_PROPERTY_NAME = "cxf.config.file";
-
+
String USER_CFG_FILE_PROPERTY_URL = "cxf.config.file.url";
/**
@@ -38,7 +38,7 @@ public interface Configurer {
* @param beanInstance the instance of the bean which needs to be configured
*/
void configureBean(Object beanInstance);
-
+
/**
* set up the Bean's value by using Dependency Injection from the application context
* with a proper name. You can use * as the prefix of wildcard name.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
index 8b83053..5de387c 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/AbstractBPBeanDefinitionParser.java
@@ -81,25 +81,25 @@ public abstract class AbstractBPBeanDefinitionParser {
return v;
}
- protected Metadata parseListData(ParserContext context,
- ComponentMetadata enclosingComponent,
+ protected Metadata parseListData(ParserContext context,
+ ComponentMetadata enclosingComponent,
Element element) {
- MutableCollectionMetadata m
- = (MutableCollectionMetadata) context.parseElement(CollectionMetadata.class,
+ MutableCollectionMetadata m
+ = (MutableCollectionMetadata) context.parseElement(CollectionMetadata.class,
enclosingComponent, element);
m.setCollectionClass(List.class);
return m;
}
- protected Metadata parseMapData(ParserContext context,
- ComponentMetadata enclosingComponent,
+ protected Metadata parseMapData(ParserContext context,
+ ComponentMetadata enclosingComponent,
Element element) {
return context.parseElement(MapMetadata.class, enclosingComponent, element);
}
- protected void setFirstChildAsProperty(Element element,
- ParserContext ctx,
- MutableBeanMetadata bean,
+ protected void setFirstChildAsProperty(Element element,
+ ParserContext ctx,
+ MutableBeanMetadata bean,
String propertyName) {
Element first = DOMUtils.getFirstElement(element);
@@ -189,7 +189,7 @@ public abstract class AbstractBPBeanDefinitionParser {
}
return setBus;
}
- protected void processBusAttribute(Element element, ParserContext ctx,
+ protected void processBusAttribute(Element element, ParserContext ctx,
MutableBeanMetadata bean, String val) {
if (this.hasBusProperty()) {
bean.addProperty("bus", getBusRef(ctx, val));
@@ -204,14 +204,14 @@ public abstract class AbstractBPBeanDefinitionParser {
String val) {
//nothing
}
- protected void mapAttribute(MutableBeanMetadata bean, Element e,
+ protected void mapAttribute(MutableBeanMetadata bean, Element e,
String name, String val, ParserContext context) {
mapToProperty(bean, name, val, context);
}
protected boolean isAttribute(String pre, String name) {
- return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
- && !"abstract".equals(name) && !"lazy-init".equals(name)
+ return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
+ && !"abstract".equals(name) && !"lazy-init".equals(name)
&& !"id".equals(name);
}
@@ -222,9 +222,9 @@ public abstract class AbstractBPBeanDefinitionParser {
protected void mapElement(ParserContext ctx, MutableBeanMetadata bean, Element el, String name) {
}
- protected void mapToProperty(MutableBeanMetadata bean,
- String propertyName,
- String val,
+ protected void mapToProperty(MutableBeanMetadata bean,
+ String propertyName,
+ String val,
ParserContext context) {
if ("id".equals(propertyName)) {
return;
@@ -266,7 +266,7 @@ public abstract class AbstractBPBeanDefinitionParser {
protected MutableBeanMetadata getBus(ParserContext context, String name) {
ComponentDefinitionRegistry cdr = context.getComponentDefinitionRegistry();
ComponentMetadata meta = cdr.getComponentDefinition("blueprintBundle");
-
+
if (!cdr.containsComponentDefinition(InterceptorTypeConverter.class.getName())) {
MutablePassThroughMetadata md = context.createMetadata(MutablePassThroughMetadata.class);
md.setObject(new InterceptorTypeConverter());
@@ -312,9 +312,9 @@ public abstract class AbstractBPBeanDefinitionParser {
}
protected void mapElementToJaxbProperty(ParserContext ctx,
- MutableBeanMetadata bean, Element parent,
+ MutableBeanMetadata bean, Element parent,
QName name,
- String propertyName,
+ String propertyName,
Class<?> c) {
Element data = DOMUtils.getFirstChildWithName(parent, name);
if (data == null) {
@@ -323,7 +323,7 @@ public abstract class AbstractBPBeanDefinitionParser {
mapElementToJaxbProperty(ctx, bean, data, propertyName, c);
}
-
+
public static class JAXBBeanFactory {
final JAXBContext ctx;
final Class<?> cls;
@@ -331,8 +331,8 @@ public abstract class AbstractBPBeanDefinitionParser {
ctx = c;
cls = c2;
}
-
-
+
+
public Object createJAXBBean(String v) {
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new StringReader(v));
try {
@@ -354,10 +354,10 @@ public abstract class AbstractBPBeanDefinitionParser {
}
protected void mapElementToJaxbProperty(ParserContext ctx,
- MutableBeanMetadata bean,
- Element data,
- String propertyName,
- Class<?> c) {
+ MutableBeanMetadata bean,
+ Element data,
+ String propertyName,
+ Class<?> c) {
try {
XMLStreamWriter xmlWriter = null;
Unmarshaller u = null;
@@ -366,8 +366,8 @@ public abstract class AbstractBPBeanDefinitionParser {
xmlWriter = StaxUtils.createXMLStreamWriter(writer);
StaxUtils.copy(data, xmlWriter);
xmlWriter.flush();
-
-
+
+
MutableBeanMetadata factory = ctx.createMetadata(MutableBeanMetadata.class);
factory.setClassName(c.getName());
factory.setFactoryComponent(createPassThrough(ctx, new JAXBBeanFactory(getContext(c), c)));
@@ -375,7 +375,7 @@ public abstract class AbstractBPBeanDefinitionParser {
factory.addArgument(createValue(ctx, writer.toString()), String.class.getName(), 0);
bean.addProperty(propertyName, factory);
- } catch (Exception ex) {
+ } catch (Exception ex) {
u = getContext(c).createUnmarshaller();
u.setEventHandler(null);
Object obj;
@@ -401,7 +401,7 @@ public abstract class AbstractBPBeanDefinitionParser {
throw new RuntimeException("Could not parse configuration.", e);
}
}
-
+
protected synchronized JAXBContext getContext(Class<?> cls) {
if (jaxbContext == null || jaxbClasses == null || !jaxbClasses.contains(cls)) {
@@ -410,9 +410,9 @@ public abstract class AbstractBPBeanDefinitionParser {
if (jaxbClasses != null) {
tmp.addAll(jaxbClasses);
}
- JAXBContextCache.addPackage(tmp, PackageUtils.getPackageName(cls),
- cls == null
- ? getClass().getClassLoader()
+ JAXBContextCache.addPackage(tmp, PackageUtils.getPackageName(cls),
+ cls == null
+ ? getClass().getClassLoader()
: cls.getClassLoader());
if (cls != null) {
boolean hasOf = false;
@@ -427,7 +427,7 @@ public abstract class AbstractBPBeanDefinitionParser {
}
}
JAXBContextCache.scanPackages(tmp);
- CachedContextAndSchemas ccs
+ CachedContextAndSchemas ccs
= JAXBContextCache.getCachedContextAndSchemas(tmp, null, null, null, false);
jaxbClasses = ccs.getClasses();
jaxbContext = ccs.getContext();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java
index fca633c..b5ecba9 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/InterceptorTypeConverter.java
@@ -24,14 +24,14 @@ import org.osgi.service.blueprint.container.Converter;
import org.osgi.service.blueprint.container.ReifiedType;
/**
- *
+ *
*/
public class InterceptorTypeConverter implements Converter {
/** {@inheritDoc}*/
public boolean canConvert(Object sourceObject, ReifiedType targetType) {
return sourceObject instanceof Interceptor
- && targetType.getRawClass().isInstance(sourceObject);
+ && targetType.getRawClass().isInstance(sourceObject);
}
/** {@inheritDoc}*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java
index 77ce8b3..9eae7d7 100644
--- a/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/blueprint/SimpleBPBeanDefinitionParser.java
@@ -27,11 +27,11 @@ import org.osgi.service.blueprint.reflect.BeanProperty;
import org.osgi.service.blueprint.reflect.Metadata;
/**
- *
+ *
*/
public class SimpleBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser {
protected Class<?> cls;
-
+
public SimpleBPBeanDefinitionParser(Class<?> cls) {
this.cls = cls;
}
@@ -42,20 +42,20 @@ public class SimpleBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser
public String getFactoryCreateType(Element element) {
return null;
}
-
+
public String getId(Element element, ParserContext context) {
return element.hasAttribute("id") ? element.getAttribute("id") : null;
}
-
+
public Metadata parse(Element element, ParserContext context) {
-
+
MutableBeanMetadata cxfBean = context.createMetadata(MutableBeanMetadata.class);
cxfBean.setRuntimeClass(cls);
String fact = getFactorySuffix();
if (fact == null) {
cxfBean.setId(getId(element, context));
} else {
- cxfBean.setId(getId(element, context) + fact);
+ cxfBean.setId(getId(element, context) + fact);
}
parseAttributes(element, context, cxfBean);
parseChildElements(element, context, cxfBean);
@@ -72,7 +72,7 @@ public class SimpleBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser
}
if (fact != null) {
context.getComponentDefinitionRegistry().registerComponentDefinition(cxfBean);
-
+
MutableBeanMetadata bean = context.createMetadata(MutableBeanMetadata.class);
bean.setId(getId(element, context));
bean.setFactoryComponent(cxfBean);
@@ -83,5 +83,5 @@ public class SimpleBPBeanDefinitionParser extends AbstractBPBeanDefinitionParser
return cxfBean;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
index 4e52018..24e162d 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/SSLUtils.java
@@ -65,10 +65,10 @@ public final class SSLUtils {
private static final String CERTIFICATE_FACTORY_TYPE = "X.509";
private static final String HTTPS_CIPHER_SUITES = "https.cipherSuites";
-
+
private static final boolean DEFAULT_REQUIRE_CLIENT_AUTHENTICATION = false;
private static final boolean DEFAULT_WANT_CLIENT_AUTHENTICATION = true;
-
+
private static final List<String> DEFAULT_CIPHERSUITE_FILTERS_INCLUDE =
Arrays.asList(new String[] {".*"});
/**
@@ -79,12 +79,12 @@ public final class SSLUtils {
".*_anon_.*",
".*_EXPORT_.*",
".*_DES_.*"});
-
+
private static volatile KeyManager[] defaultManagers;
private SSLUtils() {
- }
-
+ }
+
public static KeyManager[] getKeyStoreManagers(
String keyStoreLocation,
String keyStoreType,
@@ -95,24 +95,24 @@ public final class SSLUtils {
Logger log)
throws Exception {
//TODO for performance reasons we should cache
- // the KeymanagerFactory and TrustManagerFactory
+ // the KeymanagerFactory and TrustManagerFactory
if (keyStorePassword != null
- && keyPassword != null
+ && keyPassword != null
&& !keyStorePassword.equals(keyPassword)) {
LogUtils.log(log,
Level.WARNING,
"KEY_PASSWORD_NOT_SAME_KEYSTORE_PASSWORD");
}
- KeyManager[] keystoreManagers = null;
- KeyManagerFactory kmf =
- KeyManagerFactory.getInstance(keyStoreMgrFactoryAlgorithm);
+ KeyManager[] keystoreManagers = null;
+ KeyManagerFactory kmf =
+ KeyManagerFactory.getInstance(keyStoreMgrFactoryAlgorithm);
KeyStore ks = KeyStore.getInstance(keyStoreType);
-
+
if (keyStoreType.equalsIgnoreCase(PKCS12_TYPE)) {
Path path = FileSystems.getDefault().getPath(keyStoreLocation);
byte[] bytes = Files.readAllBytes(path);
try (ByteArrayInputStream bin = new ByteArrayInputStream(bytes)) {
-
+
if (keyStorePassword != null) {
keystoreManagers = loadKeyStore(kmf,
ks,
@@ -122,9 +122,9 @@ public final class SSLUtils {
log);
}
}
- } else {
+ } else {
byte[] sslCert = loadFile(keyStoreLocation);
-
+
if (sslCert != null && sslCert.length > 0 && keyStorePassword != null) {
try (ByteArrayInputStream bin = new ByteArrayInputStream(sslCert)) {
keystoreManagers = loadKeyStore(kmf,
@@ -134,11 +134,11 @@ public final class SSLUtils {
keyStorePassword,
log);
}
- }
+ }
}
if (keyStorePassword == null && keyStoreLocation != null) {
LogUtils.log(log, Level.WARNING,
- "FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD",
+ "FAILED_TO_LOAD_KEYSTORE_NULL_PASSWORD",
keyStoreLocation);
}
return keystoreManagers;
@@ -153,24 +153,24 @@ public final class SSLUtils {
}
return defaultManagers;
}
-
+
private static synchronized void loadDefaultKeyManagers(Logger log) {
if (defaultManagers != null) {
return;
}
-
+
String location = getKeystore(null, log);
String keyStorePassword = getKeystorePassword(null, log);
String keyPassword = getKeyPassword(null, log);
FileInputStream fis = null;
-
+
try {
File file = new File(location);
if (file.exists()) {
- KeyManagerFactory kmf =
- KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ KeyManagerFactory kmf =
+ KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-
+
fis = new FileInputStream(file);
ks.load(fis, (keyStorePassword != null) ? keyStorePassword.toCharArray() : null);
kmf.init(ks, (keyPassword != null) ? keyPassword.toCharArray() : null);
@@ -211,9 +211,9 @@ public final class SSLUtils {
} catch (Exception e) {
LogUtils.log(log,
Level.WARNING,
- "FAILED_TO_LOAD_KEYSTORE",
+ "FAILED_TO_LOAD_KEYSTORE",
new Object[]{keyStoreLocation, e.getMessage()});
- }
+ }
return keystoreManagers;
}
@@ -225,12 +225,12 @@ public final class SSLUtils {
Logger log)
throws Exception {
// ********************** Load Trusted CA file **********************
-
+
KeyStore trustedCertStore = KeyStore.getInstance(trustStoreType);
if (pkcs12) {
//TODO could support multiple trust cas
-
+
trustedCertStore.load(null, "".toCharArray());
CertificateFactory cf = CertificateFactory.getInstance(CERTIFICATE_FACTORY_TYPE);
byte[] caCert = loadFile(trustStoreLocation);
@@ -242,22 +242,22 @@ public final class SSLUtils {
}
}
} catch (Exception e) {
- LogUtils.log(log, Level.WARNING, "FAILED_TO_LOAD_TRUST_STORE",
+ LogUtils.log(log, Level.WARNING, "FAILED_TO_LOAD_TRUST_STORE",
new Object[]{trustStoreLocation, e.getMessage()});
- }
+ }
} else {
try (FileInputStream trustStoreInputStream = new FileInputStream(trustStoreLocation)) {
trustedCertStore.load(trustStoreInputStream, null);
}
}
-
- TrustManagerFactory tmf =
+
+ TrustManagerFactory tmf =
TrustManagerFactory.getInstance(trustStoreMgrFactoryAlgorithm);
tmf.init(trustedCertStore);
LogUtils.log(log, Level.FINE, "LOADED_TRUST_STORE", trustStoreLocation);
return tmf.getTrustManagers();
}
-
+
protected static byte[] loadFile(String fileName) throws IOException {
if (fileName == null) {
return null;
@@ -283,11 +283,11 @@ public final class SSLUtils {
LogUtils.log(log, Level.FINE, logMsg, keyStoreLocation);
return keyStoreLocation;
}
-
+
public static String getKeystoreType(String keyStoreType, Logger log) {
return getKeystoreType(keyStoreType, log, DEFAULT_KEYSTORE_TYPE);
}
-
+
public static String getKeystoreType(String keyStoreType, Logger log, String def) {
String logMsg = null;
if (keyStoreType != null) {
@@ -298,13 +298,13 @@ public final class SSLUtils {
keyStoreType = def;
logMsg = "KEY_STORE_TYPE_NOT_SET";
} else {
- logMsg = "KEY_STORE_TYPE_SYSTEM_SET";
+ logMsg = "KEY_STORE_TYPE_SYSTEM_SET";
}
}
LogUtils.log(log, Level.FINE, logMsg, keyStoreType);
return keyStoreType;
}
-
+
public static String getKeystoreProvider(String keyStoreProvider, Logger log) {
String logMsg = null;
if (keyStoreProvider != null) {
@@ -314,13 +314,13 @@ public final class SSLUtils {
if (keyStoreProvider == null) {
logMsg = "KEY_STORE_PROVIDER_NOT_SET";
} else {
- logMsg = "KEY_STORE_PROVIDER_SYSTEM_SET";
+ logMsg = "KEY_STORE_PROVIDER_SYSTEM_SET";
}
}
LogUtils.log(log, Level.FINE, logMsg, keyStoreProvider);
return keyStoreProvider;
- }
-
+ }
+
public static String getKeystorePassword(String keyStorePassword,
Logger log) {
String logMsg = null;
@@ -334,9 +334,9 @@ public final class SSLUtils {
: "KEY_STORE_PASSWORD_NOT_SET";
}
LogUtils.log(log, Level.FINE, logMsg);
- return keyStorePassword;
+ return keyStorePassword;
}
-
+
public static String getKeyPassword(String keyPassword, Logger log) {
String logMsg = null;
if (keyPassword != null) {
@@ -369,8 +369,8 @@ public final class SSLUtils {
}
LogUtils.log(log, Level.FINE, logMsg, keyStoreMgrFactoryAlgorithm);
return keyStoreMgrFactoryAlgorithm;
- }
-
+ }
+
public static String getTrustStoreAlgorithm(
String trustStoreMgrFactoryAlgorithm,
Logger log) {
@@ -384,8 +384,8 @@ public final class SSLUtils {
}
LogUtils.log(log, Level.FINE, logMsg, trustStoreMgrFactoryAlgorithm);
return trustStoreMgrFactoryAlgorithm;
- }
-
+ }
+
public static SSLContext getSSLContext(String protocol,
KeyManager[] keyStoreManagers,
TrustManager[] trustStoreManagers)
@@ -394,7 +394,7 @@ public final class SSLUtils {
ctx.init(keyStoreManagers, trustStoreManagers, null);
return ctx;
}
-
+
public static String[] getSupportedCipherSuites(SSLContext context) {
return context.getSocketFactory().getSupportedCipherSuites();
}
@@ -402,7 +402,7 @@ public final class SSLUtils {
public static String[] getServerSupportedCipherSuites(SSLContext context) {
return context.getServerSocketFactory().getSupportedCipherSuites();
}
-
+
public static String[] getCiphersuitesToInclude(List<String> cipherSuitesList,
FiltersType filters,
String[] defaultCipherSuites,
@@ -416,25 +416,25 @@ public final class SSLUtils {
if (!(cipherSuitesList == null || cipherSuitesList.isEmpty())) {
return getCiphersFromList(cipherSuitesList, log, false);
}
-
+
String[] cipherSuites = getSystemCiphersuites(log);
if (cipherSuites != null) {
return cipherSuites;
}
- // If we have no explicit cipherSuites (for the include case as above), and no filters,
+ // If we have no explicit cipherSuites (for the include case as above), and no filters,
// then just use the defaults
if ((defaultCipherSuites != null && defaultCipherSuites.length != 0)
&& (filters == null || !(filters.isSetInclude() || filters.isSetExclude()))) {
- LogUtils.log(log, Level.FINE, "CIPHERSUITES_SET", defaultCipherSuites.toString());
+ LogUtils.log(log, Level.FINE, "CIPHERSUITES_SET", defaultCipherSuites.toString());
return defaultCipherSuites;
}
-
+
LogUtils.log(log, Level.FINE, "CIPHERSUITES_NOT_SET");
-
+
return getFilteredCiphersuites(filters, supportedCipherSuites, log, false);
}
-
+
public static String[] getFilteredCiphersuites(FiltersType filters,
String[] supportedCipherSuites,
Logger log, boolean exclude) {
@@ -488,9 +488,9 @@ public final class SSLUtils {
} else {
return null;
}
-
+
}
-
+
private static List<Pattern> compileRegexPatterns(List<String> regexes,
boolean include,
Logger log) {
@@ -506,7 +506,7 @@ public final class SSLUtils {
}
return patterns;
}
-
+
private static boolean matchesOneOf(String s, List<Pattern> patterns) {
boolean matches = false;
if (patterns != null) {
@@ -520,9 +520,9 @@ public final class SSLUtils {
}
return matches;
}
-
+
private static String[] getCiphersFromList(List<String> cipherSuitesList,
- Logger log,
+ Logger log,
boolean exclude) {
int numCipherSuites = cipherSuitesList.size();
String[] cipherSuites = cipherSuitesList.toArray(new String[numCipherSuites]);
@@ -534,17 +534,17 @@ public final class SSLUtils {
}
ciphsStr.append(s);
}
- LogUtils.log(log, Level.FINE,
- exclude ? "CIPHERSUITES_EXCLUDED" : "CIPHERSUITES_SET", ciphsStr.toString());
+ LogUtils.log(log, Level.FINE,
+ exclude ? "CIPHERSUITES_EXCLUDED" : "CIPHERSUITES_SET", ciphsStr.toString());
}
return cipherSuites;
}
-
+
public static String getTrustStore(String trustStoreLocation, Logger log) {
String logMsg = null;
if (trustStoreLocation != null) {
logMsg = "TRUST_STORE_SET";
- } else {
+ } else {
trustStoreLocation = SystemPropertyAction.getProperty("javax.net.ssl.trustStore");
if (trustStoreLocation != null) {
logMsg = "TRUST_STORE_SYSTEM_PROPERTY_SET";
@@ -557,7 +557,7 @@ public final class SSLUtils {
LogUtils.log(log, Level.FINE, logMsg, trustStoreLocation);
return trustStoreLocation;
}
-
+
public static String getTrustStoreType(String trustStoreType, Logger log) {
String logMsg = null;
if (trustStoreType != null) {
@@ -565,7 +565,7 @@ public final class SSLUtils {
} else {
//Can default to JKS
trustStoreType = SystemPropertyAction.getProperty("javax.net.ssl.trustStoreType");
- if (trustStoreType == null) {
+ if (trustStoreType == null) {
trustStoreType = DEFAULT_TRUST_STORE_TYPE;
logMsg = "TRUST_STORE_TYPE_NOT_SET";
} else {
@@ -575,7 +575,7 @@ public final class SSLUtils {
LogUtils.log(log, Level.FINE, logMsg, trustStoreType);
return trustStoreType;
}
-
+
public static String getSecureSocketProtocol(String secureSocketProtocol,
Logger log) {
if (secureSocketProtocol != null) {
@@ -589,7 +589,7 @@ public final class SSLUtils {
}
return secureSocketProtocol;
}
-
+
public static boolean getRequireClientAuthentication(
boolean isSetRequireClientAuthentication,
Boolean isRequireClientAuthentication,
@@ -601,7 +601,7 @@ public final class SSLUtils {
isRequireClientAuthentication.booleanValue();
LogUtils.log(log,
Level.FINE,
- "REQUIRE_CLIENT_AUTHENTICATION_SET",
+ "REQUIRE_CLIENT_AUTHENTICATION_SET",
requireClientAuthentication);
} else {
LogUtils.log(log,
@@ -610,7 +610,7 @@ public final class SSLUtils {
}
return requireClientAuthentication;
}
-
+
public static boolean getWantClientAuthentication(
boolean isSetWantClientAuthentication,
Boolean isWantClientAuthentication,
@@ -622,18 +622,18 @@ public final class SSLUtils {
isWantClientAuthentication.booleanValue();
LogUtils.log(log,
Level.FINE,
- "WANT_CLIENT_AUTHENTICATION_SET",
+ "WANT_CLIENT_AUTHENTICATION_SET",
wantClientAuthentication);
} else {
LogUtils.log(log,
Level.WARNING,
"WANT_CLIENT_AUTHENTICATION_NOT_SET");
- }
+ }
return wantClientAuthentication;
- }
-
+ }
+
+
-
public static void logUnSupportedPolicies(Object policy,
boolean client,
String[] unsupported,
@@ -649,7 +649,7 @@ public final class SSLUtils {
}
}
}
-
+
private static void logUnSupportedPolicy(boolean isSet,
boolean client,
String policy,
@@ -661,20 +661,20 @@ public final class SSLUtils {
? "UNSUPPORTED_SSL_CLIENT_POLICY_DATA"
: "UNSUPPORTED_SSL_SERVER_POLICY_DATA",
policy);
- }
+ }
}
-
+
public static boolean testAllDataHasSetupMethod(Object policy,
String[] unsupported,
String[] derivative) {
Method[] sslPolicyMethods = policy.getClass().getDeclaredMethods();
Method[] methods = SSLUtils.class.getMethods();
boolean ok = true;
-
+
for (int i = 0; i < sslPolicyMethods.length && ok; i++) {
String sslPolicyMethodName = sslPolicyMethods[i].getName();
if (sslPolicyMethodName.startsWith("isSet")) {
- String dataName =
+ String dataName =
sslPolicyMethodName.substring("isSet".length(),
sslPolicyMethodName.length());
String thisMethodName = "get" + dataName;
@@ -685,7 +685,7 @@ public final class SSLUtils {
}
return ok;
}
-
+
private static boolean hasMethod(Method[] methods, String methodName) {
boolean found = false;
for (int i = 0; i < methods.length && !found; i++) {
@@ -693,7 +693,7 @@ public final class SSLUtils {
}
return found;
}
-
+
private static boolean isExcluded(String[] excluded,
String dataName) {
boolean found = false;
@@ -701,6 +701,6 @@ public final class SSLUtils {
found = excluded[i].equals(dataName);
}
return found;
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
index cfc6b2d..f880e53 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
@@ -26,7 +26,7 @@ import javax.net.ssl.SSLSocketFactory;
/**
* This class extends {@link TLSParameterBase} with client-specific
* SSL/TLS parameters.
- *
+ *
*/
public class TLSClientParameters extends TLSParameterBase {
private boolean disableCNCheck;
@@ -35,26 +35,26 @@ public class TLSClientParameters extends TLSParameterBase {
private boolean useHttpsURLConnectionDefaultSslSocketFactory;
private boolean useHttpsURLConnectionDefaultHostnameVerifier;
private HostnameVerifier hostnameVerifier;
-
+
/**
* Set custom HostnameVerifier
* @param verifier hostname verifier
*/
public void setHostnameVerifier(HostnameVerifier verifier) {
- hostnameVerifier = verifier;
+ hostnameVerifier = verifier;
}
-
+
/**
* Get custom HostnameVerifier
* @return hostname verifier
*/
public HostnameVerifier getHostnameVerifier() {
- return hostnameVerifier;
+ return hostnameVerifier;
}
/**
* Set whether or not JSEE should omit checking if the host name
* specified in the URL matches that of the Common Name
- * (CN) on the server's certificate. Default is false;
+ * (CN) on the server's certificate. Default is false;
* this attribute should not be set to true during production use.
*/
public void setDisableCNCheck(boolean disableCNCheck) {
@@ -85,7 +85,7 @@ public class TLSClientParameters extends TLSParameterBase {
public final SSLSocketFactory getSSLSocketFactory() {
return sslSocketFactory;
}
-
+
/**
* Returns the SSL cache timeout in seconds if it has been configured or the default value
*/
@@ -100,7 +100,7 @@ public class TLSClientParameters extends TLSParameterBase {
this.sslCacheTimeout = sslCacheTimeout;
}
-
+
/**
* Returns whether or not {@link javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()} should be
* used to create https connections. If <code>true</code> , {@link #getJsseProvider()} ,
@@ -115,7 +115,7 @@ public class TLSClientParameters extends TLSParameterBase {
/**
* Sets whether or not {@link javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory()} should be
* used to create https connections.
- *
+ *
* @see #isUseHttpsURLConnectionDefaultSslSocketFactory()
*/
public void setUseHttpsURLConnectionDefaultSslSocketFactory(
@@ -134,14 +134,14 @@ public class TLSClientParameters extends TLSParameterBase {
/**
* Sets whether or not {@link javax.net.ssl.HttpsURLConnection#getDefaultHostnameVerifier()} should be
* used to create https connections.
- *
+ *
* @see #isUseHttpsURLConnectionDefaultHostnameVerifier()
*/
public void setUseHttpsURLConnectionDefaultHostnameVerifier(
boolean useHttpsURLConnectionDefaultHostnameVerifier) {
this.useHttpsURLConnectionDefaultHostnameVerifier = useHttpsURLConnectionDefaultHostnameVerifier;
}
-
+
public int hashCode() {
int hash = disableCNCheck ? 37 : 17;
if (sslSocketFactory != null) {
@@ -184,7 +184,7 @@ public class TLSClientParameters extends TLSParameterBase {
}
return i;
}
-
+
public boolean equals(Object o) {
if (o == this) {
return true;
@@ -215,7 +215,7 @@ public class TLSClientParameters extends TLSParameterBase {
}
if (certConstraints != null) {
if (that.certConstraints != null) {
- eq &= equals(certConstraints.getIssuerDNConstraints(),
+ eq &= equals(certConstraints.getIssuerDNConstraints(),
that.certConstraints.getIssuerDNConstraints());
eq &= equals(certConstraints.getSubjectDNConstraints(),
that.certConstraints.getSubjectDNConstraints());
@@ -229,7 +229,7 @@ public class TLSClientParameters extends TLSParameterBase {
}
return false;
}
-
+
private static boolean equals(final List<?> obj1, final List<?> obj2) {
if (obj1.size() == obj2.size()) {
for (int x = 0; x < obj1.size(); x++) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
index e67571b..4086e10 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSClientParametersConfig.java
@@ -50,18 +50,18 @@ import org.apache.cxf.staxutils.StaxUtils;
public final class TLSClientParametersConfig {
private static Set<Class<?>> classes;
private static JAXBContext context;
-
+
private TLSClientParametersConfig() {
//not constructed
}
-
+
private static synchronized JAXBContext getContext() throws JAXBException {
if (context == null || classes == null) {
Set<Class<?>> c2 = new HashSet<Class<?>>();
- JAXBContextCache.addPackage(c2,
- PackageUtils.getPackageName(TLSClientParametersType.class),
+ JAXBContextCache.addPackage(c2,
+ PackageUtils.getPackageName(TLSClientParametersType.class),
TLSClientParametersConfig.class.getClassLoader());
- CachedContextAndSchemas ccs
+ CachedContextAndSchemas ccs
= JAXBContextCache.getCachedContextAndSchemas(c2, null, null, null, false);
classes = ccs.getClasses();
context = ccs.getContext();
@@ -69,18 +69,18 @@ public final class TLSClientParametersConfig {
return context;
}
- public static TLSClientParameters createTLSClientParametersFromType(TLSClientParametersType params)
+ public static TLSClientParameters createTLSClientParametersFromType(TLSClientParametersType params)
throws GeneralSecurityException,
IOException {
- TLSClientParameters ret = new TLSClientParameters();
+ TLSClientParameters ret = new TLSClientParameters();
boolean usingDefaults = params.isUseHttpsURLConnectionDefaultSslSocketFactory();
TLSClientParametersTypeInternal iparams = null;
if (params instanceof TLSClientParametersTypeInternal) {
iparams = (TLSClientParametersTypeInternal)params;
}
-
+
if (params.isDisableCNCheck()) {
ret.setDisableCNCheck(true);
}
@@ -133,15 +133,15 @@ public final class TLSClientParametersConfig {
}
return ret;
}
-
+
public static Object createTLSClientParameters(String s) {
-
+
StringReader reader = new StringReader(s);
XMLStreamReader data = StaxUtils.createXMLStreamReader(reader);
try {
- JAXBElement<TLSClientParametersType> type = JAXBUtils.unmarshall(getContext(),
+ JAXBElement<TLSClientParametersType> type = JAXBUtils.unmarshall(getContext(),
data,
TLSClientParametersType.class);
TLSClientParametersType cpt = type.getValue();
@@ -158,7 +158,7 @@ public final class TLSClientParametersConfig {
}
}
}
-
+
public static class TLSClientParametersTypeInternal extends TLSClientParametersType {
private KeyManager[] keyManagersRef;
private TrustManager[] trustManagersRef;
@@ -170,7 +170,7 @@ public final class TLSClientParametersConfig {
public void setKeyManagersRef(KeyManager[] keyManagersRef) {
this.keyManagersRef = keyManagersRef;
}
-
+
public boolean isSetKeyManagersRef() {
return this.keyManagersRef != null;
}
@@ -182,7 +182,7 @@ public final class TLSClientParametersConfig {
public void setTrustManagersRef(TrustManager[] trustManagersRef) {
this.trustManagersRef = trustManagersRef;
}
-
+
public boolean isSetTrustManagersRef() {
return this.trustManagersRef != null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java
index b3d7e99..b379f5e 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterBase.java
@@ -48,10 +48,10 @@ public class TLSParameterBase {
*/
public final void setJsseProvider(String prov) {
provider = prov;
- }
+ }
/**
- * Return the JSSE provider.
+ * Return the JSSE provider.
*/
public String getJsseProvider() {
return provider;
@@ -79,7 +79,7 @@ public class TLSParameterBase {
public final void setTrustManagers(TrustManager[] trustMgrs) {
trustManagers = trustMgrs;
}
-
+
/**
* Returns the TrustManagers associated with the endpoint.
*/
@@ -94,7 +94,7 @@ public class TLSParameterBase {
public final void setCipherSuites(List<String> cs) {
ciphersuites = cs;
}
-
+
/**
* Returns the CipherSuites associated with this endpoint.
*/
@@ -106,15 +106,15 @@ public class TLSParameterBase {
}
/**
- * This parameter sets the filter to include and/or exclude the
+ * This parameter sets the filter to include and/or exclude the
* cipher suites to use from the set list or system defaults.
*/
public final void setCipherSuitesFilter(FiltersType filters) {
cipherSuiteFilters = filters;
}
-
+
/**
- * Returns the cipher suites filter
+ * Returns the cipher suites filter
*/
public FiltersType getCipherSuitesFilter() {
return cipherSuiteFilters;
@@ -127,14 +127,14 @@ public class TLSParameterBase {
public final void setSecureRandom(SecureRandom random) {
secureRandom = random;
}
-
+
/**
* Get the certificate constraints type
*/
public CertificateConstraintsType getCertConstraints() {
return certConstraints;
}
-
+
/**
* Set the certificate constraints type
*/
@@ -164,7 +164,7 @@ public class TLSParameterBase {
public String getSecureSocketProtocol() {
return protocol;
}
-
+
/**
* This parameter configures the cert alias used on server side
* this is useful when keystore has multiple certs
@@ -172,7 +172,7 @@ public class TLSParameterBase {
public final void setCertAlias(String ctAlias) {
certAlias = ctAlias;
}
-
+
/**
* This parameter retrieves the cert alias specified on server side
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index e8743b7..644a1e9 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -117,7 +117,7 @@ public final class TLSParameterJaxBUtils {
password = tmp.toCharArray();
}
}
- String provider = SSLUtils.getKeystoreProvider(kst.isSetProvider()
+ String provider = SSLUtils.getKeystoreProvider(kst.isSetProvider()
? kst.getProvider() : null,
LOG);
KeyStore keyStore = provider == null
@@ -196,7 +196,7 @@ public final class TLSParameterJaxBUtils {
}
return is;
}
-
+
/**
* Create a KeyStore containing the trusted CA certificates contained
* in the supplied input stream.
@@ -246,8 +246,8 @@ public final class TLSParameterJaxBUtils {
}
return new String(b, 0, l).toCharArray();
- }
-
+ }
+
/**
* This method converts the JAXB KeyManagersType into a list of
* JSSE KeyManagers.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
index 0a2f3ac..9ba48d7 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParameters.java
@@ -26,14 +26,14 @@ import org.apache.cxf.configuration.security.ClientAuthentication;
/**
* This class extends {@link TLSParameterBase} with service-specific
* SSL/TLS parameters.
- *
+ *
*/
public class TLSServerParameters extends TLSParameterBase {
ClientAuthentication clientAuthentication;
List<String> excludeProtocols = new ArrayList<>();
List<String> includeProtocols = new ArrayList<>();
-
+
/**
* This parameter configures the server side to request and/or
* require client authentication.
@@ -48,14 +48,14 @@ public class TLSServerParameters extends TLSParameterBase {
public ClientAuthentication getClientAuthentication() {
return clientAuthentication;
}
-
+
/**
* This parameter sets the protocol list to exclude.
*/
public final void setExcludeProtocols(List<String> protocols) {
excludeProtocols = protocols;
}
-
+
/**
* Returns the protocols to exclude that are associated with this endpoint.
*/
@@ -65,14 +65,14 @@ public class TLSServerParameters extends TLSParameterBase {
}
return excludeProtocols;
}
-
+
/**
* This parameter sets the protocol list to include.
*/
public final void setIncludeProtocols(List<String> protocols) {
includeProtocols = protocols;
}
-
+
/**
* Returns the protocols to include that are associated with this endpoint.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
index 137e80d..bade93e 100644
--- a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
+++ b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSServerParametersConfig.java
@@ -33,18 +33,18 @@ import org.apache.cxf.configuration.security.TLSServerParametersType;
* configuration of the http-destination.
*/
@NoJSR250Annotations
-public class TLSServerParametersConfig
+public class TLSServerParametersConfig
extends TLSServerParameters {
- public TLSServerParametersConfig(TLSServerParametersType params)
+ public TLSServerParametersConfig(TLSServerParametersType params)
throws GeneralSecurityException,
IOException {
-
+
TLSServerParametersTypeInternal iparams = null;
if (params instanceof TLSServerParametersTypeInternal) {
iparams = (TLSServerParametersTypeInternal)params;
}
-
+
if (params.isSetSecureSocketProtocol()) {
this.setSecureSocketProtocol(params.getSecureSocketProtocol());
}
@@ -105,7 +105,7 @@ public class TLSServerParametersConfig
public void setKeyManagersRef(KeyManager[] keyManagersRef) {
this.keyManagersRef = keyManagersRef;
}
-
+
public boolean isSetKeyManagersRef() {
return this.keyManagersRef != null;
}
@@ -117,11 +117,11 @@ public class TLSServerParametersConfig
public void setTrustManagersRef(TrustManager[] trustManagersRef) {
this.trustManagersRef = trustManagersRef;
}
-
+
public boolean isSetTrustManagersRef() {
return this.trustManagersRef != null;
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
index e6e55de..431a72a 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
@@ -54,54 +54,54 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate;
import org.springframework.beans.factory.xml.ParserContext;
-public abstract class AbstractBeanDefinitionParser
+public abstract class AbstractBeanDefinitionParser
extends org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser {
public static final String WIRE_BUS_ATTRIBUTE = AbstractBeanDefinitionParser.class.getName() + ".wireBus";
public static final String WIRE_BUS_NAME = AbstractBeanDefinitionParser.class.getName() + ".wireBusName";
- public static final String WIRE_BUS_CREATE
+ public static final String WIRE_BUS_CREATE
= AbstractBeanDefinitionParser.class.getName() + ".wireBusCreate";
- public static final String WIRE_BUS_HANDLER
+ public static final String WIRE_BUS_HANDLER
= "org.apache.cxf.bus.spring.BusWiringBeanFactoryPostProcessor";
private static final Logger LOG = LogUtils.getL7dLogger(AbstractBeanDefinitionParser.class);
-
+
private Class<?> beanClass;
private JAXBContext context;
private Set<Class<?>> classes;
public AbstractBeanDefinitionParser() {
}
-
+
@Override
protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
- boolean setBus = parseAttributes(element, ctx, bean);
+ boolean setBus = parseAttributes(element, ctx, bean);
if (!setBus && hasBusProperty()) {
addBusWiringAttribute(bean, BusWiringType.PROPERTY);
}
parseChildElements(element, ctx, bean);
}
-
+
protected boolean parseAttributes(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
NamedNodeMap atts = element.getAttributes();
boolean setBus = false;
for (int i = 0; i < atts.getLength(); i++) {
Attr node = (Attr) atts.item(i);
-
+
setBus |= parseAttribute(element, node, ctx, bean);
}
return setBus;
}
- protected boolean parseAttribute(Element element, Attr node,
+ protected boolean parseAttribute(Element element, Attr node,
ParserContext ctx, BeanDefinitionBuilder bean) {
String val = node.getValue();
String pre = node.getPrefix();
String name = node.getLocalName();
String prefix = node.getPrefix();
-
+
// Don't process namespaces
if (isNamespace(name, prefix)) {
return false;
}
-
+
if ("createdFromAPI".equals(name)) {
bean.setAbstract(true);
} else if ("abstract".equals(name)) {
@@ -118,8 +118,8 @@ public abstract class AbstractBeanDefinitionParser
return false;
}
-
- protected boolean processBusAttribute(Element element, ParserContext ctx,
+
+ protected boolean processBusAttribute(Element element, ParserContext ctx,
BeanDefinitionBuilder bean,
String val) {
if (val != null && val.trim().length() > 0) {
@@ -129,7 +129,7 @@ public abstract class AbstractBeanDefinitionParser
addBusWiringAttribute(bean, BusWiringType.PROPERTY,
val, ctx);
}
- return true;
+ return true;
}
return false;
}
@@ -144,13 +144,13 @@ public abstract class AbstractBeanDefinitionParser
private boolean isNamespace(String name, String prefix) {
return "xmlns".equals(prefix) || prefix == null && "xmlns".equals(name);
}
-
+
protected void parseChildElements(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
Element el = DOMUtils.getFirstElement(element);
while (el != null) {
String name = el.getLocalName();
mapElement(ctx, bean, el, name);
- el = DOMUtils.getNextElement(el);
+ el = DOMUtils.getNextElement(el);
}
}
@@ -174,46 +174,46 @@ public abstract class AbstractBeanDefinitionParser
protected void mapAttribute(BeanDefinitionBuilder bean, String name, String val) {
mapToProperty(bean, name, val);
}
-
+
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element e, String name) {
}
-
+
@Override
- protected String resolveId(Element elem, AbstractBeanDefinition definition,
+ protected String resolveId(Element elem, AbstractBeanDefinition definition,
ParserContext ctx) throws BeanDefinitionStoreException {
-
+
// REVISIT: use getAttributeNS instead
-
+
String id = getIdOrName(elem);
String createdFromAPI = elem.getAttribute("createdFromAPI");
-
+
if (null == id || "".equals(id)) {
return super.resolveId(elem, definition, ctx);
- }
-
+ }
+
if (createdFromAPI != null && "true".equals(createdFromAPI.toLowerCase())) {
return id + getSuffix();
}
- return id;
+ return id;
}
protected boolean hasBusProperty() {
return false;
}
-
+
protected String getSuffix() {
return "";
}
- protected void setFirstChildAsProperty(Element element, ParserContext ctx,
+ protected void setFirstChildAsProperty(Element element, ParserContext ctx,
BeanDefinitionBuilder bean, String propertyName) {
Element first = getFirstChild(element);
-
+
if (first == null) {
throw new IllegalStateException(propertyName + " property must have child elements!");
}
-
+
String id;
BeanDefinition child;
if (first.getNamespaceURI().equals(BeanDefinitionParserDelegate.BEANS_NAMESPACE_URI)) {
@@ -231,9 +231,9 @@ public abstract class AbstractBeanDefinitionParser
bean.addPropertyValue(propertyName, child);
return;
} else {
- throw new UnsupportedOperationException("Elements with the name " + name
+ throw new UnsupportedOperationException("Elements with the name " + name
+ " are not currently "
- + "supported as sub elements of "
+ + "supported as sub elements of "
+ element.getLocalName());
}
}
@@ -245,12 +245,12 @@ public abstract class AbstractBeanDefinitionParser
return DOMUtils.getFirstElement(element);
}
- protected void addBusWiringAttribute(BeanDefinitionBuilder bean,
+ protected void addBusWiringAttribute(BeanDefinitionBuilder bean,
BusWiringType type) {
addBusWiringAttribute(bean, type, null, null);
}
-
- protected void addBusWiringAttribute(BeanDefinitionBuilder bean,
+
+ protected void addBusWiringAttribute(BeanDefinitionBuilder bean,
BusWiringType type,
String busName,
ParserContext ctx) {
@@ -260,31 +260,31 @@ public abstract class AbstractBeanDefinitionParser
if (busName.charAt(0) == '#') {
busName = busName.substring(1);
}
- bean.getRawBeanDefinition().setAttribute(WIRE_BUS_NAME, busName);
+ bean.getRawBeanDefinition().setAttribute(WIRE_BUS_NAME, busName);
}
-
- if (ctx != null
+
+ if (ctx != null
&& !ctx.getRegistry().containsBeanDefinition(WIRE_BUS_HANDLER)) {
- BeanDefinitionBuilder b
+ BeanDefinitionBuilder b
= BeanDefinitionBuilder.rootBeanDefinition(WIRE_BUS_HANDLER);
ctx.getRegistry().registerBeanDefinition(WIRE_BUS_HANDLER, b.getBeanDefinition());
}
}
-
- protected void mapElementToJaxbProperty(Element parent,
- BeanDefinitionBuilder bean,
+
+ protected void mapElementToJaxbProperty(Element parent,
+ BeanDefinitionBuilder bean,
QName name,
String propertyName) {
mapElementToJaxbProperty(parent, bean, name, propertyName, null);
}
-
- protected void mapElementToJaxbProperty(Element parent,
- BeanDefinitionBuilder bean,
+
+ protected void mapElementToJaxbProperty(Element parent,
+ BeanDefinitionBuilder bean,
QName name,
- String propertyName,
+ String propertyName,
Class<?> c) {
Element data = null;
-
+
Node node = parent.getFirstChild();
while (node != null) {
if (node.getNodeType() == Node.ELEMENT_NODE && name.getLocalPart().equals(node.getLocalName())
@@ -308,9 +308,9 @@ public abstract class AbstractBeanDefinitionParser
if (classes != null) {
tmp.addAll(classes);
}
- JAXBContextCache.addPackage(tmp, getJaxbPackage(),
- cls == null
- ? getClass().getClassLoader()
+ JAXBContextCache.addPackage(tmp, getJaxbPackage(),
+ cls == null
+ ? getClass().getClassLoader()
: cls.getClassLoader());
if (cls != null) {
boolean hasOf = false;
@@ -325,7 +325,7 @@ public abstract class AbstractBeanDefinitionParser
}
}
JAXBContextCache.scanPackages(tmp);
- CachedContextAndSchemas ccs
+ CachedContextAndSchemas ccs
= JAXBContextCache.getCachedContextAndSchemas(tmp, null, null, null, false);
classes = ccs.getClasses();
context = ccs.getContext();
@@ -336,9 +336,9 @@ public abstract class AbstractBeanDefinitionParser
return context;
}
- protected void mapElementToJaxbProperty(Element data,
- BeanDefinitionBuilder bean,
- String propertyName,
+ protected void mapElementToJaxbProperty(Element data,
+ BeanDefinitionBuilder bean,
+ String propertyName,
Class<?> c) {
try {
XMLStreamWriter xmlWriter = null;
@@ -348,8 +348,8 @@ public abstract class AbstractBeanDefinitionParser
xmlWriter = StaxUtils.createXMLStreamWriter(writer);
StaxUtils.copy(data, xmlWriter);
xmlWriter.flush();
-
- BeanDefinitionBuilder jaxbbean
+
+ BeanDefinitionBuilder jaxbbean
= BeanDefinitionBuilder.rootBeanDefinition(JAXBBeanFactory.class);
jaxbbean.getRawBeanDefinition().setFactoryMethodName("createJAXBBean");
jaxbbean.addConstructorArgValue(getContext(c));
@@ -382,26 +382,26 @@ public abstract class AbstractBeanDefinitionParser
}
- public void mapElementToJaxbPropertyFactory(Element data,
- BeanDefinitionBuilder bean,
- String propertyName,
+ public void mapElementToJaxbPropertyFactory(Element data,
+ BeanDefinitionBuilder bean,
+ String propertyName,
Class<?> type,
Class<?> factory,
String method,
Object ... args) {
- bean.addPropertyValue(propertyName, mapElementToJaxbBean(data,
+ bean.addPropertyValue(propertyName, mapElementToJaxbBean(data,
factory,
null, type, method, args));
}
- public AbstractBeanDefinition mapElementToJaxbBean(Element data,
+ public AbstractBeanDefinition mapElementToJaxbBean(Element data,
Class<?> cls,
Class<?> factory,
String method,
Object ... args) {
return mapElementToJaxbBean(data, cls, factory, cls, method, args);
- }
+ }
- public AbstractBeanDefinition mapElementToJaxbBean(Element data,
+ public AbstractBeanDefinition mapElementToJaxbBean(Element data,
Class<?> cls,
Class<?> factory,
Class<?> jaxbClass,
@@ -418,7 +418,7 @@ public abstract class AbstractBeanDefinitionParser
StaxUtils.close(xmlWriter);
}
- BeanDefinitionBuilder jaxbbean
+ BeanDefinitionBuilder jaxbbean
= BeanDefinitionBuilder.rootBeanDefinition(cls);
if (factory != null) {
jaxbbean.getRawBeanDefinition().setFactoryBeanName(factory.getName());
@@ -429,11 +429,11 @@ public abstract class AbstractBeanDefinitionParser
if (args != null) {
for (Object o : args) {
jaxbbean.addConstructorArgValue(o);
- }
+ }
}
return jaxbbean.getBeanDefinition();
}
-
+
protected static <T> T unmarshalFactoryString(String s, JAXBContext ctx, Class<T> cls) {
StringReader reader = new StringReader(s);
XMLStreamReader data = StaxUtils.createXMLStreamReader(reader);
@@ -455,7 +455,7 @@ public abstract class AbstractBeanDefinitionParser
JAXBUtils.closeUnmarshaller(u);
}
}
-
+
protected String getJaxbPackage() {
return "";
}
@@ -464,7 +464,7 @@ public abstract class AbstractBeanDefinitionParser
if (ID_ATTRIBUTE.equals(propertyName)) {
return;
}
-
+
if (!StringUtils.isEmpty(val)) {
if (val.startsWith("#") && !val.startsWith("#{")) {
bean.addPropertyReference(propertyName, val.substring(1));
@@ -473,7 +473,7 @@ public abstract class AbstractBeanDefinitionParser
}
}
}
-
+
protected boolean isAttribute(String pre, String name) {
return !"xmlns".equals(name) && (pre == null || !pre.equals("xmlns"))
&& !"abstract".equals(name) && !"lazy-init".equals(name) && !"id".equals(name);
@@ -498,12 +498,12 @@ public abstract class AbstractBeanDefinitionParser
if (colIdx == -1) {
local = t;
pre = "";
-
+
ns = DOMUtils.getNamespace(element, "");
} else {
pre = t.substring(0, colIdx);
local = t.substring(colIdx + 1);
-
+
ns = DOMUtils.getNamespace(element, pre);
}
@@ -513,14 +513,14 @@ public abstract class AbstractBeanDefinitionParser
/* This id-or-name resolution logic follows that in Spring's
* org.springframework.beans.factory.xml.BeanDefinitionParserDelegate object
* Intent is to have resolution of CXF custom beans follow that of Spring beans
- */
+ */
protected String getIdOrName(Element elem) {
String id = elem.getAttribute(BeanDefinitionParserDelegate.ID_ATTRIBUTE);
-
+
if (null == id || "".equals(id)) {
String names = elem.getAttribute("name");
if (null != names) {
- StringTokenizer st =
+ StringTokenizer st =
new StringTokenizer(names, BeanDefinitionParserDelegate.MULTI_VALUE_ATTRIBUTE_DELIMITERS);
if (st.countTokens() > 0) {
id = st.nextToken();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
index b8ab25d..f3feb20 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/AbstractFactoryBeanDefinitionParser.java
@@ -41,11 +41,11 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
public static void setFactoriesAreAbstract(boolean b) {
factoriesAreAbstract = b;
}
-
+
protected String getDestroyMethod() {
return null;
}
-
+
@Override
protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
Class<?> factoryClass = getFactoryClass();
@@ -54,7 +54,7 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
factoryBean = BeanDefinitionBuilder.rootBeanDefinition(getFactoryClass());
}
- NamedNodeMap atts = element.getAttributes();
+ NamedNodeMap atts = element.getAttributes();
boolean createdFromAPI = false;
boolean setBus = false;
for (int i = 0; i < atts.getLength(); i++) {
@@ -62,7 +62,7 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
String val = node.getValue();
String pre = node.getPrefix();
String name = node.getLocalName();
-
+
if ("createdFromAPI".equals(name)) {
factoryBean.setAbstract(true);
bean.setAbstract(true);
@@ -82,13 +82,13 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
}
}
mapAttribute(factoryBean, element, name, val);
- }
+ }
}
-
+
if (!setBus) {
addBusWiringAttribute(factoryBean, BusWiringType.PROPERTY);
}
-
+
Node node = element.getFirstChild();
while (node != null) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -97,7 +97,7 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
}
node = node.getNextSibling();
}
-
+
String id = getIdOrName(element);
BeanDefinition container = ctx.getContainingBeanDefinition();
boolean noFactory = false;
@@ -117,7 +117,7 @@ public abstract class AbstractFactoryBeanDefinitionParser extends AbstractBeanDe
if (createdFromAPI) {
id = id + getSuffix();
}
-
+
if (FactoryBean.class.isAssignableFrom(getFactoryClass())) {
if (!noFactory) {
AbstractBeanDefinition def = factoryBean.getRawBeanDefinition().cloneBeanDefinition();
[49/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/Policy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/Policy.java b/core/src/main/java/org/apache/cxf/annotations/Policy.java
index 4c39a7d..cc25779 100644
--- a/core/src/main/java/org/apache/cxf/annotations/Policy.java
+++ b/core/src/main/java/org/apache/cxf/annotations/Policy.java
@@ -34,31 +34,31 @@ import java.lang.annotation.Target;
@Target({ ElementType.TYPE, ElementType.METHOD })
@Inherited
public @interface Policy {
-
+
String uri();
-
+
boolean includeInWSDL() default true;
-
-
+
+
/**
- * The place to put the PolicyReference. The Default depends on the
+ * The place to put the PolicyReference. The Default depends on the
* location of the annotation. On the method in the SEI, it would be
- * the binding/operation, on the SEI, it would be the binding, on the
+ * the binding/operation, on the SEI, it would be the binding, on the
* service impl, the service element.
* @return location
*/
Placement placement() default Placement.DEFAULT;
-
+
/**
* If Placement is PORT_TYPE_OPERATION_FAULT, or BINDING_OPERATION_FAULT,
- * return the fault class associated with this documentation
+ * return the fault class associated with this documentation
* @return the fault class
*/
Class<?> faultClass() default DEFAULT.class;
-
+
enum Placement {
DEFAULT,
-
+
PORT_TYPE,
PORT_TYPE_OPERATION,
PORT_TYPE_OPERATION_INPUT,
@@ -74,7 +74,7 @@ public @interface Policy {
SERVICE,
SERVICE_PORT,
};
-
+
final class DEFAULT { }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/Provider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/Provider.java b/core/src/main/java/org/apache/cxf/annotations/Provider.java
index 4bf751e..6cff9aa 100644
--- a/core/src/main/java/org/apache/cxf/annotations/Provider.java
+++ b/core/src/main/java/org/apache/cxf/annotations/Provider.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
public @interface Provider {
enum Type { InInterceptor, OutInterceptor, InFaultInterceptor, OutFaultInterceptor, Feature }
enum Scope { Server, Client, All }
-
+
Type value();
- Scope scope() default Scope.All;
+ Scope scope() default Scope.All;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/SchemaValidation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/SchemaValidation.java b/core/src/main/java/org/apache/cxf/annotations/SchemaValidation.java
index 05d72bd..c138fb2 100644
--- a/core/src/main/java/org/apache/cxf/annotations/SchemaValidation.java
+++ b/core/src/main/java/org/apache/cxf/annotations/SchemaValidation.java
@@ -42,7 +42,7 @@ public @interface SchemaValidation {
* @return validation type
*/
SchemaValidationType type() default SchemaValidationType.BOTH;
-
+
/**
* Optional list of schema locations
* @return schema locations
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java b/core/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java
index dd48501..a615d0a 100644
--- a/core/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java
+++ b/core/src/main/java/org/apache/cxf/annotations/UseAsyncMethod.java
@@ -29,12 +29,12 @@ import java.lang.annotation.Target;
* Instructs the runtime to dispatch using the async method
* on service if continuations are available. This only applies
* to the JAX-WS frontend at this time.
- *
+ *
* Instead of calling the "X methodName(Y, Z...) method, it will
* call the "Future<?> methodName(Y, Z, ... AsyncHandler<MethodResponse>)"
* method passing in an AsyncHandler that you will need to call when
* the response is ready. An example would be:
- *
+ *
* <pre>
* public Future<?> greetMeAsync(final String requestType,
* final AsyncHandler<GreetMeResponse> asyncHandler) {
@@ -45,13 +45,13 @@ import java.lang.annotation.Target;
* GreetMeResponse resp = new GreetMeResponse();
* resp.setResponseType("Hello " + requestType);
* r.set(resp);
- * asyncHandler.handleResponse(r);
+ * asyncHandler.handleResponse(r);
* }
* } .start();
* return r;
* }
* </pre>
- *
+ *
* The use of the org.apache.cxf.jaxws.ServerAsyncResponse class for the response
* as shown above can simplify things and is recommended.
*/
@@ -60,10 +60,10 @@ import java.lang.annotation.Target;
@Target({ ElementType.METHOD })
@Inherited
public @interface UseAsyncMethod {
-
+
/**
- * By default, if continuations are not available,
- * it will use the non-async method. If you ALWAYS
+ * By default, if continuations are not available,
+ * it will use the non-async method. If you ALWAYS
* want the async method called, set this to true. However,
* that can cause threads to block.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/UseNio.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/UseNio.java b/core/src/main/java/org/apache/cxf/annotations/UseNio.java
index ca29f97..3079cae 100644
--- a/core/src/main/java/org/apache/cxf/annotations/UseNio.java
+++ b/core/src/main/java/org/apache/cxf/annotations/UseNio.java
@@ -27,7 +27,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Instructs the runtime to copy the input stream to the output stream using NIO.
- * This annotation will have no effect if continuations are not available
+ * This annotation will have no effect if continuations are not available
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java b/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java
index cecc383..0621bef 100644
--- a/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java
+++ b/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentation.java
@@ -41,31 +41,31 @@ public @interface WSDLDocumentation {
* @return documentation string
*/
String value();
-
+
/**
- * The place to put the documentation. The Default depends on the
+ * The place to put the documentation. The Default depends on the
* location of the annotation. On the method in the SEI, it would be
- * the portType/operation, on the SEI, it would be the portType, on the
+ * the portType/operation, on the SEI, it would be the portType, on the
* service impl, the service element.
* @return location
*/
Placement placement() default Placement.DEFAULT;
-
+
/**
* If Placement is FAULT_MESSAGE, PORT_FAULT, or BINDING_FAULT,
- * return the fault class associated with this documentation
+ * return the fault class associated with this documentation
* @return the fault class
*/
Class<?> faultClass() default DEFAULT.class;
-
+
enum Placement {
DEFAULT,
TOP,
-
+
INPUT_MESSAGE,
OUTPUT_MESSAGE,
FAULT_MESSAGE,
-
+
PORT_TYPE,
PORT_TYPE_OPERATION,
PORT_TYPE_OPERATION_INPUT,
@@ -80,9 +80,9 @@ public @interface WSDLDocumentation {
SERVICE,
SERVICE_PORT,
-
+
};
-
+
final class DEFAULT { }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java b/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java
index be9dd6c..b3a984b 100644
--- a/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java
+++ b/core/src/main/java/org/apache/cxf/annotations/WSDLDocumentationCollection.java
@@ -29,9 +29,9 @@ import java.lang.annotation.Target;
/**
- * Used to attach multiple WSDLDocumentation annotations
+ * Used to attach multiple WSDLDocumentation annotations
* to a method or type if documentation needs to be added
- * to more than one place in the wsdl.
+ * to more than one place in the wsdl.
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@@ -39,5 +39,5 @@ import java.lang.annotation.Target;
@Inherited
public @interface WSDLDocumentationCollection {
WSDLDocumentation[] value();
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index d1b64b8..b8773c6 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -32,14 +32,14 @@ import org.apache.cxf.message.Message;
public class AttachmentDataSource implements DataSource {
- private final String ct;
+ private final String ct;
private CachedOutputStream cache;
private InputStream ins;
private DelegatingInputStream delegate;
private String name;
-
+
public AttachmentDataSource(String ctParam, InputStream inParam) throws IOException {
- this.ct = ctParam;
+ this.ct = ctParam;
ins = inParam;
}
@@ -66,7 +66,7 @@ public class AttachmentDataSource implements DataSource {
throw cee;
} finally {
try {
- ins.close();
+ ins.close();
} catch (Exception ex) {
//ignore
}
@@ -83,7 +83,7 @@ public class AttachmentDataSource implements DataSource {
cache.releaseTempFileHold();
}
}
-
+
public String getContentType() {
return ct;
}
@@ -105,7 +105,7 @@ public class AttachmentDataSource implements DataSource {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index c81ce9e..25c75c7 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -62,7 +62,7 @@ public class AttachmentDeserializer {
private int pbAmount = 2048;
private PushbackInputStream stream;
- private int createCount;
+ private int createCount;
private int closedCount;
private boolean closed;
@@ -75,7 +75,7 @@ public class AttachmentDeserializer {
private Message message;
private InputStream body;
-
+
private Set<DelegatingInputStream> loaded = new HashSet<>();
private List<String> supportedTypes;
@@ -87,7 +87,7 @@ public class AttachmentDeserializer {
this.message = message;
this.supportedTypes = supportedTypes;
}
-
+
public void initializeAttachments() throws IOException {
initializeRootMessage();
@@ -108,7 +108,7 @@ public class AttachmentDeserializer {
if (AttachmentUtil.isTypeSupported(contentType.toLowerCase(), supportedTypes)) {
String boundaryString = findBoundaryFromContentType(contentType);
- if (null == boundaryString) {
+ if (null == boundaryString) {
boundaryString = findBoundaryFromInputStream();
}
// If a boundary still wasn't found, throw an exception
@@ -154,7 +154,7 @@ public class AttachmentDeserializer {
int i = in.read(buf);
String msg = IOUtils.newStringFromBytes(buf, 0, i);
in.unread(buf, 0, i);
-
+
// Reset the input stream since we'll need it again later
message.setContent(InputStream.class, in);
@@ -162,7 +162,7 @@ public class AttachmentDeserializer {
Matcher m = INPUT_STREAM_BOUNDARY_PATTERN.matcher(msg);
return m.find() ? "--" + m.group(1) : null;
}
-
+
public AttachmentImpl readNext() throws IOException {
// Cache any mime parts that are currently being streamed
cacheStreamedAttachments();
@@ -263,7 +263,7 @@ public class AttachmentDeserializer {
* @throws IOException
*/
private Attachment createAttachment(Map<String, List<String>> headers) throws IOException {
- InputStream partStream =
+ InputStream partStream =
new DelegatingInputStream(new MimeBodyPartInputStream(stream, boundary, pbAmount),
this);
createCount++;
@@ -308,8 +308,8 @@ public class AttachmentDeserializer {
stream.unread(v);
return true;
}
-
-
+
+
private Map<String, List<String>> loadPartHeaders(InputStream in) throws IOException {
StringBuilder buffer = new StringBuilder(128);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java
index 3b69b0d..29c161f 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentImpl.java
@@ -37,7 +37,7 @@ public class AttachmentImpl implements Attachment {
public AttachmentImpl(String idParam) {
this.id = idParam;
}
-
+
public AttachmentImpl(String idParam, DataHandler handlerParam) {
this.id = idParam;
this.dataHandler = handlerParam;
@@ -65,7 +65,7 @@ public class AttachmentImpl implements Attachment {
String value = headers.get(name);
return value == null ? headers.get(name.toLowerCase()) : value;
}
-
+
public Iterator<String> getHeaderNames() {
return headers.keySet().iterator();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
index c9878f8..8bc20a3 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
@@ -45,25 +45,25 @@ import org.apache.cxf.message.Message;
public class AttachmentSerializer {
// http://tools.ietf.org/html/rfc2387
private static final String DEFAULT_MULTIPART_TYPE = "multipart/related";
-
+
private String contentTransferEncoding = "binary";
-
+
private Message message;
private String bodyBoundary;
private OutputStream out;
private String encoding;
-
+
private String multipartType;
private Map<String, List<String>> rootHeaders = Collections.emptyMap();
private boolean xop = true;
private boolean writeOptionalTypeParameters = true;
-
-
+
+
public AttachmentSerializer(Message messageParam) {
message = messageParam;
}
- public AttachmentSerializer(Message messageParam,
+ public AttachmentSerializer(Message messageParam,
String multipartType,
boolean writeOptionalTypeParameters,
Map<String, List<String>> headers) {
@@ -72,9 +72,9 @@ public class AttachmentSerializer {
this.writeOptionalTypeParameters = writeOptionalTypeParameters;
this.rootHeaders = headers;
}
-
+
/**
- * Serialize the beginning of the attachment which includes the MIME
+ * Serialize the beginning of the attachment which includes the MIME
* beginning and headers for the root message.
*/
public void writeProlog() throws IOException {
@@ -93,21 +93,21 @@ public class AttachmentSerializer {
int pos = bodyCt.indexOf(';');
// get everything from the semi-colon
bodyCtParams = bodyCt.substring(pos);
- bodyCtParamsEscaped = escapeQuotes(bodyCtParams);
+ bodyCtParamsEscaped = escapeQuotes(bodyCtParams);
// keep the type/subtype part in bodyCt
bodyCt = bodyCt.substring(0, pos);
}
// Set transport mime type
String requestMimeType = multipartType == null ? DEFAULT_MULTIPART_TYPE : multipartType;
-
+
StringBuilder ct = new StringBuilder();
ct.append(requestMimeType);
-
+
// having xop set to true implies multipart/related, but just in case...
- boolean xopOrMultipartRelated = xop
+ boolean xopOrMultipartRelated = xop
|| DEFAULT_MULTIPART_TYPE.equalsIgnoreCase(requestMimeType)
|| DEFAULT_MULTIPART_TYPE.startsWith(requestMimeType);
-
+
// type is a required parameter for multipart/related only
if (xopOrMultipartRelated
&& requestMimeType.indexOf("type=") == -1) {
@@ -115,16 +115,16 @@ public class AttachmentSerializer {
ct.append("; type=\"application/xop+xml\"");
} else {
ct.append("; type=\"").append(bodyCt).append("\"");
- }
+ }
}
-
+
// boundary
ct.append("; boundary=\"")
.append(bodyBoundary)
.append("\"");
-
+
String rootContentId = getHeaderValue("Content-ID", AttachmentUtil.BODY_ATTACHMENT_ID);
-
+
// 'start' is a required parameter for XOP/MTOM, clearly defined
// for simpler multipart/related payloads but is not needed for
// multipart/mixed, multipart/form-data
@@ -133,7 +133,7 @@ public class AttachmentSerializer {
.append(checkAngleBrackets(rootContentId))
.append(">\"");
}
-
+
// start-info is a required parameter for XOP/MTOM, may be needed for
// other WS cases but is redundant in simpler multipart/related cases
// the parameters need to be included within the start-info's value in the escaped form
@@ -145,11 +145,11 @@ public class AttachmentSerializer {
}
ct.append("\"");
}
-
-
+
+
message.put(Message.CONTENT_TYPE, ct.toString());
-
+
// 2. write headers
out = message.getContent(OutputStream.class);
encoding = (String) message.get(Message.ENCODING);
@@ -159,7 +159,7 @@ public class AttachmentSerializer {
StringWriter writer = new StringWriter();
writer.write("--");
writer.write(bodyBoundary);
-
+
StringBuilder mimeBodyCt = new StringBuilder();
String bodyType = getHeaderValue("Content-Type", null);
if (bodyType == null) {
@@ -177,15 +177,15 @@ public class AttachmentSerializer {
} else {
mimeBodyCt.append(bodyType);
}
-
+
writeHeaders(mimeBodyCt.toString(), rootContentId, rootHeaders, writer);
out.write(writer.getBuffer().toString().getBytes(encoding));
}
private static String escapeQuotes(String s) {
- return s.indexOf('"') != 0 ? s.replace("\"", "\\\"") : s;
+ return s.indexOf('"') != 0 ? s.replace("\"", "\\\"") : s;
}
-
+
public void setContentTransferEncoding(String cte) {
contentTransferEncoding = cte;
}
@@ -204,8 +204,8 @@ public class AttachmentSerializer {
}
return sb.toString();
}
-
- private void writeHeaders(String contentType, String attachmentId,
+
+ private void writeHeaders(String contentType, String attachmentId,
Map<String, List<String>> headers, Writer writer) throws IOException {
writer.write("\r\nContent-Type: ");
writer.write(contentType);
@@ -235,17 +235,17 @@ public class AttachmentSerializer {
}
writer.write("\r\n");
}
-
+
writer.write("\r\n");
}
- private static String checkAngleBrackets(String value) {
+ private static String checkAngleBrackets(String value) {
if (value.charAt(0) == '<' && value.charAt(value.length() - 1) == '>') {
return value.substring(1, value.length() - 1);
- }
+ }
return value;
}
-
+
/**
* Write the end of the body boundary and any attachments included.
* @throws IOException
@@ -253,10 +253,10 @@ public class AttachmentSerializer {
public void writeAttachments() throws IOException {
if (message.getAttachments() != null) {
for (Attachment a : message.getAttachments()) {
- StringWriter writer = new StringWriter();
+ StringWriter writer = new StringWriter();
writer.write("\r\n--");
writer.write(bodyBoundary);
-
+
Map<String, List<String>> headers = null;
Iterator<String> it = a.getHeaderNames();
if (it.hasNext()) {
@@ -268,11 +268,11 @@ public class AttachmentSerializer {
} else {
headers = Collections.emptyMap();
}
-
-
+
+
DataHandler handler = a.getDataHandler();
handler.setCommandMap(AttachmentUtil.getCommandMap());
-
+
writeHeaders(handler.getContentType(), a.getId(),
headers, writer);
out.write(writer.getBuffer().toString().getBytes(encoding));
@@ -283,7 +283,7 @@ public class AttachmentSerializer {
}
}
}
- StringWriter writer = new StringWriter();
+ StringWriter writer = new StringWriter();
writer.write("\r\n--");
writer.write(bodyBoundary);
writer.write("--");
@@ -313,7 +313,7 @@ public class AttachmentSerializer {
}
return total;
}
-
+
public boolean isXop() {
return xop;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index 037de30..c6dd731 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -62,14 +62,14 @@ import org.apache.cxf.message.MessageUtils;
public final class AttachmentUtil {
public static final String BODY_ATTACHMENT_ID = "root.message@cxf.apache.org";
-
+
private static volatile int counter;
private static final String ATT_UUID = UUID.randomUUID().toString();
-
+
private static final Random BOUND_RANDOM = new Random();
private static final CommandMap DEFAULT_COMMAND_MAP = CommandMap.getDefaultCommandMap();
private static final MailcapCommandMap COMMAND_MAP = new EnhancedMailcapCommandMap();
-
+
static final class EnhancedMailcapCommandMap extends MailcapCommandMap {
@Override
public synchronized DataContentHandler createDataContentHandler(
@@ -96,7 +96,7 @@ public final class AttachmentUtil {
CommandInfo[] commands = super.getAllCommands(mimeType);
CommandInfo[] defaultCommands = DEFAULT_COMMAND_MAP.getAllCommands(mimeType);
List<CommandInfo> cmdList = new ArrayList<>(Arrays.asList(commands));
-
+
// Add CommandInfo which does not exist in current command map.
for (CommandInfo defCmdInfo : defaultCommands) {
String defCmdName = defCmdInfo.getCommandName();
@@ -111,7 +111,7 @@ public final class AttachmentUtil {
cmdList.add(defCmdInfo);
}
}
-
+
CommandInfo[] allCommandArray = new CommandInfo[0];
return cmdList.toArray(allCommandArray);
}
@@ -145,22 +145,22 @@ public final class AttachmentUtil {
private AttachmentUtil() {
}
-
+
static {
- COMMAND_MAP.addMailcap("image/*;;x-java-content-handler="
+ COMMAND_MAP.addMailcap("image/*;;x-java-content-handler="
+ ImageDataContentHandler.class.getName());
}
public static CommandMap getCommandMap() {
return COMMAND_MAP;
}
-
+
public static boolean isMtomEnabled(Message message) {
- Object prop = message.getContextualProperty(Message.MTOM_ENABLED);
+ Object prop = message.getContextualProperty(Message.MTOM_ENABLED);
return MessageUtils.isTrue(prop);
}
-
- public static void setStreamedAttachmentProperties(Message message, CachedOutputStream bos)
+
+ public static void setStreamedAttachmentProperties(Message message, CachedOutputStream bos)
throws IOException {
Object directory = message.getContextualProperty(AttachmentDeserializer.ATTACHMENT_DIRECTORY);
if (directory != null) {
@@ -170,7 +170,7 @@ public final class AttachmentUtil {
bos.setOutputDir(new File((String)directory));
}
}
-
+
Object threshold = message.getContextualProperty(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD);
if (threshold != null) {
if (threshold instanceof Long) {
@@ -191,11 +191,11 @@ public final class AttachmentUtil {
}
}
}
-
+
public static String createContentID(String ns) throws UnsupportedEncodingException {
// tend to change
String cid = "cxf.apache.org";
-
+
String name = ATT_UUID + "-" + String.valueOf(++counter);
if (ns != null && (ns.length() > 0)) {
try {
@@ -210,7 +210,7 @@ public final class AttachmentUtil {
cid = ns;
}
}
- return URLEncoder.encode(name, StandardCharsets.UTF_8.name()) + "@"
+ return URLEncoder.encode(name, StandardCharsets.UTF_8.name()) + "@"
+ URLEncoder.encode(cid, StandardCharsets.UTF_8.name());
}
@@ -225,15 +225,15 @@ public final class AttachmentUtil {
mostSigBits = BOUND_RANDOM.nextLong();
leastSigBits = BOUND_RANDOM.nextLong();
}
-
+
mostSigBits &= 0xFFFFFFFFFFFF0FFFL; //clear version
mostSigBits |= 0x0000000000004000L; //set version
leastSigBits &= 0x3FFFFFFFFFFFFFFFL; //clear the variant
leastSigBits |= 0x8000000000000000L; //set to IETF variant
-
+
UUID result = new UUID(mostSigBits, leastSigBits);
-
+
return "uuid:" + result.toString();
}
@@ -263,7 +263,7 @@ public final class AttachmentUtil {
}
return dataHandlers == null ? new LinkedHashMap<String, DataHandler>() : dataHandlers;
}
-
+
static class DHMap extends AbstractMap<String, DataHandler> {
final Collection<Attachment> list;
DHMap(Collection<Attachment> l) {
@@ -322,9 +322,9 @@ public final class AttachmentUtil {
}
list.add(new AttachmentImpl(key, value));
return ret;
- }
+ }
}
-
+
public static String cleanContentId(String id) {
if (id != null) {
if (id.startsWith("<")) {
@@ -348,7 +348,7 @@ public final class AttachmentUtil {
}
return id;
}
-
+
static String getHeaderValue(List<String> v) {
if (v != null && v.size() > 0) {
return v.get(0);
@@ -374,19 +374,19 @@ public final class AttachmentUtil {
static String getHeader(Map<String, List<String>> headers, String h, String delim) {
return getHeaderValue(headers.get(h), delim);
}
- public static Attachment createAttachment(InputStream stream, Map<String, List<String>> headers)
+ public static Attachment createAttachment(InputStream stream, Map<String, List<String>> headers)
throws IOException {
-
+
String id = cleanContentId(getHeader(headers, "Content-ID"));
AttachmentImpl att = new AttachmentImpl(id);
-
+
final String ct = getHeader(headers, "Content-Type");
String cd = getHeader(headers, "Content-Disposition");
String fileName = getContentDispositionFileName(cd);
-
+
String encoding = null;
-
+
for (Map.Entry<String, List<String>> e : headers.entrySet()) {
String name = e.getKey();
if (name.equalsIgnoreCase("Content-Transfer-Encoding")) {
@@ -400,20 +400,20 @@ public final class AttachmentUtil {
if (encoding == null) {
encoding = "binary";
}
- DataSource source = new AttachmentDataSource(ct,
+ DataSource source = new AttachmentDataSource(ct,
decode(stream, encoding));
if (!StringUtils.isEmpty(fileName)) {
((AttachmentDataSource)source).setName(fileName);
}
- att.setDataHandler(new DataHandler(source));
+ att.setDataHandler(new DataHandler(source));
return att;
}
-
+
static String getContentDispositionFileName(String cd) {
if (StringUtils.isEmpty(cd)) {
return null;
}
- //TODO: save ContentDisposition directly
+ //TODO: save ContentDisposition directly
ContentDisposition c = new ContentDisposition(cd);
String s = c.getParameter("filename");
if (s == null) {
@@ -421,13 +421,13 @@ public final class AttachmentUtil {
}
return s;
}
-
+
public static InputStream decode(InputStream in, String encoding) throws IOException {
encoding = encoding.toLowerCase();
// some encodings are just pass-throughs, with no real decoding.
- if ("binary".equals(encoding)
- || "7bit".equals(encoding)
+ if ("binary".equals(encoding)
+ || "7bit".equals(encoding)
|| "8bit".equals(encoding)) {
return in;
} else if ("base64".equals(encoding)) {
@@ -437,7 +437,7 @@ public final class AttachmentUtil {
} else {
throw new IOException("Unknown encoding " + encoding);
}
- }
+ }
public static boolean isTypeSupported(String contentType, List<String> types) {
if (contentType == null) {
return false;
@@ -451,15 +451,15 @@ public final class AttachmentUtil {
return false;
}
- public static Attachment createMtomAttachment(boolean isXop, String mimeType, String elementNS,
+ public static Attachment createMtomAttachment(boolean isXop, String mimeType, String elementNS,
byte[] data, int offset, int length, int threshold) {
if (!isXop || length <= threshold) {
return null;
- }
+ }
if (mimeType == null) {
mimeType = "application/octet-stream";
}
-
+
ByteDataSource source = new ByteDataSource(data, offset, length);
source.setContentType(mimeType);
DataHandler handler = new DataHandler(source);
@@ -474,12 +474,12 @@ public final class AttachmentUtil {
att.setXOP(isXop);
return att;
}
-
+
public static Attachment createMtomAttachmentFromDH(
boolean isXop, DataHandler handler, String elementNS, int threshold) {
if (!isXop) {
return null;
- }
+ }
// The following is just wrong. Even if the DataHandler has a stream, we should still
// apply the threshold.
@@ -493,7 +493,7 @@ public final class AttachmentUtil {
}
} else if (ds.getClass().getName().endsWith("ObjectDataSource")) {
Object o = handler.getContent();
- if (o instanceof String
+ if (o instanceof String
&& ((String)o).length() < threshold) {
return null;
} else if (o instanceof byte[] && ((byte[])o).length < threshold) {
@@ -503,7 +503,7 @@ public final class AttachmentUtil {
} catch (IOException e1) {
// ignore, just do the normal attachment thing
}
-
+
String id;
try {
id = AttachmentUtil.createContentID(elementNS);
@@ -542,11 +542,11 @@ public final class AttachmentUtil {
throw new Fault(e);
}
}
-
+
}
private static DataSource loadDataSource(String contentId, Collection<Attachment> atts) {
return new LazyDataSource(contentId, atts);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java b/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java
index 6f0a97f..70f24cf 100644
--- a/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java
+++ b/core/src/main/java/org/apache/cxf/attachment/Base64DecoderStream.java
@@ -85,7 +85,7 @@ public class Base64DecoderStream extends FilterInputStream {
} catch (Base64Exception e) {
throw new IOException(e);
}
- decodedCount = decodedChars.length;
+ decodedCount = decodedChars.length;
return true;
}
return false;
@@ -102,7 +102,7 @@ public class Base64DecoderStream extends FilterInputStream {
return -1;
}
decodedCount--;
- // we need to ensure this doesn't get sign extended
+ // we need to ensure this doesn't get sign extended
return decodedChars[decodedIndex++] & 0xff;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
index 2632e57..7cdda31 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ContentDisposition.java
@@ -58,7 +58,7 @@ public class ContentDisposition {
while (m.find()) {
String paramName = null;
String paramValue = "";
-
+
String groupValue = m.group().trim();
int eqIndex = groupValue.indexOf('=');
if (eqIndex > 0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java b/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java
index 4b33aeb..a4e8095 100644
--- a/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java
+++ b/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java
@@ -112,7 +112,7 @@ public class DelegatingInputStream extends InputStream implements Transferable {
this.is = inputStream;
}
-
+
public InputStream getInputStream() {
return is;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java b/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
index 8bd0223..2b28980 100644
--- a/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/attachment/ImageDataContentHandler.java
@@ -43,7 +43,7 @@ import javax.imageio.stream.ImageOutputStream;
import org.apache.cxf.helpers.IOUtils;
/**
- *
+ *
*/
public class ImageDataContentHandler implements DataContentHandler {
private static final DataFlavor[] FLAVORS;
@@ -57,9 +57,9 @@ public class ImageDataContentHandler implements DataContentHandler {
}
public ImageDataContentHandler() {
-
+
}
-
+
public Object getContent(DataSource ds) throws IOException {
return ImageIO.read(ds.getInputStream());
}
@@ -83,9 +83,9 @@ public class ImageDataContentHandler implements DataContentHandler {
Iterator<ImageWriter> writers = ImageIO.getImageWritersByMIMEType(mimeType);
if (writers.hasNext()) {
ImageWriter writer = writers.next();
-
+
BufferedImage bimg = convertToBufferedImage((Image)obj);
- ImageOutputStream out = ImageIO.createImageOutputStream(os);
+ ImageOutputStream out = ImageIO.createImageOutputStream(os);
writer.setOutput(out);
writer.write(bimg);
writer.dispose();
@@ -101,7 +101,7 @@ public class ImageDataContentHandler implements DataContentHandler {
FileInputStream file = new FileInputStream((File)obj);
IOUtils.copyAndCloseInput(file, os);
} else {
- throw new IOException("Attachment type not spported " + obj.getClass());
+ throw new IOException("Attachment type not spported " + obj.getClass());
}
}
@@ -109,10 +109,10 @@ public class ImageDataContentHandler implements DataContentHandler {
if (image instanceof BufferedImage) {
return (BufferedImage)image;
}
-
+
// Wait until the image is completely loaded
MediaTracker tracker = new MediaTracker(new Component() {
- private static final long serialVersionUID = 977142547536262901L;
+ private static final long serialVersionUID = 977142547536262901L;
});
tracker.addImage(image, 0);
try {
@@ -122,7 +122,7 @@ public class ImageDataContentHandler implements DataContentHandler {
ioe.initCause(e);
throw ioe;
}
-
+
// Create a BufferedImage so we can write it out later
BufferedImage bufImage = new BufferedImage(
image.getWidth(null),
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java b/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
index 85f0364..b9d6ad6 100644
--- a/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
+++ b/core/src/main/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
@@ -32,12 +32,12 @@ import javax.activation.DataHandler;
import org.apache.cxf.message.Attachment;
-public class LazyAttachmentCollection
+public class LazyAttachmentCollection
implements Collection<Attachment> {
-
+
private AttachmentDeserializer deserializer;
private final List<Attachment> attachments = new ArrayList<>();
-
+
public LazyAttachmentCollection(AttachmentDeserializer deserializer) {
super();
this.deserializer = deserializer;
@@ -73,7 +73,7 @@ public class LazyAttachmentCollection
return true;
}
return false;
- }
+ }
return deserializer.hasNext();
}
@@ -84,12 +84,12 @@ public class LazyAttachmentCollection
return new Iterator<Attachment>() {
int current;
boolean removed;
-
+
public boolean hasNext() {
if (attachments.size() > current) {
return true;
}
-
+
// check if there is another attachment
try {
Attachment a = deserializer.readNext();
@@ -118,13 +118,13 @@ public class LazyAttachmentCollection
attachments.remove(--current);
removed = true;
}
-
+
};
}
-
+
public int size() {
loadAll();
-
+
return attachments.size();
}
@@ -137,7 +137,7 @@ public class LazyAttachmentCollection
}
public void clear() {
- attachments.clear();
+ attachments.clear();
}
public boolean contains(Object arg0) {
@@ -169,27 +169,27 @@ public class LazyAttachmentCollection
public Object[] toArray() {
loadAll();
-
+
return attachments.toArray();
}
public <T> T[] toArray(T[] arg0) {
loadAll();
-
+
return attachments.toArray(arg0);
}
-
+
public Map<String, DataHandler> createDataHandlerMap() {
return new LazyAttachmentMap(this);
}
private static class LazyAttachmentMap implements Map<String, DataHandler> {
LazyAttachmentCollection collection;
-
+
LazyAttachmentMap(LazyAttachmentCollection c) {
collection = c;
}
-
+
public void clear() {
collection.clear();
}
@@ -233,7 +233,7 @@ public class LazyAttachmentCollection
public int size() {
return collection.size();
}
-
+
public DataHandler remove(Object key) {
Iterator<Attachment> it = collection.iterator();
while (it.hasNext()) {
@@ -257,7 +257,7 @@ public class LazyAttachmentCollection
}
}
-
+
public Set<Map.Entry<String, DataHandler>> entrySet() {
return new AbstractSet<Map.Entry<String, DataHandler>>() {
public Iterator<Map.Entry<String, DataHandler>> iterator() {
@@ -345,7 +345,7 @@ public class LazyAttachmentCollection
}
};
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java b/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
index bfae1e6..3b1c32d 100644
--- a/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/LazyDataSource.java
@@ -31,7 +31,7 @@ import javax.activation.DataSource;
import org.apache.cxf.message.Attachment;
/**
- * A DataSource which will search through a Collection of attachments so as to
+ * A DataSource which will search through a Collection of attachments so as to
* lazily load the attachment from the collection. This allows streaming attachments
* with databinding toolkits like JAXB.
*/
@@ -39,7 +39,7 @@ public class LazyDataSource implements DataSource {
private DataSource dataSource;
private Collection<Attachment> attachments;
private String id;
-
+
public LazyDataSource(String id, Collection<Attachment> attachments) {
super();
this.id = id;
@@ -77,34 +77,34 @@ public class LazyDataSource implements DataSource {
}
}
}
-
+
public String getContentType() {
load();
-
+
return dataSource.getContentType();
}
public InputStream getInputStream() throws IOException {
load();
-
+
return dataSource.getInputStream();
}
public String getName() {
load();
-
+
return dataSource.getName();
}
public OutputStream getOutputStream() throws IOException {
load();
-
+
return dataSource.getOutputStream();
}
public DataSource getDataSource() {
load();
-
+
return dataSource;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java b/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
index f8cfc5a..2d9c7da 100644
--- a/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
+++ b/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
@@ -34,7 +34,7 @@ public class MimeBodyPartInputStream extends InputStream {
private boolean closed;
- public MimeBodyPartInputStream(PushbackInputStream inStreamParam,
+ public MimeBodyPartInputStream(PushbackInputStream inStreamParam,
byte[] boundaryParam,
int pbsize) {
super();
@@ -50,7 +50,7 @@ public class MimeBodyPartInputStream extends InputStream {
if (boundaryFound || closed) {
return -1;
}
- if ((off < 0) || (off > b.length) || (len < 0)
+ if ((off < 0) || (off > b.length) || (len < 0)
|| ((off + len) > b.length) || ((off + len) < 0)) {
throw new IndexOutOfBoundsException();
@@ -60,7 +60,7 @@ public class MimeBodyPartInputStream extends InputStream {
}
boolean bufferCreated = false;
if (len < boundary.length * 2) {
- //buffer is too short to detect boundaries with it. We'll need to create a larger buffer
+ //buffer is too short to detect boundaries with it. We'll need to create a larger buffer
bufferCreated = true;
if (boundaryBuffer == null) {
boundaryBuffer = new byte[boundary.length * 2];
@@ -85,7 +85,7 @@ public class MimeBodyPartInputStream extends InputStream {
return -1;
}
len = idx;
-
+
int i = processBuffer(b, off, len);
if (bufferCreated && i > 0) {
// read more than we need, push it back
@@ -99,7 +99,7 @@ public class MimeBodyPartInputStream extends InputStream {
} else if (i == 0 && boundaryFound) {
return -1;
}
-
+
return i;
}
@@ -110,7 +110,7 @@ public class MimeBodyPartInputStream extends InputStream {
return true;
} else if (pointer >= 1000000000) {
inStream.unread(b, initialPointer, (off + len) - initialPointer);
- return false;
+ return false;
} else {
int x = inStream.read();
if (x != -1) {
@@ -155,7 +155,7 @@ public class MimeBodyPartInputStream extends InputStream {
while ((boundaryIndex < boundary.length) && (value == boundary[boundaryIndex])) {
if (!hasData(buffer, initialI, i + 1, off, len)) {
return initialI - off;
- }
+ }
value = buffer[++i];
boundaryIndex++;
}
@@ -164,7 +164,7 @@ public class MimeBodyPartInputStream extends InputStream {
if (initialI != off) {
i = 1000000000;
}
- if (initialI - off != 0
+ if (initialI - off != 0
&& !hasData(buffer, initialI, i + 1, off, len)) {
return initialI - off;
}
@@ -265,12 +265,12 @@ public class MimeBodyPartInputStream extends InputStream {
inStream.unread(10);
value = 13;
} else {
- inStream.unread(boundary, 1, boundaryIndex - 1);
+ inStream.unread(boundary, 1, boundaryIndex - 1);
value = boundary[0];
}
return value;
}
-
+
public void close() throws IOException {
this.closed = true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java b/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
index 8943c22..85fb093 100644
--- a/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
+++ b/core/src/main/java/org/apache/cxf/binding/AbstractBindingFactory.java
@@ -40,7 +40,7 @@ public abstract class AbstractBindingFactory implements BindingFactory {
public AbstractBindingFactory() {
}
-
+
public AbstractBindingFactory(Collection<String> ns) {
activationNamespaces = ns;
}
@@ -48,13 +48,13 @@ public abstract class AbstractBindingFactory implements BindingFactory {
bus = b;
registerWithBindingManager();
}
-
+
public AbstractBindingFactory(Bus b, Collection<String> ns) {
activationNamespaces = ns;
bus = b;
registerWithBindingManager();
}
-
+
private void registerWithBindingManager() {
if (bus != null && activationNamespaces != null) {
BindingFactoryManager manager = bus.getExtension(BindingFactoryManager.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/binding/Binding.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/binding/Binding.java b/core/src/main/java/org/apache/cxf/binding/Binding.java
index 10989d1..380b450 100644
--- a/core/src/main/java/org/apache/cxf/binding/Binding.java
+++ b/core/src/main/java/org/apache/cxf/binding/Binding.java
@@ -24,29 +24,29 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingInfo;
/**
- * A Binding provides interceptors and message creation logic for a
+ * A Binding provides interceptors and message creation logic for a
* specific protocol binding.
*/
public interface Binding extends InterceptorProvider {
-
+
/**
* Create a Message for this Binding.
* @return the Binding message
*/
Message createMessage();
-
+
/**
* Create a Message form the message.
- *
+ *
* @param m the message used for creating a binding message
* @return the Binding message
- */
+ */
Message createMessage(Message m);
-
+
/**
* Get the BindingInfo for this binding.
*
- * @return the BingdingInfo Object
+ * @return the BingdingInfo Object
*/
BindingInfo getBindingInfo();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/binding/BindingFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/binding/BindingFactory.java b/core/src/main/java/org/apache/cxf/binding/BindingFactory.java
index e844c85..990be98 100644
--- a/core/src/main/java/org/apache/cxf/binding/BindingFactory.java
+++ b/core/src/main/java/org/apache/cxf/binding/BindingFactory.java
@@ -28,29 +28,29 @@ import org.apache.cxf.transport.Destination;
* A factory interface for creating Bindings from BindingInfo metadata.
*/
public interface BindingFactory {
-
+
/**
* Create a Binding from the BindingInfo metadata.
- *
+ *
* @param binding
* @return the Binding object
*/
Binding createBinding(BindingInfo binding);
/**
- * Create a "default" BindingInfo object for the service. Can return a subclass.
+ * Create a "default" BindingInfo object for the service. Can return a subclass.
* @param service
* @param namespace
* @param configObject - binding specific configuration object
* @return the BindingInfo object
*/
BindingInfo createBindingInfo(Service service, String namespace, Object configObject);
-
+
/**
* Set the destination's message observer which is created by using the endpoint to
* listen the incoming message
- * @param d the destination that will be set the MessageObserver
- * @param e the endpoint to build up the MessageObserver
+ * @param d the destination that will be set the MessageObserver
+ * @param e the endpoint to build up the MessageObserver
*/
void addListener(Destination d, Endpoint e);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/binding/BindingFactoryManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/binding/BindingFactoryManager.java b/core/src/main/java/org/apache/cxf/binding/BindingFactoryManager.java
index a13a37a..361e5da 100644
--- a/core/src/main/java/org/apache/cxf/binding/BindingFactoryManager.java
+++ b/core/src/main/java/org/apache/cxf/binding/BindingFactoryManager.java
@@ -22,7 +22,7 @@ package org.apache.cxf.binding;
import org.apache.cxf.BusException;
/**
- * The manager interface represents a repository for accessing
+ * The manager interface represents a repository for accessing
* <code>BindingFactory</code>s.
*
* Provides methods necessary for registering, unregistering or retrieving of
@@ -38,7 +38,7 @@ public interface BindingFactoryManager {
* BindingFactory interface.
*/
void registerBindingFactory(String name, BindingFactory binding);
-
+
/**
* Deregisters the BindingFactory with the provided name.
*
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java b/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
index 80524c8..b576621 100644
--- a/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
+++ b/core/src/main/java/org/apache/cxf/bus/CXFBusFactory.java
@@ -27,15 +27,15 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.extension.ExtensionManagerBus;
public class CXFBusFactory extends BusFactory {
-
+
public Bus createBus() {
return createBus(new HashMap<Class<?>, Object>());
}
-
+
public Bus createBus(Map<Class<?>, Object> e) {
return createBus(e, new HashMap<String, Object>());
}
-
+
public Bus createBus(Map<Class<?>, Object> e, Map<String, Object> properties) {
ExtensionManagerBus bus = new ExtensionManagerBus(e, properties);
possiblySetDefaultBus(bus);
@@ -43,5 +43,5 @@ public class CXFBusFactory extends BusFactory {
bus.initialize();
return bus;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/ManagedBus.java b/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
index b249e4e..7060e00 100644
--- a/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/ManagedBus.java
@@ -29,23 +29,23 @@ import org.apache.cxf.management.ManagementConstants;
import org.apache.cxf.management.annotation.ManagedOperation;
import org.apache.cxf.management.annotation.ManagedResource;
-@ManagedResource(componentName = "Bus",
+@ManagedResource(componentName = "Bus",
description = "Responsible for managing services.")
-
+
public class ManagedBus implements ManagedComponent {
private static final String TYPE_VALUE = "Bus";
private static final String INSTANCE_ID = "managed.bus.instance.id";
private final Bus bus;
-
+
public ManagedBus(Bus b) {
bus = b;
}
-
- @ManagedOperation
+
+ @ManagedOperation
public void shutdown(boolean wait) {
bus.shutdown(wait);
}
-
+
public ObjectName getObjectName() throws JMException {
String busId = bus.getId();
StringBuilder buffer = new StringBuilder(ManagementConstants.DEFAULT_DOMAIN_NAME).append(':');
@@ -57,7 +57,7 @@ public class ManagedBus implements ManagedComponent {
instanceId = new StringBuilder().append(bus.hashCode()).toString();
}
buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(instanceId);
-
+
return new ObjectName(buffer.toString());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
index 1a91eae..be91e3a 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBeanLocator.java
@@ -41,16 +41,16 @@ import org.osgi.service.blueprint.reflect.BeanProperty;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
/**
- *
+ *
*/
public class BlueprintBeanLocator implements ConfiguredBeanLocator {
private static final Logger LOG = LogUtils.getL7dLogger(BlueprintBeanLocator.class);
ConfiguredBeanLocator orig;
BlueprintContainer container;
BundleContext context;
-
- public BlueprintBeanLocator(ConfiguredBeanLocator orig,
- BlueprintContainer cont,
+
+ public BlueprintBeanLocator(ConfiguredBeanLocator orig,
+ BlueprintContainer cont,
BundleContext context) {
this.orig = orig;
this.container = cont;
@@ -60,14 +60,14 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
((ExtensionManagerImpl)orig).removeBeansOfNames(names);
}
}
-
+
static Class<?> getClassForMetaData(BlueprintContainer container, ComponentMetadata cmd) {
Class<?> cls = null;
if (cmd instanceof BeanMetadata) {
BeanMetadata bm = (BeanMetadata)cmd;
if (bm instanceof ExtendedBeanMetadata) {
cls = ((ExtendedBeanMetadata)bm).getRuntimeClass();
- }
+ }
if (cls == null && container instanceof ExtendedBlueprintContainer && bm.getClassName() != null) {
try {
cls = ((ExtendedBlueprintContainer)container).loadClass(bm.getClassName());
@@ -88,9 +88,9 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
return null;
}
}
-
+
public <T> T getBeanOfType(String name, Class<T> type) {
-
+
ComponentMetadata cmd = getComponentMetadata(name);
Class<?> cls = getClassForMetaData(cmd);
if (cls != null && type.isAssignableFrom(cls)) {
@@ -115,7 +115,7 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
/** {@inheritDoc}*/
public <T> Collection<? extends T> getBeansOfType(Class<T> type) {
List<T> list = new ArrayList<>();
-
+
for (String s : container.getComponentIds()) {
ComponentMetadata cmd = container.getComponentMetadata(s);
Class<?> cls = getClassForMetaData(cmd);
@@ -133,12 +133,12 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
}
} catch (Exception ex) {
//ignore, just don't support the OSGi services
- LOG.info("Try to find the Bean with type:" + type
- + " from OSGi services and get error: " + ex);
+ LOG.info("Try to find the Bean with type:" + type
+ + " from OSGi services and get error: " + ex);
}
}
list.addAll(orig.getBeansOfType(type));
-
+
return list;
}
@@ -166,7 +166,7 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
loaded = true;
}
}
-
+
try {
if (context != null) {
ServiceReference refs[] = context.getServiceReferences(type.getName(), null);
@@ -185,9 +185,9 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
}
} catch (Exception ex) {
//ignore, just don't support the OSGi services
- LOG.info("Try to find the Bean with type:" + type
- + " from OSGi services and get error: " + ex);
- }
+ LOG.info("Try to find the Bean with type:" + type
+ + " from OSGi services and get error: " + ex);
+ }
return orig.loadBeansOfType(type, listener) || loaded;
}
@@ -209,7 +209,7 @@ public class BlueprintBeanLocator implements ConfiguredBeanLocator {
ComponentMetadata cmd = getComponentMetadata(name);
if (cmd instanceof BeanMetadata) {
return true;
- }
+ }
return orig.hasBeanOfName(name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java
index e1aeb7f..4388393 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintBus.java
@@ -31,23 +31,23 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.container.BlueprintContainer;
/**
- *
+ *
*/
public class BlueprintBus extends ExtensionManagerBus {
BundleContext context;
BlueprintContainer container;
-
+
public BlueprintBus() {
// Using the BlueprintBus Classloader to load the extensions
super(null, null, BlueprintBus.class.getClassLoader());
}
-
+
public void setBundleContext(final BundleContext c) {
context = c;
ClassLoader bundleClassLoader =
AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
public ClassLoader run() {
- return new BundleDelegatingClassLoader(c.getBundle(),
+ return new BundleDelegatingClassLoader(c.getBundle(),
this.getClass().getClassLoader());
}
});
@@ -69,7 +69,7 @@ public class BlueprintBus extends ExtensionManagerBus {
if (context == null) {
id = super.getId();
} else {
- id = context.getBundle().getSymbolicName() + "-"
+ id = context.getBundle().getSymbolicName() + "-"
+ DEFAULT_BUS_ID + Integer.toString(this.hashCode());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintNameSpaceHandlerFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintNameSpaceHandlerFactory.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintNameSpaceHandlerFactory.java
index 7f5d27c..ccabfbb 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintNameSpaceHandlerFactory.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BlueprintNameSpaceHandlerFactory.java
@@ -23,7 +23,7 @@ public interface BlueprintNameSpaceHandlerFactory {
* Creates aries blueprint NamespaceHandler.
* The return type is untyped as aries blueprint is an
* optional import
- *
+ *
* @return handler
*/
Object createNamespaceHandler();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
index 8314211..acd89df 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
@@ -56,13 +56,13 @@ public class BundleDelegatingClassLoader extends ClassLoader {
});
} catch (PrivilegedActionException e) {
Exception cause = e.getException();
-
+
if (cause instanceof ClassNotFoundException) {
throw (ClassNotFoundException)cause;
} else {
throw (RuntimeException)cause;
}
- }
+ }
}
protected URL findResource(final String name) {
@@ -70,7 +70,7 @@ public class BundleDelegatingClassLoader extends ClassLoader {
public URL run() {
return bundle.getResource(name);
}
- });
+ });
if (classLoader != null && resource == null) {
resource = classLoader.getResource(name);
}
@@ -85,23 +85,23 @@ public class BundleDelegatingClassLoader extends ClassLoader {
public Enumeration<URL> run() throws IOException {
return bundle.getResources(name);
}
-
+
});
} catch (PrivilegedActionException e) {
Exception cause = e.getException();
-
+
if (cause instanceof IOException) {
throw (IOException)cause;
} else {
throw (RuntimeException)cause;
}
}
-
+
if (urls == null) {
urls = Collections.enumeration(new ArrayList<>());
}
-
- return urls;
+
+ return urls;
}
protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
@@ -113,11 +113,11 @@ public class BundleDelegatingClassLoader extends ClassLoader {
try {
clazz = classLoader.loadClass(name);
} catch (ClassNotFoundException e) {
- throw new ClassNotFoundException(name + " from bundle " + bundle.getBundleId()
+ throw new ClassNotFoundException(name + " from bundle " + bundle.getBundleId()
+ " (" + bundle.getSymbolicName() + ")", cnfe);
}
} else {
- throw new ClassNotFoundException(name + " from bundle " + bundle.getBundleId()
+ throw new ClassNotFoundException(name + " from bundle " + bundle.getBundleId()
+ " (" + bundle.getSymbolicName() + ")", cnfe);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java b/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java
index 2ea3559..57ae5f3 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java
@@ -28,12 +28,12 @@ import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser;
import org.osgi.service.blueprint.reflect.Metadata;
-public class BusDefinitionParser
+public class BusDefinitionParser
extends AbstractBPBeanDefinitionParser {
public BusDefinitionParser() {
}
-
+
public Metadata parse(Element element, ParserContext context) {
String bname = element.hasAttribute("bus") ? element.getAttribute("bus") : "cxf";
String id = element.hasAttribute("id") ? element.getAttribute("id") : null;
@@ -46,7 +46,7 @@ public class BusDefinitionParser
}
return cxfBean;
}
- protected void processBusAttribute(Element element, ParserContext ctx,
+ protected void processBusAttribute(Element element, ParserContext ctx,
MutableBeanMetadata bean, String val) {
//nothing
}
@@ -61,7 +61,7 @@ public class BusDefinitionParser
|| "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)
|| "features".equals(name)) {
bean.addProperty(name, parseListData(ctx, bean, el));
- } else if ("properties".equals(name)) {
+ } else if ("properties".equals(name)) {
bean.addProperty(name, parseMapData(ctx, bean, el));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
index 03a8f17..f90567d 100644
--- a/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
@@ -39,12 +39,12 @@ import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
/**
- *
+ *
*/
public class ConfigurerImpl implements Configurer {
private static final Logger LOG = LogUtils.getL7dLogger(ConfigurerImpl.class);
BlueprintContainer container;
-
+
private final Map<String, List<MatcherHolder>> wildCardBeanDefinitions
= new TreeMap<String, List<MatcherHolder>>();
@@ -63,8 +63,8 @@ public class ConfigurerImpl implements Configurer {
return literalCharsLen1.compareTo(literalCharsLen2) * -1;
}
}
-
-
+
+
public ConfigurerImpl(BlueprintContainer con) {
container = con;
initializeWildcardMap();
@@ -83,7 +83,7 @@ public class ConfigurerImpl implements Configurer {
String orig = s;
if (s.charAt(0) == '*') {
//old wildcard
- s = "." + s.replaceAll("\\.", "\\.");
+ s = "." + s.replaceAll("\\.", "\\.");
}
Matcher matcher = Pattern.compile(s).matcher("");
List<MatcherHolder> m = wildCardBeanDefinitions.get(cls.getName());
@@ -101,7 +101,7 @@ public class ConfigurerImpl implements Configurer {
public void configureBean(Object beanInstance) {
configureBean(null, beanInstance, true);
}
-
+
public void configureBean(String bn, Object beanInstance) {
configureBean(bn, beanInstance, true);
}
@@ -109,14 +109,14 @@ public class ConfigurerImpl implements Configurer {
if (null == bn) {
bn = getBeanName(beanInstance);
}
-
+
if (null == bn) {
return;
}
if (checkWildcards) {
configureWithWildCard(bn, beanInstance);
}
-
+
if (container instanceof ExtendedBlueprintContainer) {
ComponentMetadata cm = null;
try {
@@ -129,10 +129,10 @@ public class ConfigurerImpl implements Configurer {
}
}
}
-
+
private void configureWithWildCard(String bn, Object beanInstance) {
if (!wildCardBeanDefinitions.isEmpty()) {
- Class<?> clazz = beanInstance.getClass();
+ Class<?> clazz = beanInstance.getClass();
while (!Object.class.equals(clazz)) {
String className = clazz.getName();
List<MatcherHolder> matchers = wildCardBeanDefinitions.get(className);
@@ -174,13 +174,13 @@ public class ConfigurerImpl implements Configurer {
LogUtils.log(LOG, Level.WARNING, "ERROR_DETERMINING_BEAN_NAME_EXC", ex);
}
}
-
+
if (null == beanName) {
LogUtils.log(LOG, Level.FINE, "COULD_NOT_DETERMINE_BEAN_NAME_MSG",
beanInstance.getClass().getName());
}
-
+
return beanName;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
index 376869b..644a878 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
@@ -34,7 +34,7 @@ import org.apache.cxf.common.util.StringUtils;
public class Extension {
protected static final Logger LOG = LogUtils.getL7dLogger(Extension.class);
-
+
protected String className;
protected ClassLoader classloader;
protected volatile Class<?> clazz;
@@ -46,10 +46,10 @@ public class Extension {
protected volatile Object obj;
protected boolean optional;
protected boolean notFound;
-
+
public Extension() {
}
-
+
public Extension(Class<?> cls, Class<?> inf) {
clazz = cls;
intf = inf;
@@ -65,7 +65,7 @@ public class Extension {
public Extension(ClassLoader loader) {
classloader = loader;
}
-
+
public Extension(Extension ext) {
className = ext.className;
interfaceName = ext.interfaceName;
@@ -78,21 +78,21 @@ public class Extension {
args = ext.args;
optional = ext.optional;
}
-
+
public void setOptional(boolean b) {
optional = b;
}
public boolean isOptional() {
return optional;
}
-
+
public String getName() {
return StringUtils.isEmpty(interfaceName) ? className : interfaceName;
}
public Object getLoadedObject() {
return obj;
}
-
+
public Extension cloneNoObject() {
Extension ext = new Extension(this);
ext.obj = null;
@@ -100,7 +100,7 @@ public class Extension {
ext.intf = null;
return ext;
}
-
+
public String toString() {
StringBuilder buf = new StringBuilder();
buf.append("class: ");
@@ -119,19 +119,19 @@ public class Extension {
n++;
}
buf.append(")");
- return buf.toString();
+ return buf.toString();
}
-
+
public String getClassname() {
return className;
}
-
+
public void setClassname(String i) {
clazz = null;
notFound = false;
className = i;
}
-
+
public String getInterfaceName() {
return interfaceName;
}
@@ -144,19 +144,19 @@ public class Extension {
public boolean isDeferred() {
return deferred;
}
-
+
public void setDeferred(boolean d) {
deferred = d;
}
-
+
public Collection<String> getNamespaces() {
return namespaces;
}
-
+
public void setArgs(Object a[]) {
args = a;
}
-
+
protected Class<?> tryClass(String name, ClassLoader cl) {
Throwable origEx = null;
if (classloader != null) {
@@ -167,7 +167,7 @@ public class Extension {
//save the exception though as this is likely the important one
origEx = nex;
}
- }
+ }
try {
return cl.loadClass(name);
} catch (Throwable ex) {
@@ -186,7 +186,7 @@ public class Extension {
}
return null;
}
-
+
public Class<?> getClassObject(ClassLoader cl) {
if (notFound) {
return null;
@@ -230,14 +230,14 @@ public class Extension {
} else {
obj = con.newInstance(b, args);
}
- return obj;
+ return obj;
} else if (args != null) {
Constructor<?> con = cls.getConstructor(Object[].class);
obj = con.newInstance(args);
- return obj;
+ return obj;
}
} catch (InvocationTargetException ex) {
- throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()),
+ throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()),
ex.getCause());
} catch (InstantiationException ex) {
throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()), ex);
@@ -257,7 +257,7 @@ public class Extension {
} catch (InvocationTargetException ex) {
notFound = true;
if (!optional) {
- throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()),
+ throw new ExtensionException(new Message("PROBLEM_CREATING_EXTENSION_CLASS", LOG, cls.getName()),
ex.getCause());
} else {
LOG.log(Level.FINE, "Could not load optional extension " + getName(), (Throwable)ex);
@@ -287,7 +287,7 @@ public class Extension {
}
return obj;
}
-
+
public Class<?> loadInterface(ClassLoader cl) {
if (intf != null || notFound) {
return intf;
@@ -299,6 +299,6 @@ public class Extension {
}
return intf;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/ExtensionException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionException.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionException.java
index 7610cfa..7f20145 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionException.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionException.java
@@ -25,7 +25,7 @@ import org.apache.cxf.common.i18n.UncheckedException;
public class ExtensionException extends UncheckedException {
private static final long serialVersionUID = 1L;
-
+
/**
* Constructs a <code>ExtensionException</code> with the provided detail message.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManager.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManager.java
index eb0e6fc..396e784 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManager.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManager.java
@@ -21,9 +21,9 @@ package org.apache.cxf.bus.extension;
public interface ExtensionManager {
void activateAll();
-
+
<T> void activateAllByType(Class<T> type);
-
+
<T> T getExtension(String ns, Class<T> type);
-
+
}
[37/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
index d2e0ea1..cfb45ff 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
@@ -61,12 +61,12 @@ import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.transport.common.gzip.GZIPFeature;
/**
- *
+ *
*/
public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
-
- private static final String EXTRA_DOCUMENTATION
- = AnnotationsFactoryBeanListener.class.getName() + ".EXTRA_DOCS";
+
+ private static final String EXTRA_DOCUMENTATION
+ = AnnotationsFactoryBeanListener.class.getName() + ".EXTRA_DOCS";
/** {@inheritDoc}*/
public void handleEvent(Event ev, AbstractServiceFactoryBean factory, Object... args) {
@@ -118,7 +118,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
InterfaceInfo i = ep.getEndpointInfo().getInterface();
List<WSDLDocumentation> docs = CastUtils.cast((List<?>)i.removeProperty(EXTRA_DOCUMENTATION));
if (docs != null) {
- addDocumentation(ep,
+ addDocumentation(ep,
WSDLDocumentation.Placement.SERVICE,
docs.toArray(new WSDLDocumentation[docs.size()]));
}
@@ -139,7 +139,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
}
}
}
- break;
+ break;
}
case SERVER_CREATED: {
Class<?> cls = (Class<?>)args[2];
@@ -217,7 +217,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
}
((FactoryInvoker)i).setFactory(f);
}
-
+
}
}
@@ -239,9 +239,9 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
} else {
obj = s;
}
- ep.getEndpointInfo().setProperty(prop.key(), obj);
+ ep.getEndpointInfo().setProperty(prop.key(), obj);
}
-
+
}
private Object createObject(Class<?> cls, Endpoint ep, Bus bus) {
@@ -253,7 +253,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
return cls.getConstructor(Endpoint.class).newInstance(ep);
} catch (NoSuchMethodException e2) {
return cls.newInstance();
- }
+ }
}
} catch (Exception ex) {
throw new ServiceConstructionException(ex);
@@ -262,7 +262,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
private void setDataBinding(AbstractServiceFactoryBean factory,
DataBinding annotation) {
- if (annotation != null && factory.getDataBinding(false) == null) {
+ if (annotation != null && factory.getDataBinding(false) == null) {
try {
if (!StringUtils.isEmpty(annotation.ref())) {
factory.setDataBinding(factory.getBus().getExtension(ResourceManager.class)
@@ -365,7 +365,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
inf.setProperty(Message.SCHEMA_VALIDATION_TYPE, annotation.type());
}
}
-
+
private void addDocumentation(OperationInfo inf, Placement defPlace, WSDLDocumentation ... values) {
List<WSDLDocumentation> later = new ArrayList<>();
for (WSDLDocumentation doc : values) {
@@ -383,7 +383,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
case PORT_TYPE_OPERATION_OUTPUT:
inf.getOutput().setDocumentation(doc.value());
break;
- case FAULT_MESSAGE:
+ case FAULT_MESSAGE:
case PORT_TYPE_OPERATION_FAULT: {
for (FaultInfo f : inf.getFaults()) {
if (doc.faultClass().equals(f.getProperty(Class.class.getName()))) {
@@ -417,7 +417,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
}
}
- private void addDocumentation(InterfaceInfo interfaceInfo,
+ private void addDocumentation(InterfaceInfo interfaceInfo,
WSDLDocumentation.Placement defPlace,
WSDLDocumentation ... values) {
List<WSDLDocumentation> later = new ArrayList<>();
@@ -450,7 +450,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
}
}
}
- private void addDocumentation(Endpoint ep,
+ private void addDocumentation(Endpoint ep,
WSDLDocumentation.Placement defPlace,
WSDLDocumentation ... values) {
for (WSDLDocumentation doc : values) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java
index a523fbf..b16d21c 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListener.java
@@ -20,7 +20,7 @@
package org.apache.cxf.service.factory;
/**
- *
+ *
*/
public interface FactoryBeanListener {
enum Event {
@@ -29,7 +29,7 @@ public interface FactoryBeanListener {
* for setting up any state the listener may need to maintain.
*/
START_CREATE,
-
+
/**
* Event fired at the very end of processing. One parameter is passed
* in which is the Service object that was created.
@@ -42,104 +42,104 @@ public interface FactoryBeanListener {
* of the URL of the wsdl.
*/
CREATE_FROM_WSDL,
-
+
/**
* Called at the start of processing when it detects that the service
* is to be created based on a Java class. One Class<?> parameter
* of the class that is being analyzed.
*/
CREATE_FROM_CLASS,
-
+
/**
* Called after the wsdl is loaded/parsed. Single parameter of the
* WSS4J Definition of the WSDL.
*/
WSDL_LOADED,
-
+
/**
* Called after the Service is set into the Factory after which the getService()
* call will return a valid value. One parameter of the Service object.
*/
- SERVICE_SET,
-
-
+ SERVICE_SET,
+
+
/**
* OperationInfo, Method
*/
INTERFACE_OPERATION_BOUND,
-
+
/**
* OperationInfo, Method, MessageInfo
*/
OPERATIONINFO_IN_MESSAGE_SET,
OPERATIONINFO_OUT_MESSAGE_SET,
-
+
/**
* OperationInfo, Class<? extends Throwable>, FaultInfo
*/
OPERATIONINFO_FAULT,
-
+
/**
* InterfaceInfo, Class<?>
*/
INTERFACE_CREATED,
-
+
/**
* DataBinding
*/
DATABINDING_INITIALIZED,
-
+
/**
* EndpointInfo, Endpoint, Class
*/
ENDPOINT_CREATED,
-
+
/**
* Server, targetObject, Class
*/
- PRE_SERVER_CREATE,
+ PRE_SERVER_CREATE,
/**
* Server, targetObject, Class
*/
- SERVER_CREATED,
-
+ SERVER_CREATED,
+
/**
* BindingInfo, BindingOperationInfo, Implementation Method
*/
BINDING_OPERATION_CREATED,
-
+
/**
* BindingInfo
*/
- BINDING_CREATED,
-
+ BINDING_CREATED,
+
/**
* Endpoint
*/
- PRE_CLIENT_CREATE,
+ PRE_CLIENT_CREATE,
/**
* Endpoint, Client
*/
- CLIENT_CREATED,
-
+ CLIENT_CREATED,
+
/**
- * EndpointInfo, Endpoint, SEI Class, Class
+ * EndpointInfo, Endpoint, SEI Class, Class
*/
ENDPOINT_SELECTED,
-
+
/**
* EndpointInfo
*/
- ENDPOINTINFO_CREATED,
-
+ ENDPOINTINFO_CREATED,
+
/**
* Class[], InvokationHandler, Proxy
*/
PROXY_CREATED,
};
-
+
void handleEvent(Event ev, AbstractServiceFactoryBean factory, Object ... args);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java
index e91000b..af07871 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/FactoryBeanListenerManager.java
@@ -29,15 +29,15 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
import org.apache.cxf.configuration.ConfiguredBeanLocator;
/**
- *
+ *
*/
@NoJSR250Annotations(unlessNull = "bus")
public class FactoryBeanListenerManager {
Bus bus;
-
+
CopyOnWriteArrayList<FactoryBeanListener> listeners
= new CopyOnWriteArrayList<FactoryBeanListener>();
-
+
public FactoryBeanListenerManager() {
listeners.add(new AnnotationsFactoryBeanListener());
}
@@ -45,13 +45,13 @@ public class FactoryBeanListenerManager {
this();
setBus(b);
}
-
+
@Resource
public final void setBus(Bus bus) {
this.bus = bus;
-
+
this.bus.setExtension(this, FactoryBeanListenerManager.class);
-
+
ConfiguredBeanLocator loc = bus.getExtension(ConfiguredBeanLocator.class);
if (loc != null) {
for (FactoryBeanListener f : loc.getBeansOfType(FactoryBeanListener.class)) {
@@ -59,17 +59,17 @@ public class FactoryBeanListenerManager {
}
}
}
-
+
public List<FactoryBeanListener> getListeners() {
return listeners;
}
-
+
public void addListener(FactoryBeanListener l) {
listeners.addIfAbsent(l);
}
-
+
public void removeListener(FactoryBeanListener l) {
listeners.remove(l);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java b/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
index 8e9b308..ed48454 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java
@@ -27,32 +27,32 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.OperationInfo;
-public class SimpleMethodDispatcher
+public class SimpleMethodDispatcher
implements org.apache.cxf.service.invoker.MethodDispatcher {
- private Map<Method, Map<BindingInfo, BindingOperationInfo>> infoMap =
+ private Map<Method, Map<BindingInfo, BindingOperationInfo>> infoMap =
new ConcurrentHashMap<Method, Map<BindingInfo, BindingOperationInfo>>(16, 0.75f, 2);
- private Map<OperationInfo, Method> opToMethod =
+ private Map<OperationInfo, Method> opToMethod =
new ConcurrentHashMap<OperationInfo, Method>(16, 0.75f, 2);
- private Map<Method, OperationInfo> methodToOp =
+ private Map<Method, OperationInfo> methodToOp =
new ConcurrentHashMap<Method, OperationInfo>(16, 0.75f, 2);
public SimpleMethodDispatcher() {
//complete
}
-
+
public void bind(OperationInfo o, Method... methods) {
Method primary = methods[0];
for (Method m : methods) {
- methodToOp.put(m, o);
-
- Map<BindingInfo, BindingOperationInfo> biToBop
+ methodToOp.put(m, o);
+
+ Map<BindingInfo, BindingOperationInfo> biToBop
= new ConcurrentHashMap<BindingInfo, BindingOperationInfo>(4, 0.75f, 2);
infoMap.put(m, biToBop);
}
-
+
opToMethod.put(o, primary);
-
+
if (o.isUnwrappedCapable()) {
opToMethod.put(o.getUnwrappedOperation(), primary);
}
@@ -63,19 +63,19 @@ public class SimpleMethodDispatcher
if (bops == null) {
return null;
}
-
+
BindingOperationInfo bop = bops.get(endpoint.getEndpointInfo().getBinding());
if (bop == null) {
OperationInfo o = methodToOp.get(method);
if (o == null) {
return null;
}
-
+
BindingInfo b = endpoint.getEndpointInfo().getBinding();
for (BindingOperationInfo bop2 : b.getOperations()) {
if (bop2.getOperationInfo().equals(o)) {
bop2 = getRealOperation(o, bop2);
-
+
bops.put(b, bop2);
return bop2;
}
@@ -96,7 +96,7 @@ public class SimpleMethodDispatcher
public Method getMethod(BindingOperationInfo op) {
return opToMethod.get(op.getOperationInfo());
}
-
+
public Method getPrimaryMethod(OperationInfo op) {
return opToMethod.get(op);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java b/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
index f201571..2f2bd60 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/AbstractInvoker.java
@@ -43,19 +43,19 @@ import org.apache.cxf.service.model.BindingOperationInfo;
*/
public abstract class AbstractInvoker implements Invoker {
private static final Logger LOG = LogUtils.getL7dLogger(AbstractInvoker.class);
-
+
public Object invoke(Exchange exchange, Object o) {
final Object serviceObject = getServiceObject(exchange);
try {
BindingOperationInfo bop = exchange.getBindingOperationInfo();
- MethodDispatcher md = (MethodDispatcher)
+ MethodDispatcher md = (MethodDispatcher)
exchange.getService().get(MethodDispatcher.class.getName());
Method m = bop == null ? null : md.getMethod(bop);
if (m == null && bop == null) {
LOG.severe(new Message("MISSING_BINDING_OPERATION", LOG).toString());
- throw new Fault(new Message("EXCEPTION_INVOKING_OBJECT", LOG,
+ throw new Fault(new Message("EXCEPTION_INVOKING_OBJECT", LOG,
"No binding operation info", "unknown method", "unknown"));
}
List<Object> params = null;
@@ -64,13 +64,13 @@ public abstract class AbstractInvoker implements Invoker {
} else if (o != null) {
params = new MessageContentsList(o);
}
-
+
m = adjustMethodAndParams(m, exchange, params, serviceObject.getClass());
-
+
//Method m = (Method)bop.getOperationInfo().getProperty(Method.class.getName());
m = matchMethod(m, serviceObject);
-
-
+
+
return invoke(exchange, serviceObject, m, params);
} finally {
releaseServiceObject(exchange, serviceObject);
@@ -94,35 +94,35 @@ public abstract class AbstractInvoker implements Invoker {
}
res = performInvocation(exchange, serviceObject, m, paramArray);
-
+
if (exchange.isOneWay()) {
return null;
}
-
+
return new MessageContentsList(res);
} catch (InvocationTargetException e) {
-
+
Throwable t = e.getCause();
-
+
if (t == null) {
t = e;
}
-
+
checkSuspendedInvocation(exchange, serviceObject, m, params, t);
-
+
exchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
-
-
+
+
for (Class<?> cl : m.getExceptionTypes()) {
if (cl.isInstance(t)) {
- exchange.getInMessage().put(FaultMode.class,
- FaultMode.CHECKED_APPLICATION_FAULT);
+ exchange.getInMessage().put(FaultMode.class,
+ FaultMode.CHECKED_APPLICATION_FAULT);
}
}
-
+
if (t instanceof Fault) {
- exchange.getInMessage().put(FaultMode.class,
- FaultMode.CHECKED_APPLICATION_FAULT);
+ exchange.getInMessage().put(FaultMode.class,
+ FaultMode.CHECKED_APPLICATION_FAULT);
throw (Fault)t;
}
throw createFault(t, m, params, true);
@@ -138,42 +138,42 @@ public abstract class AbstractInvoker implements Invoker {
checkSuspendedInvocation(exchange, serviceObject, m, params, e);
exchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(e, m, params, false);
- }
+ }
}
-
+
protected void checkSuspendedInvocation(Exchange exchange,
- Object serviceObject,
- Method m,
- List<Object> params,
+ Object serviceObject,
+ Method m,
+ List<Object> params,
Throwable t) {
if (t instanceof SuspendedInvocationException) {
-
+
if (LOG.isLoggable(Level.FINE)) {
- LOG.log(Level.FINE, "SUSPENDED_INVOCATION_EXCEPTION",
+ LOG.log(Level.FINE, "SUSPENDED_INVOCATION_EXCEPTION",
new Object[]{serviceObject, m.toString(), params});
}
throw (SuspendedInvocationException)t;
}
}
-
+
protected Fault createFault(Throwable ex, Method m, List<Object> params, boolean checked) {
-
+
if (checked) {
return new Fault(ex);
} else {
- String message = (ex == null) ? "" : ex.getMessage();
- String method = (m == null) ? "<null>" : m.toString();
- return new Fault(new Message("EXCEPTION_INVOKING_OBJECT", LOG,
+ String message = (ex == null) ? "" : ex.getMessage();
+ String method = (m == null) ? "<null>" : m.toString();
+ return new Fault(new Message("EXCEPTION_INVOKING_OBJECT", LOG,
message, method, params),
- ex);
+ ex);
}
}
-
+
protected Object performInvocation(Exchange exchange, final Object serviceObject, Method m,
Object[] paramArray) throws Exception {
paramArray = insertExchange(m, paramArray, exchange);
if (LOG.isLoggable(Level.FINER)) {
- LOG.log(Level.FINER, "INVOKING_METHOD", new Object[] {serviceObject,
+ LOG.log(Level.FINER, "INVOKING_METHOD", new Object[] {serviceObject,
m,
Arrays.asList(paramArray)});
}
@@ -199,7 +199,7 @@ public abstract class AbstractInvoker implements Invoker {
}
return newParams;
}
-
+
/**
* Creates and returns a service object depending on the scope.
*/
@@ -219,7 +219,7 @@ public abstract class AbstractInvoker implements Invoker {
* targetObject to avoid the IllegalArgumentException when invoking the
* method on the target object. The methodToMatch will be returned if the
* targetObject doesn't have a similar method.
- *
+ *
* @param methodToMatch The method to be used when finding a matching method
* in targetObject
* @param targetObject The object to search in for the method.
@@ -242,7 +242,7 @@ public abstract class AbstractInvoker implements Invoker {
/**
* Return whether the given object is a J2SE dynamic proxy.
- *
+ *
* @param object the object to check
* @see java.lang.reflect.Proxy#isProxyClass
*/
@@ -256,7 +256,7 @@ public abstract class AbstractInvoker implements Invoker {
* one. E.g. the method may be IFoo.bar() and the target class may be
* DefaultFoo. In this case, the method may be DefaultFoo.bar(). This
* enables attributes on that method to be found.
- *
+ *
* @param method method to be invoked, which may come from an interface
* @param targetClass target class for the current invocation. May be
* <code>null</code> or may not even implement the method.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/BeanInvoker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/BeanInvoker.java b/core/src/main/java/org/apache/cxf/service/invoker/BeanInvoker.java
index 34325cc..ced9a4d 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/BeanInvoker.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/BeanInvoker.java
@@ -24,7 +24,7 @@ import org.apache.cxf.message.Exchange;
/**
* Invoker for externally created service objects.
- *
+ *
*/
@NoJSR250Annotations
public class BeanInvoker extends AbstractInvoker {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/Factory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/Factory.java b/core/src/main/java/org/apache/cxf/service/invoker/Factory.java
index d4c6305..9688c2a 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/Factory.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/Factory.java
@@ -22,18 +22,18 @@ import org.apache.cxf.message.Exchange;
/**
* Represents an object factory.
- *
+ *
* Used at invoke time to find the object that the invokation will use
*/
public interface Factory {
-
+
/**
- * Creates the object that will be used for the invoke
- * @param e
+ * Creates the object that will be used for the invoke
+ * @param e
* @throws Throwable
*/
Object create(Exchange e) throws Throwable;
-
+
/**
* Post invoke, this is called to allow the factory to release
* the object, store it, etc...
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java b/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java
index dec77c8..8c819c4 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/FactoryInvoker.java
@@ -28,7 +28,7 @@ import org.apache.cxf.message.Exchange;
/**
* This invoker implementation calls a Factory to create the service object.
- *
+ *
*/
public class FactoryInvoker extends AbstractInvoker {
static final ResourceBundle BUNDLE = BundleUtils.getBundle(FactoryInvoker.class);
@@ -37,7 +37,7 @@ public class FactoryInvoker extends AbstractInvoker {
/**
* Create a FactoryInvoker object.
- *
+ *
* @param factory the factory used to create service object.
*/
public FactoryInvoker(Factory factory) {
@@ -58,12 +58,12 @@ public class FactoryInvoker extends AbstractInvoker {
throw new Fault(new Message("CREATE_SERVICE_OBJECT_EXC", BUNDLE), e);
}
}
-
+
public void releaseServiceObject(final Exchange ex, Object obj) {
factory.release(ex, obj);
}
-
+
public boolean isSingletonFactory() {
- return factory instanceof SingletonFactory;
+ return factory instanceof SingletonFactory;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java b/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java
index 5a6bc70..c9f3272 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/MethodDispatcher.java
@@ -30,9 +30,9 @@ import org.apache.cxf.service.model.OperationInfo;
*/
public interface MethodDispatcher {
Method getMethod(BindingOperationInfo op);
-
+
BindingOperationInfo getBindingOperation(Method m, Endpoint endpoint);
-
+
void bind(OperationInfo o, Method... methods);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java b/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java
index b72f6a2..7329a99 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/PooledFactory.java
@@ -27,7 +27,7 @@ import org.apache.cxf.message.Exchange;
/**
* Factory the maintains a pool of instances that are used.
- *
+ *
* Can optionally create more instances than the size of the queue
*/
public class PooledFactory implements Factory {
@@ -58,10 +58,10 @@ public class PooledFactory implements Factory {
* Pool of instances constructed from the given factory
* @param factory
* @param max the absolute maximum number to create and pool
- * @param createMore If the pool is empty, but max objects have already
- * been constructed, should more be constructed on a per-request basis (and
- * then discarded when done) or should requests block until instances are
- * released back into the pool.
+ * @param createMore If the pool is empty, but max objects have already
+ * been constructed, should more be constructed on a per-request basis (and
+ * then discarded when done) or should requests block until instances are
+ * released back into the pool.
*/
public PooledFactory(final Factory factory, int max, boolean createMore) {
this.factory = factory;
@@ -73,9 +73,9 @@ public class PooledFactory implements Factory {
this.count = 0;
this.createMore = createMore;
}
-
+
/**
- * Pool constructed from the give Collection of objects.
+ * Pool constructed from the give Collection of objects.
* @param objs The collection of objects to pre-populate the pool
*/
public PooledFactory(Collection<Object> objs) {
@@ -85,7 +85,7 @@ public class PooledFactory implements Factory {
/** {@inheritDoc}*/
public Object create(Exchange ex) throws Throwable {
- if (factory == null
+ if (factory == null
|| ((count >= max) && !createMore)) {
return pool.take();
}
@@ -97,13 +97,13 @@ public class PooledFactory implements Factory {
}
protected synchronized Object createObject(Exchange e) throws Throwable {
//recheck the count/max stuff now that we're in a sync block
- if (factory == null
+ if (factory == null
|| ((count >= max) && !createMore)) {
return pool.take();
}
-
+
count++;
- return factory.create(e);
+ return factory.create(e);
}
/** {@inheritDoc}*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/SessionFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/SessionFactory.java b/core/src/main/java/org/apache/cxf/service/invoker/SessionFactory.java
index 800dec3..689c17a 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/SessionFactory.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/SessionFactory.java
@@ -25,15 +25,15 @@ import org.apache.cxf.service.Service;
/**
* Creates a new instance for each session.
- *
- * This may have restrictions on what the bean can look like. For example,
+ *
+ * This may have restrictions on what the bean can look like. For example,
* some session implementations require the beans to be Serializable
*/
public class SessionFactory implements Factory {
-
+
Factory factory;
boolean createIfNotExist;
-
+
public SessionFactory(Class<?> svcClass) {
this(new PerRequestFactory(svcClass), true);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/SingletonFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/SingletonFactory.java b/core/src/main/java/org/apache/cxf/service/invoker/SingletonFactory.java
index ec3b827..ce73c88 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/SingletonFactory.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/SingletonFactory.java
@@ -23,7 +23,7 @@ import org.apache.cxf.message.Exchange;
/**
* Always returns a single instance of the bean.
- *
+ *
* This is generally the default.
*/
public class SingletonFactory implements Factory {
@@ -52,7 +52,7 @@ public class SingletonFactory implements Factory {
bean = factory.create(e);
}
}
-
+
/** {@inheritDoc}*/
public void release(Exchange ex, Object o) {
//nothing to do
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java b/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
index d5911b3..b7840f5 100644
--- a/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
+++ b/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
@@ -26,25 +26,25 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
/**
- * Factory that will query the Spring ApplicationContext for the
+ * Factory that will query the Spring ApplicationContext for the
* appropriate bean for each request.
- *
- * This can be expensive. If the bean is "prototype" or similar such that a
- * new instance is created each time, this could slow things down. In that
+ *
+ * This can be expensive. If the bean is "prototype" or similar such that a
+ * new instance is created each time, this could slow things down. In that
* case, it's recommended to use this in conjunction with the PooledFactory
* to pool the beans or the SessionFactory or similar.
*/
public class SpringBeanFactory implements Factory, ApplicationContextAware {
volatile ApplicationContext ctx;
final String beanName;
-
+
public SpringBeanFactory(String name) {
beanName = name;
}
public SpringBeanFactory(Class<?> c, String[] args) { //NOPMD
beanName = args[0];
}
-
+
/** {@inheritDoc}*/
public Object create(Exchange e) throws Throwable {
if (ctx == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java b/core/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java
index 64c5ae5..0402a7f 100644
--- a/core/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java
+++ b/core/src/main/java/org/apache/cxf/service/model/AbstractDescriptionElement.java
@@ -22,5 +22,5 @@ package org.apache.cxf.service.model;
public abstract class AbstractDescriptionElement extends AbstractPropertiesHolder {
public abstract DescriptionInfo getDescription();
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java b/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
index baabede..95479b7 100644
--- a/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
+++ b/core/src/main/java/org/apache/cxf/service/model/AbstractMessageContainer.java
@@ -31,16 +31,16 @@ import javax.xml.namespace.QName;
public abstract class AbstractMessageContainer extends AbstractPropertiesHolder implements NamedItem {
protected QName mName;
private OperationInfo operation;
- private Map<QName, MessagePartInfo> messageParts
+ private Map<QName, MessagePartInfo> messageParts
= new LinkedHashMap<QName, MessagePartInfo>(4);
private List<MessagePartInfo> outOfBandParts;
private String documentation;
-
-
+
+
/**
* Initializes a new instance of the <code>MessagePartContainer</code>.
* @param operation the operation.
- * @param nm
+ * @param nm
*/
AbstractMessageContainer(OperationInfo op, QName nm) {
operation = op;
@@ -53,11 +53,11 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
public void setMessageDocumentation(String doc) {
documentation = doc;
}
-
+
public QName getName() {
return mName;
}
-
+
/**
* Returns the operation of this container.
*
@@ -82,14 +82,14 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
addMessagePart(part);
return part;
}
-
+
public QName getMessagePartQName(String name) {
return new QName(this.getOperation().getInterface().getName().getNamespaceURI(), name);
}
-
+
public MessagePartInfo addMessagePart(String name) {
return addMessagePart(getMessagePartQName(name));
- }
+ }
/**
* Adds a message part to this container.
*
@@ -98,7 +98,7 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
public void addMessagePart(MessagePartInfo part) {
if (messageParts.containsKey(part.getName())) {
part.setIndex(messageParts.get(part.getName()).getIndex());
- } else {
+ } else {
part.setIndex(messageParts.size());
}
messageParts.put(part.getName(), part);
@@ -146,7 +146,7 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
messageParts.remove(name);
}
}
-
+
/**
* Returns the message part with the given name, if found.
*
@@ -171,7 +171,7 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
}
return mpi;
}
-
+
/**
* Returns the n'th message part.
*
@@ -189,9 +189,9 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
n--;
}
return null;
- }
-
-
+ }
+
+
public MessagePartInfo addOutOfBandMessagePart(QName name) {
if (name == null) {
throw new IllegalArgumentException("Invalid name [null]");
@@ -206,8 +206,8 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
return part;
}
-
-
+
+
/**
* Returns all message parts for this message.
*
@@ -242,16 +242,16 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
}
return Collections.unmodifiableList(outOfBandParts);
}
-
+
public int size() {
return messageParts.size() + getOutOfBandParts().size();
}
-
-
+
+
public int hashCode() {
return mName == null ? -1 : mName.hashCode();
}
-
+
public boolean equals(Object o) {
if (o == this) {
return true;
@@ -261,7 +261,7 @@ public abstract class AbstractMessageContainer extends AbstractPropertiesHolder
return false;
}
AbstractMessageContainer oi = (AbstractMessageContainer)o;
- return equals(mName, oi.mName)
+ return equals(mName, oi.mName)
&& equals(messageParts, oi.messageParts)
&& equals(outOfBandParts, oi.outOfBandParts);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
index 8321fb3..ac12b68 100644
--- a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
+++ b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
@@ -31,13 +31,13 @@ import javax.xml.namespace.QName;
public abstract class AbstractPropertiesHolder implements Extensible {
private AbstractPropertiesHolder delegate;
private boolean delegateProperties;
-
+
private AtomicReference<Map<String, Object>> propertyMap = new AtomicReference<Map<String, Object>>();
private AtomicReference<Object[]> extensors = new AtomicReference<Object[]>();
private Map<QName, Object> extensionAttributes;
private String documentation;
-
-
+
+
public final void setDelegate(AbstractPropertiesHolder p, boolean props) {
delegate = p;
delegateProperties = props;
@@ -65,7 +65,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
propertyMap.set(null);
}
}
-
+
public String getDocumentation() {
if (delegate != null) {
return delegate.getDocumentation();
@@ -103,7 +103,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
}
return propertyMap.get().remove(name);
}
-
+
public <T> T getProperty(String name, Class<T> cls) {
return cls.cast(getProperty(name));
}
@@ -117,7 +117,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
}
return false;
}
-
+
public void setProperty(String name, Object v) {
if (delegate != null && delegateProperties) {
delegate.setProperty(name, v);
@@ -132,7 +132,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
propertyMap.get().put(name, v);
}
}
-
+
public boolean containsExtensor(Object el) {
if (delegate != null) {
return delegate.containsExtensor(el);
@@ -189,7 +189,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
if (delegate != null) {
return delegate.getExtensors(cls);
}
-
+
Object exts[] = extensors.get();
if (exts == null) {
return null;
@@ -209,9 +209,9 @@ public abstract class AbstractPropertiesHolder implements Extensible {
}
return extensors;
}
-
-
- public Object getExtensionAttribute(QName name) {
+
+
+ public Object getExtensionAttribute(QName name) {
if (delegate != null) {
return delegate.getExtensionAttribute(name);
}
@@ -224,7 +224,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
}
return extensionAttributes;
}
-
+
public void addExtensionAttribute(QName name, Object attr) {
if (delegate != null) {
delegate.addExtensionAttribute(name, attr);
@@ -235,20 +235,20 @@ public abstract class AbstractPropertiesHolder implements Extensible {
}
extensionAttributes.put(name, attr);
}
-
+
public void setExtensionAttributes(Map<QName, Object> attrs) {
if (delegate != null) {
delegate.setExtensionAttributes(attrs);
return;
}
- extensionAttributes = attrs;
+ extensionAttributes = attrs;
}
/**
* Lookup a configuration value. This may be found in the properties holder supplied
* (i.e. an EndpointInfo or ServiceInfo), or it may be a property on the Bus itself.
* If no value is found, the defaultValue is returned.
- *
+ *
* @param defaultValue the default value
* @param type the extensor type
* @return the configuration value or the default
@@ -263,8 +263,8 @@ public abstract class AbstractPropertiesHolder implements Extensible {
}
return extensor;
}
-
-
+
+
protected static final boolean equals(Object o1, Object o2) {
if (o1 == null && o2 != null
@@ -273,5 +273,5 @@ public abstract class AbstractPropertiesHolder implements Extensible {
}
return o1 == null ? true : o1.equals(o2);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/BindingFaultInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/BindingFaultInfo.java b/core/src/main/java/org/apache/cxf/service/model/BindingFaultInfo.java
index c613826..8668a48 100644
--- a/core/src/main/java/org/apache/cxf/service/model/BindingFaultInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/BindingFaultInfo.java
@@ -22,16 +22,16 @@ package org.apache.cxf.service.model;
public class BindingFaultInfo extends AbstractPropertiesHolder {
FaultInfo fault;
BindingOperationInfo opinfo;
-
+
public BindingFaultInfo(FaultInfo f, BindingOperationInfo info) {
fault = f;
opinfo = info;
}
-
+
public FaultInfo getFaultInfo() {
return fault;
}
-
+
public BindingOperationInfo getBindingOperation() {
return opinfo;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java b/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java
index 1d8aa5a..5d3f612 100644
--- a/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/BindingInfo.java
@@ -31,21 +31,21 @@ import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
public class BindingInfo extends AbstractDescriptionElement implements NamedItem {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(BindingInfo.class);
-
+
QName name;
ServiceInfo service;
final String bindingId;
-
- Map<QName, BindingOperationInfo> operations
+
+ Map<QName, BindingOperationInfo> operations
= new ConcurrentHashMap<QName, BindingOperationInfo>(4, 0.75f, 2);
-
+
public BindingInfo(ServiceInfo service, String bindingId) {
this.service = service;
this.bindingId = bindingId;
}
-
+
public DescriptionInfo getDescription() {
if (service == null) {
return null;
@@ -64,14 +64,14 @@ public class BindingInfo extends AbstractDescriptionElement implements NamedItem
public String getBindingId() {
return bindingId;
}
-
+
public void setName(QName n) {
name = n;
}
public QName getName() {
return name;
}
-
+
private boolean nameEquals(String a, String b, String def) {
if (a == null) {
// in case of input/output itself is empty
@@ -88,7 +88,7 @@ public class BindingInfo extends AbstractDescriptionElement implements NamedItem
if (opName.equals(op.getName())
&& nameEquals(inName, op.getInputName(), op.getName().getLocalPart() + "Request")
&& nameEquals(outName, op.getOutputName(), op.getName().getLocalPart() + "Response")) {
-
+
return new BindingOperationInfo(this, op);
}
}
@@ -104,15 +104,15 @@ public class BindingInfo extends AbstractDescriptionElement implements NamedItem
if (operation.getName() == null) {
throw new NullPointerException(
new Message("BINDING.OPERATION.NAME.NOT.NULL", LOG).toString());
- }
+ }
if (operations.containsKey(operation.getName())) {
throw new IllegalArgumentException(
new Message("DUPLICATED.OPERATION.NAME", LOG, new Object[]{operation.getName()}).toString());
}
-
+
operations.put(operation.getName(), operation);
}
-
+
/**
* Removes an operation from this service.
*
@@ -122,8 +122,8 @@ public class BindingInfo extends AbstractDescriptionElement implements NamedItem
if (operation.getName() == null) {
throw new NullPointerException(
new Message("BINDING.OPERATION.NAME.NOT.NULL", LOG).toString());
- }
-
+ }
+
operations.remove(operation.getName());
}
@@ -154,10 +154,10 @@ public class BindingInfo extends AbstractDescriptionElement implements NamedItem
return b.getUnwrappedOperation();
}
}
-
+
return null;
}
-
+
@Override
public String toString() {
return "[BindingInfo " + getBindingId() + "]";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/BindingMessageInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/BindingMessageInfo.java b/core/src/main/java/org/apache/cxf/service/model/BindingMessageInfo.java
index 348e9b0..45b3d57 100644
--- a/core/src/main/java/org/apache/cxf/service/model/BindingMessageInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/BindingMessageInfo.java
@@ -26,7 +26,7 @@ public class BindingMessageInfo extends AbstractPropertiesHolder {
MessageInfo msg;
BindingOperationInfo op;
private List<MessagePartInfo> messageParts;
-
+
public BindingMessageInfo() {
}
@@ -35,11 +35,11 @@ public class BindingMessageInfo extends AbstractPropertiesHolder {
msg = m;
messageParts = msg.getMessageParts();
}
-
+
public MessageInfo getMessageInfo() {
return msg;
}
-
+
public BindingOperationInfo getBindingOperation() {
return op;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java b/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
index d7b7d4d..2e9b865 100644
--- a/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/BindingOperationInfo.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
/**
- *
+ *
*/
public class BindingOperationInfo extends AbstractPropertiesHolder {
@@ -44,11 +44,11 @@ public class BindingOperationInfo extends AbstractPropertiesHolder {
public BindingOperationInfo() {
}
-
- public BindingOperationInfo(BindingInfo bi, OperationInfo opinfo) {
+
+ public BindingOperationInfo(BindingInfo bi, OperationInfo opinfo) {
bindingInfo = bi;
opInfo = opinfo;
-
+
if (opInfo.getInput() != null) {
inputMessage = new BindingMessageInfo(opInfo.getInput(), this);
} else {
@@ -59,15 +59,15 @@ public class BindingOperationInfo extends AbstractPropertiesHolder {
} else {
outputMessage = null;
}
-
+
Collection<FaultInfo> of = opinfo.getFaults();
if (of != null && !of.isEmpty()) {
faults = new ConcurrentHashMap<QName, BindingFaultInfo>(of.size(), 0.75f, 2);
for (FaultInfo fault : of) {
faults.put(fault.getFaultName(), new BindingFaultInfo(fault, this));
}
- }
-
+ }
+
if (opinfo.isUnwrappedCapable()) {
opHolder = new BindingOperationInfo(bi, opinfo.getUnwrappedOperation(), this);
}
@@ -81,17 +81,17 @@ public class BindingOperationInfo extends AbstractPropertiesHolder {
if (opInfo.isUnwrappedCapable()
&& opHolder == null) {
opHolder = new BindingOperationInfo(bindingInfo, opInfo.getUnwrappedOperation(), this);
- }
+ }
}
-
+
public BindingInfo getBinding() {
return bindingInfo;
}
-
+
public QName getName() {
return opInfo.getName();
}
-
+
public OperationInfo getOperationInfo() {
return opInfo;
}
@@ -99,11 +99,11 @@ public class BindingOperationInfo extends AbstractPropertiesHolder {
public BindingMessageInfo getInput() {
return inputMessage;
}
-
+
public BindingMessageInfo getOutput() {
return outputMessage;
}
-
+
public BindingFaultInfo getFault(QName name) {
if (faults != null) {
return faults.get(name);
@@ -116,7 +116,7 @@ public class BindingOperationInfo extends AbstractPropertiesHolder {
}
return Collections.unmodifiableCollection(faults.values());
}
-
+
public boolean isUnwrappedCapable() {
return opInfo.isUnwrappedCapable();
}
@@ -139,12 +139,12 @@ public class BindingOperationInfo extends AbstractPropertiesHolder {
.append(getName() == null ? "" : getName())
.append("]").toString();
}
-
-
+
+
public int hashCode() {
return opInfo.hashCode();
}
-
+
public boolean equals(Object o) {
if (o == this) {
return true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java b/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java
index 7fdc170..03f61e3 100644
--- a/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/DescriptionInfo.java
@@ -32,22 +32,22 @@ public class DescriptionInfo extends AbstractPropertiesHolder implements NamedIt
public DescriptionInfo() {
}
-
+
public void setName(QName n) {
name = n;
}
public QName getName() {
return name;
}
-
+
public void setBaseURI(String u) {
uri = u;
}
-
+
public String getBaseURI() {
return uri;
}
-
+
public List<AbstractDescriptionElement> getDescribed() {
return described;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java b/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
index 64a0d77..9d5dcc2 100644
--- a/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/EndpointInfo.java
@@ -33,15 +33,15 @@ public class EndpointInfo extends AbstractDescriptionElement implements NamedIte
BindingInfo binding;
QName name;
EndpointReferenceType address;
-
+
public EndpointInfo() {
}
-
+
public EndpointInfo(ServiceInfo serv, String ns) {
transportId = ns;
service = serv;
}
-
+
public DescriptionInfo getDescription() {
if (service == null) {
return null;
@@ -49,33 +49,33 @@ public class EndpointInfo extends AbstractDescriptionElement implements NamedIte
return service.getDescription();
}
-
+
public String getTransportId() {
return transportId;
- }
-
+ }
+
public void setTransportId(String tid) {
transportId = tid;
}
-
+
public InterfaceInfo getInterface() {
if (service == null) {
return null;
}
return service.getInterface();
}
-
+
public void setService(ServiceInfo s) {
service = s;
}
public ServiceInfo getService() {
return service;
}
-
+
public QName getName() {
return name;
}
-
+
public void setName(QName n) {
name = n;
}
@@ -83,15 +83,15 @@ public class EndpointInfo extends AbstractDescriptionElement implements NamedIte
public BindingInfo getBinding() {
return binding;
}
-
+
public void setBinding(BindingInfo b) {
binding = b;
- }
-
+ }
+
public String getAddress() {
return (null != address && null != address.getAddress()) ? address.getAddress().getValue() : null;
}
-
+
public void setAddress(String addr) {
if (null == address) {
address = EndpointReferenceUtils.getEndpointReference(addr);
@@ -99,29 +99,29 @@ public class EndpointInfo extends AbstractDescriptionElement implements NamedIte
EndpointReferenceUtils.setAddress(address, addr);
}
}
-
+
public void setAddress(EndpointReferenceType endpointReference) {
address = endpointReference;
}
-
+
@Override
public <T> T getTraversedExtensor(T defaultValue, Class<T> type) {
T value = getExtensor(type);
-
+
if (value == null) {
if (binding != null) {
value = binding.getExtensor(type);
}
-
+
if (service != null && value == null) {
value = service.getExtensor(type);
}
-
+
if (value == null) {
value = defaultValue;
}
}
-
+
return value;
}
@@ -136,8 +136,8 @@ public class EndpointInfo extends AbstractDescriptionElement implements NamedIte
if (epInfo == null) {
return false;
}
- return binding.getName().equals(epInfo.binding.getName())
- && service.getName().equals(epInfo.service.getName())
+ return binding.getName().equals(epInfo.binding.getName())
+ && service.getName().equals(epInfo.service.getName())
&& name.equals(epInfo.name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/Extensible.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/Extensible.java b/core/src/main/java/org/apache/cxf/service/model/Extensible.java
index 599575f..9c73c5b 100644
--- a/core/src/main/java/org/apache/cxf/service/model/Extensible.java
+++ b/core/src/main/java/org/apache/cxf/service/model/Extensible.java
@@ -25,22 +25,22 @@ import java.util.Map;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
public interface Extensible {
<T> T getExtensor(Class<T> cls);
-
+
<T> List<T> getExtensors(Class<T> cls);
-
+
void addExtensor(Object el);
-
+
Object getExtensionAttribute(QName name);
-
+
Map<QName, Object> getExtensionAttributes();
-
+
void addExtensionAttribute(QName name, Object attr);
-
+
void setExtensionAttributes(Map<QName, Object> attrs);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java b/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java
index 16e8a34..49a7daa 100644
--- a/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/FaultInfo.java
@@ -23,25 +23,25 @@ import javax.xml.namespace.QName;
public class FaultInfo extends AbstractMessageContainer {
private QName faultName;
-
+
public FaultInfo(QName fname, QName mname, OperationInfo info) {
super(info, mname);
faultName = fname;
}
-
+
public QName getFaultName() {
return faultName;
}
public void setFaultName(QName fname) {
faultName = fname;
}
-
-
-
+
+
+
public int hashCode() {
return faultName == null ? -1 : faultName.hashCode();
}
-
+
public boolean equals(Object o) {
if (o == this) {
return true;
@@ -51,9 +51,9 @@ public class FaultInfo extends AbstractMessageContainer {
return false;
}
FaultInfo oi = (FaultInfo)o;
- return equals(faultName, oi.faultName)
+ return equals(faultName, oi.faultName)
&& super.equals(o);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java b/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
index 0b642d6..6dc7bbf 100644
--- a/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/InterfaceInfo.java
@@ -32,12 +32,12 @@ import org.apache.cxf.common.logging.LogUtils;
public class InterfaceInfo extends AbstractDescriptionElement implements NamedItem {
private static final Logger LOG = LogUtils.getL7dLogger(InterfaceInfo.class);
-
+
QName name;
ServiceInfo service;
-
+
Map<QName, OperationInfo> operations = new ConcurrentHashMap<QName, OperationInfo>(4, 0.75f, 2);
-
+
public InterfaceInfo(ServiceInfo info, QName q) {
name = q;
service = info;
@@ -53,15 +53,15 @@ public class InterfaceInfo extends AbstractDescriptionElement implements NamedIt
public ServiceInfo getService() {
return service;
}
-
+
public void setName(QName n) {
name = n;
}
public QName getName() {
return name;
}
-
-
+
+
/**
* Adds an operation to this service.
*
@@ -72,7 +72,7 @@ public class InterfaceInfo extends AbstractDescriptionElement implements NamedIt
if (oname == null) {
throw new NullPointerException(
new Message("OPERATION.NAME.NOT.NULL", LOG).toString());
- }
+ }
if (operations.containsKey(oname)) {
throw new IllegalArgumentException(
new Message("DUPLICATED.OPERATION.NAME", LOG, new Object[]{oname}).toString());
@@ -91,7 +91,7 @@ public class InterfaceInfo extends AbstractDescriptionElement implements NamedIt
void addOperation(OperationInfo operation) {
operations.put(operation.getName(), operation);
}
-
+
/**
* Removes an operation from this service.
*
@@ -99,7 +99,7 @@ public class InterfaceInfo extends AbstractDescriptionElement implements NamedIt
*/
public void removeOperation(OperationInfo operation) {
operations.remove(operation.getName());
- }
+ }
/**
* Returns the operation info with the given name, if found.
@@ -118,7 +118,7 @@ public class InterfaceInfo extends AbstractDescriptionElement implements NamedIt
*/
public Collection<OperationInfo> getOperations() {
return Collections.unmodifiableCollection(operations.values());
- }
-
-
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java b/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java
index 27f1ed9..d8e4d97 100644
--- a/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/MessageInfo.java
@@ -33,23 +33,23 @@ import org.apache.cxf.common.util.StringUtils;
* A message for an operation.
*/
public class MessageInfo extends AbstractMessageContainer {
-
+
public enum Type {
INPUT,
OUTPUT;
}
-
+
private Type type;
-
+
public MessageInfo(OperationInfo op, Type type, QName nm) {
super(op, nm);
this.type = type;
}
-
+
public void setName(QName qn) {
mName = qn;
}
-
+
public Map<QName, MessagePartInfo> getMessagePartsMap() {
Map<QName, MessagePartInfo> partsMap = new HashMap<QName, MessagePartInfo>();
for (MessagePartInfo part : getMessageParts()) {
@@ -58,11 +58,11 @@ public class MessageInfo extends AbstractMessageContainer {
return partsMap;
}
- public List<MessagePartInfo> getOrderedParts(List<String> order) {
+ public List<MessagePartInfo> getOrderedParts(List<String> order) {
if (StringUtils.isEmpty(order)) {
return getMessageParts();
}
-
+
List<MessagePartInfo> orderedParts = new ArrayList<>();
Map<QName, MessagePartInfo> partsMap = getMessagePartsMap();
for (String part : order) {
@@ -84,6 +84,6 @@ public class MessageInfo extends AbstractMessageContainer {
public void setType(Type type) {
this.type = type;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/MessagePartInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/MessagePartInfo.java b/core/src/main/java/org/apache/cxf/service/model/MessagePartInfo.java
index 61f0b2e..c5baa8c 100644
--- a/core/src/main/java/org/apache/cxf/service/model/MessagePartInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/MessagePartInfo.java
@@ -28,7 +28,7 @@ public final class MessagePartInfo extends AbstractPropertiesHolder implements N
private QName pname;
private AbstractMessageContainer mInfo;
-
+
private boolean isElement;
private QName typeName;
private QName elementName;
@@ -36,12 +36,12 @@ public final class MessagePartInfo extends AbstractPropertiesHolder implements N
private XmlSchemaAnnotated xmlSchema;
private Class<?> typeClass;
private int index;
-
+
public MessagePartInfo(QName n, AbstractMessageContainer info) {
mInfo = info;
pname = n;
}
-
+
public void setMessageContainer(AbstractMessageContainer info) {
mInfo = info;
}
@@ -58,22 +58,22 @@ public final class MessagePartInfo extends AbstractPropertiesHolder implements N
public void setName(QName n) {
pname = n;
}
-
+
public QName getConcreteName() {
return concreteName;
}
-
+
public void setConcreteName(QName concreteName) {
this.concreteName = concreteName;
}
- public boolean isElement() {
+ public boolean isElement() {
return isElement;
}
public void setElement(boolean b) {
isElement = b;
}
-
+
public QName getElementQName() {
if (isElement) {
return elementName;
@@ -100,7 +100,7 @@ public final class MessagePartInfo extends AbstractPropertiesHolder implements N
elementName = qn;
concreteName = qn;
}
-
+
public AbstractMessageContainer getMessageInfo() {
return mInfo;
}
@@ -136,11 +136,11 @@ public final class MessagePartInfo extends AbstractPropertiesHolder implements N
.append(", ConcreteName=")
.append(getConcreteName()).toString();
}
-
+
public int hashCode() {
return pname == null ? -1 : pname.hashCode();
}
-
+
public boolean equals(Object o) {
if (o == this) {
return true;
@@ -149,7 +149,7 @@ public final class MessagePartInfo extends AbstractPropertiesHolder implements N
return false;
}
MessagePartInfo oi = (MessagePartInfo)o;
- return equals(pname, oi.pname)
+ return equals(pname, oi.pname)
&& isElement == oi.isElement
&& equals(typeName, oi.typeName)
&& equals(elementName, oi.elementName)
@@ -157,5 +157,5 @@ public final class MessagePartInfo extends AbstractPropertiesHolder implements N
&& equals(typeClass, oi.typeClass);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java b/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
index 11efb1a..b4a64ac 100644
--- a/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/OperationInfo.java
@@ -41,12 +41,12 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
MessageInfo outputMessage;
Map<QName, FaultInfo> faults;
OperationInfo unwrappedOperation;
- List<String> parameterOrdering;
+ List<String> parameterOrdering;
public OperationInfo() {
}
-
- OperationInfo(InterfaceInfo it, QName n) {
+
+ OperationInfo(InterfaceInfo it, QName n) {
intf = it;
setName(n);
}
@@ -54,7 +54,7 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
intf = op.getInterface();
setName(op.getName());
}
-
+
/**
* Returns the name of the Operation.
* @return the name of the Operation
@@ -68,15 +68,15 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
*/
public final void setName(QName name) {
if (name == null) {
- throw new NullPointerException("Operation Name cannot be null.");
- }
+ throw new NullPointerException("Operation Name cannot be null.");
+ }
opName = name;
}
public InterfaceInfo getInterface() {
return intf;
}
-
+
public MessageInfo createMessage(QName nm, MessageInfo.Type type) {
return new MessageInfo(this, type, nm);
}
@@ -93,7 +93,7 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
if (unwrappedOperation != null && unwrappedOperation.getOutput() != null) {
unwrappedOperation.getOutput().setDelegate(out, false);
}
- }
+ }
public boolean hasOutput() {
return outputMessage != null;
}
@@ -114,15 +114,15 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
public boolean hasInput() {
return inputMessage != null;
}
-
+
public boolean isOneWay() {
return inputMessage != null && outputMessage == null;
}
-
+
public boolean isUnwrappedCapable() {
return unwrappedOperation != null;
}
-
+
public OperationInfo getUnwrappedOperation() {
return unwrappedOperation;
}
@@ -132,8 +132,8 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
public boolean isUnwrapped() {
return false;
}
-
-
+
+
/**
* Adds an fault to this operation.
*
@@ -142,7 +142,7 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
public FaultInfo addFault(QName name, QName message) {
if (name == null) {
throw new NullPointerException(new Message("FAULT.NAME.NOT.NULL", LOG).toString());
- }
+ }
if (faults != null && faults.containsKey(name)) {
throw new IllegalArgumentException(
new Message("DUPLICATED.FAULT.NAME", LOG, new Object[] {name}).toString());
@@ -158,7 +158,7 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
* @param fault the fault.
*/
public synchronized void addFault(FaultInfo fault) {
- if (faults == null) {
+ if (faults == null) {
faults = new ConcurrentHashMap<QName, FaultInfo>(4, 0.75f, 2);
}
faults.put(fault.getFaultName(), fault);
@@ -187,7 +187,7 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
}
return null;
}
-
+
public boolean hasFaults() {
return faults != null && faults.size() > 0;
}
@@ -203,26 +203,26 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
}
return Collections.unmodifiableCollection(faults.values());
}
-
+
public void setParameterOrdering(List<String> o) {
this.parameterOrdering = o;
}
-
+
public List<String> getParameterOrdering() {
return parameterOrdering;
}
-
+
@Override
public String toString() {
return new StringBuilder().append("[OperationInfo: ")
.append(opName)
.append("]").toString();
}
-
+
public int hashCode() {
return opName == null ? -1 : opName.hashCode();
}
-
+
public boolean equals(Object o) {
if (o == this) {
return true;
@@ -232,11 +232,11 @@ public class OperationInfo extends AbstractPropertiesHolder implements NamedItem
return false;
}
OperationInfo oi = (OperationInfo)o;
- return equals(opName, oi.opName)
+ return equals(opName, oi.opName)
&& equals(inputMessage, oi.inputMessage)
&& equals(outputMessage, oi.outputMessage)
&& equals(faults, oi.faults)
- && equals(intf.getName(), oi.intf.getName());
+ && equals(intf.getName(), oi.intf.getName());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java b/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
index 99697f7..934f05b 100644
--- a/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/ServiceInfo.java
@@ -46,7 +46,7 @@ public class ServiceInfo extends AbstractDescriptionElement implements NamedItem
public ServiceInfo() {
xmlSchemaCollection = new SchemaCollection();
}
-
+
public DescriptionInfo getDescription() {
return description;
}
@@ -159,7 +159,7 @@ public class ServiceInfo extends AbstractDescriptionElement implements NamedItem
public void addSchema(SchemaInfo schemaInfo) {
schemas.add(schemaInfo);
}
-
+
public SchemaInfo addNewSchema(String namespaceURI) {
SchemaInfo schemaInfo = new SchemaInfo(namespaceURI);
schemaInfo.setSchema(getXmlSchemaCollection().
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
index 52c4283..1b32beb 100644
--- a/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
+++ b/core/src/main/java/org/apache/cxf/service/model/ServiceModelUtil.java
@@ -183,7 +183,7 @@ public final class ServiceModelUtil {
return best;
}
-
+
public static QName getServiceQName(EndpointInfo ei) {
InterfaceInfo ii = ei.getInterface();
if (ii != null) {
@@ -193,6 +193,6 @@ public final class ServiceModelUtil {
} else {
return ei.getName();
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java b/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java
index 39891bb..b9122c5 100644
--- a/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/ServiceSchemaInfo.java
@@ -28,14 +28,14 @@ import org.w3c.dom.Element;
import org.apache.cxf.common.xmlschema.SchemaCollection;
/**
- * The ServiceInfo class has schema in two forms: the XmlSchema, in a SchemaCollection, and the
+ * The ServiceInfo class has schema in two forms: the XmlSchema, in a SchemaCollection, and the
* DOM trees in the SchemaInfo objects. This class exists in order to allow the WSDL cache to store both.
*/
public class ServiceSchemaInfo {
private SchemaCollection schemaCollection;
private List<SchemaInfo> schemaInfoList;
private Map<String, Element> schemaElementList;
-
+
public SchemaCollection getSchemaCollection() {
return schemaCollection;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java b/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java
index bc6534e..0f636a6 100644
--- a/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java
+++ b/core/src/main/java/org/apache/cxf/service/model/UnwrappedOperationInfo.java
@@ -31,11 +31,11 @@ public class UnwrappedOperationInfo extends OperationInfo {
wrappedOp = op;
setDelegate(wrappedOp, true);
}
-
+
public OperationInfo getWrappedOperation() {
return wrappedOp;
}
-
+
public boolean isUnwrapped() {
return true;
}
@@ -43,20 +43,20 @@ public class UnwrappedOperationInfo extends OperationInfo {
public FaultInfo addFault(QName name, QName message) {
return wrappedOp.addFault(name, message);
}
-
+
public FaultInfo getFault(QName name) {
return wrappedOp.getFault(name);
}
-
+
public Collection<FaultInfo> getFaults() {
return wrappedOp.getFaults();
}
-
-
+
+
public void setOutput(String nm, MessageInfo out) {
super.setOutput(nm, out);
out.setDelegate(wrappedOp.getOutput(), false);
- }
+ }
public void setInput(String nm, MessageInfo in) {
super.setInput(nm, in);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
index c739f96..a841eb9 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/AbstractDOMStreamReader.java
@@ -38,9 +38,9 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
private ElementFrame<T, I> frame;
-
+
/**
- *
+ *
*/
public static class ElementFrame<T, I> {
T element;
@@ -48,18 +48,18 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
boolean started;
boolean ended;
-
+
List<String> uris;
List<String> prefixes;
List<Object> attributes;
final ElementFrame<T, I> parent;
-
+
public ElementFrame(T element, ElementFrame<T, I> parent) {
this.element = element;
this.parent = parent;
}
-
+
public ElementFrame(T element, ElementFrame<T, I> parent, I ch) {
this.element = element;
this.parent = parent;
@@ -75,7 +75,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
}
public ElementFrame(T doc) {
this(doc, true);
- }
+ }
public T getElement() {
return element;
}
@@ -108,7 +108,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#getProperty(java.lang.String)
*/
public Object getProperty(String key) throws IllegalArgumentException {
@@ -117,7 +117,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#next()
*/
public int next() throws XMLStreamException {
@@ -149,7 +149,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
} else {
frame.ended = true;
if (frame.isDocument()) {
- currentEvent = END_DOCUMENT;
+ currentEvent = END_DOCUMENT;
} else {
currentEvent = END_ELEMENT;
endElement();
@@ -170,7 +170,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#require(int, java.lang.String,
* java.lang.String)
*/
@@ -180,7 +180,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#getElementText()
*/
public abstract String getElementText() throws XMLStreamException;
@@ -189,16 +189,16 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
frame.started = true;
frame.ended = true;
if (frame.isDocument()) {
- currentEvent = END_DOCUMENT;
+ currentEvent = END_DOCUMENT;
} else {
currentEvent = END_ELEMENT;
endElement();
}
}
-
+
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#nextTag()
*/
public int nextTag() throws XMLStreamException {
@@ -213,18 +213,18 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#hasNext()
*/
public boolean hasNext() throws XMLStreamException {
-
+
return !(frame.ended && (frames.size() == 0 || frame.isDocumentFragment()));
}
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#close()
*/
public void close() throws XMLStreamException {
@@ -232,14 +232,14 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#getNamespaceURI(java.lang.String)
*/
public abstract String getNamespaceURI(String prefix);
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#isStartElement()
*/
public boolean isStartElement() {
@@ -248,7 +248,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#isEndElement()
*/
public boolean isEndElement() {
@@ -257,7 +257,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#isCharacters()
*/
public boolean isCharacters() {
@@ -266,7 +266,7 @@ public abstract class AbstractDOMStreamReader<T, I> implements XMLStreamReader {
/*
* (non-Javadoc)
- *
+ *
* @see javax.xml.stream.XMLStreamReader#isWhiteSpace()
*/
public boolean isWhiteSpace() {
[02/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
index 64b7a15..1ecc1b6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/NewCookieHeaderProvider.java
@@ -37,19 +37,19 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
private static final String SECURE = "Secure";
private static final String EXPIRES = "Expires";
private static final String HTTP_ONLY = "HttpOnly";
-
+
/** from RFC 2068, token special case characters */
-
+
private static final String TSPECIALS_PATH = "\"()<>@,;:\\[]?={} \t";
private static final String TSPECIALS_ALL = TSPECIALS_PATH + "/";
- private static final String DOUBLE_QUOTE = "\"";
-
+ private static final String DOUBLE_QUOTE = "\"";
+
public NewCookie fromString(String c) {
-
+
if (c == null) {
throw new IllegalArgumentException("SetCookie value can not be null");
}
-
+
String name = null;
String value = null;
String path = null;
@@ -60,19 +60,19 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
Date expires = null;
boolean httpOnly = false;
int version = NewCookie.DEFAULT_VERSION;
-
+
String[] tokens = StringUtils.split(c, ";");
for (String token : tokens) {
String theToken = token.trim();
-
+
int sepIndex = theToken.indexOf('=');
String paramName = sepIndex != -1 ? theToken.substring(0, sepIndex) : theToken;
- String paramValue = sepIndex == -1 || sepIndex == theToken.length() - 1
+ String paramValue = sepIndex == -1 || sepIndex == theToken.length() - 1
? null : theToken.substring(sepIndex + 1);
if (paramValue != null) {
paramValue = stripQuotes(paramValue);
}
-
+
if (paramName.equalsIgnoreCase(MAX_AGE)) {
maxAge = Integer.parseInt(paramValue);
} else if (paramName.equalsIgnoreCase(PATH)) {
@@ -94,14 +94,14 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
value = paramValue;
}
}
-
+
if (name == null || value == null) {
throw new IllegalArgumentException("Set-Cookie is malformed : " + c);
}
-
+
return new NewCookie(name, value, path, domain, version, comment, maxAge, expires, isSecure, httpOnly);
}
-
+
@Override
public String toString(NewCookie value) {
@@ -140,7 +140,7 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
/**
* Append the input value string to the given buffer, wrapping it with
* quotes if need be.
- *
+ *
* @param value
* @return String
*/
@@ -167,7 +167,7 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
/**
* Return true iff the string contains special characters that need to be
* quoted.
- *
+ *
* @param value
* @return boolean
*/
@@ -181,8 +181,8 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
}
if ('"' == value.charAt(0) && '"' == value.charAt(len - 1)) {
// already wrapped with quotes
- return false;
- }
+ return false;
+ }
for (int i = 0; i < len; i++) {
char c = value.charAt(i);
@@ -192,7 +192,7 @@ public class NewCookieHeaderProvider implements HeaderDelegate<NewCookie> {
}
return false;
}
-
+
static String stripQuotes(String paramValue) {
if (paramValue.startsWith(DOUBLE_QUOTE)
&& paramValue.endsWith(DOUBLE_QUOTE) && paramValue.length() > 1) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
index 6ab39d8..e558ec5 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PathSegmentImpl.java
@@ -28,15 +28,15 @@ import org.apache.cxf.jaxrs.utils.JAXRSUtils;
public class PathSegmentImpl implements PathSegment {
private String path;
-
+
public PathSegmentImpl(String path) {
this(path, true);
}
-
+
public PathSegmentImpl(String path, boolean decode) {
this.path = decode ? HttpUtils.pathDecode(path) : path;
}
-
+
public MultivaluedMap<String, String> getMatrixParameters() {
return JAXRSUtils.getMatrixParams(path, false);
}
@@ -47,13 +47,13 @@ public class PathSegmentImpl implements PathSegment {
if (value.startsWith("/")) {
value = value.length() == 1 ? "" : value.substring(1);
}
- return value;
+ return value;
}
-
+
public String getOriginalPath() {
return path;
}
-
+
public String getMatrixString() {
int index = path.indexOf(';');
if (index == -1) {
@@ -62,7 +62,7 @@ public class PathSegmentImpl implements PathSegment {
return path.substring(index);
}
}
-
+
public String toString() {
return path;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java
index 3a0ce8e..f52a673 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/PropertyHolderFactory.java
@@ -28,25 +28,25 @@ import org.apache.cxf.message.Message;
public final class PropertyHolderFactory {
private PropertyHolderFactory() {
-
+
}
-
+
public static PropertyHolder getPropertyHolder(Message m) {
return m.containsKey("HTTP.REQUEST") ? new ServletRequestPropertyHolder(m) : new MessagePropertyHolder(m);
}
-
- public interface PropertyHolder {
+
+ public interface PropertyHolder {
Object getProperty(String name);
void removeProperty(String name);
void setProperty(String name, Object value);
Collection<String> getPropertyNames();
}
-
+
private static class MessagePropertyHolder implements PropertyHolder {
private static final String PROPERTY_KEY = "jaxrs.filter.properties";
private Message m;
private Map<String, Object> props;
-
+
MessagePropertyHolder(Message m) {
this.m = m;
this.props = CastUtils.cast((Map<?, ?>)m.getExchange().get(PROPERTY_KEY));
@@ -57,7 +57,7 @@ public final class PropertyHolderFactory {
public void removeProperty(String name) {
if (props != null) {
- props.remove(name);
+ props.remove(name);
}
}
@@ -66,17 +66,17 @@ public final class PropertyHolderFactory {
if (props == null) {
props = new HashMap<String, Object>();
m.getExchange().put(PROPERTY_KEY, props);
- }
+ }
if (value == null) {
removeProperty(name);
} else {
props.put(name, value);
}
-
+
}
public Collection<String> getPropertyNames() {
- return props == null ? Collections.<String>emptyList()
+ return props == null ? Collections.<String>emptyList()
: Collections.unmodifiableSet(props.keySet());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ProvidersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ProvidersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ProvidersImpl.java
index feba99e..b7f6953 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ProvidersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ProvidersImpl.java
@@ -39,7 +39,7 @@ public class ProvidersImpl implements Providers {
public ProvidersImpl(Message m) {
this.m = m;
}
-
+
public <T> MessageBodyReader<T> getMessageBodyReader(
Class<T> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
return ProviderFactory.getInstance(m).createMessageBodyReader(
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorContextImpl.java
index 2966737..9bdc5a5 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorContextImpl.java
@@ -34,7 +34,7 @@ import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.message.Message;
-public class ReaderInterceptorContextImpl extends AbstractInterceptorContextImpl
+public class ReaderInterceptorContextImpl extends AbstractInterceptorContextImpl
implements ReaderInterceptorContext {
private List<ReaderInterceptor> readers;
@@ -49,7 +49,7 @@ public class ReaderInterceptorContextImpl extends AbstractInterceptorContextImpl
this.is = is;
this.readers = readers;
}
-
+
@Override
public MultivaluedMap<String, String> getHeaders() {
return HttpUtils.getModifiableStringHeaders(m);
@@ -87,7 +87,7 @@ public class ReaderInterceptorContextImpl extends AbstractInterceptorContextImpl
providerSelectionPropertyChanged();
}
getHeaders().putSingle(HttpHeaders.CONTENT_TYPE, JAXRSUtils.mediaTypeToString(mt));
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
index 5830ad0..fcf890d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ReaderInterceptorMBR.java
@@ -40,17 +40,17 @@ public class ReaderInterceptorMBR implements ReaderInterceptor {
private MessageBodyReader<?> reader;
private Message m;
-
+
public ReaderInterceptorMBR(MessageBodyReader<?> reader,
Message m) {
this.reader = reader;
this.m = m;
}
-
+
public MessageBodyReader<?> getMBR() {
return reader;
}
-
+
@SuppressWarnings({
"unchecked", "rawtypes"
})
@@ -60,9 +60,9 @@ public class ReaderInterceptorMBR implements ReaderInterceptor {
Type entityType = c.getGenericType();
MediaType entityMt = c.getMediaType();
Annotation[] entityAnns = c.getAnnotations();
-
+
if ((reader == null || m.get(ProviderFactory.PROVIDER_SELECTION_PROPERTY_CHANGED) == Boolean.TRUE
- && !reader.isReadable(entityCls, entityType, entityAnns, entityMt))
+ && !reader.isReadable(entityCls, entityType, entityAnns, entityMt))
&& entityStreamAvailable(c.getInputStream())) {
reader = ProviderFactory.getInstance(m)
.createMessageBodyReader(entityCls, entityType, entityAnns, entityMt, m);
@@ -71,9 +71,9 @@ public class ReaderInterceptorMBR implements ReaderInterceptor {
String errorMessage = JAXRSUtils.logMessageHandlerProblem("NO_MSG_READER", entityCls, entityMt);
throw new ProcessingException(errorMessage);
}
-
-
- return reader.readFrom(entityCls, entityType, entityAnns, entityMt,
+
+
+ return reader.readFrom(entityCls, entityType, entityAnns, entityMt,
new HttpHeadersImpl(m).getRequestHeaders(),
c.getInputStream());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
index 9f25400..221c25a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
@@ -57,16 +57,16 @@ import org.apache.cxf.transport.http.AbstractHTTPDestination;
*/
public class RequestImpl implements Request {
-
+
private final Message m;
private final HttpHeaders headers;
-
+
public RequestImpl(Message m) {
this.m = m;
this.headers = new HttpHeadersImpl(m);
}
-
+
public Variant selectVariant(List<Variant> vars) throws IllegalArgumentException {
if (vars == null || vars.isEmpty()) {
@@ -76,33 +76,33 @@ public class RequestImpl implements Request {
List<Locale> acceptLangs = headers.getAcceptableLanguages();
List<String> acceptEncs = parseAcceptEnc(
headers.getRequestHeaders().getFirst(HttpHeaders.ACCEPT_ENCODING));
-
+
List<Object> varyValues = new LinkedList<Object>();
-
+
List<Variant> matchingVars = new LinkedList<Variant>();
for (Variant var : vars) {
MediaType mt = var.getMediaType();
Locale lang = var.getLanguage();
String enc = var.getEncoding();
-
+
boolean mtMatched = mt == null || acceptMediaTypes.isEmpty()
|| JAXRSUtils.intersectMimeTypes(acceptMediaTypes, mt).size() != 0;
if (mtMatched) {
handleVaryValues(varyValues, HttpHeaders.ACCEPT);
}
-
+
boolean langMatched = lang == null || acceptLangs.isEmpty()
|| isLanguageMatched(acceptLangs, lang);
if (langMatched) {
handleVaryValues(varyValues, HttpHeaders.ACCEPT_LANGUAGE);
}
-
- boolean encMatched = acceptEncs.isEmpty() || enc == null
+
+ boolean encMatched = acceptEncs.isEmpty() || enc == null
|| isEncMatached(acceptEncs, enc);
if (encMatched) {
handleVaryValues(varyValues, HttpHeaders.ACCEPT_ENCODING);
}
-
+
if (mtMatched && encMatched && langMatched) {
matchingVars.add(var);
}
@@ -111,7 +111,7 @@ public class RequestImpl implements Request {
addVaryHeader(varyValues);
Collections.sort(matchingVars, new VariantComparator());
return matchingVars.get(0);
- }
+ }
return null;
}
@@ -122,7 +122,7 @@ public class RequestImpl implements Request {
}
}
}
-
+
private static void addVaryHeader(List<Object> varyValues) {
// at this point we still have no out-bound message so lets
// use HttpServletResponse. If needed we can save the header on the exchange
@@ -143,12 +143,12 @@ public class RequestImpl implements Request {
}
}
}
-
+
private static boolean isLanguageMatched(List<Locale> locales, Locale l) {
-
+
for (Locale locale : locales) {
String language = locale.getLanguage();
- if ("*".equals(language)
+ if ("*".equals(language)
|| language.equalsIgnoreCase(l.getLanguage())) {
return true;
}
@@ -181,21 +181,21 @@ public class RequestImpl implements Request {
}
return list;
}
-
+
public ResponseBuilder evaluatePreconditions(EntityTag eTag) {
if (eTag == null) {
throw new IllegalArgumentException("ETag is null");
}
return evaluateAll(eTag, null);
}
-
+
private ResponseBuilder evaluateAll(EntityTag eTag, Date lastModified) {
// http://tools.ietf.org/search/draft-ietf-httpbis-p4-conditional-25#section-5
// Check If-Match. If it is not available proceed to checking If-Not-Modified-Since
// if it is available and the preconditions are not met - return, otherwise:
// Check If-Not-Match. If it is not available proceed to checking If-Modified-Since
// otherwise return the evaluation result
-
+
ResponseBuilder rb = evaluateIfMatch(eTag, lastModified);
if (rb == null) {
rb = evaluateIfNonMatch(eTag, lastModified);
@@ -205,11 +205,11 @@ public class RequestImpl implements Request {
private ResponseBuilder evaluateIfMatch(EntityTag eTag, Date date) {
List<String> ifMatch = headers.getRequestHeader(HttpHeaders.IF_MATCH);
-
+
if (ifMatch == null || ifMatch.size() == 0) {
return date == null ? null : evaluateIfNotModifiedSince(date);
}
-
+
try {
for (String value : ifMatch) {
if ("*".equals(value)) {
@@ -229,11 +229,11 @@ public class RequestImpl implements Request {
private ResponseBuilder evaluateIfNonMatch(EntityTag eTag, Date lastModified) {
List<String> ifNonMatch = headers.getRequestHeader(HttpHeaders.IF_NONE_MATCH);
-
+
if (ifNonMatch == null || ifNonMatch.size() == 0) {
return lastModified == null ? null : evaluateIfModifiedSince(lastModified);
}
-
+
String method = getMethod();
boolean getOrHead = HttpMethod.GET.equals(method) || HttpMethod.HEAD.equals(method);
try {
@@ -241,7 +241,7 @@ public class RequestImpl implements Request {
boolean result = "*".equals(value);
if (!result) {
EntityTag requestTag = EntityTag.valueOf(value);
- result = getOrHead ? requestTag.equals(eTag)
+ result = getOrHead ? requestTag.equals(eTag)
: !requestTag.isWeak() && !eTag.isWeak() && requestTag.equals(eTag);
}
if (result) {
@@ -255,7 +255,7 @@ public class RequestImpl implements Request {
}
return null;
}
-
+
public ResponseBuilder evaluatePreconditions(Date lastModified) {
if (lastModified == null) {
throw new IllegalArgumentException("Date is null");
@@ -266,14 +266,14 @@ public class RequestImpl implements Request {
}
return rb;
}
-
+
private ResponseBuilder evaluateIfModifiedSince(Date lastModified) {
List<String> ifModifiedSince = headers.getRequestHeader(HttpHeaders.IF_MODIFIED_SINCE);
-
+
if (ifModifiedSince == null || ifModifiedSince.size() == 0) {
return null;
}
-
+
SimpleDateFormat dateFormat = HttpUtils.getHttpDateFormat();
dateFormat.setLenient(false);
@@ -284,22 +284,22 @@ public class RequestImpl implements Request {
// invalid header value, request should continue
return Response.status(Response.Status.PRECONDITION_FAILED);
}
-
+
if (dateSince.before(lastModified)) {
// request should continue
return null;
}
-
+
return Response.status(Response.Status.NOT_MODIFIED);
}
-
+
private ResponseBuilder evaluateIfNotModifiedSince(Date lastModified) {
List<String> ifNotModifiedSince = headers.getRequestHeader(HttpHeaders.IF_UNMODIFIED_SINCE);
-
+
if (ifNotModifiedSince == null || ifNotModifiedSince.size() == 0) {
return null;
}
-
+
SimpleDateFormat dateFormat = HttpUtils.getHttpDateFormat();
dateFormat.setLenient(false);
@@ -310,11 +310,11 @@ public class RequestImpl implements Request {
// invalid header value, request should continue
return Response.status(Response.Status.PRECONDITION_FAILED);
}
-
+
if (dateSince.before(lastModified)) {
return Response.status(Response.Status.PRECONDITION_FAILED);
}
-
+
return null;
}
@@ -326,7 +326,7 @@ public class RequestImpl implements Request {
}
return evaluateAll(eTag, lastModified);
}
-
+
public String getMethod() {
return m.get(Message.HTTP_REQUEST_METHOD).toString();
}
@@ -349,29 +349,29 @@ public class RequestImpl implements Request {
public int compare(Variant v1, Variant v2) {
int result = compareMediaTypes(v1.getMediaType(), v2.getMediaType());
-
+
if (result != 0) {
return result;
}
-
+
result = compareLanguages(v1.getLanguage(), v2.getLanguage());
-
+
if (result == 0) {
result = compareEncodings(v1.getEncoding(), v2.getEncoding());
}
-
+
return result;
}
-
+
private static int compareMediaTypes(MediaType mt1, MediaType mt2) {
if (mt1 != null && mt2 == null) {
return -1;
} else if (mt1 == null && mt2 != null) {
return 1;
- }
+ }
return JAXRSUtils.compareMediaTypes(mt1, mt2);
}
-
+
private static int compareLanguages(Locale l1, Locale l2) {
if (l1 != null && l2 == null) {
return -1;
@@ -380,7 +380,7 @@ public class RequestImpl implements Request {
}
return 0;
}
-
+
private static int compareEncodings(String enc1, String enc2) {
if (enc1 != null && enc2 == null) {
return -1;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
index b033924..874d9bf 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestPreprocessor.java
@@ -35,15 +35,15 @@ import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.message.Message;
public class RequestPreprocessor {
-
+
private static final String ACCEPT_QUERY = "_type";
private static final String CTYPE_QUERY = "_ctype";
private static final String METHOD_QUERY = "_method";
private static final String METHOD_HEADER = "X-HTTP-Method-Override";
-
+
private static final Set<String> PATHS_TO_SKIP;
private static final Map<String, String> MEDIA_TYPE_SHORTCUTS;
-
+
static {
MEDIA_TYPE_SHORTCUTS = new HashMap<String, String>();
MEDIA_TYPE_SHORTCUTS.put("json", "application/json");
@@ -52,38 +52,38 @@ public class RequestPreprocessor {
MEDIA_TYPE_SHORTCUTS.put("atom", "application/atom+xml");
MEDIA_TYPE_SHORTCUTS.put("html", "text/html");
MEDIA_TYPE_SHORTCUTS.put("wadl", "application/vnd.sun.wadl+xml");
-
+
PATHS_TO_SKIP = new HashSet<>();
PATHS_TO_SKIP.add("swagger.json");
PATHS_TO_SKIP.add("swagger.yaml");
}
-
+
private Map<Object, Object> languageMappings;
private Map<Object, Object> extensionMappings;
-
+
public RequestPreprocessor() {
this(null, null);
}
-
+
public RequestPreprocessor(Map<Object, Object> languageMappings,
Map<Object, Object> extensionMappings) {
this.languageMappings =
languageMappings == null ? Collections.emptyMap() : languageMappings;
- this.extensionMappings =
+ this.extensionMappings =
extensionMappings == null ? Collections.emptyMap() : extensionMappings;
}
public String preprocess(Message m, UriInfo u) {
handleExtensionMappings(m, u);
handleLanguageMappings(m, u);
-
+
MultivaluedMap<String, String> queries = u.getQueryParameters();
handleTypeQuery(m, queries);
handleCType(m, queries);
handleMethod(m, queries, new HttpHeadersImpl(m));
return new UriInfoImpl(m, null).getPath();
}
-
+
private void handleLanguageMappings(Message m, UriInfo uriInfo) {
if (languageMappings.isEmpty()) {
return;
@@ -95,10 +95,10 @@ public class RequestPreprocessor {
updateAcceptLanguageHeader(m, entry.getValue().toString());
updatePath(m, path, entry.getKey().toString(), ps.getMatrixString());
break;
- }
+ }
}
}
-
+
private void handleExtensionMappings(Message m, UriInfo uriInfo) {
if (extensionMappings.isEmpty()) {
return;
@@ -114,7 +114,7 @@ public class RequestPreprocessor {
updateAcceptTypeHeader(m, entry.getValue().toString());
updatePath(m, path, key, ps.getMatrixString());
if ("wadl".equals(key)) {
- // the path has been updated and Accept was not necessarily set to
+ // the path has been updated and Accept was not necessarily set to
// WADL type (xml or json or html - other options)
String query = (String)m.get(Message.QUERY_STRING);
if (StringUtils.isEmpty(query)) {
@@ -127,22 +127,22 @@ public class RequestPreprocessor {
break;
}
}
-
+
}
-
+
@SuppressWarnings("unchecked")
private void updateAcceptLanguageHeader(Message m, String anotherValue) {
List<String> acceptLanguage =
((Map<String, List<String>>)m.get(Message.PROTOCOL_HEADERS)).get(HttpHeaders.ACCEPT_LANGUAGE);
if (acceptLanguage == null) {
- acceptLanguage = new ArrayList<>();
+ acceptLanguage = new ArrayList<>();
}
-
+
acceptLanguage.add(anotherValue);
((Map<String, List<String>>)m.get(Message.PROTOCOL_HEADERS))
.put(HttpHeaders.ACCEPT_LANGUAGE, acceptLanguage);
}
-
+
private void updatePath(Message m, String path, String suffix, String matrixString) {
String newPath = path.substring(0, path.length() - (suffix.length() + 1));
if (matrixString != null) {
@@ -150,8 +150,8 @@ public class RequestPreprocessor {
}
HttpUtils.updatePath(m, newPath);
}
-
- private void handleMethod(Message m,
+
+ private void handleMethod(Message m,
MultivaluedMap<String, String> queries,
HttpHeaders headers) {
String method = queries.getFirst(METHOD_QUERY);
@@ -165,7 +165,7 @@ public class RequestPreprocessor {
m.put(Message.HTTP_REQUEST_METHOD, method);
}
}
-
+
private void handleTypeQuery(Message m, MultivaluedMap<String, String> queries) {
String type = queries.getFirst(ACCEPT_QUERY);
if (type != null) {
@@ -175,7 +175,7 @@ public class RequestPreprocessor {
updateAcceptTypeHeader(m, type);
}
}
-
+
private void handleCType(Message m, MultivaluedMap<String, String> queries) {
String type = queries.getFirst(CTYPE_QUERY);
if (type != null) {
@@ -185,13 +185,13 @@ public class RequestPreprocessor {
m.put(Message.CONTENT_TYPE, type);
}
}
-
+
@SuppressWarnings("unchecked")
private void updateAcceptTypeHeader(Message m, String acceptValue) {
m.put(Message.ACCEPT_CONTENT_TYPE, acceptValue);
((Map<String, List<String>>)m.get(Message.PROTOCOL_HEADERS))
.put(HttpHeaders.ACCEPT, Collections.singletonList(acceptValue));
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
index 5e43f11..e6ad96c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
@@ -38,21 +38,21 @@ public class ResourceContextImpl implements ResourceContext {
this.cri = ori.getClassResourceInfo();
this.subClass = ori.getMethodToInvoke().getReturnType();
}
-
+
@Override
public <T> T getResource(Class<T> cls) {
ResourceProvider rp = null;
-
+
Object propValue = m.getContextualProperty(CONTEXT_PROVIDER_PROP);
if (propValue instanceof ResourceContextProvider) {
rp = ((ResourceContextProvider)propValue).getResourceProvider(cls);
- } else {
+ } else {
rp = new PerRequestResourceProvider(cls);
}
T resource = cls.cast(rp.getInstance(m));
return doInitResource(cls, resource);
}
-
+
public <T> T initResource(T resource) {
return doInitResource(resource.getClass(), resource);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceInfoImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceInfoImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceInfoImpl.java
index 8baaf24..4c8217d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceInfoImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResourceInfoImpl.java
@@ -35,7 +35,7 @@ public class ResourceInfoImpl implements ResourceInfo {
public ResourceInfoImpl(OperationResourceInfo ori) {
this.ori = ori;
}
-
+
@Override
public Method getResourceMethod() {
return ori == null ? null : ori.getMethodToInvoke();
@@ -44,5 +44,5 @@ public class ResourceInfoImpl implements ResourceInfo {
public Class<?> getResourceClass() {
return ori == null ? null : ori.getClassResourceInfo().getResourceClass();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
index 78797a8..6854c2b 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseBuilderImpl.java
@@ -46,7 +46,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
-
+
private int status = 200;
private boolean statusSet;
private Object entity;
@@ -62,13 +62,13 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
metadata.putAll(copy.metadata);
entity = copy.entity;
}
-
+
public Response build() {
if (entity == null && !statusSet) {
status = 204;
}
ResponseImpl r = new ResponseImpl(status);
- MetadataMap<String, Object> m =
+ MetadataMap<String, Object> m =
new MetadataMap<String, Object>(metadata, false, true);
r.addMetadata(m);
r.setEntity(entity, annotations);
@@ -102,7 +102,7 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
public ResponseBuilder language(Locale locale) {
return setHeader(HttpHeaders.CONTENT_LANGUAGE, locale);
}
-
+
public ResponseBuilder language(String language) {
return setHeader(HttpHeaders.CONTENT_LANGUAGE, language);
}
@@ -111,7 +111,7 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
if (!loc.isAbsolute()) {
Message currentMessage = PhaseInterceptorChain.getCurrentMessage();
if (currentMessage != null) {
-
+
UriInfo ui = new UriInfoImpl(currentMessage.getExchange().getInMessage(), null);
loc = ui.getBaseUriBuilder()
.path(loc.getRawPath())
@@ -155,12 +155,12 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
public ResponseBuilder cookie(NewCookie... cookies) {
return addHeader(HttpHeaders.SET_COOKIE, (Object[])cookies);
}
-
+
public ResponseBuilder header(String name, Object value) {
return addHeader(name, value);
}
-
+
@Override
public ResponseBuilder variant(Variant variant) {
type(variant == null ? null : variant.getMediaType());
@@ -199,7 +199,7 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
handleVaryValue(acceptVary, acceptLangVary, acceptEncVary);
return this;
}
-
+
private void handleVaryValue(String ...values) {
List<Object> varyValues = metadata.get(HttpHeaders.VARY);
for (String v : values) {
@@ -213,7 +213,7 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
}
}
}
-
+
// CHECKSTYLE:OFF
@Override
public ResponseBuilder clone() {
@@ -221,14 +221,14 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
}
// CHECKSTYLE:ON
-
+
private void reset() {
metadata.clear();
entity = null;
annotations = null;
status = 200;
}
-
+
private ResponseBuilder setHeader(String name, Object value) {
if (value == null) {
metadata.remove(name);
@@ -237,22 +237,22 @@ public class ResponseBuilderImpl extends ResponseBuilder implements Cloneable {
}
return this;
}
-
+
private ResponseBuilder addHeader(String name, Object... values) {
if (values != null && values.length >= 1 && values[0] != null) {
boolean isAllowHeader = HttpHeaders.ALLOW.equals(name);
for (Object value : values) {
- Object thevalue = isAllowHeader ? value.toString().toUpperCase() : value;
+ Object thevalue = isAllowHeader ? value.toString().toUpperCase() : value;
if (!valueExists(name, thevalue)) {
metadata.add(name, thevalue);
}
}
} else {
metadata.remove(name);
- }
+ }
return this;
}
-
+
private boolean valueExists(String key, Object value) {
List<Object> values = metadata.get(key);
return values == null ? false : values.contains(value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
index 0039923..0363650 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
@@ -62,43 +62,43 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
public final class ResponseImpl extends Response {
-
+
private int status;
private Object entity;
- private Annotation[] entityAnnotations;
+ private Annotation[] entityAnnotations;
private MultivaluedMap<String, Object> metadata;
-
+
private Message outMessage;
- private boolean entityClosed;
+ private boolean entityClosed;
private boolean entityBufferred;
private Object lastEntity;
-
+
ResponseImpl(int s) {
this.status = s;
}
-
+
ResponseImpl(int s, Object e) {
this.status = s;
this.entity = e;
}
-
- public void addMetadata(MultivaluedMap<String, Object> meta) {
+
+ public void addMetadata(MultivaluedMap<String, Object> meta) {
this.metadata = meta;
}
-
- public void setStatus(int s) {
+
+ public void setStatus(int s) {
this.status = s;
}
-
- public void setEntity(Object e, Annotation[] anns) {
+
+ public void setEntity(Object e, Annotation[] anns) {
this.entity = e;
this.entityAnnotations = anns;
}
-
- public void setEntityAnnotations(Annotation[] anns) {
+
+ public void setEntityAnnotations(Annotation[] anns) {
this.entityAnnotations = anns;
}
-
+
public Annotation[] getEntityAnnotations() {
return entityAnnotations;
}
@@ -106,11 +106,11 @@ public final class ResponseImpl extends Response {
public void setOutMessage(Message message) {
this.outMessage = message;
}
-
+
public Message getOutMessage() {
return this.outMessage;
}
-
+
public int getStatus() {
return status;
}
@@ -123,22 +123,22 @@ public final class ResponseImpl extends Response {
}
public String getReasonPhrase() {
- Response.Status statusEnum = Response.Status.fromStatusCode(ResponseImpl.this.status);
+ Response.Status statusEnum = Response.Status.fromStatusCode(ResponseImpl.this.status);
return statusEnum != null ? statusEnum.getReasonPhrase() : "";
}
public int getStatusCode() {
return ResponseImpl.this.status;
- }
-
+ }
+
};
}
-
+
public Object getActualEntity() {
checkEntityIsClosed();
return lastEntity != null ? lastEntity : entity;
}
-
+
public Object getEntity() {
return InjectionUtils.getEntity(getActualEntity());
}
@@ -146,15 +146,15 @@ public final class ResponseImpl extends Response {
public boolean hasEntity() {
return getActualEntity() != null;
}
-
+
public MultivaluedMap<String, Object> getMetadata() {
return getHeaders();
}
-
+
public MultivaluedMap<String, Object> getHeaders() {
return metadata;
}
-
+
public MultivaluedMap<String, String> getStringHeaders() {
MetadataMap<String, String> headers = new MetadataMap<String, String>(metadata.size());
for (Map.Entry<String, List<Object>> entry : metadata.entrySet()) {
@@ -168,22 +168,22 @@ public final class ResponseImpl extends Response {
List<Object> methodValues = metadata.get(header);
return HttpUtils.getHeaderString(toListOfStrings(header, methodValues));
}
-
+
// This conversion is needed as some values may not be Strings
private List<String> toListOfStrings(String headerName, List<Object> values) {
if (values == null) {
- return null;
+ return null;
} else {
List<String> stringValues = new ArrayList<>(values.size());
HeaderDelegate<Object> hd = HttpUtils.getHeaderDelegate(values.get(0));
for (Object value : values) {
- String actualValue = hd == null ? value.toString() : hd.toString(value);
+ String actualValue = hd == null ? value.toString() : hd.toString(value);
stringValues.add(actualValue);
}
return stringValues;
}
}
-
+
public Set<String> getAllowedMethods() {
List<Object> methodValues = metadata.get(HttpHeaders.ALLOW);
if (methodValues == null) {
@@ -197,8 +197,8 @@ public final class ResponseImpl extends Response {
}
}
-
-
+
+
public Map<String, NewCookie> getCookies() {
List<Object> cookieValues = metadata.get(HttpHeaders.SET_COOKIE);
if (cookieValues == null) {
@@ -222,7 +222,7 @@ public final class ResponseImpl extends Response {
return value == null || value instanceof Date ? (Date)value
: HttpUtils.getHttpDate(value.toString());
}
-
+
public EntityTag getEntityTag() {
Object header = metadata.getFirst(HttpHeaders.ETAG);
return header == null || header instanceof EntityTag ? (EntityTag)header
@@ -252,10 +252,10 @@ public final class ResponseImpl extends Response {
public MediaType getMediaType() {
Object header = metadata.getFirst(HttpHeaders.CONTENT_TYPE);
- return header == null || header instanceof MediaType ? (MediaType)header
+ return header == null || header instanceof MediaType ? (MediaType)header
: (MediaType)JAXRSUtils.toMediaType(header.toString());
}
-
+
public boolean hasLink(String relation) {
List<Object> linkValues = metadata.get(HttpHeaders.LINK);
if (linkValues != null) {
@@ -268,7 +268,7 @@ public final class ResponseImpl extends Response {
}
return false;
}
-
+
public Link getLink(String relation) {
Set<Link> links = getAllLinks();
for (Link link : links) {
@@ -305,7 +305,7 @@ public final class ResponseImpl extends Response {
return links;
}
}
-
+
public <T> T readEntity(Class<T> cls) throws ProcessingException, IllegalStateException {
return readEntity(cls, new Annotation[]{});
}
@@ -316,33 +316,33 @@ public final class ResponseImpl extends Response {
public <T> T readEntity(Class<T> cls, Annotation[] anns) throws ProcessingException,
IllegalStateException {
-
+
return doReadEntity(cls, cls, anns);
}
@SuppressWarnings("unchecked")
public <T> T readEntity(GenericType<T> genType, Annotation[] anns) throws ProcessingException,
IllegalStateException {
- return doReadEntity((Class<T>)genType.getRawType(),
+ return doReadEntity((Class<T>)genType.getRawType(),
genType.getType(), anns);
}
-
+
public <T> T doReadEntity(Class<T> cls, Type t, Annotation[] anns) throws ProcessingException,
IllegalStateException {
-
+
checkEntityIsClosed();
-
+
if (lastEntity != null && cls.isAssignableFrom(lastEntity.getClass())
&& !(lastEntity instanceof InputStream)) {
return cls.cast(lastEntity);
- }
-
+ }
+
MediaType mediaType = getMediaType();
if (mediaType == null) {
mediaType = MediaType.WILDCARD_TYPE;
}
-
- // the stream is available if entity is IS or
+
+ // the stream is available if entity is IS or
// message contains XMLStreamReader or Reader
boolean entityStreamAvailable = entityStreamAvailable();
InputStream entityStream = null;
@@ -353,26 +353,26 @@ public final class ResponseImpl extends Response {
} else if (entity instanceof InputStream) {
entityStream = InputStream.class.cast(entity);
}
-
+
// we need to check for readers even if no IS is set - the readers may still do it
List<ReaderInterceptor> readers = outMessage == null ? null : ProviderFactory.getInstance(outMessage)
.createMessageBodyReaderInterceptor(cls, t, anns, mediaType, outMessage, entityStreamAvailable, null);
-
+
if (readers != null) {
try {
if (entityBufferred) {
InputStream.class.cast(entity).reset();
}
-
+
Message responseMessage = getResponseMessage();
responseMessage.put(Message.PROTOCOL_HEADERS, getHeaders());
-
- lastEntity = JAXRSUtils.readFromMessageBodyReader(readers, cls, t,
- anns,
- entityStream,
- mediaType,
+
+ lastEntity = JAXRSUtils.readFromMessageBodyReader(readers, cls, t,
+ anns,
+ entityStream,
+ mediaType,
responseMessage);
- autoClose(cls, false);
+ autoClose(cls, false);
return castLastEntity();
} catch (Exception ex) {
autoClose(cls, true);
@@ -388,18 +388,18 @@ public final class ResponseImpl extends Response {
return castLastEntity();
} else if (entityStreamAvailable) {
reportMessageHandlerProblem("NO_MSG_READER", cls, mediaType, null);
- }
-
+ }
+
throw new IllegalStateException("The entity is not backed by an input stream, entity class is : "
+ (entity != null ? entity.getClass().getName() : cls.getName()));
-
+
}
-
+
@SuppressWarnings("unchecked")
private <T> T castLastEntity() {
return (T)lastEntity;
}
-
+
public InputStream convertEntityToStreamIfPossible() {
String stringEntity = null;
if (entity instanceof String || entity instanceof Number) {
@@ -415,37 +415,37 @@ public final class ResponseImpl extends Response {
return null;
}
}
-
+
private boolean entityStreamAvailable() {
if (entity == null) {
- Message inMessage = getResponseMessage();
+ Message inMessage = getResponseMessage();
return inMessage != null && (inMessage.getContent(XMLStreamReader.class) != null
|| inMessage.getContent(Reader.class) != null);
} else {
return entity instanceof InputStream;
}
}
-
+
private Message getResponseMessage() {
Message responseMessage = outMessage.getExchange().getInMessage();
if (responseMessage == null) {
- responseMessage = outMessage.getExchange().getInFaultMessage();
+ responseMessage = outMessage.getExchange().getInFaultMessage();
}
return responseMessage;
}
-
+
private void reportMessageHandlerProblem(String name, Class<?> cls, MediaType ct, Throwable cause) {
String errorMessage = JAXRSUtils.logMessageHandlerProblem(name, cls, ct);
throw new ResponseProcessingException(this, errorMessage, cause);
}
-
+
protected void autoClose(Class<?> cls, boolean exception) {
if (!entityBufferred && !JAXRSUtils.isStreamingOutType(cls)
&& (exception || MessageUtils.isTrue(outMessage.getContextualProperty("response.stream.auto.close")))) {
close();
}
}
-
+
public boolean bufferEntity() throws ProcessingException {
checkEntityIsClosed();
if (!entityBufferred && entity instanceof InputStream) {
@@ -473,9 +473,9 @@ public final class ResponseImpl extends Response {
entity = null;
entityClosed = true;
}
-
+
}
-
+
private void checkEntityIsClosed() {
if (entityClosed) {
throw new IllegalStateException("Entity is not available");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
index dcd5946..612578c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RuntimeDelegateImpl.java
@@ -42,8 +42,8 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils;
public class RuntimeDelegateImpl extends RuntimeDelegate {
- protected Map<Class<?>, HeaderDelegate<?>> headerProviders
- = new HashMap<Class<?>, HeaderDelegate<?>>();
+ protected Map<Class<?>, HeaderDelegate<?>> headerProviders
+ = new HashMap<Class<?>, HeaderDelegate<?>>();
public RuntimeDelegateImpl() {
headerProviders.put(MediaType.class, new MediaTypeHeaderProvider());
@@ -54,13 +54,13 @@ public class RuntimeDelegateImpl extends RuntimeDelegate {
headerProviders.put(Link.class, new LinkHeaderProvider());
headerProviders.put(Date.class, new DateHeaderProvider());
}
-
-
-
+
+
+
public <T> T createInstance(Class<T> type) {
if (type.isAssignableFrom(ResponseBuilder.class)) {
return type.cast(new ResponseBuilderImpl());
- }
+ }
if (type.isAssignableFrom(UriBuilder.class)) {
return type.cast(new UriBuilderImpl());
}
@@ -69,8 +69,8 @@ public class RuntimeDelegateImpl extends RuntimeDelegate {
}
return null;
}
-
-
+
+
@SuppressWarnings("unchecked")
@Override
public <T> HeaderDelegate<T> createHeaderDelegate(Class<T> type) {
@@ -98,13 +98,13 @@ public class RuntimeDelegateImpl extends RuntimeDelegate {
@Override
public VariantListBuilder createVariantListBuilder() {
- return new VariantListBuilderImpl();
+ return new VariantListBuilderImpl();
}
@Override
- public <T> T createEndpoint(Application app, Class<T> endpointType)
+ public <T> T createEndpoint(Application app, Class<T> endpointType)
throws IllegalArgumentException, UnsupportedOperationException {
if (app == null || (!Server.class.isAssignableFrom(endpointType)
&& !JAXRSServerFactoryBean.class.isAssignableFrom(endpointType))) {
@@ -125,6 +125,6 @@ public class RuntimeDelegateImpl extends RuntimeDelegate {
public Link.Builder createLinkBuilder() {
return new LinkBuilderImpl();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java
index 5127d7b..3088f62 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/SecurityContextImpl.java
@@ -33,7 +33,7 @@ import org.apache.cxf.message.Message;
public class SecurityContextImpl implements SecurityContext {
private Message m;
-
+
public SecurityContextImpl(Message m) {
this.m = m;
}
@@ -43,7 +43,7 @@ public class SecurityContextImpl implements SecurityContext {
return SecurityContext.BASIC_AUTH;
}
@SuppressWarnings("unchecked")
- Map<String, List<String>> headers =
+ Map<String, List<String>> headers =
(Map<String, List<String>>)m.get(Message.PROTOCOL_HEADERS);
if (headers != null) {
List<String> values = headers.get(HttpHeaders.AUTHORIZATION);
@@ -65,7 +65,7 @@ public class SecurityContextImpl implements SecurityContext {
return sc == null ? null : sc.getUserPrincipal();
}
-
+
public boolean isSecure() {
String value = HttpUtils.getEndpointAddress(m);
return value.startsWith("https://");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletOutputStreamFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletOutputStreamFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletOutputStreamFilter.java
index 31d6606..aab96d8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletOutputStreamFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletOutputStreamFilter.java
@@ -30,19 +30,19 @@ import org.apache.cxf.transport.http.AbstractHTTPDestination;
public class ServletOutputStreamFilter extends ServletOutputStream {
private Message m;
- private ServletOutputStream os;
-
+ private ServletOutputStream os;
+
public ServletOutputStreamFilter(ServletOutputStream os, Message m) {
this.os = os;
this.m = m;
}
-
+
@Override
public void write(int b) throws IOException {
setComittedStatus();
os.write(b);
}
-
+
@Override
public void write(byte[] b) throws IOException {
setComittedStatus();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletRequestPropertyHolder.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletRequestPropertyHolder.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletRequestPropertyHolder.java
index ccaf80d..d17cf32 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletRequestPropertyHolder.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ServletRequestPropertyHolder.java
@@ -34,7 +34,7 @@ public class ServletRequestPropertyHolder implements PropertyHolder {
public ServletRequestPropertyHolder(Message m) {
request = (HttpServletRequest)m.get("HTTP.REQUEST");
}
-
+
@Override
public Object getProperty(String name) {
return request.getAttribute(name);
@@ -56,7 +56,7 @@ public class ServletRequestPropertyHolder implements PropertyHolder {
@Override
public Collection<String> getPropertyNames() {
- List<String> list = new LinkedList<String>();
+ List<String> list = new LinkedList<String>();
Enumeration<String> attrNames = request.getAttributeNames();
while (attrNames.hasMoreElements()) {
String name = attrNames.nextElement();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index 476c629..820d6b0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -54,14 +54,14 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
private boolean originalPathEmpty;
private boolean leadingSlash;
private String fragment;
- private String schemeSpecificPart;
+ private String schemeSpecificPart;
private MultivaluedMap<String, String> query = new MetadataMap<String, String>();
private MultivaluedMap<String, String> matrix = new MetadataMap<String, String>();
-
+
private Map<String, Object> resolvedTemplates;
private Map<String, Object> resolvedTemplatesPathEnc;
private Map<String, Object> resolvedEncodedTemplates;
-
+
/**
* Creates builder with empty URI.
*/
@@ -70,7 +70,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
/**
* Creates builder initialized with given URI.
- *
+ *
* @param uri initial value for builder
* @throws IllegalArgumentException when uri is null
*/
@@ -87,7 +87,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
return rtemplates == null
? Collections.<String, Object>emptyMap() : new LinkedHashMap<String, Object>(rtemplates);
}
-
+
private URI doBuild(boolean fromEncoded, boolean encodePathSlash, Object... values) {
if (values == null) {
throw new IllegalArgumentException("Template parameter values are set to null");
@@ -97,7 +97,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
throw new IllegalArgumentException("Template parameter value at position " + i + " is set to null");
}
}
-
+
UriParts parts = doBuildUriParts(fromEncoded, encodePathSlash, false, values);
try {
return buildURI(fromEncoded, parts.path, parts.query, parts.fragment);
@@ -105,58 +105,58 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
throw new UriBuilderException("URI can not be built", ex);
}
}
-
- private UriParts doBuildUriParts(boolean fromEncoded, boolean encodePathSlash,
+
+ private UriParts doBuildUriParts(boolean fromEncoded, boolean encodePathSlash,
boolean allowUnresolved, Object... values) {
-
+
Map<String, Object> alreadyResolvedTs = getResolvedTemplates(resolvedTemplates);
Map<String, Object> alreadyResolvedTsPathEnc = getResolvedTemplates(resolvedTemplatesPathEnc);
Map<String, Object> alreadyResolvedEncTs = getResolvedTemplates(resolvedEncodedTemplates);
- final int resolvedTsSize = alreadyResolvedTs.size()
+ final int resolvedTsSize = alreadyResolvedTs.size()
+ alreadyResolvedEncTs.size()
+ alreadyResolvedTsPathEnc.size();
-
+
String thePath = buildPath();
URITemplate pathTempl = new URITemplate(thePath);
- thePath = substituteVarargs(pathTempl, alreadyResolvedTs, alreadyResolvedTsPathEnc,
- alreadyResolvedEncTs, values, 0, false, fromEncoded,
+ thePath = substituteVarargs(pathTempl, alreadyResolvedTs, alreadyResolvedTsPathEnc,
+ alreadyResolvedEncTs, values, 0, false, fromEncoded,
allowUnresolved, encodePathSlash);
int pathTemplateVarsSize = pathTempl.getVariables().size();
-
+
String theQuery = buildQuery();
int queryTemplateVarsSize = 0;
if (theQuery != null) {
URITemplate queryTempl = new URITemplate(theQuery);
queryTemplateVarsSize = queryTempl.getVariables().size();
if (queryTemplateVarsSize > 0) {
- int lengthDiff = values.length + resolvedTsSize
- - alreadyResolvedTs.size() - alreadyResolvedTsPathEnc.size() - alreadyResolvedEncTs.size()
- - pathTemplateVarsSize;
- theQuery = substituteVarargs(queryTempl, alreadyResolvedTs, alreadyResolvedTsPathEnc,
- alreadyResolvedEncTs, values, values.length - lengthDiff,
+ int lengthDiff = values.length + resolvedTsSize
+ - alreadyResolvedTs.size() - alreadyResolvedTsPathEnc.size() - alreadyResolvedEncTs.size()
+ - pathTemplateVarsSize;
+ theQuery = substituteVarargs(queryTempl, alreadyResolvedTs, alreadyResolvedTsPathEnc,
+ alreadyResolvedEncTs, values, values.length - lengthDiff,
true, fromEncoded, allowUnresolved, false);
}
}
-
+
String theFragment = fragment;
if (theFragment != null) {
URITemplate fragmentTempl = new URITemplate(theFragment);
if (fragmentTempl.getVariables().size() > 0) {
- int lengthDiff = values.length + resolvedTsSize
+ int lengthDiff = values.length + resolvedTsSize
- alreadyResolvedTs.size() - alreadyResolvedTsPathEnc.size() - alreadyResolvedEncTs.size()
- - pathTemplateVarsSize - queryTemplateVarsSize;
- theFragment = substituteVarargs(fragmentTempl, alreadyResolvedTs, alreadyResolvedTsPathEnc,
- alreadyResolvedEncTs, values, values.length - lengthDiff,
+ - pathTemplateVarsSize - queryTemplateVarsSize;
+ theFragment = substituteVarargs(fragmentTempl, alreadyResolvedTs, alreadyResolvedTsPathEnc,
+ alreadyResolvedEncTs, values, values.length - lengthDiff,
true, fromEncoded, allowUnresolved, false);
}
}
-
+
return new UriParts(thePath, theQuery, theFragment);
}
-
- private URI buildURI(boolean fromEncoded, String thePath, String theQuery, String theFragment)
+
+ private URI buildURI(boolean fromEncoded, String thePath, String theQuery, String theFragment)
throws URISyntaxException {
- if (fromEncoded) {
+ if (fromEncoded) {
return buildURIFromEncoded(thePath, theQuery, theFragment);
} else if (!isSchemeOpaque()) {
if ((scheme != null || host != null || userInfo != null)
@@ -168,7 +168,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
} catch (Exception ex) {
// lets try the option below
}
- URI uri = new URI(scheme, userInfo, host, port,
+ URI uri = new URI(scheme, userInfo, host, port,
thePath, theQuery, theFragment);
if (thePath.contains("%2F")) {
// TODO: the bogus case of segments containing encoded '/'
@@ -181,12 +181,12 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
return new URI(scheme, schemeSpecificPart, theFragment);
}
}
-
- private URI buildURIFromEncoded(String thePath, String theQuery, String theFragment)
+
+ private URI buildURIFromEncoded(String thePath, String theQuery, String theFragment)
throws URISyntaxException {
return new URI(buildUriString(thePath, theQuery, theFragment));
}
-
+
private String buildUriString(String thePath, String theQuery, String theFragment) {
StringBuilder b = new StringBuilder();
if (scheme != null) {
@@ -203,10 +203,10 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
b.append(host);
}
if (port != -1) {
- b.append(':').append(port);
+ b.append(':').append(port);
}
if (thePath != null && thePath.length() > 0) {
- b.append(thePath.startsWith("/") || b.length() == 0 || originalPathEmpty
+ b.append(thePath.startsWith("/") || b.length() == 0 || originalPathEmpty
? thePath : '/' + thePath);
}
if (theQuery != null && theQuery.length() != 0) {
@@ -220,11 +220,11 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
return b.toString();
}
-
+
private boolean isSchemeOpaque() {
return schemeSpecificPart != null;
}
-
+
@Override
public URI buildFromEncoded(Object... values) throws IllegalArgumentException, UriBuilderException {
return doBuild(true, false, values);
@@ -236,48 +236,48 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
return doBuildFromMap(map, false, true);
}
- private URI doBuildFromMap(Map<String, ? extends Object> map, boolean fromEncoded,
- boolean encodePathSlash)
+ private URI doBuildFromMap(Map<String, ? extends Object> map, boolean fromEncoded,
+ boolean encodePathSlash)
throws IllegalArgumentException, UriBuilderException {
try {
Map<String, Object> alreadyResolvedTs = getResolvedTemplates(resolvedTemplates);
Map<String, Object> alreadyResolvedTsPathEnc = getResolvedTemplates(resolvedTemplatesPathEnc);
Map<String, Object> alreadyResolvedEncTs = getResolvedTemplates(resolvedEncodedTemplates);
-
+
String thePath = buildPath();
- thePath = substituteMapped(thePath, map, alreadyResolvedTs, alreadyResolvedTsPathEnc,
+ thePath = substituteMapped(thePath, map, alreadyResolvedTs, alreadyResolvedTsPathEnc,
alreadyResolvedEncTs, false, fromEncoded, encodePathSlash);
-
+
String theQuery = buildQuery();
if (theQuery != null) {
- theQuery = substituteMapped(theQuery, map, alreadyResolvedTs, alreadyResolvedTsPathEnc,
+ theQuery = substituteMapped(theQuery, map, alreadyResolvedTs, alreadyResolvedTsPathEnc,
alreadyResolvedEncTs, true, fromEncoded, false);
}
-
- String theFragment = fragment == null
- ? null : substituteMapped(fragment, map, alreadyResolvedTs, alreadyResolvedTsPathEnc,
+
+ String theFragment = fragment == null
+ ? null : substituteMapped(fragment, map, alreadyResolvedTs, alreadyResolvedTsPathEnc,
alreadyResolvedEncTs, true, fromEncoded, encodePathSlash);
-
+
return buildURI(fromEncoded, thePath, theQuery, theFragment);
} catch (URISyntaxException ex) {
throw new UriBuilderException("URI can not be built", ex);
}
}
//CHECKSTYLE:OFF
- private String substituteVarargs(URITemplate templ,
+ private String substituteVarargs(URITemplate templ,
Map<String, Object> alreadyResolvedTs,
Map<String, Object> alreadyResolvedTsPathEnc,
Map<String, Object> alreadyResolvedTsEnc,
- Object[] values,
+ Object[] values,
int ind,
boolean isQuery,
boolean fromEncoded,
boolean allowUnresolved,
boolean encodePathSlash) {
-
- //CHECKSTYLE:ON
+
+ //CHECKSTYLE:ON
Map<String, String> varValueMap = new HashMap<String, String>();
-
+
// vars in set are properly ordered due to linking in hash set
Set<String> uniqueVars = new LinkedHashSet<String>(templ.getVariables());
if (!allowUnresolved && values.length + alreadyResolvedTs.size() + alreadyResolvedTsEnc.size()
@@ -287,14 +287,14 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
+ " unique variable(s)");
}
int idx = ind;
- Set<String> pathEncodeVars = alreadyResolvedTsPathEnc.isEmpty() && !encodePathSlash
+ Set<String> pathEncodeVars = alreadyResolvedTsPathEnc.isEmpty() && !encodePathSlash
? Collections.<String>emptySet() : new HashSet<>();
for (String var : uniqueVars) {
-
+
boolean resolvedPathVarHasToBeEncoded = alreadyResolvedTsPathEnc.containsKey(var);
boolean varValueHasToBeEncoded = resolvedPathVarHasToBeEncoded || alreadyResolvedTs.containsKey(var);
-
- Map<String, Object> resolved = !varValueHasToBeEncoded ? alreadyResolvedTsEnc
+
+ Map<String, Object> resolved = !varValueHasToBeEncoded ? alreadyResolvedTsEnc
: resolvedPathVarHasToBeEncoded ? alreadyResolvedTsPathEnc : alreadyResolvedTs;
Object oval = resolved.isEmpty() ? null : resolved.remove(var);
boolean valueFromEncodedMap = false;
@@ -306,7 +306,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
} else {
valueFromEncodedMap = resolved == alreadyResolvedTsEnc;
}
-
+
if (oval == null) {
throw new IllegalArgumentException("No object for " + var);
}
@@ -316,20 +316,20 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
} else {
value = isQuery ? HttpUtils.queryEncode(value) : HttpUtils.pathEncode(value);
}
-
+
varValueMap.put(var, value);
-
- if (!isQuery && (resolvedPathVarHasToBeEncoded
+
+ if (!isQuery && (resolvedPathVarHasToBeEncoded
|| encodePathSlash && !varValueHasToBeEncoded)) {
pathEncodeVars.add(var);
}
-
+
}
return templ.substitute(varValueMap, pathEncodeVars, allowUnresolved);
}
-
+
//CHECKSTYLE:OFF
- private String substituteMapped(String path,
+ private String substituteMapped(String path,
Map<String, ? extends Object> varValueMap,
Map<String, Object> alreadyResolvedTs,
Map<String, Object> alreadyResolvedTsPathEnc,
@@ -339,7 +339,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
boolean encodePathSlash) {
//CHECKSTYLE:ON
URITemplate templ = new URITemplate(path);
-
+
Set<String> uniqueVars = new HashSet<>(templ.getVariables());
if (varValueMap.size() + alreadyResolvedTs.size() + alreadyResolvedTsEnc.size()
+ alreadyResolvedTsPathEnc.size() < uniqueVars.size()) {
@@ -347,21 +347,21 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
+ " value(s) given for " + uniqueVars.size()
+ " unique variable(s)");
}
-
- Set<String> pathEncodeVars = alreadyResolvedTsPathEnc.isEmpty() && !encodePathSlash
+
+ Set<String> pathEncodeVars = alreadyResolvedTsPathEnc.isEmpty() && !encodePathSlash
? Collections.<String>emptySet() : new HashSet<>();
-
- Map<String, Object> theMap = new LinkedHashMap<String, Object>();
+
+ Map<String, Object> theMap = new LinkedHashMap<String, Object>();
for (String var : uniqueVars) {
boolean isPathEncVar = !isQuery && alreadyResolvedTsPathEnc.containsKey(var);
-
+
boolean isVarEncoded = isPathEncVar || alreadyResolvedTs.containsKey(var) ? false : true;
- Map<String, Object> resolved = isVarEncoded ? alreadyResolvedTsEnc
+ Map<String, Object> resolved = isVarEncoded ? alreadyResolvedTsEnc
: isPathEncVar ? alreadyResolvedTsPathEnc : alreadyResolvedTs;
Object oval = resolved.isEmpty() ? null : resolved.remove(var);
if (oval == null) {
oval = varValueMap.get(var);
- }
+ }
if (oval == null) {
throw new IllegalArgumentException("No object for " + var);
}
@@ -381,7 +381,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
@Override
public URI buildFromEncodedMap(Map<String, ?> map) throws IllegalArgumentException,
UriBuilderException {
-
+
Map<String, String> decodedMap = new HashMap<String, String>(map.size());
for (Map.Entry<String, ? extends Object> entry : map.entrySet()) {
if (entry.getValue() == null) {
@@ -390,7 +390,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
String theValue = entry.getValue().toString();
if (theValue.contains("/")) {
// protecting '/' from being encoded here assumes that a given value may constitute multiple
- // path segments - very questionable especially given that queries and fragments may also
+ // path segments - very questionable especially given that queries and fragments may also
// contain template vars - technically this can be covered by checking where a given template
// var is coming from and act accordingly. Confusing nonetheless.
StringBuilder buf = new StringBuilder();
@@ -405,7 +405,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
} else {
decodedMap.put(entry.getKey(), HttpUtils.encodePartiallyEncoded(theValue, false));
}
-
+
}
return doBuildFromMap(decodedMap, true, false);
}
@@ -425,16 +425,16 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
builder.schemeSpecificPart = schemeSpecificPart;
builder.leadingSlash = leadingSlash;
builder.originalPathEmpty = originalPathEmpty;
- builder.resolvedEncodedTemplates =
+ builder.resolvedEncodedTemplates =
resolvedEncodedTemplates == null ? null : new HashMap<String, Object>(resolvedEncodedTemplates);
- builder.resolvedTemplates =
+ builder.resolvedTemplates =
resolvedTemplates == null ? null : new HashMap<String, Object>(resolvedTemplates);
- builder.resolvedTemplatesPathEnc =
+ builder.resolvedTemplatesPathEnc =
resolvedTemplatesPathEnc == null ? null : new HashMap<String, Object>(resolvedTemplatesPathEnc);
return builder;
}
// CHECKSTYLE:ON
-
+
@Override
public UriBuilder fragment(String theFragment) throws IllegalArgumentException {
this.fragment = theFragment;
@@ -466,7 +466,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
@Override
- public UriBuilder path(@SuppressWarnings("rawtypes") Class resource, String method)
+ public UriBuilder path(@SuppressWarnings("rawtypes") Class resource, String method)
throws IllegalArgumentException {
if (resource == null) {
throw new IllegalArgumentException("resource is null");
@@ -491,7 +491,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
// path(String) decomposes multi-segment path when necessary
return path(foundAnn.value());
}
-
+
@Override
public UriBuilder path(Method method) throws IllegalArgumentException {
@@ -526,10 +526,10 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
return uriAsTemplate(path);
}
String pathEncoded = HttpUtils.pathEncode(path);
- // Bad hack to bypass the TCK usage of bogus URI with empty paths containing matrix parameters,
+ // Bad hack to bypass the TCK usage of bogus URI with empty paths containing matrix parameters,
// which even URI class chokes upon; cheaper to do the following than try to challenge,
// given that URI RFC mentions the possibility of empty paths, though no word on the possibility of
- // such empty paths having matrix parameters...
+ // such empty paths having matrix parameters...
int schemeIndex = pathEncoded.indexOf("//");
if (schemeIndex != -1) {
int pathComponentStart = pathEncoded.indexOf("/", schemeIndex + 2);
@@ -543,16 +543,16 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
}
setUriParts(URI.create(pathEncoded));
- }
+ }
return this;
}
-
+
if (paths.isEmpty()) {
leadingSlash = path.startsWith("/");
}
-
+
List<PathSegment> segments;
- if (checkSegments) {
+ if (checkSegments) {
segments = JAXRSUtils.getPathSegments(path, false, false);
} else {
segments = new ArrayList<>();
@@ -566,11 +566,11 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
paths.addAll(segments);
matrix.clear();
if (!paths.isEmpty()) {
- matrix = paths.get(paths.size() - 1).getMatrixParameters();
+ matrix = paths.get(paths.size() - 1).getMatrixParameters();
}
return this;
}
-
+
@Override
public UriBuilder port(int thePort) throws IllegalArgumentException {
if (thePort < 0 && thePort != -1) {
@@ -623,7 +623,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
scheme = theScheme;
}
String rawPath = uri.getRawPath();
- if (!uri.isOpaque()
+ if (!uri.isOpaque()
&& (theScheme != null || rawPath != null && rawPath.startsWith("/"))) {
port = uri.getPort();
host = uri.getHost();
@@ -654,7 +654,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
matrix.clear();
}
}
-
+
private String buildPath() {
StringBuilder sb = new StringBuilder();
Iterator<PathSegment> iter = paths.iterator();
@@ -747,25 +747,25 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
paths.clear();
matrix.clear();
}
-
+
private boolean isAbsoluteUriPath(String path) {
- // This is the cheapest way to figure out if a given path is an absolute
- // URI with the http(s) scheme, more expensive way is to always convert
+ // This is the cheapest way to figure out if a given path is an absolute
+ // URI with the http(s) scheme, more expensive way is to always convert
// a path to URI and check if it starts from some scheme or not
-
+
// Given that the list of schemes can be open-ended it is recommended that
// UriBuilder.fromUri is called instead for schemes like 'file', 'jms', etc
// be supported though the use of non-http schemes for *building* new URIs
// is pretty limited in the context of working with JAX-RS services
-
+
return path.startsWith("http:") || path.startsWith("https:");
}
-
+
@Override
public UriBuilder replaceQuery(String queryValue) throws IllegalArgumentException {
if (queryValue != null) {
- // workaround to do with a conflicting and confusing requirement where spaces
- // passed as part of replaceQuery are encoded as %20 while those passed as part
+ // workaround to do with a conflicting and confusing requirement where spaces
+ // passed as part of replaceQuery are encoded as %20 while those passed as part
// of quertyParam are encoded as '+'
queryValue = queryValue.replace(" ", "%20");
}
@@ -800,7 +800,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
/**
* Query or matrix params convertion from object values vararg to list of strings. No encoding is
* provided.
- *
+ *
* @param values entry vararg values
* @return list of strings
* @throws IllegalArgumentException when one of values is null
@@ -828,10 +828,10 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
/**
* Builds param string for query part or matrix part of URI.
- *
+ *
* @param map query or matrix multivalued map
* @param separator params separator, '&' for query ';' for matrix
- * @param fromEncoded if true then values will be decoded
+ * @param fromEncoded if true then values will be decoded
* @return stringified params.
*/
private String buildParams(MultivaluedMap<String, String> map, char separator) {
@@ -842,7 +842,7 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
for (Iterator<String> sit = entry.getValue().iterator(); sit.hasNext();) {
String val = sit.next();
boolean templateValue = val.startsWith("{") && val.endsWith("}");
- if (!templateValue) {
+ if (!templateValue) {
val = HttpUtils.encodePartiallyEncoded(val, isQuery);
if (!isQuery) {
val = val.replaceAll("/", "%2F");
@@ -861,20 +861,20 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
return b.length() > 0 ? b.toString() : null;
}
-
+
/**
* Builds param string for matrix part of URI.
- *
- * @param sb buffer to add the matrix part to, will get ';' added if map is not empty
+ *
+ * @param sb buffer to add the matrix part to, will get ';' added if map is not empty
* @param map matrix multivalued map
- */
+ */
private void buildMatrix(StringBuilder sb, MultivaluedMap<String, String> map) {
if (!map.isEmpty()) {
sb.append(';');
sb.append(buildParams(map, ';'));
}
}
-
+
private PathSegment replacePathSegment(PathSegment ps) {
StringBuilder sb = new StringBuilder();
sb.append(ps.getPath());
@@ -891,18 +891,18 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
return uri(URI.create(uriTemplate));
} catch (Exception ex) {
if (new URITemplate(uriTemplate).getVariables().isEmpty()) {
- throw new IllegalArgumentException(ex);
+ throw new IllegalArgumentException(ex);
} else {
return uriAsTemplate(uriTemplate);
}
-
+
}
}
public UriBuilder uriAsTemplate(String uri) {
// This can be a start of replacing URI class Parser completely
- // but it can be too complicated, the following code is needed for now
- // to deal with URIs containing template variables.
+ // but it can be too complicated, the following code is needed for now
+ // to deal with URIs containing template variables.
int index = uri.indexOf(":");
if (index != -1) {
this.scheme = uri.substring(0, index);
@@ -914,11 +914,11 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
String[] schemePair = uri.substring(0, index).split(":");
this.host = schemePair[0];
this.port = schemePair.length == 2 ? Integer.parseInt(schemePair[1]) : -1;
-
+
}
uri = uri.substring(index);
}
-
+
}
String rawQuery = null;
index = uri.indexOf("?");
@@ -930,17 +930,17 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
if (rawQuery != null) {
query = JAXRSUtils.getStructuredParams(rawQuery, "&", false, true);
}
-
+
return this;
}
-
+
//the clarified rules for encoding values of uri templates are:
// - encode each value contextually based on the URI component containing the template
- // - in path templates, by default, encode also slashes (i.e. treat all path templates as
+ // - in path templates, by default, encode also slashes (i.e. treat all path templates as
// part of a single path segment, to be consistent with @Path annotation templates)
- // - for special cases when the slash encoding in path templates is not desired,
+ // - for special cases when the slash encoding in path templates is not desired,
// users may use the newly added build methods to override the default behavior
-
+
@Override
public URI build(Object[] vars, boolean encodePathSlash) throws IllegalArgumentException, UriBuilderException {
return doBuild(false, encodePathSlash, vars);
@@ -958,25 +958,25 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
UriParts parts = doBuildUriParts(false, false, true);
return buildUriString(parts.path, parts.query, parts.fragment);
}
-
+
@Override
public UriBuilder resolveTemplate(String name, Object value) throws IllegalArgumentException {
return resolveTemplate(name, value, true);
}
-
+
@Override
- public UriBuilder resolveTemplate(String name, Object value, boolean encodePathSlash)
+ public UriBuilder resolveTemplate(String name, Object value, boolean encodePathSlash)
throws IllegalArgumentException {
return resolveTemplates(Collections.singletonMap(name, value), encodePathSlash);
}
-
+
@Override
public UriBuilder resolveTemplates(Map<String, Object> values) throws IllegalArgumentException {
return resolveTemplates(values, true);
}
-
+
@Override
- public UriBuilder resolveTemplates(Map<String, Object> values, boolean encodePathSlash)
+ public UriBuilder resolveTemplates(Map<String, Object> values, boolean encodePathSlash)
throws IllegalArgumentException {
if (encodePathSlash) {
resolvedTemplatesPathEnc = fillInResolveTemplates(resolvedTemplatesPathEnc, values);
@@ -985,20 +985,20 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
return this;
}
-
+
@Override
public UriBuilder resolveTemplateFromEncoded(String name, Object value) throws IllegalArgumentException {
return resolveTemplatesFromEncoded(Collections.singletonMap(name, value));
}
-
+
@Override
- public UriBuilder resolveTemplatesFromEncoded(Map<String, Object> values)
+ public UriBuilder resolveTemplatesFromEncoded(Map<String, Object> values)
throws IllegalArgumentException {
resolvedEncodedTemplates = fillInResolveTemplates(resolvedEncodedTemplates, values);
return this;
}
-
- private static Map<String, Object> fillInResolveTemplates(Map<String, Object> map, Map<String, Object> values)
+
+ private static Map<String, Object> fillInResolveTemplates(Map<String, Object> map, Map<String, Object> values)
throws IllegalArgumentException {
if (values == null) {
throw new IllegalArgumentException();
@@ -1015,12 +1015,12 @@ public class UriBuilderImpl extends UriBuilder implements Cloneable {
}
return map;
}
-
+
private static class UriParts {
String path;
String query;
String fragment;
-
+
UriParts(String path, String query, String fragment) {
this.path = path;
this.query = query;
[45/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java b/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java
index 61724d8..3b28ec5 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java
@@ -37,12 +37,12 @@ public class Base64OutputStream extends FilterOutputStream {
byte[] bytes = ByteBuffer.allocate(Integer.SIZE / 8).putInt(value).array();
write(bytes, 0, bytes.length);
}
-
+
@Override
public void write(byte b[], int off, int len) throws IOException {
encodeAndWrite(b, off, len, false);
}
-
+
private void encodeAndWrite(byte[] b, int off, int len, boolean finalWrite) throws IOException {
byte[] theChunk = lastChunk;
int lenToEncode = len;
@@ -53,16 +53,16 @@ public class Base64OutputStream extends FilterOutputStream {
} else {
theChunk = b;
}
- int rem = finalWrite ? 0 : lenToEncode % 3;
+ int rem = finalWrite ? 0 : lenToEncode % 3;
Base64Utility.encodeAndStream(theChunk, off, lenToEncode - rem, urlSafe, out);
-
+
if (rem > 0) {
lastChunk = newArray(theChunk, lenToEncode - rem, rem);
} else {
lastChunk = null;
}
}
-
+
@Override
public void flush() throws IOException {
if (flushed || lastChunk == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java b/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java
index cde9701..3436208 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Base64UrlUtility.java
@@ -21,10 +21,10 @@ package org.apache.cxf.common.util;
/**
* Base64 URL Encoding/Decoding utility.
- *
+ *
* Character 62 ('+') is '-', Character 63 ('/') is '_';
- * Padding characters are dropped after the encoding.
- *
+ * Padding characters are dropped after the encoding.
+ *
*/
import java.io.IOException;
@@ -36,7 +36,7 @@ public final class Base64UrlUtility {
private Base64UrlUtility() {
//utility class, never constructed
}
-
+
public static byte[] decode(String encoded) throws Base64Exception {
return Base64Utility.decode(encoded, true);
}
@@ -44,7 +44,7 @@ public final class Base64UrlUtility {
public static String encode(String str) {
return encode(str.getBytes(StandardCharsets.UTF_8));
}
-
+
public static String encode(byte[] id) {
return encodeChunk(id, 0, id.length);
}
@@ -57,7 +57,7 @@ public final class Base64UrlUtility {
return null;
}
}
-
+
public static void encodeAndStream(byte[] id,
int o,
int l,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
index d101b39..0096358 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Base64Utility.java
@@ -20,7 +20,7 @@
package org.apache.cxf.common.util;
/**
- * Base64Utility - this static class provides useful base64
+ * Base64Utility - this static class provides useful base64
* encoding utilities.
*/
@@ -46,45 +46,45 @@ import org.apache.cxf.common.logging.LogUtils;
* byte[] into OutStream
* byte[] into Writer
* decode:
- * char[] into byte[]
+ * char[] into byte[]
* String into byte[]
* char[] into OutStream
* String into OutStream
- *
+ *
*/
public final class Base64Utility {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(Base64Utility.class);
-
+
// base 64 character set
//
private static final char[] BCS = {
- 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
- 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
- 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
- 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
- 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
- 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
+ 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+ 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+ 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd',
+ 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n',
+ 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
+ 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', '+', '/'
};
private static final char[] BCS_URL_SAFE = Arrays.copyOf(BCS, BCS.length);
-
+
// base 64 padding
private static final char PAD = '=';
// size of base 64 decode table
private static final int BDTSIZE = 128;
- // base 64 decode table
+ // base 64 decode table
private static final byte[] BDT = new byte[128];
-
+
private static final int PAD_SIZE0 = 1;
private static final int PAD_SIZE4 = 2;
private static final int PAD_SIZE8 = 3;
-
+
// class static initializer for building decode table
static {
for (int i = 0; i < BDTSIZE; i++) {
@@ -94,18 +94,18 @@ public final class Base64Utility {
for (int i = 0; i < BCS.length; i++) {
BDT[BCS[i]] = (byte)i;
}
-
+
BCS_URL_SAFE[62] = '-';
BCS_URL_SAFE[63] = '_';
}
-
-
+
+
private Base64Utility() {
//utility class, never constructed
}
-
-
-
+
+
+
/**
* The <code>decode_chunk</code> routine decodes a chunk of data
* into its native encoding.
@@ -115,21 +115,21 @@ public final class Base64Utility {
* 24 bits which are then split into 4 x 6bit values. Each 6 bit
* value is then used as an index into the 64 character table of
* base64 chars. If the total data length is not a 3 octet multiple
- * the '=' char is used as padding for the final 4 char group,
+ * the '=' char is used as padding for the final 4 char group,
* either 1 octet + '==' or 2 octets + '='.
*
* @param id The input data to be processed
* @param o The offset from which to begin processing
* @param l The length (bound) at which processing is to end
- * @return The decoded data
+ * @return The decoded data
* @exception Base64Exception Thrown is processing fails due to
- * formatting exceptions in the encoded data
+ * formatting exceptions in the encoded data
*/
public static byte[] decodeChunk(char[] id,
int o,
- int l)
+ int l)
throws Base64Exception {
-
+
// Keep it simple - must be >= 4. Unpadded
// base64 data contain < 3 octets is invalid.
//
@@ -141,7 +141,7 @@ public final class Base64Utility {
int ibcount = 0;
// cryan. Calc the num of octets. Each 4 chars of base64 chars
- // (representing 24 bits) encodes 3 octets.
+ // (representing 24 bits) encodes 3 octets.
//
int octetCount = 3 * (l / 4);
@@ -161,7 +161,7 @@ public final class Base64Utility {
if (id[i] == PAD
|| id[i] < BDT.length
&& BDT[id[i]] != Byte.MAX_VALUE) {
-
+
ib[ibcount++] = id[i];
// Decode each 4 char sequence.
@@ -172,7 +172,7 @@ public final class Base64Utility {
}
}
}
-
+
if (obcount != ob.length) {
byte []tmp = new byte[obcount];
System.arraycopy(ob, 0, tmp, 0, obcount);
@@ -185,21 +185,21 @@ public final class Base64Utility {
public static byte[] decode(String id) throws Base64Exception {
return decode(id, false);
}
-
+
public static byte[] decode(String id, boolean urlSafe) throws Base64Exception {
if (urlSafe) {
//TODO: optimize further
id = id.replace("-", "+").replace('_', '/');
switch (id.length() % 4) {
- case 0:
- break;
- case 2:
- id += "==";
- break;
- case 3:
- id += "=";
- break;
- default:
+ case 0:
+ break;
+ case 2:
+ id += "==";
+ break;
+ case 3:
+ id += "=";
+ break;
+ default:
throw new Base64Exception(new Message("BASE64_RUNTIME_EXCEPTION", LOG));
}
}
@@ -215,7 +215,7 @@ public final class Base64Utility {
public static void decode(char[] id,
int o,
int l,
- OutputStream ostream)
+ OutputStream ostream)
throws Base64Exception {
try {
@@ -227,9 +227,9 @@ public final class Base64Utility {
}
public static void decode(String id,
- OutputStream ostream)
+ OutputStream ostream)
throws Base64Exception {
-
+
try {
char[] cd = id.toCharArray();
ostream.write(decodeChunk(cd, 0, cd.length));
@@ -246,7 +246,7 @@ public final class Base64Utility {
public static String encode(byte[] id) {
return encode(id, false);
}
-
+
public static String encode(byte[] id, boolean urlSafe) {
char[] cd = encodeChunk(id, 0, id.length);
return new String(cd, 0, cd.length);
@@ -259,7 +259,7 @@ public final class Base64Utility {
int l) {
return encodeChunk(id, o, l, false);
}
-
+
public static char[] encodeChunk(byte[] id,
int o,
int l,
@@ -317,14 +317,14 @@ public final class Base64Utility {
}
return out;
}
-
+
public static void encodeAndStream(byte[] id,
int o,
int l,
OutputStream os) throws IOException {
encodeAndStream(id, o, l, false, os);
}
-
+
public static void encodeAndStream(byte[] id,
int o,
int l,
@@ -337,13 +337,13 @@ public final class Base64Utility {
int rindex = o;
int rest = l;
final char[] base64Table = urlSafe ? BCS_URL_SAFE : BCS;
-
+
char[] chunk = new char[4];
while (rest >= 3) {
int i = ((id[rindex] & 0xff) << 16)
+ ((id[rindex + 1] & 0xff) << 8)
+ (id[rindex + 2] & 0xff);
- chunk[0] = base64Table[i >> 18];
+ chunk[0] = base64Table[i >> 18];
chunk[1] = base64Table[(i >> 12) & 0x3f];
chunk[2] = base64Table[(i >> 6) & 0x3f];
chunk[3] = base64Table[i & 0x3f];
@@ -380,9 +380,9 @@ public final class Base64Utility {
byte[] bytes = StandardCharsets.UTF_8.encode(CharBuffer.wrap(chunk, 0, len)).array();
os.write(bytes);
}
-
+
//
- // Outputs base64 representation of the specified byte array
+ // Outputs base64 representation of the specified byte array
// to a byte stream.
//
public static void encodeChunk(byte[] id,
@@ -395,8 +395,8 @@ public final class Base64Utility {
throw new Base64Exception(new Message("BASE64_ENCODE_IOEXCEPTION", LOG), e);
}
}
-
- // Outputs base64 representation of the specified byte
+
+ // Outputs base64 representation of the specified byte
// array to a character stream.
//
public static void encode(byte[] id,
@@ -422,15 +422,15 @@ public final class Base64Utility {
* @param p Pointer to the encodeme of interest
* @return The decoded encodeme
* @exception Base64Exception Thrown is processing fails due to
- * formatting exceptions in the encoded data
- */
+ * formatting exceptions in the encoded data
+ */
private static int processEncodeme(char[] ib,
byte[] ob,
- int p)
+ int p)
throws Base64Exception {
-
- int spad = PAD_SIZE8;
+
+ int spad = PAD_SIZE8;
if (ib[3] == PAD) {
spad = PAD_SIZE4;
}
@@ -459,11 +459,11 @@ public final class Base64Utility {
default:
// We should never get here
throw new IllegalStateException();
- }
+ }
}
public static boolean isValidBase64(int ch) {
return ch == PAD || BDT[ch] != Byte.MAX_VALUE;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
index 4f0a98c..9a6b112 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CacheMap.java
@@ -25,20 +25,20 @@ import java.util.WeakHashMap;
/**
- * Implements a useful caching map. It weakly references the keys,
+ * Implements a useful caching map. It weakly references the keys,
* but strongly references the data. It works much like the WeakHashMap,
- * in that when the keys are garbage collected, the data is removed from
+ * in that when the keys are garbage collected, the data is removed from
* the map.
- *
+ *
* The main difference is that keys used for lookups don't have to be "=="
- * the same to maintain the data in the cache. Basically, lookups in this
- * map use a ".equals" compare, but the keys are then stored with a "=="
+ * the same to maintain the data in the cache. Basically, lookups in this
+ * map use a ".equals" compare, but the keys are then stored with a "=="
* compare so if the original key is garbage collected, the other keys that
* may reference the data keep the data in the cache.
*
* <b>
- * Note that this implementation is not synchronized. Not even a little.
- * 'Read-only' operations can trigger internal modifications. If you share this
+ * Note that this implementation is not synchronized. Not even a little.
+ * 'Read-only' operations can trigger internal modifications. If you share this
* class between threads, you must protect every operation.
* </b>
*/
@@ -47,16 +47,16 @@ public class CacheMap<K, V> implements Map<K, V> {
Map<K, V> extraKeyMap = new WeakIdentityHashMap<K, V>();
public CacheMap() {
-
+
}
-
+
public void clear() {
mainDataMap.clear();
extraKeyMap.clear();
}
private void updateMainDataMap() {
- //if the singleton in the mainDataMap has been garbage collected,
+ //if the singleton in the mainDataMap has been garbage collected,
//we'll copy another version of it from the extraKeyMap
for (Map.Entry<K, V> entry : extraKeyMap.entrySet()) {
if (!mainDataMap.containsKey(entry.getKey())) {
@@ -64,7 +64,7 @@ public class CacheMap<K, V> implements Map<K, V> {
}
}
}
-
+
public boolean containsKey(Object key) {
if (!mainDataMap.containsKey(key)) {
updateMainDataMap();
@@ -132,7 +132,7 @@ public class CacheMap<K, V> implements Map<K, V> {
updateMainDataMap();
return mainDataMap.values();
}
-
+
public String toString() {
updateMainDataMap();
return mainDataMap.toString();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java b/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
index 8e1b6fe..a3fa1ea 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CglibProxyHelper.java
@@ -29,7 +29,7 @@ import net.sf.cglib.proxy.MethodProxy;
/**
- *
+ *
*/
class CglibProxyHelper extends ProxyHelper {
CglibProxyHelper() throws Exception {
@@ -37,20 +37,20 @@ class CglibProxyHelper extends ProxyHelper {
Class.forName("net.sf.cglib.proxy.MethodInterceptor");
Class.forName("net.sf.cglib.proxy.MethodProxy");
}
-
+
@Override
- protected Object getProxyInternal(ClassLoader loader, Class<?>[] interfaces,
+ protected Object getProxyInternal(ClassLoader loader, Class<?>[] interfaces,
final java.lang.reflect.InvocationHandler h) {
-
+
Class<?> superClass = null;
List<Class<?>> theInterfaces = new ArrayList<Class<?>>();
-
+
for (Class<?> c : interfaces) {
if (!c.isInterface()) {
if (superClass != null) {
throw new IllegalArgumentException("Only a single superclass is supported");
}
- superClass = c;
+ superClass = c;
} else {
theInterfaces.add(c);
}
@@ -62,17 +62,17 @@ class CglibProxyHelper extends ProxyHelper {
enhancer.setInterfaces(theInterfaces.toArray(new Class[theInterfaces.size()]));
enhancer.setCallback(new MethodInterceptor() {
- public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy)
+ public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy)
throws Throwable {
return h.invoke(obj, method, args);
}
-
+
});
return enhancer.create();
} else {
return super.getProxyInternal(loader, interfaces, h);
}
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java b/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java
index 461c84a..02b6832 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ClassHelper.java
@@ -25,19 +25,19 @@ import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
/**
- *
+ *
*/
public class ClassHelper {
static final ClassHelper HELPER;
static {
HELPER = getClassHelper();
}
-
-
+
+
protected ClassHelper() {
}
-
- private static ClassHelper getClassHelper() {
+
+ private static ClassHelper getClassHelper() {
boolean useSpring = true;
String s = SystemPropertyAction.getPropertyOrNull("org.apache.cxf.useSpringClassHelpers");
if (!StringUtils.isEmpty(s)) {
@@ -52,26 +52,26 @@ public class ClassHelper {
}
return new ClassHelper();
}
-
+
protected Class<?> getRealClassInternal(Object o) {
return getRealObjectInternal(o).getClass();
}
-
+
protected Class<?> getRealClassFromClassInternal(Class<?> cls) {
return cls;
}
protected Object getRealObjectInternal(Object o) {
return o instanceof Proxy ? Proxy.getInvocationHandler(o) : o;
}
-
+
public static Class<?> getRealClass(Object o) {
return getRealClass(null, o);
}
-
+
public static Class<?> getRealClassFromClass(Class<?> cls) {
return HELPER.getRealClassFromClassInternal(cls);
}
-
+
public static Object getRealObject(Object o) {
return HELPER.getRealObjectInternal(o);
}
@@ -87,7 +87,7 @@ public class ClassHelper {
}
public static double getJavaVersion() {
String version = System.getProperty("java.version");
- return Double.parseDouble(version.substring(0, 3));
+ return Double.parseDouble(version.substring(0, 3));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java
index 86b7827..6b76e1c 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ClasspathScanner.java
@@ -34,20 +34,20 @@ public class ClasspathScanner {
public static final String ALL_CLASS_FILES = ALL_FILES + ".class";
public static final String WILDCARD = "*";
public static final String CLASSPATH_URL_SCHEME = "classpath:";
-
+
static final ClasspathScanner HELPER;
static {
HELPER = getClasspathScanner();
}
-
- // Default packages list to ignore during classpath scanning
- static final String[] PACKAGES_TO_SKIP = {"org.apache.cxf"};
-
+ // Default packages list to ignore during classpath scanning
+ static final String[] PACKAGES_TO_SKIP = {"org.apache.cxf"};
+
+
protected ClasspathScanner() {
- }
+ }
- private static ClasspathScanner getClasspathScanner() {
+ private static ClasspathScanner getClasspathScanner() {
boolean useSpring = true;
String s = SystemPropertyAction.getPropertyOrNull("org.apache.cxf.useSpringClassHelpers");
if (!StringUtils.isEmpty(s)) {
@@ -62,111 +62,111 @@ public class ClasspathScanner {
}
return new ClasspathScanner();
}
-
+
/**
- * Scans list of base packages for all classes marked with specific annotations.
- * @param basePackage base package
+ * Scans list of base packages for all classes marked with specific annotations.
+ * @param basePackage base package
* @param annotations annotations to discover
- * @return all discovered classes grouped by annotations they belong too
- * @throws IOException class metadata is not readable
+ * @return all discovered classes grouped by annotations they belong too
+ * @throws IOException class metadata is not readable
* @throws ClassNotFoundException class not found
*/
@SafeVarargs
public static Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClasses(
- String basePackage, Class< ? extends Annotation > ... annotations)
+ String basePackage, Class< ? extends Annotation > ... annotations)
throws IOException, ClassNotFoundException {
- return findClasses(parsePackages(basePackage),
+ return findClasses(parsePackages(basePackage),
Collections.unmodifiableList(Arrays.asList(annotations)));
}
-
+
/**
- * Scans list of base packages for all classes marked with specific annotations.
- * @param basePackages list of base packages
+ * Scans list of base packages for all classes marked with specific annotations.
+ * @param basePackages list of base packages
* @param annotations annotations to discover
- * @return all discovered classes grouped by annotations they belong too
- * @throws IOException class metadata is not readable
+ * @return all discovered classes grouped by annotations they belong too
+ * @throws IOException class metadata is not readable
* @throws ClassNotFoundException class not found
*/
@SafeVarargs
public static Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClasses(
- Collection< String > basePackages, Class< ? extends Annotation > ... annotations)
+ Collection< String > basePackages, Class< ? extends Annotation > ... annotations)
throws IOException, ClassNotFoundException {
return findClasses(basePackages, Collections.unmodifiableList(Arrays.asList(annotations)));
}
-
+
/**
- * Scans list of base packages for all classes marked with specific annotations.
- * @param basePackages list of base packages
+ * Scans list of base packages for all classes marked with specific annotations.
+ * @param basePackages list of base packages
* @param annotations annotations to discover
- * @return all discovered classes grouped by annotations they belong too
- * @throws IOException class metadata is not readable
+ * @return all discovered classes grouped by annotations they belong too
+ * @throws IOException class metadata is not readable
* @throws ClassNotFoundException class not found
*/
public static Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClasses(
- Collection< String > basePackages, List<Class< ? extends Annotation > > annotations)
+ Collection< String > basePackages, List<Class< ? extends Annotation > > annotations)
throws IOException, ClassNotFoundException {
return findClasses(basePackages, annotations, null);
-
+
}
public static Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClasses(
- Collection< String > basePackages,
+ Collection< String > basePackages,
List<Class< ? extends Annotation > > annotations,
ClassLoader loader) throws IOException, ClassNotFoundException {
return HELPER.findClassesInternal(basePackages, annotations, loader);
}
-
+
protected Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClassesInternal(
- Collection< String > basePackages,
+ Collection< String > basePackages,
List<Class< ? extends Annotation > > annotations,
- ClassLoader loader)
+ ClassLoader loader)
throws IOException, ClassNotFoundException {
return Collections.emptyMap();
}
-
+
/**
- * Scans list of base packages for all resources with the given extension.
- * @param basePackage base package
+ * Scans list of base packages for all resources with the given extension.
+ * @param basePackage base package
* @param extension the extension matching resources needs to have
- * @return list of all discovered resource URLs
+ * @return list of all discovered resource URLs
* @throws IOException resource is not accessible
*/
- public static List<URL> findResources(String basePackage, String extension)
+ public static List<URL> findResources(String basePackage, String extension)
throws IOException {
return findResources(basePackage, extension, null);
}
-
+
/**
- * Scans list of base packages for all resources with the given extension.
- * @param basePackage base package
+ * Scans list of base packages for all resources with the given extension.
+ * @param basePackage base package
* @param extension the extension matching resources needs to have
- * @return list of all discovered resource URLs
+ * @return list of all discovered resource URLs
* @throws IOException resource is not accessible
*/
- public static List<URL> findResources(String basePackage, String extension, ClassLoader loader)
+ public static List<URL> findResources(String basePackage, String extension, ClassLoader loader)
throws IOException {
return findResources(Collections.singletonList(basePackage), extension, loader);
}
-
+
/**
- * Scans list of base packages for all resources with the given extension.
- * @param basePackages list of base packages
+ * Scans list of base packages for all resources with the given extension.
+ * @param basePackages list of base packages
* @param extension the extension matching resources needs to have
- * @return list of all discovered resource URLs
+ * @return list of all discovered resource URLs
* @throws IOException resource is not accessible
*/
- public static List<URL> findResources(Collection<String> basePackages, String extension)
+ public static List<URL> findResources(Collection<String> basePackages, String extension)
throws IOException {
return findResources(basePackages, extension, null);
}
-
+
public static List<URL> findResources(Collection<String> basePackages, String extension,
- ClassLoader loader)
+ ClassLoader loader)
throws IOException {
return HELPER.findResourcesInternal(basePackages, extension, loader);
}
-
- public static Set<String> parsePackages(final String packagesAsCsv) {
+
+ public static Set<String> parsePackages(final String packagesAsCsv) {
final String[] values = StringUtils.split(packagesAsCsv, ",");
final Set<String> basePackages = new HashSet<>(values.length);
for (final String value : values) {
@@ -179,15 +179,15 @@ public class ClasspathScanner {
basePackages.add(trimmed);
}
}
-
+
return basePackages;
}
-
- protected List<URL> findResourcesInternal(Collection<String> basePackages,
+
+ protected List<URL> findResourcesInternal(Collection<String> basePackages,
String extension,
- ClassLoader loader)
+ ClassLoader loader)
throws IOException {
return Collections.emptyList();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java b/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
index c6b2acd..9e7a3d4 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CollectionUtils.java
@@ -25,9 +25,9 @@ import java.util.Iterator;
public final class CollectionUtils {
private CollectionUtils() {
-
+
}
-
+
public static <T> Collection<T> diff(Collection<T> c1, Collection<T> c2) {
if (c1 == null || c1.size() == 0 || c2 == null || c2.size() == 0) {
return c1;
@@ -40,7 +40,7 @@ public final class CollectionUtils {
}
return difference;
}
-
+
public static <T> boolean isEmpty(Collection<T> c) {
if (c == null || c.size() == 0) {
return true;
@@ -52,5 +52,5 @@ public final class CollectionUtils {
}
return true;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/Compiler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
index 855eaad..b0eccae 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -50,17 +50,17 @@ public class Compiler {
private File classpathTmpFile;
private List<String> errors = new LinkedList<String>();
private List<String> warnings = new LinkedList<String>();
-
+
public Compiler() {
}
-
+
public List<String> getErrors() {
return errors;
}
public List<String> getWarnings() {
return warnings;
}
-
+
public void setMaxMemory(long l) {
maxMemory = l;
}
@@ -83,7 +83,7 @@ public class Compiler {
public void setClassPath(String s) {
classPath = StringUtils.isEmpty(s) ? null : s;
}
-
+
protected void addArgs(List<String> list) {
if (!StringUtils.isEmpty(encoding)) {
list.add("-encoding");
@@ -100,7 +100,7 @@ public class Compiler {
list.add("-d");
list.add(outputDir);
}
-
+
if (StringUtils.isEmpty(classPath)) {
String javaClasspath = SystemPropertyAction.getProperty("java.class.path");
boolean classpathSetted = javaClasspath != null ? true : false;
@@ -109,7 +109,7 @@ public class Compiler {
f = new File(f, "../lib");
if (f.exists() && f.isDirectory()) {
list.add("-extdirs");
- list.add(f.toString());
+ list.add(f.toString());
}
} else {
list.add("-classpath");
@@ -140,7 +140,7 @@ public class Compiler {
if (!forceFork) {
return useJava6Compiler(files);
}
-
+
List<String> list = new ArrayList<>();
// Start of honoring java.home for used javac
@@ -176,7 +176,7 @@ public class Compiler {
//fix for CXF-2081, set maximum heap of this VM to javac.
list.add("-J-Xmx" + maxMemory);
-
+
if (System.getProperty("java.version").startsWith("9")) {
list.add("--add-modules");
list.add("java.activation,java.annotations.common,java.corba,java.transaction,java.xml.bind,java.xml.ws");
@@ -205,11 +205,11 @@ public class Compiler {
return internalJava6Compile(compiler, wrapJavaFileManager(fileManager), setupDiagnosticListener(),
fileList);
}
-
+
protected JavaFileManager wrapJavaFileManager(StandardJavaFileManager standardJavaFileManger) {
return standardJavaFileManger;
}
-
+
protected DiagnosticListener<JavaFileObject> setupDiagnosticListener() {
return new DiagnosticListener<JavaFileObject>() {
public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
@@ -229,11 +229,11 @@ public class Compiler {
break;
default:
break;
- }
+ }
}
};
}
-
+
protected boolean internalJava6Compile(JavaCompiler compiler, JavaFileManager fileManager,
DiagnosticListener<JavaFileObject> listener,
Iterable<? extends JavaFileObject> fileList) {
@@ -336,11 +336,11 @@ public class Compiler {
}
return strBuffer.toString().length() > 4096 ? true : false;
}
-
+
private boolean isLongClasspath(String classpath) {
return classpath.length() > 2048 ? true : false;
- }
-
+ }
+
private void checkLongClasspath(String classpath, List<String> list, int classpathIdx) {
if (isLongClasspath(classpath)) {
PrintWriter out = null;
@@ -354,12 +354,12 @@ public class Compiler {
} catch (IOException e) {
System.err.print("[ERROR] can't write long classpath to @argfile");
}
- }
+ }
}
public void setEncoding(String string) {
encoding = string;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java b/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
index 6fbf2a4..769614c 100644
--- a/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/CompressionUtils.java
@@ -27,13 +27,13 @@ import java.util.zip.Inflater;
public final class CompressionUtils {
private CompressionUtils() {
-
+
}
- public static InputStream inflate(byte[] deflatedToken)
+ public static InputStream inflate(byte[] deflatedToken)
throws DataFormatException {
return inflate(deflatedToken, true);
}
- public static InputStream inflate(byte[] deflatedToken, boolean nowrap)
+ public static InputStream inflate(byte[] deflatedToken, boolean nowrap)
throws DataFormatException {
Inflater inflater = new Inflater(true);
inflater.setInput(deflatedToken);
@@ -50,31 +50,31 @@ public final class CompressionUtils {
break;
}
}
-
+
inflatedToken.write(buffer, 0, inflateLen);
}
return new ByteArrayInputStream(inflatedToken.toByteArray());
}
-
+
public static byte[] deflate(byte[] tokenBytes) {
return deflate(tokenBytes, true);
}
-
+
public static byte[] deflate(byte[] tokenBytes, boolean nowrap) {
return deflate(tokenBytes, Deflater.DEFLATED, nowrap);
}
-
+
public static byte[] deflate(byte[] tokenBytes, int level, boolean nowrap) {
Deflater compresser = new Deflater(level, nowrap);
-
+
compresser.setInput(tokenBytes);
compresser.finish();
-
+
byte[] output = new byte[tokenBytes.length * 2];
-
+
int compressedDataLength = compresser.deflate(output);
-
+
byte[] result = new byte[compressedDataLength];
System.arraycopy(output, 0, result, 0, compressedDataLength);
return result;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java b/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
index d089403..1217ee5 100644
--- a/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
+++ b/core/src/main/java/org/apache/cxf/common/util/MessageDigestInputStream.java
@@ -24,11 +24,11 @@ import java.security.NoSuchAlgorithmException;
public class MessageDigestInputStream extends java.security.DigestInputStream {
public static final String ALGO_SHA_256 = "SHA-256";
-
+
public MessageDigestInputStream(InputStream is) {
super(is, getDigestInstance(ALGO_SHA_256));
}
-
+
private static MessageDigest getDigestInstance(String algo) {
try {
return MessageDigest.getInstance(algo);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java b/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java
index 7a0c3aa..9fc055e 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
public final class ModCountCopyOnWriteArrayList<T> extends CopyOnWriteArrayList<T> {
private static final long serialVersionUID = 1783937035760941219L;
private AtomicInteger modCount = new AtomicInteger();
-
+
public ModCountCopyOnWriteArrayList() {
super();
}
@@ -36,15 +36,15 @@ public final class ModCountCopyOnWriteArrayList<T> extends CopyOnWriteArrayList<
modCount.set(((ModCountCopyOnWriteArrayList<?>)c).getModCount());
}
}
-
+
public int getModCount() {
return modCount.get();
}
-
+
public void setModCount(int i) {
modCount.set(i);
}
-
+
@Override
public void add(int index, T element) {
super.add(index, element);
@@ -137,14 +137,14 @@ public final class ModCountCopyOnWriteArrayList<T> extends CopyOnWriteArrayList<
}
return false;
}
-
+
public int hashCode() {
return super.hashCode() + modCount.get();
}
-
+
public boolean equals(Object o) {
if (o instanceof ModCountCopyOnWriteArrayList) {
- return super.equals(o) && modCount.get()
+ return super.equals(o) && modCount.get()
== ((ModCountCopyOnWriteArrayList<?>)o).getModCount();
}
return false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
index 1d8d6ed..a970e81 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
@@ -27,11 +27,11 @@ import org.apache.cxf.helpers.JavaUtils;
public final class PackageUtils {
-
+
private PackageUtils() {
-
+
}
-
+
static String getPackageName(String className) {
int pos = className.lastIndexOf('.');
if (pos != -1) {
@@ -40,7 +40,7 @@ public final class PackageUtils {
return "";
}
}
-
+
public static String getPackageName(Class<?> clazz) {
String className = clazz.getName();
if (className.startsWith("[L")) {
@@ -48,7 +48,7 @@ public final class PackageUtils {
}
return getPackageName(className);
}
-
+
public static String getSharedPackageName(List<Class<?>> classes) {
if (classes.isEmpty()) {
return "";
@@ -63,7 +63,7 @@ public final class PackageUtils {
for (; j < lParts.size(); j++) {
if (i > (lParts.get(j).size() - 1) || !lParts.get(j).get(i).equals(lParts.get(0).get(i))) {
break;
- }
+ }
}
if (j == lParts.size()) {
currentParts.add(lParts.get(j - 1).get(i));
@@ -80,7 +80,7 @@ public final class PackageUtils {
}
return sb.toString();
}
-
+
public static String parsePackageName(String namespace, String defaultPackageName) {
String packageName = (defaultPackageName != null && defaultPackageName.trim().length() > 0)
? defaultPackageName : null;
@@ -90,7 +90,7 @@ public final class PackageUtils {
}
return packageName;
}
-
+
public static String getPackageNameByNameSpaceURI(String nameSpaceURI) {
int idx = nameSpaceURI.indexOf(':');
String scheme = "";
@@ -227,5 +227,5 @@ public final class PackageUtils {
namespace.append('/');
return namespace.toString();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
index dc131de..3889443 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
@@ -35,17 +35,17 @@ public final class PrimitiveUtils {
AUTOBOXED_PRIMITIVES_MAP.put(boolean.class, Boolean.class);
AUTOBOXED_PRIMITIVES_MAP.put(void.class, Void.class);
}
-
+
private PrimitiveUtils() {
-
+
}
-
+
public static boolean canPrimitiveTypeBeAutoboxed(Class<?> primitiveClass, Class<?> type) {
return primitiveClass.isPrimitive() && type == AUTOBOXED_PRIMITIVES_MAP.get(primitiveClass);
}
-
+
public static Class<?> getClass(String value) {
- Class<?> clz = null;
+ Class<?> clz = null;
if ("int".equals(value)) {
clz = int.class;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java b/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
index 5afb1fd..3dbd9a1 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
@@ -33,13 +33,13 @@ import java.util.logging.Logger;
* when moving to Spring 2.0.
*
*/
-
+
public final class PropertiesLoaderUtils {
-
+
/**
* Prevents instantiation.
*/
- private PropertiesLoaderUtils() {
+ private PropertiesLoaderUtils() {
}
/**
@@ -48,7 +48,7 @@ public final class PropertiesLoaderUtils {
* <p>
* Merges properties if more than one resource of the same name found in the
* class path.
- *
+ *
* @param resourceName the name of the class path resource
* @param classLoader the ClassLoader to use for loading (or
* <code>null</code> to use the default class loader)
@@ -58,7 +58,7 @@ public final class PropertiesLoaderUtils {
public static Properties loadAllProperties(String resourceName, ClassLoader classLoader)
throws IOException {
return loadAllProperties(resourceName, classLoader, null, null, null);
- }
+ }
public static Properties loadAllProperties(String resourceName, ClassLoader classLoader,
Logger logger, Level level, String msg)
throws IOException {
@@ -74,7 +74,7 @@ public final class PropertiesLoaderUtils {
if (logger != null) {
logger.log(level, msg, url.toString());
}
-
+
try (InputStream is = url.openStream()) {
properties.loadFromXML(new BufferedInputStream(is));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/PropertyUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/PropertyUtils.java b/core/src/main/java/org/apache/cxf/common/util/PropertyUtils.java
index ded47cd..7646002 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PropertyUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PropertyUtils.java
@@ -29,7 +29,7 @@ import org.apache.cxf.message.Message;
public final class PropertyUtils {
private PropertyUtils() {
}
-
+
public static boolean isTrue(Map<String, Object> props, String key) {
if (props == null || key == null) {
return false;
@@ -37,11 +37,11 @@ public final class PropertyUtils {
return isTrue(props.get(key));
}
}
-
+
/**
* It might seem odd to return 'true' if a property == FALSE, but it
* is required sometimes.
- *
+ *
* @param props
* @param key
* @return false if value is either the String "false" or Boolean.FALSE. Otherwise returns
@@ -54,7 +54,7 @@ public final class PropertyUtils {
return isFalse(props.get(key));
}
}
-
+
/**
* Returns true if a value is either the String "true" (regardless of case) or Boolean.TRUE.
* @param property
@@ -67,10 +67,10 @@ public final class PropertyUtils {
return Boolean.TRUE.equals(property) || "true".equalsIgnoreCase(property.toString());
}
-
+
/**
* It might seem odd to return 'true' if a property == FALSE, but it is required sometimes.
- *
+ *
* Returns false if a value is either the String "false" (regardless of case) or Boolean.FALSE.
* @param property
* @return false if value is either the String "false" or Boolean.FALSE. Otherwise returns
@@ -83,7 +83,7 @@ public final class PropertyUtils {
return Boolean.FALSE.equals(property) || "false".equalsIgnoreCase(property.toString());
}
-
+
public static Long getLong(Message message, String key) {
Object o = message.getContextualProperty(key);
if (o instanceof Long) {
@@ -95,7 +95,7 @@ public final class PropertyUtils {
}
return null;
}
-
+
public static Integer getInteger(Message message, String key) {
Object o = message.getContextualProperty(key);
if (o instanceof Integer) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
index 5075653..974fef0 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ProxyClassLoader.java
@@ -25,7 +25,7 @@ import java.util.Set;
/**
* Utility class loader that can be used to create proxies in cases where
* the the client classes are not visible to the loader of the
- * service class.
+ * service class.
*/
public class ProxyClassLoader extends ClassLoader {
private final Class<?> classes[];
@@ -78,7 +78,7 @@ public class ProxyClassLoader extends ClassLoader {
}
throw new ClassNotFoundException(name);
}
-
+
public URL findResource(String name) {
for (ClassLoader loader : loaders) {
URL url = loader.getResource(name);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java b/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
index 413098c..931d3ac 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ProxyHelper.java
@@ -24,7 +24,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
/**
- *
+ *
*/
public class ProxyHelper {
static final ProxyHelper HELPER;
@@ -37,11 +37,11 @@ public class ProxyHelper {
}
HELPER = theHelper;
}
-
-
+
+
protected ProxyHelper() {
}
-
+
protected Object getProxyInternal(ClassLoader loader, Class<?>[] interfaces, InvocationHandler handler) {
ClassLoader combinedLoader = getClassLoaderForInterfaces(loader, interfaces);
return Proxy.newProxyInstance(combinedLoader, interfaces, handler);
@@ -50,7 +50,7 @@ public class ProxyHelper {
/**
* Return a classloader that can see all the given interfaces If the given loader can see all interfaces
* then it is used. If not then a combined classloader of all interface classloaders is returned.
- *
+ *
* @param loader use supplied class loader
* @param interfaces
* @return classloader that sees all interfaces
@@ -74,7 +74,7 @@ public class ProxyHelper {
if (ifClass != currentInterface) {
return false;
}
- //we need to check all the params/returns as well as the Proxy creation
+ //we need to check all the params/returns as well as the Proxy creation
//will try to create methods for all of this even if they aren't used
//by the client and not available in the clients classloader
for (Method m : ifClass.getMethods()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
index ed2c396..893eae1 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
@@ -32,19 +32,19 @@ import java.lang.reflect.Proxy;
import java.util.Iterator;
/**
- *
+ *
*/
public class ReflectionInvokationHandler implements InvocationHandler {
private Object target;
-
+
public ReflectionInvokationHandler(Object obj) {
target = obj;
}
-
+
public Object getTarget() {
- return target;
+ return target;
}
-
+
/** {@inheritDoc}*/
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
WrapReturn wr = method.getAnnotation(WrapReturn.class);
@@ -55,7 +55,7 @@ public class ReflectionInvokationHandler implements InvocationHandler {
try {
m = targetClass.getMethod(method.getName(), parameterTypes);
} catch (NoSuchMethodException nsme) {
-
+
boolean[] optionals = new boolean[method.getParameterTypes().length];
int i = 0;
int optionalNumber = 0;
@@ -70,7 +70,7 @@ public class ReflectionInvokationHandler implements InvocationHandler {
}
i++;
}
-
+
Class<?>[] newParams = new Class<?>[args.length - optionalNumber];
Object[] newArgs = new Object[args.length - optionalNumber];
int argI = 0;
@@ -96,14 +96,14 @@ public class ReflectionInvokationHandler implements InvocationHandler {
&& m2.getParameterTypes().length == method.getParameterTypes().length) {
boolean found = true;
for (int x = 0; x < m2.getParameterTypes().length; x++) {
- if (args[x] != null
+ if (args[x] != null
&& !m2.getParameterTypes()[x].isInstance(args[x])) {
found = false;
}
}
if (found) {
ReflectionUtil.setAccessible(m2);
- return wrapReturn(wr, m2.invoke(target, args));
+ return wrapReturn(wr, m2.invoke(target, args));
}
}
}
@@ -153,7 +153,7 @@ public class ReflectionInvokationHandler implements InvocationHandler {
}
return createProxyWrapper(t, wr.value());
}
-
+
public static <T> T createProxyWrapper(Object target, Class<T> inf) {
InvocationHandler h = new ReflectionInvokationHandler(target);
return inf.cast(Proxy.newProxyInstance(inf.getClassLoader(), new Class[] {inf}, h));
@@ -170,14 +170,14 @@ public class ReflectionInvokationHandler implements InvocationHandler {
Class<?> value();
boolean iterator() default false;
}
-
+
@Target(ElementType.PARAMETER)
@Retention(RetentionPolicy.RUNTIME)
public static @interface UnwrapParam {
String methodName() default "getValue";
String typeMethodName() default "#default";
}
-
+
private static class WrapperIterator implements Iterator<Object> {
Class<?> cls;
Iterator<?> internal;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
index 39f9b71..5e3bea4 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ReflectionUtil.java
@@ -37,14 +37,14 @@ import java.util.List;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
public final class ReflectionUtil {
-
- private static Method springBeanUtilsDescriptorFetcher;
+
+ private static Method springBeanUtilsDescriptorFetcher;
private static boolean springChecked;
-
+
private ReflectionUtil() {
// intentionally empty
}
-
+
public static <T> T accessDeclaredField(final Field f, final Object o, final Class<T> responseClass) {
return AccessController.doPrivileged(new PrivilegedAction<T>() {
public T run() {
@@ -64,7 +64,7 @@ public final class ReflectionUtil {
}
public static <T> T accessDeclaredField(final String fieldName,
final Class<?> cls,
- final Object o,
+ final Object o,
final Class<T> responseClass) {
return AccessController.doPrivileged(new PrivilegedAction<T>() {
public T run() {
@@ -83,7 +83,7 @@ public final class ReflectionUtil {
}
});
}
-
+
public static Field getDeclaredField(final Class<?> cls, final String name) {
return AccessController.doPrivileged(new PrivilegedAction<Field>() {
public Field run() {
@@ -110,7 +110,7 @@ public final class ReflectionUtil {
}
}
});
-
+
}
public static <T> Constructor<T> getConstructor(final Class<T> cls, final Class<?> ... args) {
return AccessController.doPrivileged(new PrivilegedAction<Constructor<T>>() {
@@ -123,9 +123,9 @@ public final class ReflectionUtil {
return null;
}
}
- });
+ });
}
-
+
public static <T> Constructor<T>[] getDeclaredConstructors(final Class<T> cls) {
return AccessController.doPrivileged(new PrivilegedAction<Constructor<T>[]>() {
@SuppressWarnings("unchecked")
@@ -134,11 +134,11 @@ public final class ReflectionUtil {
return (Constructor<T>[])cls.getDeclaredConstructors();
} catch (SecurityException e) {
return null;
- }
+ }
}
- });
+ });
}
-
+
public static Method[] getDeclaredMethods(final Class<?> cls) {
return AccessController.doPrivileged(new PrivilegedAction<Method[]>() {
public Method[] run() {
@@ -189,7 +189,7 @@ public final class ReflectionUtil {
}
});
}
-
+
/**
* create own array of property descriptors to:
* <pre>
@@ -204,7 +204,7 @@ public final class ReflectionUtil {
* @param beanClass class for bean in question
* @param propertyDescriptors raw descriptors
*/
- public static PropertyDescriptor[] getPropertyDescriptorsAvoidSunBug(Class<?> refClass,
+ public static PropertyDescriptor[] getPropertyDescriptorsAvoidSunBug(Class<?> refClass,
BeanInfo beanInfo,
Class<?> beanClass,
PropertyDescriptor[] propertyDescriptors) {
@@ -213,13 +213,13 @@ public final class ReflectionUtil {
springChecked = true;
Class<?> cls = ClassLoaderUtils
.loadClass("org.springframework.beans.BeanUtils", refClass);
- springBeanUtilsDescriptorFetcher
+ springBeanUtilsDescriptorFetcher
= cls.getMethod("getPropertyDescriptor", new Class[] {Class.class, String.class});
} catch (Exception e) {
//ignore - just assume it's an unsupported/unknown annotation
}
}
-
+
if (springBeanUtilsDescriptorFetcher != null) {
if (propertyDescriptors != null) {
List<PropertyDescriptor> descriptors = new ArrayList<>(propertyDescriptors.length);
@@ -227,7 +227,7 @@ public final class ReflectionUtil {
PropertyDescriptor propertyDescriptor = propertyDescriptors[i];
try {
propertyDescriptor = (PropertyDescriptor)springBeanUtilsDescriptorFetcher.invoke(null,
- beanClass,
+ beanClass,
propertyDescriptor.getName());
if (propertyDescriptor != null) {
descriptors.add(propertyDescriptor);
@@ -238,7 +238,7 @@ public final class ReflectionUtil {
throw new RuntimeException(e);
} catch (InvocationTargetException e) {
throw new RuntimeException(e.getCause());
- }
+ }
}
return descriptors.toArray(new PropertyDescriptor[descriptors.size()]);
}
@@ -251,7 +251,7 @@ public final class ReflectionUtil {
/**
* Look for a specified annotation on a method. If there, return it. If not, search it's containing class.
* Assume that the annotation is marked @Inherited.
- *
+ *
* @param m method to examine
* @param annotationType the annotation type to look for.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
index 2d59f40..54d846d 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SortedArraySet.java
@@ -28,20 +28,20 @@ import java.util.concurrent.atomic.AtomicReference;
/**
- * This class implements most of the <tt>Set</tt> interface, backed by a
+ * This class implements most of the <tt>Set</tt> interface, backed by a
* sorted Array. This makes iterators very fast, lookups are log(n), but
* adds are fairly expensive.
- *
+ *
* This class is also threadsafe, but without synchronizations. Lookups
* and iterators will iterate over the state of the Set when the iterator
* was created.
*
* If no data is stored in the Set, it uses very little memory. The backing
* array is created on demand.
- *
+ *
* This class is primarly useful for stuff that will be setup at startup, but
* then iterated over MANY times during runtime.
- *
+ *
* @param <T>
*/
public final class SortedArraySet<T> implements SortedSet<T> {
@@ -64,12 +64,12 @@ public final class SortedArraySet<T> implements SortedSet<T> {
T[] tmp = data.get();
return tmp == null ? 0 : tmp.length;
}
-
+
@SuppressWarnings("unchecked")
private T[] newArray(int size) {
return (T[])new Object[size];
}
-
+
public boolean add(T o) {
if (!contains(o)) {
T[] tmp = data.get();
@@ -83,7 +83,7 @@ public final class SortedArraySet<T> implements SortedSet<T> {
tmp2[tmp2.length - 1] = o;
Arrays.sort(tmp2);
}
-
+
if (!data.compareAndSet(tmp, tmp2)) {
return add(o);
}
@@ -133,13 +133,13 @@ public final class SortedArraySet<T> implements SortedSet<T> {
public boolean remove(Object o) {
T[] tmp = data.get();
-
+
if (tmp == null) {
return false;
}
int idx = Arrays.binarySearch(tmp, o);
if (idx != -1) {
- if (tmp.length == 1
+ if (tmp.length == 1
&& !data.compareAndSet(tmp, null)) {
return remove(o);
}
@@ -175,7 +175,7 @@ public final class SortedArraySet<T> implements SortedSet<T> {
}
return a;
}
-
+
if (a.length < tmp.length) {
a = (X[])java.lang.reflect.Array.
newInstance(a.getClass().getComponentType(), tmp.length);
@@ -199,18 +199,18 @@ public final class SortedArraySet<T> implements SortedSet<T> {
return Arrays.toString(data.get());
}
public int hashCode() {
- return Arrays.hashCode(data.get());
+ return Arrays.hashCode(data.get());
}
-
+
private class SASIterator<X> implements Iterator<X> {
final X[] data;
int idx;
-
+
SASIterator(X[] d) {
data = d;
}
-
+
public boolean hasNext() {
return data != null && idx != data.length;
}
@@ -241,7 +241,7 @@ public final class SortedArraySet<T> implements SortedSet<T> {
}
return tmp[0];
}
-
+
public T last() {
T[] tmp = data.get();
if (tmp == null || tmp.length == 0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java b/core/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
index 7282f01..495d3d1 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SpringAopClassHelper.java
@@ -26,14 +26,14 @@ import org.springframework.beans.factory.BeanCreationException;
import org.springframework.util.ClassUtils;
/**
- *
+ *
*/
class SpringAopClassHelper extends ClassHelper {
SpringAopClassHelper() throws Exception {
Class.forName("org.springframework.aop.support.AopUtils");
Class.forName("org.springframework.aop.framework.Advised");
}
-
+
protected Class<?> getRealClassFromClassInternal(Class<?> cls) {
if (ClassUtils.isCglibProxyClass(cls)) {
return getRealClassFromClassInternal(cls.getSuperclass());
@@ -46,7 +46,7 @@ class SpringAopClassHelper extends ClassHelper {
Advised advised = (Advised)o;
Object target = advised.getTargetSource().getTarget();
- //could be a proxy of a proxy.....
+ //could be a proxy of a proxy.....
return getRealObjectInternal(target);
} catch (Exception ex) {
// ignore
@@ -60,33 +60,33 @@ class SpringAopClassHelper extends ClassHelper {
Advised advised = (Advised)o;
try {
TargetSource targetSource = advised.getTargetSource();
-
+
Object target = null;
-
+
try {
target = targetSource.getTarget();
} catch (BeanCreationException ex) {
- // some scopes such as 'request' may not
+ // some scopes such as 'request' may not
// be active on the current thread yet
return getRealClassFromClassInternal(targetSource.getTargetClass());
}
-
+
if (target == null) {
Class<?> targetClass = AopUtils.getTargetClass(o);
if (targetClass != null) {
return getRealClassFromClassInternal(targetClass);
}
} else {
- return getRealClassInternal(target);
+ return getRealClassInternal(target);
}
} catch (Exception ex) {
// ignore
}
-
+
} else if (ClassUtils.isCglibProxyClass(o.getClass())) {
return getRealClassFromClassInternal(AopUtils.getTargetClass(o));
}
return o.getClass();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
index a18a8db..b4308ea 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SpringClasspathScanner.java
@@ -39,7 +39,7 @@ import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.util.ClassUtils;
class SpringClasspathScanner extends ClasspathScanner {
-
+
private static final Boolean IN_OSGI;
static {
IN_OSGI = isSpringInOsgi();
@@ -55,57 +55,57 @@ class SpringClasspathScanner extends ClasspathScanner {
return true;
} catch (Throwable ex) {
return false;
- }
+ }
}
-
+
protected Map< Class< ? extends Annotation >, Collection< Class< ? > > > findClassesInternal(
- Collection< String > basePackages,
+ Collection< String > basePackages,
List<Class< ? extends Annotation > > annotations,
- ClassLoader loader)
+ ClassLoader loader)
throws IOException, ClassNotFoundException {
-
+
ResourcePatternResolver resolver = getResolver(loader);
MetadataReaderFactory factory = new CachingMetadataReaderFactory(resolver);
-
- final Map< Class< ? extends Annotation >, Collection< Class< ? > > > classes =
+
+ final Map< Class< ? extends Annotation >, Collection< Class< ? > > > classes =
new HashMap< Class< ? extends Annotation >, Collection< Class< ? > > >();
- final Map< Class< ? extends Annotation >, Collection< String > > matchingInterfaces =
+ final Map< Class< ? extends Annotation >, Collection< String > > matchingInterfaces =
new HashMap< Class< ? extends Annotation >, Collection< String > >();
final Map<String, String[]> nonMatchingClasses = new HashMap<String, String[]>();
-
+
for (Class< ? extends Annotation > annotation: annotations) {
classes.put(annotation, new HashSet< Class < ? > >());
matchingInterfaces.put(annotation, new HashSet< String >());
}
-
+
if (basePackages == null || basePackages.isEmpty()) {
return classes;
}
-
+
for (final String basePackage: basePackages) {
final boolean scanAllPackages = basePackage.equals(WILDCARD);
- final String packageSearchPath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
- + (scanAllPackages ? "" : ClassUtils.convertClassNameToResourcePath(basePackage))
+ final String packageSearchPath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+ + (scanAllPackages ? "" : ClassUtils.convertClassNameToResourcePath(basePackage))
+ ALL_CLASS_FILES;
-
- final Resource[] resources = resolver.getResources(packageSearchPath);
-
-
+
+ final Resource[] resources = resolver.getResources(packageSearchPath);
+
+
for (final Resource resource: resources) {
final MetadataReader reader = factory.getMetadataReader(resource);
final AnnotationMetadata metadata = reader.getAnnotationMetadata();
-
+
if (scanAllPackages && shouldSkip(metadata.getClassName())) {
continue;
}
-
+
for (Class< ? extends Annotation > annotation: annotations) {
boolean concreteClass = !metadata.isInterface() && !metadata.isAbstract();
if (metadata.isAnnotated(annotation.getName())) {
if (concreteClass) {
classes.get(annotation).add(loadClass(metadata.getClassName(), loader));
} else {
- matchingInterfaces.get(annotation).add(metadata.getClassName());
+ matchingInterfaces.get(annotation).add(metadata.getClassName());
}
} else if (concreteClass && metadata.getInterfaceNames().length > 0) {
nonMatchingClasses.put(metadata.getClassName(), metadata.getInterfaceNames());
@@ -125,7 +125,7 @@ class SpringClasspathScanner extends ClasspathScanner {
}
}
}
-
+
for (Map.Entry<Class<? extends Annotation>, Collection<String>> e : matchingInterfaces.entrySet()) {
if (classes.get(e.getKey()).isEmpty()) {
for (String intName : e.getValue()) {
@@ -133,64 +133,64 @@ class SpringClasspathScanner extends ClasspathScanner {
}
}
}
-
+
return classes;
}
-
- protected List<URL> findResourcesInternal(Collection<String> basePackages,
+
+ protected List<URL> findResourcesInternal(Collection<String> basePackages,
String extension,
- ClassLoader loader)
+ ClassLoader loader)
throws IOException {
final List<URL> resourceURLs = new ArrayList<>();
if (basePackages == null || basePackages.isEmpty()) {
return resourceURLs;
}
ResourcePatternResolver resolver = getResolver(loader);
-
+
for (final String basePackage: basePackages) {
final boolean scanAllPackages = basePackage.equals(WILDCARD);
-
+
String theBasePackage = basePackage;
if (theBasePackage.startsWith(CLASSPATH_URL_SCHEME)) {
theBasePackage = theBasePackage.substring(CLASSPATH_URL_SCHEME.length());
}
-
- final String packageSearchPath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
- + (scanAllPackages ? "" : basePackage.contains(WILDCARD) ? basePackage
+
+ final String packageSearchPath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+ + (scanAllPackages ? "" : basePackage.contains(WILDCARD) ? basePackage
: ClassUtils.convertClassNameToResourcePath(theBasePackage)) + ALL_FILES + "." + extension;
-
- final Resource[] resources = resolver.getResources(packageSearchPath);
+
+ final Resource[] resources = resolver.getResources(packageSearchPath);
for (final Resource resource: resources) {
resourceURLs.add(resource.getURL());
- }
+ }
}
-
+
return resourceURLs;
}
-
+
private ResourcePatternResolver getResolver(ClassLoader loader) {
ResourcePatternResolver resolver = null;
if (IN_OSGI) {
resolver = SpringOsgiUtil.getResolver(loader);
- }
+ }
if (resolver == null) {
- resolver = loader != null
+ resolver = loader != null
? new PathMatchingResourcePatternResolver(loader) : new PathMatchingResourcePatternResolver();
}
return resolver;
}
-
+
private boolean shouldSkip(final String classname) {
for (String packageToSkip: PACKAGES_TO_SKIP) {
if (classname.startsWith(packageToSkip)) {
return true;
}
}
-
+
return false;
}
-
- private Class<?> loadClass(String className, ClassLoader loader)
+
+ private Class<?> loadClass(String className, ClassLoader loader)
throws ClassNotFoundException {
if (loader == null) {
return ClassLoaderUtils.loadClass(className, getClass());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/SpringOsgiUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/SpringOsgiUtil.java b/core/src/main/java/org/apache/cxf/common/util/SpringOsgiUtil.java
index 26b54b1..e340a10 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SpringOsgiUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SpringOsgiUtil.java
@@ -28,7 +28,7 @@ final class SpringOsgiUtil {
private SpringOsgiUtil() {
}
-
+
public static ResourcePatternResolver getResolver(ClassLoader loader) {
Bundle bundle = null;
if (loader == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
index 7b895e2..8fd86a1 100644
--- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
@@ -35,15 +35,15 @@ import java.util.regex.Pattern;
public final class StringUtils {
public static final Map<String, Pattern> PATTERN_MAP = new HashMap<String, Pattern>();
static {
- String patterns[] = {"/", " ", ":", ",", ";", "=", "\\.", "\\+"};
+ String patterns[] = {"/", " ", ":", ",", ";", "=", "\\.", "\\+"};
for (String p : patterns) {
PATTERN_MAP.put(p, Pattern.compile(p));
}
}
-
+
private StringUtils() {
}
-
+
public static String[] split(String s, String regex) {
Pattern p = PATTERN_MAP.get(regex);
if (p != null) {
@@ -74,14 +74,14 @@ public final class StringUtils {
}
return true;
}
-
+
public static boolean isEmpty(List<String> list) {
if (list == null || list.size() == 0) {
return true;
}
return list.size() == 1 && isEmpty(list.get(0));
}
-
+
public static String diff(String str1, String str2) {
int index = str1.lastIndexOf(str2);
if (index > -1) {
@@ -89,7 +89,7 @@ public final class StringUtils {
}
return str1;
}
-
+
public static List<String> getParts(String str, String separator) {
String[] parts = split(str, separator);
List<String> ret = new ArrayList<>(parts.length);
@@ -100,7 +100,7 @@ public final class StringUtils {
}
return ret;
}
-
+
public static String getFirstNotEmpty(String str, String separator) {
List<String> parts = Arrays.asList(split(str, separator));
for (String part : parts) {
@@ -110,7 +110,7 @@ public final class StringUtils {
}
return str;
}
-
+
public static String getFirstNotEmpty(List<String> list) {
if (isEmpty(list)) {
return null;
@@ -118,11 +118,11 @@ public final class StringUtils {
for (String item : list) {
if (!isEmpty(item)) {
return item;
- }
+ }
}
return null;
}
-
+
public static List<String> getFound(String contents, String regex) {
if (isEmpty(regex) || isEmpty(contents)) {
return null;
@@ -130,7 +130,7 @@ public final class StringUtils {
List<String> results = new ArrayList<>();
Pattern pattern = Pattern.compile(regex, Pattern.UNICODE_CASE);
Matcher matcher = pattern.matcher(contents);
-
+
while (matcher.find()) {
if (matcher.groupCount() > 0) {
results.add(matcher.group(1));
@@ -139,8 +139,8 @@ public final class StringUtils {
}
}
return results;
- }
-
+ }
+
public static String getFirstFound(String contents, String regex) {
List<String> founds = getFound(contents, regex);
if (isEmpty(founds)) {
@@ -148,11 +148,11 @@ public final class StringUtils {
}
return founds.get(0);
}
-
+
public static String addDefaultPortIfMissing(String urlString) {
return addDefaultPortIfMissing(urlString, "80");
}
-
+
public static String addDefaultPortIfMissing(String urlString, String defaultPort) {
URL url = null;
try {
@@ -163,16 +163,16 @@ public final class StringUtils {
if (url.getPort() != -1) {
return urlString;
}
- String regex = "http://([^/]+)";
+ String regex = "http://([^/]+)";
String found = StringUtils.getFirstFound(urlString, regex);
String replacer = "http://" + found + ":" + defaultPort;
-
+
if (!StringUtils.isEmpty(found)) {
urlString = urlString.replaceFirst(regex, replacer);
- }
+ }
return urlString;
}
-
+
/**
* Return input string with first character in upper case.
* @param name input string.
@@ -186,7 +186,7 @@ public final class StringUtils {
chars[0] = Character.toUpperCase(chars[0]);
return new String(chars);
}
-
+
public static String uncapitalize(String str) {
if (str == null || str.length() == 0) {
return str;
@@ -195,8 +195,8 @@ public final class StringUtils {
.append(Character.toLowerCase(str.charAt(0)))
.append(str.substring(1))
.toString();
- }
-
+ }
+
public static byte[] toBytesUTF8(String str) {
return toBytes(str, StandardCharsets.UTF_8.name());
}
@@ -206,7 +206,7 @@ public final class StringUtils {
public static byte[] toBytes(String str, String enc) {
try {
return str.getBytes(enc);
- } catch (UnsupportedEncodingException ex) {
+ } catch (UnsupportedEncodingException ex) {
throw new RuntimeException(ex);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java b/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
index c2b6cb0..378dee0 100644
--- a/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
+++ b/core/src/main/java/org/apache/cxf/common/util/SystemPropertyAction.java
@@ -27,7 +27,7 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
/**
- *
+ *
*/
public final class SystemPropertyAction implements PrivilegedAction<String> {
private static final Logger LOG = LogUtils.getL7dLogger(SystemPropertyAction.class);
@@ -41,7 +41,7 @@ public final class SystemPropertyAction implements PrivilegedAction<String> {
property = name;
def = d;
}
-
+
/* (non-Javadoc)
* @see java.security.PrivilegedAction#run()
*/
@@ -51,11 +51,11 @@ public final class SystemPropertyAction implements PrivilegedAction<String> {
}
return System.getProperty(property);
}
-
+
public static String getProperty(String name) {
return AccessController.doPrivileged(new SystemPropertyAction(name));
}
-
+
public static String getProperty(String name, String def) {
try {
return AccessController.doPrivileged(new SystemPropertyAction(name, def));
@@ -66,7 +66,7 @@ public final class SystemPropertyAction implements PrivilegedAction<String> {
}
/**
- * Get the system property via the AccessController, but if a SecurityException is
+ * Get the system property via the AccessController, but if a SecurityException is
* raised, just return null;
* @param name
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
index 214e71a..24122f1 100644
--- a/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
+++ b/core/src/main/java/org/apache/cxf/common/util/URIParserUtil.java
@@ -90,7 +90,7 @@ public final class URIParserUtil {
List<String> tokens = tokenize(nameSpaceURI, "/: ");
if (tokens.size() == 0) {
- return "cxf";
+ return "cxf";
}
if (tokens.size() > 1) {
@@ -218,7 +218,7 @@ public final class URIParserUtil {
public static String escapeChars(String s) {
StringBuilder b = new StringBuilder(s.length());
-
+
for (int x = 0; x < s.length(); x++) {
char ch = s.charAt(x);
if (isExcluded(ch)) {
@@ -242,7 +242,7 @@ public final class URIParserUtil {
result = escapeChars(url.toURI().normalize().toString().replace("\\", "/"));
} catch (MalformedURLException e1) {
try {
- if (uri.startsWith("classpath:")) {
+ if (uri.startsWith("classpath:")) {
url = ClassLoaderUtils.getResource(uri.substring(10), URIParserUtil.class);
return url != null ? url.toExternalForm() : uri;
}
@@ -286,7 +286,7 @@ public final class URIParserUtil {
return normalize(arg);
}
}
-
+
public static String relativize(String base, String toBeRelativized) throws URISyntaxException {
if (base == null || toBeRelativized == null) {
return null;
@@ -298,7 +298,7 @@ public final class URIParserUtil {
* This is a custom implementation for doing what URI.relativize(URI uri) should be
* doing but is not actually doing when URI roots do not fully match.
* See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6226081
- *
+ *
* @param base The base URI
* @param toBeRelativized The URI to be realivized
* @return The string value of the URI you'd expect to get as result
[09/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
index 5f2730d..2e611d3 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java
@@ -45,7 +45,7 @@ import org.apache.cxf.common.logging.LogUtils;
public class Java5TypeCreator extends AbstractTypeCreator {
private static final Logger LOG = LogUtils.getL7dLogger(Java5TypeCreator.class);
-
+
private AnnotationReader annotationReader;
public Java5TypeCreator() {
@@ -55,7 +55,7 @@ public class Java5TypeCreator extends AbstractTypeCreator {
public Java5TypeCreator(AnnotationReader annotationReader) {
this.annotationReader = annotationReader;
}
-
+
public static Class<? extends AegisType> castToAegisTypeClass(Class<?> c) {
if (c == null) {
return null;
@@ -112,7 +112,7 @@ public class Java5TypeCreator extends AbstractTypeCreator {
genericReturnType,
returnName,
annotationReader.getReturnNamespace(m)));
-
+
}
return info;
}
@@ -186,23 +186,23 @@ public class Java5TypeCreator extends AbstractTypeCreator {
if (paramType == null) {
return createObjectType();
}
-
+
/* null arises when the index-th parameter to generic is something list List<T> */
Class<?> clazz = TypeUtil.getTypeRelatedClass(paramType);
if (clazz == null) {
return createObjectType();
}
-
+
// here is where we insist that we only deal with collection types.
- if (!Collection.class.isAssignableFrom(clazz)
+ if (!Collection.class.isAssignableFrom(clazz)
&& !Map.class.isAssignableFrom(clazz)) {
return getTopCreator().createType(clazz);
}
-
+
TypeClassInfo info = createBasicClassInfo(clazz);
info.setDescription(clazz.toString());
- info.setType(paramType, paramType instanceof ParameterizedType ? pm : null);
+ info.setType(paramType, paramType instanceof ParameterizedType ? pm : null);
AegisType type = createTypeForClass(info);
@@ -212,7 +212,7 @@ public class Java5TypeCreator extends AbstractTypeCreator {
protected Type getComponentType(Type genericType, int index) {
if (genericType instanceof ParameterizedType) {
ParameterizedType type = (ParameterizedType)genericType;
- Type paramType = type.getActualTypeArguments()[index];
+ Type paramType = type.getActualTypeArguments()[index];
if (paramType instanceof WildcardType) {
WildcardType wildcardType = (WildcardType)paramType;
// we really aren't prepared to deal with multiple upper bounds,
@@ -232,8 +232,8 @@ public class Java5TypeCreator extends AbstractTypeCreator {
}
return findMapGenericTypes(genericType, pm, key);
}
-
-
+
+
private Type findMapGenericTypes(Type cls, Map<String, Type> pm, boolean key) {
if (cls == null) {
return null;
@@ -260,7 +260,7 @@ public class Java5TypeCreator extends AbstractTypeCreator {
} else if (cls instanceof Class) {
Class<?> c = (Class<?>)cls;
if (Map.class.isAssignableFrom(c)) {
-
+
for (Type tp : c.getGenericInterfaces()) {
Map<String, Type> cp = new HashMap<String, Type>(pm);
@@ -273,10 +273,10 @@ public class Java5TypeCreator extends AbstractTypeCreator {
if (c.getSuperclass() != null && Map.class.isAssignableFrom(c.getSuperclass())) {
return findMapGenericTypes(c.getGenericSuperclass(), pm, key);
}
- }
+ }
}
return null;
- }
+ }
@Override
public AegisType createDefaultType(TypeClassInfo info) {
@@ -338,7 +338,7 @@ public class Java5TypeCreator extends AbstractTypeCreator {
typeClass = (Class<?>)type;
}
}
-
+
if (name == null || name.length() == 0) {
name = ServiceUtils.makeServiceNameFromClassName(typeClass);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlFlattenedArray.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlFlattenedArray.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlFlattenedArray.java
index f52ce52..7d23c37 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlFlattenedArray.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlFlattenedArray.java
@@ -25,7 +25,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- *
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
index eba0586..bde1b9f 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java
@@ -52,13 +52,13 @@ public abstract class AbstractXOPType extends AegisType {
public static final QName XML_MIME_CONTENT_TYPE = new QName(XML_MIME_NS, "contentType");
public static final QName XOP_HREF = new QName("href");
public static final QName XML_MIME_BASE64 = new QName(XML_MIME_NS, "base64Binary", "xmime");
-
+
private String expectedContentTypes;
- // the base64 type knows how to deal with just plain base64 here, which is essentially always
+ // the base64 type knows how to deal with just plain base64 here, which is essentially always
// what we get in the absence of the optimization. So we need something of a coroutine.
private Base64Type fallbackDelegate;
private boolean useXmimeBinaryType;
-
+
/**
* Create an XOP type. This type will use xmime to publish and receive the content type
* via xmime:base64Binary if useXmimeBinaryType is true. If expectedContentTypes != null, then
@@ -77,7 +77,7 @@ public abstract class AbstractXOPType extends AegisType {
setSchemaType(Constants.XSD_BASE64);
}
}
-
+
/**
* This is called from base64Type when it recognizes an XOP attachment.
* @param reader
@@ -107,13 +107,13 @@ public abstract class AbstractXOPType extends AegisType {
@Override
public Object readObject(MessageReader reader, Context context) throws DatabindingException {
XMLStreamReader xreader = reader.getXMLStreamReader();
- String contentType =
+ String contentType =
xreader.getAttributeValue(AbstractXOPType.XML_MIME_NS,
AbstractXOPType.XML_MIME_CONTENT_TYPE.getLocalPart());
Object thingRead = fallbackDelegate.readObject(reader, context);
// If there was actually an attachment, the delegate will have called back to us and gotten
- // the appropriate data type. If there wasn't an attachment, it just returned the bytes.
+ // the appropriate data type. If there wasn't an attachment, it just returned the bytes.
// Our subclass have to package them.
if (thingRead.getClass() == (new byte[0]).getClass()) {
return wrapBytes((byte[])thingRead, contentType);
@@ -121,7 +121,7 @@ public abstract class AbstractXOPType extends AegisType {
return thingRead;
}
-
+
private Object readInclude(String type, MessageReader reader,
Context context) throws DatabindingException {
String href = reader.getAttributeReader(XOP_HREF).getValue().trim();
@@ -155,7 +155,7 @@ public abstract class AbstractXOPType extends AegisType {
fallbackDelegate.writeObject(getBytes(object), writer, context);
return;
}
-
+
Collection<Attachment> attachments = context.getAttachments();
if (attachments == null) {
attachments = new ArrayList<>();
@@ -167,7 +167,7 @@ public abstract class AbstractXOPType extends AegisType {
Attachment att = createAttachment(object, id);
attachments.add(att);
-
+
MessageWriter include = writer.getElementWriter(XOP_INCLUDE);
MessageWriter href = include.getAttributeWriter(XOP_HREF);
href.writeValue("cid:" + id);
@@ -178,9 +178,9 @@ public abstract class AbstractXOPType extends AegisType {
protected abstract Attachment createAttachment(Object object, String id);
protected abstract String getContentType(Object object, Context context);
-
+
/**
- * If one of these types arrives unoptimized, we need to convert it to the
+ * If one of these types arrives unoptimized, we need to convert it to the
* desired return type.
* @param bareBytes the bytes pulled out of the base64.
* @param contentType when we support xmime:contentType, this will be passed along.
@@ -204,7 +204,7 @@ public abstract class AbstractXOPType extends AegisType {
schemaElement.addMetaInfo(Constants.MetaDataConstants.EXTERNAL_ATTRIBUTES, extAttrMap);
}
}
-
+
@Override
public boolean usesXmime() {
return useXmimeBinaryType || expectedContentTypes != null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
index 10f4811..c44f1fa 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AttachmentUtil.java
@@ -37,7 +37,7 @@ public final class AttachmentUtil {
private AttachmentUtil() {
//utility class
}
-
+
public static String createContentID(String ns) {
String uid = UID.generate();
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java
index 69483b7..c02aee6 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java
@@ -57,7 +57,7 @@ public class DocumentType extends AegisType {
}
@Override
- public void writeObject(Object object, MessageWriter writer,
+ public void writeObject(Object object, MessageWriter writer,
Context context) throws DatabindingException {
Document doc = (Document)object;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
index ffd00e2..2ec5816 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
@@ -43,7 +43,7 @@ import org.apache.cxf.staxutils.StaxUtils;
* Reads and writes <code>javax.xml.transform.Source</code> types.
* <p>
* The XML stream is converted DOMSource and sent off.
- *
+ *
* @see javanet.staxutils.StAXSource
* @see javax.xml.stream.XMLInputFactory
* @see org.apache.cxf.aegis.util.STAXUtils
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
index cd11442..31bc3b1 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/NamespaceHelper.java
@@ -40,20 +40,20 @@ import org.apache.cxf.staxutils.StaxUtils;
* Namespace utilities.
*/
public final class NamespaceHelper {
-
+
private NamespaceHelper() {
//utility class
}
/**
* Create a unique namespace uri/prefix combination.
- *
+ *
* @param nsUri
* @return The namespace with the specified URI. If one doesn't exist, one
* is created.
*/
public static String getUniquePrefix(Element element, String namespaceURI) {
String prefix = getPrefix(element, namespaceURI);
- // it is OK to have both namespace URI and prefix be empty.
+ // it is OK to have both namespace URI and prefix be empty.
if (prefix == null) {
if ("".equals(namespaceURI)) {
return "";
@@ -73,7 +73,7 @@ public final class NamespaceHelper {
/**
* Create a unique namespace uri/prefix combination.
- *
+ *
* @param nsUri
* @return The namespace with the specified URI. If one doesn't exist, one
* is created.
@@ -83,8 +83,8 @@ public final class NamespaceHelper {
throws XMLStreamException {
return getUniquePrefix(writer, namespaceURI, null, declare);
}
-
-
+
+
/**
* Make a unique prefix.
* @param writer target writer.
@@ -94,26 +94,26 @@ public final class NamespaceHelper {
* @return the prefix.
* @throws XMLStreamException
*/
- public static String getUniquePrefix(XMLStreamWriter writer,
+ public static String getUniquePrefix(XMLStreamWriter writer,
String namespaceURI,
String preferred,
boolean declare)
throws XMLStreamException {
-
+
if (preferred != null) {
String existing = writer.getNamespaceContext().getNamespaceURI(preferred);
if (namespaceURI.equals(existing)) {
return preferred;
}
}
- String prefix = preferred;
+ String prefix = preferred;
if (prefix == null) {
prefix = writer.getNamespaceContext().getPrefix(namespaceURI);
if (prefix != null) {
declare = false;
}
}
-
+
if (prefix == null) {
prefix = StaxUtils.getUniquePrefix(writer);
}
@@ -135,7 +135,7 @@ public final class NamespaceHelper {
* <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
@@ -174,7 +174,7 @@ public final class NamespaceHelper {
/**
* Method makePackageName
- *
+ *
* @param namespace
* @return
*/
@@ -243,7 +243,7 @@ public final class NamespaceHelper {
* 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
@@ -283,7 +283,7 @@ public final class NamespaceHelper {
/**
* Reads a QName from the element text. Reader must be positioned at the
* start tag.
- *
+ *
* @param reader
* @return
* @throws XMLStreamException
@@ -343,7 +343,7 @@ public final class NamespaceHelper {
if (jNS == null) {
throw new DatabindingException("No namespace was found for prefix: " + prefix);
}
-
+
if (localName == null) {
throw new DatabindingException("Invalid QName in mapping: " + value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java
index 9c5db42..de167be 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/ServiceUtils.java
@@ -33,7 +33,7 @@ public final class ServiceUtils {
/**
* 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.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java
index 209fa63..403ed8c 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/UID.java
@@ -27,7 +27,7 @@ public final class UID {
private UID() {
//utility
}
-
+
public static String generate() {
return String.valueOf(System.currentTimeMillis()) + counter++ + random.nextInt();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/TimezoneLessXsDateFormat.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/TimezoneLessXsDateFormat.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/TimezoneLessXsDateFormat.java
index f71d350..e290def 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/TimezoneLessXsDateFormat.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/TimezoneLessXsDateFormat.java
@@ -25,7 +25,7 @@ package org.apache.cxf.aegis.util.date;
* </p>
*/
public class TimezoneLessXsDateFormat extends XsDateTimeFormat {
-
+
private static final long serialVersionUID = -2584986778843863501L;
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
index 725d220..cb75f4e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
@@ -40,13 +40,13 @@ public class XsDateTimeFormat extends Format {
final boolean parseDate;
final boolean parseTime;
-
+
final boolean parseTimezone;
XsDateTimeFormat(boolean pParseDate, boolean pParseTime) {
this(pParseDate, pParseTime, true);
}
-
+
XsDateTimeFormat(boolean pParseDate, boolean pParseTime, boolean pParseTimezone) {
parseDate = pParseDate;
parseTime = pParseTime;
@@ -93,7 +93,7 @@ public class XsDateTimeFormat extends Format {
}
return null;
}
-
+
private void append(StringBuffer pBuffer, int pNum, int pMinLen) {
String s = Integer.toString(pNum);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
index 773133b..ac903b9 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMNamespaceContext.java
@@ -56,7 +56,7 @@ public class JDOMNamespaceContext implements NamespaceContext {
public void setElement(Element element) {
this.element = element;
}
-
+
public static String rawGetPrefix(Element element, String namespaceURI) {
if (element.getNamespaceURI().equals(namespaceURI)) {
return element.getNamespacePrefix();
@@ -78,7 +78,7 @@ public class JDOMNamespaceContext implements NamespaceContext {
return null;
}
}
-
+
static void rawGetPrefixes(Element element, String namespaceURI, List<String> prefixes) {
if (element.getNamespaceURI().equals(namespaceURI)) {
prefixes.add(element.getNamespacePrefix());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
index 4d15494..94e2f11 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/JDOMStreamWriter.java
@@ -56,7 +56,7 @@ public class JDOMStreamWriter implements XMLStreamWriter {
}
public void flush() throws XMLStreamException {
- }
+ }
public void writeStartElement(String local) throws XMLStreamException {
newChild(new Element(local));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
index 6d1ce56..369504f 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/stax/W3CNamespaceContext.java
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.cxf.aegis.util.stax;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java
index 5d23923..936b707 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/AbstractMessageWriter.java
@@ -26,9 +26,9 @@ import org.apache.ws.commons.schema.constants.Constants;
* Basic type conversion functionality for writing messages.
*/
public abstract class AbstractMessageWriter implements MessageWriter {
-
+
private boolean xsiTypeWritten;
-
+
public AbstractMessageWriter() {
}
@@ -68,7 +68,7 @@ public abstract class AbstractMessageWriter implements MessageWriter {
public void writeValueAsInt(Integer i) {
writeValue(i.toString());
}
-
+
public void writeValueAsByte(Byte b) {
writeValue(b.toString());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageReader.java
index 7c055eb..364721f 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageReader.java
@@ -26,7 +26,7 @@ import javax.xml.stream.XMLStreamReader;
* hasMoreChildReaders() returns false.
*/
public interface MessageReader {
-
+
String getValue();
boolean isXsiNil();
@@ -57,7 +57,7 @@ public interface MessageReader {
/**
* Get the local name of the element this reader represents.
- *
+ *
* @return Local Name
*/
String getLocalName();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageWriter.java
index 3566cdd..61c1995 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/MessageWriter.java
@@ -37,7 +37,7 @@ public interface MessageWriter {
void writeValueAsFloat(Float f);
void writeValueAsShort(Short short1);
-
+
void writeValueAsByte(Byte b);
void writeValueAsBoolean(boolean b);
@@ -62,7 +62,7 @@ public interface MessageWriter {
* use the hint prefix if possible. If the namespace is already registered
* or the hint is already registered with a different namespace then the
* behavior will be the same as the non-hint version.
- *
+ *
* @param namespace the namespace to retrieve the prefix for
* @param hint the hint for the prefix.
* @return the prefix associated with the namespace
@@ -80,7 +80,7 @@ public interface MessageWriter {
* XML Schema Part 1: "An element information item in an instance may,
* however, explicitly assert its type using the attribute
* <code>xsi:type</code>."
- *
+ *
* @param type the QName of the type being referenced.
*/
void writeXsiType(QName qn);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/AttributeWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/AttributeWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/AttributeWriter.java
index b226a88..7fb75e3 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/AttributeWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/AttributeWriter.java
@@ -47,7 +47,7 @@ public class AttributeWriter extends AbstractMessageWriter {
if (XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI.equals(namespace)) {
prefix = NamespaceHelper.getUniquePrefix(writer, namespace, "xsi", true);
} else {
- prefix = NamespaceHelper.getUniquePrefix(writer, namespace, null, true);
+ prefix = NamespaceHelper.getUniquePrefix(writer, namespace, null, true);
}
} else {
prefix = "";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
index 652348b..a19d7ae 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementReader.java
@@ -115,7 +115,7 @@ public class ElementReader extends AbstractMessageReader {
return null;
}
value = root.getElementText();
-
+
hasCheckedChildren = true;
hasChildren = false;
if (root.hasNext()) {
@@ -124,7 +124,7 @@ public class ElementReader extends AbstractMessageReader {
} catch (XMLStreamException e) {
throw new DatabindingException("Could not read XML stream.", e);
}
-
+
if (value == null) {
value = "";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
index db632c5..3574ae3 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/xml/stax/ElementWriter.java
@@ -40,7 +40,7 @@ public class ElementWriter extends AbstractMessageWriter {
/**
* Create an ElementWriter but without writing an element name.
- *
+ *
* @param writer
*/
public ElementWriter(XMLStreamWriter writer) {
@@ -93,9 +93,9 @@ public class ElementWriter extends AbstractMessageWriter {
String decPrefix = writer.getNamespaceContext().getPrefix(namespace);
// If the user didn't specify a prefix, create one
- if (StringUtils.isEmpty(prefix)
+ if (StringUtils.isEmpty(prefix)
&& decPrefix == null) {
-
+
if (!StringUtils.isEmpty(namespace)) {
declare = true;
prefix = StaxUtils.getUniquePrefix(writer);
@@ -155,8 +155,8 @@ public class ElementWriter extends AbstractMessageWriter {
if ("".equals(qname.getPrefix())) {
return new ElementWriter(writer, qname.getLocalPart(), qname.getNamespaceURI());
} else {
- return new ElementWriter(writer, qname.getLocalPart(),
- qname.getNamespaceURI(),
+ return new ElementWriter(writer, qname.getLocalPart(),
+ qname.getNamespaceURI(),
qname.getPrefix());
}
}
@@ -217,8 +217,8 @@ public class ElementWriter extends AbstractMessageWriter {
if (pfx == null) {
String ns2 = writer.getNamespaceContext().getNamespaceURI(hint);
- // if the hint is "" (the default) and the context does
- if (ns2 == null && !"".equals(hint)) {
+ // if the hint is "" (the default) and the context does
+ if (ns2 == null && !"".equals(hint)) {
pfx = hint;
} else if (ns.equals(ns2)) {
// just because it's in the context, doesn't mean it has been written.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
index 39e5127..c683612 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java
@@ -83,7 +83,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
@Before
public void setUp() throws Exception {
super.setUpBus();
-
+
SoapBindingFactory bindingFactory = new SoapBindingFactory();
bindingFactory.setBus(bus);
@@ -111,8 +111,8 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
bus.setExtension(new WSDLManagerImpl(), WSDLManager.class);
//WoodstoxValidationImpl wstxVal = new WoodstoxValidationImpl();
-
-
+
+
addNamespace("wsdl", WSDLConstants.NS_WSDL11);
addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
@@ -160,7 +160,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
return sf.create();
}
- protected Server createJaxwsService(Class<?> serviceClass,
+ protected Server createJaxwsService(Class<?> serviceClass,
Object serviceBean, String address, QName name) {
if (address == null) {
address = serviceClass.getSimpleName();
@@ -169,13 +169,13 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
sf.setDataBinding(new AegisDatabinding());
JaxWsServerFactoryBean serverFactoryBean = new JaxWsServerFactoryBean();
serverFactoryBean.setServiceClass(serviceClass);
-
+
if (serviceBean != null) {
serverFactoryBean.setServiceBean(serviceBean);
}
serverFactoryBean.setAddress("local://" + address);
-
+
serverFactoryBean.setServiceFactory(sf);
if (name != null) {
serverFactoryBean.setEndpointName(name);
@@ -194,7 +194,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
return sf.create();
}
- protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
+ protected ServerFactoryBean createServiceFactory(Class<?> serviceClass,
Object serviceBean, String address,
QName name, AegisDatabinding binding) {
ServerFactoryBean sf = new ServerFactoryBean();
@@ -245,7 +245,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
}
return docs;
}
-
+
private Collection<Import> getImports(final Definition wsdlDef) {
Collection<Import> importList = new ArrayList<>();
Map<?, ?> imports = wsdlDef.getImports();
@@ -256,7 +256,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
}
return importList;
}
-
+
protected Definition getWSDLDefinition(String string) throws WSDLException {
ServerRegistry svrMan = getBus().getExtension(ServerRegistry.class);
@@ -285,7 +285,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
globalContext.initialize();
return new Context(globalContext);
}
-
+
protected XmlSchema newXmlSchema(String targetNamespace) {
XmlSchema s = new XmlSchema();
s.setTargetNamespace(targetNamespace);
@@ -294,12 +294,12 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
// tns: is conventional, and besides we have unit tests that are hardcoded to it.
xmlsNamespaceMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX, targetNamespace);
-
+
// ditto for xsd: instead of just namespace= for the schema schema.
xmlsNamespaceMap.add("xsd", Constants.URI_2001_SCHEMA_XSD);
return s;
}
-
+
protected Element createElement(String namespace, String name) {
return createElement(namespace, name, null);
}
@@ -316,7 +316,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
doc.appendChild(element);
return element;
}
-
+
protected ElementWriter getElementWriter(Element element) {
return getElementWriter(element, new MapNamespaceContext());
}
@@ -350,7 +350,7 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
protected void setEnableJDOM(boolean enableJDOM) {
this.enableJDOM = enableJDOM;
}
-
+
protected String renderWsdl(Document wsdlDoc) throws XMLStreamException {
StringWriter out = new StringWriter();
XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(out);
@@ -358,5 +358,5 @@ public abstract class AbstractAegisTest extends AbstractCXFTest {
writer.flush();
return out.toString();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookService.java
index 789b41c..b9cbf72 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/BookService.java
@@ -20,10 +20,10 @@ package org.apache.cxf.aegis.client;
public interface BookService {
Book[] getBooks();
-
+
Book findBook(String isbn);
-
+
void addBook(Book book);
-
+
void addBooks(Book[] books);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
index fcfe88e..0db907e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ClientServiceConfigTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
public class ClientServiceConfigTest extends AbstractAegisTest {
EndpointImpl impl;
-
+
@Before
public void before() throws Exception {
super.setUp();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/CustomBeansTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/CustomBeansTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/CustomBeansTest.java
index 8274467..177286c 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/CustomBeansTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/CustomBeansTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
import static org.junit.Assert.assertNotSame;
/**
- *
+ *
*/
public class CustomBeansTest {
@@ -45,12 +45,12 @@ public class CustomBeansTest {
AegisDatabinding dataBinding = new AegisDatabinding();
- NoDefaultConstructorBeanTypeRegistrar beanRegistrar
+ NoDefaultConstructorBeanTypeRegistrar beanRegistrar
= new NoDefaultConstructorBeanTypeRegistrar();
beanRegistrar.setDataBinding(dataBinding);
beanRegistrar.register();
- NoDefaultConstructorBeanKeyTypeRegistrar beanKeyRegistrar
+ NoDefaultConstructorBeanKeyTypeRegistrar beanKeyRegistrar
= new NoDefaultConstructorBeanKeyTypeRegistrar();
beanKeyRegistrar.setDataBinding(dataBinding);
beanKeyRegistrar.register();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/Service.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/Service.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/Service.java
index aa06718..8880f4b 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/Service.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/Service.java
@@ -28,7 +28,7 @@ public interface Service {
Collection<NoDefaultConstructorBean> getByName(NoDefaultConstructorBeanKey key);
- Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>>
+ Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>>
getByNames(Collection<NoDefaultConstructorBeanKey> keys);
Map<String, NoDefaultConstructorBean> getByIds(Collection<String> beanIds);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
index ef6d2f3..883f111 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/service/ServiceImpl.java
@@ -50,14 +50,14 @@ public class ServiceImpl implements Service {
return collection;
}
- public Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>>
+ public Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>>
getByNames(Collection<NoDefaultConstructorBeanKey> keys) {
if (keys == null) {
throw new IllegalArgumentException("keys is null");
}
- Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>> map =
+ Map<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>> map =
new HashMap<NoDefaultConstructorBeanKey, Collection<NoDefaultConstructorBean>>();
Collection<NoDefaultConstructorBean> collection = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
index 9964037..0b3ee5e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/exception/HelloException.java
@@ -21,19 +21,19 @@ package org.apache.cxf.aegis.exception;
import org.apache.cxf.frontend.FaultInfoException;
public class HelloException extends FaultInfoException {
-
+
private static final long serialVersionUID = 6037321444071981393L;
String faultInfo;
-
+
public HelloException() {
super();
}
-
+
public HelloException(String message, String faultInfo) {
super(message);
this.faultInfo = faultInfo;
}
-
+
public void setFaultInfo(String faultInfo) {
this.faultInfo = faultInfo;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/AbstractUser.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/AbstractUser.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/AbstractUser.java
index 88b5873..90f4e63 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/AbstractUser.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/AbstractUser.java
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.cxf.aegis.inheritance;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/Employee.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/Employee.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/Employee.java
index 4ef3590..278cdd7 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/Employee.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/Employee.java
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.cxf.aegis.inheritance;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java
index 73880c7..129e28f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/InheritanceService.java
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.cxf.aegis.inheritance;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IGrandChild.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IGrandChild.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IGrandChild.java
index 6e27550..a55363b 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IGrandChild.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IGrandChild.java
@@ -20,7 +20,7 @@ package org.apache.cxf.aegis.inheritance.intf;
public interface IGrandChild extends IChild {
String getGrandChildName();
-
+
// make sure we don't get two getChildName props
String getChildName();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IInterfaceService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IInterfaceService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IInterfaceService.java
index 7d230ce..11f6b3e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IInterfaceService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/intf/IInterfaceService.java
@@ -20,8 +20,8 @@ package org.apache.cxf.aegis.inheritance.intf;
public interface IInterfaceService {
IChild getChild();
-
+
IParent getChildViaParent();
-
+
IGrandChild getGrandChild();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1ExtendedException.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1ExtendedException.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1ExtendedException.java
index 522090a..51eb1c0 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1ExtendedException.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/inheritance/ws1/WS1ExtendedException.java
@@ -19,7 +19,7 @@
package org.apache.cxf.aegis.inheritance.ws1;
public class WS1ExtendedException extends WS1Exception {
-
+
private static final long serialVersionUID = 346325404400568680L;
private int extendedCode;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
index b9c9276..d6e8c12 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/ParameterMappingTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
*/
public class ParameterMappingTest extends AbstractAegisTest {
- @Before
+ @Before
public void setUp() throws Exception {
super.setUp();
setEnableJDOM(true); // there are JDOM types in here.
@@ -53,8 +53,8 @@ public class ParameterMappingTest extends AbstractAegisTest {
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(def, sink);
assertValid("/wsdl:definitions/wsdl:types/"
+ "xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']"
- + "/xsd:complexType[@name='add']"
- + "/xsd:sequence"
+ + "/xsd:complexType[@name='add']"
+ + "/xsd:sequence"
+ "/xsd:element[@name='value1']", doc);
assertValid(
"/wsdl:definitions/wsdl:types/"
@@ -62,7 +62,7 @@ public class ParameterMappingTest extends AbstractAegisTest {
+ "/xsd:complexType[@name='unmappedAdd']" + "/xsd:sequence"
+ "/xsd:element[@name='one']", doc);
}
-
+
@Test
public void testNamedParameter() throws Exception {
Node doc = getWSDLDocument("ArrayService");
@@ -71,8 +71,8 @@ public class ParameterMappingTest extends AbstractAegisTest {
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(def, sink);
assertValid("/wsdl:definitions/wsdl:types/"
+ "xsd:schema[@targetNamespace= 'http://services.aegis.cxf.apache.org']"
- + "/xsd:complexType[@name='verifyCustomParamName']"
- + "/xsd:sequence"
+ + "/xsd:complexType[@name='verifyCustomParamName']"
+ + "/xsd:sequence"
+ "/xsd:element[@name='custom']", doc);
}
@@ -84,8 +84,8 @@ public class ParameterMappingTest extends AbstractAegisTest {
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(def, sink);
assertXPathEquals("/wsdl:definitions/wsdl:types/"
+ "xsd:schema[@targetNamespace= 'http://services.aegis.cxf.apache.org']"
- + "/xsd:complexType[@name='ArrayOfString-2-50']"
- + "/xsd:sequence"
+ + "/xsd:complexType[@name='ArrayOfString-2-50']"
+ + "/xsd:sequence"
+ "/xsd:element[@name='string']/@minOccurs", "2", doc);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java
index c134cc6..c4f1f4b 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/SchemaValidationTest.java
@@ -37,7 +37,7 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class SchemaValidationTest extends AbstractAegisTest {
private Server server;
@@ -48,10 +48,10 @@ public class SchemaValidationTest extends AbstractAegisTest {
super.setUp();
setEnableJDOM(true);
arrayService = new ArrayService();
- server = createService(ArrayService.class,
+ server = createService(ArrayService.class,
arrayService, "Array", new QName("urn:Array", "Array"));
}
-
+
@Test
public void testInvalidArray() throws Exception {
assertTrue(testInvalidArray(Boolean.TRUE));
@@ -60,9 +60,9 @@ public class SchemaValidationTest extends AbstractAegisTest {
assertFalse(testInvalidArray(SchemaValidationType.OUT));
assertFalse(testInvalidArray(Boolean.FALSE));
}
-
+
private boolean testInvalidArray(Object validationType) throws Exception {
- server.getEndpoint().getService().put(Message.SCHEMA_VALIDATION_ENABLED, validationType);
+ server.getEndpoint().getService().put(Message.SCHEMA_VALIDATION_ENABLED, validationType);
Node r = invoke("Array", "/org/apache/cxf/aegis/integration/invalidArrayMessage.xml");
assertNotNull(r);
StringWriter out = new StringWriter();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
index 232a25a..6307f3f 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/integration/WrappedTest.java
@@ -32,11 +32,11 @@ import org.junit.Before;
import org.junit.Test;
public class WrappedTest extends AbstractAegisTest {
-
+
private ArrayService arrayService;
private Document arrayWsdlDoc;
-
- @Before
+
+ @Before
public void setUp() throws Exception {
super.setUp();
setEnableJDOM(true);
@@ -45,7 +45,7 @@ public class WrappedTest extends AbstractAegisTest {
createService(BeanService.class, "BeanService");
arrayWsdlDoc = getWSDLDocument("Array");
}
-
+
@Test
public void testBeanService() throws Exception {
Node response = invoke("BeanService", "bean11.xml");
@@ -57,13 +57,13 @@ public class WrappedTest extends AbstractAegisTest {
assertValid("//sb:getSimpleBeanResponse/sb:return/beanz:howdy[text()=\"howdy\"]", response);
assertValid("//sb:getSimpleBeanResponse/sb:return/beanz:bleh[text()=\"bleh\"]", response);
}
-
+
@Test
public void testArrayWsdl() throws Exception {
NodeList stuff = assertValid("//xsd:complexType[@name='ArrayOfString-2-50']", arrayWsdlDoc);
assertEquals(1, stuff.getLength());
}
-
+
@Test
public void testXmlConfigurationOfParameterTypeSchema() throws Exception {
assertValid(
@@ -73,7 +73,7 @@ public class WrappedTest extends AbstractAegisTest {
+ "[@type=\"xsd:long\"]",
arrayWsdlDoc);
}
-
+
@Test
public void testXmlConfigurationOfParameterType() throws Exception {
invoke("Array", "takeNumber.xml");
@@ -86,7 +86,7 @@ public class WrappedTest extends AbstractAegisTest {
assertValid("/wsdl:definitions/wsdl:types", doc);
assertValid("/wsdl:definitions/wsdl:types/xsd:schema", doc);
- assertValid("/wsdl:definitions/wsdl:types/"
+ assertValid("/wsdl:definitions/wsdl:types/"
+ "xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']",
doc);
assertValid("//xsd:schema[@targetNamespace='http://services.aegis.cxf.apache.org']/"
@@ -123,10 +123,10 @@ public class WrappedTest extends AbstractAegisTest {
}
@org.junit.Ignore // uses Jaxen.
- @Test
+ @Test
public void testSubmitJDOMArray() throws Exception {
-
- org.jdom.xpath.XPath jxpathWalrus =
+
+ org.jdom.xpath.XPath jxpathWalrus =
org.jdom.xpath.XPath.newInstance("/a:anyType/iam:walrus");
jxpathWalrus.addNamespace("a", "urn:Array");
jxpathWalrus.addNamespace("iam", "uri:iam");
@@ -142,8 +142,8 @@ public class WrappedTest extends AbstractAegisTest {
assertEquals("tusks", e.getText());
assertEquals("after items", arrayService.getAfterValue());
}
-
- @Test
+
+ @Test
public void testSubmitW3CArray() throws Exception {
addNamespace("a", "urn:Array");
addNamespace("iam", "uri:iam");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
index e32730f..d5e3e81 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/ExplicitPrefixTest.java
@@ -44,7 +44,7 @@ import org.junit.Test;
* map.
*/
public class ExplicitPrefixTest extends AbstractAegisTest {
-
+
private static final String AEGIS_TEST_NAMESPACE_PREFIX_XYZZY = "xyzzy";
private static final String URN_AEGIS_NAMESPACE_TEST = "urn:aegis:namespace:test";
@@ -53,10 +53,10 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
private TypeMapping typeMapping;
private Service service;
private Server server;
-
+
/**
* *
- *
+ *
* @return Returns the server.
*/
public Server getServer() {
@@ -70,7 +70,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
}
/**
* *
- *
+ *
* @return Returns the typeMapping.
*/
public TypeMapping getTypeMapping() {
@@ -84,7 +84,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
}
/**
* *
- *
+ *
* @return Returns the service.
*/
public Service getService() {
@@ -97,7 +97,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
this.service = service;
}
}
-
+
private ServiceAndMapping setupService(Class<?> seiClass, Map<String, String> namespaces) {
AegisDatabinding db = new AegisDatabinding();
db.setNamespaceMap(namespaces);
@@ -109,11 +109,11 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
serviceAndMapping.getService().get(TypeMapping.class.getName()));
return serviceAndMapping;
}
-
+
/**
* The W3C dom is not helpful in looking at declarations. We could convert
* to JDOM, but this is enough to get the job done.
- *
+ *
* @param node
* @return
*/
@@ -129,7 +129,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
}
return result;
}
-
+
/**
* This substitutes for using the commons-collection BiDiMap.
* @param nsmap
@@ -144,7 +144,7 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
}
return null;
}
-
+
@Test
public void testOnePrefix() throws Exception {
Map<String, String> mappings = new HashMap<String, String>();
@@ -164,11 +164,11 @@ public class ExplicitPrefixTest extends AbstractAegisTest {
// xyzzy.
assertFalse(namePrefixes.containsKey("tns"));
Element serviceSchema = (Element)
- assertValid("//xsd:schema[@targetNamespace='http://impl.namespaces.aegis.cxf.apache.org']",
+ assertValid("//xsd:schema[@targetNamespace='http://impl.namespaces.aegis.cxf.apache.org']",
rootElement).item(0);
Map<String, String> servicePrefixes = getNodeNamespaceDeclarations(serviceSchema);
String testPrefix = lookupPrefix(servicePrefixes, URN_AEGIS_NAMESPACE_TEST);
- assertEquals(AEGIS_TEST_NAMESPACE_PREFIX_XYZZY, testPrefix);
+ assertEquals(AEGIS_TEST_NAMESPACE_PREFIX_XYZZY, testPrefix);
serviceAndMapping.getServer().destroy();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java
index 7241a03..5c40d29 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java
@@ -42,14 +42,14 @@ import org.junit.Before;
import org.junit.Test;
-/**
- * Regression test for CXF-959. This is a point test for consistent
- * use of namespace prefixes in generated WSDL/XMLSchema. This test could
+/**
+ * Regression test for CXF-959. This is a point test for consistent
+ * use of namespace prefixes in generated WSDL/XMLSchema. This test could
* be made into a more comprehensive functional test by exercising
* cases such as multiple schema.
*/
public class NamespaceConfusionTest extends AbstractAegisTest {
-
+
private TypeMapping tm;
private Service service;
private AegisDatabinding databinding;
@@ -57,15 +57,15 @@ public class NamespaceConfusionTest extends AbstractAegisTest {
@Before
public void setUp() throws Exception {
super.setUp();
-
+
Server s = createService(NameServiceImpl.class);
service = s.getEndpoint().getService();
databinding = (AegisDatabinding)service.getDataBinding();
tm = databinding.getAegisContext().getTypeMapping();
}
-
- private String getNamespaceForPrefix(Element rootElement,
- Element typeElement,
+
+ private String getNamespaceForPrefix(Element rootElement,
+ Element typeElement,
String prefix) throws Exception {
Element schemaElement = (Element)assertValid("ancestor::xsd:schema", typeElement).item(0);
@@ -94,20 +94,20 @@ public class NamespaceConfusionTest extends AbstractAegisTest {
return null;
}
-
+
@Test
public void testNameNamespace() throws Exception {
-
+
org.w3c.dom.Document doc = getWSDLDocument("NameServiceImpl");
Element rootElement = doc.getDocumentElement();
Definition def = getWSDLDefinition("NameServiceImpl");
StringWriter sink = new StringWriter();
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(def, sink);
- NodeList aonNodes =
+ NodeList aonNodes =
assertValid("//xsd:complexType[@name='ArrayOfName']/xsd:sequence/xsd:element", doc);
Element arrayOfNameElement = (Element)aonNodes.item(0);
-
+
String typename = arrayOfNameElement.getAttribute("type");
String prefix = typename.split(":")[0];
@@ -116,10 +116,10 @@ public class NamespaceConfusionTest extends AbstractAegisTest {
AegisType nameType = tm.getTypeCreator().createType(Name.class);
QName tmQname = nameType.getSchemaType();
assertEquals(tmQname.getNamespaceURI(), uri);
-
+
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/data/Name.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/data/Name.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/data/Name.java
index df483ae..1adc60d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/data/Name.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/data/Name.java
@@ -23,7 +23,7 @@ public class Name {
String data;
String uid;
-
+
Name() {
this.data = "";
this.uid = "";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
index d577a01..e787394 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/impl/NameServiceImpl.java
@@ -26,8 +26,8 @@ import javax.jws.WebService;
import org.apache.cxf.aegis.namespaces.data.Name;
import org.apache.cxf.aegis.namespaces.intf.NameService;
-@WebService(serviceName = "NameService",
- endpointInterface = "org.apache.cxf.aegis.namespaces.intf.NameService",
+@WebService(serviceName = "NameService",
+ endpointInterface = "org.apache.cxf.aegis.namespaces.intf.NameService",
targetNamespace = "urn:org.apache.cxf.aegis.namespace")
public class NameServiceImpl implements NameService {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
index 725f734..8b71395 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/override/OverrideTypeTest.java
@@ -33,21 +33,21 @@ import org.apache.cxf.databinding.DataReader;
import org.junit.Test;
/**
- *
+ *
*/
public class OverrideTypeTest extends AbstractAegisTest {
-
+
@Test
public void testOverrideBean() throws Exception {
AegisDatabinding aegisDatabinding = new AegisDatabinding();
Set<String> types = new HashSet<>();
types.add("org.apache.cxf.aegis.inheritance.Employee");
aegisDatabinding.setOverrideTypes(types);
- DataReader<XMLStreamReader> dataReader =
+ DataReader<XMLStreamReader> dataReader =
aegisDatabinding.createReader(XMLStreamReader.class);
- InputStream employeeBytes =
+ InputStream employeeBytes =
testUtilities.getResourceAsStream("/org/apache/cxf/aegis/override/employee.xml");
-
+
XMLInputFactory readerFactory = XMLInputFactory.newInstance();
XMLStreamReader reader = readerFactory.createXMLStreamReader(employeeBytes);
Object objectRead = dataReader.read(reader);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java
index 9d3bd16..78212d6 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/ArrayService.java
@@ -28,16 +28,16 @@ import javax.jws.WebService;
@WebService(targetNamespace = "urn:org.apache.cxf.aegis",
serviceName = "arrayService")
public class ArrayService {
-
+
private org.jdom.Element[] jdomArray;
private org.w3c.dom.Document[] w3cArray;
private String beforeValue;
private String afterValue;
private Number numberValue;
-
+
public ArrayService() {
}
-
+
@WebMethod
public SimpleBean[] getBeanArray() {
SimpleBean bean = new SimpleBean();
@@ -46,11 +46,11 @@ public class ArrayService {
return new SimpleBean[] {bean};
}
-
+
@WebMethod
public void takeOneSimpleBean(SimpleBean sb) {
}
-
+
public void resetValues() {
beforeValue = null;
afterValue = null;
@@ -72,11 +72,11 @@ public class ArrayService {
public boolean submitBeanArray(SimpleBean[] array) {
return true;
}
-
+
@WebMethod
public void verifyCustomParamName(String param) {
}
-
+
@WebMethod
public void submitJDOMArray(String before, org.jdom.Element[] anything, String after) {
beforeValue = before;
@@ -99,11 +99,11 @@ public class ArrayService {
public org.w3c.dom.Document[] getW3cArray() {
return w3cArray;
}
-
+
public void takeNumber(Number numberParam) {
numberValue = numberParam;
}
-
+
public Number getNumberValue() {
return numberValue;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java
index 603394d..c03da71 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/AttributeBean.java
@@ -45,6 +45,6 @@ public class AttributeBean {
public void setAttrExplicitString(String attrExplicitString) {
this.attrExplicitString = attrExplicitString;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanWithDOM.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanWithDOM.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanWithDOM.java
index 671821e..977d5f16 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanWithDOM.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/BeanWithDOM.java
@@ -29,13 +29,13 @@ import org.w3c.dom.Element;
//import org.w3c.dom.Text;
/**
- *
+ *
*/
public class BeanWithDOM {
private Document document;
// private Node node;
-
-
+
+
public void fillWithSomeData() {
DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder db;
@@ -58,14 +58,14 @@ public class BeanWithDOM {
node = beetText;
*/
}
-
+
public Document getDocument() {
return document;
}
public void setDocument(Document document) {
this.document = document;
}
-
+
/*
public Node getNode() {
return node;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java
index 5f3bee6..806f000 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DataBean.java
@@ -21,7 +21,7 @@ package org.apache.cxf.aegis.services;
public class DataBean {
private byte[] data = new byte[0];
private byte[] moreData = new byte[0];
-
+
public byte[] getData() {
return data;
}
@@ -37,5 +37,5 @@ public class DataBean {
public void setMoreData(byte[] moreData) {
this.moreData = moreData;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DocumentService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DocumentService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DocumentService.java
index 0464c61..997956a 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DocumentService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/DocumentService.java
@@ -30,13 +30,13 @@ import org.w3c.dom.Element;
* Test for mapping to DOM Document.
*/
public class DocumentService implements IDocumentService {
-
+
private DocumentBuilderFactory documentBuilderFactory;
public DocumentService() {
documentBuilderFactory = DocumentBuilderFactory.newInstance();
}
-
+
/** {@inheritDoc}*/
public Document returnDocument() {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
index ac576c0..8dc9ba7 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/Echo.java
@@ -29,7 +29,7 @@ public class Echo {
public String echo(@WebParam(name = "echo") String echo) {
return echo;
}
-
+
public String simpleEcho(String string) throws Exception {
return string;
}
@@ -38,7 +38,7 @@ public class Echo {
@WebParam(name = "firstHeader", header = true) int i,
@WebParam(name = "secondHeader", header = true) String s,
String string) {
-
+
return string;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/NillableService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/NillableService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/NillableService.java
index 74842b8..9d17bf1 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/NillableService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/NillableService.java
@@ -22,14 +22,14 @@ package org.apache.cxf.aegis.services;
* A minimal service for testing nillable annotations in Aegis XML.
*/
public class NillableService {
-
+
public NillableService() {
}
-
+
public boolean submitStringArray(String[] array) {
return true;
}
-
+
public void takeNotNillableString(String string) {
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java
index 75a4383..ab87051 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/SimpleBean.java
@@ -25,19 +25,19 @@ public class SimpleBean {
private String bleh;
private String howdy;
-
+
private int[] numbers;
-
+
private Character character;
private char primitiveCharacter;
private byte littleByte;
private Byte bigByte;
private Number numberValue;
-
+
public Number getNumber() {
return numberValue;
}
-
+
public void setNumber(Number value) {
numberValue = value;
}
@@ -49,13 +49,13 @@ public class SimpleBean {
public void setNumbers(int[] numbers) {
this.numbers = numbers;
}
-
+
// this property has no XML mapping,
// useful for testing defaults.
public int[] getDefaultSchemaNumbers() {
return numbers;
}
-
+
public void setDefaultSchemaNumbers(int[] n) {
this.numbers = n;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
index 02c9362..5da2bd5 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/services/base64/BinaryDataTest.java
@@ -29,8 +29,8 @@ public class BinaryDataTest extends AbstractAegisTest {
createService(BinaryDataService.class);
runTests();
- }
-
+ }
+
private void runTests() throws Exception {
Node res = invoke("BinaryDataService",
"/org/apache/cxf/aegis/services/base64/binary.xml");
@@ -38,7 +38,7 @@ public class BinaryDataTest extends AbstractAegisTest {
addNamespace("b", "http://base64.services.aegis.cxf.apache.org");
assertValid("//b:return[text()='OK']", res);
- res = invoke("BinaryDataService",
+ res = invoke("BinaryDataService",
"/org/apache/cxf/aegis/services/base64/binaryEmpty.xml");
assertValid("//b:return[text()='OK']", res);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
index e382984..7f9c4a2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java
@@ -38,21 +38,21 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- *
+ *
*/
public class StandaloneReadTest {
private AegisContext context;
private TestUtilities testUtilities;
-
+
private interface ListStringInterface {
List<String> method();
}
-
+
@Before
public void before() {
testUtilities = new TestUtilities(getClass());
}
-
+
@Test
public void testBasicTypeRead() throws Exception {
context = new AegisContext();
@@ -62,21 +62,21 @@ public class StandaloneReadTest {
Object something = reader.read(streamReader);
assertTrue("ball-of-yarn".equals(something));
}
-
+
@Test
public void testCollectionReadNoXsiType() throws Exception {
context = new AegisContext();
Set<java.lang.reflect.Type> roots = new HashSet<java.lang.reflect.Type>();
- java.lang.reflect.Type listStringType
+ java.lang.reflect.Type listStringType
= ListStringInterface.class.getMethods()[0].getGenericReturnType();
roots.add(listStringType);
context.setRootClasses(roots);
context.initialize();
- XMLStreamReader streamReader
+ XMLStreamReader streamReader
= testUtilities.getResourceAsXMLStreamReader("topLevelList.xml");
AegisReader<XMLStreamReader> reader = context.createXMLStreamReader();
- // until I fix type mapping to use java.lang.reflect.Type instead of
- // Class, I need to do the following
+ // until I fix type mapping to use java.lang.reflect.Type instead of
+ // Class, I need to do the following
QName magicTypeQName = new QName("urn:org.apache.cxf.aegis.types", "ArrayOfString");
AegisType aegisRegisteredType = context.getTypeMapping().getType(magicTypeQName);
@@ -87,17 +87,17 @@ public class StandaloneReadTest {
correctAnswer.add("hailstorm");
assertEquals(correctAnswer, something);
}
-
+
@Test
public void testCollectionReadXsiType() throws Exception {
context = new AegisContext();
Set<java.lang.reflect.Type> roots = new HashSet<java.lang.reflect.Type>();
- java.lang.reflect.Type listStringType
+ java.lang.reflect.Type listStringType
= ListStringInterface.class.getMethods()[0].getGenericReturnType();
roots.add(listStringType);
context.setRootClasses(roots);
context.initialize();
- XMLStreamReader streamReader
+ XMLStreamReader streamReader
= testUtilities.getResourceAsXMLStreamReader("topLevelListWithXsiType.xml");
AegisReader<XMLStreamReader> reader = context.createXMLStreamReader();
@@ -108,8 +108,8 @@ public class StandaloneReadTest {
correctAnswer.add("hailstorm");
assertEquals(correctAnswer, something);
}
-
-
+
+
// test using a .aegis.xml
@Test
public void testSimpleBeanRead() throws Exception {
@@ -118,7 +118,7 @@ public class StandaloneReadTest {
rootClasses.add(SimpleBean.class);
context.setRootClasses(rootClasses);
context.initialize();
- XMLStreamReader streamReader =
+ XMLStreamReader streamReader =
testUtilities.getResourceAsXMLStreamReader("simpleBean1.xml");
AegisReader<XMLStreamReader> reader = context.createXMLStreamReader();
Object something = reader.read(streamReader);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
index c9057e3..68a5c94 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java
@@ -48,18 +48,18 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
- *
+ *
*/
public class StandaloneWriteTest {
private AegisContext context;
private TestUtilities testUtilities;
private XMLOutputFactory xmlOutputFactory;
private XMLInputFactory xmlInputFactory;
-
+
private interface ListStringInterface {
List<String> method();
}
-
+
@Before
public void before() {
testUtilities = new TestUtilities(getClass());
@@ -67,17 +67,17 @@ public class StandaloneWriteTest {
xmlOutputFactory = XMLOutputFactory.newInstance();
xmlInputFactory = XMLInputFactory.newInstance();
}
-
+
@Test
public void testTypeLookup() throws Exception {
context = new AegisContext();
context.initialize();
- AegisType st = context.getTypeMapping().getType(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI,
+ AegisType st = context.getTypeMapping().getType(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI,
"string"));
assertNotNull(st);
assertEquals(st.getClass(), StringType.class);
}
-
+
@Test
public void testBasicTypeWrite() throws Exception {
context = new AegisContext();
@@ -98,7 +98,7 @@ public class StandaloneWriteTest {
String text = reader.getText();
assertEquals("ball-of-yarn", text);
}
-
+
@Test
public void testWriteCollection() throws Exception {
context = new AegisContext();
@@ -111,7 +111,7 @@ public class StandaloneWriteTest {
AegisWriter<XMLStreamWriter> writer = context.createXMLStreamWriter();
StringWriter stringWriter = new StringWriter();
XMLStreamWriter xmlWriter = xmlOutputFactory.createXMLStreamWriter(stringWriter);
- java.lang.reflect.Type listStringType
+ java.lang.reflect.Type listStringType
= ListStringInterface.class.getMethods()[0].getGenericReturnType();
writer.write(strings, new QName("urn:borghes", "items"),
false, xmlWriter, listStringType);
@@ -137,7 +137,7 @@ public class StandaloneWriteTest {
text = reader.getElementText();
assertEquals("hailstorm", text);
}
-
+
@Test
public void testBean() throws Exception {
context = new AegisContext();
@@ -157,6 +157,6 @@ public class StandaloneWriteTest {
xmlWriter.close();
String xml = stringWriter.toString();
assertTrue(xml.contains("doody"));
-
+
}
}
[35/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java b/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
index 32df9cb..3af57f8 100755
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/ElementProperty.java
@@ -22,34 +22,34 @@ package org.apache.cxf.staxutils.transform;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
class ElementProperty {
private QName name;
private String text;
private boolean child;
-
+
ElementProperty(QName name, String text, boolean child) {
this.name = name;
this.text = text;
this.child = child;
}
- /**
+ /**
* @return Returns the name.
*/
public QName getName() {
return name;
}
- /**
+ /**
* @return Returns the text.
*/
public String getText() {
return text;
}
- /**
+ /**
* @return Returns the child.
*/
public boolean isChild() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
index c6187ba..8d80a6d 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/IgnoreNamespacesWriter.java
@@ -34,7 +34,7 @@ public class IgnoreNamespacesWriter extends DelegatingXMLStreamWriter {
this.ignoreXsiAttributes = ignoreXsiAttributes;
}
- public void writeAttribute(String prefix, String uri,
+ public void writeAttribute(String prefix, String uri,
String local, String value) throws XMLStreamException {
if (ignoreXsiAttributes && XSI_PREFIX.equals(prefix)
&& ("type".equals(local) || "nil".equals(local))) {
@@ -46,19 +46,19 @@ public class IgnoreNamespacesWriter extends DelegatingXMLStreamWriter {
public void writeAttribute(String uri, String local, String value) throws XMLStreamException {
super.writeAttribute(local, value);
}
-
+
public void writeStartElement(String prefix, String local, String uri) throws XMLStreamException {
super.writeStartElement(local);
}
-
+
public void writeStartElement(String uri, String local) throws XMLStreamException {
super.writeStartElement(local);
}
-
+
public void setPrefix(String pfx, String uri) throws XMLStreamException {
// completed
}
-
+
public void setDefaultNamespace(String uri) throws XMLStreamException {
// completed
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
index 765713d..3a115ff 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/InTransformReader.java
@@ -43,7 +43,7 @@ public class InTransformReader extends DepthXMLStreamReader {
private static final String INTERN_NAMES = "org.codehaus.stax2.internNames";
private static final String INTERN_NS = "org.codehaus.stax2.internNsUris";
-
+
private QNamesMap inElementsMap;
private QNamesMap inAttributesMap;
private Map<QName, ElementProperty> inAppendMap = new HashMap<QName, ElementProperty>(5);
@@ -53,20 +53,20 @@ public class InTransformReader extends DepthXMLStreamReader {
private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<List<ParsingEvent>>();
private String replaceText;
private ParsingEvent currentEvent;
- private List<Integer> attributesIndexes = new ArrayList<>();
+ private List<Integer> attributesIndexes = new ArrayList<>();
private boolean blockOriginalReader = true;
private boolean attributesIndexed;
private DelegatingNamespaceContext namespaceContext;
- public InTransformReader(XMLStreamReader reader,
+ public InTransformReader(XMLStreamReader reader,
Map<String, String> inMap,
Map<String, String> appendMap,
boolean blockOriginalReader) {
-
+
this(reader, inMap, appendMap, null, null, blockOriginalReader);
}
-
- public InTransformReader(XMLStreamReader reader,
+
+ public InTransformReader(XMLStreamReader reader,
Map<String, String> inEMap,
Map<String, String> appendMap,
List<String> dropESet,
@@ -78,20 +78,20 @@ public class InTransformReader extends DepthXMLStreamReader {
this.blockOriginalReader = blockOriginalReader;
TransformUtils.convertToQNamesMap(inEMap, inElementsMap, nsMap);
TransformUtils.convertToQNamesMap(inAMap, inAttributesMap, null);
-
+
TransformUtils.convertToMapOfElementProperties(appendMap, inAppendMap);
TransformUtils.convertToSetOfQNames(dropESet, inDropSet);
namespaceContext = new DelegatingNamespaceContext(
reader.getNamespaceContext(), nsMap);
}
-
+
@Override
- // If JAXB schema validation is disabled then returning
+ // If JAXB schema validation is disabled then returning
// the native reader and thus bypassing this reader may work
public XMLStreamReader getReader() {
return blockOriginalReader ? this : super.getReader();
}
-
+
public int next() throws XMLStreamException {
final boolean doDebug = LOG.isLoggable(Level.FINE);
@@ -107,7 +107,7 @@ public class InTransformReader extends DepthXMLStreamReader {
LOG.fine("no pushed event");
}
}
-
+
int event = super.next();
if (event == XMLStreamConstants.START_ELEMENT) {
attributesIndexed = false;
@@ -118,7 +118,7 @@ public class InTransformReader extends DepthXMLStreamReader {
if (doDebug) {
LOG.fine("read StartElement " + theName + " at " + getDepth());
}
-
+
final boolean dropped = inDropSet.contains(theName);
QName expected = inElementsMap.get(theName);
if (expected == null) {
@@ -143,7 +143,7 @@ public class InTransformReader extends DepthXMLStreamReader {
} else if (replaceContent) {
replaceText = appendProp.getText();
if (doDebug) {
- LOG.fine("replacing content with " + replaceText);
+ LOG.fine("replacing content with " + replaceText);
}
currentEvent = TransformUtils.createStartElementEvent(expected);
pushedAheadEvents.add(0, null);
@@ -168,39 +168,39 @@ public class InTransformReader extends DepthXMLStreamReader {
if (doDebug) {
LOG.fine("read EndElement " + theName + " at " + getDepth());
}
-
+
namespaceContext.up();
final boolean dropped = inDropSet.contains(theName);
if (!dropped) {
List<ParsingEvent> pe = pushedAheadEvents.remove(0);
if (null != pe) {
if (doDebug) {
- LOG.fine("pushed event found");
+ LOG.fine("pushed event found");
}
pushedBackEvents.addAll(0, pe);
currentEvent = pushedBackEvents.remove(0);
event = currentEvent.getEvent();
} else {
if (doDebug) {
- LOG.fine("no pushed event found");
+ LOG.fine("no pushed event found");
}
}
} else {
if (doDebug) {
- LOG.fine("shallow-dropping end " + theName);
+ LOG.fine("shallow-dropping end " + theName);
}
event = next();
}
} else {
if (doDebug) {
- LOG.fine("read other event " + event);
+ LOG.fine("read other event " + event);
}
currentEvent = null;
}
return event;
}
-
+
private void handleAppendMode(QName expected, ElementProperty appendProp) {
final boolean doDebug = LOG.isLoggable(Level.FINE);
if (appendProp.isChild()) {
@@ -225,7 +225,7 @@ public class InTransformReader extends DepthXMLStreamReader {
pe.add(TransformUtils.createEndElementEvent(expected));
pushedAheadEvents.add(0, pe);
}
- } else {
+ } else {
// ap-pre-*
if (null == appendProp.getText()) {
// ap-pre-wrap
@@ -249,7 +249,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
}
}
-
+
private void handleDefaultMode(QName name, QName expected) {
currentEvent = TransformUtils.createStartElementEvent(expected);
if (!name.equals(expected)) {
@@ -260,7 +260,7 @@ public class InTransformReader extends DepthXMLStreamReader {
pushedAheadEvents.add(0, null);
}
}
-
+
private void handleDeepDrop() throws XMLStreamException {
final int depth = getDepth();
while (depth != getDepth() || super.next() != XMLStreamConstants.END_ELEMENT) {
@@ -278,7 +278,7 @@ public class InTransformReader extends DepthXMLStreamReader {
public String getLocalName() {
if (currentEvent != null) {
- return currentEvent.getName().getLocalPart();
+ return currentEvent.getName().getLocalPart();
} else {
return super.getLocalName();
}
@@ -300,7 +300,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
return prefix;
}
-
+
public String getNamespaceURI(int index) {
String ns = super.getNamespaceURI(index);
String actualNs = nsMap.get(ns);
@@ -312,7 +312,7 @@ public class InTransformReader extends DepthXMLStreamReader {
return ns;
}
}
-
+
public String getNamespacePrefix(int index) {
String ns = super.getNamespaceURI(index);
String actualNs = nsMap.get(ns);
@@ -328,7 +328,7 @@ public class InTransformReader extends DepthXMLStreamReader {
return namespaceContext.getPrefix(ns);
}
}
-
+
public String getNamespaceURI(String prefix) {
String ns = super.getNamespaceURI(prefix);
@@ -357,8 +357,8 @@ public class InTransformReader extends DepthXMLStreamReader {
String prefix = super.getPrefix();
return new QName(ns, name, prefix == null ? "" : prefix);
}
-
- public QName getName() {
+
+ public QName getName() {
return new QName(getNamespaceURI(), getLocalName());
}
@@ -375,7 +375,7 @@ public class InTransformReader extends DepthXMLStreamReader {
throwIndexException(arg0, 0);
}
checkAttributeIndexRange(arg0);
-
+
return getAttributeName(arg0).getLocalPart();
}
@@ -386,7 +386,7 @@ public class InTransformReader extends DepthXMLStreamReader {
checkAttributeIndexRange(arg0);
QName aname = super.getAttributeName(attributesIndexes.get(arg0));
QName expected = inAttributesMap.get(aname);
-
+
return expected == null ? aname : expected;
}
@@ -440,7 +440,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
checkAttributeIndexRange(-1);
//TODO need reverse lookup
- return super.getAttributeValue(namespace, localName);
+ return super.getAttributeValue(namespace, localName);
}
public String getText() {
@@ -467,7 +467,7 @@ public class InTransformReader extends DepthXMLStreamReader {
return superChars;
}
- public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length)
+ public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length)
throws XMLStreamException {
if (currentEvent != null && currentEvent.getValue() != null) {
int len = currentEvent.getValue().length() - sourceStart;
@@ -491,7 +491,7 @@ public class InTransformReader extends DepthXMLStreamReader {
/**
* Checks the index range for the current attributes set.
* If the attributes are not indexed for the current element context, they
- * will be indexed.
+ * will be indexed.
* @param index
*/
private void checkAttributeIndexRange(int index) {
@@ -513,7 +513,7 @@ public class InTransformReader extends DepthXMLStreamReader {
}
private void throwIndexException(int index, int size) {
- throw new IllegalArgumentException("Invalid index " + index
+ throw new IllegalArgumentException("Invalid index " + index
+ "; current element has only " + size + " attributes");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
index f3d5b0b..56da591 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/OutTransformWriter.java
@@ -44,7 +44,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
private Map<QName, ElementProperty> appendMap = new HashMap<QName, ElementProperty>(5);
private Map<String, String> nsMap = new HashMap<String, String>(5);
private List<Set<String>> writtenUris = new LinkedList<Set<String>>();
-
+
private Set<QName> dropElements;
private List<List<ParsingEvent>> pushedAheadEvents = new LinkedList<List<ParsingEvent>>();
private List<QName> elementsStack = new LinkedList<QName>();
@@ -55,12 +55,12 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
private boolean attributesToElements;
private DelegatingNamespaceContext namespaceContext;
- public OutTransformWriter(XMLStreamWriter writer,
+ public OutTransformWriter(XMLStreamWriter writer,
Map<String, String> outMap) {
this(writer, outMap, null, null, null, false, null);
}
-
- public OutTransformWriter(XMLStreamWriter writer,
+
+ public OutTransformWriter(XMLStreamWriter writer,
Map<String, String> outMap,
Map<String, String> append,
List<String> dropEls,
@@ -68,8 +68,8 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
String defaultNamespace) {
this(writer, outMap, append, dropEls, null, attributesToElements, defaultNamespace);
}
-
- public OutTransformWriter(XMLStreamWriter writer,
+
+ public OutTransformWriter(XMLStreamWriter writer,
Map<String, String> outEMap,
Map<String, String> append,
List<String> dropEls,
@@ -104,14 +104,14 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
|| uri.equals(replaceNamespace)) {
return;
}
-
+
uri = value != null ? value : uri;
-
- if (writtenUris.get(0).contains(uri)
+
+ if (writtenUris.get(0).contains(uri)
&& (prefix.length() == 0 || prefix.equals(namespaceContext.getPrefix(uri)))) {
return;
}
-
+
if (defaultNamespace != null && defaultNamespace.equals(uri)) {
super.writeDefaultNamespace(uri);
namespaceContext.addPrefix("", uri);
@@ -124,7 +124,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
writtenUris.get(0).add(uri);
}
-
+
@Override
public void writeDefaultNamespace(String uri) throws XMLStreamException {
@@ -132,14 +132,14 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
return;
}
String value = nsMap.get(uri);
- if ((value != null && value.length() == 0)
+ if ((value != null && value.length() == 0)
|| (isDefaultNamespaceRedefined() && !isDefaultNamespaceRedefined(uri))
|| uri.equals(replaceNamespace)) {
return;
}
-
+
uri = value != null ? value : uri;
-
+
if (writtenUris.get(0).contains(uri) && "".equals(namespaceContext.getPrefix(uri))) {
return;
}
@@ -158,7 +158,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
|| (isDefaultNamespaceRedefined() && !isDefaultNamespaceRedefined(uri))) {
return;
}
-
+
uri = value != null ? value : uri;
super.setDefaultNamespace(uri);
@@ -178,7 +178,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
s = new HashSet<>(writtenUris.get(0));
}
writtenUris.add(0, s);
-
+
final QName theName = new QName(uri, local, prefix);
final ElementProperty appendProp = appendMap.remove(theName);
final boolean replaceContent = appendProp != null && theName.equals(appendProp.getName());
@@ -190,7 +190,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
} else {
if (prefix.length() == 0 && expected.getNamespaceURI().length() > 0
&& theName.getNamespaceURI().length() == 0) {
- // if the element is promoted to a qualified element, use the prefix bound
+ // if the element is promoted to a qualified element, use the prefix bound
// to that namespace. If the namespace is unbound, generate a new prefix and
// write its declaration later.
prefix = namespaceContext.getPrefix(expected.getNamespaceURI());
@@ -208,13 +208,13 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
if (!appendProp.isChild()) {
// ap-pre-*
QName appendQName = appendProp.getName();
- String theprefix = namespaceContext.getPrefix(appendQName.getNamespaceURI());
+ String theprefix = namespaceContext.getPrefix(appendQName.getNamespaceURI());
boolean nsadded = false;
if (theprefix == null) {
nsadded = true;
theprefix = namespaceContext.getPrefix(appendQName.getNamespaceURI());
- if (theprefix == null
- && (appendQName.getNamespaceURI().equals(expected.getNamespaceURI())
+ if (theprefix == null
+ && (appendQName.getNamespaceURI().equals(expected.getNamespaceURI())
&& expected.getPrefix().length() > 0)) {
theprefix = expected.getPrefix();
} else if (theprefix == null) {
@@ -261,17 +261,17 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
pushedAheadEvents.add(0, pe);
elementsStack.add(0, expected);
- replaceNamespace = expected.getNamespaceURI().equals(theName.getNamespaceURI())
+ replaceNamespace = expected.getNamespaceURI().equals(theName.getNamespaceURI())
? null : theName.getNamespaceURI();
if (appendProp != null && !replaceContent && appendProp.isChild()) {
// ap-post-*
QName appendQName = appendProp.getName();
String theprefix = namespaceContext.getPrefix(appendQName.getNamespaceURI());
-
+
if (appendProp.getText() == null) {
// ap-post-wrap
- write(new QName(appendQName.getNamespaceURI(), appendQName.getLocalPart(),
+ write(new QName(appendQName.getNamespaceURI(), appendQName.getLocalPart(),
theprefix == null ? "" : theprefix), false);
if (namespaceContext.getPrefix(appendQName.getNamespaceURI()) == null) {
this.writeNamespace(theprefix, uri);
@@ -295,7 +295,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
}
-
+
@Override
public void writeStartElement(String uri, String local) throws XMLStreamException {
/*
@@ -349,7 +349,7 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
}
}
-
+
@Override
public void writeCharacters(String text) throws XMLStreamException {
if (matchesDropped(false)) {
@@ -361,14 +361,14 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
}
super.writeCharacters(text);
}
-
+
private void write(QName qname, boolean replacePrefix) throws XMLStreamException {
boolean writeNs = false;
String prefix = "";
if (qname.getNamespaceURI().length() > 0) {
- if ((replacePrefix || isDefaultNamespaceRedefined())
+ if ((replacePrefix || isDefaultNamespaceRedefined())
&& qname.getPrefix().length() == 0) {
- // if the default namespace is configured to be replaced, a non-empty prefix must be assigned
+ // if the default namespace is configured to be replaced, a non-empty prefix must be assigned
prefix = namespaceContext.getPrefix(qname.getNamespaceURI());
if (prefix == null) {
prefix = namespaceContext.findUniquePrefix(qname.getNamespaceURI());
@@ -377,44 +377,44 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
} else {
prefix = qname.getPrefix();
}
-
- }
+
+ }
if (isDefaultNamespaceRedefined(qname.getNamespaceURI())) {
prefix = "";
}
super.writeStartElement(prefix, qname.getLocalPart(), qname.getNamespaceURI());
- if (writeNs
+ if (writeNs
|| !qname.getNamespaceURI().equals(namespaceContext.getNamespaceURI(prefix))) {
this.writeNamespace(prefix, qname.getNamespaceURI());
}
}
-
+
private boolean isDefaultNamespaceRedefined() {
return defaultNamespace != null;
}
-
+
private boolean isDefaultNamespaceRedefined(String uri) {
return isDefaultNamespaceRedefined() && defaultNamespace.equals(uri);
}
private boolean matchesDropped(boolean shallow) {
- return (dropDepth > 0 && dropDepth <= currentDepth)
+ return (dropDepth > 0 && dropDepth <= currentDepth)
|| (shallow && (elementsStack.size() > 0 && dropElements.contains(elementsStack.get(0))));
}
-
-
+
+
@Override
public NamespaceContext getNamespaceContext() {
- return namespaceContext;
+ return namespaceContext;
}
-
+
@Override
- public void writeAttribute(String prefix, String uri, String local, String value)
+ public void writeAttribute(String prefix, String uri, String local, String value)
throws XMLStreamException {
if (matchesDropped(false)) {
return;
}
-
+
QName expected = attributesMap.get(new QName(uri, local, prefix));
if (expected != null) {
if (TransformUtils.isEmptyQName(expected)) {
@@ -448,13 +448,13 @@ public class OutTransformWriter extends DelegatingXMLStreamWriter {
if (uri.length() > 0) {
super.writeAttribute(uri, local, value);
} else {
- super.writeAttribute(local, value);
+ super.writeAttribute(local, value);
}
} else {
writeAttributeAsElement(uri, local, value);
}
}
-
+
private void writeAttributeAsElement(String uri, String local, String value)
throws XMLStreamException {
this.writeStartElement(uri, local);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java b/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
index 72edc37..e46bb5d 100755
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/ParsingEvent.java
@@ -22,19 +22,19 @@ package org.apache.cxf.staxutils.transform;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
class ParsingEvent {
private int event;
private QName name;
private String value;
-
+
ParsingEvent(int event, QName name, String value) {
this.event = event;
this.name = name;
this.value = value;
}
-
+
public String toString() {
return new StringBuilder().append("Event(").
append(event).append(", ").append(name).append(", ").append(value).append(")").
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java b/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java
index ad09e92..8f634ea 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/QNamesMap.java
@@ -25,18 +25,18 @@ class QNamesMap {
private QName[] keys;
private QName[] values;
private int index;
-
+
QNamesMap(int size) {
keys = new QName[size];
values = new QName[size];
}
-
+
public void put(QName key, QName value) {
keys[index] = key;
values[index] = value;
index++;
}
-
+
public QName get(QName key) {
for (int i = 0; i < keys.length; i++) {
if (keys[i].getNamespaceURI().equals(key.getNamespaceURI())) {
@@ -49,10 +49,10 @@ class QNamesMap {
}
}
}
- return null;
+ return null;
}
-
+
public int size() {
- return index;
+ return index;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java b/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
index 9dc2649..49d9aca 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/TransformUtils.java
@@ -35,17 +35,17 @@ import org.apache.cxf.staxutils.StaxUtils;
public final class TransformUtils {
private TransformUtils() {
-
+
}
-
+
public static XMLStreamReader createNewReaderIfNeeded(XMLStreamReader reader, InputStream is) {
return reader == null ? StaxUtils.createXMLStreamReader(is) : reader;
}
-
+
public static XMLStreamWriter createNewWriterIfNeeded(XMLStreamWriter writer, OutputStream os) {
return writer == null ? StaxUtils.createXMLStreamWriter(os) : writer;
}
-
+
public static XMLStreamWriter createTransformWriterIfNeeded(XMLStreamWriter writer,
OutputStream os,
Map<String, String> outElementsMap,
@@ -53,7 +53,7 @@ public final class TransformUtils {
Map<String, String> outAppendMap,
boolean attributesToElements,
String defaultNamespace) {
- if (outElementsMap != null || outDropElements != null
+ if (outElementsMap != null || outDropElements != null
|| outAppendMap != null || attributesToElements) {
writer = createNewWriterIfNeeded(writer, os);
writer = new OutTransformWriter(writer, outElementsMap, outAppendMap,
@@ -71,7 +71,7 @@ public final class TransformUtils {
Map<String, String> outAttributesMap,
boolean attributesToElements,
String defaultNamespace) {
- if (outElementsMap != null || outDropElements != null
+ if (outElementsMap != null || outDropElements != null
|| outAppendMap != null || attributesToElements) {
writer = createNewWriterIfNeeded(writer, os);
writer = new OutTransformWriter(writer, outElementsMap, outAppendMap,
@@ -81,33 +81,33 @@ public final class TransformUtils {
}
//CHECKSTYLE:ON
- public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader,
+ public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader,
InputStream is,
List<String> inDropElements,
Map<String, String> inElementsMap,
Map<String, String> inAppendMap,
boolean blockOriginalReader) {
- return createTransformReaderIfNeeded(reader, is,
+ return createTransformReaderIfNeeded(reader, is,
inDropElements, inElementsMap, inAppendMap, null, blockOriginalReader);
}
-
- public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader,
+
+ public static XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader,
InputStream is,
List<String> inDropElements,
Map<String, String> inElementsMap,
Map<String, String> inAppendMap,
Map<String, String> inAttributesMap,
boolean blockOriginalReader) {
- if (inElementsMap != null || inAppendMap != null || inDropElements != null
+ if (inElementsMap != null || inAppendMap != null || inDropElements != null
|| inAttributesMap != null) {
reader = new InTransformReader(createNewReaderIfNeeded(reader, is),
- inElementsMap, inAppendMap, inDropElements,
+ inElementsMap, inAppendMap, inDropElements,
inAttributesMap, blockOriginalReader);
}
return reader;
}
-
+
protected static void convertToQNamesMap(Map<String, String> map,
QNamesMap elementsMap,
Map<String, String> nsMap) {
@@ -123,7 +123,7 @@ public final class TransformUtils {
}
}
}
-
+
static void convertToMapOfElementProperties(Map<String, String> map,
Map<QName, ElementProperty> elementsMap) {
if (map != null) {
@@ -132,7 +132,7 @@ public final class TransformUtils {
String value = entry.getValue();
String text = null;
boolean child = false;
-
+
// if the content delimiter is present in the value, extract the content
int d = value.indexOf('}');
d = value.indexOf('=', d < 0 ? 0 : d);
@@ -140,7 +140,7 @@ public final class TransformUtils {
text = value.substring(d + 1);
value = value.substring(0, d);
}
-
+
// if the trailer delimiter is present in the key, remove it
if (key.endsWith("/")) {
key = key.substring(0, key.length() - 1);
@@ -148,13 +148,13 @@ public final class TransformUtils {
}
QName lname = DOMUtils.convertStringToQName(key);
QName rname = DOMUtils.convertStringToQName(value);
-
- ElementProperty desc = new ElementProperty(rname, text, child);
+
+ ElementProperty desc = new ElementProperty(rname, text, child);
elementsMap.put(lname, desc);
}
}
}
-
+
protected static void convertToSetOfQNames(List<String> set,
Set<QName> elementsSet) {
if (set != null) {
@@ -164,7 +164,7 @@ public final class TransformUtils {
}
}
}
-
+
static boolean isEmptyQName(QName qname) {
return XMLConstants.NULL_NS_URI.equals(qname.getNamespaceURI()) && "".equals(qname.getLocalPart());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java b/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
index cafe17c..b769396 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
@@ -30,7 +30,7 @@ public class EmbeddedSchema {
/**
* Create object to represent one of the schemas in a WSDL
- *
+ *
* @param systemId schema system Id.
* @param schemaElement Element for the schema.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
index 6cde540..40d996c 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
@@ -65,7 +65,7 @@ class Stax2ValidationUtils {
}
HAS_WOODSTOX = hasw;
}
-
+
Stax2ValidationUtils() {
if (!HAS_WOODSTOX) {
throw new RuntimeException("Could not load woodstox");
@@ -74,12 +74,12 @@ class Stax2ValidationUtils {
/**
* {@inheritDoc}
- *
+ *
* @throws XMLStreamException
*/
- public boolean setupValidation(XMLStreamReader reader, Endpoint endpoint, ServiceInfo serviceInfo)
+ public boolean setupValidation(XMLStreamReader reader, Endpoint endpoint, ServiceInfo serviceInfo)
throws XMLStreamException {
-
+
// Gosh, this is bad, but I don't know a better solution, unless we're willing
// to require the stax2 API no matter what.
XMLStreamReader effectiveReader = reader;
@@ -102,9 +102,9 @@ class Stax2ValidationUtils {
return true;
}
- public boolean setupValidation(XMLStreamWriter writer, Endpoint endpoint, ServiceInfo serviceInfo)
+ public boolean setupValidation(XMLStreamWriter writer, Endpoint endpoint, ServiceInfo serviceInfo)
throws XMLStreamException {
-
+
XMLStreamWriter2 writer2 = (XMLStreamWriter2)writer;
XMLValidationSchema vs = getValidator(endpoint, serviceInfo);
if (vs == null) {
@@ -122,7 +122,7 @@ class Stax2ValidationUtils {
/**
* Create woodstox validator for a schema set.
- *
+ *
* @param schemas
* @return
* @throws XMLStreamException
@@ -135,24 +135,24 @@ class Stax2ValidationUtils {
return null;
}
Map<String, EmbeddedSchema> sources = new TreeMap<String, EmbeddedSchema>();
-
+
for (SchemaInfo schemaInfo : serviceInfo.getSchemas()) {
XmlSchema sch = schemaInfo.getSchema();
String uri = sch.getTargetNamespace();
if (XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(uri)) {
continue;
}
-
+
Element serialized = schemaInfo.getElement();
String schemaSystemId = sch.getSourceURI();
if (null == schemaSystemId) {
schemaSystemId = sch.getTargetNamespace();
}
-
+
EmbeddedSchema embeddedSchema = new EmbeddedSchema(schemaSystemId, serialized);
sources.put(sch.getTargetNamespace(), embeddedSchema);
}
-
+
W3CMultiSchemaFactory factory = new W3CMultiSchemaFactory();
// I don't think that we need the baseURI.
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
index 7ccea58..03db30b 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
@@ -35,7 +35,7 @@ import org.apache.cxf.phase.Phase;
public class StaxSchemaValidationInInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getL7dLogger(StaxSchemaValidationInInterceptor.class);
-
+
public StaxSchemaValidationInInterceptor() {
super(Phase.PRE_UNMARSHAL);
}
@@ -46,11 +46,11 @@ public class StaxSchemaValidationInInterceptor extends AbstractPhaseInterceptor<
try {
setSchemaInMessage(message, xmlReader);
} catch (XMLStreamException e) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),
+ throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),
e);
}
}
-
+
private void setSchemaInMessage(Message message, XMLStreamReader reader) throws XMLStreamException {
if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message)) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
index 82a6096..1865d91 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
@@ -35,7 +35,7 @@ import org.apache.cxf.phase.Phase;
public class StaxSchemaValidationOutInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getL7dLogger(StaxSchemaValidationOutInterceptor.class);
-
+
public StaxSchemaValidationOutInterceptor() {
super(Phase.PRE_MARSHAL);
}
@@ -46,11 +46,11 @@ public class StaxSchemaValidationOutInterceptor extends AbstractPhaseInterceptor
try {
setSchemaInMessage(message, writer);
} catch (XMLStreamException e) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),
+ throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),
e);
}
}
-
+
private void setSchemaInMessage(Message message, XMLStreamWriter writer) throws XMLStreamException {
if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, message)) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java b/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
index 7e981f9..f616890 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
@@ -17,7 +17,7 @@
* under the License.
*/
/*
- * Code in this file derives from source code in Woodstox which
+ * Code in this file derives from source code in Woodstox which
* carries a ASL 2.0 license.
*/
@@ -49,18 +49,18 @@ import com.sun.msv.reader.xmlschema.XMLSchemaReader;
import org.codehaus.stax2.validation.XMLValidationSchema;
/**
- *
+ *
*/
public class W3CMultiSchemaFactory extends BaseSchemaFactory {
-
- private MultiSchemaReader multiSchemaReader;
+
+ private MultiSchemaReader multiSchemaReader;
private SAXParserFactory parserFactory;
private RecursiveAllowedXMLSchemaReader xmlSchemaReader;
public W3CMultiSchemaFactory() {
super(XMLValidationSchema.SCHEMA_ID_W3C_SCHEMA);
}
-
+
static class RecursiveAllowedXMLSchemaReader extends XMLSchemaReader {
Set<String> sysIds = new TreeSet<String>();
RecursiveAllowedXMLSchemaReader(GrammarReaderController controller,
@@ -75,7 +75,7 @@ public class W3CMultiSchemaFactory extends BaseSchemaFactory {
r.currentSchema = old;
}
protected void onTargetNamespaceResolved(String targetNs, boolean ignoreContents) {
-
+
RecursiveAllowedXMLSchemaReader r = (RecursiveAllowedXMLSchemaReader)reader;
// sets new XMLSchemaGrammar object.
old = r.currentSchema;
@@ -88,10 +88,10 @@ public class W3CMultiSchemaFactory extends BaseSchemaFactory {
}
}
};
- }
+ }
}, new ExpressionPool());
}
-
+
public void setLocator(Locator locator) {
if (locator == null && getLocator() != null && getLocator().getSystemId() != null) {
sysIds.add(getLocator().getSystemId());
@@ -105,13 +105,13 @@ public class W3CMultiSchemaFactory extends BaseSchemaFactory {
}
super.switchSource(source, newState);
}
-
+
}
-
- public XMLValidationSchema loadSchemas(String baseURI,
+
+ public XMLValidationSchema loadSchemas(String baseURI,
Map<String, EmbeddedSchema> sources) throws XMLStreamException {
parserFactory = getSaxFactory();
-
+
ResolvingGrammarReaderController ctrl = new ResolvingGrammarReaderController(baseURI, sources);
xmlSchemaReader = new RecursiveAllowedXMLSchemaReader(ctrl, parserFactory);
multiSchemaReader = new MultiSchemaReader(xmlSchemaReader);
@@ -120,12 +120,12 @@ public class W3CMultiSchemaFactory extends BaseSchemaFactory {
domSource.setSystemId(source.getSystemId());
multiSchemaReader.parse(domSource);
}
-
+
XMLSchemaGrammar grammar = multiSchemaReader.getResult();
if (grammar == null) {
throw new XMLStreamException("Failed to load schemas");
}
- return new W3CSchema(grammar);
+ return new W3CSchema(grammar);
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java b/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
index d948cdd..588c391 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
@@ -31,14 +31,14 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.service.model.ServiceInfo;
/**
- *
+ *
*/
public class WoodstoxValidationImpl {
private static final Logger LOG = LogUtils.getL7dLogger(WoodstoxValidationImpl.class);
-
+
private Stax2ValidationUtils utils;
-
+
public WoodstoxValidationImpl() {
try {
utils = new Stax2ValidationUtils();
@@ -60,7 +60,7 @@ public class WoodstoxValidationImpl {
}
}
- public void setupValidation(XMLStreamWriter writer,
+ public void setupValidation(XMLStreamWriter writer,
Endpoint endpoint,
ServiceInfo serviceInfo) throws XMLStreamException {
if (utils != null && writer != null && !utils.setupValidation(writer, endpoint, serviceInfo)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java b/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
index 5ff3bd4..44319fd 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractConduit.java
@@ -31,7 +31,7 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* allowing non-decoupled transports to be written without any
* regard for the decoupled back-channel or partial response logic.
*/
-public abstract class AbstractConduit
+public abstract class AbstractConduit
extends AbstractObservable implements Conduit {
protected final EndpointReferenceType target;
@@ -42,14 +42,14 @@ public abstract class AbstractConduit
/**
* @return the reference associated with the target Destination
- */
+ */
public EndpointReferenceType getTarget() {
return target;
}
/**
* @param msg for which content should be closed.
- */
+ */
public void close(Message msg) throws IOException {
OutputStream os = msg.getContent(OutputStream.class);
if (os != null) {
@@ -60,14 +60,14 @@ public abstract class AbstractConduit
in.close();
}
}
-
+
/**
* Close the conduit.
*/
public void close() {
// nothing to do by default
}
-
+
public String toString() {
return "conduit: " + this.getClass() + System.identityHashCode(this)
+ "target: "
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java b/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
index a308f07..91abb63 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractDestination.java
@@ -29,22 +29,22 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
/**
- * Abstract base class factoring out common Destination logic,
+ * Abstract base class factoring out common Destination logic,
* allowing non-decoupled transports to be written without any
* regard for the decoupled back-channel or partial response logic.
*/
public abstract class AbstractDestination
extends AbstractObservable implements Destination, DestinationWithEndpoint {
-
+
protected final EndpointReferenceType reference;
protected final EndpointInfo endpointInfo;
protected final Bus bus;
-
+
public AbstractDestination(EndpointReferenceType ref,
EndpointInfo ei) {
this(null, ref, ei);
}
-
+
public AbstractDestination(Bus b,
EndpointReferenceType ref,
EndpointInfo ei) {
@@ -52,10 +52,10 @@ public abstract class AbstractDestination
endpointInfo = ei;
bus = b;
}
-
+
/**
* @return the reference associated with this Destination
- */
+ */
public EndpointReferenceType getAddress() {
return reference;
}
@@ -65,17 +65,17 @@ public abstract class AbstractDestination
* with the current Message and associated Destination. For example
* compatible Quality of Protection must be asserted on the back-channel.
* This would generally only be an issue if the back-channel is decoupled.
- *
- * @param inMessage the current inbound message (null to indicate a
+ *
+ * @param inMessage the current inbound message (null to indicate a
* disassociated back-channel)
* @return a suitable Conduit
*/
public Conduit getBackChannel(Message inMessage)
throws IOException {
-
+
return getInbuiltBackChannel(inMessage);
}
-
+
/**
* Shutdown the Destination, i.e. stop accepting incoming messages.
*/
@@ -88,7 +88,7 @@ public abstract class AbstractDestination
* @return the inbuilt backchannel
*/
protected abstract Conduit getInbuiltBackChannel(Message inMessage);
-
+
/**
* Backchannel conduit.
*/
@@ -100,13 +100,13 @@ public abstract class AbstractDestination
/**
* Register a message observer for incoming messages.
- *
+ *
* @param observer the observer to notify on receipt of incoming
*/
public void setMessageObserver(MessageObserver observer) {
// shouldn't be called for a back channel conduit
}
-
+
protected Logger getLogger() {
return AbstractDestination.this.getLogger();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
index ecc690b..4974f81 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractMultiplexDestination.java
@@ -42,26 +42,26 @@ public abstract class AbstractMultiplexDestination extends AbstractDestination i
}
/**
- * Builds an new endpoint reference using the current target reference as a template.
+ * Builds an new endpoint reference using the current target reference as a template.
* The supplied id is endcoded using a reference parameter.
* This requires the ws-a interceptors to propagate the reference parameters
* on subsequent invokes using the returned reference.
* @param id the id to encode in the new reference
* @return the new reference with the id encoded as a reference parameter
* @see org.apache.cxf.transport.MultiplexDestination#getAddressWithId(java.lang.String)
-
+
*/
public EndpointReferenceType getAddressWithId(String id) {
EndpointReferenceType epr = EndpointReferenceUtils.duplicate(
EndpointReferenceUtils.mint(reference, bus));
ReferenceParametersType newParams = new org.apache.cxf.ws.addressing.ObjectFactory()
.createReferenceParametersType();
-
+
ReferenceParametersType existingParams = epr.getReferenceParameters();
if (null != existingParams) {
newParams.getAny().addAll(existingParams.getAny());
}
-
+
newParams.getAny().add(new JAXBElement<String>(MULTIPLEX_ID_QNAME, String.class, id));
epr.setReferenceParameters(newParams);
return epr;
@@ -69,7 +69,7 @@ public abstract class AbstractMultiplexDestination extends AbstractDestination i
/**
* Obtain id from reference parameters of the ws-a to address
- * Requires the existance of ws-a interceptors on dispatch path to provide access
+ * Requires the existance of ws-a interceptors on dispatch path to provide access
* to the ws-a headers
* @param contextMap the current invocation or message context
* @return the id from the reference parameters of the ws-a-to address or null if not found
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java b/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
index 35a2f16..75eaa1d 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractObservable.java
@@ -34,7 +34,7 @@ public abstract class AbstractObservable implements Observable {
/**
* Register a message observer for incoming messages.
- *
+ *
* @param observer the observer to notify on receipt of incoming
* message
*/
@@ -68,7 +68,7 @@ public abstract class AbstractObservable implements Observable {
}
}
}
-
+
/**
* @return the observer to notify on receipt of incoming message
*/
@@ -78,17 +78,17 @@ public abstract class AbstractObservable implements Observable {
/**
* Get the target reference .
- *
+ *
* @param ei the corresponding EndpointInfo
* @return the actual target
*/
protected static EndpointReferenceType getTargetReference(EndpointInfo ei, Bus bus) {
return getTargetReference(ei, null, bus);
}
-
+
/**
* Get the target endpoint reference.
- *
+ *
* @param ei the corresponding EndpointInfo
* @param t the given target EPR if available
* @param bus the Bus
@@ -104,8 +104,8 @@ public abstract class AbstractObservable implements Observable {
address.setValue(ei.getAddress());
ref.setAddress(address);
if (ei.getService() != null) {
- EndpointReferenceUtils.setServiceAndPortName(ref,
- ei.getService().getName(),
+ EndpointReferenceUtils.setServiceAndPortName(ref,
+ ei.getService().getName(),
ei.getName().getLocalPart());
}
} else {
@@ -113,7 +113,7 @@ public abstract class AbstractObservable implements Observable {
}
return ref;
}
-
+
/**
* Activate messages flow.
*/
@@ -125,9 +125,9 @@ public abstract class AbstractObservable implements Observable {
* Deactivate messages flow.
*/
protected void deactivate() {
- // nothing to do by default
+ // nothing to do by default
}
-
+
/**
* @return the logger to use
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java b/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
index 8d57f68..984b47d 100644
--- a/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
+++ b/core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java
@@ -29,13 +29,13 @@ import org.apache.cxf.helpers.CastUtils;
*/
public abstract class AbstractTransportFactory {
private List<String> transportIds;
-
+
public AbstractTransportFactory() {
}
public AbstractTransportFactory(List<String> ids) {
transportIds = ids;
}
-
+
public final List<String> getTransportIds() {
return transportIds;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Assertor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Assertor.java b/core/src/main/java/org/apache/cxf/transport/Assertor.java
index 3ec915b..3e2869c 100644
--- a/core/src/main/java/org/apache/cxf/transport/Assertor.java
+++ b/core/src/main/java/org/apache/cxf/transport/Assertor.java
@@ -28,8 +28,8 @@ import org.apache.cxf.message.Message;
* assert its capabilities for the underlying message.
*/
public interface Assertor {
-
+
void assertMessage(Message message);
-
+
boolean canAssert(QName type);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java b/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
index 74a2af1..fd6c34f 100644
--- a/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
+++ b/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java
@@ -48,7 +48,7 @@ public class ChainInitiationObserver implements MessageObserver {
protected Endpoint endpoint;
protected Bus bus;
protected ClassLoader loader;
-
+
private PhaseChainCache chainCache = new PhaseChainCache();
public ChainInitiationObserver(Endpoint endpoint, Bus bus) {
@@ -68,19 +68,19 @@ public class ChainInitiationObserver implements MessageObserver {
origLoader = ClassLoaderUtils.setThreadContextClassloader(loader);
}
InterceptorChain phaseChain = null;
-
+
if (m.getInterceptorChain() != null) {
phaseChain = m.getInterceptorChain();
// To make sure the phase chain is run by one thread once
synchronized (phaseChain) {
- if (phaseChain.getState() == InterceptorChain.State.PAUSED
+ if (phaseChain.getState() == InterceptorChain.State.PAUSED
|| phaseChain.getState() == InterceptorChain.State.SUSPENDED) {
phaseChain.resume();
return;
}
}
}
-
+
Message message = getBinding().createMessage(m);
Exchange exchange = message.getExchange();
if (exchange == null) {
@@ -89,7 +89,7 @@ public class ChainInitiationObserver implements MessageObserver {
}
exchange.setInMessage(message);
setExchangeProperties(exchange, message);
-
+
InterceptorProvider dbp = null;
if (endpoint.getService().getDataBinding() instanceof InterceptorProvider) {
dbp = (InterceptorProvider)endpoint.getService().getDataBinding();
@@ -109,17 +109,17 @@ public class ChainInitiationObserver implements MessageObserver {
getBinding().getInInterceptors(),
dbp.getInInterceptors());
}
-
-
-
+
+
+
message.setInterceptorChain(phaseChain);
-
+
phaseChain.setFaultObserver(endpoint.getOutFaultObserver());
-
+
addToChain(phaseChain, message);
-
+
phaseChain.doIntercept(message);
-
+
} finally {
if (origBus != bus) {
BusFactory.setThreadDefaultBus(origBus);
@@ -130,14 +130,14 @@ public class ChainInitiationObserver implements MessageObserver {
}
}
private void addToChain(InterceptorChain 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.getInInterceptors());
}
}
- Collection<Interceptor<? extends Message>> is
+ Collection<Interceptor<? extends Message>> is
= CastUtils.cast((Collection<?>)m.get(Message.IN_INTERCEPTORS));
if (is != null) {
chain.add(is);
@@ -150,7 +150,7 @@ public class ChainInitiationObserver implements MessageObserver {
protected Binding getBinding() {
return endpoint.getBinding();
}
-
+
protected void setExchangeProperties(Exchange exchange, Message m) {
exchange.put(Endpoint.class, endpoint);
exchange.put(Binding.class, getBinding());
@@ -193,5 +193,5 @@ public class ChainInitiationObserver implements MessageObserver {
public Endpoint getEndpoint() {
return endpoint;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Conduit.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Conduit.java b/core/src/main/java/org/apache/cxf/transport/Conduit.java
index 51e8b9b..49c682f 100644
--- a/core/src/main/java/org/apache/cxf/transport/Conduit.java
+++ b/core/src/main/java/org/apache/cxf/transport/Conduit.java
@@ -34,10 +34,10 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* are received. Alternatively the back-channel destination may be decoupled,
* in which case the response it is received via a separate Conduit.
* The crucial distinction is whether the Conduit can itself correlate
- * the response (which may be synchronous, or may be delivered via
- * a dedicated destination).
+ * the response (which may be synchronous, or may be delivered via
+ * a dedicated destination).
* <p>
- * Conduits may be used for multiple messages, either serially or
+ * Conduits may be used for multiple messages, either serially or
* concurrently, with the implementation taking care of mapping onto
* multiple transport resources (e.g. connections) if neccessary to
* support concurrency.
@@ -45,25 +45,25 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* Binding-level MEPs may be realized over one or more Conduits.
*/
public interface Conduit extends Observable {
-
+
/**
* Prepare the message for sending. This will typically involve setting
* an OutputStream on the message, but it may do nothing at all.
- *
+ *
* @param message the message to be sent.
*/
void prepare(Message message) throws IOException;
-
+
/**
* Close the connections associated with the message
*/
void close(Message message) throws IOException;
-
+
/**
* @return the reference associated with the target Destination
- */
+ */
EndpointReferenceType getTarget();
-
+
/**
* Close the conduit
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java b/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
index 20f37b0..8bd13c3 100644
--- a/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
+++ b/core/src/main/java/org/apache/cxf/transport/ConduitInitiator.java
@@ -33,8 +33,8 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
public interface ConduitInitiator {
/**
* Initiate an outbound Conduit.
- *
- * @param targetInfo the endpoint info of the target
+ *
+ * @param targetInfo the endpoint info of the target
* @return a suitable new or pre-existing Conduit
*/
Conduit getConduit(EndpointInfo targetInfo,
@@ -42,7 +42,7 @@ public interface ConduitInitiator {
/**
* Initiate an outbound Conduit.
- *
+ *
* @param localInfo the endpoint info for a local endpoint on which the
* the configuration should be based
* @param target the target EPR
@@ -51,7 +51,7 @@ public interface ConduitInitiator {
Conduit getConduit(EndpointInfo localInfo,
EndpointReferenceType target,
Bus bus) throws IOException;
-
+
Set<String> getUriPrefixes();
List<String> getTransportIds();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java b/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
index 8762000..eecb4e8 100644
--- a/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
+++ b/core/src/main/java/org/apache/cxf/transport/ConduitInitiatorManager.java
@@ -42,16 +42,16 @@ public interface ConduitInitiatorManager {
* <code>ConduitInitiator</code>.
*/
void deregisterConduitInitiator(String name);
-
+
/**
- * Returns the <code>ConduitInitiator</code> registered with the specified name,
+ * Returns the <code>ConduitInitiator</code> registered with the specified name,
* loading the appropriate plugin if necessary.
- *
+ *
* @param name
* @return the registered <code>ConduitInitiator</code>
* @throws BusException
*/
ConduitInitiator getConduitInitiator(String name) throws BusException;
-
+
ConduitInitiator getConduitInitiatorForUri(String uri);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Destination.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Destination.java b/core/src/main/java/org/apache/cxf/transport/Destination.java
index 148e22b..205c391 100644
--- a/core/src/main/java/org/apache/cxf/transport/Destination.java
+++ b/core/src/main/java/org/apache/cxf/transport/Destination.java
@@ -29,17 +29,17 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* unsolicited incoming messages from different peers.
*/
public interface Destination extends Observable {
-
+
/**
* @return the reference associated with this Destination
- */
+ */
EndpointReferenceType getAddress();
-
+
/**
* Retreive a back-channel Conduit, which must be policy-compatible
* with the current Message and associated Destination. For example
* compatible Quality of Protection must be asserted on the back-channel.
- *
+ *
* @param inMessage the current message
* @return a suitable Conduit
*/
@@ -50,6 +50,6 @@ public interface Destination extends Observable {
* Shutdown the Destination, i.e. stop accepting incoming messages.
*/
void shutdown();
-
+
MessageObserver getMessageObserver();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java b/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java
index d35d7e0..cbe00b0 100644
--- a/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java
+++ b/core/src/main/java/org/apache/cxf/transport/DestinationFactory.java
@@ -30,16 +30,16 @@ import org.apache.cxf.service.model.EndpointInfo;
* Factory for Destinations.
*/
public interface DestinationFactory {
-
+
/**
* Create a destination.
- *
+ *
* @param ei the endpoint info of the destination.
* @return the created Destination.
*/
Destination getDestination(EndpointInfo ei, Bus bus) throws IOException;
-
+
Set<String> getUriPrefixes();
-
+
List<String> getTransportIds();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java b/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java
index 9232d30..41c69f4 100644
--- a/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java
+++ b/core/src/main/java/org/apache/cxf/transport/DestinationFactoryManager.java
@@ -42,11 +42,11 @@ public interface DestinationFactoryManager {
* <code>DestinationFactory</code>.
*/
void deregisterDestinationFactory(String name);
-
+
/**
- * Returns the <code>DestinationFactory</code> registered with the specified name,
+ * Returns the <code>DestinationFactory</code> registered with the specified name,
* loading the appropriate plugin if necessary.
- *
+ *
* @param name
* @return the registered <code>DestinationFactory</code>
* @throws BusException
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java b/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
index 86940d6..f5c3822 100644
--- a/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
+++ b/core/src/main/java/org/apache/cxf/transport/HttpUriMapper.java
@@ -20,20 +20,20 @@
package org.apache.cxf.transport;
public final class HttpUriMapper {
-
+
private HttpUriMapper() {
// Util class doesn't need public constructor
}
-
+
public static String getContextName(String path) {
- String contextName = "";
+ String contextName = "";
int idx = path.lastIndexOf('/');
if (idx >= 0) {
- contextName = path.substring(0, idx);
+ contextName = path.substring(0, idx);
}
return contextName;
}
-
+
public static String getResourceBase(String path) {
String servletMap = "";
int idx = path.lastIndexOf('/');
@@ -42,7 +42,7 @@ public final class HttpUriMapper {
}
if ("".equals(servletMap) || "".equals(path)) {
servletMap = "/";
- }
+ }
return servletMap;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/MessageObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/MessageObserver.java b/core/src/main/java/org/apache/cxf/transport/MessageObserver.java
index 7770946..5ceaa30 100644
--- a/core/src/main/java/org/apache/cxf/transport/MessageObserver.java
+++ b/core/src/main/java/org/apache/cxf/transport/MessageObserver.java
@@ -29,7 +29,7 @@ public interface MessageObserver {
/**
* Called for an incoming message, i.e. where the content format(s)
* is/are source(s).
- *
+ *
* @param message
*/
void onMessage(Message message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java b/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
index b539884..30d41834 100644
--- a/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
+++ b/core/src/main/java/org/apache/cxf/transport/MultipleEndpointObserver.java
@@ -43,9 +43,9 @@ import org.apache.cxf.phase.PhaseManager;
*
*/
public class MultipleEndpointObserver implements MessageObserver {
-
+
public static final String ENDPOINTS = "multipleEndpointObserver.endpoints";
-
+
protected Bus bus;
protected List<Interceptor<? extends Message>> bindingInterceptors
= new CopyOnWriteArrayList<Interceptor<? extends Message>>();
@@ -53,7 +53,7 @@ public class MultipleEndpointObserver implements MessageObserver {
= new CopyOnWriteArrayList<Interceptor<? extends Message>>();
private Set<Endpoint> endpoints = new CopyOnWriteArraySet<Endpoint>();
private ClassLoader loader;
-
+
public MultipleEndpointObserver(Bus bus) {
super();
this.bus = bus;
@@ -74,15 +74,15 @@ public class MultipleEndpointObserver implements MessageObserver {
message.setExchange(exchange);
}
message = createMessage(message);
- message.setExchange(exchange);
+ message.setExchange(exchange);
exchange.setInMessage(message);
setExchangeProperties(exchange, message);
-
+
// setup chain
PhaseInterceptorChain chain = createChain();
-
+
message.setInterceptorChain(chain);
-
+
chain.add(bus.getInInterceptors());
if (bindingInterceptors != null) {
chain.add(bindingInterceptors);
@@ -90,11 +90,11 @@ public class MultipleEndpointObserver implements MessageObserver {
if (routingInterceptors != null) {
chain.add(routingInterceptors);
}
-
+
if (endpoints != null) {
exchange.put(ENDPOINTS, endpoints);
}
-
+
chain.doIntercept(message);
} finally {
if (origBus != bus) {
@@ -118,7 +118,7 @@ public class MultipleEndpointObserver implements MessageObserver {
.getInPhases());
return chain;
}
-
+
protected void setExchangeProperties(Exchange exchange, Message m) {
exchange.put(Bus.class, bus);
if (exchange.getDestination() == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java b/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
index 2f91f21..e34bade 100644
--- a/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
+++ b/core/src/main/java/org/apache/cxf/transport/MultiplexDestination.java
@@ -25,24 +25,24 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
/**
* A MultiplexDestination is a transport-level endpoint capable of receiving
- * unsolicited incoming messages from different peers for multiple targets
+ * unsolicited incoming messages from different peers for multiple targets
* identified by a unique id.
* The disambiguation of targets is handled by higher layers as the target
* address is made available as a context property or as a WS-A-To header
*/
public interface MultiplexDestination extends Destination {
-
+
/**
- * @return the a reference containing the id that is
+ * @return the a reference containing the id that is
* associated with this Destination
*/
EndpointReferenceType getAddressWithId(String id);
-
+
/**
- * @param contextMap for this invocation. Obtained for example from
+ * @param contextMap for this invocation. Obtained for example from
* JAX-WS WebServiceContext.getMessageContext(). The context will
- * either contain the WS-A To content and/or some property that
+ * either contain the WS-A To content and/or some property that
* identifies the target address, eg MessageContext.PATH_INFO for
* the current invocation
* @return the id associated with the current invocation
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Observable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Observable.java b/core/src/main/java/org/apache/cxf/transport/Observable.java
index ab7a748..435f484 100644
--- a/core/src/main/java/org/apache/cxf/transport/Observable.java
+++ b/core/src/main/java/org/apache/cxf/transport/Observable.java
@@ -25,12 +25,12 @@ package org.apache.cxf.transport;
public interface Observable {
/**
* Register a message observer for incoming messages.
- *
+ *
* @param observer the observer to notify on receipt of incoming
*/
void setMessageObserver(MessageObserver observer);
-
-
+
+
/**
* Retrieves the message observer for incoming messages
* @return the MessageObserver for incoming messages
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/Session.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/Session.java b/core/src/main/java/org/apache/cxf/transport/Session.java
index 19ab868..3c7a2f8 100644
--- a/core/src/main/java/org/apache/cxf/transport/Session.java
+++ b/core/src/main/java/org/apache/cxf/transport/Session.java
@@ -25,7 +25,7 @@ package org.apache.cxf.transport;
public interface Session {
/**
* Get a variable from the session by the key.
- *
+ *
* @param key
* @return Value
*/
@@ -33,7 +33,7 @@ public interface Session {
/**
* Put a variable into the session with a key.
- *
+ *
* @param key
* @param value
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/transport/TransportFinder.java b/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
index d5df81e..a6ff31f 100644
--- a/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
+++ b/core/src/main/java/org/apache/cxf/transport/TransportFinder.java
@@ -30,14 +30,14 @@ import org.apache.cxf.configuration.ConfiguredBeanLocator;
import org.apache.cxf.helpers.CastUtils;
/**
- *
+ *
*/
public class TransportFinder<T> {
Map<String, T> map;
Set<String> loaded;
Class<T> cls;
ConfiguredBeanLocator locator;
-
+
public TransportFinder(Bus b,
Map<String, T> m,
Set<String> l,
@@ -47,7 +47,7 @@ public class TransportFinder<T> {
locator = b.getExtension(ConfiguredBeanLocator.class);
loaded = l;
}
-
+
public T findTransportForNamespace(final String namespace) {
if (locator == null) {
return null;
@@ -65,7 +65,7 @@ public class TransportFinder<T> {
}
return factory;
}
-
+
public T findTransportForURI(String uri) {
if (locator == null) {
@@ -79,7 +79,7 @@ public class TransportFinder<T> {
if (factory == null) {
//didn't find, now well need to search
factory = loadDefaultURIs(uri);
-
+
if (factory == null) {
loadAll();
factory = checkForURI(uri);
@@ -87,7 +87,7 @@ public class TransportFinder<T> {
}
return factory;
}
-
+
private static Set<String> getPrefixes(Object t) {
Set<String> prefixes = null;
if (t instanceof AbstractTransportFactory) {
@@ -95,10 +95,10 @@ public class TransportFinder<T> {
prefixes = atf.getUriPrefixes();
} else if (t instanceof DestinationFactory) {
DestinationFactory atf = (DestinationFactory)t;
- prefixes = atf.getUriPrefixes();
+ prefixes = atf.getUriPrefixes();
} else if (t instanceof ConduitInitiator) {
ConduitInitiator atf = (ConduitInitiator)t;
- prefixes = atf.getUriPrefixes();
+ prefixes = atf.getUriPrefixes();
}
return prefixes;
}
@@ -122,9 +122,9 @@ public class TransportFinder<T> {
}
return null;
}
-
+
private void loadAll() {
- ConfiguredBeanLocator.BeanLoaderListener<T> listener
+ ConfiguredBeanLocator.BeanLoaderListener<T> listener
= new ConfiguredBeanLocator.BeanLoaderListener<T>() {
public boolean beanLoaded(String name, T bean) {
loaded.add(name);
@@ -139,9 +139,9 @@ public class TransportFinder<T> {
}
private void registerBean(T bean) {
- if (bean instanceof AbstractTransportFactory) {
+ if (bean instanceof AbstractTransportFactory) {
if (((AbstractTransportFactory)bean).getTransportIds() != null) {
- for (String ns
+ for (String ns
: ((AbstractTransportFactory)bean).getTransportIds()) {
if (!map.containsKey(ns)) {
map.put(ns, bean);
@@ -163,16 +163,16 @@ public class TransportFinder<T> {
}
}
-
+
private T loadActivationNamespaces(final String namespace) {
- //Try old method of having activationNamespaces configured in.
- ConfiguredBeanLocator.BeanLoaderListener<T> listener
+ //Try old method of having activationNamespaces configured in.
+ ConfiguredBeanLocator.BeanLoaderListener<T> listener
= new ConfiguredBeanLocator.BeanLoaderListener<T>() {
public boolean beanLoaded(String name, T bean) {
loaded.add(name);
if (!map.containsKey(namespace)) {
registerBean(bean);
- }
+ }
return map.containsKey(namespace);
}
@@ -185,14 +185,14 @@ public class TransportFinder<T> {
locator.loadBeansOfType(cls, listener);
return map.get(namespace);
}
-
-
+
+
private T loadDefaultURIs(final String uri) {
//First attempt will be to examine the factory class
//for a DEFAULT_URIS field and use it
- URIBeanLoaderListener listener
+ URIBeanLoaderListener listener
= new URIBeanLoaderListener(uri) {
public boolean loadBean(String name, Class<? extends T> type) {
@@ -208,19 +208,19 @@ public class TransportFinder<T> {
}
return false;
}
- };
+ };
locator.loadBeansOfType(cls, listener);
return listener.getFactory();
}
-
+
abstract class URIBeanLoaderListener implements ConfiguredBeanLocator.BeanLoaderListener<T> {
T factory;
String uri;
-
+
URIBeanLoaderListener(String u) {
uri = u;
}
-
+
public T getFactory() {
return factory;
}
@@ -232,13 +232,13 @@ public class TransportFinder<T> {
}
return false;
}
-
+
}
-
+
private T loadDefaultNamespace(final String namespace) {
//First attempt will be to examine the factory class
//for a DEFAULT_NAMESPACES field and use it
- ConfiguredBeanLocator.BeanLoaderListener<T> listener
+ ConfiguredBeanLocator.BeanLoaderListener<T> listener
= new ConfiguredBeanLocator.BeanLoaderListener<T>() {
public boolean beanLoaded(String name, T bean) {
loaded.add(name);
@@ -262,16 +262,16 @@ public class TransportFinder<T> {
}
return false;
}
- };
+ };
locator.loadBeansOfType(cls, listener);
-
+
return map.get(namespace);
}
private T loadNoDefaultNamespace(final String namespace) {
//Second attempt will be to examine the factory class
- //for a DEFAULT_NAMESPACES field and if it doesn't exist, try
+ //for a DEFAULT_NAMESPACES field and if it doesn't exist, try
//loading. This will then load most of the "older" things
- ConfiguredBeanLocator.BeanLoaderListener<T> listener
+ ConfiguredBeanLocator.BeanLoaderListener<T> listener
= new ConfiguredBeanLocator.BeanLoaderListener<T>() {
public boolean beanLoaded(String name, T bean) {
loaded.add(name);
@@ -291,9 +291,9 @@ public class TransportFinder<T> {
}
return true;
}
- };
+ };
locator.loadBeansOfType(cls, listener);
-
+
return map.get(namespace);
}
[18/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
index 3fb3323..4190702 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java
@@ -44,7 +44,7 @@ import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
/**
- *
+ *
*/
@Command(scope = "cxf", name = "list-endpoints",
description = "Lists all CXF Endpoints on a Bus.")
@@ -52,13 +52,13 @@ import org.osgi.service.cm.ConfigurationAdmin;
public class ListEndpointsCommand extends CXFController implements Action {
protected static final String HEADER_FORMAT = "%-25s %-10s %-60s %-40s";
protected static final String OUTPUT_FORMAT = "[%-23s] [%-8s] [%-58s] [%-38s]";
-
+
@Argument(index = 0, name = "bus",
- description = "The CXF bus name where to look for the Endpoints",
+ description = "The CXF bus name where to look for the Endpoints",
required = false, multiValued = false)
@Completion(BusCompleter.class)
String name;
-
+
@Option(name = "-f", aliases = {"--fulladdress" },
description = "Display full address of an endpoint ", required = false, multiValued = false)
boolean fullAddress;
@@ -108,7 +108,7 @@ public class ListEndpointsCommand extends CXFController implements Action {
table.print(System.out, !noFormat);
return null;
}
-
+
private String toFullAddress(String address) throws IOException, InvalidSyntaxException {
ConfigurationAdmin configAdmin = getConfigAdmin();
if (address.startsWith("/") && configAdmin != null) {
@@ -129,7 +129,7 @@ public class ListEndpointsCommand extends CXFController implements Action {
return address;
}
- private String extractConfigProperty(ConfigurationAdmin configAdmin,
+ private String extractConfigProperty(ConfigurationAdmin configAdmin,
String pid, String propertyName) throws IOException,
InvalidSyntaxException {
String ret = null;
@@ -145,17 +145,17 @@ public class ListEndpointsCommand extends CXFController implements Action {
private String getCXFOSGiServletContext() throws InvalidSyntaxException {
String ret = null;
- String filter = "(&(" + "objectclass=" + "javax.servlet.Servlet"
+ String filter = "(&(" + "objectclass=" + "javax.servlet.Servlet"
+ ")(servlet-name=cxf-osgi-transport-servlet))";
ServiceReference ref = getBundleContext().getServiceReferences(null, filter)[0];
-
+
if (ref != null) {
ret = (String)ref.getProperty("alias");
- }
-
+ }
+
return ret;
-
+
}
private String getHttpOSGiServicePort() throws InvalidSyntaxException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java
index d2bf6be..2d60d9b 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java
@@ -34,21 +34,21 @@ import org.apache.karaf.shell.api.action.Completion;
import org.apache.karaf.shell.api.action.lifecycle.Service;
/**
- *
+ *
*/
@Command(scope = "cxf", name = "start-endpoint",
description = "Starts a CXF Endpoint on a Bus.")
@Service
public class StartEndpointCommand extends CXFController implements Action {
-
- @Argument(index = 0, name = "bus",
- description = "The CXF bus name where to look for the Endpoint",
+
+ @Argument(index = 0, name = "bus",
+ description = "The CXF bus name where to look for the Endpoint",
required = true, multiValued = false)
@Completion(BusCompleter.class)
String busName;
-
+
@Argument(index = 1, name = "endpoint",
- description = "The Endpoint name to start",
+ description = "The Endpoint name to start",
required = true, multiValued = false)
@Completion(StoppedEndpointCompleter.class)
String endpoint;
@@ -64,5 +64,5 @@ public class StartEndpointCommand extends CXFController implements Action {
}
}
return null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java
index 9ffdbf9..cbd56a8 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java
@@ -34,21 +34,21 @@ import org.apache.karaf.shell.api.action.Completion;
import org.apache.karaf.shell.api.action.lifecycle.Service;
/**
- *
+ *
*/
@Command(scope = "cxf", name = "stop-endpoint",
description = "Stops a CXF Endpoint on a Bus.")
@Service
public class StopEndpointCommand extends CXFController implements Action {
-
+
@Argument(index = 0, name = "bus",
- description = "The CXF bus name where to look for the Endpoint",
+ description = "The CXF bus name where to look for the Endpoint",
required = true, multiValued = false)
@Completion(BusCompleter.class)
String busName;
-
- @Argument(index = 1, name = "endpoint",
- description = "The Endpoint name to stop",
+
+ @Argument(index = 1, name = "endpoint",
+ description = "The Endpoint name to stop",
required = true, multiValued = false)
@Completion(StartedEndpointCompleter.class)
String endpoint;
@@ -64,5 +64,5 @@ public class StopEndpointCommand extends CXFController implements Action {
}
}
return null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
index 47217e1..3d5cf76 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/BusCompleter.java
@@ -31,7 +31,7 @@ import org.apache.karaf.shell.support.completers.StringsCompleter;
@Service
public class BusCompleter extends CXFController implements Completer {
-
+
@Override
public int complete(Session session,
CommandLine commandLine,
@@ -39,11 +39,11 @@ public class BusCompleter extends CXFController implements Completer {
StringsCompleter delegate = new StringsCompleter();
try {
List<Bus> busses = getBusses();
-
+
for (Bus bus : busses) {
delegate.getStrings().add(bus.getId());
}
-
+
} catch (Exception e) {
// Ignore
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/EndpointCompleterSupport.java
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/EndpointCompleterSupport.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/EndpointCompleterSupport.java
index 463a5ad..aaeab22 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/EndpointCompleterSupport.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/EndpointCompleterSupport.java
@@ -38,11 +38,11 @@ public abstract class EndpointCompleterSupport extends CXFController implements
StringsCompleter delegate = new StringsCompleter();
try {
List<Bus> busses = getBusses();
-
+
for (Bus b : busses) {
ServerRegistry reg = b.getExtension(ServerRegistry.class);
List<Server> servers = reg.getServers();
-
+
for (Server serv : servers) {
if (acceptsFeature(serv)) {
String qname = serv.getEndpoint().getEndpointInfo().getName().getLocalPart();
@@ -50,13 +50,13 @@ public abstract class EndpointCompleterSupport extends CXFController implements
}
}
}
-
+
} catch (Exception e) {
// Ignore
}
return delegate.complete(session, commandLine, list);
}
-
+
/**
* Method for filtering endpoint.
*
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/StoppedEndpointCompleter.java
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/StoppedEndpointCompleter.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/StoppedEndpointCompleter.java
index fb53ae7..dd5d823 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/StoppedEndpointCompleter.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/completers/StoppedEndpointCompleter.java
@@ -25,7 +25,7 @@ import org.apache.karaf.shell.api.action.lifecycle.Service;
@Service
public class StoppedEndpointCompleter extends EndpointCompleterSupport {
-
+
@Override
protected boolean acceptsFeature(Server server) {
return !server.isStarted();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
index 8eea8bd..bb61a6b 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocInInterceptor.java
@@ -39,10 +39,10 @@ import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
public class ColocInInterceptor extends AbstractPhaseInterceptor<Message> {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(ColocInInterceptor.class);
-
+
public ColocInInterceptor() {
super(Phase.INVOKE);
addAfter(ServiceInvokerInterceptor.class.getName());
@@ -69,7 +69,7 @@ public class ColocInInterceptor extends AbstractPhaseInterceptor<Message> {
BindingOperationInfo boi = ex.getBindingOperationInfo();
Message outBound = ex.getOutMessage();
if (boi != null) {
- outBound.put(MessageInfo.class,
+ outBound.put(MessageInfo.class,
boi.getOperationInfo().getOutput());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
index 2cccd28..dd31eaf 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocMessageObserver.java
@@ -71,14 +71,14 @@ public class ColocMessageObserver extends ChainInitiationObserver {
}
Exchange ex = new ExchangeImpl();
setExchangeProperties(ex, m);
-
+
Message inMsg = endpoint.getBinding().createMessage();
MessageImpl.copyContent(m, inMsg);
-
+
//Copy Request Context to Server inBound Message
- //TODO a Context Filter Strategy required.
+ //TODO a Context Filter Strategy required.
inMsg.putAll(m);
-
+
inMsg.put(COLOCATED, Boolean.TRUE);
inMsg.put(Message.REQUESTOR_ROLE, Boolean.FALSE);
inMsg.put(Message.INBOUND_MESSAGE, Boolean.TRUE);
@@ -89,27 +89,27 @@ public class ColocMessageObserver extends ChainInitiationObserver {
}
ex.setInMessage(inMsg);
inMsg.setExchange(ex);
-
+
if (LOG.isLoggable(Level.FINEST)) {
LOG.finest("Build inbound interceptor chain.");
}
-
+
//Add all interceptors between USER_LOGICAL and INVOKE.
SortedSet<Phase> phases = new TreeSet<Phase>(bus.getExtension(PhaseManager.class).getInPhases());
ColocUtil.setPhases(phases, Phase.USER_LOGICAL, Phase.INVOKE);
InterceptorChain chain = ColocUtil.getInInterceptorChain(ex, phases);
chain.add(addColocInterceptors());
inMsg.setInterceptorChain(chain);
-
+
//Convert the coloc object type if necessary
BindingOperationInfo bop = m.getExchange().getBindingOperationInfo();
OperationInfo soi = bop != null ? bop.getOperationInfo() : null;
if (soi != null && oi != null) {
- if (ColocUtil.isAssignableOperationInfo(soi, Source.class)
+ if (ColocUtil.isAssignableOperationInfo(soi, Source.class)
&& !ColocUtil.isAssignableOperationInfo(oi, Source.class)) {
// converting source -> pojo
ColocUtil.convertSourceToObject(inMsg);
- } else if (ColocUtil.isAssignableOperationInfo(oi, Source.class)
+ } else if (ColocUtil.isAssignableOperationInfo(oi, Source.class)
&& !ColocUtil.isAssignableOperationInfo(soi, Source.class)) {
// converting pojo -> source
ColocUtil.convertObjectToSource(inMsg);
@@ -117,12 +117,12 @@ public class ColocMessageObserver extends ChainInitiationObserver {
}
chain.doIntercept(inMsg);
if (soi != null && oi != null) {
- if (ColocUtil.isAssignableOperationInfo(soi, Source.class)
+ if (ColocUtil.isAssignableOperationInfo(soi, Source.class)
&& !ColocUtil.isAssignableOperationInfo(oi, Source.class)
&& ex.getOutMessage() != null) {
- // converting pojo -> source
+ // converting pojo -> source
ColocUtil.convertObjectToSource(ex.getOutMessage());
- } else if (ColocUtil.isAssignableOperationInfo(oi, Source.class)
+ } else if (ColocUtil.isAssignableOperationInfo(oi, Source.class)
&& !ColocUtil.isAssignableOperationInfo(soi, Source.class)
&& ex.getOutMessage() != null) {
// converting pojo -> source
@@ -140,7 +140,7 @@ public class ColocMessageObserver extends ChainInitiationObserver {
}
}
}
-
+
protected void setOutBoundMessage(Exchange from, Exchange to) {
if (from.getOutFaultMessage() != null) {
to.setInFaultMessage(from.getOutFaultMessage());
@@ -148,7 +148,7 @@ public class ColocMessageObserver extends ChainInitiationObserver {
to.setInMessage(from.getOutMessage());
}
}
-
+
protected void setExchangeProperties(Exchange exchange, Message m) {
exchange.put(Bus.class, bus);
exchange.put(Endpoint.class, endpoint);
@@ -162,10 +162,10 @@ public class ColocMessageObserver extends ChainInitiationObserver {
if (boi != null && boi.isUnwrapped()) {
boi = boi.getWrappedOperation();
}
-
+
exchange.put(BindingOperationInfo.class, boi);
}
-
+
protected List<Interceptor<? extends Message>> addColocInterceptors() {
List<Interceptor<? extends Message>> list = new ArrayList<Interceptor<? extends Message>>();
list.add(new ColocInInterceptor());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutFaultObserver.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutFaultObserver.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutFaultObserver.java
index c5272ee..7537a2c 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutFaultObserver.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutFaultObserver.java
@@ -32,7 +32,7 @@ public class ColocOutFaultObserver extends OutFaultChainInitiatorObserver {
public ColocOutFaultObserver(Bus bus) {
super(bus);
list = new TreeSet<Phase>(bus.getExtension(PhaseManager.class).getOutPhases());
- ColocUtil.setPhases(list, Phase.SETUP, Phase.USER_LOGICAL);
+ ColocUtil.setPhases(list, Phase.SETUP, Phase.USER_LOGICAL);
}
protected SortedSet<Phase> getPhases() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
index 34a5b45..7db48eb 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocOutInterceptor.java
@@ -54,8 +54,8 @@ public class ColocOutInterceptor extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = LogUtils.getL7dLogger(ClientImpl.class);
private static final String COLOCATED = Message.class.getName() + ".COLOCATED";
private MessageObserver colocObserver;
- private Bus bus;
-
+ private Bus bus;
+
public ColocOutInterceptor() {
super(Phase.POST_LOGICAL);
}
@@ -65,9 +65,9 @@ public class ColocOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
public void setBus(Bus bus) {
- this.bus = bus;
+ this.bus = bus;
}
-
+
public void handleMessage(Message message) throws Fault {
if (bus == null) {
bus = message.getExchange().getBus();
@@ -78,30 +78,30 @@ public class ColocOutInterceptor extends AbstractPhaseInterceptor<Message> {
throw new Fault(new org.apache.cxf.common.i18n.Message("BUS_NOT_FOUND", BUNDLE));
}
}
-
+
ServerRegistry registry = bus.getExtension(ServerRegistry.class);
-
+
if (registry == null) {
throw new Fault(new org.apache.cxf.common.i18n.Message("SERVER_REGISTRY_NOT_FOUND", BUNDLE));
}
-
+
Exchange exchange = message.getExchange();
Endpoint senderEndpoint = exchange.getEndpoint();
if (senderEndpoint == null) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("ENDPOINT_NOT_FOUND",
+ throw new Fault(new org.apache.cxf.common.i18n.Message("ENDPOINT_NOT_FOUND",
BUNDLE));
}
BindingOperationInfo boi = exchange.getBindingOperationInfo();
-
+
if (boi == null) {
- throw new Fault(new org.apache.cxf.common.i18n.Message("OPERATIONINFO_NOT_FOUND",
+ throw new Fault(new org.apache.cxf.common.i18n.Message("OPERATIONINFO_NOT_FOUND",
BUNDLE));
}
Server srv = isColocated(registry.getServers(), senderEndpoint, boi);
-
+
if (srv != null) {
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Operation:" + boi.getName() + " dispatched as colocated call.");
@@ -121,11 +121,11 @@ public class ColocOutInterceptor extends AbstractPhaseInterceptor<Message> {
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Operation:" + boi.getName() + " dispatched as remote call.");
}
-
+
message.put(COLOCATED, Boolean.FALSE);
}
}
-
+
protected void invokeColocObserver(Message outMsg, Endpoint inboundEndpoint) {
if (colocObserver == null) {
colocObserver = new ColocMessageObserver(inboundEndpoint, bus);
@@ -141,40 +141,40 @@ public class ColocOutInterceptor extends AbstractPhaseInterceptor<Message> {
Message m = getInBoundMessage(ex);
Message inMsg = ep.getBinding().createMessage();
MessageImpl.copyContent(m, inMsg);
-
+
//Copy Response Context to Client inBound Message
- //TODO a Context Filter Strategy required.
+ //TODO a Context Filter Strategy required.
inMsg.putAll(m);
-
+
inMsg.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
inMsg.put(Message.INBOUND_MESSAGE, Boolean.TRUE);
inMsg.setExchange(ex);
-
+
Exception exc = inMsg.getContent(Exception.class);
if (exc != null) {
ex.setInFaultMessage(inMsg);
ColocInFaultObserver observer = new ColocInFaultObserver(bus);
- observer.onMessage(inMsg);
+ observer.onMessage(inMsg);
} else {
//Handle Response
ex.setInMessage(inMsg);
PhaseManager pm = bus.getExtension(PhaseManager.class);
SortedSet<Phase> phases = new TreeSet<Phase>(pm.getInPhases());
ColocUtil.setPhases(phases, Phase.USER_LOGICAL, Phase.PRE_INVOKE);
-
- InterceptorChain chain = ColocUtil.getInInterceptorChain(ex, phases);
- inMsg.setInterceptorChain(chain);
+
+ InterceptorChain chain = ColocUtil.getInInterceptorChain(ex, phases);
+ inMsg.setInterceptorChain(chain);
chain.doIntercept(inMsg);
}
ex.put(ClientImpl.FINISHED, Boolean.TRUE);
}
-
+
protected Message getInBoundMessage(Exchange ex) {
return (ex.getInFaultMessage() != null)
? ex.getInFaultMessage()
: ex.getInMessage();
}
-
+
protected void setMessageObserver(MessageObserver observer) {
colocObserver = observer;
}
@@ -191,26 +191,26 @@ public class ColocOutInterceptor extends AbstractPhaseInterceptor<Message> {
&& receiverEI.getName().equals(senderEI.getName())) {
//Check For Operation Match.
BindingOperationInfo receiverOI = receiverEI.getBinding().getOperation(boi.getName());
- if (receiverOI != null
+ if (receiverOI != null
&& isCompatibleOperationInfo(boi, receiverOI)) {
return s;
}
}
}
}
-
+
return null;
}
-
+
protected boolean isSameOperationInfo(BindingOperationInfo sender,
BindingOperationInfo receiver) {
- return ColocUtil.isSameOperationInfo(sender.getOperationInfo(),
+ return ColocUtil.isSameOperationInfo(sender.getOperationInfo(),
receiver.getOperationInfo());
}
protected boolean isCompatibleOperationInfo(BindingOperationInfo sender,
BindingOperationInfo receiver) {
- return ColocUtil.isCompatibleOperationInfo(sender.getOperationInfo(),
+ return ColocUtil.isCompatibleOperationInfo(sender.getOperationInfo(),
receiver.getOperationInfo());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
index fd653ef..acdcacf 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/ColocUtil.java
@@ -68,7 +68,7 @@ public final class ColocUtil {
boolean remove = true;
while (iter.hasNext()) {
Phase p = iter.next();
- if (remove
+ if (remove
&& p.getName().equals(startPhase.getName())) {
remove = false;
} else if (p.getName().equals(endPhase.getName())) {
@@ -78,11 +78,11 @@ public final class ColocUtil {
}
}
}
-
+
public static InterceptorChain getOutInterceptorChain(Exchange ex, SortedSet<Phase> phases) {
Bus bus = ex.getBus();
PhaseInterceptorChain chain = new PhaseInterceptorChain(phases);
-
+
Endpoint ep = ex.getEndpoint();
List<Interceptor<? extends Message>> il = ep.getOutInterceptors();
if (LOG.isLoggable(Level.FINE)) {
@@ -99,7 +99,7 @@ public final class ColocUtil {
LOG.fine("Interceptors contributed by bus: " + il);
}
chain.add(il);
-
+
if (ep.getService().getDataBinding() instanceof InterceptorProvider) {
il = ((InterceptorProvider)ep.getService().getDataBinding()).getOutInterceptors();
if (LOG.isLoggable(Level.FINE)) {
@@ -111,11 +111,11 @@ public final class ColocUtil {
return chain;
}
-
+
public static InterceptorChain getInInterceptorChain(Exchange ex, SortedSet<Phase> phases) {
Bus bus = ex.getBus();
PhaseInterceptorChain chain = new PhaseInterceptorChain(phases);
-
+
Endpoint ep = ex.getEndpoint();
List<Interceptor<? extends Message>> il = ep.getInInterceptors();
if (LOG.isLoggable(Level.FINE)) {
@@ -132,7 +132,7 @@ public final class ColocUtil {
LOG.fine("Interceptors contributed by bus: " + il);
}
chain.add(il);
-
+
if (ep.getService().getDataBinding() instanceof InterceptorProvider) {
il = ((InterceptorProvider)ep.getService().getDataBinding()).getInInterceptors();
if (LOG.isLoggable(Level.FINE)) {
@@ -143,7 +143,7 @@ public final class ColocUtil {
chain.setFaultObserver(new ColocOutFaultObserver(bus));
modifyChain(chain, ex, true);
return chain;
- }
+ }
private static void modifyChain(PhaseInterceptorChain chain, Exchange ex, boolean in) {
modifyChain(chain, ex.getInMessage(), in);
modifyChain(chain, ex.getOutMessage(), in);
@@ -152,7 +152,7 @@ public final class ColocUtil {
if (m == null) {
return;
}
- Collection<InterceptorProvider> providers
+ Collection<InterceptorProvider> providers
= CastUtils.cast((Collection<?>)m.get(Message.INTERCEPTOR_PROVIDERS));
if (providers != null) {
for (InterceptorProvider p : providers) {
@@ -164,7 +164,7 @@ public final class ColocUtil {
}
}
String key = in ? Message.IN_INTERCEPTORS : Message.OUT_INTERCEPTORS;
- Collection<Interceptor<? extends Message>> is
+ Collection<Interceptor<? extends Message>> is
= CastUtils.cast((Collection<?>)m.get(key));
if (is != null) {
chain.add(is);
@@ -177,25 +177,25 @@ public final class ColocUtil {
&& isSameMessageInfo(oi1.getOutput(), oi2.getOutput())
&& isSameFaultInfo(oi1.getFaults(), oi2.getFaults());
}
-
+
public static boolean isCompatibleOperationInfo(OperationInfo oi1, OperationInfo oi2) {
return isSameOperationInfo(oi1, oi2)
- || isAssignableOperationInfo(oi1, Source.class)
+ || isAssignableOperationInfo(oi1, Source.class)
|| isAssignableOperationInfo(oi2, Source.class);
}
-
+
public static boolean isAssignableOperationInfo(OperationInfo oi, Class<?> cls) {
MessageInfo mi = oi.getInput();
List<MessagePartInfo> mpis = mi.getMessageParts();
return mpis.size() == 1 && cls.isAssignableFrom(mpis.get(0).getTypeClass());
}
-
+
public static boolean isSameMessageInfo(MessageInfo mi1, MessageInfo mi2) {
if ((mi1 == null && mi2 != null)
|| (mi1 != null && mi2 == null)) {
return false;
}
-
+
if (mi1 != null && mi2 != null) {
List<MessagePartInfo> mpil1 = mi1.getMessageParts();
List<MessagePartInfo> mpil2 = mi2.getMessageParts();
@@ -213,26 +213,26 @@ public final class ColocUtil {
}
return true;
}
-
- public static boolean isSameFaultInfo(Collection<FaultInfo> fil1,
+
+ public static boolean isSameFaultInfo(Collection<FaultInfo> fil1,
Collection<FaultInfo> fil2) {
if ((fil1 == null && fil2 != null)
|| (fil1 != null && fil2 == null)) {
return false;
}
-
+
if (fil1 != null && fil2 != null) {
if (fil1.size() != fil2.size()) {
return false;
}
for (FaultInfo fi1 : fil1) {
Iterator<FaultInfo> iter = fil2.iterator();
- Class<?> fiClass1 = fi1.getProperty(Class.class.getName(),
+ Class<?> fiClass1 = fi1.getProperty(Class.class.getName(),
Class.class);
boolean match = false;
while (iter.hasNext()) {
FaultInfo fi2 = iter.next();
- Class<?> fiClass2 = fi2.getProperty(Class.class.getName(),
+ Class<?> fiClass2 = fi2.getProperty(Class.class.getName(),
Class.class);
//Sender/Receiver Service Model not same for faults wr.t message names.
//So Compare Exception Class Instance.
@@ -242,13 +242,13 @@ public final class ColocUtil {
}
}
if (!match) {
- return false;
+ return false;
}
}
}
return true;
}
-
+
public static void convertSourceToObject(Message message) {
List<Object> content = CastUtils.cast(message.getContent(List.class));
if (content == null || content.size() < 1) {
@@ -286,7 +286,7 @@ public final class ColocUtil {
}
// only supporting the wrapped style for now (one pojo <-> one source)
Object object = content.get(0);
- DataWriter<OutputStream> writer =
+ DataWriter<OutputStream> writer =
message.getExchange().getService().getDataBinding().createWriter(OutputStream.class);
//TODO use a better conversion method to get a Source from a pojo.
ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -294,7 +294,7 @@ public final class ColocUtil {
content.set(0, new StreamSource(new ByteArrayInputStream(bos.toByteArray())));
}
-
+
private static MessageInfo getMessageInfo(Message message) {
OperationInfo oi = message.getExchange().getBindingOperationInfo().getOperationInfo();
if (MessageUtils.isOutbound(message)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java
index e6bfbf0..3f612c4 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/WebFaultInInterceptor.java
@@ -42,12 +42,12 @@ public class WebFaultInInterceptor extends AbstractPhaseInterceptor<Message> {
if (ex != null) {
message.put(Message.RESPONSE_CODE, Integer.valueOf(500));
}
-
+
if (ex instanceof Fault) {
Fault f = (Fault) ex;
ex = (Exception) f.getCause();
}
- if (ex == null) {
+ if (ex == null) {
return;
}
@@ -71,15 +71,15 @@ public class WebFaultInInterceptor extends AbstractPhaseInterceptor<Message> {
if (wf != null) {
faultName = new QName(wf.targetNamespace(), wf.name());
}
-
+
return faultName;
}
-
+
private MessagePartInfo getFaultMessagePart(QName qname, OperationInfo op) {
if (op.isUnwrapped() && (op instanceof UnwrappedOperationInfo)) {
op = ((UnwrappedOperationInfo)op).getWrappedOperation();
}
-
+
for (FaultInfo faultInfo : op.getFaults()) {
for (MessagePartInfo mpi : faultInfo.getMessageParts()) {
String ns = null;
@@ -88,13 +88,13 @@ public class WebFaultInInterceptor extends AbstractPhaseInterceptor<Message> {
} else {
ns = mpi.getTypeQName().getNamespaceURI();
}
- if (qname.getLocalPart().equals(mpi.getConcreteName().getLocalPart())
+ if (qname.getLocalPart().equals(mpi.getConcreteName().getLocalPart())
&& qname.getNamespaceURI().equals(ns)) {
return mpi;
}
}
-
+
}
return null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java
index f8a1097..cb24a76 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/blueprint/Activator.java
@@ -30,7 +30,7 @@ public class Activator implements BundleActivator {
public void start(BundleContext context) throws Exception {
try {
BlueprintNameSpaceHandlerFactory factory = new BlueprintNameSpaceHandlerFactory() {
-
+
@Override
public Object createNamespaceHandler() {
return new ColocBPNamespaceHandler();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
index 153df02..c943f4f 100644
--- a/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
+++ b/rt/bindings/coloc/src/main/java/org/apache/cxf/binding/coloc/feature/ColocFeature.java
@@ -38,7 +38,7 @@ public class ColocFeature extends AbstractFeature {
client.setConduitSelector(selector);
initializeProvider(client, bus);
}
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
provider.getInInterceptors().add(new ColocInInterceptor());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
index 7cbc32d..17c46fe 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocMessageObserverTest.java
@@ -59,7 +59,7 @@ public class ColocMessageObserverTest extends Assert {
ep = control.createMock(Endpoint.class);
bus = control.createMock(Bus.class);
srv = control.createMock(Service.class);
- BusFactory.setDefaultBus(bus);
+ BusFactory.setDefaultBus(bus);
msg = new MessageImpl();
ex = new ExchangeImpl();
//msg.setExchange(ex);
@@ -73,7 +73,7 @@ public class ColocMessageObserverTest extends Assert {
@Test
public void testSetExchangeProperties() throws Exception {
QName opName = new QName("A", "B");
- msg.put(Message.WSDL_OPERATION, opName);
+ msg.put(Message.WSDL_OPERATION, opName);
EasyMock.expect(ep.getService()).andReturn(srv);
Binding binding = control.createMock(Binding.class);
EasyMock.expect(ep.getBinding()).andReturn(binding);
@@ -104,10 +104,10 @@ public class ColocMessageObserverTest extends Assert {
@Test
public void testObserverOnMessage() throws Exception {
msg.setExchange(ex);
-
+
Binding binding = control.createMock(Binding.class);
EasyMock.expect(ep.getBinding()).andReturn(binding);
-
+
Message inMsg = new MessageImpl();
EasyMock.expect(binding.createMessage()).andReturn(inMsg);
@@ -136,18 +136,18 @@ public class ColocMessageObserverTest extends Assert {
Exchange ex1 = msg.getExchange();
assertNotNull("Exchange should be set", ex1);
}
-
+
class TestColocMessageObserver extends ColocMessageObserver {
TestColocMessageObserver(Endpoint endpoint, Bus bus) {
super(endpoint, bus);
}
-
+
public void setExchangeProperties(Exchange exchange, Message m) {
exchange.put(Bus.class, bus);
exchange.put(Endpoint.class, ep);
exchange.put(Service.class, srv);
}
-
+
protected List<Interceptor<? extends Message>> addColocInterceptors() {
return new ArrayList<Interceptor<? extends Message>>();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
index 0e8c670..d0ed656 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocOutInterceptorTest.java
@@ -68,7 +68,7 @@ public class ColocOutInterceptorTest extends Assert {
public ColocOutInterceptorTest() {
control.makeThreadSafe(true);
}
-
+
@Before
public void setUp() throws Exception {
colocOut = new ColocOutInterceptor();
@@ -163,7 +163,7 @@ public class ColocOutInterceptorTest extends Assert {
@Test
public void testColocOutIsColocatedPropertySet() throws Exception {
colocOut = new TestColocOutInterceptor1();
-
+
Bus bus = setupBus();
ServerRegistry sr = control.createMock(ServerRegistry.class);
EasyMock.expect(bus.getExtension(ServerRegistry.class)).andReturn(sr);
@@ -171,7 +171,7 @@ public class ColocOutInterceptorTest extends Assert {
//Funtion Param
Server s1 = control.createMock(Server.class);
List<Server> list = new ArrayList<>();
- list.add(s1);
+ list.add(s1);
Endpoint sep = control.createMock(Endpoint.class);
ex.put(Endpoint.class, sep);
QName op = new QName("E", "F");
@@ -187,7 +187,7 @@ public class ColocOutInterceptorTest extends Assert {
OperationInfo roi = rii.getOperation(op);
BindingOperationInfo sboi = control.createMock(BindingOperationInfo.class);
BindingOperationInfo rboi = control.createMock(BindingOperationInfo.class);
-
+
ex.put(BindingOperationInfo.class, sboi);
//Local var
Service ses = control.createMock(Service.class);
@@ -197,7 +197,7 @@ public class ColocOutInterceptorTest extends Assert {
Service res = control.createMock(Service.class);
BindingInfo rbi = control.createMock(BindingInfo.class);
EndpointInfo rei = control.createMock(EndpointInfo.class);
-
+
EasyMock.expect(sr.getServers()).andReturn(list);
EasyMock.expect(sep.getService()).andReturn(ses);
EasyMock.expect(sep.getEndpointInfo()).andReturn(sei);
@@ -220,7 +220,7 @@ public class ColocOutInterceptorTest extends Assert {
msg.setInterceptorChain(chain);
EasyMock.expect(sboi.getBinding()).andReturn(sbi);
EasyMock.expect(sbi.getInterface()).andReturn(sii);
-
+
control.replay();
colocOut.handleMessage(msg);
assertEquals("COLOCATED property should be set",
@@ -229,10 +229,10 @@ public class ColocOutInterceptorTest extends Assert {
op, msg.get(Message.WSDL_OPERATION));
assertEquals("Message.WSDL_INTERFACE property should be set",
intf, msg.get(Message.WSDL_INTERFACE));
-
- control.verify();
+
+ control.verify();
}
-
+
@Test
public void testInvokeInboundChain() {
//Reset Exchange on msg
@@ -249,7 +249,7 @@ public class ColocOutInterceptorTest extends Assert {
ex.put(Bus.class, bus);
ex.put(Endpoint.class, ep);
ex.put(Service.class, srv);
-
+
EasyMock.expect(ep.getBinding()).andReturn(bd);
EasyMock.expect(bd.createMessage()).andReturn(new MessageImpl());
EasyMock.expect(ep.getInInterceptors())
@@ -259,7 +259,7 @@ public class ColocOutInterceptorTest extends Assert {
.andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
EasyMock.expect(bus.getInInterceptors())
.andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
-
+
control.replay();
colocOut.invokeInboundChain(ex, ep);
Message inMsg = ex.getInMessage();
@@ -274,7 +274,7 @@ public class ColocOutInterceptorTest extends Assert {
Boolean.TRUE, ex.get(ClientImpl.FINISHED));
control.verify();
}
-
+
private void verifyIsColocatedWithNullList() {
Server val = colocOut.isColocated(null, null, null);
assertEquals("Is not a colocated call",
@@ -292,7 +292,7 @@ public class ColocOutInterceptorTest extends Assert {
EasyMock.expect(sep.getService()).andReturn(ses);
EasyMock.expect(sep.getEndpointInfo()).andReturn(sei);
-
+
control.replay();
Server val = colocOut.isColocated(list, sep, null);
assertEquals("Is not a colocated call",
@@ -305,7 +305,7 @@ public class ColocOutInterceptorTest extends Assert {
//Funtion Param
Server s1 = control.createMock(Server.class);
List<Server> list = new ArrayList<>();
- list.add(s1);
+ list.add(s1);
Endpoint sep = control.createMock(Endpoint.class);
//Local var
Service ses = control.createMock(Service.class);
@@ -318,7 +318,7 @@ public class ColocOutInterceptorTest extends Assert {
EasyMock.expect(rep.getService()).andReturn(res);
EasyMock.expect(ses.getName()).andReturn(new QName("A", "C"));
EasyMock.expect(res.getName()).andReturn(new QName("A", "B"));
-
+
control.replay();
Server val = colocOut.isColocated(list, sep, null);
assertEquals("Is not a colocated call",
@@ -331,7 +331,7 @@ public class ColocOutInterceptorTest extends Assert {
//Funtion Param
Server s1 = control.createMock(Server.class);
List<Server> list = new ArrayList<>();
- list.add(s1);
+ list.add(s1);
Endpoint sep = control.createMock(Endpoint.class);
BindingOperationInfo sboi = control.createMock(BindingOperationInfo.class);
//Local var
@@ -351,7 +351,7 @@ public class ColocOutInterceptorTest extends Assert {
EasyMock.expect(res.getName()).andReturn(new QName("A", "B"));
EasyMock.expect(rei.getName()).andReturn(new QName("C", "D"));
EasyMock.expect(sei.getName()).andReturn(new QName("C", "E"));
-
+
control.replay();
Server val = colocOut.isColocated(list, sep, sboi);
assertEquals("Is not a colocated call",
@@ -364,13 +364,13 @@ public class ColocOutInterceptorTest extends Assert {
//Funtion Param
Server s1 = control.createMock(Server.class);
List<Server> list = new ArrayList<>();
- list.add(s1);
+ list.add(s1);
Endpoint sep = control.createMock(Endpoint.class);
BindingOperationInfo sboi = control.createMock(BindingOperationInfo.class);
//Local var
Service ses = control.createMock(Service.class);
ServiceInfo ssi = control.createMock(ServiceInfo.class);
- EndpointInfo sei = control.createMock(EndpointInfo.class);
+ EndpointInfo sei = control.createMock(EndpointInfo.class);
TestBindingInfo rbi = new TestBindingInfo(ssi, "testBinding");
Endpoint rep = control.createMock(Endpoint.class);
Service res = control.createMock(Service.class);
@@ -390,13 +390,13 @@ public class ColocOutInterceptorTest extends Assert {
//Causes ConcurrentModification intermittently
//QName op = new QName("E", "F");
//EasyMock.expect(rbi.getOperation(op).andReturn(null);
-
+
control.replay();
Server val = colocOut.isColocated(list, sep, sboi);
assertEquals("Is not a colocated call",
null,
val);
- assertEquals("BindingOperation.getOperation was not called",
+ assertEquals("BindingOperation.getOperation was not called",
1, rbi.getOpCount());
control.reset();
}
@@ -406,7 +406,7 @@ public class ColocOutInterceptorTest extends Assert {
//Funtion Param
Server s1 = control.createMock(Server.class);
List<Server> list = new ArrayList<>();
- list.add(s1);
+ list.add(s1);
Endpoint sep = control.createMock(Endpoint.class);
BindingOperationInfo sboi = control.createMock(BindingOperationInfo.class);
@@ -418,7 +418,7 @@ public class ColocOutInterceptorTest extends Assert {
Service res = control.createMock(Service.class);
EndpointInfo rei = control.createMock(EndpointInfo.class);
BindingOperationInfo rboi = control.createMock(BindingOperationInfo.class);
-
+
QName op = new QName("E", "F");
QName intf = new QName("G", "H");
QName inmi = new QName("M", "in");
@@ -431,14 +431,14 @@ public class ColocOutInterceptorTest extends Assert {
MessageInfo mio = new MessageInfo(soi, MessageInfo.Type.OUTPUT, outmi);
soi.setInput("in", mii);
soi.setOutput("out", mio);
-
+
ServiceInfo rsi = new ServiceInfo();
InterfaceInfo rii = new InterfaceInfo(rsi, intf);
rii.addOperation(op);
OperationInfo roi = rii.getOperation(op);
roi.setInput("in", mii);
roi.setOutput("out", mio);
-
+
EasyMock.expect(sep.getService()).andReturn(ses);
EasyMock.expect(sep.getEndpointInfo()).andReturn(sei);
EasyMock.expect(s1.getEndpoint()).andReturn(rep);
@@ -449,13 +449,13 @@ public class ColocOutInterceptorTest extends Assert {
EasyMock.expect(rei.getName()).andReturn(new QName("C", "D"));
EasyMock.expect(sei.getName()).andReturn(new QName("C", "D"));
EasyMock.expect(rei.getBinding()).andReturn(rbi);
-
+
EasyMock.expect(sboi.getName()).andReturn(op);
EasyMock.expect(sboi.getOperationInfo()).andReturn(soi);
EasyMock.expect(rboi.getName()).andReturn(op);
EasyMock.expect(rboi.getOperationInfo()).andReturn(roi);
EasyMock.expect(rbi.getOperation(op)).andReturn(rboi);
-
+
control.replay();
Server val = colocOut.isColocated(list, sep, sboi);
assertEquals("Expecting a colocated call",
@@ -469,7 +469,7 @@ public class ColocOutInterceptorTest extends Assert {
//Funtion Param
Server s1 = control.createMock(Server.class);
List<Server> list = new ArrayList<>();
- list.add(s1);
+ list.add(s1);
Endpoint sep = control.createMock(Endpoint.class);
BindingOperationInfo sboi = control.createMock(BindingOperationInfo.class);
@@ -481,7 +481,7 @@ public class ColocOutInterceptorTest extends Assert {
Service res = control.createMock(Service.class);
EndpointInfo rei = control.createMock(EndpointInfo.class);
BindingOperationInfo rboi = control.createMock(BindingOperationInfo.class);
-
+
QName op = new QName("E", "F");
QName intf = new QName("G", "H");
QName inmi = new QName("M", "in");
@@ -498,7 +498,7 @@ public class ColocOutInterceptorTest extends Assert {
mpi.setTypeClass(Source.class);
soi.setInput("in", mii);
soi.setOutput("out", mio);
-
+
ServiceInfo rsi = new ServiceInfo();
InterfaceInfo rii = new InterfaceInfo(rsi, intf);
rii.addOperation(op);
@@ -511,7 +511,7 @@ public class ColocOutInterceptorTest extends Assert {
mpi.setTypeClass(Object.class);
roi.setInput("in", mii);
roi.setOutput("out", mio);
-
+
EasyMock.expect(sep.getService()).andReturn(ses);
EasyMock.expect(sep.getEndpointInfo()).andReturn(sei);
EasyMock.expect(s1.getEndpoint()).andReturn(rep);
@@ -522,13 +522,13 @@ public class ColocOutInterceptorTest extends Assert {
EasyMock.expect(rei.getName()).andReturn(new QName("C", "D"));
EasyMock.expect(sei.getName()).andReturn(new QName("C", "D"));
EasyMock.expect(rei.getBinding()).andReturn(rbi);
-
+
EasyMock.expect(sboi.getName()).andReturn(op);
EasyMock.expect(sboi.getOperationInfo()).andReturn(soi);
EasyMock.expect(rboi.getName()).andReturn(op);
EasyMock.expect(rboi.getOperationInfo()).andReturn(roi);
EasyMock.expect(rbi.getOperation(op)).andReturn(rboi);
-
+
control.replay();
Server val = colocOut.isColocated(list, sep, sboi);
assertEquals("Expecting a colocated call",
@@ -536,39 +536,39 @@ public class ColocOutInterceptorTest extends Assert {
val);
control.reset();
}
-
+
private Bus setupBus() {
Bus bus = control.createMock(Bus.class);
BusFactory.setDefaultBus(bus);
return bus;
}
-
+
class TestColocOutInterceptor1 extends ColocOutInterceptor {
public void invokeColocObserver(Message outMsg, Endpoint inboundEndpoint) {
//No Op
}
-
+
public void invokeInboundChain(Exchange exchange, Endpoint ep) {
//No Op
}
-
+
}
-
+
class TestBindingInfo extends BindingInfo {
private int opCount;
TestBindingInfo(ServiceInfo si, String bindingId) {
super(si, bindingId);
}
-
+
public int getOpCount() {
return opCount;
}
-
+
public BindingOperationInfo getOperation(QName opName) {
BindingOperationInfo boi = super.getOperation(opName);
++opCount;
return boi;
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
index f569aea..0a6b192 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/ColocUtilTest.java
@@ -103,21 +103,21 @@ public class ColocUtilTest extends Assert {
Phase.POST_LOGICAL);
}
-
+
@Test
public void testGetOutInterceptorChain() throws Exception {
PhaseManagerImpl phaseMgr = new PhaseManagerImpl();
SortedSet<Phase> list = phaseMgr.getInPhases();
ColocUtil.setPhases(list, Phase.SETUP, Phase.POST_LOGICAL);
-
+
Endpoint ep = control.createMock(Endpoint.class);
Service srv = control.createMock(Service.class);
Exchange ex = new ExchangeImpl();
-
+
ex.put(Bus.class, bus);
ex.put(Endpoint.class, ep);
ex.put(Service.class, srv);
-
+
EasyMock.expect(ep.getOutInterceptors())
.andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
EasyMock.expect(ep.getService()).andReturn(srv).atLeastOnce();
@@ -125,7 +125,7 @@ public class ColocUtilTest extends Assert {
.andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
EasyMock.expect(bus.getOutInterceptors())
.andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
-
+
control.replay();
InterceptorChain chain = ColocUtil.getOutInterceptorChain(ex, list);
control.verify();
@@ -141,15 +141,15 @@ public class ColocUtilTest extends Assert {
PhaseManagerImpl phaseMgr = new PhaseManagerImpl();
SortedSet<Phase> list = phaseMgr.getInPhases();
ColocUtil.setPhases(list, Phase.SETUP, Phase.POST_LOGICAL);
-
+
Endpoint ep = control.createMock(Endpoint.class);
Service srv = control.createMock(Service.class);
Exchange ex = new ExchangeImpl();
-
+
ex.put(Bus.class, bus);
ex.put(Endpoint.class, ep);
ex.put(Service.class, srv);
-
+
EasyMock.expect(bus.getExtension(PhaseManager.class)).andReturn(phaseMgr);
EasyMock.expect(ep.getInInterceptors())
.andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
@@ -158,7 +158,7 @@ public class ColocUtilTest extends Assert {
.andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
EasyMock.expect(bus.getInInterceptors())
.andReturn(new ArrayList<Interceptor<? extends Message>>()).atLeastOnce();
-
+
control.replay();
InterceptorChain chain = ColocUtil.getInInterceptorChain(ex, list);
control.verify();
@@ -169,11 +169,11 @@ public class ColocUtilTest extends Assert {
iter.hasNext());
assertNotNull("OutFaultObserver should be set", chain.getFaultObserver());
}
-
+
@Test
public void testIsSameFaultInfo() {
OperationInfo oi = control.createMock(OperationInfo.class);
-
+
boolean match = ColocUtil.isSameFaultInfo(null, null);
assertEquals("Should return true", true, match);
List<FaultInfo> fil1 = new ArrayList<>();
@@ -181,13 +181,13 @@ public class ColocUtilTest extends Assert {
assertEquals("Should not find a match", false, match);
match = ColocUtil.isSameFaultInfo(null, fil1);
assertEquals("Should not find a match", false, match);
-
+
List<FaultInfo> fil2 = new ArrayList<>();
match = ColocUtil.isSameFaultInfo(fil1, fil2);
-
+
QName fn1 = new QName("A", "B");
QName fn2 = new QName("C", "D");
-
+
FaultInfo fi1 = new FaultInfo(fn1, null, oi);
fi1.setProperty(Class.class.getName(), PingMeFault.class);
fil1.add(fi1);
@@ -202,7 +202,7 @@ public class ColocUtilTest extends Assert {
match = ColocUtil.isSameFaultInfo(fil1, fil2);
assertEquals("Should find a match", true, match);
}
-
+
@Test
public void testIsSameMessageInfo() {
OperationInfo oi = control.createMock(OperationInfo.class);
@@ -217,21 +217,21 @@ public class ColocUtilTest extends Assert {
assertEquals("Should not find a match", false, match);
match = ColocUtil.isSameMessageInfo(null, mi2);
assertEquals("Should not find a match", false, match);
-
+
MessagePartInfo mpi = new MessagePartInfo(new QName("", "B"), null);
mpi.setTypeClass(InHeaderT.class);
mi1.addMessagePart(mpi);
-
+
mpi = new MessagePartInfo(new QName("", "D"), null);
mpi.setTypeClass(OutHeaderT.class);
mi2.addMessagePart(mpi);
-
+
match = ColocUtil.isSameMessageInfo(mi1, mi2);
assertEquals("Should not find a match", false, match);
-
+
mpi.setTypeClass(InHeaderT.class);
match = ColocUtil.isSameMessageInfo(mi1, mi2);
assertEquals("Should find a match", true, match);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
index 4fd6c01..7ca9b7d 100644
--- a/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
+++ b/rt/bindings/coloc/src/test/java/org/apache/cxf/binding/coloc/blueprint/ColocBPNamespaceHandlerTest.java
@@ -1,36 +1,36 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.binding.coloc.blueprint;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- *
- */
-public class ColocBPNamespaceHandlerTest extends Assert {
- @Test
- public void testGetSchemaLocation() {
- ColocBPNamespaceHandler handler = new ColocBPNamespaceHandler();
-
- assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/binding/coloc"));
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.binding.coloc.blueprint;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class ColocBPNamespaceHandlerTest extends Assert {
+ @Test
+ public void testGetSchemaLocation() {
+ ColocBPNamespaceHandler handler = new ColocBPNamespaceHandler();
+
+ assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/binding/coloc"));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
index 7681de1..ea541cd 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBinding.java
@@ -32,19 +32,19 @@ import org.apache.cxf.service.model.BindingInfo;
public class CorbaBinding extends AbstractBasicInterceptorProvider implements Binding {
private BindingInfo bindingInfo;
-
+
public CorbaBinding() {
}
-
+
public void setBindingInfo(BindingInfo info) {
bindingInfo = info;
}
-
+
public BindingInfo getBindingInfo() {
return bindingInfo;
}
-
+
public Message createMessage() {
return createMessage(new MessageImpl());
}
@@ -56,7 +56,7 @@ public class CorbaBinding extends AbstractBasicInterceptorProvider implements Bi
public List<Interceptor<? extends Message>> getFaultInInterceptors() {
return this.getInFaultInterceptors();
}
-
+
public List<Interceptor<? extends Message>> getFaultOutInterceptors() {
return this.getOutFaultInterceptors();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingException.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingException.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingException.java
index 0ccb7d6..7b88949 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingException.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingException.java
@@ -21,8 +21,8 @@ package org.apache.cxf.binding.corba;
import javax.xml.ws.ProtocolException;
// NOTE: This exception provides basic functionality for throwing exceptions within the binding.
-// At the momemnt, we just want to support the ability to throw a message (and accompanying
-// exception) but it may be necessary to break up this functionality into separate exceptions
+// At the momemnt, we just want to support the ability to throw a message (and accompanying
+// exception) but it may be necessary to break up this functionality into separate exceptions
// or make this exception a bit more complex.
public class CorbaBindingException extends ProtocolException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
index fabcbf3..78c1b53 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaBindingFactory.java
@@ -47,13 +47,13 @@ import org.apache.cxf.wsdl.interceptors.BareOutInterceptor;
public class CorbaBindingFactory extends AbstractWSDLBindingFactory
implements ConduitInitiator, DestinationFactory {
- public static final Collection<String> DEFAULT_NAMESPACES
+ public static final Collection<String> DEFAULT_NAMESPACES
= Arrays.asList(
"http://cxf.apache.org/bindings/corba",
"http://schemas.apache.org/yoko/bindings/corba"
);
-
+
protected List<String> transportIds = new ArrayList<>(DEFAULT_NAMESPACES);
protected OrbConfig orbConfig = new OrbConfig();
@@ -65,7 +65,7 @@ public class CorbaBindingFactory extends AbstractWSDLBindingFactory
public void setOrbClass(String cls) {
orbConfig.setOrbClass(cls);
}
-
+
public void setOrbSingletonClass(String cls) {
orbConfig.setOrbSingletonClass(cls);
}
@@ -109,7 +109,7 @@ public class CorbaBindingFactory extends AbstractWSDLBindingFactory
public void setOrbArgs(List<String> args) {
orbConfig.setOrbArgs(args);
}
-
+
public Set<String> getUriPrefixes() {
Set<String> uriPrefixes = new java.util.HashSet<String>();
uriPrefixes.add("IOR");
@@ -119,7 +119,7 @@ public class CorbaBindingFactory extends AbstractWSDLBindingFactory
uriPrefixes.add("corba");
return uriPrefixes;
}
-
+
public OrbConfig getOrbConfig() {
return orbConfig;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
index 98218ca..5a6c766 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
@@ -86,16 +86,16 @@ public class CorbaConduit implements Conduit {
public OrbConfig getOrbConfig() {
return orbConfig;
}
-
+
public synchronized void prepareOrb() {
if (orb == null) {
orb = CorbaBindingHelper.getDefaultORB(orbConfig);
}
}
- public void prepare(Message message) throws IOException {
+ public void prepare(Message message) throws IOException {
try {
prepareOrb();
-
+
String address = null;
if (target != null) {
address = target.getAddress().getValue();
@@ -123,11 +123,11 @@ public class CorbaConduit implements Conduit {
message.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, targetObject);
message.setContent(OutputStream.class,
new CorbaOutputStream(message));
-
+
if (message instanceof CorbaMessage) {
((CorbaMessage)message).setCorbaTypeMap(typeMap);
}
-
+
} catch (java.lang.Exception ex) {
LOG.log(Level.SEVERE, "Could not resolve target object");
throw new CorbaBindingException(ex);
@@ -140,7 +140,7 @@ public class CorbaConduit implements Conduit {
OperationType opType = boi.getExtensor(OperationType.class);
try {
if (message instanceof CorbaMessage) {
- buildRequest((CorbaMessage)message, opType);
+ buildRequest((CorbaMessage)message, opType);
}
message.getContent(OutputStream.class).close();
} catch (Exception ex) {
@@ -155,7 +155,7 @@ public class CorbaConduit implements Conduit {
}
public void close() {
-
+
}
public void setMessageObserver(MessageObserver observer) {
@@ -178,8 +178,8 @@ public class CorbaConduit implements Conduit {
public final String getAddress() {
return endpointInfo.getAddress();
}
-
- public void buildRequest(CorbaMessage message, OperationType opType) throws Exception {
+
+ public void buildRequest(CorbaMessage message, OperationType opType) throws Exception {
ServiceInfo service = message.getExchange().getEndpoint().getEndpointInfo().getService();
NVList nvlist = getArguments(message);
NamedValue ret = getReturn(message);
@@ -216,7 +216,7 @@ public class CorbaConduit implements Conduit {
raises.getException(),
typeMap,
service);
-
+
CorbaStreamable exStreamable = message.createStreamableObject(handler, elName);
exStreamable._read(except.create_input_stream());
message.setStreamableException(exStreamable);
@@ -226,7 +226,7 @@ public class CorbaConduit implements Conduit {
}
}
}
-
+
public NVList getArguments(CorbaMessage message) {
if (orb == null) {
prepareOrb();
@@ -246,9 +246,9 @@ public class CorbaConduit implements Conduit {
list = orb.create_list(0);
}
- return list;
+ return list;
}
-
+
public NamedValue getReturn(CorbaMessage message) {
if (orb == null) {
prepareOrb();
@@ -261,15 +261,15 @@ public class CorbaConduit implements Conduit {
ret = orb.create_named_value(retVal.getName(), returnAny, org.omg.CORBA.ARG_OUT.value);
} else {
// TODO: REVISIT: for some reason,some ORBs do not like to
- // have a null NamedValue return value. Create this 'empty'
+ // have a null NamedValue return value. Create this 'empty'
// one if a void return type is used.
ret = orb.create_named_value("return", orb.create_any(), org.omg.CORBA.ARG_OUT.value);
}
- return ret;
+ return ret;
}
-
+
public ExceptionList getExceptionList(Map<TypeCode, RaisesType> exceptions,
- CorbaMessage message,
+ CorbaMessage message,
OperationType opType) {
if (orb == null) {
prepareOrb();
@@ -279,23 +279,23 @@ public class CorbaConduit implements Conduit {
// These are defined in the operation definition from WSDL.
ExceptionList exList = orb.create_exception_list();
-
+
if (exceptions != null) {
Object[] tcs = null;
tcs = exceptions.keySet().toArray();
-
+
for (int i = 0; i < exceptions.size(); ++i) {
exList.add((TypeCode)tcs[i]);
}
}
return exList;
}
-
+
public Request getRequest(CorbaMessage message,
String opName,
- org.omg.CORBA.NVList nvlist,
- org.omg.CORBA.NamedValue ret,
- org.omg.CORBA.ExceptionList exList)
+ org.omg.CORBA.NVList nvlist,
+ org.omg.CORBA.NamedValue ret,
+ org.omg.CORBA.ExceptionList exList)
throws Exception {
Request request = null;
if (orb == null) {
@@ -304,7 +304,7 @@ public class CorbaConduit implements Conduit {
ContextList ctxList = orb.create_context_list();
Context ctx = null;
try {
- ctx = orb.get_default_context();
+ ctx = orb.get_default_context();
} catch (Exception ex) {
//ignore?
}
@@ -316,15 +316,15 @@ public class CorbaConduit implements Conduit {
}
return request;
}
-
+
public Map<TypeCode, RaisesType> getOperationExceptions(
- OperationType operation,
+ OperationType operation,
CorbaTypeMap map) {
if (orb == null) {
prepareOrb();
}
Map<TypeCode, RaisesType> exceptions = new HashMap<TypeCode, RaisesType>();
- List<RaisesType> exList = operation.getRaises();
+ List<RaisesType> exList = operation.getRaises();
if (exList != null) {
for (int i = 0; i < exList.size(); ++i) {
RaisesType ex = exList.get(i);
@@ -335,14 +335,14 @@ public class CorbaConduit implements Conduit {
return exceptions;
}
-
+
private class CorbaOutputStream extends CachedOutputStream {
-
+
private Message message;
private boolean isOneWay;
CorbaOutputStream(Message m) {
- message = m;
+ message = m;
}
/**
@@ -356,18 +356,18 @@ public class CorbaConduit implements Conduit {
/**
* Perform any actions required on stream closure (handle response etc.)
*/
- public void doClose() throws IOException {
+ public void doClose() throws IOException {
if (ContextUtils.isRequestor(message) && ContextUtils.isOutbound(message)) {
try {
isOneWay = message.getExchange().isOneWay();
-
- if (!isOneWay) {
+
+ if (!isOneWay) {
handleResponse();
}
} catch (Exception ex) {
LOG.log(Level.WARNING, "Connection failed with Exception : ", ex);
throw new IOException(ex.toString());
- }
+ }
}
}
@@ -384,7 +384,7 @@ public class CorbaConduit implements Conduit {
inMessage.setDestination(destination);
exchange.put(ORB.class, orb);
inMessage.setExchange(exchange);
- CorbaMessage inCorbaMsg = new CorbaMessage(inMessage);
+ CorbaMessage inCorbaMsg = new CorbaMessage(inMessage);
inCorbaMsg.setCorbaTypeMap(typeMap);
if (corbaMsg.getStreamableException() != null) {
exchange.setInFaultMessage(corbaMsg);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
index 87a6da4..ad89d45 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaDestination.java
@@ -58,10 +58,10 @@ import org.omg.PortableServer.Servant;
import org.omg.PortableServer.ThreadPolicyValue;
public class CorbaDestination implements MultiplexDestination {
-
+
private static final String IOR_SHARED_KEY = "ior:shared-key";
private static final Logger LOG = LogUtils.getL7dLogger(CorbaDestination.class);
-
+
private AddressType address;
private EndpointReferenceType reference;
private ORB orb;
@@ -78,7 +78,7 @@ public class CorbaDestination implements MultiplexDestination {
private org.omg.CORBA.Object obj;
public CorbaDestination(EndpointInfo ei, OrbConfig config) {
- this(ei, config, null);
+ this(ei, config, null);
}
public CorbaDestination(EndpointInfo ei, OrbConfig config, CorbaTypeMap tm) {
@@ -99,17 +99,17 @@ public class CorbaDestination implements MultiplexDestination {
if (policy != null) {
poaName = policy.getPoaname();
isPersistent = policy.isPersistent();
- serviceId = policy.getServiceid();
+ serviceId = policy.getServiceid();
}
}
public OrbConfig getOrbConfig() {
return orbConfig;
}
-
+
public EndpointReferenceType getAddress() {
return reference;
- }
+ }
public Conduit getBackChannel(Message inMessage)
throws IOException {
@@ -120,7 +120,7 @@ public class CorbaDestination implements MultiplexDestination {
public BindingInfo getBindingInfo() {
return binding;
}
-
+
public EndpointInfo getEndPointInfo() {
return endpointInfo;
}
@@ -147,9 +147,9 @@ public class CorbaDestination implements MultiplexDestination {
orb = null;
}
}
-
- public ORB getORB(List<String> orbArgs,
- String location,
+
+ public ORB getORB(List<String> orbArgs,
+ String location,
java.util.Properties props) {
// See if an ORB has already been created for the given address. If so,
// we'll simply use it
@@ -162,24 +162,24 @@ public class CorbaDestination implements MultiplexDestination {
// Get the binding helper to remember that we need this ORB kept alive, even if another
// destination tries to destroy it.
CorbaBindingHelper.keepORBAlive(location);
-
+
return orb;
}
-
+
protected ORB getOrb() {
return orb;
}
-
+
protected AddressType getAddressType() {
return address;
- }
+ }
public synchronized void setMessageObserver(MessageObserver observer) {
if (observer != incomingObserver) {
MessageObserver old = incomingObserver;
incomingObserver = observer;
- if (observer != null) {
+ if (observer != null) {
if (old == null) {
activate();
}
@@ -202,17 +202,17 @@ public class CorbaDestination implements MultiplexDestination {
props.put("org.omg.CORBA.ORBSingletonClass", orbConfig
.getOrbSingletonClass());
}
-
+
String location = getDestinationAddress();
-
+
if (!CorbaUtils.isValidURL(location)) {
throw new CorbaBindingException(
"Invalid addressing specified for CORBA port location");
}
-
+
LOG.info("Service address retrieved: " + location);
-
-
+
+
URI addressURI = null;
try {
addressURI = new URI(location);
@@ -220,8 +220,8 @@ public class CorbaDestination implements MultiplexDestination {
throw new CorbaBindingException(
"Unable to create ORB with address " + address);
}
-
-
+
+
List<String> orbArgs = new ArrayList<>(orbConfig.getOrbArgs());
String scheme = addressURI.getScheme();
@@ -235,7 +235,7 @@ public class CorbaDestination implements MultiplexDestination {
}
if ("corbaloc".equals(scheme)) {
if (poaName == null) {
- poaName = getEndPointInfo().getName().getLocalPart().replace('.', '_');
+ poaName = getEndPointInfo().getName().getLocalPart().replace('.', '_');
}
setCorbaLocArgs(addressURI, orbArgs);
} else if ("corbaname".equals(scheme)) {
@@ -257,8 +257,8 @@ public class CorbaDestination implements MultiplexDestination {
.getLocalPart(), poaName).replace('.', '_');
}
- orb = getORB(orbArgs, location, props);
-
+ orb = getORB(orbArgs, location, props);
+
try {
POA rootPOA = POAHelper.narrow(orb.resolve_initial_references("RootPOA"));
@@ -285,7 +285,7 @@ public class CorbaDestination implements MultiplexDestination {
} else if (bindingPOA == null) {
bindingPOA = createPOA(poaName, rootPOA, poaManager);
}
-
+
if (bindingPOA == null) {
throw new CorbaBindingException("Unable to create CXF CORBA Binding POA");
}
@@ -303,16 +303,16 @@ public class CorbaDestination implements MultiplexDestination {
+ " already active for non-persistent poa");
}
}
- } else {
+ } else {
objectId = bindingPOA.activate_object(servant);
}
bindingPOA.set_servant(servant);
obj = bindingPOA.id_to_reference(objectId);
orbConfig.exportObjectReference(orb, obj, location, address);
-
+
populateEpr(orb.object_to_string(obj));
LOG.info("Object Reference: " + orb.object_to_string(obj));
- // TODO: Provide other export mechanisms?
+ // TODO: Provide other export mechanisms?
poaManager.activate();
} catch (Exception ex) {
throw new CorbaBindingException("Unable to activate CORBA servant", ex);
@@ -327,9 +327,9 @@ public class CorbaDestination implements MultiplexDestination {
public String getDestinationAddress() {
// We should check the endpoint first for an address. This allows object references
- // to use the address that is associated with their endpoint instead of the single
- // address for a particular port type that is listed in the wsdl. Otherwise, for all
- // object references we want to create, we would need to add the address to the wsdl
+ // to use the address that is associated with their endpoint instead of the single
+ // address for a particular port type that is listed in the wsdl. Otherwise, for all
+ // object references we want to create, we would need to add the address to the wsdl
// file before running the application.
String location = null;
if (endpointInfo != null) {
@@ -342,7 +342,7 @@ public class CorbaDestination implements MultiplexDestination {
return location;
}
-
+
public MessageObserver getMessageObserver() {
return incomingObserver;
}
@@ -363,7 +363,7 @@ public class CorbaDestination implements MultiplexDestination {
}
}
}
-
+
private void setCorbaLocArgs(URI addressURI, List<String> orbArgs) {
String schemeSpecificPart = addressURI.getSchemeSpecificPart();
int keyIndex = schemeSpecificPart.indexOf('/');
@@ -408,15 +408,15 @@ public class CorbaDestination implements MultiplexDestination {
if (serviceId != null) {
policies.add(parentPOA
.create_id_assignment_policy(IdAssignmentPolicyValue.USER_ID));
-
+
}
policies.add(parentPOA.create_id_uniqueness_policy(IdUniquenessPolicyValue.MULTIPLE_ID));
RequestProcessingPolicyValue value = RequestProcessingPolicyValue.USE_DEFAULT_SERVANT;
- policies.add(parentPOA.create_request_processing_policy(value));
-
+ policies.add(parentPOA.create_request_processing_policy(value));
+
orbConfig.addPOAPolicies(orb, name, parentPOA, poaManager, policies);
-
+
Policy[] policyList = policies.toArray(new Policy[policies.size()]);
try {
@@ -434,7 +434,7 @@ public class CorbaDestination implements MultiplexDestination {
}
try {
Servant servant = bindingPOA.id_to_servant(objectId);
- org.omg.CORBA.Object objRef
+ org.omg.CORBA.Object objRef
= bindingPOA.create_reference_with_id(id.getBytes(),
servant._all_interfaces(bindingPOA, objectId)[0]);
AddressType addr = new AddressType();
@@ -444,7 +444,7 @@ public class CorbaDestination implements MultiplexDestination {
ref = EndpointReferenceUtils.getEndpointReference(addr.getLocation());
EndpointInfo ei = getEndPointInfo();
if (ei.getService() != null) {
- EndpointReferenceUtils.setServiceAndPortName(ref, ei.getService().getName(),
+ EndpointReferenceUtils.setServiceAndPortName(ref, ei.getService().getName(),
ei.getName().getLocalPart());
}
} catch (Exception e) {
[28/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
index 545f41a..21e8701 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/OutTransformWriterTest.java
@@ -53,7 +53,7 @@ public class OutTransformWriterTest extends Assert {
public void testDefaultNamespace() throws Exception {
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name());
-
+
Map<String, String> outMap = new HashMap<String, String>();
outMap.put("{http://testbeans.com}*", "{http://testbeans.com/v2}*");
OutTransformWriter transformWriter = new OutTransformWriter(writer,
@@ -65,14 +65,14 @@ public class OutTransformWriterTest extends Assert {
JAXBContext context = JAXBContext.newInstance(TestBean.class);
Marshaller m = context.createMarshaller();
m.marshal(new TestBean(), transformWriter);
-
+
String expected = "<?xml version='1.0' encoding='UTF-8'?>"
+ "<testBean xmlns=\"http://testbeans.com/v2\"><bean/></testBean>";
assertEquals(expected, os.toString());
}
-
+
@Test
- public void testNamespaceConversion() throws Exception {
+ public void testNamespaceConversion() throws Exception {
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
JAXBContext context = JAXBContext.newInstance(TestBean.class);
@@ -87,21 +87,21 @@ public class OutTransformWriterTest extends Assert {
false,
"");
m.marshal(new TestBean(), transformWriter);
-
+
Element el = writer.getDocument().getDocumentElement();
assertEquals("http://testbeans.com/v2", el.getNamespaceURI());
assertFalse(StringUtils.isEmpty(el.getPrefix()));
-
+
Element el2 = DOMUtils.getFirstElement(el);
assertEquals("http://testbeans.com/v3", el2.getNamespaceURI());
assertFalse(StringUtils.isEmpty(el2.getPrefix()));
-
+
}
-
+
@Test
public void testNamespaceConversionAndDefaultNS() throws Exception {
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
-
+
Map<String, String> outMap = new HashMap<String, String>();
outMap.put("{http://testbeans.com}testBean", "{http://testbeans.com/v2}testBean");
outMap.put("{http://testbeans.com}bean", "{http://testbeans.com/v3}bean");
@@ -114,16 +114,16 @@ public class OutTransformWriterTest extends Assert {
JAXBContext context = JAXBContext.newInstance(TestBean.class);
Marshaller m = context.createMarshaller();
m.marshal(new TestBean(), transformWriter);
-
+
Element el = writer.getDocument().getDocumentElement();
assertEquals("http://testbeans.com/v2", el.getNamespaceURI());
assertTrue(StringUtils.isEmpty(el.getPrefix()));
-
+
el = DOMUtils.getFirstElement(el);
assertEquals("http://testbeans.com/v3", el.getNamespaceURI());
assertFalse(StringUtils.isEmpty(el.getPrefix()));
}
-
+
@XmlRootElement(name = "testBean", namespace = "http://testbeans.com")
public static class TestBean {
private TestBean2 bean = new TestBean2();
@@ -137,10 +137,10 @@ public class OutTransformWriterTest extends Assert {
return bean;
}
}
-
+
private static class TestBean2 {
}
-
+
// additional test cases
@Test
public void testReplaceSimpleElement() throws Exception {
@@ -148,8 +148,8 @@ public class OutTransformWriterTest extends Assert {
"<ns:test xmlns:ns=\"http://bar\"><ns:a>1</ns:a></ns:test>".getBytes());
ByteArrayOutputStream os = new ByteArrayOutputStream();
- XMLStreamWriter writer =
- new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
+ XMLStreamWriter writer =
+ new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
null, Collections.singletonMap("{http://bar}a", "{http://bar}a=1 2 3"),
null, null, false, null);
StaxUtils.copy(new StreamSource(is), writer);
@@ -157,106 +157,106 @@ public class OutTransformWriterTest extends Assert {
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(os.toByteArray()));
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
StaxUtils.copy(reader, bos);
String value = bos.toString();
- assertEquals("<ns:test xmlns:ns=\"http://bar\"><ns:a>1 2 3</ns:a></ns:test>", value);
+ assertEquals("<ns:test xmlns:ns=\"http://bar\"><ns:a>1 2 3</ns:a></ns:test>", value);
}
@Test
public void testReadWithComplexRequestSameNamespace() throws Exception {
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/element}*");
-
- XMLStreamReader reader =
- TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn1.xml",
+
+ XMLStreamReader reader =
+ TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn1.xml",
inMap, null, null, null, false, null);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
OutTransformWriter.class.getResourceAsStream("../resources/complexReq1.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, true);
}
-
+
@Test
public void testReadWithComplexRequestMultipleNamespace() throws Exception {
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/otherelement}*");
- inMap.put("{http://cxf.apache.org/transform/test}*",
+ inMap.put("{http://cxf.apache.org/transform/test}*",
"{http://cxf.apache.org/transform/othertest}*");
-
- XMLStreamReader reader =
- TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn2.xml",
+
+ XMLStreamReader reader =
+ TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn2.xml",
inMap, null, null, null, false, null);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
InTransformReader.class.getResourceAsStream("../resources/complexReq2.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, true);
}
-
+
@Test
public void testReadWithComplexTransformationNamespace() throws Exception {
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/otherelement}*");
- inMap.put("{http://cxf.apache.org/transform/test}*",
+ inMap.put("{http://cxf.apache.org/transform/test}*",
"{http://cxf.apache.org/transform/othertest}*");
- inMap.put("{http://schemas.xmlsoap.org/soap/envelope/}Envelope",
+ inMap.put("{http://schemas.xmlsoap.org/soap/envelope/}Envelope",
"{http://schemas.xmlsoap.org/soap/envelope/}TheEnvelope");
-
+
// set the block original reader flag to true
- XMLStreamReader reader =
- TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn3.xml",
+ XMLStreamReader reader =
+ TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn3.xml",
inMap, null, null, null, false, null);
- XMLStreamReader reader2 =
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReq3.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/complexReq3.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, false);
}
@Test
public void testReadWithComplexTransformationNamespace2() throws Exception {
Map<String, String> map = new HashMap<String, String>();
- map.put("{http://testbeans.com/double}*",
+ map.put("{http://testbeans.com/double}*",
"{http://testbeans.com/double/v2}*");
- map.put("{http://testbeans.com}*",
+ map.put("{http://testbeans.com}*",
"{http://testbeans.com/v3}*");
-
+
// the namespaces are prefixed in the input
- XMLStreamReader reader =
- TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn1.xml",
+ XMLStreamReader reader =
+ TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn1.xml",
map, null, null, null, false, null);
- XMLStreamReader reader2 =
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, false);
// the child elements with the default namespace that is declared in the elements
- reader =
- TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn2.xml",
+ reader =
+ TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn2.xml",
map, null, null, null, false, null);
- reader2 =
+ reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, false);
// the child elements with the default namespace that is declared in their parent element
- reader =
- TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn3.xml",
+ reader =
+ TransformTestUtils.createOutTransformedStreamReader("../resources/doubleBeanIn3.xml",
map, null, null, null, false, null);
- reader2 =
+ reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, false);
-
+
// writing each child separately (as the soap header children are serialized)
ByteArrayOutputStream os = new ByteArrayOutputStream();
XMLStreamWriter writer =
- new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
+ new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
map, null,
null, null, false, null);
boolean nsset = "ns3".equals(writer.getNamespaceContext().getPrefix("http://testbeans.com/double"));
@@ -267,48 +267,48 @@ public class OutTransformWriterTest extends Assert {
nsset = "".equals(writer.getNamespaceContext().getPrefix("http://testbeans.com"));
writer.writeStartElement("", "bean", "http://testbeans.com");
if (!nsset) {
- writer.writeNamespace("", "http://testbeans.com");
+ writer.writeNamespace("", "http://testbeans.com");
}
writer.writeEndElement();
nsset = "".equals(writer.getNamespaceContext().getPrefix("http://testbeans.com"));
writer.writeStartElement("", "beanNext", "http://testbeans.com");
if (!nsset) {
- writer.writeNamespace("", "http://testbeans.com");
+ writer.writeNamespace("", "http://testbeans.com");
}
writer.writeEndElement();
writer.writeEndElement();
writer.flush();
-
+
reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(os.toByteArray()));
- reader2 =
+ reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/doubleBean.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, false);
}
@Test
public void testRemoveOneNamespace() throws Exception {
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/vgop/serviceorder/v1_0}result", "result");
- XMLStreamReader reader =
- TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn5.xml",
+ inMap.put("{http://cxf.apache.org/vgop/serviceorder/v1_0}result", "result");
+ XMLStreamReader reader =
+ TransformTestUtils.createOutTransformedStreamReader("../resources/complexReqIn5.xml",
inMap, null, null, null, false, null);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
InTransformReader.class.getResourceAsStream("../resources/complexReq5.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, true);
}
-
+
@Test
public void testRemoveOneDefaultNamespace() throws Exception {
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/hello_world_soap_http/types2}requestType", "requestType");
- XMLStreamReader reader =
- TransformTestUtils.createOutTransformedStreamReader("../resources/greetMe2ReqIn1.xml",
+ inMap.put("{http://cxf.apache.org/hello_world_soap_http/types2}requestType", "requestType");
+ XMLStreamReader reader =
+ TransformTestUtils.createOutTransformedStreamReader("../resources/greetMe2ReqIn1.xml",
inMap, null, null, null, false, null);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
InTransformReader.class.getResourceAsStream("../resources/greetMe2Req.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, true);
@@ -319,11 +319,11 @@ public class OutTransformWriterTest extends Assert {
Map<String, String> transformElements = new HashMap<String, String>();
transformElements.put("requestValue",
"{http://cxf.apache.org/hello_world_soap_http/types}requestType");
-
+
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("requestValue",
"{http://cxf.apache.org/hello_world_soap_http/types}greetMe");
- TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn1.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn1.xml",
"../resources/greetMeReq.xml",
transformElements, appendElements, null, null, null);
}
@@ -335,21 +335,21 @@ public class OutTransformWriterTest extends Assert {
"{http://cxf.apache.org/hello_world_soap_http/types}requestType");
transformElements.put("{http://cxf.apache.org/hello_world_soap_http/types}requestDate",
"");
-
+
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("requestValue",
"{http://cxf.apache.org/hello_world_soap_http/types}greetMe");
-
+
List<String> dropElements = new ArrayList<>();
dropElements.add("value");
-
+
Map<String, String> transformAttributes = new HashMap<String, String>();
transformAttributes.put("num", "");
transformAttributes.put("nombre", "{http://cxf.apache.org/hello_world_soap_http/types}name");
-
- TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn2.xml",
+
+ TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn2.xml",
"../resources/greetMeReq.xml",
- transformElements, appendElements, dropElements,
+ transformElements, appendElements, dropElements,
transformAttributes, null);
}
@@ -359,7 +359,7 @@ public class OutTransformWriterTest extends Assert {
transformElements.put("*",
"{http://cxf.apache.org/hello_world_soap_http/types}*");
- TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn3.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn3.xml",
"../resources/greetMeReq.xml",
transformElements, null, null, null, null);
}
@@ -370,20 +370,20 @@ public class OutTransformWriterTest extends Assert {
transformAttributes.put("{http://www.w3.org/2001/XMLSchema-instance}type",
"");
- TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn4.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeReqIn4.xml",
"../resources/greetMeReq.xml",
null, null, null, transformAttributes, null);
}
-
+
@Test
public void testReadWithAppendPreInclude1() throws Exception {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId",
"{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN");
- TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1.xml",
"../resources/amazon.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -391,10 +391,10 @@ public class OutTransformWriterTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId",
"{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN");
- TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1nospace.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn1nospace.xml",
"../resources/amazon.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -405,7 +405,7 @@ public class OutTransformWriterTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://apache.org/cxf/calculator/types}add",
"{http://www.w3.org/2003/05/soap-envelope}Body");
- TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2.xml",
"../resources/AddRequest2.xml",
transformElements, appendElements, null, null, null);
}
@@ -418,7 +418,7 @@ public class OutTransformWriterTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://apache.org/cxf/calculator/types}add",
"{http://www.w3.org/2003/05/soap-envelope}Body");
- TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2nospace.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn2nospace.xml",
"../resources/AddRequest2.xml",
transformElements, appendElements, null, null, null);
}
@@ -428,10 +428,10 @@ public class OutTransformWriterTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/",
"{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214");
- TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2.xml",
"../resources/amazon.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -439,10 +439,10 @@ public class OutTransformWriterTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/",
"{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214");
- TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2nospace.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/amazonIn2nospace.xml",
"../resources/amazon.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -450,10 +450,10 @@ public class OutTransformWriterTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/",
"{http://apache.org/cxf/calculator/types}add");
- TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1.xml",
"../resources/AddRequest.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -461,10 +461,10 @@ public class OutTransformWriterTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/",
"{http://apache.org/cxf/calculator/types}add");
- TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1nospace.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn1nospace.xml",
"../resources/AddRequest.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -486,19 +486,19 @@ public class OutTransformWriterTest extends Assert {
List<String> dropElements = new ArrayList<>();
dropElements.add("param");
- TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn3.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/AddRequestIn3.xml",
"../resources/AddRequest3.xml",
transformElements, appendElements, dropElements, null, null);
-
+
}
-
+
@Test
public void testOldSTSTransform() throws Exception {
Map<String, String> transformElements = new HashMap<String, String>();
transformElements.put("{http://docs.oasis-open.org/ws-sx/ws-trust/200512}*",
"{http://schemas.xmlsoap.org/ws/2005/02/trust}*");
- TransformTestUtils.transformOutStreamAndCompare("../resources/wstrustReqSTRCIn1.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/wstrustReqSTRCIn1.xml",
"../resources/wstrustReqSTRC.xml",
transformElements, null, null, null, null);
}
@@ -509,7 +509,7 @@ public class OutTransformWriterTest extends Assert {
transformElements.put("{urn:abc}*",
"{urn:a}*");
- TransformTestUtils.transformOutStreamAndCompare("../resources/multiNSIn1.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/multiNSIn1.xml",
"../resources/multiNS.xml",
transformElements, null, null, null, null);
}
@@ -520,25 +520,25 @@ public class OutTransformWriterTest extends Assert {
"<test xmlns=\"http://bar\"><a>1</a></test>".getBytes());
ByteArrayOutputStream os = new ByteArrayOutputStream();
- XMLStreamWriter writer =
- new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
+ XMLStreamWriter writer =
+ new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
null, null, null, null, false, "");
StaxUtils.copy(new StreamSource(is), writer);
writer.flush();
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(os.toByteArray()));
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
StaxUtils.copy(reader, bos);
String value = bos.toString();
- assertEquals("<ps1:test xmlns:ps1=\"http://bar\"><ps1:a>1</ps1:a></ps1:test>", value);
+ assertEquals("<ps1:test xmlns:ps1=\"http://bar\"><ps1:a>1</ps1:a></ps1:test>", value);
}
@Test
public void testNamespacedAttributeDropElement() throws Exception {
Map<String, String> transformElements = new HashMap<String, String>();
transformElements.put("{http://www.w3.org/2005/08/addressing}ReplyTo", "");
- TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeWSAReqIn.xml",
+ TransformTestUtils.transformOutStreamAndCompare("../resources/greetMeWSAReqIn.xml",
"../resources/greetMeWSAReq.xml",
transformElements, null, null, null, null);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java b/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
index df095bd..e2bfe38 100755
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/TransformTestUtils.java
@@ -40,58 +40,58 @@ import org.apache.cxf.staxutils.StaxUtils;
import org.junit.Assert;
/**
- *
+ *
*/
public final class TransformTestUtils {
private static final Logger LOG = LogUtils.getLogger(TransformTestUtils.class);
private TransformTestUtils() {
}
-
- // test utilities methods
-
- static void transformInStreamAndCompare(String inname, String outname,
+
+ // test utilities methods
+
+ static void transformInStreamAndCompare(String inname, String outname,
Map<String, String> transformElements,
Map<String, String> appendElements,
List<String> dropElements,
Map<String, String> transformAttributes,
- Map<String, String> appendAttributes)
+ Map<String, String> appendAttributes)
throws XMLStreamException {
-
+
XMLStreamReader reader = createInTransformedStreamReader(inname,
transformElements,
appendElements,
dropElements,
transformAttributes);
- XMLStreamReader teacher =
+ XMLStreamReader teacher =
StaxUtils.createXMLStreamReader(
TransformTestUtils.class.getResourceAsStream(outname));
-
+
verifyReaders(teacher, reader, false, true);
}
- static void transformOutStreamAndCompare(String inname, String outname,
+ static void transformOutStreamAndCompare(String inname, String outname,
Map<String, String> transformElements,
Map<String, String> appendElements,
List<String> dropElements,
Map<String, String> transformAttributes,
- Map<String, String> appendAttributes)
+ Map<String, String> appendAttributes)
throws XMLStreamException {
-
- XMLStreamReader reader = createOutTransformedStreamReader(inname,
- transformElements, appendElements,
- dropElements, transformAttributes,
+
+ XMLStreamReader reader = createOutTransformedStreamReader(inname,
+ transformElements, appendElements,
+ dropElements, transformAttributes,
false, null);
- XMLStreamReader teacher =
+ XMLStreamReader teacher =
StaxUtils.createXMLStreamReader(
TransformTestUtils.class.getResourceAsStream(outname));
-
+
verifyReaders(teacher, reader, false, true);
}
static XMLStreamReader createInTransformedStreamReader(
String file,
- Map<String, String> emap,
+ Map<String, String> emap,
Map<String, String> eappend,
List<String> dropEls,
Map<String, String> amap) throws XMLStreamException {
@@ -100,10 +100,10 @@ public final class TransformTestUtils {
TransformTestUtils.class.getResourceAsStream(file)),
emap, eappend, dropEls, amap, false);
}
-
+
static XMLStreamReader createOutTransformedStreamReader(
String file,
- Map<String, String> emap,
+ Map<String, String> emap,
Map<String, String> append,
List<String> dropEls,
Map<String, String> amap,
@@ -111,8 +111,8 @@ public final class TransformTestUtils {
String defaultNamespace) throws XMLStreamException {
ByteArrayOutputStream os = new ByteArrayOutputStream();
- XMLStreamWriter writer =
- new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
+ XMLStreamWriter writer =
+ new OutTransformWriter(StaxUtils.createXMLStreamWriter(os, StandardCharsets.UTF_8.name()),
emap, append, dropEls, amap, attributesToElements, defaultNamespace);
StaxUtils.copy(new StreamSource(TransformTestUtils.class.getResourceAsStream(file)), writer);
writer.flush();
@@ -121,20 +121,20 @@ public final class TransformTestUtils {
}
/**
- * Verifies the two stream events are equivalent and throws an assertion
+ * Verifies the two stream events are equivalent and throws an assertion
* exception at the first mismatch.
* @param teacher
* @param reader
* @param eec
* @throws XMLStreamException
*/
- static void verifyReaders(XMLStreamReader teacher, XMLStreamReader reader,
+ static void verifyReaders(XMLStreamReader teacher, XMLStreamReader reader,
boolean eec, boolean pfx) throws XMLStreamException {
// compare the elements and attributes while ignoring comments, line breaks, etc
for (;;) {
int revent = getNextEvent(reader);
int tevent = getNextEvent(teacher);
-
+
if (revent == -1 && tevent == -1) {
break;
}
@@ -179,7 +179,7 @@ public final class TransformTestUtils {
// compares each attribute
for (int i = 0; i < acount; i++) {
String avalue = attributesMap.remove(teacher.getAttributeName(i));
- Assert.assertEquals("attribute " + teacher.getAttributeName(i) + " has wrong value.",
+ Assert.assertEquals("attribute " + teacher.getAttributeName(i) + " has wrong value.",
teacher.getAttributeValue(i), avalue);
}
// attributes must be exhausted
@@ -190,14 +190,14 @@ public final class TransformTestUtils {
int dcount = teacher.getNamespaceCount();
for (int i = 0; i < dcount; i++) {
String p = teacher.getNamespacePrefix(i);
- Assert.assertEquals("nsdecl prefix " + p + " is incorrectly bound.",
+ Assert.assertEquals("nsdecl prefix " + p + " is incorrectly bound.",
teacher.getNamespaceURI(i), reader.getNamespaceURI(p));
}
}
/**
* Returns the next relevant reader event.
- *
+ *
* @param reader
* @return
* @throws XMLStreamException
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
index dc17467..5caf301 100644
--- a/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/ChainInitiationObserverTest.java
@@ -38,7 +38,7 @@ public class ChainInitiationObserverTest extends Assert {
private TestChain chain;
private Message message;
private ChainInitiationObserver observer;
-
+
@Before
public void setUp() {
@@ -56,35 +56,35 @@ public class ChainInitiationObserverTest extends Assert {
public void tearDown() {
control.verify();
}
-
+
@Test
public void testPausedChain() {
message.getInterceptorChain();
EasyMock.expectLastCall().andReturn(chain).times(2);
control.replay();
-
+
observer.onMessage(message);
assertTrue(chain.isInvoked());
}
-
+
private static class TestChain extends PhaseInterceptorChain {
-
+
private boolean invoked;
-
+
TestChain(SortedSet<Phase> ps) {
super(ps);
}
-
+
@Override
public void resume() {
invoked = true;
}
-
+
@Override
public State getState() {
return State.PAUSED;
}
-
+
public boolean isInvoked() {
return invoked;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
index ab8568b..1352d76 100644
--- a/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/HttpUriMapperTest.java
@@ -31,16 +31,16 @@ public class HttpUriMapperTest extends Assert {
URL url = new URL("http://localhost:8080/SoapContext/SoapPort");
String path = url.getPath();
assertEquals("/SoapContext", HttpUriMapper.getContextName(path));
-
+
url = new URL("http://localhost:8080/SoapContext/SoapPort/");
path = url.getPath();
assertEquals("/SoapContext/SoapPort", HttpUriMapper.getContextName(path));
-
+
url = new URL("http://localhost:8080/");
path = url.getPath();
assertEquals("", HttpUriMapper.getContextName(path));
}
-
+
@Test
public void testGetResourceBase() throws Exception {
URL url = new URL("http://localhost:8080/SoapContext/SoapPort");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
index cd86280..c82416e 100644
--- a/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
+++ b/core/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
@@ -116,7 +116,7 @@ public class GZIPAcceptEncodingTest extends Assert {
interceptor.handleMessage(outMessage);
}
- private void singleTest(String encoding,
+ private void singleTest(String encoding,
GZIPOutInterceptor.UseGzip expectedUseGzip, String expectedGzipEncoding)
throws Exception {
@@ -130,7 +130,7 @@ public class GZIPAcceptEncodingTest extends Assert {
}
private void setAcceptEncoding(String enc) {
- Map<String, List<String>> protocolHeaders
+ Map<String, List<String>> protocolHeaders
= new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
protocolHeaders.put(HttpHeaderHelper.getHeaderKey(HttpHeaderHelper.ACCEPT_ENCODING), Collections
.singletonList(enc));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
index 3229ef9..bb177df 100644
--- a/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
+++ b/core/src/test/java/org/apache/cxf/workqueue/AutomaticWorkQueueTest.java
@@ -44,7 +44,7 @@ public class AutomaticWorkQueueTest extends Assert {
public static final int TIMEOUT = 100;
AutomaticWorkQueueImpl workqueue;
-
+
@After
public void tearDown() throws Exception {
if (workqueue != null) {
@@ -52,7 +52,7 @@ public class AutomaticWorkQueueTest extends Assert {
workqueue = null;
}
}
-
+
@Test
public void testUnboundedConstructor() {
workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE, INITIAL_SIZE,
@@ -77,14 +77,14 @@ public class AutomaticWorkQueueTest extends Assert {
assertEquals(DEFAULT_LOW_WATER_MARK, workqueue.getLowWaterMark());
}
-
+
@Test
public void testEnqueueWithTimeout() throws Exception {
workqueue = new AutomaticWorkQueueImpl(2, 2,
2,
2,
DEFAULT_DEQUEUE_TIMEOUT);
-
+
final Object lock = new Object();
int x = 0;
try {
@@ -105,8 +105,8 @@ public class AutomaticWorkQueueTest extends Assert {
assertTrue("Expect RejectedExecutionException when the work queue is full.", x <= 4);
}
}
-
-
+
+
@Test
public void testEnqueue() {
workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE,
@@ -188,7 +188,7 @@ public class AutomaticWorkQueueTest extends Assert {
// ignore
}
}
-
+
for (int i = 0; i < DEFAULT_MAX_QUEUE_SIZE; i++) {
fillers[i] = new BlockingWorkItem();
try {
@@ -271,7 +271,7 @@ public class AutomaticWorkQueueTest extends Assert {
checkDeadLock(dead);
}
-
+
@Test
public void testSchedule() throws Exception {
workqueue = new AutomaticWorkQueueImpl(UNBOUNDED_MAX_QUEUE_SIZE, INITIAL_SIZE,
@@ -291,16 +291,16 @@ public class AutomaticWorkQueueTest extends Assert {
}
}
};
-
+
workqueue.schedule(doNothing, 5000);
-
+
runLock.lock();
try {
runCondition.await();
} finally {
runLock.unlock();
}
-
+
assertTrue("expected delay",
System.currentTimeMillis() - start >= 4950);
}
@@ -322,14 +322,14 @@ public class AutomaticWorkQueueTest extends Assert {
// ignore
}
}
-// if (System.getProperty("java.version").startsWith("1.6")
+// if (System.getProperty("java.version").startsWith("1.6")
// || System.getProperty("java.vendor").startsWith("IBM")) {
// // ThreadPoolExecutor in 1.6 is broken. The size can get below
// // the low watermark. Oddly, this also appears to happen with
// // the ibm jdk.
assertTrue(workqueue.getLowWaterMark() >= workqueue.getPoolSize());
// } else {
-// assertEquals(workqueue.getLowWaterMark(), workqueue.getPoolSize());
+// assertEquals(workqueue.getLowWaterMark(), workqueue.getPoolSize());
// }
}
@@ -356,7 +356,7 @@ public class AutomaticWorkQueueTest extends Assert {
assertTrue("threads_total(): " + sz, workqueue.getPoolSize() <= DEFAULT_LOW_WATER_MARK);
}
- @Test
+ @Test
public void testShutdown() {
workqueue = new AutomaticWorkQueueImpl(DEFAULT_MAX_QUEUE_SIZE, INITIAL_SIZE,
INITIAL_SIZE, INITIAL_SIZE, 500);
@@ -378,7 +378,7 @@ public class AutomaticWorkQueueTest extends Assert {
}
assertEquals(0, workqueue.getSize());
assertEquals(0, workqueue.getPoolSize());
-
+
//already shutdown
workqueue = null;
}
@@ -396,13 +396,13 @@ public class AutomaticWorkQueueTest extends Assert {
// No reduction in the completion count so it may be deadlocked,
// allow thread to make no progress for 5 time-slices before
// assuming a deadlock has occurred
- //
+ //
if (oldCompleted != 0
&& ++noProgressCount > 5) {
-
- fail("No reduction in threads in 1.25 secs: \n"
- + "oldCompleted: " + oldCompleted
- + "\nof " + dead.getWorkItemCount());
+
+ fail("No reduction in threads in 1.25 secs: \n"
+ + "oldCompleted: " + oldCompleted
+ + "\nof " + dead.getWorkItemCount());
}
}
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java
index c954c04..952e1e9 100644
--- a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java
@@ -32,7 +32,7 @@ import demo.hw.server.HelloWorld;
public final class Client {
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java
index c66a7c7..c57d048 100644
--- a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/HelloWorld.java
@@ -21,7 +21,7 @@ package demo.hw.server;
import org.w3c.dom.Document;
public interface HelloWorld {
-
+
String sayHi(String text);
Document getADocument();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java b/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java
index 3e3038e..9b8a2d9 100644
--- a/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java
+++ b/distribution/src/main/release/samples/aegis/src/test/java/org/apache/cxf/sample/test/TestAegisSample.java
@@ -27,14 +27,14 @@ import demo.hw.server.Server;
/**
- *
+ *
*/
public class TestAegisSample {
@BeforeClass
public static void startServer() throws Exception {
Server.startServer();
}
-
+
@Test
public void testClient() throws Exception {
Client.main(null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java
index 50e4e36..f6054c3 100644
--- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java
+++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/ReadZoo.java
@@ -34,7 +34,7 @@ import org.apache.cxf.demo.aegis.types.Animal;
import org.apache.cxf.demo.aegis.types.Zoo;
/**
- *
+ *
*/
public final class ReadZoo {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
index 869b612..6269934 100644
--- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
+++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/commands/WriteZoo.java
@@ -39,7 +39,7 @@ import org.apache.cxf.demo.aegis.types.Zoo;
import javanet.staxutils.IndentingXMLStreamWriter;
/**
- *
+ *
*/
public final class WriteZoo {
private XMLOutputFactory outputFactory;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java
index e7df8ab..73b295b 100644
--- a/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java
+++ b/distribution/src/main/release/samples/aegis_standalone/src/main/java/org/apache/cxf/demo/aegis/types/Zoo.java
@@ -22,7 +22,7 @@ package org.apache.cxf.demo.aegis.types;
import java.util.Map;
/**
- *
+ *
*/
public class Zoo {
private String name;
@@ -35,7 +35,7 @@ public class Zoo {
public void setFounder(String founder) {
this.founder = founder;
}
-
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java
index 8ff3439..9f18045 100644
--- a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/GreeterImpl.java
@@ -22,15 +22,15 @@ package demo.hw_http.server;
import java.util.logging.Logger;
import org.apache.hello_world_soap_http.Greeter;
-@javax.jws.WebService(name = "Soap", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(name = "Soap", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
wsdlLocation = "file:./wsdl/hello_world.wsdl")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.objectweb.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java
index 4b8ea22..dc4863f 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/CallbackImpl.java
@@ -23,14 +23,14 @@ package demo.callback.client;
import org.apache.callback.CallbackPortType;
-@javax.jws.WebService(serviceName = "CallbackService",
+@javax.jws.WebService(serviceName = "CallbackService",
portName = "CallbackPort",
endpointInterface = "org.apache.callback.CallbackPortType",
targetNamespace = "http://apache.org/callback")
-
+
public class CallbackImpl implements CallbackPortType {
-
+
/**
* serverSayHi
* @param: return_message (String)
@@ -41,5 +41,5 @@ public class CallbackImpl implements CallbackPortType {
System.out.println("Message received: " + message);
return new String("Hi " + message);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
index e27981b..34207f8 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
@@ -42,22 +42,22 @@ import org.apache.cxf.staxutils.StaxUtils;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://apache.org/callback", "SOAPService");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
-
-
+
+
Object implementor = new CallbackImpl();
String address = "http://localhost:9005/CallbackContext/CallbackPort";
Endpoint endpoint = Endpoint.publish(address, implementor);
-
- if (args.length == 0) {
+
+ if (args.length == 0) {
System.out.println("please specify wsdl");
- System.exit(1);
+ System.exit(1);
}
URL wsdlURL;
@@ -67,22 +67,22 @@ public final class Client {
} else {
wsdlURL = new URL(args[0]);
}
-
+
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
ServerPortType port = ss.getSOAPPort();
-
+
InputStream is = demo.callback.client.Client.class.getResourceAsStream("/callback_infoset.xml");
Document doc = StaxUtils.read(is);
Element referenceParameters = DOMUtils.findChildWithAtt(doc.getDocumentElement(),
"wsa:ReferenceParameters",
"name", "");
W3CEndpointReference ref = (W3CEndpointReference)endpoint.getEndpointReference(referenceParameters);
-
+
String resp = port.registerCallback(ref);
System.out.println("Response from server: " + resp);
-
- System.exit(0);
+
+ System.exit(0);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java
index 66d1e05..5483b35 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/ServerImpl.java
@@ -27,15 +27,15 @@ import org.apache.callback.CallbackPortType;
import org.apache.callback.ServerPortType;
-@javax.jws.WebService(serviceName = "SOAPService",
+@javax.jws.WebService(serviceName = "SOAPService",
portName = "SOAPPort",
targetNamespace = "http://apache.org/callback",
- endpointInterface = "org.apache.callback.ServerPortType")
-
+ endpointInterface = "org.apache.callback.ServerPortType")
+
public class ServerImpl implements ServerPortType {
-
+
public String registerCallback(W3CEndpointReference callback) {
-
+
try {
WebServiceFeature[] wfs = new WebServiceFeature[] {};
@@ -44,16 +44,16 @@ public class ServerImpl implements ServerPortType {
System.out.println("Invoking callback object");
String resp = port.serverSayHi(System.getProperty("user.name"));
System.out.println("Response from callback object: " + resp);
-
-
+
+
} catch (Exception ex) {
ex.printStackTrace();
return null;
}
-
- return "registerCallback called";
+
+ return "registerCallback called";
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
index c167f10..709f2e3 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
@@ -27,26 +27,26 @@ import org.apache.hello_world_soap_http.SOAPService;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://apache.org/hello_world_soap_http", "SOAPService");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
URL wsdlURL = Client.class.getResource("/wsdl/hello_world.wsdl");
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
Greeter port = ss.getSoapPort();
- String resp;
+ String resp;
System.out.println("Invoking sayHi...");
resp = port.sayHi();
System.out.println("Server responded with: " + resp);
System.out.println();
-
- System.exit(0);
+
+ System.exit(0);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
index e534329..2c3bf7d 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/interceptor/StreamInterceptor.java
@@ -37,7 +37,7 @@ public class StreamInterceptor extends AbstractPhaseInterceptor<Message> {
super(Phase.PRE_STREAM);
addBefore(SoapPreProtocolOutInterceptor.class.getName());
}
-
+
public void handleMessage(Message message) {
//TODO
@@ -49,7 +49,7 @@ public class StreamInterceptor extends AbstractPhaseInterceptor<Message> {
OutputStream os = message.getContent(OutputStream.class);
CachedStream cs = new CachedStream();
message.setContent(OutputStream.class, cs);
-
+
message.getInterceptorChain().doIntercept(message);
try {
@@ -80,20 +80,20 @@ public class StreamInterceptor extends AbstractPhaseInterceptor<Message> {
public void handleFault(Message message) {
}
-
+
private class CachedStream extends CachedOutputStream {
CachedStream() {
super();
}
-
+
protected void doFlush() throws IOException {
currentStream.flush();
}
protected void doClose() throws IOException {
}
-
+
protected void onWrite() throws IOException {
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java
index 094c466..db6f07a 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/GreeterImpl.java
@@ -24,15 +24,15 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
endpointInterface = "org.apache.hello_world_soap_http.Greeter")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -42,7 +42,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
@@ -60,7 +60,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Executing operation sayHi\n");
return "Bonjour";
}
-
+
public void pingMe() throws PingMeFault {
FaultDetail faultDetail = new FaultDetail();
faultDetail.setMajor((short)2);
@@ -70,5 +70,5 @@ public class GreeterImpl implements Greeter {
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
index 41a9738..78691b4 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
@@ -29,7 +29,7 @@ import bank.common.BankCORBAService;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://cxf.apache.org/schemas/cxf/idl/bank", "BankCORBAService");
private Client() {
@@ -37,10 +37,10 @@ public final class Client {
public static void main(String args[]) throws Exception {
URL wsdlUrl = Client.class.getResource("/wsdl/bank.wsdl");
-
+
BankCORBAService ss = new BankCORBAService(wsdlUrl, SERVICE_NAME);
- Bank port = ss.getBankCORBAPort();
-
+ Bank port = ss.getBankCORBAPort();
+
System.out.print("Invoking createAccount for Mr. John... ");
javax.xml.ws.Holder<Account> account = new javax.xml.ws.Holder<Account>(new Account());
@@ -56,7 +56,7 @@ public final class Client {
Account bankAccount = account.value;
if (bankAccount != null) {
- System.out.println("Created Account : "
+ System.out.println("Created Account : "
+ bankAccount.getName() + ": " + bankAccount.getBalance());
}
@@ -71,16 +71,16 @@ public final class Client {
}
} catch (AccountNotFoundException ex) {
System.out.println("failure (" + ex.getMessage() + " : " + ex.getFaultInfo().getName() + ")");
- }
+ }
System.out.println("Getting an non-existent account (Ms. Helen)...");
try {
bankAccount = port.getAccount("Helen");
} catch (AccountNotFoundException ex) {
- System.out.println("Caught the expected AccountNotFoundException("
+ System.out.println("Caught the expected AccountNotFoundException("
+ ex.getFaultInfo().getName() + ")");
}
-
+
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
index 987d049..420d9fd 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/BankImpl.java
@@ -28,8 +28,8 @@ import bank.common.AccountNotFoundException;
import bank.common.AccountNotFoundExceptionType;
import bank.common.Bank;
-@javax.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService",
- targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/bank",
+@javax.jws.WebService(portName = "BankCORBAPort", serviceName = "BankCORBAService",
+ targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/bank",
wsdlLocation = "classpath:/wsdl/bank.wsdl",
endpointInterface = "bank.common.Bank")
@@ -38,7 +38,7 @@ public class BankImpl implements Bank {
Map<String, Account> accounts = new HashMap<String, Account>();
public boolean createAccount(String name, javax.xml.ws.Holder<Account> account)
- throws AccountAlreadyExistsException {
+ throws AccountAlreadyExistsException {
System.out.println("Creating account: " + name);
boolean result = false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java
index 060182a..ad658df 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java
@@ -36,9 +36,9 @@ public final class Client {
//not constructed
}
static int run(ORB orb, String[] args) throws UserException {
-
+
// Get the Bank object
- org.omg.CORBA.Object obj =
+ org.omg.CORBA.Object obj =
orb.string_to_object("corbaname::localhost:1050#Bank");
if (obj == null) {
System.err.println("bank.Client: cannot read IOR from corbaname::localhost:1050#Bank");
@@ -63,7 +63,7 @@ public final class Client {
account2.deposit(5.00f);
System.out.println("Current balance of \"Account2\" is " + account2.get_balance());
System.out.println();
-
+
// Create two more accounts to use with the getAccount calls
Account acc3 = bank.create_account("Account3");
acc3.deposit(200.00f);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java
index 0ccb41a..82ef659 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/AccountImpl.java
@@ -27,15 +27,15 @@ import corba.common.AccountPOA;
public class AccountImpl extends AccountPOA {
-
+
// The servants default POA
private POA poa_;
private float balance;
-
+
public AccountImpl(POA poa) {
poa_ = poa;
-
+
balance = 0.0f;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
index d24563a..8e83f31 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
@@ -30,11 +30,11 @@ import corba.common.BankPOA;
public class BankImpl extends BankPOA {
-
+
private POA poa_;
private Map<String, Account> accountList;
-
+
BankImpl(POA poa) {
poa_ = poa;
@@ -45,12 +45,12 @@ public class BankImpl extends BankPOA {
if (accountList.containsKey(accountName)) {
return accountList.get(accountName);
}
-
+
System.out.println("[Bank] Called create_account( " + accountName + " )...");
- System.out.println();
+ System.out.println();
AccountImpl accountImpl = new AccountImpl(poa_);
String name = "Account-" + accountName;
- byte[] oid = name.getBytes();
+ byte[] oid = name.getBytes();
try {
poa_.activate_object_with_id(oid, accountImpl);
} catch (Exception ex) {
@@ -73,7 +73,7 @@ public class BankImpl extends BankPOA {
AccountImpl accountImpl = new AccountImpl(poa_);
String name = "Account-" + accountName;
- byte[] oid = name.getBytes();
+ byte[] oid = name.getBytes();
try {
poa_.activate_object_with_id(oid, accountImpl);
} catch (Exception ex) {
@@ -117,7 +117,7 @@ public class BankImpl extends BankPOA {
System.out.println();
accountList.remove(accountName);
}
-
+
public POA _default_POA() {
return poa_;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java
index 946dcd7..aa1de39 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java
@@ -36,8 +36,8 @@ public final class Server {
private Server() {
//not created
}
-
-
+
+
static int run(ORB orb, String[] args) throws UserException {
//
// Resolve Root POA
@@ -78,7 +78,7 @@ public final class Server {
public static void main(String args[]) {
Properties props = System.getProperties();
props.put("org.omg.CORBA.ORBInitialHost", "localhost");
- props.put("org.omg.CORBA.ORBInitialPort", "1050");
+ props.put("org.omg.CORBA.ORBInitialPort", "1050");
int status = 0;
ORB orb = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
index b2d9e26..776c250 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
@@ -34,12 +34,12 @@ public final class Client {
private static final Logger LOG =
Logger.getLogger(Client.class.getPackage().getName());
-
+
private Client() {
}
public static void main(String args[]) throws Exception {
-
+
LOG.log(Level.INFO, "Resolving the bank object");
BankCORBAService service = new BankCORBAService();
Bank port = service.getBankCORBAPort();
@@ -53,8 +53,8 @@ public final class Client {
System.out.println("Current balance of account \"Account1\" is " + account1.getBalance());
System.out.println();
- /* Re-enable when we have a utility to manipulate the meta data stored
- within the EPR.
+ /* Re-enable when we have a utility to manipulate the meta data stored
+ within the EPR.
// Test the method Bank.createEprAccount()
System.out.println("Creating account called \"Account2\"");
W3CEndpointReference epr2 = port.createEprAccount("Account2");
@@ -70,7 +70,7 @@ public final class Client {
acc3.deposit(200.00f);
Account acc4 = getAccountFromEPR(port.createAccount("Account4"));
acc4.deposit(400.00f);
-
+
// Test the method Bank.getAccount()
System.out.println("Retrieving account called \"Account3\"");
W3CEndpointReference epr3 = port.getAccount("Account3");
@@ -81,8 +81,8 @@ public final class Client {
System.out.println("New balance for account \"Account3\" is " + account3.getBalance());
System.out.println();
- /* Re-enable when we have a utility to manipulate the meta data stored
- within the EPR.
+ /* Re-enable when we have a utility to manipulate the meta data stored
+ within the EPR.
// Test the method Bank.getEprAccount()
System.out.println("Retrieving account called \"Account4\"");
EndpointReferenceType epr4 = port.getEprAccount("Account4");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java
index 5179616..e54eafb 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/AccountImpl.java
@@ -28,9 +28,9 @@ import cxf.common.Account;
endpointInterface = "cxf.common.Account")
public class AccountImpl implements Account {
-
+
private float balance;
-
+
public float getBalance() {
System.out.println("[Account] Called AccountImpl.getBalance()...");
System.out.println();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
index ad01df5..63a835b 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/BankImpl.java
@@ -27,7 +27,7 @@ import javax.xml.ws.wsaddressing.W3CEndpointReference;
import cxf.common.Bank;
-@javax.jws.WebService(portName = "BankCORBAPort",
+@javax.jws.WebService(portName = "BankCORBAPort",
serviceName = "BankCORBAService",
targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/Bank",
wsdlLocation = "classpath:/wsdl/BankWS-corba.wsdl",
@@ -35,13 +35,13 @@ import cxf.common.Bank;
public class BankImpl implements Bank {
- private Map<String, W3CEndpointReference> accountList =
+ private Map<String, W3CEndpointReference> accountList =
new HashMap<String, W3CEndpointReference>();
private Map<String, Endpoint> endpointList = new HashMap<String, Endpoint>();
public BankImpl() {
}
-
+
public W3CEndpointReference createAccount(String accountName) {
System.out.println("[Bank] Called createAccount( " + accountName + " )...");
System.out.println();
@@ -79,7 +79,7 @@ public class BankImpl implements Bank {
public W3CEndpointReference getAccountEprWithNoUseAttribute(String accountName) {
return null;
}
-
+
// TODO: What is the correct implementation for this operation?
public void findAccount(javax.xml.ws.Holder<java.lang.Object> accountDetails) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
index 6b59393..baa4958 100644
--- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
+++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
@@ -31,7 +31,7 @@ public final class Client {
private Client() {
//not consructed
}
-
+
static int run(ORB orb, String[] args) throws UserException {
// Get "hello" object
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
index 09c3a66..f72bad1 100644
--- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
+++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/HelloWorldImpl.java
@@ -21,11 +21,11 @@ package cxf.server;
import cxf.common.HelloWorld;
-@javax.jws.WebService(portName = "HelloWorldCORBAPort", serviceName = "HelloWorldCORBAService",
+@javax.jws.WebService(portName = "HelloWorldCORBAPort", serviceName = "HelloWorldCORBAService",
targetNamespace = "http://cxf.apache.org/schemas/cxf/idl/HelloWorld",
wsdlLocation = "classpath:/wsdl/HelloWorld-corba.wsdl",
endpointInterface = "cxf.common.HelloWorld")
-
+
public class HelloWorldImpl implements HelloWorld {
public java.lang.String greetMe(java.lang.String inparameter) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
index 7917fff..3c6b77e 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
@@ -31,7 +31,7 @@ public final class Client {
public static void main(String args[]) throws Exception {
// START SNIPPET: client
- ClassPathXmlApplicationContext context
+ ClassPathXmlApplicationContext context
= new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
HelloWorld client = (HelloWorld)context.getBean("client");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
index 32a2811..2ddb7fa 100755
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
@@ -42,23 +42,23 @@ import demo.colocated.server.Server;
public final class DispatchSourceClient {
private static final String ADDRESS = "http://localhost:9000/SoapContext/GreeterPort";
- private static final String SERVICE_NS = "http://apache.org/hello_world_soap_http";
+ private static final String SERVICE_NS = "http://apache.org/hello_world_soap_http";
private static final QName SERVICE_NAME = new QName(SERVICE_NS, "SOAPService");
private static final QName PORT_NAME = new QName(SERVICE_NS, "SoapPort");
private static final String PAYLOAD_NAMESPACE_URI = "http://apache.org/hello_world_soap_http/types";
- private static final String SAYHI_REQUEST_TEMPLATE
+ private static final String SAYHI_REQUEST_TEMPLATE
= "<ns1:sayHi xmlns:ns1=\"http://apache.org/hello_world_soap_http/types\" />";
- private static final String GREETME_REQUEST_TEMPLATE
+ private static final String GREETME_REQUEST_TEMPLATE
= "<ns1:greetMe xmlns:ns1=\"http://apache.org/hello_world_soap_http/types\">"
+ "<ns1:requestType>%s</ns1:requestType></ns1:greetMe>";
- private static final String PINGME_REQUEST_TEMPLATE
+ private static final String PINGME_REQUEST_TEMPLATE
= "<ns1:pingMe xmlns:ns1=\"http://apache.org/hello_world_soap_http/types\" />";
private static final QName SAYHI_OPERATION_NAME = new QName(SERVICE_NS, "sayHi");
private static final QName GREETME_OPERATION_NAME = new QName(SERVICE_NS, "greetMe");
private static final QName PINGME_OPERATION_NAME = new QName(SERVICE_NS, "pingMe");
-
+
private DispatchSourceClient() {
@@ -67,15 +67,15 @@ public final class DispatchSourceClient {
public static void main(String args[]) throws Exception {
Server.main(new String[]{"inProcess"});
-
+
Service service = Service.create(SERVICE_NAME);
service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING, ADDRESS);
-
+
Dispatch<Source> dispatch = service.createDispatch(PORT_NAME, Source.class, Service.Mode.PAYLOAD);
-
+
String resp;
Source response;
-
+
System.out.println("Invoking sayHi...");
setOperation(dispatch, SAYHI_OPERATION_NAME);
response = dispatch.invoke(encodeSource(SAYHI_REQUEST_TEMPLATE, null));
@@ -99,9 +99,9 @@ public final class DispatchSourceClient {
}
System.exit(0);
}
-
+
private static void setOperation(Dispatch<Source> dispatch, QName operationName) {
- dispatch.getRequestContext().put(MessageContext.WSDL_OPERATION, operationName);
+ dispatch.getRequestContext().put(MessageContext.WSDL_OPERATION, operationName);
}
private static Source encodeSource(String template, String value) throws IOException {
@@ -118,20 +118,20 @@ public final class DispatchSourceClient {
transformer.transform(source, new SAXResult(handler));
return handler.getValue();
}
-
+
static class ContentHandler extends DefaultHandler {
StringBuffer buffer;
String namespaceURI;
String elementName;
boolean recording;
-
+
ContentHandler(String namespaceURI, String elementName) {
this.namespaceURI = namespaceURI;
this.elementName = elementName;
}
-
+
/* (non-Javadoc)
- * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String,
+ * @see org.xml.sax.helpers.DefaultHandler#startElement(java.lang.String,
* java.lang.String, java.lang.String, org.xml.sax.Attributes)
*/
@Override
@@ -144,7 +144,7 @@ public final class DispatchSourceClient {
/* (non-Javadoc)
- * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String,
+ * @see org.xml.sax.helpers.DefaultHandler#endElement(java.lang.String,
* java.lang.String, java.lang.String)
*/
@Override
@@ -173,5 +173,5 @@ public final class DispatchSourceClient {
public String getValue() {
return buffer == null ? null : buffer.toString();
}
- }
+ }
}
[26/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java
index aa3ef2c..0de1312 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Storage.java
@@ -32,47 +32,47 @@ import org.apache.cxf.helpers.IOUtils;
public class Storage {
private final File folder = new File("files");
-
+
public Storage() throws IOException {
if (!folder.exists() && !folder.mkdirs()) {
throw new IOException("Unable to initialize FS storage:" + folder.getAbsolutePath());
}
-
+
if (!folder.isDirectory() || !folder.canWrite() || !folder.canWrite()) {
throw new IOException("Unable to access FS storage:" + folder.getAbsolutePath());
- }
+ }
}
-
+
public void addDocument(final String name, final byte[] content) throws IOException {
try (InputStream in = new ByteArrayInputStream(content)) {
addDocument(name, in);
}
}
-
- public void addDocument(final String name, final InputStream in) throws IOException {
+
+ public void addDocument(final String name, final InputStream in) throws IOException {
final File f = new File(folder, name);
-
+
if (f.exists() && !f.delete()) {
throw new IOException("Unable to delete FS file:" + f.getAbsolutePath());
- }
-
+ }
+
try (OutputStream out = new BufferedOutputStream(new FileOutputStream(f))) {
out.write(IOUtils.readBytesFromStream(in));
-
+
f.deleteOnExit();
}
}
-
+
public InputStream getDocument(final String name) throws IOException {
final File f = new File(folder, name);
-
+
if (!f.exists() || !f.isFile()) {
throw new FileNotFoundException("Unable to access FS file:" + f.getAbsolutePath());
}
-
+
return new FileInputStream(f);
}
-
+
public void deleteAll() throws IOException {
for (final File f: folder.listFiles()) {
if (!f.delete()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
index 98894b4..915b190 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/SparkUtils.java
@@ -40,15 +40,15 @@ import scala.Tuple2;
public final class SparkUtils {
-
+
private SparkUtils() {
}
-
+
public static JavaPairDStream<String, Integer> createOutputDStream(
JavaDStream<String> receiverStream, boolean withId) {
- final JavaDStream<String> words =
+ final JavaDStream<String> words =
receiverStream.flatMap(x -> withId ? splitInputStringWithId(x) : splitInputString(x));
-
+
final JavaPairDStream<String, Integer> pairs = words.mapToPair(s -> {
return new Tuple2<String, Integer>(s, 1);
});
@@ -73,7 +73,7 @@ public final class SparkUtils {
int index = x.indexOf(":");
String jobId = x.substring(0, index);
x = x.substring(index + 1);
-
+
List<String> list = new LinkedList<String>();
for (String s : Arrays.asList(x.split(" "))) {
s = s.trim();
@@ -98,7 +98,7 @@ public final class SparkUtils {
return getStringsFromReader(new BufferedReader(new StringReader(s)));
}
public static List<String> getStringsFromReader(BufferedReader reader) {
-
+
List<String> inputStrings = new LinkedList<String>();
String userInput = null;
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
index c1a49b2..eb7475e 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
@@ -28,10 +28,10 @@ public class Server {
protected Server(String args[]) throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(StreamingService.class);
-
+
String receiverType = args.length == 1 && args[0].equals("-receiverType=queue")
? "queue" : "string";
- sf.setResourceProvider(StreamingService.class,
+ sf.setResourceProvider(StreamingService.class,
new SingletonResourceProvider(new StreamingService(receiverType)));
sf.setAddress("http://localhost:9000/spark");
@@ -45,6 +45,6 @@ public class Server {
System.out.println("Server exiting");
System.exit(0);
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java
index 216f3f8..0d6a200 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingListener.java
@@ -32,7 +32,7 @@ public class SparkStreamingListener implements StreamingListener {
private SparkStreamingOutput streamOutput;
private boolean batchStarted;
private long batchStartAt;
-
+
public SparkStreamingListener(SparkStreamingOutput streamOutput) {
this.streamOutput = streamOutput;
}
@@ -40,7 +40,7 @@ public class SparkStreamingListener implements StreamingListener {
@Override
public void onBatchCompleted(StreamingListenerBatchCompleted event) {
System.out.println("Batch processing time in millisecs: " + (System.currentTimeMillis() - batchStartAt));
-
+
streamOutput.setSparkBatchCompleted();
}
@@ -87,7 +87,7 @@ public class SparkStreamingListener implements StreamingListener {
// continue
}
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java
index 67e2c84..49db3be 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/SparkStreamingOutput.java
@@ -32,7 +32,7 @@ import org.apache.spark.streaming.api.java.JavaStreamingContext;
public class SparkStreamingOutput implements StreamingOutput {
private BlockingQueue<String> responseQueue = new LinkedBlockingQueue<String>();
-
+
private JavaStreamingContext jssc;
private volatile boolean sparkBatchCompleted;
private volatile boolean outputWriteDone;
@@ -56,13 +56,13 @@ public class SparkStreamingOutput implements StreamingOutput {
// continue;
}
}
-
+
jssc.stop(false);
jssc.close();
System.out.println("Total processing time in millisecs: " + (System.currentTimeMillis() - startAt));
}
-
-
+
+
public void setSparkBatchCompleted() {
this.sparkBatchCompleted = true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
index ee2eade..96259e2 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StreamingService.java
@@ -67,18 +67,18 @@ public class StreamingService {
}
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
new ArrayBlockingQueue<Runnable>(10));
-
+
private String receiverType;
-
+
public StreamingService(String receiverType) {
this.receiverType = receiverType;
}
-
+
@POST
@Path("/multipart")
@Consumes("multipart/form-data")
@Produces("text/plain")
- public void processMultipartStream(@Suspended AsyncResponse async,
+ public void processMultipartStream(@Suspended AsyncResponse async,
@Multipart("file") Attachment att) {
MediaType mediaType = att.getContentType();
if (mediaType == null) {
@@ -90,13 +90,13 @@ public class StreamingService {
}
}
}
-
+
TikaContentExtractor tika = new TikaContentExtractor();
TikaContent tikaContent = tika.extract(att.getObject(InputStream.class),
mediaType);
processStream(async, SparkUtils.getStringsFromString(tikaContent.getContent()));
}
-
+
@POST
@Path("/stream")
@Consumes("text/plain")
@@ -116,12 +116,12 @@ public class StreamingService {
try {
SparkConf sparkConf = new SparkConf().setMaster("local[*]")
.setAppName("JAX-RS Spark Connect " + SparkUtils.getRandomId());
- JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
-
+ JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
+
SparkStreamingOutput streamOut = new SparkStreamingOutput(jssc);
SparkStreamingListener sparkListener = new SparkStreamingListener(streamOut);
jssc.addStreamingListener(sparkListener);
-
+
JavaDStream<String> receiverStream = null;
if ("queue".equals(receiverType)) {
Queue<JavaRDD<String>> rddQueue = new LinkedList<>();
@@ -132,11 +132,11 @@ public class StreamingService {
} else {
receiverStream = jssc.receiverStream(new StringListReceiver(inputStrings));
}
-
+
JavaPairDStream<String, Integer> wordCounts = SparkUtils.createOutputDStream(receiverStream, false);
wordCounts.foreachRDD(new OutputFunction(streamOut));
jssc.start();
-
+
executor.execute(new SparkJob(async, sparkListener));
} catch (Exception ex) {
// the compiler does not allow to catch SparkException directly
@@ -147,13 +147,13 @@ public class StreamingService {
}
}
}
-
+
private void processStreamOneWay(List<String> inputStrings) {
try {
SparkConf sparkConf = new SparkConf().setMaster("local[*]")
.setAppName("JAX-RS Spark Connect OneWay " + SparkUtils.getRandomId());
- JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
-
+ JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
+
JavaDStream<String> receiverStream = null;
if ("queue".equals(receiverType)) {
Queue<JavaRDD<String>> rddQueue = new LinkedList<>();
@@ -164,7 +164,7 @@ public class StreamingService {
} else {
receiverStream = jssc.receiverStream(new StringListReceiver(inputStrings));
}
-
+
JavaPairDStream<String, Integer> wordCounts = SparkUtils.createOutputDStream(receiverStream, false);
wordCounts.foreachRDD(new PrintOutputFunction(jssc));
jssc.start();
@@ -172,8 +172,8 @@ public class StreamingService {
// ignore
}
}
-
-
+
+
private static class OutputFunction implements VoidFunction<JavaPairRDD<String, Integer>> {
private static final long serialVersionUID = 1L;
private SparkStreamingOutput streamOut;
@@ -187,7 +187,7 @@ public class StreamingService {
streamOut.addResponseEntry(value);
}
}
-
+
}
private static class PrintOutputFunction implements VoidFunction<JavaPairRDD<String, Integer>> {
private static final long serialVersionUID = 1L;
@@ -206,7 +206,7 @@ public class StreamingService {
jssc.close();
}
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java
index f5cac28..76432cc 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/StringListReceiver.java
@@ -27,7 +27,7 @@ public class StringListReceiver extends Receiver<String> {
private static final long serialVersionUID = 1L;
private List<String> inputStrings;
-
+
public StringListReceiver(List<String> inputStrings) {
super(StorageLevel.MEMORY_ONLY());
this.inputStrings = inputStrings;
@@ -40,5 +40,5 @@ public class StringListReceiver extends Receiver<String> {
public void onStop() {
// complete
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
index fc7968c..02ece07 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
@@ -45,49 +45,49 @@ import demo.jaxrs.server.simple.SparkStreamingOutput;
public class Server {
protected Server(String args[]) throws Exception {
-
+
ServerSocket sparkServerSocket = new ServerSocket(9999);
ServerSocket jaxrsResponseServerSocket = new ServerSocket(10000);
Socket jaxrsResponseClientSocket = new Socket("localhost", 10000);
-
-
+
+
SparkConf sparkConf = new SparkConf().setMaster("local[*]")
.setAppName("JAX-RS Spark Socket Connect");
- JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
-
+ JavaStreamingContext jssc = new JavaStreamingContext(sparkConf, Durations.seconds(1));
+
SparkStreamingOutput streamOut = new SparkStreamingOutput(jssc);
SparkStreamingListener sparkListener = new SparkStreamingListener(streamOut);
jssc.addStreamingListener(sparkListener);
-
+
JavaDStream<String> receiverStream = jssc.socketTextStream(
"localhost", 9999, StorageLevels.MEMORY_ONLY);
-
+
JavaPairDStream<String, Integer> wordCounts = SparkUtils.createOutputDStream(receiverStream, true);
PrintStream sparkResponseOutputStream = new PrintStream(jaxrsResponseClientSocket.getOutputStream(), true);
wordCounts.foreachRDD(new SocketOutputFunction(sparkResponseOutputStream));
-
+
jssc.start();
-
+
Socket receiverClientSocket = sparkServerSocket.accept();
PrintStream sparkOutputStream = new PrintStream(receiverClientSocket.getOutputStream(), true);
- BufferedReader sparkInputStream =
+ BufferedReader sparkInputStream =
new BufferedReader(new InputStreamReader(jaxrsResponseServerSocket.accept().getInputStream()));
-
-
+
+
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
-
+
sf.setResourceClasses(StreamingService.class);
- sf.setResourceProvider(StreamingService.class,
+ sf.setResourceProvider(StreamingService.class,
new SingletonResourceProvider(new StreamingService(sparkInputStream,
sparkOutputStream)));
sf.setAddress("http://localhost:9000/spark");
sf.create();
-
+
jssc.awaitTermination();
sparkServerSocket.close();
jaxrsResponseServerSocket.close();
jaxrsResponseClientSocket.close();
-
+
}
public static void main(String args[]) throws Exception {
@@ -97,7 +97,7 @@ public class Server {
System.out.println("Server exiting");
System.exit(0);
}
-
+
private static class SocketOutputFunction implements VoidFunction<JavaPairRDD<String, Integer>> {
private static final long serialVersionUID = 1L;
private PrintStream streamOut;
@@ -115,14 +115,14 @@ public class Server {
int index = value.indexOf(":");
jobId = value.substring(0, index);
printStream = "oneway".equals(jobId) ? System.out : streamOut;
-
+
}
printStream.println(value);
}
printStream.println(jobId + ":" + "<batchEnd>");
}
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java
index 9128a4e..8f5458d 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkJob.java
@@ -45,7 +45,7 @@ public class SparkJob implements Runnable {
String jobId = SparkUtils.getRandomId();
BlockingQueue<String> queue = new LinkedBlockingQueue<String>();
sparkResponses.put(jobId, queue);
-
+
for (String s : inputStrings) {
sparkOutputStream.println(jobId + ":" + s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java
index eb0286b..35ba4c5 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkResultJob.java
@@ -33,7 +33,7 @@ public class SparkResultJob implements Runnable {
this.sparkInputStream = sparkInputStream;
}
-
+
@Override
public void run() {
try {
@@ -45,7 +45,7 @@ public class SparkResultJob implements Runnable {
sparkResponses.get(jobId).offer(value);
}
} catch (IOException ex) {
- // ignore
+ // ignore
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java
index 681395a..7972843 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/SparkStreamingOutput.java
@@ -57,6 +57,6 @@ public class SparkStreamingOutput implements StreamingOutput {
} catch (InterruptedException ex) {
// ignore
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
index e0e185b..ff72942 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/StreamingService.java
@@ -59,20 +59,20 @@ public class StreamingService {
}
private Executor executor = new ThreadPoolExecutor(5, 5, 0, TimeUnit.SECONDS,
new ArrayBlockingQueue<Runnable>(10));
- private Map<String, BlockingQueue<String>> sparkResponses =
+ private Map<String, BlockingQueue<String>> sparkResponses =
new ConcurrentHashMap<String, BlockingQueue<String>>();
private PrintStream sparkOutputStream;
-
+
public StreamingService(BufferedReader sparkInputStream, PrintStream sparkOutputStream) {
this.sparkOutputStream = sparkOutputStream;
executor.execute(new SparkResultJob(sparkResponses, sparkInputStream));
}
-
+
@POST
@Path("/multipart")
@Consumes("multipart/form-data")
@Produces("text/plain")
- public void processMultipartStream(@Suspended AsyncResponse async,
+ public void processMultipartStream(@Suspended AsyncResponse async,
@Multipart("file") Attachment att) {
MediaType mediaType = att.getContentType();
if (mediaType == null) {
@@ -84,13 +84,13 @@ public class StreamingService {
}
}
}
-
+
TikaContentExtractor tika = new TikaContentExtractor();
TikaContent tikaContent = tika.extract(att.getObject(InputStream.class),
mediaType);
processStream(async, SparkUtils.getStringsFromString(tikaContent.getContent()));
}
-
+
@POST
@Path("/stream")
@Consumes("text/plain")
@@ -103,7 +103,7 @@ public class StreamingService {
executor.execute(
new SparkJob(async, sparkResponses, sparkOutputStream, inputStrings));
}
-
+
@POST
@Path("/streamOneWay")
@Consumes("text/plain")
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
index aeb054b..cb5e139 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -36,10 +36,10 @@ public class SampleRestClientApplication {
new SpringApplicationBuilder(SampleRestClientApplication.class)
.web(false)
.run(args);
- }
+ }
@Bean
CommandLineRunner initWebClientRunner(final WebClient webClient) {
-
+
return new CommandLineRunner() {
@Override
@@ -50,7 +50,7 @@ public class SampleRestClientApplication {
}
@Bean
CommandLineRunner initProxyClientRunner(final HelloService client) {
-
+
return new CommandLineRunner() {
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
index bd37a96..eb3678f 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/HelloService.java
@@ -24,14 +24,14 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.springframework.stereotype.Service;
-
+
@Path("/sayHello")
@Service
public interface HelloService {
-
+
@GET
@Path("/{a}")
@Produces(MediaType.TEXT_PLAIN)
String sayHello(@PathParam("a") String a);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
index 358ca4a..4d8b54b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -39,7 +39,7 @@ public class SampleRestApplication {
public static void main(String[] args) {
SpringApplication.run(SampleRestApplication.class, args);
}
-
+
@Bean
public Server rsServer() {
JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
index 0e5d9b8..481a787 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
@@ -19,12 +19,12 @@
package sample.rs.service.hello1;
import io.swagger.annotations.Api;
import sample.rs.service.HelloService;
-
+
@Api("/sayHello")
public class HelloServiceImpl1 implements HelloService {
-
+
public String sayHello(String a) {
return "Hello " + a + ", Welcome to CXF RS Spring Boot World!!!";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
index 9b24c29..ee44929 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
@@ -24,9 +24,9 @@ import sample.rs.service.HelloService;
@Path("/sayHello2")
@Api("/sayHello2")
public class HelloServiceImpl2 implements HelloService {
-
+
public String sayHello(String a) {
return "Hello2 " + a + ", Welcome to CXF RS Spring Boot World!!!";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
index 706b054..25bda5b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/HelloService.java
@@ -22,13 +22,13 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-
+
@Path("/sayHello")
public interface HelloService {
-
+
@GET
@Path("/{a}")
@Produces(MediaType.TEXT_PLAIN)
String sayHello(@PathParam("a") String a);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index 35bf34a..1f3ff56 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -37,7 +37,7 @@ public class SampleRestApplication {
public MetricRegistry metricRegistry() {
return new MetricRegistry();
}
-
+
@Bean
public MetricsEndpoint metricsEndpoint(final MetricRegistry registry) {
return new MetricsEndpoint(Collections.singleton(new MetricReaderPublicMetrics(
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
index 4ebe2bb..d07b136 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java
@@ -21,13 +21,13 @@ import org.springframework.stereotype.Service;
import io.swagger.annotations.Api;
import sample.rs.service.HelloService;
-
+
@Api("/sayHello")
@Service
public class HelloServiceImpl1 implements HelloService {
-
+
public String sayHello(String a) {
return "Hello " + a + ", Welcome to CXF RS Spring Boot World!!!";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
index 23f8a1d..ad0aca2 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java
@@ -28,9 +28,9 @@ import sample.rs.service.HelloService;
@Api("/sayHello2")
@Service
public class HelloServiceImpl2 implements HelloService {
-
+
public String sayHello(String a) {
return "Hello2 " + a + ", Welcome to CXF RS Spring Boot World!!!";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
index fac11e6..9f8b928 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/client/SampleRestClientApplication.java
@@ -49,10 +49,10 @@ public class SampleRestClientApplication {
new SpringApplicationBuilder(SampleRestClientApplication.class)
.web(false)
.run(args);
- }
+ }
@Bean
CommandLineRunner initProxyClient(final HelloService service) {
-
+
return new CommandLineRunner() {
@Override
public void run(String... runArgs) throws Exception {
@@ -73,11 +73,11 @@ public class SampleRestClientApplication {
@Autowired
DiscoveryClient discoveryClient;
List<String> addresses = new LinkedList<String>();
-
+
EurekaFailoverFeature() {
super("eureka://registry");
}
-
+
@Override
public FailoverStrategy getStrategy() {
for (ServiceInstance s : discoveryClient.getInstances("jaxrs-hello-world-service")) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
index 706b054..25bda5b 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/src/main/java/sample/rs/service/HelloService.java
@@ -22,13 +22,13 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
-
+
@Path("/sayHello")
public interface HelloService {
-
+
@GET
@Path("/{a}")
@Produces(MediaType.TEXT_PLAIN)
String sayHello(@PathParam("a") String a);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
index 4dfac8b..b691d80 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
@@ -41,115 +41,115 @@ public final class Client {
System.out.println("\n");
Client c = new Client();
-
- // 1. get customer info
- //
+
+ // 1. get customer info
+ //
c.getCustomerInfo("fred", "fred", 123);
c.getCustomerInfo("fred", "fredspassword", 123);
c.getCustomerInfo("bob", "bobspassword", 123);
- // 2. add customer info
- //
+ // 2. add customer info
+ //
c.addCustomerInfo("fred", "fredspassword");
c.addCustomerInfo("bob", "bobspassword");
-
- // 3. update customer info
- //
+
+ // 3. update customer info
+ //
c.updateCustomerInfo("fred", "fredspassword");
c.updateCustomerInfo("bob", "bobspassword");
- // 4. delete customer info
- //
+ // 4. delete customer info
+ //
c.deleteCustomerInfo("bob", "bobspassword", 123);
c.deleteCustomerInfo("fred", "fredspassword", 123);
-
+
}
public void getCustomerInfo(String name, String password, int id) throws Exception {
-
- System.out.println("HTTP GET to query customer info, user : "
+
+ System.out.println("HTTP GET to query customer info, user : "
+ name + ", password : " + password);
- GetMethod get =
+ GetMethod get =
new GetMethod("http://localhost:9002/customerservice/customers/" + id);
setMethodHeaders(get, name, password);
handleHttpMethod(get);
- }
+ }
public void addCustomerInfo(String name, String password) throws Exception {
-
- System.out.println("HTTP POST to add customer info, user : "
+
+ System.out.println("HTTP POST to add customer info, user : "
+ name + ", password : " + password);
PostMethod post = new PostMethod("http://localhost:9002/customerservice/customers");
setMethodHeaders(post, name, password);
RequestEntity entity = new InputStreamRequestEntity(
this.getClass().getClassLoader().getResourceAsStream("add_customer.xml"));
post.setRequestEntity(entity);
-
+
handleHttpMethod(post);
- }
+ }
public void updateCustomerInfo(String name, String password) throws Exception {
-
- System.out.println("HTTP PUT to update customer info, user : "
+
+ System.out.println("HTTP PUT to update customer info, user : "
+ name + ", password : " + password);
PutMethod put = new PutMethod("http://localhost:9002/customerservice/customers/123");
setMethodHeaders(put, name, password);
RequestEntity entity = new InputStreamRequestEntity(
this.getClass().getClassLoader().getResourceAsStream("update_customer.xml"));
put.setRequestEntity(entity);
-
+
handleHttpMethod(put);
- }
+ }
public void deleteCustomerInfo(String name, String password, int id) throws Exception {
-
- System.out.println("HTTP DELETE to update customer info, user : "
+
+ System.out.println("HTTP DELETE to update customer info, user : "
+ name + ", password : " + password);
System.out.println("Confirming a customer with id " + id + " exists first");
getCustomerInfo(name, password, id);
System.out.println("Deleting now...");
- DeleteMethod del =
+ DeleteMethod del =
new DeleteMethod("http://localhost:9002/customerservice/customers/" + id);
setMethodHeaders(del, name, password);
handleHttpMethod(del);
System.out.println("Confirming a customer with id " + id + " does not exist anymore");
getCustomerInfo(name, password, id);
- }
+ }
private static void handleHttpMethod(HttpMethod httpMethod) throws Exception {
HttpClient client = new HttpClient();
try {
int statusCode = client.executeMethod(httpMethod);
- System.out.println("Response status : " + statusCode);
+ System.out.println("Response status : " + statusCode);
Response.Status status = Response.Status.fromStatusCode(statusCode);
if (status == Response.Status.OK) {
- System.out.println(httpMethod.getResponseBodyAsString());
+ System.out.println(httpMethod.getResponseBodyAsString());
} else if (status == Response.Status.FORBIDDEN) {
System.out.println("Authorization failure");
} else if (status == Response.Status.UNAUTHORIZED) {
System.out.println("Authentication failure");
}
- System.out.println();
+ System.out.println();
} finally {
// release any connection resources used by the method
httpMethod.releaseConnection();
- }
+ }
}
private static void setMethodHeaders(HttpMethod httpMethod, String name, String password) {
if (httpMethod instanceof PostMethod || httpMethod instanceof PutMethod) {
httpMethod.setRequestHeader("Content-Type", "application/xml");
- }
+ }
httpMethod.setDoAuthentication(false);
httpMethod.setRequestHeader("Accept", "application/xml");
- httpMethod.setRequestHeader("Authorization",
+ httpMethod.setRequestHeader("Authorization",
"Basic " + base64Encode(name + ":" + password));
-
+
}
private static String base64Encode(String value) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
index 27141f4..e0cda41 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/AbstractCustomerServiceSecured.java
@@ -31,14 +31,14 @@ import javax.ws.rs.core.Response;
@Path("/customerservice/")
public abstract class AbstractCustomerServiceSecured implements CustomerServiceSecured {
-
+
protected long currentId = 123;
protected Map<Long, Customer> customers = new HashMap<Long, Customer>();
protected Map<Long, Order> orders = new HashMap<Long, Order>();
protected AbstractCustomerServiceSecured() {
init();
- }
+ }
@GET
@Path("/customers/{id}/")
@@ -47,7 +47,7 @@ public abstract class AbstractCustomerServiceSecured implements CustomerServiceS
@PUT
@Path("/customers/{id}")
public abstract Response updateCustomer(@PathParam("id") Long id, Customer customer);
-
+
@POST
@Path("/customers/")
public abstract Response addCustomer(Customer customer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
index b623f92..310c83d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerService.java
@@ -28,7 +28,7 @@ import javax.ws.rs.core.Response;
@Path("/customerservice/")
public interface CustomerService {
-
+
@GET
@Path("/customers/{id}/")
Customer getCustomer(@PathParam("id") String id);
@@ -36,7 +36,7 @@ public interface CustomerService {
@PUT
@Path("/customers/{id}")
Response updateCustomer(@PathParam("id") Long id, Customer customer);
-
+
@POST
@Path("/customers/")
Response addCustomer(Customer customer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
index 699a448..0566f2d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecured.java
@@ -23,13 +23,13 @@ import org.springframework.security.access.annotation.Secured;
public interface CustomerServiceSecured {
-
+
@Secured({"ROLE_CUSTOMER", "ROLE_ADMIN" })
Customer getCustomer(String id);
@Secured("ROLE_ADMIN")
Response updateCustomer(Long id, Customer customer);
-
+
@Secured("ROLE_ADMIN")
Response addCustomer(Customer customer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
index ff05d35..7bf04c4 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/service/CustomerServiceSecuredImpl.java
@@ -75,6 +75,6 @@ public class CustomerServiceSecuredImpl extends AbstractCustomerServiceSecured {
return c;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java
index 874047c..95f7619 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/Stats.java
@@ -29,7 +29,7 @@ public class Stats implements Serializable {
private long timestamp;
private int load;
-
+
public Stats() {
}
@@ -41,7 +41,7 @@ public class Stats implements Serializable {
public long getTimestamp() {
return timestamp;
}
-
+
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
index edf8a2b..a313967 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsApplication.java
@@ -32,7 +32,7 @@ import org.apache.cxf.jaxrs.sse.SseFeature;
@ApplicationPath("api")
public class StatsApplication extends Application {
@Inject private StatsRestServiceImpl statsRestService;
-
+
@Override
public Set<Object> getSingletons() {
final Set<Object> singletons = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index a156125..f1fa6a4 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -70,7 +70,7 @@ public class StatsRestServiceImpl {
}
}.start();
}
-
+
private static OutboundSseEvent createStatsEvent(final OutboundSseEvent.Builder builder, final int eventId) {
return builder
.id("" + eventId)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
index c227718..f13318d 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_cdi/src/main/java/demo/jaxrs/sse/StatsServer.java
@@ -31,7 +31,7 @@ import org.jboss.weld.environment.servlet.Listener;
public final class StatsServer {
private StatsServer() {
}
-
+
public static void main(final String[] args) throws Exception {
final Server server = new Server(8686);
@@ -54,7 +54,7 @@ public final class StatsServer {
HandlerList handlers = new HandlerList();
handlers.addHandler(staticContext);
handlers.addHandler(context);
-
+
server.setHandler(handlers);
server.start();
server.join();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java
index 874047c..95f7619 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/Stats.java
@@ -29,7 +29,7 @@ public class Stats implements Serializable {
private long timestamp;
private int load;
-
+
public Stats() {
}
@@ -41,7 +41,7 @@ public class Stats implements Serializable {
public long getTimestamp() {
return timestamp;
}
-
+
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
index 57a163f..3380050 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsConfig.java
@@ -35,9 +35,9 @@ import org.springframework.context.annotation.DependsOn;
@Configuration
@ComponentScan(basePackageClasses = StatsRestServiceImpl.class)
public class StatsConfig {
- @Inject
+ @Inject
private StatsRestServiceImpl statsRestService;
-
+
@Bean(destroyMethod = "shutdown")
SpringBus cxf() {
return new SpringBus();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index 005c2bf..dc07af6 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Component;
public class StatsRestServiceImpl {
private static final Random RANDOM = new Random();
private final Sse sse = SseFactory.create();
-
+
@GET
@Path("sse/{id}")
@Produces(MediaType.SERVER_SENT_EVENTS)
@@ -72,7 +72,7 @@ public class StatsRestServiceImpl {
}
}.start();
}
-
+
private static OutboundSseEvent createStatsEvent(final OutboundSseEvent.Builder builder, final int eventId) {
return builder
.id("" + eventId)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
index 06a1e04..4896045 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_spring/src/main/java/demo/jaxrs/sse/StatsServer.java
@@ -31,7 +31,7 @@ import org.springframework.web.context.support.AnnotationConfigWebApplicationCon
public final class StatsServer {
private StatsServer() {
}
-
+
public static void main(final String[] args) throws Exception {
final Server server = new Server(8686);
@@ -54,7 +54,7 @@ public final class StatsServer {
HandlerList handlers = new HandlerList();
handlers.addHandler(staticContext);
handlers.addHandler(context);
-
+
server.setHandler(handlers);
server.start();
server.join();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java
index 874047c..95f7619 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/Stats.java
@@ -29,7 +29,7 @@ public class Stats implements Serializable {
private long timestamp;
private int load;
-
+
public Stats() {
}
@@ -41,7 +41,7 @@ public class Stats implements Serializable {
public long getTimestamp() {
return timestamp;
}
-
+
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
index f937702..f1fa6a4 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsRestServiceImpl.java
@@ -39,7 +39,7 @@ import org.apache.cxf.jaxrs.sse.SseFactory;
public class StatsRestServiceImpl {
private static final Random RANDOM = new Random();
private final Sse sse = SseFactory.create();
-
+
@GET
@Path("sse/{id}")
@Produces(MediaType.SERVER_SENT_EVENTS)
@@ -70,7 +70,7 @@ public class StatsRestServiceImpl {
}
}.start();
}
-
+
private static OutboundSseEvent createStatsEvent(final OutboundSseEvent.Builder builder, final int eventId) {
return builder
.id("" + eventId)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java
index 8a8831b..9a11851 100644
--- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java
+++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java
@@ -35,15 +35,15 @@ import org.springframework.web.context.ContextLoaderListener;
public final class StatsServer {
private StatsServer() {
}
-
+
public static void main(final String[] args) throws Exception {
// Register and map the dispatcher servlet
final File base = new File(System.getProperty("java.io.tmpdir"));
-
+
final Tomcat server = new Tomcat();
server.setPort(8686);
server.setBaseDir(base.getAbsolutePath());
-
+
final StandardContext context = (StandardContext)server.addWebapp("/", base.getAbsolutePath());
context.setConfigFile(StatsServer.class.getResource("/META-INF/context.xml"));
context.addApplicationListener(ContextLoaderListener.class.getName());
@@ -58,8 +58,8 @@ public final class StatsServer {
Tomcat.addServlet(staticContext, "cxfStaticServlet", new DefaultServlet());
staticContext.addServletMapping("/static/*", "cxfStaticServlet");
staticContext.setResources(resourcesFrom(staticContext, "target/classes/web-ui"));
- staticContext.setParentClassLoader(Thread.currentThread().getContextClassLoader());
-
+ staticContext.setParentClassLoader(Thread.currentThread().getContextClassLoader());
+
server.start();
server.getServer().await();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
index 39ba835..6390237 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -32,16 +32,16 @@ import org.apache.cxf.tracing.brave.jaxrs.BraveClientProvider;
public final class Client {
private Client() {
}
-
+
public static void main(final String[] args) throws Exception {
final Brave brave = new Brave.Builder().build();
final BraveClientProvider provider = new BraveClientProvider(brave);
-
+
final Response response = WebClient
.create("http://localhost:9000/catalog", Arrays.asList(provider))
.accept(MediaType.APPLICATION_JSON)
.get();
-
+
System.out.println(response.readEntity(String.class));
response.close();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 35110b2..141effc 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -50,20 +50,20 @@ import org.apache.cxf.tracing.TracerContext;
public class Catalog {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final CatalogStore store;
-
+
public Catalog() {
store = new CatalogStore();
}
-
+
@POST
@Produces(MediaType.APPLICATION_JSON)
- public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
+ public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
@FormParam("title") final String title) {
try {
final String id = UUID.randomUUID().toString();
-
+
executor.submit(
- tracing.wrap("Inserting New Book",
+ tracing.wrap("Inserting New Book",
new Traceable<Void>() {
public Void call(final TracerContext context) throws Exception {
store.put(id, title);
@@ -72,7 +72,7 @@ public class Catalog {
}
)
).get(10, TimeUnit.SECONDS);
-
+
return Response
.created(uriInfo.getRequestUriBuilder().path(id).build())
.build();
@@ -86,10 +86,10 @@ public class Catalog {
.build();
}
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
- public void getBooks(@Suspended final AsyncResponse response,
+ public void getBooks(@Suspended final AsyncResponse response,
@Context final TracerContext tracing) throws Exception {
tracing.continueSpan(new Traceable<Void>() {
@Override
@@ -101,25 +101,25 @@ public class Catalog {
return null;
}
}));
-
+
return null;
}
});
}
-
+
@GET
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
public JsonObject getBook(@PathParam("id") final String id) throws IOException {
final JsonObject book = store.get(id);
-
+
if (book == null) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return book;
}
-
+
@DELETE
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
@@ -127,7 +127,7 @@ public class Catalog {
if (!store.remove(id)) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return Response.ok().build();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index bdbd573..d68ba66 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -30,17 +30,17 @@ import javax.json.JsonObject;
public class CatalogStore {
private final Map<String, String> books = new ConcurrentHashMap<>();
-
+
public CatalogStore() {
}
-
+
public boolean remove(final String key) throws IOException {
return books.remove(key) != null;
}
-
+
public JsonObject get(final String key) throws IOException {
final String title = books.get(key);
-
+
if (title != null) {
return Json.createObjectBuilder()
.add("id", key)
@@ -50,21 +50,21 @@ public class CatalogStore {
return null;
}
-
+
public void put(final String key, final String title) throws IOException {
books.put(key, title);
}
-
+
public JsonArray scan() throws IOException {
final JsonArrayBuilder builder = Json.createArrayBuilder();
-
+
for (final Map.Entry<String, String> entry: books.entrySet()) {
builder.add(Json.createObjectBuilder()
.add("id", entry.getKey())
.add("title", entry.getValue())
);
}
-
+
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
index 407300b..c57083d 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -29,11 +29,11 @@ public class Server {
// Register and map the dispatcher servlet
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(servletHolder, "/*");
-
- servletHolder.setInitParameter("javax.ws.rs.Application",
+
+ servletHolder.setInitParameter("javax.ws.rs.Application",
CatalogApplication.class.getName());
server.setHandler(context);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index 35110b2..141effc 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -50,20 +50,20 @@ import org.apache.cxf.tracing.TracerContext;
public class Catalog {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final CatalogStore store;
-
+
public Catalog() {
store = new CatalogStore();
}
-
+
@POST
@Produces(MediaType.APPLICATION_JSON)
- public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
+ public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
@FormParam("title") final String title) {
try {
final String id = UUID.randomUUID().toString();
-
+
executor.submit(
- tracing.wrap("Inserting New Book",
+ tracing.wrap("Inserting New Book",
new Traceable<Void>() {
public Void call(final TracerContext context) throws Exception {
store.put(id, title);
@@ -72,7 +72,7 @@ public class Catalog {
}
)
).get(10, TimeUnit.SECONDS);
-
+
return Response
.created(uriInfo.getRequestUriBuilder().path(id).build())
.build();
@@ -86,10 +86,10 @@ public class Catalog {
.build();
}
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
- public void getBooks(@Suspended final AsyncResponse response,
+ public void getBooks(@Suspended final AsyncResponse response,
@Context final TracerContext tracing) throws Exception {
tracing.continueSpan(new Traceable<Void>() {
@Override
@@ -101,25 +101,25 @@ public class Catalog {
return null;
}
}));
-
+
return null;
}
});
}
-
+
@GET
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
public JsonObject getBook(@PathParam("id") final String id) throws IOException {
final JsonObject book = store.get(id);
-
+
if (book == null) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return book;
}
-
+
@DELETE
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
@@ -127,7 +127,7 @@ public class Catalog {
if (!store.remove(id)) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return Response.ok().build();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index bdbd573..d68ba66 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave_osgi/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -30,17 +30,17 @@ import javax.json.JsonObject;
public class CatalogStore {
private final Map<String, String> books = new ConcurrentHashMap<>();
-
+
public CatalogStore() {
}
-
+
public boolean remove(final String key) throws IOException {
return books.remove(key) != null;
}
-
+
public JsonObject get(final String key) throws IOException {
final String title = books.get(key);
-
+
if (title != null) {
return Json.createObjectBuilder()
.add("id", key)
@@ -50,21 +50,21 @@ public class CatalogStore {
return null;
}
-
+
public void put(final String key, final String title) throws IOException {
books.put(key, title);
}
-
+
public JsonArray scan() throws IOException {
final JsonArrayBuilder builder = Json.createArrayBuilder();
-
+
for (final Map.Entry<String, String> entry: books.entrySet()) {
builder.add(Json.createObjectBuilder()
.add("id", entry.getKey())
.add("title", entry.getValue())
);
}
-
+
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
index c2047ee8..b90b3f6 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/client/Client.java
@@ -37,22 +37,22 @@ import demo.jaxrs.tracing.conf.TracingConfiguration;
public final class Client {
private Client() {
}
-
+
public static void main(final String[] args) throws Exception {
final Map<String, String> properties = new HashMap<String, String>();
properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TracingConfiguration.SPAN_RECEIVER.getName());
properties.put(Tracer.SAMPLER_CLASSES_KEY, AlwaysSampler.class.getName());
-
+
final Tracer tracer = new Tracer.Builder("catalog-client")
.conf(HTraceConfiguration.fromMap(properties))
.build();
-
+
final HTraceClientProvider provider = new HTraceClientProvider(tracer);
final Response response = WebClient
.create("http://localhost:9000/catalog", Arrays.asList(provider))
.accept(MediaType.APPLICATION_JSON)
.get();
-
+
System.out.println(response.readEntity(String.class));
response.close();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
index a15c17a..ca86613 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/conf/TracingConfiguration.java
@@ -25,9 +25,9 @@ import org.apache.htrace.core.StandardOutSpanReceiver;
public final class TracingConfiguration {
public static final Class<? extends SpanReceiver> SPAN_RECEIVER = StandardOutSpanReceiver.class;
// Apache HBase client still uses Apache HTrace 3.x release branch
- public static final Class<? extends org.apache.htrace.SpanReceiver> HBASE_SPAN_RECEIVER =
+ public static final Class<? extends org.apache.htrace.SpanReceiver> HBASE_SPAN_RECEIVER =
org.apache.htrace.impl.StandardOutSpanReceiver.class;
-
+
private TracingConfiguration() {
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
index b5017c2..57e66d4 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Catalog.java
@@ -55,7 +55,7 @@ import demo.jaxrs.tracing.conf.TracingConfiguration;
public class Catalog {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final CatalogStore store;
-
+
public Catalog() throws IOException {
final Configuration configuration = HBaseConfiguration.create();
configuration.set("hbase.zookeeper.quorum", "hbase");
@@ -63,16 +63,16 @@ public class Catalog {
configuration.set(SpanReceiverHost.SPAN_RECEIVERS_CONF_KEY, TracingConfiguration.HBASE_SPAN_RECEIVER.getName());
store = new CatalogStore(configuration, "catalog");
}
-
+
@POST
@Produces(MediaType.APPLICATION_JSON)
- public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
+ public Response addBook(@Context final UriInfo uriInfo, @Context final TracerContext tracing,
@FormParam("title") final String title) {
try {
final String id = UUID.randomUUID().toString();
-
+
executor.submit(
- tracing.wrap("Inserting New Book",
+ tracing.wrap("Inserting New Book",
new Traceable<Void>() {
public Void call(final TracerContext context) throws Exception {
store.put(id, title);
@@ -81,7 +81,7 @@ public class Catalog {
}
)
).get(10, TimeUnit.SECONDS);
-
+
return Response
.created(uriInfo.getRequestUriBuilder().path(id).build())
.build();
@@ -95,10 +95,10 @@ public class Catalog {
.build();
}
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
- public void getBooks(@Suspended final AsyncResponse response,
+ public void getBooks(@Suspended final AsyncResponse response,
@Context final TracerContext tracing) throws Exception {
tracing.continueSpan(new Traceable<Void>() {
@Override
@@ -110,25 +110,25 @@ public class Catalog {
return null;
}
}));
-
+
return null;
}
});
}
-
+
@GET
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
public JsonObject getBook(@PathParam("id") final String id) throws IOException {
final JsonObject book = store.get(id);
-
+
if (book == null) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return book;
}
-
+
@DELETE
@Path("/{id}")
@Produces(MediaType.APPLICATION_JSON)
@@ -136,7 +136,7 @@ public class Catalog {
if (!store.remove(id)) {
throw new NotFoundException("Book with does not exists: " + id);
}
-
+
return Response.ok().build();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
index 175e9d5..eb63e8c 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogApplication.java
@@ -53,7 +53,7 @@ public class CatalogApplication extends Application {
throw new RuntimeException("Failed to initaliaze JAX-RS application", ex);
}
}
-
+
private static Map<String, String> getTracingProperties() {
final Map<String, String> properties = new HashMap<String, String>();
properties.put(Tracer.SPAN_RECEIVER_CLASSES_KEY, TracingConfiguration.SPAN_RECEIVER.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index 060cbbb..6036f15 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -47,13 +47,13 @@ public class CatalogStore {
private final SpanReceiverHost spanReceiverHost;
private final Connection connection;
private final String tableName;
-
+
public CatalogStore(final Configuration configuration, final String tableName) throws IOException {
this.connection = ConnectionFactory.createConnection(configuration);
this.spanReceiverHost = SpanReceiverHost.getInstance(configuration);
this.tableName = tableName;
}
-
+
public boolean remove(final String key) throws IOException {
try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
if (get(key) != null) {
@@ -62,28 +62,28 @@ public class CatalogStore {
return true;
}
}
-
+
return false;
}
-
+
public JsonObject get(final String key) throws IOException {
try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
final Get get = new Get(Bytes.toBytes(key));
final Result result = table.get(get);
-
+
if (!result.isEmpty()) {
final Cell cell = result.getColumnLatestCell(Bytes.toBytes("c"), Bytes.toBytes("title"));
-
+
return Json.createObjectBuilder()
.add("id", Bytes.toString(CellUtil.cloneRow(cell)))
.add("title", Bytes.toString(CellUtil.cloneValue(cell)))
.build();
}
}
-
+
return null;
}
-
+
public void put(final String key, final String title) throws IOException {
try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
final Put put = new Put(Bytes.toBytes(key));
@@ -91,23 +91,23 @@ public class CatalogStore {
table.put(put);
}
}
-
+
public JsonArray scan() throws IOException {
final JsonArrayBuilder builder = Json.createArrayBuilder();
-
+
try (final Table table = connection.getTable(TableName.valueOf(tableName))) {
final Scan scan = new Scan();
final ResultScanner results = table.getScanner(scan);
for (final Result result: results) {
final Cell cell = result.getColumnLatestCell(Bytes.toBytes("c"), Bytes.toBytes("title"));
-
+
builder.add(Json.createObjectBuilder()
.add("id", Bytes.toString(CellUtil.cloneRow(cell)))
.add("title", Bytes.toString(CellUtil.cloneValue(cell)))
);
}
}
-
+
return builder.build();
}
[39/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java
index 73cb9f6..b6e2da7 100755
--- a/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptor.java
@@ -1,96 +1,96 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.interceptor.security;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.security.SecurityContext;
-import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.service.model.OperationInfo;
-
-/**
- *
- */
-public class OperationInfoAuthorizingInterceptor extends SimpleAuthorizingInterceptor {
- private static final Logger LOG = LogUtils.getL7dLogger(OperationInfoAuthorizingInterceptor.class);
-
- @Override
- public void handleMessage(Message message) throws Fault {
- OperationInfo opinfo = getTargetOperationInfo(message);
- SecurityContext sc = message.get(SecurityContext.class);
- if (sc != null && sc.getUserPrincipal() != null) {
- if (opinfo.getName() != null
- && authorize(sc, opinfo.getName().getLocalPart())) {
- return;
- }
- } else if (!isMethodProtected(opinfo.getName().getLocalPart()) && isAllowAnonymousUsers()) {
- return;
- }
-
- throw new AccessDeniedException("Unauthorized");
-
- }
-
- protected boolean authorize(SecurityContext sc, String key) {
- List<String> expectedRoles = getExpectedRoles(key);
- if (expectedRoles.isEmpty()) {
- List<String> denyRoles = getDenyRoles(key);
- return denyRoles.isEmpty() ? true : isUserInRole(sc, denyRoles, true);
- }
-
- if (isUserInRole(sc, expectedRoles, false)) {
- return true;
- }
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine(sc.getUserPrincipal().getName() + " is not authorized");
- }
- return false;
- }
-
- protected OperationInfo getTargetOperationInfo(Message message) {
- BindingOperationInfo bop = message.getExchange().getBindingOperationInfo();
- if (bop != null) {
- return bop.getOperationInfo();
- }
- throw new AccessDeniedException("OperationInfo is not available : Unauthorized");
- }
-
- protected List<String> getExpectedRoles(String key) {
- List<String> roles = methodRolesMap.get(key);
- if (roles != null) {
- return roles;
- }
- return globalRoles;
- }
-
- protected List<String> getDenyRoles(String key) {
- return Collections.emptyList();
- }
-
- protected boolean isMethodProtected(String key) {
- return !getExpectedRoles(key).isEmpty() || !getDenyRoles(key).isEmpty();
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.interceptor.security;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.security.SecurityContext;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.apache.cxf.service.model.OperationInfo;
+
+/**
+ *
+ */
+public class OperationInfoAuthorizingInterceptor extends SimpleAuthorizingInterceptor {
+ private static final Logger LOG = LogUtils.getL7dLogger(OperationInfoAuthorizingInterceptor.class);
+
+ @Override
+ public void handleMessage(Message message) throws Fault {
+ OperationInfo opinfo = getTargetOperationInfo(message);
+ SecurityContext sc = message.get(SecurityContext.class);
+ if (sc != null && sc.getUserPrincipal() != null) {
+ if (opinfo.getName() != null
+ && authorize(sc, opinfo.getName().getLocalPart())) {
+ return;
+ }
+ } else if (!isMethodProtected(opinfo.getName().getLocalPart()) && isAllowAnonymousUsers()) {
+ return;
+ }
+
+ throw new AccessDeniedException("Unauthorized");
+
+ }
+
+ protected boolean authorize(SecurityContext sc, String key) {
+ List<String> expectedRoles = getExpectedRoles(key);
+ if (expectedRoles.isEmpty()) {
+ List<String> denyRoles = getDenyRoles(key);
+ return denyRoles.isEmpty() ? true : isUserInRole(sc, denyRoles, true);
+ }
+
+ if (isUserInRole(sc, expectedRoles, false)) {
+ return true;
+ }
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine(sc.getUserPrincipal().getName() + " is not authorized");
+ }
+ return false;
+ }
+
+ protected OperationInfo getTargetOperationInfo(Message message) {
+ BindingOperationInfo bop = message.getExchange().getBindingOperationInfo();
+ if (bop != null) {
+ return bop.getOperationInfo();
+ }
+ throw new AccessDeniedException("OperationInfo is not available : Unauthorized");
+ }
+
+ protected List<String> getExpectedRoles(String key) {
+ List<String> roles = methodRolesMap.get(key);
+ if (roles != null) {
+ return roles;
+ }
+ return globalRoles;
+ }
+
+ protected List<String> getDenyRoles(String key) {
+ return Collections.emptyList();
+ }
+
+ protected boolean isMethodProtected(String key) {
+ return !getExpectedRoles(key).isEmpty() || !getDenyRoles(key).isEmpty();
+ }
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java b/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java
index 7b6baa3..125d6e0 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImpl.java
@@ -30,20 +30,20 @@ import org.apache.cxf.security.LoginSecurityContext;
public class RolePrefixSecurityContextImpl implements LoginSecurityContext {
private Principal p;
- private Set<Principal> roles;
+ private Set<Principal> roles;
private Subject theSubject;
-
+
public RolePrefixSecurityContextImpl(Subject subject, String rolePrefix) {
this(subject, rolePrefix, JAASLoginInterceptor.ROLE_CLASSIFIER_PREFIX);
}
-
+
public RolePrefixSecurityContextImpl(Subject subject, String roleClassifier,
String roleClassifierType) {
this.p = findPrincipal(subject, roleClassifier, roleClassifierType);
this.roles = findRoles(subject, roleClassifier, roleClassifierType);
this.theSubject = subject;
}
-
+
public Principal getUserPrincipal() {
return p;
}
@@ -58,8 +58,8 @@ public class RolePrefixSecurityContextImpl implements LoginSecurityContext {
}
return false;
}
-
- private static Principal findPrincipal(Subject subject,
+
+ private static Principal findPrincipal(Subject subject,
String roleClassifier, String roleClassifierType) {
for (Principal p : subject.getPrincipals()) {
if (!isRole(p, roleClassifier, roleClassifierType)) {
@@ -68,8 +68,8 @@ public class RolePrefixSecurityContextImpl implements LoginSecurityContext {
}
return null;
}
-
- private static Set<Principal> findRoles(Subject subject,
+
+ private static Set<Principal> findRoles(Subject subject,
String roleClassifier, String roleClassifierType) {
Set<Principal> set = new HashSet<>();
for (Principal p : subject.getPrincipals()) {
@@ -87,7 +87,7 @@ public class RolePrefixSecurityContextImpl implements LoginSecurityContext {
return p.getClass().getName().endsWith(roleClassifier);
}
}
-
+
public Subject getSubject() {
return theSubject;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
index 0ff02dd..41b1bd5 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptor.java
@@ -37,24 +37,24 @@ public class SecureAnnotationsInterceptor extends SimpleAuthorizingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(SecureAnnotationsInterceptor.class);
private static final String DEFAULT_ANNOTATION_CLASS_NAME = "javax.annotation.security.RolesAllowed";
-
+
private static final Set<String> SKIP_METHODS;
static {
SKIP_METHODS = new HashSet<>();
SKIP_METHODS.addAll(Arrays.asList(
- new String[] {"wait", "notify", "notifyAll",
+ new String[] {"wait", "notify", "notifyAll",
"equals", "toString", "hashCode"}));
}
-
+
private String annotationClassName = DEFAULT_ANNOTATION_CLASS_NAME;
-
+
public SecureAnnotationsInterceptor() {
this(true);
}
public SecureAnnotationsInterceptor(boolean uniqueId) {
super(uniqueId);
}
-
+
public void setAnnotationClassName(String name) {
try {
ClassLoaderUtils.loadClass(name, SecureAnnotationsInterceptor.class);
@@ -64,7 +64,7 @@ public class SecureAnnotationsInterceptor extends SimpleAuthorizingInterceptor {
throw new IllegalArgumentException("Annotation class " + name + " is not available");
}
}
-
+
public void setSecuredObject(Object object) {
Class<?> cls = ClassHelper.getRealClass(object);
Map<String, String> rolesMap = new HashMap<String, String>();
@@ -98,18 +98,18 @@ public class SecureAnnotationsInterceptor extends SimpleAuthorizingInterceptor {
if (!rolesMap.isEmpty()) {
return;
}
-
+
findRoles(cls.getSuperclass(), rolesMap);
-
+
if (!rolesMap.isEmpty()) {
return;
}
-
+
for (Class<?> interfaceCls : cls.getInterfaces()) {
findRoles(interfaceCls, rolesMap);
}
}
-
+
private String getRoles(Annotation[] anns, String annName) {
for (Annotation ann : anns) {
if (ann.annotationType().getName().equals(annName)) {
@@ -125,7 +125,7 @@ public class SecureAnnotationsInterceptor extends SimpleAuthorizingInterceptor {
}
return sb.toString();
} catch (Exception ex) {
- // ignore
+ // ignore
}
break;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java
index a3e6079..45c0a94 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptor.java
@@ -35,22 +35,22 @@ public class SimpleAuthorizingInterceptor extends AbstractAuthorizingInIntercept
protected Map<String, List<String>> userRolesMap = Collections.emptyMap();
protected List<String> globalRoles = Collections.emptyList();
private boolean checkConfiguredRolesOnly;
-
+
public SimpleAuthorizingInterceptor() {
this(true);
}
public SimpleAuthorizingInterceptor(boolean uniqueId) {
super(uniqueId);
}
-
- @Override
+
+ @Override
protected boolean isUserInRole(SecurityContext sc, List<String> roles, boolean deny) {
if (!checkConfiguredRolesOnly && !super.isUserInRole(sc, roles, deny)) {
return false;
}
// Additional check.
if (!userRolesMap.isEmpty()) {
- List<String> userRoles = userRolesMap.get(sc.getUserPrincipal().getName());
+ List<String> userRoles = userRolesMap.get(sc.getUserPrincipal().getName());
if (userRoles == null) {
return false;
}
@@ -64,7 +64,7 @@ public class SimpleAuthorizingInterceptor extends AbstractAuthorizingInIntercept
return !checkConfiguredRolesOnly;
}
}
-
+
protected String createMethodSig(Method method) {
StringBuilder b = new StringBuilder(method.getReturnType().getName());
b.append(' ').append(method.getName()).append('(');
@@ -79,7 +79,7 @@ public class SimpleAuthorizingInterceptor extends AbstractAuthorizingInIntercept
b.append(')');
return b.toString();
}
-
+
@Override
protected List<String> getExpectedRoles(Method method) {
List<String> roles = methodRolesMap.get(createMethodSig(method));
@@ -94,21 +94,21 @@ public class SimpleAuthorizingInterceptor extends AbstractAuthorizingInIntercept
public void setMethodRolesMap(Map<String, String> rolesMap) {
- methodRolesMap.putAll(parseRolesMap(rolesMap));
+ methodRolesMap.putAll(parseRolesMap(rolesMap));
}
-
+
public void setUserRolesMap(Map<String, String> rolesMap) {
userRolesMap = parseRolesMap(rolesMap);
}
-
+
public void setGlobalRoles(String roles) {
globalRoles = Arrays.asList(StringUtils.split(roles, " "));
}
-
+
public void setCheckConfiguredRolesOnly(boolean checkConfiguredRolesOnly) {
this.checkConfiguredRolesOnly = checkConfiguredRolesOnly;
}
-
+
private static Map<String, List<String>> parseRolesMap(Map<String, String> rolesMap) {
Map<String, List<String>> map = new HashMap<String, List<String>>();
for (Map.Entry<String, String> entry : rolesMap.entrySet()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerProviderUsernameToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerProviderUsernameToken.java b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerProviderUsernameToken.java
index 7e6e284..de66c49 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerProviderUsernameToken.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerProviderUsernameToken.java
@@ -36,7 +36,7 @@ public class CallbackHandlerProviderUsernameToken implements CallbackHandlerProv
}
UsernameToken ut = (UsernameToken)token;
if (ut.getPasswordType().endsWith("PasswordDigest")) {
- return new NameDigestPasswordCallbackHandler(ut.getName(),
+ return new NameDigestPasswordCallbackHandler(ut.getName(),
ut.getPassword(),
ut.getNonce(),
ut.getCreatedTime());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java
index cfb95ce..02f3f1a 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CallbackHandlerTlsCert.java
@@ -31,7 +31,7 @@ public class CallbackHandlerTlsCert implements CallbackHandlerProvider {
private CertificateToNameMapper certMapper;
private NameToPasswordMapper nameToPasswordMapper;
private String fixedPassword;
-
+
public CallbackHandlerTlsCert() {
// By default use subjectDN as userName
this.certMapper = new CertificateToNameMapper() {
@@ -39,7 +39,7 @@ public class CallbackHandlerTlsCert implements CallbackHandlerProvider {
return ((X509Certificate)cert).getSubjectDN().getName();
}
};
- // By default use fixed password
+ // By default use fixed password
this.nameToPasswordMapper = new NameToPasswordMapper() {
public String getPassword(String userName) {
return fixedPassword;
@@ -58,7 +58,7 @@ public class CallbackHandlerTlsCert implements CallbackHandlerProvider {
String password = nameToPasswordMapper.getPassword(name);
return new NamePasswordCallbackHandler(name, password);
}
-
+
/**
* Extracts certificate from message, expecting to find TLSSessionInfo inside.
*
@@ -78,7 +78,7 @@ public class CallbackHandlerTlsCert implements CallbackHandlerProvider {
// Due to RFC5246, senders certificates always comes 1st
return certificates[0];
}
-
+
public void setCertMapper(CertificateToNameMapper certMapper) {
this.certMapper = certMapper;
}
@@ -90,5 +90,5 @@ public class CallbackHandlerTlsCert implements CallbackHandlerProvider {
public void setNameToPasswordMapper(NameToPasswordMapper nameToPasswordMapper) {
this.nameToPasswordMapper = nameToPasswordMapper;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java
index 7952faa..3a826e9 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/callback/CertKeyToUserNameMapper.java
@@ -27,7 +27,7 @@ import javax.naming.ldap.Rdn;
public class CertKeyToUserNameMapper implements CertificateToNameMapper {
private String key;
-
+
/**
* Returns Subject DN from X509Certificate
*
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java
index fab2026..1c0eb84 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformInInterceptor.java
@@ -38,50 +38,50 @@ import org.apache.cxf.staxutils.transform.TransformUtils;
* Creates an XMLStreamReader from the InputStream on the Message.
*/
public class TransformInInterceptor extends AbstractPhaseInterceptor<Message> {
-
+
private List<String> inDropElements;
private Map<String, String> inElementsMap;
private Map<String, String> inAppendMap;
private Map<String, String> inAttributesMap;
private boolean blockOriginalReader = true;
private String contextPropertyName;
-
+
public TransformInInterceptor() {
this(Phase.POST_STREAM);
addBefore(StaxInInterceptor.class.getName());
}
-
+
public TransformInInterceptor(String phase) {
super(phase);
}
-
+
public TransformInInterceptor(String phase, List<String> after) {
super(phase);
if (after != null) {
addAfter(after);
}
}
-
+
public TransformInInterceptor(String phase, List<String> before, List<String> after) {
this(phase, after);
if (before != null) {
addBefore(before);
}
}
-
+
public void handleMessage(Message message) {
- if (contextPropertyName != null
+ if (contextPropertyName != null
&& !MessageUtils.getContextualBoolean(message, contextPropertyName, false)) {
return;
}
XMLStreamReader reader = message.getContent(XMLStreamReader.class);
InputStream is = message.getContent(InputStream.class);
-
+
XMLStreamReader transformReader = createTransformReaderIfNeeded(reader, is);
if (transformReader != null) {
message.setContent(XMLStreamReader.class, transformReader);
}
-
+
}
protected XMLStreamReader createTransformReaderIfNeeded(XMLStreamReader reader, InputStream is) {
@@ -96,11 +96,11 @@ public class TransformInInterceptor extends AbstractPhaseInterceptor<Message> {
public void setInAppendElements(Map<String, String> inElements) {
this.inAppendMap = inElements;
}
-
+
public void setInDropElements(List<String> dropElementsSet) {
this.inDropElements = dropElementsSet;
}
-
+
public void setInTransformElements(Map<String, String> inElements) {
this.inElementsMap = inElements;
}
@@ -112,7 +112,7 @@ public class TransformInInterceptor extends AbstractPhaseInterceptor<Message> {
public void setBlockOriginalReader(boolean blockOriginalReader) {
this.blockOriginalReader = blockOriginalReader;
}
-
+
public void setContextPropertyName(String propertyName) {
contextPropertyName = propertyName;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
index c1901bf..cb37ef5 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
@@ -40,12 +40,12 @@ import org.apache.cxf.staxutils.transform.TransformUtils;
* Creates an XMLStreamReader from the InputStream on the Message.
*/
public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
-
- private static final String OUTPUT_STREAM_HOLDER =
+
+ private static final String OUTPUT_STREAM_HOLDER =
TransformOutInterceptor.class.getName() + ".outputstream";
private static final String TRANSFORM_SKIP = "transform.skip";
private static final StaxOutEndingInterceptor ENDING = new StaxOutEndingInterceptor(OUTPUT_STREAM_HOLDER);
-
+
private Map<String, String> outElementsMap;
private Map<String, String> outAppendMap;
private List<String> outDropElements;
@@ -54,18 +54,18 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
private boolean skipOnFault;
private String contextPropertyName;
private String defaultNamespace;
-
+
public TransformOutInterceptor() {
this(Phase.PRE_STREAM);
}
-
+
public TransformOutInterceptor(String phase) {
super(phase);
addBefore(StaxOutInterceptor.class.getName());
addAfter("org.apache.cxf.interceptor.LoggingOutInterceptor");
addAfter("org.apache.cxf.ext.logging.LoggingOutInterceptor");
}
-
+
@Override
public void handleFault(Message message) {
super.handleFault(message);
@@ -74,27 +74,27 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
message.setContent(OutputStream.class, os);
}
}
-
+
public void handleMessage(Message message) {
if (!isHttpVerbSupported(message)) {
return;
}
-
- if (contextPropertyName != null
+
+ if (contextPropertyName != null
&& !MessageUtils.getContextualBoolean(message.getExchange().getInMessage(),
- contextPropertyName,
+ contextPropertyName,
false)) {
return;
}
-
+
if (skipOnFault && null != message.getContent(Exception.class)
|| MessageUtils.isTrue(message.getContextualProperty(TRANSFORM_SKIP))) {
return;
}
-
+
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
OutputStream out = message.getContent(OutputStream.class);
-
+
XMLStreamWriter transformWriter = createTransformWriterIfNeeded(writer, out);
if (transformWriter != null) {
message.setContent(XMLStreamWriter.class, transformWriter);
@@ -107,9 +107,9 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
}
}
-
+
protected XMLStreamWriter createTransformWriterIfNeeded(XMLStreamWriter writer, OutputStream os) {
- return TransformUtils.createTransformWriterIfNeeded(writer, os,
+ return TransformUtils.createTransformWriterIfNeeded(writer, os,
outElementsMap,
outDropElements,
outAppendMap,
@@ -117,11 +117,11 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
attributesToElements,
defaultNamespace);
}
-
+
public void setOutTransformElements(Map<String, String> outElements) {
this.outElementsMap = outElements;
}
-
+
public void setOutAppendElements(Map<String, String> map) {
this.outAppendMap = map;
}
@@ -137,15 +137,15 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
public void setAttributesToElements(boolean value) {
this.attributesToElements = value;
}
-
+
public void setSkipOnFault(boolean value) {
this.skipOnFault = value;
}
-
+
protected boolean isHttpVerbSupported(Message message) {
return isRequestor(message) && isGET(message) ? false : true;
}
-
+
public void setContextPropertyName(String propertyName) {
contextPropertyName = propertyName;
}
@@ -153,5 +153,5 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
public void setDefaultNamespace(String defaultNamespace) {
this.defaultNamespace = defaultNamespace;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
index 6e416e4..d76d0f8 100644
--- a/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
+++ b/core/src/main/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
@@ -44,8 +44,8 @@ import org.osgi.service.blueprint.reflect.Metadata;
"http://schemas.xmlsoap.org/wsdl/",
"http://www.w3.org/2005/08/addressing",
"http://schemas.xmlsoap.org/ws/2004/08/addressing"})
-public class CXFAPINamespaceHandler implements NamespaceHandler {
-
+public class CXFAPINamespaceHandler implements NamespaceHandler {
+
public URL getSchemaLocation(String namespace) {
String location = null;
@@ -55,7 +55,7 @@ public class CXFAPINamespaceHandler implements NamespaceHandler {
if ("http://cxf.apache.org/configuration/beans".equals(namespace)
|| "http://cxf.apache.org/schemas/configuration/cxf-beans.xsd".equals(namespace)) {
- location = "schemas/configuration/cxf-beans.xsd";
+ location = "schemas/configuration/cxf-beans.xsd";
} else if ("http://cxf.apache.org/configuration/parameterized-types".equals(namespace)
|| "http://cxf.apache.org/schemas/configuration/parameterized-types.xsd".equals(namespace)) {
location = "schemas/configuration/parameterized-types.xsd";
@@ -96,7 +96,7 @@ public class CXFAPINamespaceHandler implements NamespaceHandler {
public String getId(Element element, ParserContext context) {
String id = element.hasAttribute("id") ? element.getAttribute("id") : null;
if (id == null) {
- id = "cxf.workqueue.";
+ id = "cxf.workqueue.";
id += element.hasAttribute("name") ? element.getAttribute("name") : "def";
}
return id;
@@ -119,5 +119,5 @@ public class CXFAPINamespaceHandler implements NamespaceHandler {
public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) {
return null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/AbstractThresholdOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/AbstractThresholdOutputStream.java b/core/src/main/java/org/apache/cxf/io/AbstractThresholdOutputStream.java
index 3d8bbab..6cbc799 100644
--- a/core/src/main/java/org/apache/cxf/io/AbstractThresholdOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/AbstractThresholdOutputStream.java
@@ -27,26 +27,26 @@ import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
* Outputstream that will buffer a certain amount before writing anything to the underlying
* stream. When the threshold is reached, provides a callback point to allow the
* subclass to update headers, replace/set the output stream, etc...
- *
+ *
* Also provides a callback for when the stream is closed without it reaching the threshold.
*/
public abstract class AbstractThresholdOutputStream extends AbstractWrappedOutputStream {
-
+
protected int threshold;
protected LoadingByteArrayOutputStream buffer;
-
+
public AbstractThresholdOutputStream(int threshold) {
this.threshold = threshold;
if (threshold >= 0) {
buffer = new LoadingByteArrayOutputStream(threshold + 1);
}
}
-
-
+
+
public abstract void thresholdReached() throws IOException;
public abstract void thresholdNotReached() throws IOException;
-
-
+
+
@Override
public void write(byte[] b, int off, int len) throws IOException {
if (buffer != null) {
@@ -57,7 +57,7 @@ public abstract class AbstractThresholdOutputStream extends AbstractWrappedOutpu
buffer.write(b, off, space);
len -= space;
off += space;
-
+
if (buffer.size() >= threshold) {
thresholdReached();
unBuffer();
@@ -89,7 +89,7 @@ public abstract class AbstractThresholdOutputStream extends AbstractWrappedOutpu
super.write(buffer.getRawBytes(), 0, buffer.size());
}
buffer = null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java b/core/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
index 2962b4c..084f624 100644
--- a/core/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/AbstractWrappedOutputStream.java
@@ -32,7 +32,7 @@ public abstract class AbstractWrappedOutputStream extends OutputStream {
protected OutputStream wrappedStream;
protected boolean written;
protected boolean allowFlush = true;
-
+
protected AbstractWrappedOutputStream() {
super();
}
@@ -70,7 +70,7 @@ public abstract class AbstractWrappedOutputStream extends OutputStream {
wrappedStream.write(b);
}
}
-
+
@Override
public void close() throws IOException {
if (wrappedStream != null) {
@@ -84,7 +84,7 @@ public abstract class AbstractWrappedOutputStream extends OutputStream {
wrappedStream.flush();
}
}
-
+
public void allowFlush(boolean b) {
this.allowFlush = b;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java b/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java
index f34fcd9..0af9145 100644
--- a/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CacheAndWriteOutputStream.java
@@ -33,7 +33,7 @@ public class CacheAndWriteOutputStream extends CachedOutputStream {
OutputStream flowThroughStream;
long count;
long limit = Long.MAX_VALUE;
-
+
public CacheAndWriteOutputStream(OutputStream stream) {
super();
if (stream == null) {
@@ -41,7 +41,7 @@ public class CacheAndWriteOutputStream extends CachedOutputStream {
}
flowThroughStream = stream;
}
-
+
public void setCacheLimit(long l) {
limit = l;
}
@@ -50,17 +50,17 @@ public class CacheAndWriteOutputStream extends CachedOutputStream {
flowThroughStream.flush();
flowThroughStream.close();
}
-
+
protected void postClose() throws IOException {
flowThroughStream.flush();
flowThroughStream.close();
}
-
+
public OutputStream getFlowThroughStream() {
return flowThroughStream;
}
-
-
+
+
@Override
protected void onWrite() throws IOException {
// does nothing
@@ -74,7 +74,7 @@ public class CacheAndWriteOutputStream extends CachedOutputStream {
}
count++;
}
-
+
@Override
public void write(byte[] b, int off, int len) throws IOException {
flowThroughStream.write(b, off, len);
@@ -83,7 +83,7 @@ public class CacheAndWriteOutputStream extends CachedOutputStream {
}
count += len;
}
-
+
@Override
public void write(byte[] b) throws IOException {
flowThroughStream.write(b);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index d261984..5adc875 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -53,7 +53,7 @@ public class CachedOutputStream extends OutputStream {
private static long defaultMaxSize;
private static String defaultCipherTransformation;
static {
-
+
String s = SystemPropertyAction.getPropertyOrNull("org.apache.cxf.io.CachedOutputStream.OutputDirectory");
if (s != null) {
File f = new File(s);
@@ -89,7 +89,7 @@ public class CachedOutputStream extends OutputStream {
private CipherPair ciphers;
private List<CachedOutputStreamCallback> callbacks;
-
+
private List<Object> streamList = new ArrayList<>();
public CachedOutputStream() {
@@ -97,7 +97,7 @@ public class CachedOutputStream extends OutputStream {
}
public CachedOutputStream(long threshold) {
- this.threshold = threshold;
+ this.threshold = threshold;
currentStream = new LoadingByteArrayOutputStream(2048);
inmem = true;
readBusProperties();
@@ -132,14 +132,14 @@ public class CachedOutputStream extends OutputStream {
public void releaseTempFileHold() {
allowDeleteOfFile = true;
}
-
+
public void registerCallback(CachedOutputStreamCallback cb) {
if (null == callbacks) {
callbacks = new ArrayList<>();
}
callbacks.add(cb);
}
-
+
public void deregisterCallback(CachedOutputStreamCallback cb) {
if (null != callbacks) {
callbacks.remove(cb);
@@ -155,7 +155,7 @@ public class CachedOutputStream extends OutputStream {
* output stream ... etc.)
*/
protected void doFlush() throws IOException {
-
+
}
public void flush() throws IOException {
@@ -172,14 +172,14 @@ public class CachedOutputStream extends OutputStream {
* Perform any actions required on stream closure (handle response etc.)
*/
protected void doClose() throws IOException {
-
+
}
-
+
/**
* Perform any actions required after stream closure (close the other related stream etc.)
*/
protected void postClose() throws IOException {
-
+
}
/**
@@ -201,7 +201,7 @@ public class CachedOutputStream extends OutputStream {
doClose();
streamList.remove(currentStream);
}
-
+
public void close() throws IOException {
currentStream.flush();
outputLocked = true;
@@ -233,7 +233,7 @@ public class CachedOutputStream extends OutputStream {
* When with Attachment, needs to replace the xml writer stream with the stream used by
* AttachmentSerializer or copy the cached output stream to the "real"
* output stream, i.e. onto the wire.
- *
+ *
* @param out the new output stream
* @param copyOldContent flag indicating if the old content should be copied
* @throws IOException
@@ -314,11 +314,11 @@ public class CachedOutputStream extends OutputStream {
IOUtils.copyAndCloseInput(fin, out);
}
}
-
+
public void writeCacheTo(StringBuilder out, long limit) throws IOException {
writeCacheTo(out, StandardCharsets.UTF_8.name(), limit);
}
-
+
public void writeCacheTo(StringBuilder out, String charsetName, long limit) throws IOException {
flush();
if (totalLength < limit
@@ -360,11 +360,11 @@ public class CachedOutputStream extends OutputStream {
}
}
}
-
+
public void writeCacheTo(StringBuilder out) throws IOException {
writeCacheTo(out, StandardCharsets.UTF_8.name());
}
-
+
public void writeCacheTo(StringBuilder out, String charsetName) throws IOException {
flush();
if (inmem) {
@@ -425,7 +425,7 @@ public class CachedOutputStream extends OutputStream {
}
if (inmem && totalLength > threshold && currentStream instanceof ByteArrayOutputStream) {
createFileOutputStream();
- }
+ }
}
public void write(byte[] b, int off, int len) throws IOException {
@@ -466,7 +466,7 @@ public class CachedOutputStream extends OutputStream {
} else {
tempFile = FileUtils.createTempFile("cos", "tmp", outputDir, false);
}
-
+
currentStream = createOutputStream(tempFile);
bout.writeTo(currentStream);
inmem = false;
@@ -513,14 +513,14 @@ public class CachedOutputStream extends OutputStream {
}
};
}
-
+
return fileInputStream;
} catch (FileNotFoundException e) {
throw new IOException("Cached file was deleted, " + e.toString());
}
}
}
-
+
private synchronized void deleteTempFile() {
if (tempFile != null) {
File file = tempFile;
@@ -551,7 +551,7 @@ public class CachedOutputStream extends OutputStream {
public void setOutputDir(File outputDir) throws IOException {
this.outputDir = outputDir;
}
-
+
public long getThreshold() {
return threshold;
}
@@ -566,7 +566,7 @@ public class CachedOutputStream extends OutputStream {
public void setCipherTransformation(String cipherTransformation) {
this.cipherTransformation = cipherTransformation;
}
-
+
public static void setDefaultMaxSize(long l) {
if (l == -1) {
String s = System.getProperty("org.apache.cxf.io.CachedOutputStream.MaxSize",
@@ -585,7 +585,7 @@ public class CachedOutputStream extends OutputStream {
}
}
defaultThreshold = i;
-
+
}
public static void setDefaultCipherTransformation(String n) {
if (n == null) {
@@ -636,12 +636,12 @@ public class CachedOutputStream extends OutputStream {
private class TransferableFileInputStream extends FileInputStream implements Transferable {
private boolean closed;
private File sourceFile;
-
+
TransferableFileInputStream(File sourceFile) throws FileNotFoundException {
super(sourceFile);
this.sourceFile = sourceFile;
}
-
+
public void close() throws IOException {
if (!closed) {
super.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/CachedWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/CachedWriter.java b/core/src/main/java/org/apache/cxf/io/CachedWriter.java
index 66c9df8..8b0fc43 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedWriter.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedWriter.java
@@ -53,9 +53,9 @@ public class CachedWriter extends Writer {
private static int defaultThreshold;
private static long defaultMaxSize;
private static String defaultCipherTransformation;
-
+
static {
-
+
String s = SystemPropertyAction.getPropertyOrNull("org.apache.cxf.io.CachedOutputStream.OutputDirectory");
if (s == null) {
// lookup the deprecated property
@@ -96,10 +96,10 @@ public class CachedWriter extends Writer {
private CipherPair ciphers;
private List<CachedWriterCallback> callbacks;
-
+
private List<Object> streamList = new ArrayList<>();
-
+
static class LoadingCharArrayWriter extends CharArrayWriter {
LoadingCharArrayWriter() {
super(1024);
@@ -108,7 +108,7 @@ public class CachedWriter extends Writer {
return super.buf;
}
}
-
+
public CachedWriter() {
this(defaultThreshold);
@@ -152,14 +152,14 @@ public class CachedWriter extends Writer {
public void releaseTempFileHold() {
allowDeleteOfFile = true;
}
-
+
public void registerCallback(CachedWriterCallback cb) {
if (null == callbacks) {
callbacks = new ArrayList<>();
}
callbacks.add(cb);
}
-
+
public void deregisterCallback(CachedWriterCallback cb) {
if (null != callbacks) {
callbacks.remove(cb);
@@ -175,14 +175,14 @@ public class CachedWriter extends Writer {
* output stream ... etc.)
*/
protected void doFlush() throws IOException {
-
+
}
public void flush() throws IOException {
if (!cosClosed) {
currentStream.flush();
}
-
+
if (null != callbacks) {
for (CachedWriterCallback cb : callbacks) {
cb.onFlush(this);
@@ -195,14 +195,14 @@ public class CachedWriter extends Writer {
* Perform any actions required on stream closure (handle response etc.)
*/
protected void doClose() throws IOException {
-
+
}
-
+
/**
* Perform any actions required after stream closure (close the other related stream etc.)
*/
protected void postClose() throws IOException {
-
+
}
/**
@@ -224,7 +224,7 @@ public class CachedWriter extends Writer {
doClose();
streamList.remove(currentStream);
}
-
+
public void close() throws IOException {
if (!cosClosed) {
currentStream.flush();
@@ -257,7 +257,7 @@ public class CachedWriter extends Writer {
* When with Attachment, needs to replace the xml writer stream with the stream used by
* AttachmentSerializer or copy the cached output stream to the "real"
* output stream, i.e. onto the wire.
- *
+ *
* @param out the new output stream
* @param copyOldContent flag indicating if the old content should be copied
* @throws IOException
@@ -345,7 +345,7 @@ public class CachedWriter extends Writer {
}
}
}
-
+
public void writeCacheTo(StringBuilder out, long limit) throws IOException {
flush();
if (totalLength < limit
@@ -383,7 +383,7 @@ public class CachedWriter extends Writer {
}
}
}
-
+
public void writeCacheTo(StringBuilder out) throws IOException {
flush();
if (inmem) {
@@ -440,10 +440,10 @@ public class CachedWriter extends Writer {
}
if (inmem && totalLength > threshold && currentStream instanceof LoadingCharArrayWriter) {
createFileOutputStream();
- }
+ }
}
-
+
public void write(char[] cbuf, int off, int len) throws IOException {
if (!outputLocked) {
onWrite();
@@ -524,7 +524,7 @@ public class CachedWriter extends Writer {
}
}
}
-
+
private synchronized void deleteTempFile() {
if (tempFile != null) {
File file = tempFile;
@@ -563,7 +563,7 @@ public class CachedWriter extends Writer {
public void setCipherTransformation(String cipherTransformation) {
this.cipherTransformation = cipherTransformation;
}
-
+
public static void setDefaultMaxSize(long l) {
if (l == -1) {
String s = System.getProperty("org.apache.cxf.io.CachedOutputStream.MaxSize");
@@ -588,7 +588,7 @@ public class CachedWriter extends Writer {
}
}
defaultThreshold = i;
-
+
}
public static void setDefaultCipherTransformation(String n) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/CipherPair.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/CipherPair.java b/core/src/main/java/org/apache/cxf/io/CipherPair.java
index 8237221..525c1fe 100644
--- a/core/src/main/java/org/apache/cxf/io/CipherPair.java
+++ b/core/src/main/java/org/apache/cxf/io/CipherPair.java
@@ -35,10 +35,10 @@ public class CipherPair {
private Cipher enccipher;
private Key key;
private byte[] ivp;
-
+
public CipherPair(String transformation) throws GeneralSecurityException {
this.transformation = transformation;
-
+
int d = transformation.indexOf('/');
String a;
if (d > 0) {
@@ -58,15 +58,15 @@ public class CipherPair {
throw e;
}
}
-
+
public String getTransformation() {
return transformation;
}
-
+
public Cipher getEncryptor() {
return enccipher;
}
-
+
public Cipher getDecryptor() {
Cipher deccipher = null;
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/CopyingOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/CopyingOutputStream.java b/core/src/main/java/org/apache/cxf/io/CopyingOutputStream.java
index 9625187..d9a1c46 100644
--- a/core/src/main/java/org/apache/cxf/io/CopyingOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CopyingOutputStream.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
/**
- * Marker interface for OutputStreams that can directly support
+ * Marker interface for OutputStreams that can directly support
* copying from an input stream. OutputStreams that maintain their
* own byte buffer or similar may be able to optimize the copy
* instead of using the read/write into a temporary buffer that
@@ -32,5 +32,5 @@ import java.io.InputStream;
public interface CopyingOutputStream {
int copyFrom(InputStream in) throws IOException;
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/DelegatingInputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/DelegatingInputStream.java b/core/src/main/java/org/apache/cxf/io/DelegatingInputStream.java
index 92b5e0d..331a714 100644
--- a/core/src/main/java/org/apache/cxf/io/DelegatingInputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/DelegatingInputStream.java
@@ -28,7 +28,7 @@ import org.apache.cxf.helpers.IOUtils;
public class DelegatingInputStream extends FilterInputStream {
protected boolean cached;
-
+
public DelegatingInputStream(InputStream is) {
super(is);
}
@@ -40,7 +40,7 @@ public class DelegatingInputStream extends FilterInputStream {
public InputStream getInputStream() {
return in;
}
-
+
/**
* Read the entire original input stream and cache it. Useful
* if switching threads or doing something where the original
@@ -65,5 +65,5 @@ public class DelegatingInputStream extends FilterInputStream {
cached = true;
}
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java b/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java
index c746bd7..2d5d168 100644
--- a/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/WriteOnCloseOutputStream.java
@@ -30,16 +30,16 @@ import java.io.OutputStream;
public class WriteOnCloseOutputStream extends CachedOutputStream {
OutputStream flowThroughStream;
-
+
public WriteOnCloseOutputStream(OutputStream stream) {
super();
flowThroughStream = stream;
}
-
+
protected void doClose() throws IOException {
resetOut(flowThroughStream, true);
flowThroughStream.flush();
- }
-
+ }
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/logging/FaultListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/logging/FaultListener.java b/core/src/main/java/org/apache/cxf/logging/FaultListener.java
index d536fd5..528ecb2 100644
--- a/core/src/main/java/org/apache/cxf/logging/FaultListener.java
+++ b/core/src/main/java/org/apache/cxf/logging/FaultListener.java
@@ -38,7 +38,7 @@ public interface FaultListener {
* the exception occurred.
* @param message the message processed while the exception occurred.
* @return <code>true</code> if CXF should use default handling for this
- * exception which normally is just logging the exception, <code>false</code>
+ * exception which normally is just logging the exception, <code>false</code>
* if CXF not should do any logging.
*/
boolean faultOccurred(Exception exception, String description, Message message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/management/InstrumentationManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/management/InstrumentationManager.java b/core/src/main/java/org/apache/cxf/management/InstrumentationManager.java
index 111a6e6..d03acb7 100644
--- a/core/src/main/java/org/apache/cxf/management/InstrumentationManager.java
+++ b/core/src/main/java/org/apache/cxf/management/InstrumentationManager.java
@@ -23,8 +23,8 @@ import javax.management.JMException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-/**
- * InstrumentationManager interface for the instrumentations query, register
+/**
+ * InstrumentationManager interface for the instrumentations query, register
* and unregister
*/
public interface InstrumentationManager {
@@ -35,7 +35,7 @@ public interface InstrumentationManager {
* @throws JMException
*/
ObjectName register(ManagedComponent component) throws JMException;
-
+
/**
* Register a component with management infrastructure. Component will supply registration name.
* @param component
@@ -46,16 +46,16 @@ public interface InstrumentationManager {
ObjectName register(ManagedComponent component, boolean forceRegistration) throws JMException;
/**
- * Registers object with management infrastructure with a specific name. Object must be annotated or
+ * Registers object with management infrastructure with a specific name. Object must be annotated or
* implement standard MBean interface.
* @param obj
* @param name
* @throws JMException
*/
void register(Object obj, ObjectName name) throws JMException;
-
+
/**
- * Registers object with management infrastructure with a specific name. Object must be annotated or
+ * Registers object with management infrastructure with a specific name. Object must be annotated or
* implement standard MBean interface.
* @param obj
* @param name
@@ -63,14 +63,14 @@ public interface InstrumentationManager {
* @throws JMException
*/
void register(Object obj, ObjectName name, boolean forceRegistration) throws JMException;
-
+
/**
* Unregisters component with management infrastructure
* @param component
* @throws JMException
*/
void unregister(ManagedComponent component) throws JMException;
-
+
/**
* Unregisters component based upon registered name
* @param name
@@ -82,16 +82,16 @@ public interface InstrumentationManager {
* Cleans up and shutsdown management infrastructure.
*/
void shutdown();
-
+
/**
* Get the MBeanServer which hosts managed components
* NOTE: if the configuration is not set the JMXEnabled to be true, this method
* will return null
- * @return the MBeanServer
+ * @return the MBeanServer
*/
MBeanServer getMBeanServer();
String getPersistentBusId();
-
+
void setPersistentBusId(String id);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/management/ManagedComponent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/management/ManagedComponent.java b/core/src/main/java/org/apache/cxf/management/ManagedComponent.java
index 5836ea6..4f3bfd8 100644
--- a/core/src/main/java/org/apache/cxf/management/ManagedComponent.java
+++ b/core/src/main/java/org/apache/cxf/management/ManagedComponent.java
@@ -23,10 +23,10 @@ import javax.management.JMException;
import javax.management.ObjectName;
/**
* Basic interface for representing a Instrumented object.
- *
+ *
*/
public interface ManagedComponent {
-
+
ObjectName getObjectName() throws JMException;
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/management/ManagementConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/management/ManagementConstants.java b/core/src/main/java/org/apache/cxf/management/ManagementConstants.java
index c753e14..e10bf78 100644
--- a/core/src/main/java/org/apache/cxf/management/ManagementConstants.java
+++ b/core/src/main/java/org/apache/cxf/management/ManagementConstants.java
@@ -20,7 +20,7 @@
package org.apache.cxf.management;
public final class ManagementConstants {
-
+
public static final String DEFAULT_DOMAIN_NAME = "org.apache.cxf";
public static final String BUS_ID_PROP = "bus.id";
public static final String NAME_PROP = "name";
@@ -30,8 +30,8 @@ public final class ManagementConstants {
public static final String OPERATION_NAME_PROP = "operation";
public static final String PORT_NAME_PROP = "port";
public static final String INSTANCE_ID_PROP = "instance.id";
-
+
private ManagementConstants() {
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/management/annotation/ManagedResource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/management/annotation/ManagedResource.java b/core/src/main/java/org/apache/cxf/management/annotation/ManagedResource.java
index dd89d54..902eb71 100644
--- a/core/src/main/java/org/apache/cxf/management/annotation/ManagedResource.java
+++ b/core/src/main/java/org/apache/cxf/management/annotation/ManagedResource.java
@@ -47,6 +47,6 @@ public @interface ManagedResource {
String persistName() default "";
- String persistLocation() default "";
+ String persistLocation() default "";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java b/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
index 094e432..0312c09 100644
--- a/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
+++ b/core/src/main/java/org/apache/cxf/message/AbstractWrappedMessage.java
@@ -30,7 +30,7 @@ import org.apache.cxf.transport.Destination;
* A base class to build your own message implementations on.
*/
public abstract class AbstractWrappedMessage implements Message {
-
+
private Message message;
protected AbstractWrappedMessage(Message msg) {
@@ -76,7 +76,7 @@ public abstract class AbstractWrappedMessage implements Message {
public void setMessage(Message message) {
this.message = message;
}
-
+
public Destination getDestination() {
return message.getDestination();
}
@@ -96,7 +96,7 @@ public abstract class AbstractWrappedMessage implements Message {
public void setId(String id) {
message.setId(id);
}
-
+
public InterceptorChain getInterceptorChain() {
return message.getInterceptorChain();
}
@@ -150,7 +150,7 @@ public abstract class AbstractWrappedMessage implements Message {
public Collection<Object> values() {
return message.values();
}
-
+
public <T> T get(Class<T> key) {
return message.get(key);
}
@@ -163,7 +163,7 @@ public abstract class AbstractWrappedMessage implements Message {
public Object getContextualProperty(String key) {
return message.getContextualProperty(key);
- }
+ }
void setContextualProperty(String key, Object v) {
if (message instanceof MessageImpl) {
((MessageImpl)message).setContextualProperty(key, v);
@@ -172,9 +172,9 @@ public abstract class AbstractWrappedMessage implements Message {
} else {
//cannot set directly. Just invalidate the cache.
message.resetContextCache();
- }
+ }
}
-
+
public Set<String> getContextualPropertyKeys() {
return message.getContextualPropertyKeys();
}
@@ -182,5 +182,5 @@ public abstract class AbstractWrappedMessage implements Message {
public void resetContextCache() {
message.resetContextCache();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/Attachment.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/Attachment.java b/core/src/main/java/org/apache/cxf/message/Attachment.java
index e163382..e86e67c 100644
--- a/core/src/main/java/org/apache/cxf/message/Attachment.java
+++ b/core/src/main/java/org/apache/cxf/message/Attachment.java
@@ -30,16 +30,16 @@ public interface Attachment {
* @return The attachment id.
*/
String getId();
-
+
String getHeader(String name);
-
+
Iterator<String> getHeaderNames();
-
+
/**
- * Whether or not this is an XOP package. This will affect the
+ * Whether or not this is an XOP package. This will affect the
* serialization of the attachment. If true, it will be serialized
* as binary data, and not Base64Binary.
- *
+ *
* @return true if this attachment is an XOP package
*/
boolean isXOP();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/Exchange.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/Exchange.java b/core/src/main/java/org/apache/cxf/message/Exchange.java
index 593d5e4..7fdd9f5 100644
--- a/core/src/main/java/org/apache/cxf/message/Exchange.java
+++ b/core/src/main/java/org/apache/cxf/message/Exchange.java
@@ -29,42 +29,42 @@ import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.Session;
public interface Exchange extends StringMap {
-
+
/**
- * Returns the inbound message for the exchange. On the client-side, this
+ * Returns the inbound message for the exchange. On the client-side, this
* is the response. On the server-side, this is the request.
- *
+ *
* @return the inboubnd message
*/
Message getInMessage();
void setInMessage(Message m);
-
+
/**
- * Returns the outbound message for the exchange. On the client-side, this
- * is the request. On the server-side, this is the response. During the
+ * Returns the outbound message for the exchange. On the client-side, this
+ * is the request. On the server-side, this is the response. During the
* inbound message processing, the outbound message is null.
- *
+ *
* @return the outbound message
*/
Message getOutMessage();
void setOutMessage(Message m);
-
+
Message getInFaultMessage();
void setInFaultMessage(Message m);
Message getOutFaultMessage();
void setOutFaultMessage(Message m);
-
+
Session getSession();
-
+
/**
* @return the associated incoming Destination (may be anonymous)
*/
Destination getDestination();
-
+
/**
* @param destination the associated incoming Destination
- */
+ */
void setDestination(Destination destination);
/**
@@ -74,42 +74,42 @@ public interface Exchange extends StringMap {
Conduit getConduit(Message message);
/**
- * @param conduit the associated outgoing Conduit
+ * @param conduit the associated outgoing Conduit
*/
void setConduit(Conduit conduit);
-
+
/**
* Determines if the exchange is one-way.
- *
+ *
* @return true if the exchange is known to be a one-way exchange
*/
boolean isOneWay();
-
+
/**
- * Determines if the exchange requires the frontend to wait for a
- * response. Transports can then optimize themselves to process the
+ * Determines if the exchange requires the frontend to wait for a
+ * response. Transports can then optimize themselves to process the
* response immediately instead of using a background thread or similar.
- *
+ *
* @return true if the frontend will wait for the response
*/
boolean isSynchronous();
void setSynchronous(boolean b);
/**
- *
+ *
* @param b true if the exchange is known to be a one-way exchange
*/
void setOneWay(boolean b);
-
+
/**
* {@inheritDoc}
*/
void clear();
-
+
Bus getBus();
Service getService();
Endpoint getEndpoint();
Binding getBinding();
BindingOperationInfo getBindingOperationInfo();
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java b/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
index 4798827..618667e 100644
--- a/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/ExchangeImpl.java
@@ -38,19 +38,19 @@ import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.Session;
public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements Exchange {
-
+
private static final long serialVersionUID = -3112077559217623594L;
private Destination destination;
private boolean oneWay;
private boolean synchronous = true;
-
+
private Message inMessage;
private Message outMessage;
private Message inFaultMessage;
private Message outFaultMessage;
-
+
private Session session;
-
+
private Bus bus;
private Endpoint endpoint;
private Service service;
@@ -90,10 +90,10 @@ public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements
outFaultMessage.resetContextCache();
}
}
-
+
public <T> T get(Class<T> key) {
T t = key.cast(get(key.getName()));
-
+
if (t == null) {
if (key == Bus.class) {
t = key.cast(bus);
@@ -147,7 +147,7 @@ public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements
super.put(key.getName(), value);
}
}
-
+
public Object put(String key, Object value) {
setMessageContextProperty(inMessage, key, value);
setMessageContextProperty(outMessage, key, value);
@@ -176,7 +176,7 @@ public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements
m.resetContextCache();
}
}
-
+
public Destination getDestination() {
return destination;
}
@@ -247,7 +247,7 @@ public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements
public void setOneWay(boolean b) {
oneWay = b;
}
-
+
public boolean isSynchronous() {
return synchronous;
}
@@ -263,7 +263,7 @@ public class ExchangeImpl extends ConcurrentHashMap<String, Object> implements
public void setSession(Session session) {
this.session = session;
}
-
+
public void clear() {
super.clear();
resetContextCaches();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/FaultMode.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/FaultMode.java b/core/src/main/java/org/apache/cxf/message/FaultMode.java
index eef678f..2dfe2fe 100644
--- a/core/src/main/java/org/apache/cxf/message/FaultMode.java
+++ b/core/src/main/java/org/apache/cxf/message/FaultMode.java
@@ -20,13 +20,13 @@
package org.apache.cxf.message;
/**
- *
+ *
*/
public enum FaultMode {
-
+
RUNTIME_FAULT,
LOGICAL_RUNTIME_FAULT,
CHECKED_APPLICATION_FAULT,
UNCHECKED_APPLICATION_FAULT,
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/Message.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/Message.java b/core/src/main/java/org/apache/cxf/message/Message.java
index a3d0251..ed7be5b 100644
--- a/core/src/main/java/org/apache/cxf/message/Message.java
+++ b/core/src/main/java/org/apache/cxf/message/Message.java
@@ -26,13 +26,13 @@ import org.apache.cxf.interceptor.InterceptorChain;
import org.apache.cxf.transport.Destination;
/**
- * The base interface for all all message implementations.
+ * The base interface for all all message implementations.
* All message objects passed to interceptors use this interface.
*/
public interface Message extends StringMap {
-
+
String TRANSPORT = "org.apache.cxf.transport";
-
+
/*
* Boolean property which can be used to check that the current request
* is part of the SOAP (JAX-WS) or non-SOAP/REST (JAX-RS) execution context.
@@ -48,32 +48,32 @@ public interface Message extends StringMap {
* Boolean property specifying if the message is inbound.
*/
String INBOUND_MESSAGE = "org.apache.cxf.message.inbound";
-
+
/**
- * A Map keyed by a string that stores optional context information
+ * A Map keyed by a string that stores optional context information
* associated with the invocation that spawned the message.
*/
String INVOCATION_CONTEXT = "org.apache.cxf.invocation.context";
-
+
/**
* Current Service Object
*/
String SERVICE_OBJECT = "org.apache.cxf.service.object";
-
+
/**
* A Map containing the MIME headers for a SOAP message.
*/
String MIME_HEADERS = "org.apache.cxf.mime.headers";
-
+
/**
- * Boolean property specifying if the server should send the response
+ * Boolean property specifying if the server should send the response
* asynchronously.
*/
String ASYNC_POST_RESPONSE_DISPATCH =
"org.apache.cxf.async.post.response.dispatch";
/**
- * Boolean property specifying if this message arrived via a
+ * Boolean property specifying if this message arrived via a
* decoupled endpoint.
*/
String DECOUPLED_CHANNEL_MESSAGE = "decoupled.channel.message";
@@ -85,20 +85,20 @@ public interface Message extends StringMap {
* Boolean property specifying if oneWay response must be processed.
*/
String PROCESS_ONEWAY_RESPONSE = "org.apache.cxf.transport.processOneWayResponse";
-
+
/**
- * Boolean property specifying if the thread which runs a request is
+ * Boolean property specifying if the thread which runs a request is
* different to the thread which created this Message.
*/
String THREAD_CONTEXT_SWITCHED = "thread.context.switched";
-
-
+
+
String ROBUST_ONEWAY = "org.apache.cxf.oneway.robust";
-
+
String HTTP_REQUEST_METHOD = "org.apache.cxf.request.method";
String REQUEST_URI = "org.apache.cxf.request.uri";
String REQUEST_URL = "org.apache.cxf.request.url";
-
+
String PROTOCOL_HEADERS = Message.class.getName() + ".PROTOCOL_HEADERS";
String RESPONSE_CODE = Message.class.getName() + ".RESPONSE_CODE";
String ERROR_MESSAGE = Message.class.getName() + ".ERROR_MESSAGE";
@@ -108,41 +108,41 @@ public interface Message extends StringMap {
String PROPOGATE_EXCEPTION = Message.class.getName() + ".PROPOGATE_EXCEPTION";
/**
- * Boolean property specifying in the runtime is configured to process
+ * Boolean property specifying in the runtime is configured to process
* MTOM attachments.
*/
String MTOM_ENABLED = "mtom-enabled";
String MTOM_THRESHOLD = "mtom-threshold";
-
+
/**
* Runtime schema validation property
*/
String SCHEMA_VALIDATION_ENABLED = "schema-validation-enabled";
-
+
/**
* The default values for schema validation will be set in the service model using this property
*/
String SCHEMA_VALIDATION_TYPE = "schema-validation-type";
-
+
/**
- * Boolean property specifying if the Java stack trace is returned as a
+ * Boolean property specifying if the Java stack trace is returned as a
* SOAP fault message.
*/
String FAULT_STACKTRACE_ENABLED = "faultStackTraceEnabled";
/**
- * Boolean property specifying if the name of the exception that caused
+ * Boolean property specifying if the name of the exception that caused
* the Java stack trace is returned.
*/
String EXCEPTION_MESSAGE_CAUSE_ENABLED = "exceptionMessageCauseEnabled";
-
+
/**
- * A very unique delimiter used for exception with FAULT_STACKTRACE_ENABLED enable,
- * which is easy for client to differentiate the cause and stacktrace when unmarsall
- * a fault message
+ * A very unique delimiter used for exception with FAULT_STACKTRACE_ENABLED enable,
+ * which is easy for client to differentiate the cause and stacktrace when unmarsall
+ * a fault message
*/
String EXCEPTION_CAUSE_SUFFIX = "#*#";
- String CONTENT_TYPE = "Content-Type";
+ String CONTENT_TYPE = "Content-Type";
String ACCEPT_CONTENT_TYPE = "Accept";
String BASE_PATH = Message.class.getName() + ".BASE_PATH";
String ENCODING = Message.class.getName() + ".ENCODING";
@@ -158,7 +158,7 @@ public interface Message extends StringMap {
/**
* Some properties to allow adding interceptors to the chain
- * on a per-request basis. All are a Collection<Interceptor>
+ * on a per-request basis. All are a Collection<Interceptor>
* These are NOT contextual properties (ie: not searched outside the message).
* They must exist on the message itself at time of Chain creation
*/
@@ -167,30 +167,30 @@ public interface Message extends StringMap {
String FAULT_IN_INTERCEPTORS = Message.class.getName() + ".FAULT_IN_INTERCEPTORS";
String FAULT_OUT_INTERCEPTORS = Message.class.getName() + ".FAULT_OUT_INTERCEPTORS";
/**
- * As above, but Collection<InterceptorProvider>
+ * As above, but Collection<InterceptorProvider>
*/
String INTERCEPTOR_PROVIDERS = Message.class.getName() + ".INTERCEPTOR_PROVIDER";
-
+
/**
* Content-Transfer-Encoding used for MTOM attachment
* binary, base64, etc
*/
String CONTENT_TRANSFER_ENCODING = Message.class.getName() + ".CONTENT_TRANSFER_ENCODING";
-
+
/*
* The properties to allow configure the client timeout
*/
String CONNECTION_TIMEOUT = "javax.xml.ws.client.connectionTimeout";
String RECEIVE_TIMEOUT = "javax.xml.ws.client.receiveTimeout";
-
+
String getId();
void setId(String id);
-
+
/**
- * Returns a live copy of the messages interceptor chain. This is
- * useful when an interceptor wants to modify the interceptor chain on the
+ * Returns a live copy of the messages interceptor chain. This is
+ * useful when an interceptor wants to modify the interceptor chain on the
* fly.
- *
+ *
* @return the interceptor chain used to process the message
*/
InterceptorChain getInterceptorChain();
@@ -200,67 +200,67 @@ public interface Message extends StringMap {
* @return the associated Destination if message is inbound, null otherwise
*/
Destination getDestination();
-
+
Exchange getExchange();
void setExchange(Exchange exchange);
-
+
/**
* Retrieve any binary attachments associated with the message.
- *
+ *
* @return a collection containing the attachments
*/
Collection<Attachment> getAttachments();
void setAttachments(Collection<Attachment> attachments);
-
+
/**
- * Retrieve the encapsulated content as a particular type. The content is
- * available as a result type if the message is outbound. The content
- * is available as a source type if message is inbound. If the content is
+ * Retrieve the encapsulated content as a particular type. The content is
+ * available as a result type if the message is outbound. The content
+ * is available as a source type if message is inbound. If the content is
* not available as the specified type null is returned.
- *
- * @param format the expected content format
+ *
+ * @param format the expected content format
* @return the encapsulated content
- */
+ */
<T> T getContent(Class<T> format);
/**
* Provide the encapsulated content as a particular type (a result type
* if message is outbound, a source type if message is inbound)
- *
- * @param format the provided content format
+ *
+ * @param format the provided content format
* @param content the content to be encapsulated
- */
+ */
<T> void setContent(Class<T> format, Object content);
-
+
/**
* @return the set of currently encapsulated content formats
*/
Set<Class<?>> getContentFormats();
-
+
/**
* Removes a content from a message. If some contents are completely consumed,
* removing them is a good idea
* @param format the format to remove
*/
<T> void removeContent(Class<T> format);
-
+
/**
* Queries the Message object's metadata for a specific property.
- *
- * @param key the Message interface's property strings that
- * correlates to the desired property
+ *
+ * @param key the Message interface's property strings that
+ * correlates to the desired property
* @return the property's value
*/
- Object getContextualProperty(String key);
-
+ Object getContextualProperty(String key);
+
/**
* Resets the cache of contextual properties that messages may contain. Subsequent
* calls to getContextualProperty will likely recalculate the cache.
*/
void resetContextCache();
-
+
/**
* @return set of defined contextual property keys
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/MessageContentsList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/MessageContentsList.java b/core/src/main/java/org/apache/cxf/message/MessageContentsList.java
index a61cc66..a1f4d1a 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageContentsList.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageContentsList.java
@@ -39,7 +39,7 @@ public class MessageContentsList extends ArrayList<Object> {
public MessageContentsList(List<?> values) {
super(values);
}
-
+
public static MessageContentsList getContentsList(Message msg) {
List<Object> o = CastUtils.cast(msg.getContent(List.class));
if (o == null) {
@@ -52,30 +52,30 @@ public class MessageContentsList extends ArrayList<Object> {
}
return (MessageContentsList)o;
}
-
+
public Object set(int idx, Object value) {
ensureSize(idx);
return super.set(idx, value);
}
-
+
private void ensureSize(int idx) {
while (idx >= size()) {
add(REMOVED_MARKER);
}
}
-
+
public Object put(MessagePartInfo key, Object value) {
ensureSize(key.getIndex());
return super.set(key.getIndex(), value);
}
-
+
public boolean hasValue(MessagePartInfo key) {
if (key.getIndex() >= size()) {
return false;
}
return super.get(key.getIndex()) != REMOVED_MARKER;
}
-
+
public Object get(MessagePartInfo key) {
Object o = super.get(key.getIndex());
return o == REMOVED_MARKER ? null : o;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/MessageImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/MessageImpl.java b/core/src/main/java/org/apache/cxf/message/MessageImpl.java
index b08b0c5..1b3691b 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageImpl.java
@@ -35,19 +35,19 @@ import org.apache.cxf.transport.Destination;
public class MessageImpl extends StringMapImpl implements Message {
private static final long serialVersionUID = -3020763696429459865L;
-
-
+
+
private Exchange exchange;
private String id;
private InterceptorChain interceptorChain;
-
- // array of Class<T>/T pairs for contents
+
+ // array of Class<T>/T pairs for contents
private Object[] contents = new Object[20];
private int index;
-
+
private Map<String, Object> contextCache;
-
-
+
+
public MessageImpl() {
//nothing
}
@@ -65,7 +65,7 @@ public class MessageImpl extends StringMapImpl implements Message {
throw new RuntimeException("Not a MessageImpl! " + m.getClass());
}
}
-
+
public Collection<Attachment> getAttachments() {
return CastUtils.cast((Collection<?>)get(ATTACHMENTS));
}
@@ -78,7 +78,7 @@ public class MessageImpl extends StringMapImpl implements Message {
//for sub class overriding
return null;
}
-
+
public Destination getDestination() {
return get(Destination.class);
}
@@ -113,7 +113,7 @@ public class MessageImpl extends StringMapImpl implements Message {
}
}
if (index >= contents.length) {
- //very unlikely to happen. Haven't seen more than about 6,
+ //very unlikely to happen. Haven't seen more than about 6,
//but just in case we'll add a few more
Object tmp[] = new Object[contents.length + 10];
System.arraycopy(contents, 0, tmp, 0, contents.length);
@@ -123,7 +123,7 @@ public class MessageImpl extends StringMapImpl implements Message {
contents[index + 1] = content;
index += 2;
}
-
+
public <T> void removeContent(Class<T> format) {
for (int x = 0; x < index; x += 2) {
if (contents[x] == format) {
@@ -140,7 +140,7 @@ public class MessageImpl extends StringMapImpl implements Message {
}
public Set<Class<?>> getContentFormats() {
-
+
Set<Class<?>> c = new HashSet<Class<?>>();
for (int x = 0; x < index; x += 2) {
c.add((Class<?>)contents[x]);
@@ -178,7 +178,7 @@ public class MessageImpl extends StringMapImpl implements Message {
public Set<String> getContextualPropertyKeys() {
return contextCache.keySet();
}
-
+
private void calcContextCache() {
Map<String, Object> o = new HashMap<String, Object>() {
private static final long serialVersionUID = 7067290677790419348L;
@@ -195,11 +195,11 @@ public class MessageImpl extends StringMapImpl implements Message {
if (b != null) {
o.putAll(b.getProperties());
}
- Service sv = ex.getService();
+ Service sv = ex.getService();
if (sv != null) {
o.putAll(sv);
}
- Endpoint ep = ex.getEndpoint();
+ Endpoint ep = ex.getEndpoint();
if (ep != null) {
EndpointInfo ei = ep.getEndpointInfo();
if (ei != null) {
[30/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java b/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
index c841937..30cf74c 100644
--- a/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
+++ b/core/src/test/java/org/apache/cxf/feature/transform/XSLTInterceptorsTest.java
@@ -1,150 +1,150 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.feature.transform;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.stream.StreamSource;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-import org.apache.cxf.common.classloader.ClassLoaderUtils;
-import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.io.CachedOutputStream;
-import org.apache.cxf.io.CachedWriter;
-import org.apache.cxf.message.Message;
-import org.apache.cxf.message.MessageImpl;
-import org.apache.cxf.staxutils.StaxUtils;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/* Provides XSLT transformation of incoming message.
- * Interceptor breaks streaming (can be fixed in further versions when XSLT engine supports XML stream)
- */
-public class XSLTInterceptorsTest {
-
- private static final String TRANSFORMATION_XSL = "transformation.xsl";
- private static final String MESSAGE_FILE = "message.xml";
-
- private InputStream messageIS;
- private Message message;
- private XSLTInInterceptor inInterceptor;
- private XSLTOutInterceptor outInterceptor;
-
- @Before
- public void setUp() throws TransformerConfigurationException {
- messageIS = ClassLoaderUtils.getResourceAsStream(MESSAGE_FILE, this.getClass());
- if (messageIS == null) {
- throw new IllegalArgumentException("Cannot load message from path: " + MESSAGE_FILE);
- }
- message = new MessageImpl();
- inInterceptor = new XSLTInInterceptor(TRANSFORMATION_XSL);
- outInterceptor = new XSLTOutInterceptor(TRANSFORMATION_XSL);
- }
-
- @Test
- public void inStreamTest() throws Exception {
- message.setContent(InputStream.class, messageIS);
- inInterceptor.handleMessage(message);
- InputStream transformedIS = message.getContent(InputStream.class);
- Document doc = StaxUtils.read(transformedIS);
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void inXMLStreamTest() throws XMLStreamException {
- XMLStreamReader xReader = StaxUtils.createXMLStreamReader(messageIS);
- message.setContent(XMLStreamReader.class, xReader);
- inInterceptor.handleMessage(message);
- XMLStreamReader transformedXReader = message.getContent(XMLStreamReader.class);
- Document doc = StaxUtils.read(transformedXReader);
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void inReaderTest() throws Exception {
- Reader reader = new InputStreamReader(messageIS);
- message.setContent(Reader.class, reader);
- inInterceptor.handleMessage(message);
- Reader transformedReader = message.getContent(Reader.class);
- Document doc = StaxUtils.read(transformedReader);
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void outStreamTest() throws Exception {
- CachedOutputStream cos = new CachedOutputStream();
- cos.holdTempFile();
- message.setContent(OutputStream.class, cos);
- outInterceptor.handleMessage(message);
- OutputStream os = message.getContent(OutputStream.class);
- IOUtils.copy(messageIS, os);
- os.close();
- cos.releaseTempFileHold();
- Document doc = StaxUtils.read(cos.getInputStream());
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void outXMLStreamTest() throws XMLStreamException, SAXException, IOException, ParserConfigurationException {
- CachedWriter cWriter = new CachedWriter();
- cWriter.holdTempFile();
- XMLStreamWriter xWriter = StaxUtils.createXMLStreamWriter(cWriter);
- message.setContent(XMLStreamWriter.class, xWriter);
- outInterceptor.handleMessage(message);
- XMLStreamWriter tXWriter = message.getContent(XMLStreamWriter.class);
- StaxUtils.copy(new StreamSource(messageIS), tXWriter);
- tXWriter.close();
- cWriter.releaseTempFileHold();
- Document doc = StaxUtils.read(cWriter.getReader());
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- @Test
- public void outWriterStreamTest() throws Exception {
- CachedWriter cWriter = new CachedWriter();
- message.setContent(Writer.class, cWriter);
- outInterceptor.handleMessage(message);
- Writer tWriter = message.getContent(Writer.class);
- IOUtils.copy(new InputStreamReader(messageIS), tWriter, IOUtils.DEFAULT_BUFFER_SIZE);
- tWriter.close();
- Document doc = StaxUtils.read(cWriter.getReader());
- Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
- }
-
- private boolean checkTransformedXML(Document doc) {
- NodeList list = doc.getDocumentElement()
- .getElementsByTagNameNS("http://customerservice.example.com/", "getCustomersByName1");
- return list.getLength() == 1;
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.feature.transform;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.stream.StreamSource;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+import org.apache.cxf.common.classloader.ClassLoaderUtils;
+import org.apache.cxf.helpers.IOUtils;
+import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.io.CachedWriter;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.staxutils.StaxUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/* Provides XSLT transformation of incoming message.
+ * Interceptor breaks streaming (can be fixed in further versions when XSLT engine supports XML stream)
+ */
+public class XSLTInterceptorsTest {
+
+ private static final String TRANSFORMATION_XSL = "transformation.xsl";
+ private static final String MESSAGE_FILE = "message.xml";
+
+ private InputStream messageIS;
+ private Message message;
+ private XSLTInInterceptor inInterceptor;
+ private XSLTOutInterceptor outInterceptor;
+
+ @Before
+ public void setUp() throws TransformerConfigurationException {
+ messageIS = ClassLoaderUtils.getResourceAsStream(MESSAGE_FILE, this.getClass());
+ if (messageIS == null) {
+ throw new IllegalArgumentException("Cannot load message from path: " + MESSAGE_FILE);
+ }
+ message = new MessageImpl();
+ inInterceptor = new XSLTInInterceptor(TRANSFORMATION_XSL);
+ outInterceptor = new XSLTOutInterceptor(TRANSFORMATION_XSL);
+ }
+
+ @Test
+ public void inStreamTest() throws Exception {
+ message.setContent(InputStream.class, messageIS);
+ inInterceptor.handleMessage(message);
+ InputStream transformedIS = message.getContent(InputStream.class);
+ Document doc = StaxUtils.read(transformedIS);
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void inXMLStreamTest() throws XMLStreamException {
+ XMLStreamReader xReader = StaxUtils.createXMLStreamReader(messageIS);
+ message.setContent(XMLStreamReader.class, xReader);
+ inInterceptor.handleMessage(message);
+ XMLStreamReader transformedXReader = message.getContent(XMLStreamReader.class);
+ Document doc = StaxUtils.read(transformedXReader);
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void inReaderTest() throws Exception {
+ Reader reader = new InputStreamReader(messageIS);
+ message.setContent(Reader.class, reader);
+ inInterceptor.handleMessage(message);
+ Reader transformedReader = message.getContent(Reader.class);
+ Document doc = StaxUtils.read(transformedReader);
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void outStreamTest() throws Exception {
+ CachedOutputStream cos = new CachedOutputStream();
+ cos.holdTempFile();
+ message.setContent(OutputStream.class, cos);
+ outInterceptor.handleMessage(message);
+ OutputStream os = message.getContent(OutputStream.class);
+ IOUtils.copy(messageIS, os);
+ os.close();
+ cos.releaseTempFileHold();
+ Document doc = StaxUtils.read(cos.getInputStream());
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void outXMLStreamTest() throws XMLStreamException, SAXException, IOException, ParserConfigurationException {
+ CachedWriter cWriter = new CachedWriter();
+ cWriter.holdTempFile();
+ XMLStreamWriter xWriter = StaxUtils.createXMLStreamWriter(cWriter);
+ message.setContent(XMLStreamWriter.class, xWriter);
+ outInterceptor.handleMessage(message);
+ XMLStreamWriter tXWriter = message.getContent(XMLStreamWriter.class);
+ StaxUtils.copy(new StreamSource(messageIS), tXWriter);
+ tXWriter.close();
+ cWriter.releaseTempFileHold();
+ Document doc = StaxUtils.read(cWriter.getReader());
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ @Test
+ public void outWriterStreamTest() throws Exception {
+ CachedWriter cWriter = new CachedWriter();
+ message.setContent(Writer.class, cWriter);
+ outInterceptor.handleMessage(message);
+ Writer tWriter = message.getContent(Writer.class);
+ IOUtils.copy(new InputStreamReader(messageIS), tWriter, IOUtils.DEFAULT_BUFFER_SIZE);
+ tWriter.close();
+ Document doc = StaxUtils.read(cWriter.getReader());
+ Assert.assertTrue("Message was not transformed", checkTransformedXML(doc));
+ }
+
+ private boolean checkTransformedXML(Document doc) {
+ NodeList list = doc.getDocumentElement()
+ .getElementsByTagNameNS("http://customerservice.example.com/", "getCustomersByName1");
+ return list.getLength() == 1;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
index 90ecce8..d0bc572 100644
--- a/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/FileUtilsTest.java
@@ -24,11 +24,11 @@ import org.junit.Assert;
import org.junit.Test;
public class FileUtilsTest extends Assert {
-
-
+
+
@Test
public void testTempIODirExists() throws Exception {
-
+
String originaltmpdir = System.getProperty("java.io.tmpdir");
try {
System.setProperty("java.io.tmpdir", "dummy");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java b/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
index 7fdb41e..09112de 100644
--- a/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/HttpHeaderHelperTest.java
@@ -26,11 +26,11 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
/**
- *
+ *
*/
public class HttpHeaderHelperTest {
-
- @Test
+
+ @Test
public void testMapCharset() {
String cs = HttpHeaderHelper.mapCharset("utf-8");
assertEquals(Charset.forName("utf-8").name(), cs);
@@ -41,13 +41,13 @@ public class HttpHeaderHelperTest {
cs = HttpHeaderHelper.mapCharset("'utf-8'");
assertEquals(Charset.forName("utf-8").name(), cs);
}
-
- @Test
+
+ @Test
public void testEmptyCharset() {
String cs = HttpHeaderHelper.mapCharset(HttpHeaderHelper.findCharset("foo/bar; charset="));
assertEquals("ISO-8859-1", cs);
}
- @Test
+ @Test
public void testEmptyCharset2() {
String cs = HttpHeaderHelper.mapCharset(HttpHeaderHelper.findCharset("foo/bar; charset=;"));
assertEquals("ISO-8859-1", cs);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
index c0c8cc0..36ba44d4 100644
--- a/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/IOUtilsTest.java
@@ -28,8 +28,8 @@ import org.junit.Assert;
import org.junit.Test;
public class IOUtilsTest extends Assert {
-
-
+
+
@Test
public void testIsEmpty() throws Exception {
assertTrue(IOUtils.isEmpty(new ByteArrayInputStream(new byte[]{})));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
index 68af96c..3860447 100644
--- a/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/NameSpaceTest.java
@@ -23,46 +23,46 @@ import org.junit.Assert;
import org.junit.Test;
public class NameSpaceTest extends Assert {
-
+
private static final String MY_URL1 = "http://test.apache.org/testurl1";
private static final String MY_URL2 = "http://test.apache.org/testurl2";
private static final String MY_CUSTOM_URL = "http://test.apache.org/custom-prefix-url";
private static final String MY_OWN_PREFIX = "myown-prefix";
-
+
@Test
public void testNSStackOperations() throws Exception {
NSStack nsStackObj = new NSStack();
-
+
nsStackObj.push();
-
+
nsStackObj.add(MY_URL1);
nsStackObj.add(MY_OWN_PREFIX, MY_CUSTOM_URL);
nsStackObj.add(MY_URL2);
-
+
assertEquals(MY_URL1, nsStackObj.getURI("ns1"));
assertEquals(MY_CUSTOM_URL, nsStackObj.getURI(MY_OWN_PREFIX));
assertEquals(MY_URL2, nsStackObj.getURI("ns2"));
assertNull(nsStackObj.getURI("non-existent-prefix"));
-
+
assertEquals("ns2", nsStackObj.getPrefix(MY_URL2));
assertEquals(MY_OWN_PREFIX, nsStackObj.getPrefix(MY_CUSTOM_URL));
assertEquals("ns1", nsStackObj.getPrefix(MY_URL1));
assertNull(nsStackObj.getPrefix("non-existent-prefix"));
-
+
nsStackObj.pop();
assertNull(nsStackObj.getPrefix("non-existent-prefix"));
assertNull(nsStackObj.getPrefix(MY_CUSTOM_URL));
}
-
+
@Test
public void testNSDeclOperaions() throws Exception {
NSDecl nsDecl1 = new NSDecl(MY_OWN_PREFIX, MY_CUSTOM_URL);
NSDecl nsDecl2 = new NSDecl("ns2", MY_URL2);
NSDecl nsDecl3 = new NSDecl(MY_OWN_PREFIX, MY_CUSTOM_URL);
-
+
assertFalse(nsDecl2.equals(nsDecl1));
assertTrue(nsDecl3.equals(nsDecl1));
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
index bb0d5ec..e9a16d0 100644
--- a/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/helpers/ServiceUtilsTest.java
@@ -32,49 +32,49 @@ import org.junit.Test;
public class ServiceUtilsTest extends Assert {
private IMocksControl control;
private Message msg;
-
- @Before
+
+ @Before
public void setUp() {
control = EasyMock.createNiceControl();
msg = control.createMock(Message.class);
}
-
+
@Test
public void testmakeNamespaceFromClassName() throws Exception {
String tns = ServiceUtils.makeNamespaceFromClassName("com.example.ws.Test", "http");
assertEquals("http://ws.example.com/", tns);
}
-
+
@Test
public void testRequestResponseTypes() {
// lets do server side first
setupSchemaValidationValue(SchemaValidationType.REQUEST, false);
assertTrue(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.REQUEST, false);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.RESPONSE, false);
assertTrue(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.RESPONSE, false);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, msg));
-
+
// now client side
setupSchemaValidationValue(SchemaValidationType.REQUEST, true);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.REQUEST, true);
assertTrue(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.RESPONSE, true);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.RESPONSE, true);
assertTrue(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, msg));
}
-
+
@Test
public void testIsSchemaValidationEnabled() {
setupSchemaValidationValue(SchemaValidationType.NONE, false);
@@ -85,7 +85,7 @@ public class ServiceUtilsTest extends Assert {
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, msg));
setupSchemaValidationValue(SchemaValidationType.NONE, false);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.IN, false);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.NONE, msg));
setupSchemaValidationValue(SchemaValidationType.IN, false);
@@ -94,7 +94,7 @@ public class ServiceUtilsTest extends Assert {
assertTrue(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, msg));
setupSchemaValidationValue(SchemaValidationType.IN, false);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.OUT, false);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.NONE, msg));
setupSchemaValidationValue(SchemaValidationType.OUT, false);
@@ -103,7 +103,7 @@ public class ServiceUtilsTest extends Assert {
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, msg));
setupSchemaValidationValue(SchemaValidationType.OUT, false);
assertTrue(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, msg));
-
+
setupSchemaValidationValue(SchemaValidationType.BOTH, false);
assertFalse(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.NONE, msg));
setupSchemaValidationValue(SchemaValidationType.BOTH, false);
@@ -113,62 +113,62 @@ public class ServiceUtilsTest extends Assert {
setupSchemaValidationValue(SchemaValidationType.BOTH, false);
assertTrue(ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, msg));
}
-
+
@Test
public void testGetSchemaValidationTypeBoolean() {
setupSchemaValidationValue(null, false);
assertEquals(SchemaValidationType.NONE, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue("", false);
assertEquals(SchemaValidationType.NONE, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue(Boolean.FALSE, false);
assertEquals(SchemaValidationType.NONE, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue("false", false);
assertEquals(SchemaValidationType.NONE, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue("FALSE", false);
assertEquals(SchemaValidationType.NONE, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue("fAlse", false);
assertEquals(SchemaValidationType.NONE, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue(Boolean.TRUE, false);
assertEquals(SchemaValidationType.BOTH, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue("true", false);
assertEquals(SchemaValidationType.BOTH, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue("TRUE", false);
assertEquals(SchemaValidationType.BOTH, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue("tRue", false);
assertEquals(SchemaValidationType.BOTH, ServiceUtils.getSchemaValidationType(msg));
}
-
+
@Test
public void testGetSchemaValidationType() {
for (SchemaValidationType type : SchemaValidationType.values()) {
setupSchemaValidationValue(type.name(), false);
assertEquals(type, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue(type.name().toLowerCase(), false);
assertEquals(type, ServiceUtils.getSchemaValidationType(msg));
-
+
setupSchemaValidationValue(StringUtils.capitalize(type.name()), false);
assertEquals(type, ServiceUtils.getSchemaValidationType(msg));
}
}
-
+
private void setupSchemaValidationValue(Object value, boolean isRequestor) {
control.reset();
msg.getContextualProperty(Message.SCHEMA_VALIDATION_ENABLED);
EasyMock.expectLastCall().andReturn(value);
-
+
msg.get(Message.REQUESTOR_ROLE);
EasyMock.expectLastCall().andReturn(isRequestor);
-
+
control.replay();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
index 26227a7..3b3158a 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/LoggingOutInterceptorTest.java
@@ -63,7 +63,7 @@ public class LoggingOutInterceptorTest extends Assert {
control.replay();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintWriter pw = new PrintWriter(baos);
-
+
LoggingOutInterceptor p = new LoggingOutInterceptor(pw);
//p.setPrettyLogging(true);
CachedOutputStream cos = new CachedOutputStream();
@@ -82,42 +82,42 @@ public class LoggingOutInterceptorTest extends Assert {
assertTrue(str.contains("<today>"));
}
-
+
@Test
public void testFormattingOverride() throws Exception {
control.replay();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+
// create a custom logging interceptor that overrides how formatting is done
LoggingOutInterceptor p = new CustomFormatLoggingOutInterceptor(new PrintWriter(baos));
CachedOutputStream cos = new CachedOutputStream();
String s = "<today><is><the><twenty> <second> <of> <january> <two> <thousand> <and> <nine></nine> "
+ "</and></thousand></two></january></of></second></twenty></the></is></today>";
cos.write(s.getBytes());
-
+
Message message = new MessageImpl();
message.setExchange(new ExchangeImpl());
message.put(Message.CONTENT_TYPE, "application/xml");
Logger logger = LogUtils.getL7dLogger(this.getClass());
LoggingOutInterceptor.LoggingCallback l = p.new LoggingCallback(logger, message, cos);
l.onClose(cos);
-
+
String str = baos.toString();
assertTrue(str.contains("<tomorrow/>"));
}
-
+
@Test
public void testFormattingOverrideLogWriter() throws Exception {
// create a custom logging interceptor that overrides how formatting is done
LoggingOutInterceptor p = new CustomFormatLoggingOutInterceptor();
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
p.setPrintWriter(new PrintWriter(baos));
-
+
StringWriter sw = new StringWriter();
sw.append("<today/>");
-
+
Endpoint endpoint = control.createMock(Endpoint.class);
EndpointInfo endpointInfo = control.createMock(EndpointInfo.class);
EasyMock.expect(endpoint.getEndpointInfo()).andReturn(endpointInfo).anyTimes();
@@ -127,12 +127,12 @@ public class LoggingOutInterceptorTest extends Assert {
message.setExchange(new ExchangeImpl());
message.put(Message.CONTENT_TYPE, "application/xml");
message.setContent(Writer.class, sw);
-
+
p.handleMessage(message);
-
+
Writer w = message.getContent(Writer.class);
w.close();
-
+
String str = baos.toString();
assertTrue(str.contains("<tomorrow/>"));
}
@@ -180,11 +180,11 @@ public class LoggingOutInterceptorTest extends Assert {
CustomFormatLoggingOutInterceptor() {
super();
}
-
+
CustomFormatLoggingOutInterceptor(PrintWriter w) {
super(w);
}
-
+
@Override
protected String formatLoggingMessage(LoggingMessage loggingMessage) {
loggingMessage.getPayload().append("<tomorrow/>");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
index 3cb4aad..d1e40be 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/ServiceInvokerInterceptorTest.java
@@ -37,18 +37,18 @@ import org.junit.Assert;
import org.junit.Test;
public class ServiceInvokerInterceptorTest extends Assert {
-
+
@Test
public void testInterceptor() throws Exception {
ServiceInvokerInterceptor intc = new ServiceInvokerInterceptor();
-
+
MessageImpl m = new MessageImpl();
Exchange exchange = new ExchangeImpl();
m.setExchange(exchange);
exchange.setInMessage(m);
-
+
exchange.setOutMessage(new MessageImpl());
-
+
TestInvoker i = new TestInvoker();
Endpoint endpoint = createEndpoint(i);
exchange.put(Endpoint.class, endpoint);
@@ -56,15 +56,15 @@ public class ServiceInvokerInterceptorTest extends Assert {
List<Object> lst = new ArrayList<>();
lst.add(input);
m.setContent(List.class, lst);
-
+
intc.handleMessage(m);
-
+
assertTrue(i.invoked);
-
+
List<?> list = exchange.getOutMessage().getContent(List.class);
assertEquals(input, list.get(0));
}
-
+
Endpoint createEndpoint(Invoker i) throws Exception {
IMocksControl control = EasyMock.createNiceControl();
Endpoint endpoint = control.createMock(Endpoint.class);
@@ -73,12 +73,12 @@ public class ServiceInvokerInterceptorTest extends Assert {
service.setInvoker(i);
service.setExecutor(new SimpleExecutor());
EasyMock.expect(endpoint.getService()).andReturn(service).anyTimes();
-
+
control.replay();
return endpoint;
}
-
+
static class TestInvoker implements Invoker {
boolean invoked;
public Object invoke(Exchange exchange, Object o) {
@@ -88,12 +88,12 @@ public class ServiceInvokerInterceptorTest extends Assert {
return o;
}
}
-
+
static class SimpleExecutor implements Executor {
public void execute(Runnable command) {
command.run();
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
index 191772c..f59da22 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/DefaultSecurityContextTest.java
@@ -41,7 +41,7 @@ public class DefaultSecurityContextTest extends Assert {
s.getPrincipals().add(p);
assertFalse(new DefaultSecurityContext(p, s).isUserInRole("friend"));
}
-
+
@Test
public void testUserInRole() {
Subject s = new Subject();
@@ -50,33 +50,33 @@ public class DefaultSecurityContextTest extends Assert {
s.getPrincipals().add(new SimpleGroup("friend", p));
assertTrue(new DefaultSecurityContext(p, s).isUserInRole("friend"));
}
-
+
@Test
public void testMultipleRoles() {
Subject s = new Subject();
Principal p = new SimplePrincipal("Barry");
s.getPrincipals().add(p);
-
+
Set<Principal> roles = new HashSet<>();
roles.add(new SimpleGroup("friend", p));
roles.add(new SimpleGroup("admin", p));
s.getPrincipals().addAll(roles);
-
+
LoginSecurityContext context = new DefaultSecurityContext(p, s);
assertTrue(context.isUserInRole("friend"));
assertTrue(context.isUserInRole("admin"));
assertFalse(context.isUserInRole("bar"));
-
+
Set<Principal> roles2 = context.getUserRoles();
assertEquals(roles2, roles);
}
-
+
@Test
public void testGetSubject() {
Subject s = new Subject();
assertSame(new DefaultSecurityContext(s).getSubject(), s);
}
-
+
@Test
public void testUserInRole2() {
Subject s = new Subject();
@@ -87,7 +87,7 @@ public class DefaultSecurityContextTest extends Assert {
s.getPrincipals().add(group);
assertTrue(new DefaultSecurityContext(p, s).isUserInRole("friend"));
}
-
+
@Test
public void testUserInRole3() {
Subject s = new Subject();
@@ -108,10 +108,10 @@ public class DefaultSecurityContextTest extends Assert {
s.getPrincipals().add(p);
Principal role = new SimplePrincipal("friend");
s.getPrincipals().add(role);
- LoginSecurityContext context = new DefaultSecurityContext(p, s);
+ LoginSecurityContext context = new DefaultSecurityContext(p, s);
assertTrue(context.isUserInRole("friend"));
assertFalse(context.isUserInRole("family"));
assertFalse(context.isUserInRole("Barry"));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
index eda0931..a971b35 100755
--- a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
@@ -27,14 +27,14 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
*/
public class NamePasswordCallbackHandlerTest extends Assert {
@Test
public void testHandleCallback() throws Exception {
NamePasswordCallbackHandler handler = new NamePasswordCallbackHandler("Barry", "dog");
- Callback[] callbacks =
+ Callback[] callbacks =
new Callback[]{new NameCallback("name"), new PasswordCallback("password", false)};
handler.handle(callbacks);
assertEquals("Barry", ((NameCallback)callbacks[0]).getName());
@@ -44,7 +44,7 @@ public class NamePasswordCallbackHandlerTest extends Assert {
@Test
public void testHandleCallback2() throws Exception {
NamePasswordCallbackHandler handler = new NamePasswordCallbackHandler("Barry", "dog");
- Callback[] callbacks =
+ Callback[] callbacks =
new Callback[]{new NameCallback("name"), new ObjectCallback()};
handler.handle(callbacks);
assertEquals("Barry", ((NameCallback)callbacks[0]).getName());
@@ -56,7 +56,7 @@ public class NamePasswordCallbackHandlerTest extends Assert {
@Test
public void testHandleCallback3() throws Exception {
NamePasswordCallbackHandler handler = new NamePasswordCallbackHandler("Barry", "dog");
- Callback[] callbacks =
+ Callback[] callbacks =
new Callback[]{new NameCallback("name"), new StringObjectCallback()};
handler.handle(callbacks);
assertEquals("Barry", ((NameCallback)callbacks[0]).getName());
@@ -66,7 +66,7 @@ public class NamePasswordCallbackHandlerTest extends Assert {
@Test
public void testHandleCallback4() throws Exception {
NamePasswordCallbackHandler handler = new NamePasswordCallbackHandler("Barry", "dog", "setValue");
- Callback[] callbacks =
+ Callback[] callbacks =
new Callback[]{new NameCallback("name"), new CharArrayCallback()};
handler.handle(callbacks);
assertEquals("Barry", ((NameCallback)callbacks[0]).getName());
@@ -75,7 +75,7 @@ public class NamePasswordCallbackHandlerTest extends Assert {
static class ObjectCallback implements Callback {
private Object obj;
-
+
public Object getObject() {
return obj;
}
@@ -87,7 +87,7 @@ public class NamePasswordCallbackHandlerTest extends Assert {
static class StringObjectCallback implements Callback {
private String obj;
-
+
public String getObject() {
return obj;
}
@@ -99,7 +99,7 @@ public class NamePasswordCallbackHandlerTest extends Assert {
static class CharArrayCallback implements Callback {
private char[] obj;
-
+
public char[] getValue() {
return obj;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
index a0c5697..21b783a 100755
--- a/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/OperationInfoAuthorizingInterceptorTest.java
@@ -42,7 +42,7 @@ public class OperationInfoAuthorizingInterceptorTest extends SimpleAuthorizingIn
ex.put(Service.class, service);
MethodDispatcher md = EasyMock.createMock(MethodDispatcher.class);
EasyMock.expect(service.get(MethodDispatcher.class.getName())).andReturn(md).anyTimes();
-
+
BindingOperationInfo boi = EasyMock.createMock(BindingOperationInfo.class);
ex.put(BindingOperationInfo.class, boi);
EasyMock.expect(md.getMethod(boi)).andReturn(null);
@@ -51,12 +51,12 @@ public class OperationInfoAuthorizingInterceptorTest extends SimpleAuthorizingIn
EasyMock.expect(boi.getOperationInfo()).andReturn(opinfo).anyTimes();
EasyMock.replay(service, md, boi, opinfo);
}
-
+
@Override
protected SimpleAuthorizingInterceptor createSimpleAuthorizingInterceptor() {
return new OperationInfoAuthorizingInterceptor();
}
-
+
@Override
protected SimpleAuthorizingInterceptor createSimpleAuthorizingInterceptorWithDenyRoles(final String role) {
SimpleAuthorizingInterceptor in = new OperationInfoAuthorizingInterceptor() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
index 428f5c4..5083b2d 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/RolePrefixSecurityContextImplTest.java
@@ -39,7 +39,7 @@ public class RolePrefixSecurityContextImplTest extends Assert {
s.getPrincipals().add(p);
assertFalse(new RolePrefixSecurityContextImpl(s, "").isUserInRole("friend"));
}
-
+
@Test
public void testUserInRole() {
Subject s = new Subject();
@@ -49,7 +49,7 @@ public class RolePrefixSecurityContextImplTest extends Assert {
assertTrue(new RolePrefixSecurityContextImpl(s, "role_")
.isUserInRole("role_friend"));
}
-
+
@Test
public void testUserInRoleWithRolePrincipal() {
Subject s = new Subject();
@@ -59,42 +59,42 @@ public class RolePrefixSecurityContextImplTest extends Assert {
assertTrue(new RolePrefixSecurityContextImpl(s, "RolePrincipal", "classname")
.isUserInRole("friend"));
}
-
-
+
+
@Test
public void testMultipleRoles() {
Subject s = new Subject();
Principal p = new SimplePrincipal("Barry");
s.getPrincipals().add(p);
-
+
Set<Principal> roles = new HashSet<>();
roles.add(new SimplePrincipal("role_friend"));
roles.add(new SimplePrincipal("role_admin"));
s.getPrincipals().addAll(roles);
-
+
LoginSecurityContext context = new RolePrefixSecurityContextImpl(s, "role_");
assertTrue(context.isUserInRole("role_friend"));
assertTrue(context.isUserInRole("role_admin"));
assertFalse(context.isUserInRole("role_bar"));
-
+
Set<Principal> roles2 = context.getUserRoles();
assertEquals(roles2, roles);
}
-
+
@Test
public void testGetSubject() {
Subject s = new Subject();
assertSame(new RolePrefixSecurityContextImpl(s, "").getSubject(), s);
}
-
+
private static class RolePrincipal implements Principal {
- private String roleName;
+ private String roleName;
RolePrincipal(String roleName) {
this.roleName = roleName;
}
public String getName() {
return roleName;
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
index aa02d2e..60cff9e 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SecureAnnotationsInterceptorTest.java
@@ -45,67 +45,67 @@ public class SecureAnnotationsInterceptorTest extends Assert {
private Method method;
private Message message = new MessageImpl();
-
+
@Before
public void setUp() throws Exception {
method = TestService.class.getMethod("echo", new Class[]{});
message.put(SecurityContext.class, new TestSecurityContext());
Exchange ex = new ExchangeImpl();
message.setExchange(ex);
-
+
Service service = EasyMock.createMock(Service.class);
ex.put(Service.class, service);
MethodDispatcher md = EasyMock.createMock(MethodDispatcher.class);
service.get(MethodDispatcher.class.getName());
EasyMock.expectLastCall().andReturn(md);
-
+
BindingOperationInfo boi = EasyMock.createMock(BindingOperationInfo.class);
ex.put(BindingOperationInfo.class, boi);
md.getMethod(boi);
EasyMock.expectLastCall().andReturn(method);
EasyMock.replay(service, md);
}
-
+
@Test
public void testPermitWithNoRoles() {
- new SecureAnnotationsInterceptor().handleMessage(message);
+ new SecureAnnotationsInterceptor().handleMessage(message);
}
-
+
@Test
public void testPermitWithMethodRoles() {
SecureAnnotationsInterceptor in = new SecureAnnotationsInterceptor();
in.setAnnotationClassName(SecureRolesAllowed.class.getName());
in.setSecuredObject(new TestService());
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testAccessDeniedMethodRoles() {
SecureAnnotationsInterceptor in = new SecureAnnotationsInterceptor();
in.setAnnotationClassName(SecureRolesAllowed.class.getName());
in.setSecuredObject(new TestService2());
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
-
+
+
@Retention (RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE, ElementType.METHOD })
public @interface SecureRolesAllowed {
String[] value();
}
-
+
private static class TestService {
@SecureRolesAllowed("testRole")
public void echo() {
}
}
-
+
private static class TestService2 {
@SecureRolesAllowed("baz")
public void echo() {
}
}
-
+
private static class TestSecurityContext implements SecurityContext {
public Principal getUserPrincipal() {
@@ -115,6 +115,6 @@ public class SecureAnnotationsInterceptorTest extends Assert {
public boolean isUserInRole(String role) {
return "testRole".equals(role);
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
index ad9b5c0..73e79cd 100644
--- a/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
+++ b/core/src/test/java/org/apache/cxf/interceptor/security/SimpleAuthorizingInterceptorTest.java
@@ -42,7 +42,7 @@ public class SimpleAuthorizingInterceptorTest extends Assert {
protected Message message = new MessageImpl();
private Method method;
-
+
@Before
public void setUp() throws Exception {
method = TestService.class.getMethod("echo", new Class[]{});
@@ -52,25 +52,25 @@ public class SimpleAuthorizingInterceptorTest extends Assert {
MethodDispatcher md = EasyMock.createMock(MethodDispatcher.class);
service.get(MethodDispatcher.class.getName());
EasyMock.expectLastCall().andReturn(md);
-
+
BindingOperationInfo boi = EasyMock.createMock(BindingOperationInfo.class);
ex.put(BindingOperationInfo.class, boi);
md.getMethod(boi);
EasyMock.expectLastCall().andReturn(method);
EasyMock.replay(service, md);
}
-
+
protected Exchange setUpExchange() {
message.put(SecurityContext.class, new TestSecurityContext());
Exchange ex = new ExchangeImpl();
message.setExchange(ex);
return ex;
}
-
+
protected SimpleAuthorizingInterceptor createSimpleAuthorizingInterceptor() {
return new SimpleAuthorizingInterceptor();
}
-
+
protected SimpleAuthorizingInterceptor createSimpleAuthorizingInterceptorWithDenyRoles(final String role) {
SimpleAuthorizingInterceptor in = new SimpleAuthorizingInterceptor() {
@Override
@@ -80,7 +80,7 @@ public class SimpleAuthorizingInterceptorTest extends Assert {
};
return in;
}
-
+
@Test(expected = AccessDeniedException.class)
public void testNoSecurityContext() {
message.put(SecurityContext.class, null);
@@ -88,7 +88,7 @@ public class SimpleAuthorizingInterceptorTest extends Assert {
in.setAllowAnonymousUsers(false);
in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testNoSecurityContextAnonymousUserRoles() {
message.put(SecurityContext.class, null);
@@ -102,7 +102,7 @@ public class SimpleAuthorizingInterceptorTest extends Assert {
SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testIncompleteSecurityContext() {
message.put(SecurityContext.class, new IncompleteSecurityContext());
@@ -110,98 +110,98 @@ public class SimpleAuthorizingInterceptorTest extends Assert {
in.setAllowAnonymousUsers(false);
in.handleMessage(message);
}
-
+
@Test
public void testPermitWithNoRoles() {
- createSimpleAuthorizingInterceptor().handleMessage(message);
+ createSimpleAuthorizingInterceptor().handleMessage(message);
}
-
+
@Test
public void testPermitWithMethodRoles() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.setMethodRolesMap(Collections.singletonMap("echo", "role1 testRole"));
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test
public void testPermitWithMethodRolesConfigurationOnly() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.setCheckConfiguredRolesOnly(true);
in.setUserRolesMap(Collections.singletonMap("testUser", "role1"));
in.setMethodRolesMap(Collections.singletonMap("echo", "role1 role2"));
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testDenyWithMethodRolesConfigurationOnly() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.setCheckConfiguredRolesOnly(true);
in.setUserRolesMap(Collections.singletonMap("testUser", "role1"));
in.setMethodRolesMap(Collections.singletonMap("echo", "role2 role3"));
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testEmptyRolesConfigurationOnly() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.setCheckConfiguredRolesOnly(true);
in.setMethodRolesMap(Collections.singletonMap("echo", "role1 role2"));
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test
public void testPermitAll() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.setMethodRolesMap(Collections.singletonMap("echo", "*"));
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test
public void testPermitWithClassRoles() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.setGlobalRoles("role1 testRole");
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testDenyWithMethodRoles() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.setMethodRolesMap(Collections.singletonMap("echo", "role1 role2"));
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testDenyWithClassRoles() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptor();
in.setGlobalRoles("role1 role2");
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test
public void testPermitWithDenyRoles() {
SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptorWithDenyRoles("frogs");
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testDenyWithDenyRoles() {
SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptorWithDenyRoles("testRole");
- in.handleMessage(message);
+ in.handleMessage(message);
}
-
+
@Test(expected = AccessDeniedException.class)
public void testDenyAll() {
- SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptorWithDenyRoles("*");
- in.handleMessage(message);
+ SimpleAuthorizingInterceptor in = createSimpleAuthorizingInterceptorWithDenyRoles("*");
+ in.handleMessage(message);
}
-
+
private static class TestService {
@SuppressWarnings("unused")
public void echo() {
-
+
}
}
-
+
private static class IncompleteSecurityContext implements SecurityContext {
public Principal getUserPrincipal() {
@@ -211,9 +211,9 @@ public class SimpleAuthorizingInterceptorTest extends Assert {
public boolean isUserInRole(String role) {
return false;
}
-
+
}
-
+
private static class TestSecurityContext implements SecurityContext {
public Principal getUserPrincipal() {
@@ -227,6 +227,6 @@ public class SimpleAuthorizingInterceptorTest extends Assert {
public boolean isUserInRole(String role) {
return "testRole".equals(role);
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
index f8f61f8..54c525a 100644
--- a/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
+++ b/core/src/test/java/org/apache/cxf/internal/CXFAPINamespaceHandlerTest.java
@@ -23,13 +23,13 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
*/
public class CXFAPINamespaceHandlerTest extends Assert {
@Test
public void testGetSchemaLocation() {
CXFAPINamespaceHandler handler = new CXFAPINamespaceHandler();
-
+
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/configuration/beans"));
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/configuration/parameterized-types"));
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/configuration/security"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java b/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
index 6b95eb3..32d3e8f 100644
--- a/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
+++ b/core/src/test/java/org/apache/cxf/io/CacheAndWriteOutputStreamTest.java
@@ -33,7 +33,7 @@ public class CacheAndWriteOutputStreamTest extends CachedOutputStreamTest {
isClosed = true;
}
};
-
+
@Override
protected Object createCache() {
return new CacheAndWriteOutputStream(baos);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java b/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
index b54c3cf..7d4366a 100644
--- a/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedOutputStreamTest.java
@@ -24,24 +24,24 @@ import java.io.IOException;
import java.io.InputStream;
public class CachedOutputStreamTest extends CachedStreamTestBase {
-
+
@Override
protected void reloadDefaultProperties() {
CachedOutputStream.setDefaultThreshold(-1);
CachedOutputStream.setDefaultMaxSize(-1);
CachedOutputStream.setDefaultCipherTransformation(null);
}
-
+
@Override
protected Object createCache() {
return new CachedOutputStream();
}
-
+
@Override
protected Object createCache(long threshold) {
return createCache(threshold, null);
}
-
+
@Override
protected Object createCache(long threshold, String transformation) {
CachedOutputStream cos = new CachedOutputStream();
@@ -49,16 +49,16 @@ public class CachedOutputStreamTest extends CachedStreamTestBase {
cos.setCipherTransformation(transformation);
return cos;
}
-
+
@Override
protected String getResetOutValue(String result, Object cache) throws IOException {
CachedOutputStream cos = (CachedOutputStream)cache;
cos.write(result.getBytes());
ByteArrayOutputStream out = new ByteArrayOutputStream();
cos.resetOut(out, true);
- return out.toString();
+ return out.toString();
}
-
+
@Override
protected File getTmpFile(String result, Object cache) throws IOException {
CachedOutputStream cos = (CachedOutputStream)cache;
@@ -72,7 +72,7 @@ public class CachedOutputStreamTest extends CachedStreamTestBase {
protected Object getInputStreamObject(Object cache) throws IOException {
return ((CachedOutputStream)cache).getInputStream();
}
-
+
@Override
protected String readFromStreamObject(Object obj) throws IOException {
return readFromStream((InputStream)obj);
@@ -83,5 +83,5 @@ public class CachedOutputStreamTest extends CachedStreamTestBase {
return readPartiallyFromStream((InputStream)cache, len);
}
}
-
-
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
index 9d69fe3..e898f00 100755
--- a/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedStreamTestBase.java
@@ -49,7 +49,7 @@ public abstract class CachedStreamTestBase extends Assert {
protected abstract Object getInputStreamObject(Object cache) throws IOException;
protected abstract String readFromStreamObject(Object cache) throws IOException;
protected abstract String readPartiallyFromStreamObject(Object cache, int len) throws IOException;
-
+
@Test
public void testResetOut() throws IOException {
String result = initTestData(16);
@@ -58,7 +58,7 @@ public abstract class CachedStreamTestBase extends Assert {
assertEquals("The test stream content isn't same ", test, result);
close(cache);
}
-
+
@Test
public void testDeleteTmpFile() throws IOException {
Object cache = createCache();
@@ -90,7 +90,7 @@ public abstract class CachedStreamTestBase extends Assert {
//assert tmp file is deleted after the input stream is closed
assertFalse(tempFile.exists());
}
-
+
@Test
public void testEncryptAndDecryptWithDeleteOnClose() throws IOException {
// need a 8-bit cipher so that all bytes are flushed when the stream is flushed.
@@ -98,7 +98,7 @@ public abstract class CachedStreamTestBase extends Assert {
verifyEncryptAndDecryptWithDeleteOnClose(cipher);
}
}
-
+
private void verifyEncryptAndDecryptWithDeleteOnClose(String cipher) throws IOException {
Object cache = createCache(4, cipher);
final String text = "Hello Secret World!";
@@ -111,7 +111,7 @@ public abstract class CachedStreamTestBase extends Assert {
Object fin = getInputStreamObject(cache);
assertTrue("file is deleted", tmpfile.exists());
-
+
final String dectext = readFromStreamObject(fin);
assertEquals("text is not decoded correctly", text, dectext);
@@ -134,7 +134,7 @@ public abstract class CachedStreamTestBase extends Assert {
final String text = "Hello Secret World!";
File tmpfile = getTmpFile(text, cache);
assertNotNull(tmpfile);
-
+
final String enctext = readFromStream(new FileInputStream(tmpfile));
assertFalse("text is not encoded", text.equals(enctext));
@@ -142,7 +142,7 @@ public abstract class CachedStreamTestBase extends Assert {
close(cache);
assertTrue("file is deleted", tmpfile.exists());
-
+
// the file is deleted when cos is closed while all the associated inputs are closed
final String dectext = readFromStreamObject(fin);
assertEquals("text is not decoded correctly", text, dectext);
@@ -195,7 +195,7 @@ public abstract class CachedStreamTestBase extends Assert {
File tmpfile = getTmpFile("Hello World!", cache);
assertNull("expects no tmp file", tmpfile);
close(cache);
-
+
System.setProperty("org.apache.cxf.io.CachedOutputStream.Threshold", "4");
reloadDefaultProperties();
cache = createCache();
@@ -214,22 +214,22 @@ public abstract class CachedStreamTestBase extends Assert {
@Test
public void testUseBusProps() throws Exception {
- Bus oldbus = BusFactory.getThreadDefaultBus(false);
+ Bus oldbus = BusFactory.getThreadDefaultBus(false);
try {
Object cache = createCache(64);
File tmpfile = getTmpFile("Hello World!", cache);
assertNull("expects no tmp file", tmpfile);
close(cache);
-
+
IMocksControl control = EasyMock.createControl();
-
+
Bus b = control.createMock(Bus.class);
EasyMock.expect(b.getProperty("bus.io.CachedOutputStream.Threshold")).andReturn("4");
EasyMock.expect(b.getProperty("bus.io.CachedOutputStream.MaxSize")).andReturn(null);
EasyMock.expect(b.getProperty("bus.io.CachedOutputStream.CipherTransformation")).andReturn(null);
-
+
BusFactory.setThreadDefaultBus(b);
-
+
control.replay();
cache = createCache();
@@ -238,13 +238,13 @@ public abstract class CachedStreamTestBase extends Assert {
assertTrue("expects a tmp file", tmpfile.exists());
close(cache);
assertFalse("expects no tmp file", tmpfile.exists());
-
+
control.verify();
} finally {
BusFactory.setThreadDefaultBus(oldbus);
}
}
-
+
private static void close(Object obj) throws IOException {
if (obj instanceof Closeable) {
((Closeable)obj).close();
@@ -264,21 +264,21 @@ public abstract class CachedStreamTestBase extends Assert {
return new String(buf.toByteArray(), StandardCharsets.UTF_8);
}
}
-
+
protected static String readFromReader(Reader is) throws IOException {
try (StringWriter writer = new StringWriter()) {
IOUtils.copyAndCloseInput(is, writer);
return writer.toString();
}
}
-
+
protected static String readPartiallyFromReader(Reader is, int len) throws IOException {
try (StringWriter writer = new StringWriter()) {
IOUtils.copyAtLeast(is, writer, len);
return writer.toString();
}
}
-
+
private static String initTestData(int packetSize) {
String temp = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+?><[]/0123456789";
String result = new String();
@@ -288,5 +288,5 @@ public abstract class CachedStreamTestBase extends Assert {
return result;
}
}
-
-
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/io/CachedWriterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/io/CachedWriterTest.java b/core/src/test/java/org/apache/cxf/io/CachedWriterTest.java
index 7a4c846..e15b78d 100644
--- a/core/src/test/java/org/apache/cxf/io/CachedWriterTest.java
+++ b/core/src/test/java/org/apache/cxf/io/CachedWriterTest.java
@@ -35,12 +35,12 @@ public class CachedWriterTest extends CachedStreamTestBase {
protected Object createCache() {
return new CachedWriter();
}
-
+
@Override
protected Object createCache(long threshold) {
return createCache(threshold, null);
}
-
+
@Override
protected Object createCache(long threshold, String transformation) {
CachedWriter cos = new CachedWriter();
@@ -48,7 +48,7 @@ public class CachedWriterTest extends CachedStreamTestBase {
cos.setCipherTransformation(transformation);
return cos;
}
-
+
@Override
protected String getResetOutValue(String result, Object cache) throws IOException {
CachedWriter cos = (CachedWriter)cache;
@@ -57,7 +57,7 @@ public class CachedWriterTest extends CachedStreamTestBase {
cos.resetOut(out, true);
return out.toString();
}
-
+
@Override
protected File getTmpFile(String result, Object cache) throws IOException {
CachedWriter cos = (CachedWriter)cache;
@@ -82,5 +82,5 @@ public class CachedWriterTest extends CachedStreamTestBase {
return readPartiallyFromReader((Reader)cache, len);
}
}
-
-
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
index 1a24849..a8fa5ec 100644
--- a/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
+++ b/core/src/test/java/org/apache/cxf/phase/PhaseInterceptorChainTest.java
@@ -75,10 +75,10 @@ public class PhaseInterceptorChainTest extends Assert {
@Test
public void testState() throws Exception {
AbstractPhaseInterceptor<? extends Message> p = setUpPhaseInterceptor("phase1", "p1");
-
+
control.replay();
chain.add(p);
-
+
assertSame("Initial state is State.EXECUTING",
InterceptorChain.State.EXECUTING, chain.getState());
chain.pause();
@@ -91,34 +91,34 @@ public class PhaseInterceptorChainTest extends Assert {
assertSame("Aborting chain should lead to State.ABORTED",
InterceptorChain.State.ABORTED, chain.getState());
}
-
+
@Test
public void testSuspendedException() throws Exception {
- CountingPhaseInterceptor p1 =
+ CountingPhaseInterceptor p1 =
new CountingPhaseInterceptor("phase1", "p1");
- SuspendedInvocationInterceptor p2 =
+ SuspendedInvocationInterceptor p2 =
new SuspendedInvocationInterceptor("phase2", "p2");
-
+
message.getInterceptorChain();
EasyMock.expectLastCall().andReturn(chain).anyTimes();
control.replay();
-
+
chain.add(p1);
chain.add(p2);
-
+
try {
chain.doIntercept(message);
fail("Suspended invocation swallowed");
} catch (SuspendedInvocationException ex) {
// ignore
}
-
+
assertSame("No previous interceptor selected", p1, chain.iterator().next());
assertSame("Suspended invocation should lead to State.PAUSED",
InterceptorChain.State.PAUSED, chain.getState());
}
-
+
@Test
public void testAddOneInterceptor() throws Exception {
AbstractPhaseInterceptor<? extends Message> p = setUpPhaseInterceptor("phase1", "p1");
@@ -128,7 +128,7 @@ public class PhaseInterceptorChainTest extends Assert {
assertSame(p, it.next());
assertTrue(!it.hasNext());
}
-
+
@Test
public void testForceAddSameInterceptor() throws Exception {
@@ -143,9 +143,9 @@ public class PhaseInterceptorChainTest extends Assert {
it = chain.iterator();
assertSame(p, it.next());
assertSame(p, it.next());
- assertTrue(!it.hasNext());
+ assertTrue(!it.hasNext());
}
-
+
@Test
public void testForceAddSameInterceptorType() throws Exception {
@@ -161,7 +161,7 @@ public class PhaseInterceptorChainTest extends Assert {
it = chain.iterator();
assertSame(p1, it.next());
assertSame(p2, it.next());
- assertTrue(!it.hasNext());
+ assertTrue(!it.hasNext());
}
@Test
@@ -179,7 +179,7 @@ public class PhaseInterceptorChainTest extends Assert {
assertSame("Unexpected interceptor at this position.", p2, it.next());
assertTrue(!it.hasNext());
}
-
+
@Test
public void testThreeInterceptorSamePhaseWithOrder() throws Exception {
AbstractPhaseInterceptor<? extends Message> p1 = setUpPhaseInterceptor("phase1", "p1");
@@ -193,7 +193,7 @@ public class PhaseInterceptorChainTest extends Assert {
chain.add(p3);
chain.add(p1);
chain.add(p2);
-
+
Iterator<Interceptor<? extends Message>> it = chain.iterator();
assertSame("Unexpected interceptor at this position.", p3, it.next());
assertSame("Unexpected interceptor at this position.", p2, it.next());
@@ -391,20 +391,20 @@ public class PhaseInterceptorChainTest extends Assert {
assertEquals(0, p2.invoked);
assertEquals(1, p3.invoked);
}
-
+
AbstractPhaseInterceptor<Message> setUpPhaseInterceptor(String phase, String id) throws Exception {
return setUpPhaseInterceptor(phase, id, null, null);
}
- AbstractPhaseInterceptor<Message> setUpPhaseInterceptor(final String phase,
+ AbstractPhaseInterceptor<Message> setUpPhaseInterceptor(final String phase,
final String id,
Set<String> b,
Set<String> a) throws Exception {
-
+
@SuppressWarnings("unchecked")
AbstractPhaseInterceptor<Message> p = control
.createMock(AbstractPhaseInterceptor.class);
-
+
if (a == null) {
a = new SortedArraySet<String>();
}
@@ -414,7 +414,7 @@ public class PhaseInterceptorChainTest extends Assert {
Field f = AbstractPhaseInterceptor.class.getDeclaredField("before");
ReflectionUtil.setAccessible(f);
f.set(p, b);
-
+
f = AbstractPhaseInterceptor.class.getDeclaredField("after");
ReflectionUtil.setAccessible(f);
f.set(p, a);
@@ -429,7 +429,7 @@ public class PhaseInterceptorChainTest extends Assert {
return p;
}
-
+
void setUpPhaseInterceptorInvocations(AbstractPhaseInterceptor<Message> p,
boolean fail, boolean expectFault) {
p.handleMessage(message);
@@ -447,8 +447,8 @@ public class PhaseInterceptorChainTest extends Assert {
}
}
- private void setUpCustomLogger(boolean useCustomLogger,
- boolean expectFault,
+ private void setUpCustomLogger(boolean useCustomLogger,
+ boolean expectFault,
boolean returnFromCustomLogger) {
if (useCustomLogger) {
FaultListener customLogger = control.createMock(FaultListener.class);
@@ -456,7 +456,7 @@ public class PhaseInterceptorChainTest extends Assert {
EasyMock.expectLastCall().andReturn(customLogger);
if (expectFault) {
customLogger.faultOccurred(EasyMock.isA(Exception.class),
- EasyMock.isA(String.class),
+ EasyMock.isA(String.class),
EasyMock.isA(Message.class));
EasyMock.expectLastCall().andReturn(returnFromCustomLogger);
if (returnFromCustomLogger) {
@@ -513,7 +513,7 @@ public class PhaseInterceptorChainTest extends Assert {
invoked++;
}
}
-
+
public class WrapperingPhaseInterceptor extends CountingPhaseInterceptor {
public WrapperingPhaseInterceptor(String phase, String id) {
super(phase, id);
@@ -526,11 +526,11 @@ public class PhaseInterceptorChainTest extends Assert {
}
public class SuspendedInvocationInterceptor extends AbstractPhaseInterceptor<Message> {
-
+
public SuspendedInvocationInterceptor(String phase, String id) {
super(id, phase);
}
-
+
public void handleMessage(Message m) {
m.getInterceptorChain().suspend();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
index 0d953de..aaef891 100644
--- a/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/ClassLoaderResolverTest.java
@@ -35,15 +35,15 @@ import org.junit.Test;
public class ClassLoaderResolverTest extends Assert {
- private static final String RESOURCE_DATA = "this is the resource data";
+ private static final String RESOURCE_DATA = "this is the resource data";
private String resourceName;
- private ClassLoaderResolver clr;
+ private ClassLoaderResolver clr;
@Before
- public void setUp() throws IOException {
+ public void setUp() throws IOException {
File resource = File.createTempFile("test", "resource");
- resource.deleteOnExit();
+ resource.deleteOnExit();
resourceName = resource.getName();
FileWriter writer = new FileWriter(resource);
@@ -52,34 +52,34 @@ public class ClassLoaderResolverTest extends Assert {
writer.close();
URL[] urls = {resource.getParentFile().toURI().toURL()};
- ClassLoader loader = new URLClassLoader(urls);
+ ClassLoader loader = new URLClassLoader(urls);
assertNotNull(loader.getResourceAsStream(resourceName));
assertNull(ClassLoader.getSystemResourceAsStream(resourceName));
clr = new ClassLoaderResolver(loader);
- }
-
+ }
+
@After
public void tearDown() {
clr = null;
resourceName = null;
}
-
+
@Test
- public void testResolve() {
+ public void testResolve() {
assertNull(clr.resolve(resourceName, null));
assertNotNull(clr.resolve(resourceName, URL.class));
- }
+ }
@Test
- public void testGetAsStream() throws IOException {
+ public void testGetAsStream() throws IOException {
InputStream in = clr.getAsStream(resourceName);
- assertNotNull(in);
+ assertNotNull(in);
BufferedReader reader = new BufferedReader(new InputStreamReader(in));
- String content = reader.readLine();
+ String content = reader.readLine();
assertEquals("resource content incorrect", RESOURCE_DATA, content);
reader.close();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
index d5b60ff..21c9427 100644
--- a/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
+++ b/core/src/test/java/org/apache/cxf/resource/URIResolverTest.java
@@ -27,20 +27,20 @@ import org.junit.Assert;
import org.junit.Test;
public class URIResolverTest extends Assert {
-
+
private URIResolver uriResolver;
-
+
private URL resourceURL = getClass().getResource("resources/helloworld.bpr");
-
-
+
+
@Test
public void testJARProtocol() throws Exception {
uriResolver = new URIResolver();
-
+
byte[] barray = new byte[]{0};
- byte[] barray2 = new byte[]{1};
+ byte[] barray2 = new byte[]{1};
String uriStr = "jar:" + resourceURL.toString() + "!/wsdl/hello_world.wsdl";
-
+
// Check standard Java API's work with "jar:"
URL jarURL = new URL(uriStr);
InputStream is = jarURL.openStream();
@@ -50,43 +50,43 @@ public class URIResolverTest extends Assert {
is.read(barray);
is.close();
}
-
+
uriResolver.resolve("baseUriStr", uriStr, null);
-
+
InputStream is2 = uriResolver.getInputStream();
- assertNotNull(is2);
+ assertNotNull(is2);
if (is2 != null) {
barray2 = new byte[is2.available()];
is2.read(barray2);
is2.close();
-
- }
+
+ }
assertEquals(IOUtils.newStringFromBytes(barray), IOUtils.newStringFromBytes(barray2));
}
@Test
public void testJARResolver() throws Exception {
uriResolver = new URIResolver();
-
+
String uriStr = "jar:" + resourceURL.toString() + "!/wsdl/hello_world.wsdl";
-
+
URL jarURL = new URL(uriStr);
InputStream is = jarURL.openStream();
assertNotNull(is);
String uriStr2 = "jar:" + resourceURL.toString() + "!/wsdl/hello_world_2.wsdl";
-
+
URL jarURL2 = new URL(uriStr2);
InputStream is2 = jarURL2.openStream();
assertNotNull(is2);
-
+
uriResolver.resolve(uriStr, "hello_world_2.wsdl", null);
-
+
InputStream is3 = uriResolver.getInputStream();
- assertNotNull(is3);
+ assertNotNull(is3);
}
-
-
+
+
@Test
public void testResolveRelativeFile() throws Exception {
URIResolver wsdlResolver = new URIResolver();
@@ -94,23 +94,23 @@ public class URIResolverTest extends Assert {
// resolve the wsdl
wsdlResolver.resolve(null, "wsdl/foo.wsdl", this.getClass());
assertTrue(wsdlResolver.isResolved());
-
+
// get the base uri from the resolved wsdl location
String baseUri = wsdlResolver.getURI().toString();
-
+
// resolve the schema using relative location
String schemaLocation = "../schemas/configuration/bar.xsd";
URIResolver xsdResolver = new URIResolver();
xsdResolver.resolve(baseUri, schemaLocation, this.getClass());
assertNotNull(xsdResolver.getInputStream());
-
+
// resolve the schema using relative location with base uri fragment
xsdResolver = new URIResolver();
xsdResolver.resolve(baseUri + "#type2", schemaLocation, this.getClass());
assertNotNull(xsdResolver.getInputStream());
-
+
}
-
+
@Test
public void testResolvePathWithSpace() throws Exception {
URIResolver wsdlResolver = new URIResolver();
@@ -118,21 +118,21 @@ public class URIResolverTest extends Assert {
// resolve the wsdl
wsdlResolver.resolve(null, "wsdl/foo.wsdl", this.getClass());
assertTrue(wsdlResolver.isResolved());
-
+
// get the base uri from the resolved wsdl location
String baseUri = wsdlResolver.getURI().toString();
-
+
// resolve the schema using relative location
String schemaLocation = "../schemas/configuration/folder with spaces/bar.xsd";
URIResolver xsdResolver = new URIResolver();
xsdResolver.resolve(baseUri, schemaLocation, this.getClass());
assertNotNull(xsdResolver.getInputStream());
-
+
// resolve the schema using relative location with base uri fragment
xsdResolver = new URIResolver();
xsdResolver.resolve(baseUri + "#type2", schemaLocation, this.getClass());
assertNotNull(xsdResolver.getInputStream());
-
+
}
@Test
@@ -142,7 +142,7 @@ public class URIResolverTest extends Assert {
wsdlResolver.resolve(null, "wsdl/folder with spaces/foo.wsdl", this.getClass());
assertTrue(wsdlResolver.isResolved());
}
-
+
@Test
public void testBasePathWithEncodedSpace() throws Exception {
URIResolver wsdlResolver = new URIResolver();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
index a4e4bbe..ae60554 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingFaultInfoTest.java
@@ -26,9 +26,9 @@ import org.junit.Before;
import org.junit.Test;
public class BindingFaultInfoTest extends Assert {
-
+
private BindingFaultInfo bindingFaultInfo;
-
+
@Before
public void setUp() throws Exception {
FaultInfo faultInfo = new FaultInfo(new QName("http://faultns/", "fault"), new QName(
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
index d646cf8..aef5312 100644
--- a/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/BindingOperationInfoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class BindingOperationInfoTest extends Assert {
private static final String TEST_NS = "urn:test:ns";
private BindingOperationInfo bindingOperationInfo;
-
+
@Before
public void setUp() throws Exception {
OperationInfo operationInfo = new OperationInfo(null, new QName(TEST_NS, "operationTest"));
@@ -36,7 +36,7 @@ public class BindingOperationInfoTest extends Assert {
"http://apache.org/hello_world_soap_http", "testInputMessage"),
MessageInfo.Type.INPUT);
operationInfo.setInput("input", inputMessage);
-
+
MessageInfo outputMessage = operationInfo.createMessage(new QName(
"http://apache.org/hello_world_soap_http", "testOutputMessage"),
MessageInfo.Type.OUTPUT);
@@ -45,17 +45,17 @@ public class BindingOperationInfoTest extends Assert {
"http://apache.org/hello_world_soap_http", "faultMessage"));
bindingOperationInfo = new BindingOperationInfo(null, operationInfo);
}
-
+
@Test
public void testName() throws Exception {
assertEquals(bindingOperationInfo.getName(), new QName(TEST_NS, "operationTest"));
}
-
+
@Test
public void testBinding() throws Exception {
assertNull(bindingOperationInfo.getBinding());
}
-
+
@Test
public void testOperation() throws Exception {
assertEquals(bindingOperationInfo.getOperationInfo().getName(), new QName(TEST_NS, "operationTest"));
@@ -67,25 +67,25 @@ public class BindingOperationInfoTest extends Assert {
new QName(TEST_NS, "fault"));
assertEquals(1, bindingOperationInfo.getFaults().size());
}
-
+
@Test
public void testInputMessage() throws Exception {
BindingMessageInfo inputMessage = bindingOperationInfo.getInput();
assertNotNull(inputMessage);
assertEquals(inputMessage.getMessageInfo().getName().getLocalPart(), "testInputMessage");
- assertEquals(inputMessage.getMessageInfo().getName().getNamespaceURI(),
+ assertEquals(inputMessage.getMessageInfo().getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http");
}
-
+
@Test
public void testOutputMessage() throws Exception {
BindingMessageInfo outputMessage = bindingOperationInfo.getOutput();
assertNotNull(outputMessage);
assertEquals(outputMessage.getMessageInfo().getName().getLocalPart(), "testOutputMessage");
- assertEquals(outputMessage.getMessageInfo().getName().getNamespaceURI(),
+ assertEquals(outputMessage.getMessageInfo().getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http");
}
-
+
@Test
public void testFaultMessage() throws Exception {
BindingFaultInfo faultMessage = bindingOperationInfo.getFaults().iterator().next();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
index caa7f99..7dca73a 100644
--- a/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/FaultInfoTest.java
@@ -26,22 +26,22 @@ import org.junit.Before;
import org.junit.Test;
public class FaultInfoTest extends Assert {
-
+
private FaultInfo faultInfo;
-
+
@Before
public void setUp() throws Exception {
faultInfo = new FaultInfo(new QName("urn:test:ns", "fault"), new QName(
"http://apache.org/hello_world_soap_http", "faultMessage"), null);
}
-
+
@Test
public void testName() throws Exception {
assertEquals(faultInfo.getFaultName(), new QName("urn:test:ns", "fault"));
assertEquals(faultInfo.getName().getLocalPart(), "faultMessage");
assertEquals(faultInfo.getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http");
-
+
faultInfo.setFaultName(new QName("urn:test:ns", "fault"));
assertEquals(faultInfo.getFaultName(), new QName("urn:test:ns", "fault"));
}
[47/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
index 847ce28..beebcc7 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
@@ -54,7 +54,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
}
protected void doParse(Element element, ParserContext ctx, BeanDefinitionBuilder bean) {
- String bus = element.getAttribute("bus");
+ String bus = element.getAttribute("bus");
if (StringUtils.isEmpty(bus)) {
bus = element.getAttribute("name");
if (StringUtils.isEmpty(bus)) {
@@ -71,7 +71,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
}
super.doParse(element, ctx, bean);
-
+
if (ctx.getRegistry().containsBeanDefinition(bus)) {
BeanDefinition def = ctx.getRegistry().getBeanDefinition(bus);
copyProps(bean, def);
@@ -87,12 +87,12 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
}
} else {
addBusWiringAttribute(bean, BusWiringType.PROPERTY, bus, ctx);
- bean.getRawBeanDefinition().setAttribute(WIRE_BUS_CREATE,
+ bean.getRawBeanDefinition().setAttribute(WIRE_BUS_CREATE,
resolveId(element, null, ctx));
bean.addConstructorArgValue(bus);
}
}
- protected boolean processBusAttribute(Element element, ParserContext ctx,
+ protected boolean processBusAttribute(Element element, ParserContext ctx,
BeanDefinitionBuilder bean,
String val) {
return false;
@@ -104,13 +104,13 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
}
src.getBeanDefinition().getPropertyValues().removePropertyValue(v);
}
-
+
}
@Override
- protected void mapElement(ParserContext ctx,
- BeanDefinitionBuilder bean,
- Element e,
+ protected void mapElement(ParserContext ctx,
+ BeanDefinitionBuilder bean,
+ Element e,
String name) {
if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name)
|| "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)
@@ -123,7 +123,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
}
}
@Override
- protected String resolveId(Element element, AbstractBeanDefinition definition,
+ protected String resolveId(Element element, AbstractBeanDefinition definition,
ParserContext ctx) {
String bus = null;
try {
@@ -132,7 +132,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
//ignore
}
if (bus == null) {
- bus = element.getAttribute("bus");
+ bus = element.getAttribute("bus");
if (StringUtils.isEmpty(bus)) {
bus = element.getAttribute("name");
}
@@ -144,26 +144,26 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
try {
element.setUserData("ID", bus, null);
} catch (Throwable t) {
- //maybe no DOM level 3, ignore, but, may have issues with the counter
+ //maybe no DOM level 3, ignore, but, may have issues with the counter
}
}
return bus;
}
-
+
@NoJSR250Annotations
public static class BusConfig extends AbstractBasicInterceptorProvider
implements ApplicationContextAware {
-
+
Bus bus;
String busName;
String id;
Collection<Feature> features;
Map<String, Object> properties;
-
+
public BusConfig(String busName) {
this.busName = busName;
}
-
+
public void setBus(Bus bb) {
if (bus == bb) {
return;
@@ -197,9 +197,9 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
if (bus != null) {
return;
- }
+ }
}
-
+
public List<Interceptor<? extends Message>> getOutFaultInterceptors() {
if (bus != null) {
return bus.getOutFaultInterceptors();
@@ -259,7 +259,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
super.setOutFaultInterceptors(interceptors);
}
}
-
+
public Collection<Feature> getFeatures() {
if (bus != null) {
return bus.getFeatures();
@@ -273,13 +273,13 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
} else {
this.features = CastUtils.cast(features);
}
-
+
}
-
+
public Map<String, Object> getProperties() {
if (bus != null) {
return bus.getProperties();
- }
+ }
return properties;
}
public void setProperties(Map<String, Object> s) {
@@ -289,7 +289,7 @@ public class BusDefinitionParser extends AbstractBeanDefinitionParser {
this.properties = s;
}
}
-
+
public void setId(String s) {
id = s;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
index 65d3ffc..d3d747e 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusEntityResolver.java
@@ -38,25 +38,25 @@ import org.springframework.core.io.support.PropertiesLoaderUtils;
import org.springframework.util.CollectionUtils;
/**
- *
+ *
*/
public class BusEntityResolver extends DelegatingEntityResolver {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(BusEntityResolver.class);
-
+
private EntityResolver dtdResolver;
private EntityResolver schemaResolver;
private Map<String, String> schemaMappings;
private ClassLoader classLoader;
-
+
public BusEntityResolver(ClassLoader loader, EntityResolver dr, EntityResolver sr) {
super(dr, sr);
classLoader = loader;
dtdResolver = dr;
schemaResolver = sr;
-
+
try {
- Properties mappings = PropertiesLoaderUtils.loadAllProperties("META-INF/spring.schemas",
+ Properties mappings = PropertiesLoaderUtils.loadAllProperties("META-INF/spring.schemas",
classLoader);
schemaMappings = new ConcurrentHashMap<String, String>(mappings.size());
CollectionUtils.mergePropertiesIntoMap(mappings, schemaMappings);
@@ -71,19 +71,19 @@ public class BusEntityResolver extends DelegatingEntityResolver {
if (null == source && null != systemId) {
// try the schema and dtd resolver in turn, ignoring the suffix in publicId
LOG.log(Level.FINE, "Attempting to resolve systemId {0}", systemId);
- source = schemaResolver.resolveEntity(publicId, systemId);
+ source = schemaResolver.resolveEntity(publicId, systemId);
if (null == source) {
- source = dtdResolver.resolveEntity(publicId, systemId);
+ source = dtdResolver.resolveEntity(publicId, systemId);
}
}
String resourceLocation = schemaMappings.get(systemId);
if (resourceLocation != null && publicId == null) {
Resource resource = new ClassPathResource(resourceLocation, classLoader);
if (resource != null && resource.exists()) {
- source.setPublicId(systemId);
+ source.setPublicId(systemId);
source.setSystemId(resource.getURL().toString());
}
}
return source;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
index 3c6369d..8ef72ef 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
@@ -37,13 +37,13 @@ public class BusExtensionPostProcessor implements BeanPostProcessor, Application
public void setApplicationContext(ApplicationContext ctx) {
context = ctx;
- }
-
+ }
+
public int getOrder() {
return 1001;
}
-
-
+
+
public Object postProcessAfterInitialization(Object bean, String beanId) throws BeansException {
return bean;
}
@@ -60,7 +60,7 @@ public class BusExtensionPostProcessor implements BeanPostProcessor, Application
private <T> void registerExt(Object bean, Class<T> cls) {
getBus().setExtension(cls.cast(bean), cls);
}
-
+
private Bus getBus() {
if (bus == null) {
bus = (Bus)context.getBean(Bus.DEFAULT_BUS_ID);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
index f4f826e..4119214 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusWiringBeanFactoryPostProcessor.java
@@ -52,7 +52,7 @@ public class BusWiringBeanFactoryPostProcessor implements BeanFactoryPostProcess
Bus bus;
String busName;
-
+
public BusWiringBeanFactoryPostProcessor() {
}
@@ -88,9 +88,9 @@ public class BusWiringBeanFactoryPostProcessor implements BeanFactoryPostProcess
BeanDefinition bd = factory.getBeanDefinition(name);
bd.getPropertyValues().addPropertyValue("busConfig", new RuntimeBeanReference(cn));
}
- return new RuntimeBeanReference(name);
+ return new RuntimeBeanReference(name);
}
-
+
public void postProcessBeanFactory(ConfigurableListableBeanFactory factory) throws BeansException {
Object inject = bus;
if (inject == null) {
@@ -103,7 +103,7 @@ public class BusWiringBeanFactoryPostProcessor implements BeanFactoryPostProcess
}
for (String beanName : factory.getBeanDefinitionNames()) {
BeanDefinition beanDefinition = factory.getBeanDefinition(beanName);
- BusWiringType type
+ BusWiringType type
= (BusWiringType)beanDefinition.getAttribute(AbstractBeanDefinitionParser.WIRE_BUS_ATTRIBUTE);
if (type == null) {
continue;
@@ -138,7 +138,7 @@ public class BusWiringBeanFactoryPostProcessor implements BeanFactoryPostProcess
* argument set, then re-insert all its generic arguments, then re-insert all its indexed arguments with
* their indices incremented by 1, and finally set the first indexed argument (at index 0) to the given
* value.
- *
+ *
* @param constructorArgs the argument definition to modify.
* @param valueToInsert the value to insert as the first argument.
*/
@@ -157,7 +157,7 @@ public class BusWiringBeanFactoryPostProcessor implements BeanFactoryPostProcess
}
constructorArgs.addIndexedArgumentValue(0, valueToInsert);
}
-
+
public static Bus addDefaultBus(ApplicationContext ctx) {
if (!ctx.containsBean(Bus.DEFAULT_BUS_ID)) {
Bus b = getBusForName(Bus.DEFAULT_BUS_ID, ctx, true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java b/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
index 007ce70..74fd14a 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/ControlledValidationXmlBeanDefinitionReader.java
@@ -46,22 +46,22 @@ import org.springframework.core.io.support.EncodedResource;
* The time it takes to parse them, especially if validating, builds up.
* The XML files shipped in a release in the JARs are valid and invariant.
* To speed things up, this class implements two levels of optimization.
- * When a CXF distribution is fully-packaged, each of the Spring XML
+ * When a CXF distribution is fully-packaged, each of the Spring XML
* bus extension .xml files is accompanied by a FastInfoset '.fixml' file.
* These read much more rapidly. When one of those is present, this classs
- * reads it instead of reading the XML text file.
- *
+ * reads it instead of reading the XML text file.
+ *
* Absent a .fixml file, this class uses WoodStox instead of Xerces (or
* whatever the JDK is providing).
- *
+ *
* The Woodstox optimization also applies to user cxf.xml or cxf-servlet.xml files
* if the user has disabled XML validation of Spring files with
* the org.apache.cxf.spring.validation.mode system property.
- *
- * Note that the fastInfoset optimization is only applied for the
+ *
+ * Note that the fastInfoset optimization is only applied for the
* methods here that start from a Resource. If this is called with an InputSource,
* that optimization is not applied, since we can't reliably know the
- * location of the XML.
+ * location of the XML.
*/
public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefinitionReader {
@@ -74,7 +74,7 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
}
- // the following flag allows performance comparisons with and
+ // the following flag allows performance comparisons with and
// without fast infoset processing.
private boolean noFastinfoset;
// Spring has no 'getter' for this, so we need our own copy.
@@ -88,12 +88,12 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
super(beanFactory);
tunedDocumentLoader = new TunedDocumentLoader();
this.setDocumentLoader(tunedDocumentLoader);
- noFastinfoset = SystemPropertyAction.getPropertyOrNull("org.apache.cxf.nofastinfoset") != null
+ noFastinfoset = SystemPropertyAction.getPropertyOrNull("org.apache.cxf.nofastinfoset") != null
|| !TunedDocumentLoader.hasFastInfoSet();
}
@Override
- protected int doLoadBeanDefinitions(InputSource inputSource,
+ protected int doLoadBeanDefinitions(InputSource inputSource,
Resource resource) throws BeanDefinitionStoreException {
// sadly, the Spring class we are extending has the critical function
// getValidationModeForResource
@@ -107,7 +107,7 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
} catch (IOException e) {
// this space intentionally left blank.
}
-
+
int savedValidation = visibleValidationMode;
if (suppressValidation) {
setValidationMode(VALIDATION_NONE);
@@ -140,7 +140,7 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
public Integer run() throws Exception {
return internalLoadBeanDefinitions(encodedResource);
}
-
+
});
} catch (PrivilegedActionException e) {
if (e.getException() instanceof RuntimeException) {
@@ -149,15 +149,15 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
throw (BeanDefinitionStoreException)e.getException();
}
}
-
+
private int internalLoadBeanDefinitions(EncodedResource encodedResource) {
return super.loadBeanDefinitions(encodedResource);
}
-
+
private int fastInfosetLoadBeanDefinitions(EncodedResource encodedResource)
- throws IOException, StaleFastinfosetException,
+ throws IOException, StaleFastinfosetException,
ParserConfigurationException, XMLStreamException {
-
+
URL resUrl = encodedResource.getResource().getURL();
// There are XML files scampering around that don't end in .xml.
// We don't apply the optimization to them.
@@ -170,7 +170,7 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
if ("jar".equals(protocol)) {
fixmlPath = fixmlPath.replaceFirst("^.*!", "");
}
-
+
URL fixmlUrl = new URL(resUrl, fixmlPath);
// if we are in unpacked files, we take some extra time
@@ -184,8 +184,8 @@ public class ControlledValidationXmlBeanDefinitionReader extends XmlBeanDefiniti
throw new StaleFastinfosetException();
}
}
-
- Resource newResource = new UrlResource(fixmlUrl);
+
+ Resource newResource = new UrlResource(fixmlUrl);
Document doc = TunedDocumentLoader.loadFastinfosetDocument(fixmlUrl);
if (doc == null) {
//something caused FastinfoSet to not be able to read the doc
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java b/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
index 25748bf..d5c8766 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
@@ -31,7 +31,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.Ordered;
-public class Jsr250BeanPostProcessor
+public class Jsr250BeanPostProcessor
implements DestructionAwareBeanPostProcessor, Ordered, ApplicationContextAware {
private ResourceManager resourceManager;
@@ -43,9 +43,9 @@ public class Jsr250BeanPostProcessor
Jsr250BeanPostProcessor() {
}
-
+
public void setApplicationContext(ApplicationContext arg0) throws BeansException {
- context = arg0;
+ context = arg0;
try {
Class<?> cls = Class
.forName("org.springframework.context.annotation.CommonAnnotationBeanPostProcessor");
@@ -54,11 +54,11 @@ public class Jsr250BeanPostProcessor
isProcessing = true;
}
}
-
+
public int getOrder() {
return 1010;
}
-
+
private boolean injectable(Object bean, String beanId) {
return !"cxf".equals(beanId) && ResourceInjector.processable(bean.getClass(), bean);
}
@@ -111,7 +111,7 @@ public class Jsr250BeanPostProcessor
}
return bean;
}
- if (bean != null
+ if (bean != null
&& injectable(bean, beanId)) {
new ResourceInjector(getResourceManager(bean)).construct(bean);
}
@@ -130,14 +130,14 @@ public class Jsr250BeanPostProcessor
Thread.dumpStack();
}
*/
-
- if (bean != null
+
+ if (bean != null
&& injectable(bean, beanId)) {
new ResourceInjector(getResourceManager(bean)).inject(bean);
/*
System.out.println("p :" + (++count) + ": " + bean.getClass().getName() + " " + beanId);
} else if (bean != null) {
- System.out.println("np: " + (++count2)
+ System.out.println("np: " + (++count2)
+ ": " + bean.getClass().getName() + " " + beanId);
*/
}
@@ -148,7 +148,7 @@ public class Jsr250BeanPostProcessor
if (!isProcessing) {
return;
}
- if (bean != null
+ if (bean != null
&& injectable(bean, beanId)) {
new ResourceInjector(getResourceManager(bean)).destroy(bean);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java b/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
index 9a67b84..a2b0511 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/NamespaceHandler.java
@@ -36,7 +36,7 @@ public class NamespaceHandler extends NamespaceHandlerSupport {
new SimpleBeanDefinitionParser(LoggingFeature.class));
registerBeanDefinitionParser("fastinfoset",
new SimpleBeanDefinitionParser(FastInfosetFeature.class));
-
+
registerBeanDefinitionParser("workqueue",
new SimpleBeanDefinitionParser(AutomaticWorkQueueImpl.class) {
@@ -50,7 +50,7 @@ public class NamespaceHandler extends NamespaceHandlerSupport {
val = "cxf.workqueue." + val;
element.setAttribute("id", val);
}
-
+
}
});
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
index 6a42c11..b080e65 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
@@ -48,17 +48,17 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
/**
- *
+ *
*/
public class SpringBeanLocator implements ConfiguredBeanLocator {
private static final Logger LOG = LogUtils.getL7dLogger(SpringBeanLocator.class);
-
+
ApplicationContext context;
ConfiguredBeanLocator orig;
Set<String> passThroughs = new HashSet<>();
Object bundleContext;
boolean osgi = true;
-
+
public SpringBeanLocator(ApplicationContext ctx) {
this(ctx, null);
}
@@ -74,7 +74,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
names.add(s2);
}
}
-
+
((ExtensionManagerImpl)orig).removeBeansOfNames(names);
}
}
@@ -87,7 +87,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
osgi = false;
}
}
-
+
private Object findBundleContext(ApplicationContext applicationContext, Bus b) {
Object answer = null;
ApplicationContext aContext = applicationContext;
@@ -98,7 +98,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
}
return answer;
}
-
+
private Object getBundleContext(ApplicationContext applicationContext, Bus b) {
try {
//use a little reflection to allow this to work without the spring-dm jars
@@ -116,7 +116,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
}
return null;
}
-
+
public <T> T getBeanOfType(String name, Class<T> type) {
T t = null;
try {
@@ -129,7 +129,7 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
}
return t;
}
-
+
/** {@inheritDoc}*/
public List<String> getBeanNamesOfType(Class<?> type) {
Set<String> s = new LinkedHashSet<String>(Arrays.asList(context.getBeanNamesForType(type,
@@ -198,10 +198,10 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
if (c2 != null) {
return c2;
}
-
+
return cls;
}
-
+
public <T> boolean loadBeansOfType(Class<T> type,
BeanLoaderListener<T> listener) {
@@ -234,13 +234,13 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
}
Collection<?> ids = null;
PropertyValue pv = def.getPropertyValues().getPropertyValue(propertyName);
-
+
if (pv != null) {
Object value = pv.getValue();
if (!(value instanceof Collection)) {
throw new RuntimeException("The property " + propertyName + " must be a collection!");
}
-
+
if (value instanceof Mergeable) {
if (!((Mergeable)value).isMergeEnabled()) {
ids = (Collection<?>)value;
@@ -248,8 +248,8 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
} else {
ids = (Collection<?>)value;
}
- }
-
+ }
+
if (ids != null) {
for (Iterator<?> itr = ids.iterator(); itr.hasNext();) {
Object o = itr.next();
@@ -273,13 +273,13 @@ public class SpringBeanLocator implements ConfiguredBeanLocator {
if (!osgi) {
return lst;
}
-
+
Class<?> contextClass = findContextClass(bundleContext.getClass());
try {
Method m = contextClass.getMethod("getServiceReference", String.class);
Class<?> servRefClass = m.getReturnType();
m = contextClass.getMethod("getServiceReferences", String.class, String.class);
-
+
Object o = ReflectionUtil.setAccessible(m).invoke(bundleContext, type.getName(), null);
if (o != null) {
m = contextClass.getMethod("getService", servRefClass);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java b/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
index 6272f3b..8b5d1ac 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBus.java
@@ -34,21 +34,21 @@ import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.context.support.AbstractApplicationContext;
/**
- *
+ *
*/
-public class SpringBus extends ExtensionManagerBus
+public class SpringBus extends ExtensionManagerBus
implements ApplicationContextAware {
AbstractApplicationContext ctx;
boolean closeContext;
-
+
public SpringBus() {
}
-
+
public void setBusConfig(BusDefinitionParser.BusConfig bc) {
bc.setBus(this);
}
-
+
/** {@inheritDoc}*/
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
ctx = (AbstractApplicationContext)applicationContext;
@@ -66,15 +66,15 @@ public class SpringBus extends ExtensionManagerBus
}
ac = ac.getParent();
}
-
+
// set the classLoader extension with the application context classLoader
setExtension(applicationContext.getClassLoader(), ClassLoader.class);
-
+
setExtension(new ConfigurerImpl(applicationContext), Configurer.class);
-
+
ResourceManager m = getExtension(ResourceManager.class);
m.addResourceResolver(new BusApplicationContextResourceResolver(applicationContext));
-
+
setExtension(applicationContext, ApplicationContext.class);
ConfiguredBeanLocator loc = getExtension(ConfiguredBeanLocator.class);
if (!(loc instanceof SpringBeanLocator)) {
@@ -104,20 +104,20 @@ public class SpringBus extends ExtensionManagerBus
initialize();
}
} else if (event instanceof ContextClosedEvent && getState() == BusState.RUNNING) {
- // The bus could be create by using SpringBusFactory.createBus("/cxf.xml");
+ // The bus could be create by using SpringBusFactory.createBus("/cxf.xml");
// Just to make sure the shutdown is called rightly
shutdown();
}
}
}
-
+
public void destroyBeans() {
if (closeContext) {
ctx.close();
}
super.destroyBeans();
}
-
+
public String getId() {
if (id == null) {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
index 04ea866..84b2761 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
@@ -40,9 +40,9 @@ import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.io.Resource;
public class SpringBusFactory extends BusFactory {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(SpringBusFactory.class);
-
+
private final ApplicationContext context;
private NamespaceHandlerResolver resolver;
@@ -58,7 +58,7 @@ public class SpringBusFactory extends BusFactory {
context = null;
this.resolver = r;
}
-
+
private static NamespaceHandlerResolver tryFindNamespaceHandler(ApplicationContext ctx) {
try {
SpringBeanLocator sbl = new SpringBeanLocator(ctx);
@@ -78,11 +78,11 @@ public class SpringBusFactory extends BusFactory {
public void setNamespaceHandlerResolver(NamespaceHandlerResolver r) {
resolver = r;
}
-
+
public Bus createBus() {
return createBus((String)null);
}
-
+
private boolean defaultBusNotExists() {
if (null != context) {
return !context.containsBean(Bus.DEFAULT_BUS_ID);
@@ -93,11 +93,11 @@ public class SpringBusFactory extends BusFactory {
public Bus createBus(String cfgFile) {
return createBus(cfgFile, defaultBusNotExists());
}
-
+
public Bus createBus(String cfgFiles[]) {
return createBus(cfgFiles, defaultBusNotExists());
}
-
+
protected Bus finishCreatingBus(ConfigurableApplicationContext bac) {
final Bus bus = (Bus)bac.getBean(Bus.DEFAULT_BUS_ID);
@@ -106,29 +106,29 @@ public class SpringBusFactory extends BusFactory {
bus.setExtension((BusApplicationContext)bac, BusApplicationContext.class);
}
possiblySetDefaultBus(bus);
-
- initializeBus(bus);
-
+
+ initializeBus(bus);
+
registerApplicationContextLifeCycleListener(bus, bac);
-
+
if (bus instanceof SpringBus && defaultBusNotExists()) {
((SpringBus)bus).setCloseContext(true);
}
return bus;
}
-
+
public Bus createBus(String cfgFile, boolean includeDefaults) {
if (cfgFile == null) {
return createBus((String[])null, includeDefaults);
}
return createBus(new String[] {cfgFile}, includeDefaults);
- }
-
+ }
+
public Bus createBus(String cfgFiles[], boolean includeDefaults) {
try {
- String userCfgFile
+ String userCfgFile
= SystemPropertyAction.getPropertyOrNull(Configurer.USER_CFG_FILE_PROPERTY_NAME);
- String sysCfgFileUrl
+ String sysCfgFileUrl
= SystemPropertyAction.getPropertyOrNull(Configurer.USER_CFG_FILE_PROPERTY_URL);
final Resource r = BusApplicationContext.findResource(Configurer.DEFAULT_USER_CFG_FILE);
@@ -141,7 +141,7 @@ public class SpringBusFactory extends BusFactory {
}
});
}
- if (context == null && userCfgFile == null && cfgFiles == null && sysCfgFileUrl == null
+ if (context == null && userCfgFile == null && cfgFiles == null && sysCfgFileUrl == null
&& (r == null || !exists) && includeDefaults) {
return new org.apache.cxf.bus.CXFBusFactory().createBus();
}
@@ -151,9 +151,9 @@ public class SpringBusFactory extends BusFactory {
throw new RuntimeException(ex);
}
}
-
+
protected ConfigurableApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults) {
- try {
+ try {
return new BusApplicationContext(cfgFiles, includeDefaults, context, resolver);
} catch (BeansException ex) {
LogUtils.log(LOG, Level.WARNING, "INITIAL_APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[])null);
@@ -162,7 +162,7 @@ public class SpringBusFactory extends BusFactory {
Thread.currentThread().setContextClassLoader(
BusApplicationContext.class.getClassLoader());
try {
- return new BusApplicationContext(cfgFiles, includeDefaults, context);
+ return new BusApplicationContext(cfgFiles, includeDefaults, context);
} finally {
Thread.currentThread().setContextClassLoader(contextLoader);
}
@@ -171,30 +171,30 @@ public class SpringBusFactory extends BusFactory {
}
}
}
-
+
public Bus createBus(URL url) {
return createBus(url, defaultBusNotExists());
}
public Bus createBus(URL[] urls) {
return createBus(urls, defaultBusNotExists());
}
-
+
public Bus createBus(URL url, boolean includeDefaults) {
if (url == null) {
return createBus((URL[])null, includeDefaults);
}
return createBus(new URL[] {url}, includeDefaults);
}
-
+
public Bus createBus(URL[] urls, boolean includeDefaults) {
- try {
+ try {
return finishCreatingBus(createAppContext(urls, includeDefaults));
} catch (BeansException ex) {
LogUtils.log(LOG, Level.WARNING, "APP_CONTEXT_CREATION_FAILED_MSG", ex, (Object[])null);
throw new RuntimeException(ex);
}
}
-
+
protected ConfigurableApplicationContext createAppContext(URL[] urls, boolean includeDefaults) {
return new BusApplicationContext(urls, includeDefaults, context, resolver);
}
@@ -204,7 +204,7 @@ public class SpringBusFactory extends BusFactory {
if (null != lm) {
lm.registerLifeCycleListener(new BusApplicationContextLifeCycleListener(bac));
}
- }
+ }
static class BusApplicationContextLifeCycleListener implements BusLifeCycleListener {
private ConfigurableApplicationContext bac;
@@ -222,6 +222,6 @@ public class SpringBusFactory extends BusFactory {
public void postShutdown() {
bac.close();
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java b/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
index b67fd94..bb8189b 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/TunedDocumentLoader.java
@@ -50,27 +50,27 @@ import org.springframework.beans.factory.xml.DefaultDocumentLoader;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
/**
- * A Spring DocumentLoader that uses WoodStox when we are not validating to speed up the process.
+ * A Spring DocumentLoader that uses WoodStox when we are not validating to speed up the process.
*/
class TunedDocumentLoader extends DefaultDocumentLoader {
- private static final Logger LOG = LogUtils.getL7dLogger(TunedDocumentLoader.class);
-
+ private static final Logger LOG = LogUtils.getL7dLogger(TunedDocumentLoader.class);
+
private static boolean hasFastInfoSet;
-
+
static {
- try {
+ try {
ClassLoaderUtils
- .loadClass("com.sun.xml.fastinfoset.stax.StAXDocumentParser",
- TunedDocumentLoader.class);
+ .loadClass("com.sun.xml.fastinfoset.stax.StAXDocumentParser",
+ TunedDocumentLoader.class);
hasFastInfoSet = true;
- } catch (Throwable e) {
+ } catch (Throwable e) {
LOG.fine("FastInfoset not found on classpath. Disabling context load optimizations.");
hasFastInfoSet = false;
- }
+ }
}
private SAXParserFactory saxParserFactory;
private SAXParserFactory nsasaxParserFactory;
-
+
TunedDocumentLoader() {
try {
Class<?> cls = ClassLoaderUtils.loadClass("com.ctc.wstx.sax.WstxSAXParserFactory",
@@ -84,15 +84,15 @@ class TunedDocumentLoader extends DefaultDocumentLoader {
}
try {
- nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespaces", true);
- nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes",
+ nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespaces", true);
+ nsasaxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes",
true);
} catch (Throwable e) {
//ignore
}
-
+
}
-
+
public static boolean hasFastInfoSet() {
return hasFastInfoSet;
}
@@ -102,7 +102,7 @@ class TunedDocumentLoader extends DefaultDocumentLoader {
ErrorHandler errorHandler, int validationMode, boolean namespaceAware)
throws Exception {
if (validationMode == XmlBeanDefinitionReader.VALIDATION_NONE) {
- SAXParserFactory parserFactory =
+ SAXParserFactory parserFactory =
namespaceAware ? nsasaxParserFactory : saxParserFactory;
SAXParser parser = parserFactory.newSAXParser();
XMLReader reader = parser.getXMLReader();
@@ -128,11 +128,11 @@ class TunedDocumentLoader extends DefaultDocumentLoader {
// we can get all kinds of exceptions from this
// due to old copies of Xerces and whatnot.
}
-
+
return factory;
}
-
- static Document loadFastinfosetDocument(URL url)
+
+ static Document loadFastinfosetDocument(URL url)
throws IOException, ParserConfigurationException, XMLStreamException {
InputStream is = url.openStream();
InputStream in = new BufferedInputStream(is);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/buslifecycle/BusCreationListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/buslifecycle/BusCreationListener.java b/core/src/main/java/org/apache/cxf/buslifecycle/BusCreationListener.java
index 07010d1..99d657f 100644
--- a/core/src/main/java/org/apache/cxf/buslifecycle/BusCreationListener.java
+++ b/core/src/main/java/org/apache/cxf/buslifecycle/BusCreationListener.java
@@ -25,18 +25,18 @@ import org.apache.cxf.Bus;
* The listener interface for receiving notification of when <code>Bus</code>
* objects are created.
*
- * It's a simplified form of BusLifeCycleListener that takes the
- * target Bus as a parameter which is appropriate if the listener needs
- * to be a singleton that works with multiple Bus objects.
- *
+ * It's a simplified form of BusLifeCycleListener that takes the
+ * target Bus as a parameter which is appropriate if the listener needs
+ * to be a singleton that works with multiple Bus objects.
+ *
* A common pattern would be to register a full BusLifeCycleListener on the
* target Bus to receive full Bus events
*/
public interface BusCreationListener {
/**
- * Invoked to create a BusLifeCycleListener.
+ * Invoked to create a BusLifeCycleListener.
*/
void busCreated(Bus b);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/buslifecycle/BusLifeCycleListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/buslifecycle/BusLifeCycleListener.java b/core/src/main/java/org/apache/cxf/buslifecycle/BusLifeCycleListener.java
index 6d65d18..86ce9a4 100644
--- a/core/src/main/java/org/apache/cxf/buslifecycle/BusLifeCycleListener.java
+++ b/core/src/main/java/org/apache/cxf/buslifecycle/BusLifeCycleListener.java
@@ -35,7 +35,7 @@ public interface BusLifeCycleListener {
*
*/
void initComplete();
-
+
/**
* Invoked before the <code>Bus</code> is shutdown.
*
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java b/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
index 16fcf65..07d330a 100644
--- a/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
@@ -44,9 +44,9 @@ public class CatalogXmlSchemaURIResolver implements URIResolver {
public CatalogXmlSchemaURIResolver(Bus bus) {
this.resolver = new TransportURIResolver(bus);
- this.bus = bus;
+ this.bus = bus;
}
-
+
public Map<String, String> getResolvedMap() {
return resolved;
}
@@ -55,12 +55,12 @@ public class CatalogXmlSchemaURIResolver implements URIResolver {
String resolvedSchemaLocation = null;
OASISCatalogManager catalogResolver = OASISCatalogManager.getCatalogManager(bus);
try {
- resolvedSchemaLocation = new OASISCatalogManagerHelper().resolve(catalogResolver,
+ resolvedSchemaLocation = new OASISCatalogManagerHelper().resolve(catalogResolver,
schemaLocation, baseUri);
} catch (Exception e) {
throw new RuntimeException("Catalog resolution failed", e);
}
-
+
InputSource in = null;
if (resolvedSchemaLocation == null) {
in = this.resolver.resolve(schemaLocation, baseUri);
@@ -81,7 +81,7 @@ public class CatalogXmlSchemaURIResolver implements URIResolver {
} else if (in.getByteStream() != null
&& !(in.getByteStream() instanceof ByteArrayInputStream)) {
//workaround bug in XmlSchema - XmlSchema is not closing the InputStreams
- //that are returned for imports. Thus, with a lot of services starting up
+ //that are returned for imports. Thus, with a lot of services starting up
//or a lot of schemas imported or similar, it's easy to run out of
//file handles. We'll just load the file into a byte[] and return that.
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
index 2aa061e..6950ac2 100644
--- a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
+++ b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManager.java
@@ -50,9 +50,9 @@ public class OASISCatalogManager {
private static final Logger LOG =
LogUtils.getL7dLogger(OASISCatalogManager.class);
- private static final String DEBUG_LEVEL
+ private static final String DEBUG_LEVEL
= SystemPropertyAction.getPropertyOrNull(CATALOG_DEBUG_KEY);
-
+
private EntityResolver resolver;
private Object catalog;
@@ -63,18 +63,18 @@ public class OASISCatalogManager {
resolver = getResolver();
catalog = getCatalog(resolver);
}
-
+
public OASISCatalogManager(Bus b) {
bus = b;
resolver = getResolver();
catalog = getCatalog(resolver);
loadContextCatalogs(DEFAULT_CATALOG_NAME);
}
-
+
public boolean hasCatalogs() {
return !loadedCatalogs.isEmpty();
}
-
+
private static Object getCatalog(EntityResolver resolver) {
try {
return ((CatalogResolver)resolver).getCatalog();
@@ -111,7 +111,7 @@ public class OASISCatalogManager {
return catalogResolver;
} catch (Throwable t) {
//ignore
- }
+ }
return null;
}
@@ -180,7 +180,7 @@ public class OASISCatalogManager {
}
}
}
-
+
private static OASISCatalogManager getContextCatalog() {
try {
OASISCatalogManager oasisCatalog = new OASISCatalogManager();
@@ -201,9 +201,9 @@ public class OASISCatalogManager {
if (catalog != null) {
bus.setExtension(catalog, OASISCatalogManager.class);
}
- }
+ }
return catalog;
-
+
}
public String resolveSystem(String sys) throws MalformedURLException, IOException {
@@ -225,7 +225,7 @@ public class OASISCatalogManager {
}
return ((Catalog)catalog).resolvePublic(uri, parent);
}
-
+
public EntityResolver getEntityResolver() {
return resolver;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java
index 7d471ef..25c4318 100644
--- a/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java
+++ b/core/src/main/java/org/apache/cxf/catalog/OASISCatalogManagerHelper.java
@@ -26,13 +26,13 @@ public class OASISCatalogManagerHelper {
String resolvedLocation = null;
if (catalogResolver != null) {
resolvedLocation = catalogResolver.resolveSystem(target);
-
+
if (resolvedLocation == null) {
resolvedLocation = catalogResolver.resolveURI(target);
}
if (resolvedLocation == null) {
resolvedLocation = catalogResolver.resolvePublic(target, base);
- }
+ }
}
return resolvedLocation;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java b/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java
index f1ec27a..3093b82 100644
--- a/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java
+++ b/core/src/main/java/org/apache/cxf/common/annotation/AbstractAnnotationVisitor.java
@@ -28,23 +28,23 @@ import java.util.List;
public abstract class AbstractAnnotationVisitor implements AnnotationVisitor {
protected Object target;
protected Class<?> targetClass;
-
- private final List<Class<? extends Annotation>> targetAnnotations =
- new ArrayList<Class<? extends Annotation>>();
-
-
+
+ private final List<Class<? extends Annotation>> targetAnnotations =
+ new ArrayList<Class<? extends Annotation>>();
+
+
protected AbstractAnnotationVisitor(Class<? extends Annotation> ann) {
addTargetAnnotation(ann);
}
-
+
protected AbstractAnnotationVisitor(List<Class<? extends Annotation>> ann) {
targetAnnotations.addAll(ann);
}
- protected final void addTargetAnnotation(Class<? extends Annotation> ann) {
- targetAnnotations.add(ann);
- }
+ protected final void addTargetAnnotation(Class<? extends Annotation> ann) {
+ targetAnnotations.add(ann);
+ }
public void visitClass(Class<?> clz, Annotation annotation) {
// complete
@@ -70,12 +70,12 @@ public abstract class AbstractAnnotationVisitor implements AnnotationVisitor {
target = object;
targetClass = cls;
}
-
- public Object getTarget() {
+
+ public Object getTarget() {
return target;
- }
- public Class<?> getTargetClass() {
+ }
+ public Class<?> getTargetClass() {
return targetClass;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/annotation/AnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/annotation/AnnotationProcessor.java b/core/src/main/java/org/apache/cxf/common/annotation/AnnotationProcessor.java
index 2e14680..6c7f950 100644
--- a/core/src/main/java/org/apache/cxf/common/annotation/AnnotationProcessor.java
+++ b/core/src/main/java/org/apache/cxf/common/annotation/AnnotationProcessor.java
@@ -38,45 +38,45 @@ import org.apache.cxf.common.util.ReflectionUtil;
* level annotation
*/
public class AnnotationProcessor {
-
- private static final Logger LOG = LogUtils.getL7dLogger(AnnotationProcessor.class);
-
- private final Object target;
- private List<Class<? extends Annotation>> annotationTypes;
-
-
+
+ private static final Logger LOG = LogUtils.getL7dLogger(AnnotationProcessor.class);
+
+ private final Object target;
+ private List<Class<? extends Annotation>> annotationTypes;
+
+
public AnnotationProcessor(Object o) {
if (o == null) {
- throw new IllegalArgumentException(new Message("INVALID_CTOR_ARGS", LOG).toString());
+ throw new IllegalArgumentException(new Message("INVALID_CTOR_ARGS", LOG).toString());
}
- target = o;
+ target = o;
}
-
- /**
+
+ /**
* Visits each of the annotated elements of the object.
- *
- * @param visitor a visitor
+ *
+ * @param visitor a visitor
* @param claz the Class of the targe object
*/
- public void accept(AnnotationVisitor visitor, Class<?> claz) {
-
+ public void accept(AnnotationVisitor visitor, Class<?> claz) {
+
if (visitor == null) {
throw new IllegalArgumentException();
}
-
+
annotationTypes = visitor.getTargetAnnotations();
visitor.setTarget(target);
//recursively check annotation in super class
processClass(visitor, claz);
- processFields(visitor, claz);
+ processFields(visitor, claz);
processMethods(visitor, claz);
- }
-
+ }
+
public void accept(AnnotationVisitor visitor) {
accept(visitor, target.getClass());
}
-
-
+
+
private void processMethods(AnnotationVisitor visitor, Class<? extends Object> targetClass) {
if (targetClass.getSuperclass() != null) {
@@ -84,38 +84,38 @@ public class AnnotationProcessor {
}
for (Method element : ReflectionUtil.getDeclaredMethods(targetClass)) {
for (Class<? extends Annotation> clz : annotationTypes) {
- Annotation ann = element.getAnnotation(clz);
+ Annotation ann = element.getAnnotation(clz);
if (ann != null) {
visitor.visitMethod(element, ann);
}
}
}
}
-
- private void processFields(AnnotationVisitor visitor, Class<? extends Object> targetClass) {
+
+ private void processFields(AnnotationVisitor visitor, Class<? extends Object> targetClass) {
if (targetClass.getSuperclass() != null) {
processFields(visitor, targetClass.getSuperclass());
}
for (Field element : ReflectionUtil.getDeclaredFields(targetClass)) {
for (Class<? extends Annotation> clz : annotationTypes) {
- Annotation ann = element.getAnnotation(clz);
+ Annotation ann = element.getAnnotation(clz);
if (ann != null) {
visitor.visitField(element, ann);
}
}
}
- }
-
-
+ }
+
+
private void processClass(AnnotationVisitor visitor, Class<? extends Object> targetClass) {
if (targetClass.getSuperclass() != null) {
processClass(visitor, targetClass.getSuperclass());
}
for (Class<? extends Annotation> clz : annotationTypes) {
- Annotation ann = targetClass.getAnnotation(clz);
+ Annotation ann = targetClass.getAnnotation(clz);
if (ann != null) {
visitor.visitClass(targetClass, ann);
}
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/annotation/AnnotationVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/annotation/AnnotationVisitor.java b/core/src/main/java/org/apache/cxf/common/annotation/AnnotationVisitor.java
index 0356bb9..1c2e0cd 100644
--- a/core/src/main/java/org/apache/cxf/common/annotation/AnnotationVisitor.java
+++ b/core/src/main/java/org/apache/cxf/common/annotation/AnnotationVisitor.java
@@ -31,12 +31,12 @@ import java.util.List;
public interface AnnotationVisitor {
/** set the target object being visited. Invoked before any of
- * the visit methods.
+ * the visit methods.
*
* @see AnnotationProcessor
*
- * @param target the target object
- */
+ * @param target the target object
+ */
void setTarget(Object target);
@@ -46,39 +46,39 @@ public interface AnnotationVisitor {
* @return list of annotation types to be informed about
*
*/
- List<Class<? extends Annotation>> getTargetAnnotations();
-
+ List<Class<? extends Annotation>> getTargetAnnotations();
+
/** visit an annotated class. Invoked when the class of an object
* is annotated by one of the specified annotations.
* <code>visitClass</code> is called for each of the annotations
- * that matches and for each class.
+ * that matches and for each class.
*
* @param clz the class with the annotation
- * @param annotation the annotation
+ * @param annotation the annotation
*
*/
- void visitClass(Class<?> clz, Annotation annotation);
+ void visitClass(Class<?> clz, Annotation annotation);
+
-
/** visit an annotated field. Invoked when the field of an object
* is annotated by one of the specified annotations.
* <code>visitField</code> is called for each of the annotations
- * that matches and for each field.
+ * that matches and for each field.
*
* @param field the annotated field
- * @param annotation the annotation
+ * @param annotation the annotation
*
*/
- void visitField(Field field, Annotation annotation);
+ void visitField(Field field, Annotation annotation);
/** visit an annotated method. Invoked when the method of an object
* is annotated by one of the specified annotations.
* <code>visitMethod</code> is called for each of the annotations
- * that matches and for each method.
+ * that matches and for each method.
*
* @param method the annotated fieldx
- * @param annotation the annotation
+ * @param annotation the annotation
*
*/
- void visitMethod(Method method, Annotation annotation);
+ void visitMethod(Method method, Annotation annotation);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
index 421d1d2..971045f 100644
--- a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
@@ -36,16 +36,16 @@ import java.util.List;
* verify any change on 6 different application servers.
*/
public final class ClassLoaderUtils {
-
+
private ClassLoaderUtils() {
}
-
+
public static class ClassLoaderHolder {
ClassLoader loader;
ClassLoaderHolder(ClassLoader c) {
loader = c;
}
-
+
public void reset() {
ClassLoaderUtils.setThreadContextClassloader(loader);
}
@@ -59,7 +59,7 @@ public final class ClassLoaderUtils {
}
});
}
-
+
public static ClassLoader getURLClassLoader(
final URL[] urls, final ClassLoader parent
) {
@@ -75,7 +75,7 @@ public final class ClassLoaderUtils {
) {
return getURLClassLoader(urlList.toArray(new URL[urlList.size()]), parent);
}
-
+
/**
* Load a given resource. <p/> This method will try to load the resource
* using the following methods (in order):
@@ -84,7 +84,7 @@ public final class ClassLoaderUtils {
* <li>From ClassLoaderUtil.class.getClassLoader()
* <li>callingClass.getClassLoader()
* </ul>
- *
+ *
* @param resourceName The name of the resource to load
* @param callingClass The Class object of the calling object
*/
@@ -119,14 +119,14 @@ public final class ClassLoaderUtils {
if (url == null) {
url = callingClass.getResource(resourceName);
}
-
+
if ((url == null) && (resourceName != null) && (resourceName.charAt(0) != '/')) {
return getResource('/' + resourceName, callingClass);
}
return url;
}
-
+
/**
* Load a given resources. <p/> This method will try to load the resources
* using the following methods (in order):
@@ -135,7 +135,7 @@ public final class ClassLoaderUtils {
* <li>From ClassLoaderUtil.class.getClassLoader()
* <li>callingClass.getClassLoader()
* </ul>
- *
+ *
* @param resourceName The name of the resource to load
* @param callingClass The Class object of the calling object
*/
@@ -148,7 +148,7 @@ public final class ClassLoaderUtils {
public URL nextElement() {
return null;
}
-
+
};
try {
urls = Thread.currentThread().getContextClassLoader()
@@ -208,7 +208,7 @@ public final class ClassLoaderUtils {
ret.add(urls.nextElement());
}
-
+
if (ret.isEmpty() && (resourceName != null) && (resourceName.charAt(0) != '/')) {
return getResources('/' + resourceName, callingClass);
}
@@ -219,7 +219,7 @@ public final class ClassLoaderUtils {
/**
* This is a convenience method to load a resource as a stream. <p/> The
* algorithm used to find the resource is given in getResource()
- *
+ *
* @param resourceName The name of the resource to load
* @param callingClass The Class object of the calling object
*/
@@ -242,7 +242,7 @@ public final class ClassLoaderUtils {
* <li>From ClassLoaderUtil.class.getClassLoader()
* <li>From the callingClass.getClassLoader()
* </ul>
- *
+ *
* @param className The name of the class to load
* @param callingClass The Class object of the calling object
* @throws ClassNotFoundException If the class cannot be found anywhere.
@@ -254,7 +254,7 @@ public final class ClassLoaderUtils {
if (cl != null) {
return cl.loadClass(className);
- }
+ }
} catch (ClassNotFoundException e) {
//ignore
}
@@ -267,7 +267,7 @@ public final class ClassLoaderUtils {
if (cl != null) {
return cl.loadClass(className).asSubclass(type);
- }
+ }
} catch (ClassNotFoundException e) {
//ignore
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java b/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
index 5fdd3b4..011d00e 100644
--- a/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/i18n/BundleUtils.java
@@ -45,7 +45,7 @@ public final class BundleUtils {
/**
* Encapsulates the logic related to naming the default resource bundle
- * for a class.
+ * for a class.
*
* @param cls the Class requiring the bundle
* @return an appropriate ResourceBundle name
@@ -53,12 +53,12 @@ public final class BundleUtils {
public static String getBundleName(Class<?> cls) {
// Class.getPackage() can return null, so change to another way to get Package Name
return PackageUtils.getPackageName(cls) + MESSAGE_BUNDLE;
-
+
}
-
+
/**
* Encapsulates the logic related to naming the resource bundle
- * with the given relative name for a class.
+ * with the given relative name for a class.
*
* @param cls the Class requiring the bundle
* @return an appropriate ResourceBundle name
@@ -69,13 +69,13 @@ public final class BundleUtils {
/**
* Encapsulates the logic related to locating the default resource bundle
- * for a class.
+ * for a class.
*
* @param cls the Class requiring the bundle
* @return an appropriate ResourceBundle
*/
public static ResourceBundle getBundle(Class<?> cls) {
-
+
try {
ClassLoader loader = cls.getClassLoader();
if (loader == null) {
@@ -92,12 +92,12 @@ public final class BundleUtils {
return ResourceBundle.getBundle(getBundleName(cls),
Locale.getDefault(),
loader);
-
+
}
}
-
+
/**
- * Encapsulates the logic related to locating the resource bundle with the given
+ * Encapsulates the logic related to locating the resource bundle with the given
* relative name for a class.
*
* @param cls the Class requiring the bundle
@@ -121,13 +121,13 @@ public final class BundleUtils {
return ResourceBundle.getBundle(getBundleName(cls, name),
Locale.getDefault(),
loader);
-
+
}
}
-
+
/**
* Encapsulates the logic to format a string based on the key in the resource bundle
- *
+ *
* @param b Resource bundle to use
* @param key The key in the bundle to lookup
* @param params the params to expand into the string
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/i18n/Exception.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/i18n/Exception.java b/core/src/main/java/org/apache/cxf/common/i18n/Exception.java
index 26e06b1..874142c 100644
--- a/core/src/main/java/org/apache/cxf/common/i18n/Exception.java
+++ b/core/src/main/java/org/apache/cxf/common/i18n/Exception.java
@@ -22,32 +22,32 @@ package org.apache.cxf.common.i18n;
public class Exception extends java.lang.Exception {
-
+
private static final long serialVersionUID = 1L;
-
+
private final Message message;
-
+
public Exception(Message msg) {
message = msg;
}
-
+
public Exception(Message msg, Throwable t) {
super(t);
message = msg;
}
-
+
public Exception(Throwable cause) {
super(cause);
message = null;
- }
-
+ }
+
public String getCode() {
if (null != message) {
return message.getCode();
}
return null;
}
-
+
public String getMessage() {
if (null != message) {
return message.toString();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/i18n/Message.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/i18n/Message.java b/core/src/main/java/org/apache/cxf/common/i18n/Message.java
index b675aaf..51dd9ce 100644
--- a/core/src/main/java/org/apache/cxf/common/i18n/Message.java
+++ b/core/src/main/java/org/apache/cxf/common/i18n/Message.java
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
public class Message implements Serializable {
private static final long serialVersionUID = 42L;
-
+
transient String code;
transient Object[] parameters;
transient ResourceBundle bundle;
@@ -56,24 +56,24 @@ public class Message implements Serializable {
bundle = catalog;
parameters = params;
}
-
+
public String toString() {
String fmt = null;
try {
if (null == bundle) {
return code;
}
- fmt = bundle.getString(code);
+ fmt = bundle.getString(code);
} catch (MissingResourceException ex) {
return code;
}
return MessageFormat.format(fmt, parameters);
}
-
+
public String getCode() {
- return code;
+ return code;
}
-
+
public Object[] getParameters() {
return parameters;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java b/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
index 90906d5..46b5264 100644
--- a/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
+++ b/core/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
@@ -25,55 +25,55 @@ import java.util.logging.Logger;
public class UncheckedException extends java.lang.RuntimeException {
-
+
private static final long serialVersionUID = 1L;
-
+
protected final Message message;
-
+
public UncheckedException(Message msg) {
message = msg;
}
-
+
public UncheckedException(Message msg, Throwable t) {
super(t);
message = msg;
}
-
+
public UncheckedException(Throwable cause) {
super(cause);
message = null;
- }
-
+ }
+
public UncheckedException(Logger log, String msg, Object ... params) {
message = new org.apache.cxf.common.i18n.Message(msg,
log,
params);
- }
+ }
public UncheckedException(ResourceBundle bundle, String msg, Object ... params) {
message = new org.apache.cxf.common.i18n.Message(msg,
bundle,
params);
- }
+ }
public UncheckedException(Logger log, String msg, Throwable t, Object ... params) {
super(t);
message = new org.apache.cxf.common.i18n.Message(msg,
log,
params);
- }
+ }
public UncheckedException(ResourceBundle bundle, String msg, Throwable t, Object ... params) {
super(t);
message = new org.apache.cxf.common.i18n.Message(msg,
bundle,
params);
- }
-
+ }
+
public String getCode() {
if (null != message) {
return message.getCode();
}
return null;
}
-
+
public String getMessage() {
if (null != message) {
return message.toString();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/injection/NoJSR250Annotations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/injection/NoJSR250Annotations.java b/core/src/main/java/org/apache/cxf/common/injection/NoJSR250Annotations.java
index 8bb1a04..86c29f5 100644
--- a/core/src/main/java/org/apache/cxf/common/injection/NoJSR250Annotations.java
+++ b/core/src/main/java/org/apache/cxf/common/injection/NoJSR250Annotations.java
@@ -27,16 +27,16 @@ import java.lang.annotation.Target;
/**
* Marker annotation to let our JSR250 Processor know
* not to bother examining the class for annotations
- * as it's know not to have any
+ * as it's know not to have any
*/
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
public @interface NoJSR250Annotations {
-
+
/**
* If these fields are null, it will go ahead and do JSR250 processing
* as it assumes the values were not set via a constructor.
- *
+ *
* Be careful with this. If the field is injected with a value via @Resource,
* when the other annotations are processed (@PostConstruct), the field is then
* not-null so they won't be run. The best bet is to make sure the @Resource
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
index 2e6eb3b..27efdcc 100644
--- a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
+++ b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
@@ -46,22 +46,22 @@ import org.apache.cxf.resource.ResourceResolver;
/**
- * injects references specified using @Resource annotation
- *
+ * injects references specified using @Resource annotation
+ *
*/
public class ResourceInjector extends AbstractAnnotationVisitor {
private static final Logger LOG = LogUtils.getL7dLogger(ResourceInjector.class);
- private static final List<Class<? extends Annotation>> ANNOTATIONS =
+ private static final List<Class<? extends Annotation>> ANNOTATIONS =
new ArrayList<Class<? extends Annotation>>();
-
+
static {
ANNOTATIONS.add(Resource.class);
ANNOTATIONS.add(Resources.class);
}
-
-
- private final ResourceManager resourceManager;
+
+
+ private final ResourceManager resourceManager;
private final List<ResourceResolver> resourceResolvers;
public ResourceInjector(ResourceManager resMgr) {
@@ -73,7 +73,7 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
resourceManager = resMgr;
resourceResolvers = resolvers;
}
-
+
private static Field getField(Class<?> cls, String name) {
if (cls == null) {
return null;
@@ -84,7 +84,7 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
return getField(cls.getSuperclass(), name);
}
}
-
+
public static boolean processable(Class<?> cls, Object o) {
if (cls.getName().startsWith("java.")
|| cls.getName().startsWith("javax.")) {
@@ -107,18 +107,18 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
}
return true;
}
-
- public void inject(Object o) {
+
+ public void inject(Object o) {
inject(o, o.getClass());
}
-
+
public void inject(Object o, Class<?> claz) {
if (processable(claz, o)) {
- AnnotationProcessor processor = new AnnotationProcessor(o);
+ AnnotationProcessor processor = new AnnotationProcessor(o);
processor.accept(this, claz);
}
}
-
+
public void construct(Object o) {
setTarget(o);
if (processable(targetClass, o)) {
@@ -144,64 +144,64 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
// Implementation of org.apache.cxf.common.annotation.AnnotationVisitor
public final void visitClass(final Class<?> clz, final Annotation annotation) { //NOPMD
-
- assert annotation instanceof Resource || annotation instanceof Resources : annotation;
- if (annotation instanceof Resource) {
- injectResourceClassLevel((Resource)annotation);
- } else if (annotation instanceof Resources) {
+ assert annotation instanceof Resource || annotation instanceof Resources : annotation;
+
+ if (annotation instanceof Resource) {
+ injectResourceClassLevel((Resource)annotation);
+ } else if (annotation instanceof Resources) {
Resources resources = (Resources)annotation;
for (Resource resource : resources.value()) {
- injectResourceClassLevel(resource);
+ injectResourceClassLevel(resource);
}
- }
+ }
}
- private void injectResourceClassLevel(Resource res) {
- if (res.name() == null || "".equals(res.name())) {
+ private void injectResourceClassLevel(Resource res) {
+ if (res.name() == null || "".equals(res.name())) {
LOG.log(Level.INFO, "RESOURCE_NAME_NOT_SPECIFIED", target.getClass().getName());
return;
- }
+ }
Object resource = null;
// first find a setter that matches this resource
Method setter = findSetterForResource(res);
- if (setter != null) {
- Class<?> type = getResourceType(res, setter);
+ if (setter != null) {
+ Class<?> type = getResourceType(res, setter);
resource = resolveResource(res.name(), type);
if (resource == null) {
LOG.log(Level.INFO, "RESOURCE_RESOLVE_FAILED");
return;
- }
+ }
invokeSetter(setter, resource);
return;
}
-
+
Field field = findFieldForResource(res);
- if (field != null) {
- Class<?> type = getResourceType(res, field);
+ if (field != null) {
+ Class<?> type = getResourceType(res, field);
resource = resolveResource(res.name(), type);
if (resource == null) {
LOG.log(Level.INFO, "RESOURCE_RESOLVE_FAILED");
return;
- }
- injectField(field, resource);
+ }
+ injectField(field, resource);
return;
}
LOG.log(Level.SEVERE, "NO_SETTER_OR_FIELD_FOR_RESOURCE", getTarget().getClass().getName());
- }
+ }
public final void visitField(final Field field, final Annotation annotation) {
assert annotation instanceof Resource : annotation;
-
+
Resource res = (Resource)annotation;
String name = getFieldNameForResource(res, field);
- Class<?> type = getResourceType(res, field);
-
+ Class<?> type = getResourceType(res, field);
+
Object resource = resolveResource(name, type);
if (resource == null
&& "".equals(res.name())) {
@@ -215,13 +215,13 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
}
public final void visitMethod(final Method method, final Annotation annotation) {
-
+
assert annotation instanceof Resource : annotation;
- Resource res = (Resource)annotation;
-
+ Resource res = (Resource)annotation;
+
String resourceName = getResourceName(res, method);
- Class<?> clz = getResourceType(res, method);
+ Class<?> clz = getResourceType(res, method);
Object resource = resolveResource(resourceName, clz);
if (resource == null
@@ -236,26 +236,26 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
}
private Field findFieldForResource(Resource res) {
- assert target != null;
+ assert target != null;
assert res.name() != null;
- for (Field field : target.getClass().getFields()) {
- if (field.getName().equals(res.name())) {
+ for (Field field : target.getClass().getFields()) {
+ if (field.getName().equals(res.name())) {
return field;
- }
+ }
}
- for (Field field : target.getClass().getDeclaredFields()) {
- if (field.getName().equals(res.name())) {
+ for (Field field : target.getClass().getDeclaredFields()) {
+ if (field.getName().equals(res.name())) {
return field;
- }
+ }
}
return null;
}
private Method findSetterForResource(Resource res) {
- assert target != null;
+ assert target != null;
String setterName = resourceNameToSetter(res.name());
Method setterMethod = null;
@@ -266,78 +266,78 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
break;
}
}
-
+
if (setterMethod != null && setterMethod.getParameterTypes().length != 1) {
LOG.log(Level.WARNING, "SETTER_INJECTION_WITH_INCORRECT_TYPE", setterMethod);
}
return setterMethod;
}
-
+
private String resourceNameToSetter(String resName) {
return "set" + Character.toUpperCase(resName.charAt(0)) + resName.substring(1);
}
-
- private void invokeSetter(Method method, Object resource) {
+
+ private void invokeSetter(Method method, Object resource) {
try {
ReflectionUtil.setAccessible(method);
if (method.getDeclaringClass().isAssignableFrom(getTarget().getClass())) {
method.invoke(getTarget(), resource);
} else { // deal with the proxy setter method
Method targetMethod = getTarget().getClass().getMethod(method.getName(),
- method.getParameterTypes());
+ method.getParameterTypes());
targetMethod.invoke(getTarget(), resource);
}
- } catch (IllegalAccessException e) {
+ } catch (IllegalAccessException e) {
LOG.log(Level.SEVERE, "INJECTION_SETTER_NOT_VISIBLE", method);
- } catch (InvocationTargetException e) {
+ } catch (InvocationTargetException e) {
LogUtils.log(LOG, Level.SEVERE, "INJECTION_SETTER_RAISED_EXCEPTION", e, method);
} catch (SecurityException e) {
LogUtils.log(LOG, Level.SEVERE, "INJECTION_SETTER_RAISED_EXCEPTION", e, method);
} catch (NoSuchMethodException e) {
LOG.log(Level.SEVERE, "INJECTION_SETTER_METHOD_NOT_FOUND", new Object[] {method.getName()});
- }
- }
+ }
+ }
- private String getResourceName(Resource res, Method method) {
- assert method != null;
- assert res != null;
+ private String getResourceName(Resource res, Method method) {
+ assert method != null;
+ assert res != null;
assert method.getName().startsWith("set") : method;
if (res.name() == null || "".equals(res.name())) {
- String name = method.getName().substring(3);
- name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
+ String name = method.getName().substring(3);
+ name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
return method.getDeclaringClass().getCanonicalName() + "/" + name;
}
return res.name();
- }
+ }
- private void injectField(Field field, Object resource) {
- assert field != null;
- assert resource != null;
+ private void injectField(Field field, Object resource) {
+ assert field != null;
+ assert resource != null;
- boolean accessible = field.isAccessible();
+ boolean accessible = field.isAccessible();
try {
if (field.getType().isAssignableFrom(resource.getClass())) {
ReflectionUtil.setAccessible(field);
field.set(ClassHelper.getRealObject(getTarget()), resource);
}
- } catch (IllegalAccessException e) {
+ } catch (IllegalAccessException e) {
e.printStackTrace();
- LOG.severe("FAILED_TO_INJECT_FIELD");
+ LOG.severe("FAILED_TO_INJECT_FIELD");
} finally {
ReflectionUtil.setAccessible(field, accessible);
}
- }
+ }
public void invokePostConstruct() {
-
- boolean accessible = false;
+
+ boolean accessible = false;
for (Method method : getPostConstructMethods()) {
PostConstruct pc = method.getAnnotation(PostConstruct.class);
if (pc != null) {
@@ -356,8 +356,8 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
}
public void invokePreDestroy() {
-
- boolean accessible = false;
+
+ boolean accessible = false;
for (Method method : getPreDestroyMethods()) {
PreDestroy pd = method.getAnnotation(PreDestroy.class);
if (pd != null) {
@@ -376,37 +376,37 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
}
- private Collection<Method> getPostConstructMethods() {
+ private Collection<Method> getPostConstructMethods() {
return getAnnotatedMethods(PostConstruct.class);
}
- private Collection<Method> getPreDestroyMethods() {
+ private Collection<Method> getPreDestroyMethods() {
return getAnnotatedMethods(PreDestroy.class);
}
- private Collection<Method> getAnnotatedMethods(Class<? extends Annotation> acls) {
+ private Collection<Method> getAnnotatedMethods(Class<? extends Annotation> acls) {
- Collection<Method> methods = new LinkedList<Method>();
- addAnnotatedMethods(acls, getTarget().getClass().getMethods(), methods);
+ Collection<Method> methods = new LinkedList<Method>();
+ addAnnotatedMethods(acls, getTarget().getClass().getMethods(), methods);
addAnnotatedMethods(acls, ReflectionUtil.getDeclaredMethods(getTarget().getClass()), methods);
if (getTargetClass() != getTarget().getClass()) {
- addAnnotatedMethods(acls, getTargetClass().getMethods(), methods);
- addAnnotatedMethods(acls, ReflectionUtil.getDeclaredMethods(getTargetClass()), methods);
+ addAnnotatedMethods(acls, getTargetClass().getMethods(), methods);
+ addAnnotatedMethods(acls, ReflectionUtil.getDeclaredMethods(getTargetClass()), methods);
}
return methods;
}
-
+
private void addAnnotatedMethods(Class<? extends Annotation> acls, Method[] methods,
Collection<Method> annotatedMethods) {
- for (Method method : methods) {
- if (method.getAnnotation(acls) != null
+ for (Method method : methods) {
+ if (method.getAnnotation(acls) != null
&& !annotatedMethods.contains(method)) {
- annotatedMethods.add(method);
+ annotatedMethods.add(method);
}
}
- }
-
-
+ }
+
+
/**
* making this protected to keep pmd happy
*/
@@ -420,11 +420,11 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
}
- private Class<?> getResourceType(Resource res, Method method) {
- return res.type() != null && !Object.class.equals(res.type())
- ? res.type()
+ private Class<?> getResourceType(Resource res, Method method) {
+ return res.type() != null && !Object.class.equals(res.type())
+ ? res.type()
: method.getParameterTypes()[0];
- }
+ }
private String getFieldNameForResource(Resource res, Field field) {
@@ -441,5 +441,5 @@ public class ResourceInjector extends AbstractAnnotationVisitor {
}
return resourceManager.resolveResource(resourceName, type, resourceResolvers);
}
-
+
}
[10/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisWriter.java
index 566cd37..0f70029 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisWriter.java
@@ -34,15 +34,15 @@ public interface AegisWriter<SinkT> extends AegisIo {
* @param optional true to omit for null. (minOccurs=0)
* @param output The output sink.
* @param aegisType The aegis type to use. Null is allowed, but only if
- * obj is not null.
+ * obj is not null.
* @throws Exception
*/
- void write(Object obj,
+ void write(Object obj,
QName elementName,
boolean optional,
- SinkT output,
+ SinkT output,
AegisType aegisType) throws Exception;
-
+
/**
* Write an object to the sink, providing a {@link java.lang.reflect.Type} to specify
* its type.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
index 624428e..440e6f2 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataReader.java
@@ -37,7 +37,7 @@ public class AegisXMLStreamDataReader extends AbstractAegisIoImpl implements Aeg
public AegisXMLStreamDataReader(AegisContext globalContext) {
super(globalContext);
}
-
+
/**
* This constructor is used by the Element data reader to borrow this class.
* @param globalContext
@@ -63,7 +63,7 @@ public class AegisXMLStreamDataReader extends AbstractAegisIoImpl implements Aeg
public Object read(XMLStreamReader reader) throws Exception {
return read(reader, null);
}
-
+
/** {@inheritDoc}*/
public Object read(XMLStreamReader reader, AegisType desiredType) throws Exception {
setupReaderPosition(reader);
@@ -73,9 +73,9 @@ public class AegisXMLStreamDataReader extends AbstractAegisIoImpl implements Aeg
elReader.readToEnd();
return null;
}
-
+
AegisType type = TypeUtil.getReadTypeStandalone(reader, aegisContext, desiredType);
-
+
if (type == null) {
throw new DatabindingException(new Message("NO_MAPPING", LOG));
}
@@ -83,11 +83,11 @@ public class AegisXMLStreamDataReader extends AbstractAegisIoImpl implements Aeg
return type.readObject(elReader, context);
}
- public Object readFlatArray(XMLStreamReader input,
+ public Object readFlatArray(XMLStreamReader input,
ArrayType arrayType, QName concreteName) throws Exception {
setupReaderPosition(input);
ElementReader elReader = new ElementReader(input);
return arrayType.readObject(elReader, concreteName, context, true);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java
index 408b38b..b9306d2 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisXMLStreamDataWriter.java
@@ -34,11 +34,11 @@ import org.apache.cxf.common.logging.LogUtils;
public class AegisXMLStreamDataWriter extends AbstractAegisIoImpl implements AegisWriter<XMLStreamWriter> {
private static final Logger LOG = LogUtils.getL7dLogger(AegisXMLStreamDataWriter.class);
-
+
AegisXMLStreamDataWriter(AegisContext globalContext) {
super(globalContext);
}
-
+
/**
* Write an object to the output. This method always writes xsi:type attributes.
* @param obj The object to write.
@@ -47,16 +47,16 @@ public class AegisXMLStreamDataWriter extends AbstractAegisIoImpl implements Aeg
* @param output the output stream
* @param aegisType the aegis type. This may be null if the object is non-null
* and the type of the object is covered in the mapping. Warning, for collections
- * this will not do what you want, you must call the alternative version of
- * write that takes a {@link java.lang.reflect.Type}.
+ * this will not do what you want, you must call the alternative version of
+ * write that takes a {@link java.lang.reflect.Type}.
* @throws Exception
*/
- public void write(Object obj,
+ public void write(Object obj,
QName elementName,
boolean optional,
- XMLStreamWriter output,
+ XMLStreamWriter output,
AegisType aegisType) throws Exception {
-
+
if (obj == null && aegisType == null && !optional) {
Message message = new Message("WRITE_NULL_NEEDS_TYPE", LOG);
throw new DatabindingException(message);
@@ -69,17 +69,17 @@ public class AegisXMLStreamDataWriter extends AbstractAegisIoImpl implements Aeg
aegisType = creator.createType(obj.getClass());
}
}
-
+
if (obj != null) {
// look for overrides declared in the context.
- aegisType = TypeUtil.getWriteType(aegisContext, obj, aegisType);
+ aegisType = TypeUtil.getWriteType(aegisContext, obj, aegisType);
}
-
+
if (aegisType == null) {
Message message = new Message("WRITE_NEEDS_TYPE", LOG, obj);
throw new DatabindingException(message);
}
-
+
if (obj == null) {
if (optional) { // minOccurs = 0
return;
@@ -92,7 +92,7 @@ public class AegisXMLStreamDataWriter extends AbstractAegisIoImpl implements Aeg
return;
}
}
-
+
ElementWriter writer = new ElementWriter(output);
MessageWriter w2 = writer.getElementWriter(elementName);
if (getContext().isWriteXsiTypes()
@@ -117,12 +117,12 @@ public class AegisXMLStreamDataWriter extends AbstractAegisIoImpl implements Aeg
TypeCreator creator = getContext().getTypeMapping().getTypeCreator();
aegisType = creator.createType(objectType);
}
-
+
if (aegisType == null) {
Message message = new Message("NO_MAPPING_FOR_TYPE", LOG, objectType);
throw new DatabindingException(message);
}
write(obj, elementName, optional, output, aegisType);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
index ad9c16be..dcd37c2 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/Context.java
@@ -27,7 +27,7 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.message.Attachment;
/**
- * Holds information about the message request and response. Applications should not need to
+ * Holds information about the message request and response. Applications should not need to
* work with this class.
*/
public class Context {
@@ -36,7 +36,7 @@ public class Context {
private Fault fault;
private Map<Class<?>, Object> properties;
private Map<String, Object> namedProperties;
-
+
public Context(AegisContext aegisContext) {
this.globalContext = aegisContext;
this.properties = new HashMap<Class<?>, Object>();
@@ -83,16 +83,16 @@ public class Context {
public <T> T getProperty(Class<T> key) {
return key.cast(properties.get(key));
}
-
+
public void setProperty(Object value) {
properties.put(value.getClass(), value);
}
-
+
//named properties to solve other problems
public void setProperty(String name, Object value) {
namedProperties.put(name, value);
}
-
+
public <T> T getProperty(String name, Class<T> type) {
return type.cast(namedProperties.get(name));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
index 0aa5b3b..0ec0a2b 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/DatabindingException.java
@@ -26,15 +26,15 @@ import java.util.List;
import org.apache.cxf.common.i18n.Message;
public class DatabindingException extends RuntimeException {
-
+
private static final long serialVersionUID = -2595633596348811788L;
private final List<String> extraMessages = new LinkedList<String>();
-
+
/**
* Constructs a new exception with the specified detail
* message.
- *
+ *
* @param message the detail message.
*/
public DatabindingException(String message) {
@@ -44,14 +44,14 @@ public class DatabindingException extends RuntimeException {
/**
* Constructs a new exception with the specified detail
* message and cause.
- *
+ *
* @param message the detail message.
* @param cause the cause.
*/
public DatabindingException(String message, Throwable cause) {
super(message, cause);
}
-
+
public DatabindingException(Message message) {
super(message.toString());
}
@@ -64,7 +64,7 @@ public class DatabindingException extends RuntimeException {
/**
* Return the detail message, including the message from the
* {@link #getCause() nested exception} if there is one.
- *
+ *
* @return the detail message.
*/
public String getMessage() {
@@ -92,7 +92,7 @@ public class DatabindingException extends RuntimeException {
/**
* Prints this throwable and its backtrace to the specified print stream.
- *
+ *
* @param s <code>PrintStream</code> to use for output
*/
@Override
@@ -107,7 +107,7 @@ public class DatabindingException extends RuntimeException {
/**
* Prints this throwable and its backtrace to the specified print writer.
- *
+ *
* @param w <code>PrintWriter</code> to use for output
*/
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java
index c2a387e..ccdbf79 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ElementDataReader.java
@@ -34,16 +34,16 @@ import org.apache.cxf.message.Attachment;
import org.apache.cxf.service.model.MessagePartInfo;
/**
- *
+ *
*/
public class ElementDataReader implements DataReader<Element> {
-
+
private AegisElementDataReader reader;
private AegisDatabinding databinding;
-
+
ElementDataReader(AegisDatabinding binding) {
databinding = binding;
- reader = new AegisElementDataReader(binding.getAegisContext());
+ reader = new AegisElementDataReader(binding.getAegisContext());
}
/**
@@ -77,7 +77,7 @@ public class ElementDataReader implements DataReader<Element> {
}
}
- /**
+ /**
* {@inheritDoc}
* */
public void setAttachments(Collection<Attachment> attachments) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/InconsistentInitializationException.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/InconsistentInitializationException.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/InconsistentInitializationException.java
index 68a8e60..e01c2dd 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/InconsistentInitializationException.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/InconsistentInitializationException.java
@@ -20,7 +20,7 @@
package org.apache.cxf.aegis.databinding;
/**
- *
+ *
*/
public class InconsistentInitializationException extends RuntimeException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java
index 1528f96..e75136a 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataReader.java
@@ -37,23 +37,23 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
private AegisDatabinding databinding;
private AegisXMLStreamDataReader reader;
-
+
public XMLStreamDataReader(AegisDatabinding databinding, Bus bus) {
this.databinding = databinding;
reader = new AegisXMLStreamDataReader(databinding.getAegisContext());
}
-
+
public Object read(MessagePartInfo part, XMLStreamReader input) {
try {
AegisType type = part.getProperty("org.apache.cxf.aegis.outerType", AegisType.class);
if (type == null) {
type = databinding.getType(part);
- return reader.read(input, type);
+ return reader.read(input, type);
} else {
ArrayType arrayType = (ArrayType) type;
return reader.readFlatArray(input, arrayType, part.getConcreteName());
}
-
+
} catch (Exception e) {
throw new Fault(e);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java
index 935d88b..ce193ed 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/XMLStreamDataWriter.java
@@ -49,7 +49,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
private AegisDatabinding databinding;
private Collection<Attachment> attachments;
private Map<String, Object> properties;
-
+
public XMLStreamDataWriter(AegisDatabinding databinding, Bus bus) {
this.databinding = databinding;
}
@@ -69,15 +69,15 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
if (type == null) {
throw new Fault(new Message("NO_MESSAGE_FOR_PART", LOG, part));
}
-
+
Context context = new Context(databinding.getAegisContext());
-
+
context.setAttachments(attachments);
type = TypeUtil.getWriteType(databinding.getAegisContext(), obj, type);
-
- /*
+
+ /*
* We arrive here with a 'type' of the inner type if isWriteOuter is null.
- * However, in that case, the original type is available.
+ * However, in that case, the original type is available.
*/
AegisType outerType = null;
if (part != null) {
@@ -100,7 +100,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
ElementWriter writer = new ElementWriter(output);
// outerType is only != null for a flat array.
if (outerType == null) {
- MessageWriter w2 = writer.getElementWriter(part != null ? part.getConcreteName()
+ MessageWriter w2 = writer.getElementWriter(part != null ? part.getConcreteName()
: type.getSchemaType());
type.writeObject(obj, w2, context);
w2.close();
@@ -124,7 +124,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
if (properties == null) {
properties = new HashMap<String, Object>();
}
-
+
properties.put(prop, value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
index 6d6168a..564cb0e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AbstractTypeCreator.java
@@ -89,7 +89,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
info.setDescription("field " + f.getName() + " in " + f.getDeclaringClass());
return info;
}
-
+
public TypeClassInfo createBasicClassInfo(Type type) {
TypeClassInfo info = new TypeClassInfo();
Class<?> typeClass = TypeUtil.getTypeClass(type, false);
@@ -104,7 +104,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
}
public AegisType createTypeForClass(TypeClassInfo info) {
-
+
Class<?> javaClass = TypeUtil.getTypeRelatedClass(info.getType());
AegisType result = null;
boolean newType = true;
@@ -127,7 +127,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
result = getTypeMapping().getType(javaClass);
} else {
AegisType type = getTypeMapping().getType(info.getType());
- if (type == null
+ if (type == null
|| (info.getTypeName() != null && !type.getSchemaType().equals(info.getTypeName()))) {
if (info.getTypeName() != null) {
type = getTypeMapping().getType(info.getTypeName());
@@ -203,10 +203,10 @@ public abstract class AbstractTypeCreator implements TypeCreator {
return type;
} catch (InstantiationException e) {
- throw new DatabindingException("Couldn't instantiate type classs "
+ throw new DatabindingException("Couldn't instantiate type classs "
+ info.getAegisTypeClass().getName(), e);
} catch (IllegalAccessException e) {
- throw new DatabindingException("Couldn't access type classs "
+ throw new DatabindingException("Couldn't access type classs "
+ info.getAegisTypeClass().getName(), e);
}
}
@@ -222,11 +222,11 @@ public abstract class AbstractTypeCreator implements TypeCreator {
} else {
type.setMinOccurs(typeConfiguration.getDefaultMinOccurs());
}
-
+
if (info.getMaxOccurs() != -1) {
type.setMaxOccurs(info.getMaxOccurs());
}
-
+
type.setFlat(info.isFlat());
return type;
@@ -266,7 +266,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
if (info.getMaxOccurs() != -1) {
type.setMaxOccurs(info.getMaxOccurs());
}
-
+
type.setFlat(info.isFlat());
return type;
@@ -310,8 +310,8 @@ public abstract class AbstractTypeCreator implements TypeCreator {
protected QName createMapQName(TypeClassInfo info, AegisType keyType, AegisType valueType) {
String name = keyType.getSchemaType().getLocalPart() + '2' + valueType.getSchemaType().getLocalPart();
-
-
+
+
Class<?> cls = TypeUtil.getTypeRelatedClass(info.getType());
name += cls.getSimpleName();
@@ -373,7 +373,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
/**
* Create a AegisType for a Method parameter.
- *
+ *
* @param m the method to create a type for
* @param index The parameter index. If the index is less than zero, the
* return type is used.
@@ -393,7 +393,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
/**
* Create type information for a PropertyDescriptor.
- *
+ *
* @param pd the propertydescriptor
*/
public AegisType createType(PropertyDescriptor pd) {
@@ -404,7 +404,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
/**
* Create type information for a <code>Field</code>.
- *
+ *
* @param f the field to create a type from
*/
public AegisType createType(Field f) {
@@ -412,11 +412,11 @@ public abstract class AbstractTypeCreator implements TypeCreator {
info.setDescription("field " + f.getName() + " in " + f.getDeclaringClass());
return createTypeForClass(info);
}
-
+
/**
* Create an Aegis type from a reflected type description.
* This will only work for the restricted set of collection
- * types supported by Aegis.
+ * types supported by Aegis.
* @param t the reflected type.
* @return the type
*/
@@ -425,7 +425,7 @@ public abstract class AbstractTypeCreator implements TypeCreator {
info.setType(t);
info.setDescription("reflected type " + t.toString());
return createTypeForClass(info);
-
+
}
public AegisType createType(Class<?> clazz) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java
index 4c48c07..cf22987 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/AegisType.java
@@ -31,9 +31,9 @@ import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaElement;
/**
- * Aegis abstraction for a object. Types are responsible for reading and writing the contents
+ * Aegis abstraction for a object. Types are responsible for reading and writing the contents
* of objects, but not, almost always, their own outermost XML element.
- *
+ *
*/
public abstract class AegisType {
@@ -50,7 +50,7 @@ public abstract class AegisType {
/**
* Read in the XML fragment and create an object.
- *
+ *
* @param reader
* @param context
* @return
@@ -60,7 +60,7 @@ public abstract class AegisType {
/**
* Writes the object to the MessageWriter.
- *
+ *
* @param object
* @param writer
* @param context
@@ -76,10 +76,10 @@ public abstract class AegisType {
*/
public void writeSchema(XmlSchema root) {
}
-
+
/**
- * If the type object merely wants to contribute attributes to the
- * xsd:element element, it can implement this.
+ * If the type object merely wants to contribute attributes to the
+ * xsd:element element, it can implement this.
* @param schemaElement
*/
public void addToSchemaElement(XmlSchemaElement schemaElement) {
@@ -100,14 +100,14 @@ public abstract class AegisType {
}
/**
- * @return Returns the java type as a Class.
+ * @return Returns the java type as a Class.
* For a generic, return the raw type. For something
* truly exotic, return null.
*/
public Class<?> getTypeClass() {
return TypeUtil.getTypeRelatedClass(typeClass);
}
-
+
/**
* @return Return the Java type.
*/
@@ -155,7 +155,7 @@ public abstract class AegisType {
/**
* Return a set of AegisType dependencies. Returns null if this type has no
* dependencies.
- *
+ *
* @return Set of <code>AegisType</code> dependencies
*/
public Set<AegisType> getDependencies() {
@@ -223,11 +223,11 @@ public abstract class AegisType {
public void setWriteOuter(boolean writeOuter) {
this.writeOuter = writeOuter;
}
-
+
public boolean usesXmime() {
return false;
}
-
+
/**
* True if this type requires the import of the aegisTypes schema.
* @return
@@ -235,19 +235,19 @@ public abstract class AegisType {
public boolean usesUtilityTypes() {
return false;
}
-
+
public boolean hasMinOccurs() {
return false;
}
-
+
public boolean hasMaxOccurs() {
return false;
}
-
+
public long getMinOccurs() {
return 0; // not valid in general
}
-
+
public long getMaxOccurs() {
return 0;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeCreator.java
index af6c820..c3d6e4e 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeCreator.java
@@ -56,7 +56,7 @@ public class DefaultTypeCreator extends AbstractTypeCreator {
@Override
public AegisType createCollectionType(TypeClassInfo info) {
if (!(info.getType() instanceof ParameterizedType)) {
- throw new DatabindingException("Cannot create mapping for " + info.getType()
+ throw new DatabindingException("Cannot create mapping for " + info.getType()
+ ", unspecified component type for " + info.getDescription());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
index 7bc803e..652c7a0 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/DefaultTypeMapping.java
@@ -92,7 +92,7 @@ public class DefaultTypeMapping implements TypeMapping {
this.nextTM = defaultTM;
}
-
+
public DefaultTypeMapping() {
this(DEFAULT_MAPPING_URI);
}
@@ -204,7 +204,7 @@ public class DefaultTypeMapping implements TypeMapping {
return nextTM;
}
- private static void defaultRegister(TypeMapping tm, boolean defaultNillable, Class<?> class1,
+ private static void defaultRegister(TypeMapping tm, boolean defaultNillable, Class<?> class1,
QName name,
AegisType type) {
if (!defaultNillable) {
@@ -214,7 +214,7 @@ public class DefaultTypeMapping implements TypeMapping {
tm.register(class1, name, type);
}
- private static void fillStandardMappings(TypeMapping tm, boolean defaultNillable,
+ private static void fillStandardMappings(TypeMapping tm, boolean defaultNillable,
boolean enableMtomXmime, boolean enableJDOM) {
defaultRegister(tm, defaultNillable, BigDecimal.class, Constants.XSD_DECIMAL,
new BigDecimalType());
@@ -240,7 +240,7 @@ public class DefaultTypeMapping implements TypeMapping {
defaultRegister(tm, defaultNillable, URI.class, Constants.XSD_ANYURI, new URIType());
defaultRegister(tm, defaultNillable, XMLStreamReader.class, Constants.XSD_ANYTYPE,
new XMLStreamReaderType());
-
+
defaultRegister(tm, defaultNillable, boolean.class, Constants.XSD_BOOLEAN,
new BooleanType());
defaultRegister(tm, defaultNillable, byte[].class, Constants.XSD_BASE64, new Base64Type());
@@ -257,7 +257,7 @@ public class DefaultTypeMapping implements TypeMapping {
new SqlDateType());
defaultRegister(tm, defaultNillable, Number.class, Constants.XSD_DECIMAL,
new BigDecimalType());
-
+
QName mtomBase64 = Constants.XSD_BASE64;
if (enableMtomXmime) {
mtomBase64 = AbstractXOPType.XML_MIME_BASE64;
@@ -267,7 +267,7 @@ public class DefaultTypeMapping implements TypeMapping {
new DataSourceType(enableMtomXmime, null));
defaultRegister(tm, defaultNillable, DataHandler.class, mtomBase64,
new DataHandlerType(enableMtomXmime, null));
-
+
defaultRegister(tm, defaultNillable, Document.class, Constants.XSD_ANYTYPE, new DocumentType());
if (enableJDOM) {
@@ -285,9 +285,9 @@ public class DefaultTypeMapping implements TypeMapping {
} catch (ClassNotFoundException e) {
// not available.
}
-
+
try {
- Class<?> jdomElementClass =
+ Class<?> jdomElementClass =
ClassLoaderUtils.loadClass("org.jdom.Element", DefaultTypeMapping.class);
defaultRegister(tm, defaultNillable, jdomElementClass, Constants.XSD_ANYTYPE,
new JDOMElementType());
@@ -304,7 +304,7 @@ public class DefaultTypeMapping implements TypeMapping {
* @param enableJDOM whether to add mappings for JDOM.
* @return
*/
- public static DefaultTypeMapping createSoap11TypeMapping(boolean defaultNillable,
+ public static DefaultTypeMapping createSoap11TypeMapping(boolean defaultNillable,
boolean enableMtomXmime, boolean enableJDOM) {
// Create a AegisType Mapping for SOAP 1.1 Encoding
DefaultTypeMapping soapTM = new DefaultTypeMapping(Soap11.SOAP_ENCODING_URI);
@@ -339,7 +339,7 @@ public class DefaultTypeMapping implements TypeMapping {
return soapTM;
}
- public static DefaultTypeMapping createDefaultTypeMapping(boolean defaultNillable,
+ public static DefaultTypeMapping createDefaultTypeMapping(boolean defaultNillable,
boolean enableMtomXmime) {
return createDefaultTypeMapping(
defaultNillable,
@@ -354,16 +354,16 @@ public class DefaultTypeMapping implements TypeMapping {
* @param enableJDOM whether to map JDOM types.
* @return
*/
- public static DefaultTypeMapping createDefaultTypeMapping(boolean defaultNillable,
- boolean enableMtomXmime,
+ public static DefaultTypeMapping createDefaultTypeMapping(boolean defaultNillable,
+ boolean enableMtomXmime,
boolean enableJDOM) {
// by convention, the default mapping is against the XML schema URI.
DefaultTypeMapping tm = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD);
fillStandardMappings(tm, defaultNillable, enableMtomXmime, enableJDOM);
- defaultRegister(tm, defaultNillable, Character.class,
+ defaultRegister(tm, defaultNillable, Character.class,
CharacterAsStringType.CHARACTER_AS_STRING_TYPE_QNAME,
new CharacterAsStringType());
- defaultRegister(tm, defaultNillable, char.class,
+ defaultRegister(tm, defaultNillable, char.class,
CharacterAsStringType.CHARACTER_AS_STRING_TYPE_QNAME,
new CharacterAsStringType());
@@ -402,6 +402,6 @@ public class DefaultTypeMapping implements TypeMapping {
public void setMappingIdentifierURI(String uri) {
identifierURI = uri;
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/ParameterizedTypeFactory.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/ParameterizedTypeFactory.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/ParameterizedTypeFactory.java
index 11d77df..dc09b81 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/ParameterizedTypeFactory.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/ParameterizedTypeFactory.java
@@ -28,7 +28,7 @@ import java.lang.reflect.Type;
public final class ParameterizedTypeFactory {
private ParameterizedTypeFactory() {
}
-
+
public static ParameterizedType createParameterizedType(Class<?> rawType, Type[] parameters) {
return new SimpleParameterizedType(rawType, parameters);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java
index c3f61d9..5ff5261 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/SimpleParameterizedType.java
@@ -33,7 +33,7 @@ import java.util.Arrays;
class SimpleParameterizedType implements ParameterizedType {
private Class<?> rawType;
private Type[] parameters;
-
+
SimpleParameterizedType(Class<?> rawType, Type[] parameters) {
this.rawType = rawType;
this.parameters = parameters;
@@ -69,22 +69,22 @@ class SimpleParameterizedType implements ParameterizedType {
if (obj == null) {
return false;
}
-
+
ParameterizedType opt = null;
try {
opt = (ParameterizedType) obj;
} catch (ClassCastException cce) {
return false;
}
-
+
if (opt.getOwnerType() != null) {
return false;
}
-
+
if (rawType != opt.getRawType()) {
return false;
}
-
+
return Arrays.equals(parameters, opt.getActualTypeArguments());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeClassInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeClassInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeClassInfo.java
index ebe8bc1..7f3923d 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeClassInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeClassInfo.java
@@ -25,27 +25,27 @@ import java.util.Map;
import javax.xml.namespace.QName;
/**
- * Object to carry information for an Aegis type,
+ * Object to carry information for an Aegis type,
* such as that from an XML mapping file.
- *
- * Note that this class has a misleading name. It is used both for
- * type information that corresponds to a type, and also for parameters
+ *
+ * Note that this class has a misleading name. It is used both for
+ * type information that corresponds to a type, and also for parameters
* of methods and elements of beans. When describing a top-level type,
* minOccurs and maxOccurs are not meaningful. Aegis does not have a
* very clear model of a 'type', in the sense of an AegisType object
* corresponding to some particular XML Schema type, in isolation
- * from the mapping system.
- *
- * Historically, Aegis talked about Java types as Class. However,
+ * from the mapping system.
+ *
+ * Historically, Aegis talked about Java types as Class. However,
* we want to be able to keep track, distinctly, of un-erased
* generics. That requires java.lang.reflect.Type.
- *
+ *
* Nillable is only used for parameters.
- *
+ *
* It might be that the code could be deconfused by
* using the nillable property in here for the non-parameters cases
* that look at minOccurs and maxOccurs.
- *
+ *
* Historically, the code for dealing with nillable was very confused,
* and so the support here is a bit ginger, until someone figures out how
* to sort things out. Thus the three-valued support instead
@@ -65,7 +65,7 @@ public class TypeClassInfo {
private QName mappedName;
// XML schema name for the type.
private QName typeName;
-
+
// a Class reference to the aegis aegisTypeClass, if the app has specified it
// via XML or via an annotation.
private Class<? extends AegisType> aegisTypeClass;
@@ -76,7 +76,7 @@ public class TypeClassInfo {
// Flat array.
private boolean flat;
private Boolean nillable;
-
+
public boolean nonDefaultAttributes() {
return minOccurs != -1 || maxOccurs != -1 || flat;
}
@@ -112,7 +112,7 @@ public class TypeClassInfo {
public void setType(Type type) {
this.type = type;
}
-
+
public void setType(Type tp, Map<String, Type> vars) {
this.type = tp;
this.typeVars = vars;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreationOptions.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreationOptions.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreationOptions.java
index 8e5251f..490e7e7 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreationOptions.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreationOptions.java
@@ -21,12 +21,12 @@
* This class contains a set of flags that control Aegis' process of mapping from Java types to XML Schema.
* These options are respected by the standard Aegis type creation classes. An application that replaces
* these with custom creators will make its own arrangements.
- *
+ *
* @see AbstractTypeCreator
* @see DefaultTypeCreator
* @see XMLTypeCreator
* @see Java5TypeCreator
- *
+ *
* @since 2.1
*/
package org.apache.cxf.aegis.type;
@@ -92,11 +92,11 @@ public class TypeCreationOptions {
this.defaultNillable = defaultNillable;
}
- /**
+ /**
* Whether or not elements are qualified absent any annotations
- * or mapping files.
+ * or mapping files.
* True by default.
- * @return
+ * @return
*/
public boolean isQualifyElements() {
return qualifyElements;
@@ -104,7 +104,7 @@ public class TypeCreationOptions {
/**
* Turn on of off element qualification.
- * @param qualifyElements
+ * @param qualifyElements
*/
public void setQualifyElements(boolean qualifyElements) {
this.qualifyElements = qualifyElements;
@@ -113,16 +113,16 @@ public class TypeCreationOptions {
/**
* Whether or not attributes are qualified absent any annotations
* or mapping files.
- * False by default.
- * @return
+ * False by default.
+ * @return
*/
public boolean isQualifyAttributes() {
return qualifyAttributes;
}
/**
- * Turn on or off attribute qualification.
- * @param qualifyAttributes
+ * Turn on or off attribute qualification.
+ * @param qualifyAttributes
*/
public void setQualifyAttributes(boolean qualifyAttributes) {
this.qualifyAttributes = qualifyAttributes;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreator.java
index 52f45b4..f1c93a1 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeCreator.java
@@ -28,7 +28,7 @@ import javax.xml.namespace.QName;
public interface TypeCreator {
/**
* Get the mapped name of a method parameter.
- *
+ *
* @param m
* @param index
* @return
@@ -38,24 +38,24 @@ public interface TypeCreator {
AegisType createType(Method m, int index);
AegisType createType(PropertyDescriptor pd);
-
+
AegisType createType(Type type);
AegisType createType(Field f);
TypeCreator getParent();
-
+
void setParent(TypeCreator creator);
-
+
void setTypeMapping(TypeMapping typeMapping);
- /** Retrieve the classInfo for a method. Needed to get parameters right.
- *
+ /** Retrieve the classInfo for a method. Needed to get parameters right.
+ *
* @param m Method object
* @param index index in the parameter list
* @return info
*/
- TypeClassInfo createClassInfo(Method m, int index);
+ TypeClassInfo createClassInfo(Method m, int index);
/**
* Create class info for a Type.
@@ -63,7 +63,7 @@ public interface TypeCreator {
* @return info
*/
TypeClassInfo createBasicClassInfo(Type itemType);
-
+
/**
* Turn a TypeClassInfo into a type.
* @param info
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java
index 4c9ea05..14fc8b1 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeMapping.java
@@ -23,7 +23,7 @@ import java.lang.reflect.Type;
import javax.xml.namespace.QName;
/**
- * Abstraction for the map between Java types (represented as
+ * Abstraction for the map between Java types (represented as
* {@link java.lang.reflect.Type} and Aegis types.
*/
public interface TypeMapping {
@@ -54,7 +54,7 @@ public interface TypeMapping {
/**
* Register a type that self-describes the schema type and the Java class.
- * @param type Aegis type object that
+ * @param type Aegis type object that
*/
void register(AegisType type);
@@ -67,7 +67,7 @@ public interface TypeMapping {
QName getTypeQName(Type clazz);
TypeCreator getTypeCreator();
-
+
/**
* Each mapping has a URI that identifies it.
* The mapping for a service uses the service URI.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
index ae55ae0..f6935ae 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/TypeUtil.java
@@ -44,17 +44,17 @@ public final class TypeUtil {
private TypeUtil() {
//utility class
}
-
+
public static AegisType getReadType(XMLStreamReader xsr, AegisContext context, AegisType baseType) {
if (!context.isReadXsiTypes()) {
if (baseType == null) {
- LOG.warning("xsi:type reading disabled, and no type available for "
+ LOG.warning("xsi:type reading disabled, and no type available for "
+ xsr.getName());
}
return baseType;
}
-
+
String overrideType = xsr.getAttributeValue(Constants.URI_2001_SCHEMA_XSI, "type");
if (overrideType != null) {
QName overrideName = NamespaceHelper.createQName(xsr.getNamespaceContext(), overrideType);
@@ -73,7 +73,7 @@ public final class TypeUtil {
return improvedType;
}
}
-
+
if (baseType != null) {
LOG.finest("xsi:type=\"" + overrideName
+ "\" was specified, but no corresponding AegisType was registered; defaulting to "
@@ -86,7 +86,7 @@ public final class TypeUtil {
}
} else {
if (baseType == null) {
- LOG.warning("xsi:type absent, and no type available for "
+ LOG.warning("xsi:type absent, and no type available for "
+ xsr.getName());
}
return baseType;
@@ -101,35 +101,35 @@ public final class TypeUtil {
* @param context
* @return
*/
- public static AegisType getReadTypeStandalone(XMLStreamReader xsr,
+ public static AegisType getReadTypeStandalone(XMLStreamReader xsr,
AegisContext context, AegisType baseType) {
-
+
if (baseType != null) {
return getReadType(xsr, context, baseType);
}
if (!context.isReadXsiTypes()) {
- LOG.warning("xsi:type reading disabled, and no type available for "
+ LOG.warning("xsi:type reading disabled, and no type available for "
+ xsr.getName());
return null;
}
-
+
String typeNameString = xsr.getAttributeValue(Constants.URI_2001_SCHEMA_XSI, "type");
if (typeNameString != null) {
- QName schemaTypeName = NamespaceHelper.createQName(xsr.getNamespaceContext(),
+ QName schemaTypeName = NamespaceHelper.createQName(xsr.getNamespaceContext(),
typeNameString);
TypeMapping tm;
tm = context.getTypeMapping();
AegisType type = tm.getType(schemaTypeName);
-
+
if (type == null) {
type = context.getRootType(schemaTypeName);
}
-
+
if (type != null) {
return type;
}
-
+
LOG.warning("xsi:type=\"" + schemaTypeName
+ "\" was specified, but no corresponding AegisType was registered; no default.");
return null;
@@ -137,7 +137,7 @@ public final class TypeUtil {
LOG.warning("xsi:type was not specified for top-level element " + xsr.getName());
return null;
}
-
+
public static AegisType getWriteType(AegisContext globalContext, Object value, AegisType type) {
if (value != null && type != null && type.getTypeClass() != value.getClass()) {
AegisType overrideType = globalContext.getRootType(value.getClass());
@@ -152,7 +152,7 @@ public final class TypeUtil {
if (type != null) {
return getWriteType(globalContext, value, type);
}
-
+
TypeMapping tm;
tm = globalContext.getTypeMapping();
// don't use this for null!
@@ -160,7 +160,7 @@ public final class TypeUtil {
return type;
}
-
+
/**
* Allow writing of collections when the type of the collection object is known via
* an {@link java.lang.reflect.Type} object.
@@ -169,18 +169,18 @@ public final class TypeUtil {
* @param reflectType the type to use in writing the object.
* @return
*/
- public static AegisType getWriteTypeStandalone(AegisContext globalContext,
- Object value,
+ public static AegisType getWriteTypeStandalone(AegisContext globalContext,
+ Object value,
java.lang.reflect.Type reflectType) {
if (reflectType == null) {
return getWriteTypeStandalone(globalContext, value, (AegisType)null);
} else {
return globalContext.getTypeMapping().getTypeCreator().createType(reflectType);
}
-
-
+
+
}
-
+
public static void setAttributeAttributes(QName name, AegisType type, XmlSchema root) {
String ns = type.getSchemaType().getNamespaceURI();
XmlSchemaUtils.addImportIfNeeded(root, ns);
@@ -188,7 +188,7 @@ public final class TypeUtil {
/**
* Utility function to cast a Type to a Class. This throws an unchecked exception if the Type is
- * not a Class. The idea here is that these Type references should have been checked for
+ * not a Class. The idea here is that these Type references should have been checked for
* reasonableness before the point of calls to this function.
* @param type Reflection type.
* @param throwForNonClass whether to throw (true) or return null (false) if the Type
@@ -245,12 +245,12 @@ public final class TypeUtil {
if (directClass != null) {
return directClass;
}
-
+
if (type instanceof ParameterizedType) {
ParameterizedType pType = (ParameterizedType) type;
return getTypeRelatedClass(pType.getRawType());
}
-
+
if (type instanceof GenericArrayType) {
GenericArrayType gat = (GenericArrayType) type;
Type compType = gat.getGenericComponentType();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
index 3f8ff21..f3ded00 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/XMLTypeCreator.java
@@ -67,17 +67,17 @@ import org.apache.cxf.helpers.XPathUtils;
* Deduce mapping information from an xml file. The xml file should be in the
* same packages as the class, with the name <code>className.aegis.xml</code>.
* For example, given the following service interface: <p/>
- *
+ *
* <pre>
* public Collection getResultsForValues(String id, Collection values); //method 1
- *
+ *
* public Collection getResultsForValues(int id, Collection values); //method 2
- *
+ *
* public String getResultForValue(String value); //method 3
* </pre>
- *
+ *
* An example of the type xml is:
- *
+ *
* <pre>
* <mappings>
* <mapping>
@@ -89,7 +89,7 @@ import org.apache.cxf.helpers.XPathUtils;
* </mapping>
* </mappings>
* </pre>
- *
+ *
* <p/> Note that for values which can be easily deduced (such as the String
* parameter, or the second service method) no mapping need be specified in the
* xml descriptor, which is why no mapping is specified for method 3. <p/>
@@ -115,7 +115,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
static {
AEGIS_DOCUMENT_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
AEGIS_DOCUMENT_BUILDER_FACTORY.setNamespaceAware(true);
-
+
String path = "/META-INF/cxf/aegis.xsd";
InputStream is = XMLTypeCreator.class.getResourceAsStream(path);
if (is != null) {
@@ -139,7 +139,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
}
}
}
-
+
private volatile XPathUtils xpathUtils;
private synchronized XPathUtils getXPathUtils() {
if (xpathUtils == null) {
@@ -165,7 +165,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
Integer.valueOf(exception.getLineNumber()),
Integer.valueOf(exception.getColumnNumber())});
}
-
+
private void throwDatabindingException(String message) {
//DatabindingException is quirky. This dance is required to get the full message
//to where it belongs.
@@ -283,9 +283,9 @@ public class XMLTypeCreator extends AbstractTypeCreator {
protected Element findMapping(Type type) {
// We are not prepared to find .aegis.xml files for Parameterized types.
-
+
Class<?> clazz = TypeUtil.getTypeClass(type, false);
-
+
if (clazz == null) {
return null;
}
@@ -294,7 +294,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
return null;
}
- Element mapping = getMatch(doc, "/mappings/mapping[@uri='"
+ Element mapping = getMatch(doc, "/mappings/mapping[@uri='"
+ getTypeMapping().getMappingIdentifierURI()
+ "']");
if (mapping == null) {
@@ -391,7 +391,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
} else {
btinfo.setExtensibleAttributes(getConfiguration().isDefaultExtensibleAttributes());
}
-
+
btinfo.setQualifyAttributes(this.getConfiguration().isQualifyAttributes());
btinfo.setQualifyElements(this.getConfiguration().isQualifyElements());
BeanType type = new BeanType(btinfo);
@@ -431,9 +431,9 @@ public class XMLTypeCreator extends AbstractTypeCreator {
info.setDescription("method " + m.getName() + " parameter " + index);
if (index >= 0) {
if (index >= m.getParameterTypes().length) {
- throw new DatabindingException("Method "
- + m
- + " does not have a parameter at index "
+ throw new DatabindingException("Method "
+ + m
+ + " does not have a parameter at index "
+ index);
}
// we don't want nodes for which the specified index is not
@@ -477,7 +477,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
protected void readMetadata(TypeClassInfo info, Element mapping, Element parameter) {
info.setTypeName(createQName(parameter, DOMUtils.getAttributeValueEmptyNull(parameter, "typeName")));
- info.setMappedName(createQName(parameter,
+ info.setMappedName(createQName(parameter,
DOMUtils.getAttributeValueEmptyNull(parameter, "mappedName")));
Class<?> relatedClass = TypeUtil.getTypeRelatedClass(info.getType());
// we only mess with the generic issues for list and map
@@ -514,13 +514,13 @@ public class XMLTypeCreator extends AbstractTypeCreator {
valueType = Object.class;
}
}
- Type fullType
+ Type fullType
= ParameterizedTypeFactory.createParameterizedType(relatedClass,
new Type[] {keyType, valueType});
info.setType(fullType);
-
+
}
-
+
}
setType(info, parameter);
@@ -539,7 +539,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
if (flat != null) {
info.setFlat(Boolean.valueOf(flat.toLowerCase()).booleanValue());
}
-
+
String nillable = DOMUtils.getAttributeValueEmptyNull(parameter, "nillable");
if (nillable != null) {
info.setNillable(Boolean.valueOf(nillable.toLowerCase()).booleanValue());
@@ -549,7 +549,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
@Override
protected AegisType getOrCreateGenericType(TypeClassInfo info) {
AegisType type = null;
- if (info.getType() instanceof ParameterizedType) {
+ if (info.getType() instanceof ParameterizedType) {
type = createTypeFromGeneric(info.getType());
}
@@ -606,7 +606,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
}
return getGenericParameterFromSpec(mapping, componentSpec);
}
-
+
private Type getKeyType(Element mapping, Element parameter) {
String spec = DOMUtils.getAttributeValueEmptyNull(parameter, "keyType");
if (spec == null) {
@@ -638,7 +638,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
throw new DatabindingException("A 'class' attribute must be specified for <component> "
+ name);
}
-
+
return loadComponentClass(className);
} else {
return loadComponentClass(componentType);
@@ -657,7 +657,7 @@ public class XMLTypeCreator extends AbstractTypeCreator {
String type = DOMUtils.getAttributeValueEmptyNull(parameter, "type");
if (type != null) {
try {
- Class<?> aegisTypeClass = ClassLoaderUtils.loadClass(type, getClass());
+ Class<?> aegisTypeClass = ClassLoaderUtils.loadClass(type, getClass());
info.setAegisTypeClass(Java5TypeCreator.castToAegisTypeClass(aegisTypeClass));
} catch (ClassNotFoundException e) {
throw new DatabindingException("Unable to load type class " + type, e);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
index d086b50..a34b10f 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/Base64Type.java
@@ -37,8 +37,8 @@ import org.apache.cxf.common.util.Base64Utility;
/**
* Converts back and forth to byte[] objects.
- * There is a co-routine between this class and the MTOM ByteArrayType. This class can accept either
- * inline base64 or an MTOM attachment. It passes the problem over the ByteArrayType for the later.
+ * There is a co-routine between this class and the MTOM ByteArrayType. This class can accept either
+ * inline base64 or an MTOM attachment. It passes the problem over the ByteArrayType for the later.
*/
public class Base64Type extends AegisType {
private AbstractXOPType optimizedType;
@@ -48,12 +48,12 @@ public class Base64Type extends AegisType {
// no MTOM for this type.
optimizedType = new ByteArrayType(false, null);
}
-
+
public Base64Type(AbstractXOPType xopType) {
super();
optimizedType = xopType;
}
-
+
@Override
public Object readObject(MessageReader mreader, Context context) throws DatabindingException {
XMLStreamReader reader = mreader.getXMLStreamReader();
@@ -65,7 +65,7 @@ public class Base64Type extends AegisType {
while (!reader.isCharacters() && !reader.isEndElement() && !reader.isStartElement()) {
reader.next();
}
-
+
if (reader.isStartElement() && reader.getName().equals(AbstractXOPType.XOP_INCLUDE)) {
return optimizedType.readMtoM(mreader, context);
}
@@ -108,7 +108,7 @@ public class Base64Type extends AegisType {
optimizedType.writeObject(object, writer, context);
return;
}
-
+
byte[] data = (byte[])object;
if (data != null && data.length > 0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
index 88b16bc..7288c5c 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanType.java
@@ -263,7 +263,7 @@ public class BeanType extends AegisType {
/**
* Write the specified property to a field.
*/
- protected void writeProperty(QName name, Object object, Object property,
+ protected void writeProperty(QName name, Object object, Object property,
Class<?> impl, BeanTypeInfo inf)
throws DatabindingException {
@@ -596,7 +596,7 @@ public class BeanType extends AegisType {
/*
* Don't dig any deeper than Object or Exception
*/
- if (c != null && c != Object.class && c != Exception.class && c != RuntimeException.class
+ if (c != null && c != Object.class && c != Exception.class && c != RuntimeException.class
&& c != Enum.class && c != Serializable.class && c != Cloneable.class) {
TypeMapping tm = inf.getTypeMapping();
AegisType superType = tm.getType(c);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
index d2dccbd..1bad34c 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BeanTypeInfo.java
@@ -77,7 +77,7 @@ public class BeanTypeInfo {
/**
* Create a BeanTypeInfo class.
- *
+ *
* @param typeClass
* @param defaultNamespace
* @param initiallize If true attempt default property/xml mappings.
@@ -230,7 +230,7 @@ public class BeanTypeInfo {
/**
* Specifies the name of the property as it shows up in the xml schema. This
* method just returns <code>propertyDescriptor.getName();</code>
- *
+ *
* @param desc
* @return
*/
@@ -254,7 +254,7 @@ public class BeanTypeInfo {
/**
* Specifies the SchemaType for a particular class.
- *
+ *
* @param mappedName
* @param type
*/
@@ -288,9 +288,9 @@ public class BeanTypeInfo {
PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
if (propertyDescriptors != null) {
// see comments on this function.
- descriptors = ReflectionUtil.getPropertyDescriptorsAvoidSunBug(getClass(),
- beanInfo,
- beanClass,
+ descriptors = ReflectionUtil.getPropertyDescriptorsAvoidSunBug(getClass(),
+ beanInfo,
+ beanClass,
propertyDescriptors);
}
}
@@ -378,7 +378,7 @@ public class BeanTypeInfo {
/**
* Nillable is only allowed if the actual property is Nullable
- *
+ *
* @param name
* @return
*/
@@ -392,7 +392,7 @@ public class BeanTypeInfo {
/**
* Return the minOccurs value. When there is no XML file or annotation (the situation
- * if we are running from the base class here), there is no source for the
+ * if we are running from the base class here), there is no source for the
* minOccurs parameter except the default, which is supplied from the overall Aegis options.
* @param name Element QName
* @return
@@ -400,7 +400,7 @@ public class BeanTypeInfo {
public int getMinOccurs(QName name) {
return minOccurs;
}
-
+
/**
* Return the maxOccurs value. When there is no XML file or annotation (the situation
* if we are in the base class here), there is no per-element source for this item,
@@ -411,7 +411,7 @@ public class BeanTypeInfo {
public int getMaxOccurs(QName name) {
return 1;
}
-
+
public long getMinOccurs() {
return minOccurs;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java
index 76f7ba6..af54ee9 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java
@@ -28,15 +28,15 @@ import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.MessageWriter;
/**
- *
+ *
*/
public class CharacterAsStringType extends AegisType {
-
- public static final QName CHARACTER_AS_STRING_TYPE_QNAME
+
+ public static final QName CHARACTER_AS_STRING_TYPE_QNAME
= new QName("http://cxf.apache.org/aegisTypes", "char");
-
+
private IntType intType;
-
+
public CharacterAsStringType() {
intType = new IntType();
}
@@ -50,7 +50,7 @@ public class CharacterAsStringType extends AegisType {
/** {@inheritDoc}*/
@Override
- public void writeObject(Object object, MessageWriter writer, Context context)
+ public void writeObject(Object object, MessageWriter writer, Context context)
throws DatabindingException {
Character charObject = (Character) object;
intType.writeObject(Integer.valueOf(charObject.charValue()), writer, context);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
index 0b1098e..2c2439d 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/InterfaceInvocationHandler.java
@@ -17,7 +17,7 @@
* under the License.
*/
/**
- *
+ *
*/
package org.apache.cxf.aegis.type.basic;
@@ -68,8 +68,8 @@ class InterfaceInvocationHandler implements InvocationHandler {
if (methodName.startsWith("get") && methodName.length() > 3) {
return true;
- }
-
+ }
+
return methodName.length() > 2 && methodName.startsWith("is");
/*
* // should "hasXXX()" be considered a getter method? else if
@@ -103,7 +103,7 @@ class InterfaceInvocationHandler implements InvocationHandler {
} else {
throw new IllegalAccessError(methodName + " is not a valid getter method.");
}
-
+
Object prop = readProperty(attrName);
if (prop == null && method.getReturnType().isPrimitive()) {
if (method.getReturnType() == int.class) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java
index a25ddfd..07ba378 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java
@@ -34,7 +34,7 @@ import org.apache.cxf.aegis.xml.MessageWriter;
*/
public class TimezoneLessDateType extends DateType {
private static TimezoneLessXsDateFormat format = new TimezoneLessXsDateFormat();
-
+
@Override
public Object readObject(MessageReader reader, Context context) throws DatabindingException {
String value = reader.getValue();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
index bb52796..b8a34ee 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java
@@ -80,7 +80,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
if (style == null) {
style = "element";
}
-
+
boolean element = "element".equals(style);
boolean qualify;
if (element) {
@@ -92,7 +92,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
if (qualify) {
namespace = getDefaultNamespace();
}
-
+
if (e != null) {
mappedName = NamespaceHelper.createQName(e, DOMUtils.getAttributeValueEmptyNull(e, "mappedName"),
namespace);
@@ -103,15 +103,15 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
}
if (e != null) {
-
- QName mappedType = NamespaceHelper.createQName(e,
+
+ QName mappedType = NamespaceHelper.createQName(e,
DOMUtils.getAttributeValueEmptyNull(e, "typeName"),
getDefaultNamespace());
if (mappedType != null) {
mapTypeName(mappedName, mappedType);
- }
-
+ }
+
/*
* Whenever we create a type object, it has to have a schema type. If we created a custom type
* object out of thin air here, we've may have a problem. If "typeName" was specified, then then
@@ -120,11 +120,11 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
* it, we'll get it wrong.
*/
-
+
String explicitTypeName = DOMUtils.getAttributeValueEmptyNull(e, "type");
if (explicitTypeName != null) {
try {
- Class<?> typeClass =
+ Class<?> typeClass =
ClassLoaderUtils.loadClass(explicitTypeName, XMLBeanTypeInfo.class);
AegisType customTypeObject = (AegisType) typeClass.newInstance();
mapType(mappedName, customTypeObject);
@@ -140,9 +140,9 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
//
} catch (IllegalAccessException e3) {
//
- }
+ }
}
-
+
String nillableVal = DOMUtils.getAttributeValueEmptyNull(e, "nillable");
if (nillableVal != null && nillableVal.length() > 0) {
ensurePropertyInfo(mappedName).setNillable(Boolean.valueOf(nillableVal).booleanValue());
@@ -232,7 +232,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
/**
* Grab the Property Info for the given property
- *
+ *
* @param name
* @return the BeanTypePropertyInfo for the property or NULL if none found
*/
@@ -243,7 +243,7 @@ public class XMLBeanTypeInfo extends BeanTypeInfo {
/**
* Grab the Property Info for the given property but if not found create one
* and add it to the map
- *
+ *
* @param name
* @return the BeanTypePropertyInfo for the property
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
index 9b8652e..3f4931f 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java
@@ -59,13 +59,13 @@ public class CollectionType extends ArrayType {
@SuppressWarnings("unchecked")
protected Collection<Object> createCollection() {
Collection<Object> values = null;
-
+
/*
* getTypeClass returns the type of the object. These 'if's asked if the proposed
* type can be assigned to the object, not the other way around. Thus List before
* Vector and Set before SortedSet.
*/
-
+
Class<?> userTypeClass = getTypeClass();
if (userTypeClass.isAssignableFrom(List.class)) {
values = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
index 940a12e..292b3ed 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java
@@ -70,7 +70,7 @@ public class ArrayTypeInfo {
typeName = new QName(namespace, typeName.getLocalPart(), typeName.getPrefix());
}
}
-
+
if (tm != null) {
type = tm.getType(typeName);
@@ -113,7 +113,7 @@ public class ArrayTypeInfo {
throw new DatabindingException("Invalid ArrayType value " + arrayTypeValue);
}
if (tokens.get(1).equals(":")) {
- typeName =
+ typeName =
new QName(namespaceContext.getNamespaceURI(tokens.get(0)), tokens.get(2), tokens.get(0));
tokens = tokens.subList(3, tokens.size());
} else {
@@ -222,7 +222,7 @@ public class ArrayTypeInfo {
public String toString() {
StringBuilder string = new StringBuilder();
-
+
// no prefix handed to us by someone else ...
if ("".equals(typeName.getPrefix()) && !"".equals(typeName.getNamespaceURI())) {
throw new RuntimeException("No prefix provided in QName for " + typeName.getNamespaceURI());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java
index 168cf7e..c1d8bd9 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/MarshalRegistry.java
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.cxf.aegis.Context;
/**
- * MarshalRegistry maintains tracks which object instances have been marshaled
+ * MarshalRegistry maintains tracks which object instances have been marshaled
* and which objects still need to be marshaled.
* <p/>
* Note: only the StructType register objects with this class.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
index 2f54840..d6bcdc1 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java
@@ -143,7 +143,7 @@ public class SoapArrayType extends AegisType {
compType = arrayTypeInfo.getType();
}
// check for an xsi:type override
- compType = TypeUtil.getReadType(creader.getXMLStreamReader(),
+ compType = TypeUtil.getReadType(creader.getXMLStreamReader(),
context.getGlobalContext(), compType);
// wrap type with soap ref to handle hrefs
@@ -277,7 +277,7 @@ public class SoapArrayType extends AegisType {
public void writeObject(Object values,
MessageWriter writer,
Context context) throws DatabindingException {
-
+
if (values == null) {
return;
}
@@ -302,7 +302,7 @@ public class SoapArrayType extends AegisType {
getDimensions() - 1,
Array.getLength(values));
// ensure that the writer writes out this prefix...
- writer.getPrefixForNamespace(arrayTypeInfo.getTypeName().getNamespaceURI(),
+ writer.getPrefixForNamespace(arrayTypeInfo.getTypeName().getNamespaceURI(),
arrayTypeInfo.getTypeName().getPrefix());
arrayTypeInfo.writeAttribute(writer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java
index 8af483f..439afb1 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java
@@ -50,7 +50,7 @@ public class StructType extends BeanType {
public StructType(BeanTypeInfo info) {
super(info);
}
-
+
//soap-encoding always allow xsi:nil=true to be set
protected boolean alwaysAllowNillables() {
return true;
@@ -77,7 +77,7 @@ public class StructType extends BeanType {
BeanTypeInfo beanTypeInfo,
MessageReader reader,
Context context) {
-
+
// nested elements use unqualified names
name = qualifyName(name);
@@ -118,7 +118,7 @@ public class StructType extends BeanType {
* Writes a nested element with an unqualified name.
*/
@Override
- protected void writeElement(QName name, Object value,
+ protected void writeElement(QName name, Object value,
AegisType type, MessageWriter writer, Context context) {
// Nested elements are unqualified
name = new QName("", name.getLocalPart());
@@ -156,7 +156,7 @@ public class StructType extends BeanType {
return name;
}
-
+
private BeanType superBeanType(AegisType t) {
if (t instanceof BeanType) {
BeanType bt = (BeanType)t;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
index 1a868c2..753e8ab 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java
@@ -103,7 +103,7 @@ public class TrailingBlocks {
Object instance = objectType.readObject(creader, context);
blocks.add(instance);
- // register the instance
+ // register the instance
SoapRefRegistry.get(context).addInstance(id, instance);
// close the element reader
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
index bb44726..0a4532f 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeInfo.java
@@ -31,7 +31,7 @@ import org.apache.cxf.aegis.util.NamespaceHelper;
public class AnnotatedTypeInfo extends BeanTypeInfo {
private final AnnotationReader annotationReader;
- public AnnotatedTypeInfo(TypeMapping tm, Class<?> typeClass,
+ public AnnotatedTypeInfo(TypeMapping tm, Class<?> typeClass,
String ns, TypeCreationOptions typeCreationOptions) {
this(tm, typeClass, ns, new AnnotationReader(), typeCreationOptions);
}
@@ -52,9 +52,9 @@ public class AnnotatedTypeInfo extends BeanTypeInfo {
protected void mapProperty(PropertyDescriptor pd) {
// skip ignored properties
if (annotationReader.isIgnored(pd.getReadMethod())) {
- return;
+ return;
}
-
+
String explicitNamespace = annotationReader.getNamespace(pd.getReadMethod());
boolean mustQualify = null != explicitNamespace && !"".equals(explicitNamespace);
[33/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
index 05f19a9..c9330b9 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
@@ -89,10 +89,10 @@ public final class EndpointReferenceUtils {
/**
* We want to load the schemas, including references to external schemas, into a SchemaFactory
- * to validate. There seem to be bugs in resolving inter-schema references in Xerces, so even when we are
+ * to validate. There seem to be bugs in resolving inter-schema references in Xerces, so even when we are
* handing the factory all the schemas, interrelated with <import> elements, we need
* to also hand over extra copies (!) as character images when requested.
- *
+ *
* To do this, we use the DOM representation kept in the SchemaInfo. This has the bonus
* of benefiting from the use of the catalog resolver in there, which is missing from
* the code in here.
@@ -102,12 +102,12 @@ public final class EndpointReferenceUtils {
private final Set<String> done = new HashSet<>();
private final ExtendedURIResolver resolver = new ExtendedURIResolver();
private final Bus bus;
-
+
private SchemaLSResourceResolver(Map<String, byte[]> schemas, Bus b) {
this.schemas = schemas;
this.bus = b;
}
-
+
public LSInput resolveResource(String type, String namespaceURI, String publicId,
String systemId, String baseURI) {
@@ -134,15 +134,15 @@ public final class EndpointReferenceUtils {
if (done.contains(newId + ":" + namespaceURI)) {
return null;
}
-
+
if (schemas.containsKey(newId + ":" + namespaceURI)) {
byte[] ds = schemas.remove(newId + ":" + namespaceURI);
- impl = createInput(newId, ds);
+ impl = createInput(newId, ds);
done.add(newId + ":" + namespaceURI);
}
if (impl == null && schemas.containsKey(newId + ":null")) {
byte[] ds = schemas.get(newId + ":null");
- impl = createInput(newId, ds);
+ impl = createInput(newId, ds);
done.add(newId + ":" + namespaceURI);
}
if (impl == null && bus != null && systemId != null) {
@@ -170,7 +170,7 @@ public final class EndpointReferenceUtils {
}
}
// there can be multiple includes on the same namespace. This scenario is not envisioned yet.
- // hence the filename part is included as well.
+ // hence the filename part is included as well.
if (systemId != null) {
String systemIdFileName = systemId.substring(systemId.lastIndexOf('/') + 1);
for (Map.Entry<String, byte[]> ent : schemas.entrySet()) {
@@ -195,7 +195,7 @@ public final class EndpointReferenceUtils {
}
}
}
-
+
//REVIST - we need to get catalogs in here somehow :-(
if (systemId == null) {
systemId = publicId;
@@ -223,15 +223,15 @@ public final class EndpointReferenceUtils {
}
public static final String ANONYMOUS_ADDRESS = "http://www.w3.org/2005/08/addressing/anonymous";
-
+
private static final Logger LOG = LogUtils.getL7dLogger(EndpointReferenceUtils.class);
private static final String NS_WSAW_2005 = "http://www.w3.org/2005/02/addressing/wsdl";
- private static final String WSDL_INSTANCE_NAMESPACE2 =
+ private static final String WSDL_INSTANCE_NAMESPACE2 =
"http://www.w3.org/2006/01/wsdl-instance";
- private static final String WSDL_INSTANCE_NAMESPACE =
+ private static final String WSDL_INSTANCE_NAMESPACE =
"http://www.w3.org/ns/wsdl-instance";
-
+
private static final QName WSA_WSDL_NAMESPACE_NS =
new QName("xmlns:" + JAXWSAConstants.WSAW_PREFIX);
private static final String XML_SCHEMA_NAMESPACE =
@@ -245,15 +245,15 @@ public final class EndpointReferenceUtils {
new QName(WSDL_INSTANCE_NAMESPACE2, "wsdlLocation");
private static final QName WSDL_LOCATION =
new QName(WSDL_INSTANCE_NAMESPACE, "wsdlLocation");
- private static final QName XSI_TYPE =
+ private static final QName XSI_TYPE =
new QName(XML_SCHEMA_INSTANCE_NAMESPACE, "type", "xsi");
-
- private static final org.apache.cxf.ws.addressing.wsdl.ObjectFactory WSA_WSDL_OBJECT_FACTORY =
+
+ private static final org.apache.cxf.ws.addressing.wsdl.ObjectFactory WSA_WSDL_OBJECT_FACTORY =
new org.apache.cxf.ws.addressing.wsdl.ObjectFactory();
-
-
+
+
private static final Set<Class<?>> ADDRESSING_CLASSES = new HashSet<Class<?>>();
- private static final AtomicReference<Reference<JAXBContext>> ADDRESSING_CONTEXT
+ private static final AtomicReference<Reference<JAXBContext>> ADDRESSING_CONTEXT
= new AtomicReference<Reference<JAXBContext>>(new SoftReference<JAXBContext>(null));
static {
ADDRESSING_CLASSES.add(WSA_WSDL_OBJECT_FACTORY.getClass());
@@ -263,15 +263,15 @@ public final class EndpointReferenceUtils {
private EndpointReferenceUtils() {
// Utility class - never constructed
}
-
+
/**
- * Sets the service and port name of the provided endpoint reference.
+ * Sets the service and port name of the provided endpoint reference.
* @param ref the endpoint reference.
* @param serviceName the name of service.
* @param portName the port name.
*/
- public static void setServiceAndPortName(EndpointReferenceType ref,
- QName serviceName,
+ public static void setServiceAndPortName(EndpointReferenceType ref,
+ QName serviceName,
String portName) {
if (null != serviceName) {
JAXBElement<ServiceNameType> jaxbElement = getServiceNameType(serviceName, portName);
@@ -280,8 +280,8 @@ public final class EndpointReferenceUtils {
mt.getAny().add(jaxbElement);
}
}
-
-
+
+
public static MetadataType getSetMetadata(EndpointReferenceType ref) {
MetadataType mt = ref.getMetadata();
if (null == mt) {
@@ -290,20 +290,20 @@ public final class EndpointReferenceUtils {
}
return mt;
}
-
+
public static JAXBElement<ServiceNameType> getServiceNameType(QName serviceName, String portName) {
ServiceNameType serviceNameType = WSA_WSDL_OBJECT_FACTORY.createServiceNameType();
serviceNameType.setValue(serviceName);
serviceNameType.setEndpointName(portName);
serviceNameType.getOtherAttributes().put(WSA_WSDL_NAMESPACE_NS, JAXWSAConstants.NS_WSAW);
- serviceNameType.getOtherAttributes().put(XSI_TYPE,
- JAXWSAConstants.WSAW_PREFIX + ":"
+ serviceNameType.getOtherAttributes().put(XSI_TYPE,
+ JAXWSAConstants.WSAW_PREFIX + ":"
+ serviceNameType.getClass().getSimpleName());
return WSA_WSDL_OBJECT_FACTORY.createServiceName(serviceNameType);
}
-
+
/**
- * Gets the service name of the provided endpoint reference.
+ * Gets the service name of the provided endpoint reference.
* @param ref the endpoint reference.
* @return the service name.
*/
@@ -329,7 +329,7 @@ public final class EndpointReferenceUtils {
Node nodeAttr = node.getAttributes().getNamedItem("xmlns");
namespaceURI = nodeAttr.getNodeValue();
}
-
+
return new QName(namespaceURI, service);
}
} else if (obj instanceof JAXBElement) {
@@ -343,7 +343,7 @@ public final class EndpointReferenceUtils {
}
return null;
}
-
+
/**
* Gets the port name of the provided endpoint reference.
* @param ref the endpoint reference.
@@ -374,12 +374,12 @@ public final class EndpointReferenceUtils {
}
return null;
}
-
+
public static QName getPortQName(EndpointReferenceType ref, Bus bus) {
- QName serviceName = getServiceName(ref, bus);
+ QName serviceName = getServiceName(ref, bus);
return new QName(serviceName.getNamespaceURI(), getPortName(ref));
}
-
+
public static void setPortName(EndpointReferenceType ref, String portName) {
MetadataType metadata = ref.getMetadata();
if (metadata != null) {
@@ -403,27 +403,27 @@ public final class EndpointReferenceUtils {
}
}
}
-
+
public static void setInterfaceName(EndpointReferenceType ref, QName portTypeName) {
if (null != portTypeName) {
AttributedQNameType interfaceNameType =
WSA_WSDL_OBJECT_FACTORY.createAttributedQNameType();
-
+
interfaceNameType.setValue(portTypeName);
- interfaceNameType.getOtherAttributes().put(XML_SCHEMA_NAMESPACE_NS,
+ interfaceNameType.getOtherAttributes().put(XML_SCHEMA_NAMESPACE_NS,
XML_SCHEMA_NAMESPACE);
interfaceNameType.getOtherAttributes().put(XSI_TYPE,
XML_SCHEMA_NAMESPACE_PREFIX + ":"
+ portTypeName.getClass().getSimpleName());
-
- JAXBElement<AttributedQNameType> jaxbElement =
+
+ JAXBElement<AttributedQNameType> jaxbElement =
WSA_WSDL_OBJECT_FACTORY.createInterfaceName(interfaceNameType);
MetadataType mt = getSetMetadata(ref);
mt.getAny().add(jaxbElement);
}
}
-
+
public static QName getInterfaceName(EndpointReferenceType ref, Bus bus) {
MetadataType metadata = ref.getMetadata();
if (metadata == null) {
@@ -435,7 +435,7 @@ public final class EndpointReferenceUtils {
if ((node.getNamespaceURI().equals(JAXWSAConstants.NS_WSAW)
|| node.getNamespaceURI().equals(JAXWSAConstants.NS_WSAM))
&& node.getNodeName().contains("InterfaceName")) {
-
+
String content = node.getTextContent();
String namespaceURI = node.getFirstChild().getNamespaceURI();
//String service = content;
@@ -461,9 +461,9 @@ public final class EndpointReferenceUtils {
return null;
}
-
+
public static void setWSDLLocation(EndpointReferenceType ref, String... wsdlLocation) {
-
+
MetadataType metadata = getSetMetadata(ref);
//wsdlLocation attribute is a list of anyURI.
@@ -475,7 +475,7 @@ public final class EndpointReferenceUtils {
metadata.getOtherAttributes().put(WSDL_LOCATION, strBuf.toString().trim());
}
-
+
public static String getWSDLLocation(EndpointReferenceType ref) {
String wsdlLocation = null;
MetadataType metadata = ref.getMetadata();
@@ -491,7 +491,7 @@ public final class EndpointReferenceUtils {
return null;
}
- //TODO The wsdlLocation inserted should be a valid URI
+ //TODO The wsdlLocation inserted should be a valid URI
//before doing a split. So temporarily return the string
//return wsdlLocation.split(" ");
return wsdlLocation;
@@ -504,7 +504,7 @@ public final class EndpointReferenceUtils {
*/
public static void setMetadata(EndpointReferenceType ref, List<Source> metadata)
throws EndpointUtilsException {
-
+
if (null != ref) {
MetadataType mt = getSetMetadata(ref);
List<Object> anyList = mt.getAny();
@@ -522,16 +522,16 @@ public final class EndpointReferenceUtils {
} else if (source instanceof DOMSource) {
node = ((DOMSource)source).getNode();
doTransform = false;
- }
-
+ }
+
if (doTransform) {
DOMResult domResult = new DOMResult();
domResult.setSystemId(source.getSystemId());
node = StaxUtils.read(source);
-
+
node = domResult.getNode();
}
-
+
if (null != node) {
if (node instanceof Document) {
try {
@@ -541,11 +541,11 @@ public final class EndpointReferenceUtils {
}
node = node.getFirstChild();
}
-
+
while (node.getNodeType() != Node.ELEMENT_NODE) {
node = node.getNextSibling();
}
-
+
anyList.add(node);
}
}
@@ -555,8 +555,8 @@ public final class EndpointReferenceUtils {
}
}
}
-
-
+
+
private static synchronized Schema createSchema(ServiceInfo serviceInfo, Bus b) {
if (b == null) {
b = BusFactory.getThreadDefaultBus(false);
@@ -581,7 +581,7 @@ public final class EndpointReferenceUtils {
if (baseURI == null) {
baseURI = si.getSystemId();
}
- DOMSource ds = new DOMSource(el, baseURI);
+ DOMSource ds = new DOMSource(el, baseURI);
schemaSourcesMap2.put(si.getSystemId() + ":" + si.getNamespaceURI(), ds);
LoadingByteArrayOutputStream out = new LoadingByteArrayOutputStream();
writer = StaxUtils.createXMLStreamWriter(out);
@@ -590,12 +590,12 @@ public final class EndpointReferenceUtils {
schemaSourcesMap.put(si.getSystemId() + ":" + si.getNamespaceURI(), out.toByteArray());
}
-
+
for (XmlSchema sch : serviceInfo.getXmlSchemaCollection().getXmlSchemas()) {
if (sch.getSourceURI() != null
- && !schemaSourcesMap.containsKey(sch.getSourceURI() + ":"
- + sch.getTargetNamespace())) {
-
+ && !schemaSourcesMap.containsKey(sch.getSourceURI() + ":"
+ + sch.getTargetNamespace())) {
+
InputStream ins = null;
try {
URL url = new URL(sch.getSourceURI());
@@ -604,7 +604,7 @@ public final class EndpointReferenceUtils {
//ignore, we'll just use what we have. (though
//bugs in XmlSchema could make this less useful)
}
-
+
LoadingByteArrayOutputStream out = new LoadingByteArrayOutputStream();
if (ins == null) {
sch.write(out);
@@ -612,21 +612,21 @@ public final class EndpointReferenceUtils {
IOUtils.copyAndCloseInput(ins, out);
}
- schemaSourcesMap.put(sch.getSourceURI() + ":"
+ schemaSourcesMap.put(sch.getSourceURI() + ":"
+ sch.getTargetNamespace(), out.toByteArray());
-
+
Source source = new StreamSource(out.createInputStream(), sch.getSourceURI());
- schemaSourcesMap2.put(sch.getSourceURI() + ":"
+ schemaSourcesMap2.put(sch.getSourceURI() + ":"
+ sch.getTargetNamespace(), source);
}
- }
+ }
factory.setResourceResolver(new SchemaLSResourceResolver(schemaSourcesMap, b));
schema = factory.newSchema(schemaSourcesMap2.values()
.toArray(new Source[schemaSourcesMap2.size()]));
-
-
+
+
} catch (Exception ex) {
// Something not right with the schema from the wsdl.
LOG.log(Level.WARNING, "SAXException for newSchema()", ex);
@@ -634,7 +634,7 @@ public final class EndpointReferenceUtils {
String s = StaxUtils.toString(schemaInfo.getElement(), 4);
LOG.log(Level.INFO, "Schema for: " + schemaInfo.getNamespaceURI() + "\n" + s);
}
- } finally {
+ } finally {
for (Source src : schemaSourcesMap2.values()) {
if (src instanceof DOMSource) {
Node nd = ((DOMSource)src).getNode();
@@ -647,7 +647,7 @@ public final class EndpointReferenceUtils {
}
return schema;
}
-
+
private static void unsetReadonly(Node nd) {
try {
//work around a bug in the version of Xerces that is in the JDK
@@ -677,7 +677,7 @@ public final class EndpointReferenceUtils {
}
return schema;
}
-
+
/**
* Get the address from the provided endpoint reference.
@@ -709,7 +709,7 @@ public final class EndpointReferenceUtils {
* @param portName - the name of the port.
* @return EndpointReferenceType - the endpoint reference
*/
- public static EndpointReferenceType getEndpointReference(URL wsdlUrl,
+ public static EndpointReferenceType getEndpointReference(URL wsdlUrl,
QName serviceName,
String portName) {
EndpointReferenceType reference = new EndpointReferenceType();
@@ -720,8 +720,8 @@ public final class EndpointReferenceUtils {
return reference;
}
-
-
+
+
/**
* Create a duplicate endpoint reference sharing all atributes
* @param ref the reference to duplicate
@@ -734,7 +734,7 @@ public final class EndpointReferenceUtils {
reference.setAddress(ref.getAddress());
return reference;
}
-
+
/**
* Create an endpoint reference for the provided address.
* @param address - address URI
@@ -745,13 +745,13 @@ public final class EndpointReferenceUtils {
setAddress(reference, address);
return reference;
}
-
+
public static EndpointReferenceType getEndpointReference(AttributedURIType address) {
EndpointReferenceType reference = new EndpointReferenceType();
reference.setAddress(address);
return reference;
- }
-
+ }
+
/**
* Create an anonymous endpoint reference.
* @return EndpointReferenceType - the endpoint reference
@@ -761,10 +761,10 @@ public final class EndpointReferenceUtils {
setAddress(reference, ANONYMOUS_ADDRESS);
return reference;
}
-
+
/**
* Resolve logical endpoint reference via the Bus EndpointResolverRegistry.
- *
+ *
* @param logical the abstract EPR to resolve
* @return the resolved concrete EPR if appropriate, null otherwise
*/
@@ -780,10 +780,10 @@ public final class EndpointReferenceUtils {
return physical != null ? physical : logical;
}
-
+
/**
* Renew logical endpoint reference via the Bus EndpointResolverRegistry.
- *
+ *
* @param logical the original abstract EPR (if still available)
* @param physical the concrete EPR to renew
* @return the renewed concrete EPR if appropriate, null otherwise
@@ -804,7 +804,7 @@ public final class EndpointReferenceUtils {
/**
* Mint logical endpoint reference via the Bus EndpointResolverRegistry.
- *
+ *
* @param serviceName the given serviceName
* @return the newly minted EPR if appropriate, null otherwise
*/
@@ -819,11 +819,11 @@ public final class EndpointReferenceUtils {
}
return logical;
}
-
+
/**
* Mint logical endpoint reference via the Bus EndpointResolverRegistry.
- *
- * @param physical the concrete template EPR
+ *
+ * @param physical the concrete template EPR
* @return the newly minted EPR if appropriate, null otherwise
*/
public static EndpointReferenceType mint(EndpointReferenceType physical, Bus bus) {
@@ -837,10 +837,10 @@ public final class EndpointReferenceUtils {
}
return logical != null ? logical : physical;
}
-
+
private static String getNameSpaceUri(Node node, String content, String namespaceURI) {
if (namespaceURI == null) {
- namespaceURI = node.lookupNamespaceURI(content.substring(0,
+ namespaceURI = node.lookupNamespaceURI(content.substring(0,
content.indexOf(":")));
}
return namespaceURI;
@@ -856,23 +856,23 @@ public final class EndpointReferenceUtils {
* @param portName identifies a particular port of the service, may be null
* @param id that must be embedded in the returned reference
* @param bus the current bus
- * @return a new reference or null if the target destination does not support destination mutiplexing
+ * @return a new reference or null if the target destination does not support destination mutiplexing
*/
- public static EndpointReferenceType getEndpointReferenceWithId(QName serviceQName,
- String portName,
- String id,
+ public static EndpointReferenceType getEndpointReferenceWithId(QName serviceQName,
+ String portName,
+ String id,
Bus bus) {
- EndpointReferenceType epr = null;
+ EndpointReferenceType epr = null;
MultiplexDestination destination = getMatchingMultiplexDestination(serviceQName, portName, bus);
if (null != destination) {
epr = destination.getAddressWithId(id);
}
return epr;
}
-
+
/**
- * Obtain the id String from the endpoint reference of the current dispatch.
- * @param messageContext the current message context
+ * Obtain the id String from the endpoint reference of the current dispatch.
+ * @param messageContext the current message context
* @return the id embedded in the current endpoint reference or null if not found
*/
public static String getEndpointReferenceId(Map<String, Object> messageContext) {
@@ -883,7 +883,7 @@ public final class EndpointReferenceUtils {
}
return id;
}
-
+
private static synchronized JAXBContext createContextForEPR() throws JAXBException {
Reference<JAXBContext> rctx = ADDRESSING_CONTEXT.get();
@@ -893,7 +893,7 @@ public final class EndpointReferenceUtils {
null, null, null,
true).getContext();
ADDRESSING_CONTEXT.set(new SoftReference<JAXBContext>(ctx));
- }
+ }
return ctx;
}
private static JAXBContext getJAXBContextForEPR() throws JAXBException {
@@ -911,18 +911,18 @@ public final class EndpointReferenceUtils {
QName qname = new QName("http://www.w3.org/2005/08/addressing", "EndpointReference");
JAXBElement<EndpointReferenceType> jaxEle
= new JAXBElement<EndpointReferenceType>(qname, EndpointReferenceType.class, epr);
-
-
+
+
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
- jm.marshal(jaxEle, writer);
+ jm.marshal(jaxEle, writer);
return new DOMSource(writer.getDocument());
} catch (JAXBException e) {
//ignore
}
return null;
}
-
-
+
+
private static MultiplexDestination getMatchingMultiplexDestination(QName serviceQName, String portName,
Bus bus) {
MultiplexDestination destination = null;
@@ -941,7 +941,7 @@ public final class EndpointReferenceUtils {
}
} else {
LOG.log(Level.WARNING,
- "Failed to locate service matching " + serviceQName
+ "Failed to locate service matching " + serviceQName
+ ", because the bus ServerRegistry extension provider is null");
}
return destination;
@@ -949,13 +949,13 @@ public final class EndpointReferenceUtils {
private static boolean portNameMatches(Server s, String portName) {
boolean ret = false;
- if (null == portName
+ if (null == portName
|| portName.equals(s.getEndpoint().getEndpointInfo().getName().getLocalPart())) {
return true;
}
return ret;
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java
index 4279b4d..1f4a194 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointUtilsException.java
@@ -27,7 +27,7 @@ public class EndpointUtilsException extends Exception {
public EndpointUtilsException(Message msg) {
super(msg);
}
-
+
public EndpointUtilsException(Message msg, Throwable t) {
super(msg, t);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java b/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
index bb7e5d3..db85ab7 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/JAXWSAConstants.java
@@ -27,7 +27,7 @@ import javax.xml.namespace.QName;
* A container for WS-Addressing constants.
*/
public final class JAXWSAConstants {
-
+
public static final String WSAW_PREFIX = "wsaw";
public static final String NS_WSAW = "http://www.w3.org/2006/05/addressing/wsdl";
public static final String WSAM_PREFIX = "wsam";
@@ -35,9 +35,9 @@ public final class JAXWSAConstants {
public static final QName WSAW_ACTION_QNAME = new QName(NS_WSAW, "Action");
public static final QName WSAM_ACTION_QNAME = new QName(NS_WSAM, "Action");
-
+
public static final QName WSAW_USINGADDRESSING_QNAME = new QName(NS_WSAW, "UsingAddressing");
-
+
public static final String NS_WSA = "http://www.w3.org/2005/08/addressing";
public static final String WSA_PREFIX = "wsa";
public static final String WSA_XSD = "http://www.w3.org/2006/03/addressing/ws-addr.xsd";
@@ -45,10 +45,10 @@ public final class JAXWSAConstants {
public static final String WSA_REFERENCEPARAMETERS_NAME = "ReferenceParameters";
public static final String WSA_METADATA_NAME = "Metadata";
public static final String WSA_ADDRESS_NAME = "Address";
-
+
public static final String WSAM_SERVICENAME_NAME = "ServiceName";
public static final String WSAM_INTERFACE_NAME = "InterfaceName";
- public static final String WSAM_ENDPOINT_NAME = "EndpointName";
+ public static final String WSAM_ENDPOINT_NAME = "EndpointName";
public static final String WSDLI_PFX = "wsdli";
@@ -59,16 +59,16 @@ public final class JAXWSAConstants {
* Well-known Property names for AddressingProperties in BindingProvider
* Context.
*/
- public static final String CLIENT_ADDRESSING_PROPERTIES =
+ public static final String CLIENT_ADDRESSING_PROPERTIES =
"javax.xml.ws.addressing.context";
-
+
/**
* Well-known Property names for AddressingProperties in Handler
* Context.
*/
- public static final String ADDRESSING_PROPERTIES_INBOUND =
+ public static final String ADDRESSING_PROPERTIES_INBOUND =
"javax.xml.ws.addressing.context.inbound";
- public static final String ADDRESSING_PROPERTIES_OUTBOUND =
+ public static final String ADDRESSING_PROPERTIES_OUTBOUND =
"javax.xml.ws.addressing.context.outbound";
@@ -81,9 +81,9 @@ public final class JAXWSAConstants {
@Deprecated
public static final String SERVER_ADDRESSING_PROPERTIES_OUTBOUND = ADDRESSING_PROPERTIES_OUTBOUND;
-
+
/**
- * Prevents instantiation.
+ * Prevents instantiation.
*/
private JAXWSAConstants() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java b/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
index 7687785..721ea60 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/MAPAggregator.java
@@ -27,16 +27,16 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptor;
/**
- * Logical Handler responsible for aggregating the Message Addressing
+ * Logical Handler responsible for aggregating the Message Addressing
* Properties for outgoing messages.
*/
public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
public static final String USING_ADDRESSING = MAPAggregator.class.getName() + ".usingAddressing";
public static final String ADDRESSING_DISABLED = MAPAggregator.class.getName() + ".addressingDisabled";
- public static final String DECOUPLED_DESTINATION = MAPAggregator.class.getName()
+ public static final String DECOUPLED_DESTINATION = MAPAggregator.class.getName()
+ ".decoupledDestination";
public static final String ACTION_VERIFIED = MAPAggregator.class.getName() + ".actionVerified";
-
+
public interface MAPAggregatorLoader {
MAPAggregator createImplementation(MAPAggregator mag);
}
@@ -45,7 +45,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
protected boolean usingAddressingAdvisory = true;
protected boolean addressingRequired;
protected boolean allowDuplicates = true;
- protected WSAddressingFeature.AddressingResponses addressingResponses
+ protected WSAddressingFeature.AddressingResponses addressingResponses
= WSAddressingFeature.AddressingResponses.ALL;
/**
@@ -60,7 +60,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
super(MAPAggregator.class.getName(), Phase.PRE_LOGICAL);
addBefore("org.apache.cxf.interceptor.OneWayProcessorInterceptor");
}
-
+
/**
* Indicates if duplicate messageIDs are allowed.
* @return true if duplicate messageIDs are allowed
@@ -73,7 +73,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
}
/**
- * Allows/disallows duplicate messageIdDs.
+ * Allows/disallows duplicate messageIdDs.
* @param ad whether duplicate messageIDs are allowed
*/
public void setAllowDuplicates(boolean ad) {
@@ -88,7 +88,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
* in the WSDL is purely advisory, i.e. its absence doesn't prevent
* the encoding of WS-A headers.
*
- * @return true if the presence of the <wsaw:UsingAddressing> element is
+ * @return true if the presence of the <wsaw:UsingAddressing> element is
* advisory
*/
public boolean isUsingAddressingAdvisory() {
@@ -112,7 +112,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
}
usingAddressingAdvisory = advisory;
}
-
+
/**
* Whether the use of addressing is completely required for this endpoint
*
@@ -134,9 +134,9 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
}
addressingRequired = required;
}
-
+
/**
- * Sets Addresing Response
+ * Sets Addresing Response
*
*/
public void setAddressingResponses(WSAddressingFeature.AddressingResponses responses) {
@@ -145,7 +145,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
}
addressingResponses = responses;
}
-
+
/**
* Returns the cache used to enforce duplicate message IDs when
* {@link #allowDuplicates()} returns {@code false}.
@@ -176,9 +176,9 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
}
this.messageIdCache = messageIdCache;
}
-
+
/**
- * Sets Addressing Response
+ * Sets Addressing Response
*
*/
public WSAddressingFeature.AddressingResponses getAddressingResponses() {
@@ -187,7 +187,7 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
}
return addressingResponses;
}
-
+
/**
* Invoked for normal processing of inbound and outbound messages.
*
@@ -202,20 +202,20 @@ public class MAPAggregator extends AbstractPhaseInterceptor<Message> {
}
impl.handleMessage(message);
}
-
+
public void handleFault(Message message) {
if (impl != null) {
impl.handleFault(message);
}
}
-
-
+
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
if (impl != null) {
return impl.getAdditionalInterceptors();
}
return super.getAdditionalInterceptors();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java b/core/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java
index 9c912dc..659cc2d 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/MessageIdCache.java
@@ -22,12 +22,12 @@ package org.apache.cxf.ws.addressing;
* Interface abstracting various ID caches for enforcement of ID uniqueness.
*/
public interface MessageIdCache {
-
+
/**
* Check {@code messageId} for uniqueness against previously
* encountered values and cache the ID. Note that the retention
* policy for previously encountered values is implementation specific.
- *
+ *
* @param messageId the message ID to check for uniqueness and cache for
* future comparison
*
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
index c0761a1..4f4a60c 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/Names.java
@@ -30,78 +30,78 @@ import javax.xml.namespace.QName;
* Holder for WS-Addressing names (of headers, namespaces etc.).
*/
public final class Names {
-
- public static final String WSA_NAMESPACE_NAME =
+
+ public static final String WSA_NAMESPACE_NAME =
"http://www.w3.org/2005/08/addressing";
-
+
public static final String WSA_NAMESPACE_WSDL_NAME = "http://www.w3.org/2006/05/addressing/wsdl";
- public static final String WSA_NAMESPACE_WSDL_NAME_OLD =
+ public static final String WSA_NAMESPACE_WSDL_NAME_OLD =
"http://www.w3.org/2005/02/addressing/wsdl";
- public static final String WSA_NAMESPACE_WSDL_METADATA =
+ public static final String WSA_NAMESPACE_WSDL_METADATA =
"http://www.w3.org/2007/05/addressing/metadata";
public static final String WSA_NAMESPACE_PATTERN = "/addressing";
- public static final String WSA_REFERENCE_PARAMETERS_NAME =
+ public static final String WSA_REFERENCE_PARAMETERS_NAME =
"ReferenceParameters";
- public static final QName WSA_REFERENCE_PARAMETERS_QNAME =
+ public static final QName WSA_REFERENCE_PARAMETERS_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_REFERENCE_PARAMETERS_NAME);
-
- public static final String WSA_IS_REFERENCE_PARAMETER_NAME =
+
+ public static final String WSA_IS_REFERENCE_PARAMETER_NAME =
"IsReferenceParameter";
public static final QName WSA_IS_REFERENCE_PARAMETER_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_IS_REFERENCE_PARAMETER_NAME);
-
+
public static final String WSA_ADDRESS_NAME = "Address";
- public static final QName WSA_ADDRESS_QNAME =
+ public static final QName WSA_ADDRESS_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_ADDRESS_NAME);
-
+
public static final String WSA_METADATA_NAME = "Metadata";
- public static final QName WSA_METADATA_QNAME =
+ public static final QName WSA_METADATA_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_METADATA_NAME);
-
+
public static final String WSA_FROM_NAME = "From";
- public static final QName WSA_FROM_QNAME =
+ public static final QName WSA_FROM_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_FROM_NAME);
public static final String WSA_TO_NAME = "To";
- public static final QName WSA_TO_QNAME =
+ public static final QName WSA_TO_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_TO_NAME);
-
+
public static final String WSA_REPLYTO_NAME = "ReplyTo";
- public static final QName WSA_REPLYTO_QNAME =
+ public static final QName WSA_REPLYTO_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_REPLYTO_NAME);
public static final String WSA_FAULTTO_NAME = "FaultTo";
- public static final QName WSA_FAULTTO_QNAME =
+ public static final QName WSA_FAULTTO_QNAME =
new QName(WSA_NAMESPACE_NAME, "FaultTo");
-
+
public static final String WSA_ACTION_NAME = "Action";
- public static final QName WSA_ACTION_QNAME =
+ public static final QName WSA_ACTION_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_ACTION_NAME);
public static final String WSA_MESSAGEID_NAME = "MessageID";
- public static final QName WSA_MESSAGEID_QNAME =
- new QName(WSA_NAMESPACE_NAME, WSA_MESSAGEID_NAME);
-
+ public static final QName WSA_MESSAGEID_QNAME =
+ new QName(WSA_NAMESPACE_NAME, WSA_MESSAGEID_NAME);
+
public static final String WSA_REPLY_NAME = "reply";
public static final String WSA_RELATIONSHIP_DELIMITER = "/";
- public static final String WSA_RELATIONSHIP_REPLY =
+ public static final String WSA_RELATIONSHIP_REPLY =
WSA_NAMESPACE_NAME + WSA_RELATIONSHIP_DELIMITER + WSA_REPLY_NAME;
-
+
public static final String WSA_RELATESTO_NAME = "RelatesTo";
public static final QName WSA_RELATESTO_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_RELATESTO_NAME);
public static final String WSA_RELATIONSHIPTYPE_NAME = "RelationshipType";
- public static final QName WSA_RELATIONSHIPTYPE_QNAME =
+ public static final QName WSA_RELATIONSHIPTYPE_QNAME =
new QName(WSA_NAMESPACE_NAME, WSA_RELATIONSHIPTYPE_NAME);
-
- public static final String WSA_ANONYMOUS_ADDRESS =
+
+ public static final String WSA_ANONYMOUS_ADDRESS =
WSA_NAMESPACE_NAME + "/anonymous";
public static final String WSA_NONE_ADDRESS =
WSA_NAMESPACE_NAME + "/none";
-
+
public static final String WSA_UNSPECIFIED_RELATIONSHIP =
WSA_NAMESPACE_NAME + "/unspecified";
@@ -109,37 +109,37 @@ public final class Names {
"/fault";
public static final String WSA_DEFAULT_FAULT_ACTION =
WSA_NAMESPACE_NAME + WSA_FAULT_DELIMITER;
-
+
public static final String WSAW_ACTION_NAME = "Action";
- public static final QName WSAW_ACTION_QNAME =
+ public static final QName WSAW_ACTION_QNAME =
new QName(WSA_NAMESPACE_WSDL_NAME, WSAW_ACTION_NAME);
-
+
public static final String WSAW_USING_ADDRESSING_NAME = "UsingAddressing";
- public static final QName WSAW_USING_ADDRESSING_QNAME =
+ public static final QName WSAW_USING_ADDRESSING_QNAME =
new QName(WSA_NAMESPACE_WSDL_NAME, WSAW_USING_ADDRESSING_NAME);
-
- public static final String WSDL_INSTANCE_NAMESPACE_NAME =
+
+ public static final String WSDL_INSTANCE_NAMESPACE_NAME =
"http://www.w3.org/2004/08/wsdl-instance";
public static final String INVALID_MAP_NAME =
- "InvalidMessageAddressingProperty";
- public static final QName INVALID_MAP_QNAME =
+ "InvalidMessageAddressingProperty";
+ public static final QName INVALID_MAP_QNAME =
new QName(WSA_NAMESPACE_NAME, INVALID_MAP_NAME);
public static final String MAP_REQUIRED_NAME =
"MessageAddressingPropertyRequired";
- public static final QName MAP_REQUIRED_QNAME =
+ public static final QName MAP_REQUIRED_QNAME =
new QName(WSA_NAMESPACE_NAME, MAP_REQUIRED_NAME);
public static final String DESTINATION_UNREACHABLE_NAME =
"DestinationUnreachable";
- public static final QName DESTINATION_UNREACHABLE_QNAME =
+ public static final QName DESTINATION_UNREACHABLE_QNAME =
new QName(WSA_NAMESPACE_NAME, DESTINATION_UNREACHABLE_NAME);
public static final String ACTION_NOT_SUPPORTED_NAME =
"ActionNotSupported";
- public static final QName ACTION_NOT_SUPPORTED_QNAME =
+ public static final QName ACTION_NOT_SUPPORTED_QNAME =
new QName(WSA_NAMESPACE_NAME, ACTION_NOT_SUPPORTED_NAME);
public static final String ENDPOINT_UNAVAILABLE_NAME =
"EndpointUnavailable";
- public static final QName ENDPOINT_UNAVAILABLE_QNAME =
+ public static final QName ENDPOINT_UNAVAILABLE_QNAME =
new QName(WSA_NAMESPACE_NAME, ENDPOINT_UNAVAILABLE_NAME);
public static final String DUPLICATE_MESSAGE_ID_NAME =
@@ -157,20 +157,20 @@ public final class Names {
public static final QName HEADER_REQUIRED_QNAME =
new QName(WSA_NAMESPACE_NAME, HEADER_REQUIRED_NAME);
- public static final String ONLY_ANONYMOUS_ADDRESS_SUPPORTED_NAME =
+ public static final String ONLY_ANONYMOUS_ADDRESS_SUPPORTED_NAME =
"OnlyAnonymousAddressSupported";
public static final QName ONLY_ANONYMOUS_ADDRESS_SUPPORTED_QNAME =
new QName(WSA_NAMESPACE_NAME, ONLY_ANONYMOUS_ADDRESS_SUPPORTED_NAME);
-
- public static final String ONLY_NONANONYMOUS_ADDRESS_SUPPORTED_NAME =
+
+ public static final String ONLY_NONANONYMOUS_ADDRESS_SUPPORTED_NAME =
"OnlyNonAnonymousAddressSupported";
public static final QName ONLY_NONANONYMOUS_ADDRESS_SUPPORTED_QNAME =
new QName(WSA_NAMESPACE_NAME, ONLY_NONANONYMOUS_ADDRESS_SUPPORTED_NAME);
-
+
public static final String INVALID_CARDINALITY_NAME = "InvalidCardinality";
public static final QName INVALID_CARDINALITY_QNAME = new QName(WSA_NAMESPACE_NAME,
INVALID_CARDINALITY_NAME);
-
+
/**
* The set of headers understood by the protocol binding.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
index 345fcac..77ec674 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/VersionTransformer.java
@@ -36,7 +36,7 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.common.jaxb.JAXBUtils;
-// importation convention: if the same class name is used for
+// importation convention: if the same class name is used for
// 2005/08 and 2004/08, then the former version is imported
// and the latter is fully qualified when used
import org.apache.cxf.helpers.DOMUtils;
@@ -47,7 +47,7 @@ import org.apache.cxf.ws.addressing.v200408.Relationship;
import org.apache.cxf.ws.addressing.v200408.ServiceNameType;
/**
- * This class is responsible for transforming between the native
+ * This class is responsible for transforming between the native
* WS-Addressing schema version (i.e. 2005/08) and exposed
* version (currently may be 2005/08 or 2004/08).
* <p>
@@ -55,51 +55,51 @@ import org.apache.cxf.ws.addressing.v200408.ServiceNameType;
* WS-A types are represented via the JAXB generated types for the
* 2005/08 schema.
* <p>
- * The exposed version is that used when the WS-A types are
- * externalized, i.e. are encoded in the headers of outgoing
- * messages. For outgoing requests, the exposed version is
+ * The exposed version is that used when the WS-A types are
+ * externalized, i.e. are encoded in the headers of outgoing
+ * messages. For outgoing requests, the exposed version is
* determined from configuration. For outgoing responses, the
* exposed version is determined by the exposed version of
* the corresponding request.
* <p>
* The motivation for using different native and exposed types
- * is usually to facilitate a WS-* standard based on an earlier
+ * is usually to facilitate a WS-* standard based on an earlier
* version of WS-Adressing (for example WS-RM depends on the
* 2004/08 version).
*/
public class VersionTransformer {
protected static final String NATIVE_VERSION = Names.WSA_NAMESPACE_NAME;
-
+
/**
* Constructor.
*/
protected VersionTransformer() {
}
-
+
/**
* @param namespace a namspace URI to consider
- * @return true if th WS-Addressing version specified by the namespace
+ * @return true if th WS-Addressing version specified by the namespace
* URI is supported
*/
public static boolean isSupported(String namespace) {
- return NATIVE_VERSION.equals(namespace)
+ return NATIVE_VERSION.equals(namespace)
|| Names200408.WSA_NAMESPACE_NAME.equals(namespace)
|| Names200403.WSA_NAMESPACE_NAME.equals(namespace);
}
-
+
/**
* Convert from 2005/08 AttributedURI to 2004/08 AttributedURI.
- *
+ *
* @param internal the 2005/08 AttributedURIType
* @return an equivalent 2004/08 AttributedURI
*/
public static AttributedURI convert(AttributedURIType internal) {
- AttributedURI exposed =
+ AttributedURI exposed =
Names200408.WSA_OBJECT_FACTORY.createAttributedURI();
String exposedValue =
Names.WSA_ANONYMOUS_ADDRESS.equals(internal.getValue())
- ? Names200408.WSA_ANONYMOUS_ADDRESS
+ ? Names200408.WSA_ANONYMOUS_ADDRESS
: Names.WSA_NONE_ADDRESS.equals(internal.getValue())
? Names200408.WSA_NONE_ADDRESS
: internal.getValue();
@@ -110,13 +110,13 @@ public class VersionTransformer {
/**
* Convert from 2005/08 AttributedURI to 2004/03 AttributedURI.
- *
+ *
* @param internal the 2005/08 AttributedURIType
* @return an equivalent 2004/08 or 2004/03 AttributedURI
*/
- public static org.apache.cxf.ws.addressing.v200403.AttributedURI
+ public static org.apache.cxf.ws.addressing.v200403.AttributedURI
convertTo200403(AttributedURIType internal) {
-
+
org.apache.cxf.ws.addressing.v200403.AttributedURI exposed = Names200403.WSA_OBJECT_FACTORY
.createAttributedURI();
String exposedValue = Names.WSA_ANONYMOUS_ADDRESS.equals(internal.getValue())
@@ -128,27 +128,27 @@ public class VersionTransformer {
}
/**
* Convert from 2004/08 AttributedURI to 2005/08 AttributedURI.
- *
+ *
* @param exposed the 2004/08 AttributedURI
* @return an equivalent 2005/08 AttributedURIType
*/
public static AttributedURIType convert(AttributedURI exposed) {
- AttributedURIType internal =
+ AttributedURIType internal =
ContextUtils.WSA_OBJECT_FACTORY.createAttributedURIType();
String internalValue =
Names200408.WSA_ANONYMOUS_ADDRESS.equals(exposed.getValue())
- ? Names.WSA_ANONYMOUS_ADDRESS
+ ? Names.WSA_ANONYMOUS_ADDRESS
: Names200408.WSA_NONE_ADDRESS.equals(exposed.getValue())
? Names.WSA_NONE_ADDRESS
: exposed.getValue();
internal.setValue(internalValue);
putAll(internal.getOtherAttributes(), exposed.getOtherAttributes());
- return internal;
+ return internal;
}
-
+
/**
* Convert from 2004/03 AttributedURI to 2005/08 AttributedURI.
- *
+ *
* @param exposed the 2004/03 AttributedURI
* @return an equivalent 2005/08 AttributedURIType
*/
@@ -160,12 +160,12 @@ public class VersionTransformer {
internal.setValue(internalValue);
putAll(internal.getOtherAttributes(), exposed.getOtherAttributes());
return internal;
- }
+ }
/**
- * Convert from 2005/08 EndpointReferenceType to 2004/08
+ * Convert from 2005/08 EndpointReferenceType to 2004/08
* EndpointReferenceType.
- *
+ *
* @param internal the 2005/08 EndpointReferenceType
* @return an equivalent 2004/08 EndpointReferenceType
*/
@@ -188,9 +188,9 @@ public class VersionTransformer {
String namespace = serviceQName.getNamespaceURI() != null
? serviceQName.getNamespaceURI()
: Names.WSDL_INSTANCE_NAMESPACE_NAME;
- QName portQName =
+ QName portQName =
new QName(namespace, portLocalName);
- AttributedQName portType =
+ AttributedQName portType =
Names200408.WSA_OBJECT_FACTORY.createAttributedQName();
portType.setValue(portQName);
exposed.setPortType(portType);
@@ -200,14 +200,14 @@ public class VersionTransformer {
putAll(exposed.getOtherAttributes(), internal.getOtherAttributes());
return exposed;
}
-
+
/**
* Convert from 2005/08 EndpointReferenceType to 2004/03 EndpointReferenceType.
- *
+ *
* @param internal the 2005/08 EndpointReferenceType
* @return an equivalent 2004/03 EndpointReferenceType
*/
- public static org.apache.cxf.ws.addressing.v200403.EndpointReferenceType
+ public static org.apache.cxf.ws.addressing.v200403.EndpointReferenceType
convertTo200403(EndpointReferenceType internal) {
org.apache.cxf.ws.addressing.v200403.EndpointReferenceType exposed = Names200403.WSA_OBJECT_FACTORY
.createEndpointReferenceType();
@@ -236,15 +236,15 @@ public class VersionTransformer {
return exposed;
}
/**
- * Convert from 2004/08 EndpointReferenceType to 2005/08
+ * Convert from 2004/08 EndpointReferenceType to 2005/08
* EndpointReferenceType.
- *
+ *
* @param exposed the 2004/08 EndpointReferenceType
* @return an equivalent 2005/08 EndpointReferenceType
*/
public static EndpointReferenceType convert(
org.apache.cxf.ws.addressing.v200408.EndpointReferenceType exposed) {
- EndpointReferenceType internal =
+ EndpointReferenceType internal =
ContextUtils.WSA_OBJECT_FACTORY.createEndpointReferenceType();
internal.setAddress(convert(exposed.getAddress()));
internal.setReferenceParameters(
@@ -252,7 +252,7 @@ public class VersionTransformer {
ServiceNameType serviceName = exposed.getServiceName();
AttributedQName portName = exposed.getPortType();
if (serviceName != null && portName != null) {
- EndpointReferenceUtils.setServiceAndPortName(internal,
+ EndpointReferenceUtils.setServiceAndPortName(internal,
serviceName.getValue(),
portName.getValue().getLocalPart());
}
@@ -260,12 +260,12 @@ public class VersionTransformer {
// no direct analogue for ReferenceProperties
addAll(internal.getAny(), exposed.getAny());
putAll(internal.getOtherAttributes(), exposed.getOtherAttributes());
- return internal;
+ return internal;
}
/**
* Convert from 2004/03 EndpointReferenceType to 2005/08 EndpointReferenceType.
- *
+ *
* @param exposed the 2004/03 EndpointReferenceType
* @return an equivalent 2005/08 EndpointReferenceType
*/
@@ -286,31 +286,31 @@ public class VersionTransformer {
addAll(internal.getAny(), exposed.getAny());
putAll(internal.getOtherAttributes(), exposed.getOtherAttributes());
return internal;
- }
-
+ }
+
/**
* Convert from 2005/08 ReferenceParametersType to 2004/08
* ReferenceParametersType.
- *
+ *
* @param internal the 2005/08 ReferenceParametersType
* @return an equivalent 2004/08 ReferenceParametersType
*/
public static org.apache.cxf.ws.addressing.v200408.ReferenceParametersType convert(
ReferenceParametersType internal) {
- org.apache.cxf.ws.addressing.v200408.ReferenceParametersType exposed =
+ org.apache.cxf.ws.addressing.v200408.ReferenceParametersType exposed =
null;
if (internal != null) {
exposed =
Names200408.WSA_OBJECT_FACTORY.createReferenceParametersType();
addAll(exposed.getAny(), internal.getAny());
}
- return exposed;
+ return exposed;
}
-
+
/**
* Convert from 2004/08 ReferenceParametersType to 2005/08
* ReferenceParametersType.
- *
+ *
* @param exposed the 2004/08 ReferenceParametersType
* @return an equivalent 2005/08 ReferenceParametersType
*/
@@ -318,17 +318,17 @@ public class VersionTransformer {
org.apache.cxf.ws.addressing.v200408.ReferenceParametersType exposed) {
ReferenceParametersType internal = null;
if (exposed != null) {
- internal =
+ internal =
ContextUtils.WSA_OBJECT_FACTORY.createReferenceParametersType();
addAll(internal.getAny(), exposed.getAny());
}
- return internal;
+ return internal;
}
// THERE IS NO ReferenceParametersType for 2004/03
/**
* Convert from 2005/08 RelatesToType to 2004/08 Relationship.
- *
+ *
* @param internal the 2005/08 RelatesToType
* @return an equivalent 2004/08 Relationship
*/
@@ -352,7 +352,7 @@ public class VersionTransformer {
/**
* Convert from 2005/08 RelatesToType to 2004/03 Relationship.
- *
+ *
* @param internal the 2005/08 RelatesToType
* @return an equivalent 2004/03 Relationship
*/
@@ -373,20 +373,20 @@ public class VersionTransformer {
}
return exposed;
}
-
+
/** Convert from 2004/08 Relationship to 2005/08 RelatesToType.
- *
+ *
* @param exposed the 2004/08 Relationship
* @return an equivalent 2005/08 RelatesToType
*/
- public static RelatesToType convert(Relationship exposed) {
+ public static RelatesToType convert(Relationship exposed) {
RelatesToType internal = null;
if (exposed != null) {
internal = ContextUtils.WSA_OBJECT_FACTORY.createRelatesToType();
internal.setValue(exposed.getValue());
QName exposedRelationshipType = exposed.getRelationshipType();
if (exposedRelationshipType != null) {
- String internalRelationshipType =
+ String internalRelationshipType =
Names.WSA_REPLY_NAME.equalsIgnoreCase(
exposedRelationshipType.getLocalPart())
? Names.WSA_RELATIONSHIP_REPLY
@@ -395,12 +395,12 @@ public class VersionTransformer {
}
internal.getOtherAttributes().putAll(exposed.getOtherAttributes());
}
- return internal;
+ return internal;
}
-
+
/**
* Convert from 2004/03 Relationship to 2005/08 RelatesToType.
- *
+ *
* @param exposed the 2004/03 Relationship
* @return an equivalent 2005/08 RelatesToType
*/
@@ -419,8 +419,8 @@ public class VersionTransformer {
}
return internal;
}
-
-
+
+
/**
* Parse an EndpointReferenceType from a DOM element. Handles all of
* the WS-Addressing namespaces currently supported.
@@ -464,7 +464,7 @@ public class VersionTransformer {
return convert((org.apache.cxf.ws.addressing.v200408.EndpointReferenceType)exposed);
} else if (Names200403.EPR_TYPE.isInstance(exposed)) {
return convert((org.apache.cxf.ws.addressing.v200403.EndpointReferenceType)exposed);
- }
+ }
return null;
}
@@ -475,11 +475,11 @@ public class VersionTransformer {
*/
public static Class<?> getExposedReferenceType(String exposedURI) {
return NATIVE_VERSION.equals(exposedURI)
- ? EndpointReferenceType.class
- : Names200408.WSA_NAMESPACE_NAME.equals(exposedURI) ? Names200408.EPR_TYPE
+ ? EndpointReferenceType.class
+ : Names200408.WSA_NAMESPACE_NAME.equals(exposedURI) ? Names200408.EPR_TYPE
: Names200403.WSA_NAMESPACE_NAME.equals(exposedURI) ? Names200403.EPR_TYPE : null;
}
-
+
/**
* @param exposedURI specifies the version WS-Addressing
* @return JABXContext for the exposed namespace URI
@@ -494,7 +494,7 @@ public class VersionTransformer {
/**
* Put all entries from one map into another.
- *
+ *
* @param to target map
* @param from source map
*/
@@ -506,7 +506,7 @@ public class VersionTransformer {
/**
* Add all entries from one list into another.
- *
+ *
* @param to target list
* @param from source list
*/
@@ -520,27 +520,27 @@ public class VersionTransformer {
* Holder for 2004/08 Names
*/
public static class Names200408 {
- public static final String WSA_NAMESPACE_NAME =
+ public static final String WSA_NAMESPACE_NAME =
"http://schemas.xmlsoap.org/ws/2004/08/addressing";
- public static final String WSA_ANONYMOUS_ADDRESS =
+ public static final String WSA_ANONYMOUS_ADDRESS =
WSA_NAMESPACE_NAME + "/role/anonymous";
public static final String WSA_NONE_ADDRESS =
WSA_NAMESPACE_NAME + "/role/none";
- public static final ObjectFactory WSA_OBJECT_FACTORY =
+ public static final ObjectFactory WSA_OBJECT_FACTORY =
new ObjectFactory();
- public static final Class<org.apache.cxf.ws.addressing.v200408.EndpointReferenceType> EPR_TYPE
+ public static final Class<org.apache.cxf.ws.addressing.v200408.EndpointReferenceType> EPR_TYPE
= org.apache.cxf.ws.addressing.v200408.EndpointReferenceType.class;
-
+
private static JAXBContext jaxbContext;
-
+
protected Names200408() {
}
-
+
/**
* Retrieve a JAXBContext for marshalling and unmarshalling JAXB generated
* types for the 2004/08 version.
*
- * @return a JAXBContext
+ * @return a JAXBContext
*/
public static JAXBContext getJAXBContext() throws JAXBException {
synchronized (Names200408.class) {
@@ -550,17 +550,17 @@ public class VersionTransformer {
}
return jaxbContext;
}
-
+
/**
* Set the encapsulated JAXBContext (used by unit tests).
- *
- * @param ctx JAXBContext
+ *
+ * @param ctx JAXBContext
*/
public static void setJAXBContext(JAXBContext ctx) throws JAXBException {
synchronized (Names200408.class) {
jaxbContext = ctx;
}
- }
+ }
}
/**
* Holder for 2004/03 Names
@@ -569,9 +569,9 @@ public class VersionTransformer {
public static final String WSA_NAMESPACE_NAME = "http://schemas.xmlsoap.org/ws/2004/03/addressing";
public static final String WSA_ANONYMOUS_ADDRESS = WSA_NAMESPACE_NAME + "/role/anonymous";
public static final String WSA_NONE_ADDRESS = WSA_NAMESPACE_NAME + "/role/none";
- public static final org.apache.cxf.ws.addressing.v200403.ObjectFactory WSA_OBJECT_FACTORY =
+ public static final org.apache.cxf.ws.addressing.v200403.ObjectFactory WSA_OBJECT_FACTORY =
new org.apache.cxf.ws.addressing.v200403.ObjectFactory();
- public static final Class<org.apache.cxf.ws.addressing.v200403.EndpointReferenceType> EPR_TYPE =
+ public static final Class<org.apache.cxf.ws.addressing.v200403.EndpointReferenceType> EPR_TYPE =
org.apache.cxf.ws.addressing.v200403.EndpointReferenceType.class;
private static JAXBContext jaxbContext;
@@ -582,7 +582,7 @@ public class VersionTransformer {
/**
* Retrieve a JAXBContext for marshalling and unmarshalling JAXB generated types for the 2004/08
* version.
- *
+ *
* @return a JAXBContext
*/
public static JAXBContext getJAXBContext() throws JAXBException {
@@ -596,7 +596,7 @@ public class VersionTransformer {
/**
* Set the encapsulated JAXBContext (used by unit tests).
- *
+ *
* @param ctx JAXBContext
*/
public static void setJAXBContext(JAXBContext ctx) throws JAXBException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java b/core/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java
index aa727e0..3c760bc 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/WSAContextUtils.java
@@ -33,7 +33,7 @@ public final class WSAContextUtils {
"org.apache.cxf.ws.addressing.decoupled.endpoint.base";
private static final String USING_PROPERTY =
- "org.apache.cxf.ws.addressing.using";
+ "org.apache.cxf.ws.addressing.using";
/**
* Prevents instantiation.
@@ -46,7 +46,7 @@ public final class WSAContextUtils {
*
* @param message the current message
* @return true if UsingAddressing should be overridden
- */
+ */
public static boolean retrieveUsingAddressing(Message message) {
Boolean override = (Boolean)message.get(USING_PROPERTY);
return override == null || override.booleanValue();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/ws/addressing/WSAddressingFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/ws/addressing/WSAddressingFeature.java b/core/src/main/java/org/apache/cxf/ws/addressing/WSAddressingFeature.java
index 7d81600..0f146c8 100644
--- a/core/src/main/java/org/apache/cxf/ws/addressing/WSAddressingFeature.java
+++ b/core/src/main/java/org/apache/cxf/ws/addressing/WSAddressingFeature.java
@@ -30,17 +30,17 @@ public class WSAddressingFeature extends AbstractFeature {
NON_ANONYMOUS,
ANONYMOUS,
}
-
+
public interface WSAddressingFeatureApplier {
void initializeProvider(WSAddressingFeature feature, InterceptorProvider provider, Bus bus);
}
-
+
boolean allowDuplicates = true;
boolean usingAddressingAdvisory = true;
boolean required;
MessageIdCache cache;
AddressingResponses responses = AddressingResponses.ALL;
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
bus.getExtension(WSAddressingFeatureApplier.class).initializeProvider(this, provider, bus);
@@ -49,7 +49,7 @@ public class WSAddressingFeature extends AbstractFeature {
public void setAllowDuplicates(boolean allow) {
allowDuplicates = allow;
}
-
+
public boolean isAllowDuplicates() {
return allowDuplicates;
}
@@ -57,19 +57,19 @@ public class WSAddressingFeature extends AbstractFeature {
public void setUsingAddressingAdvisory(boolean advisory) {
usingAddressingAdvisory = advisory;
}
-
+
public boolean isUsingAddressingAdvisory() {
return usingAddressingAdvisory;
}
-
+
public boolean isAddressingRequired() {
return required;
}
public void setAddressingRequired(boolean r) {
- required = r;
+ required = r;
}
-
+
/**
* Returns the cache used to enforce duplicate message IDs when
* {@link #isAllowDuplicates()} returns {@code false}.
@@ -101,5 +101,5 @@ public class WSAddressingFeature extends AbstractFeature {
public AddressingResponses getResponses() {
return responses;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/BusFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/BusFactoryTest.java b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
index 5268042..53ad06d 100644
--- a/core/src/test/java/org/apache/cxf/BusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/BusFactoryTest.java
@@ -26,19 +26,19 @@ import org.junit.Test;
public class BusFactoryTest extends Assert {
-
+
@After
public void tearDown() {
- System.clearProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME);
+ System.clearProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME);
}
-
+
@Test
public void testGetInstance() {
System.setProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME, TestBusFactory.class.getName());
BusFactory factory = BusFactory.newInstance();
assertTrue(factory instanceof TestBusFactory);
}
-
+
public static class TestBusFactory extends BusFactory {
public Bus createBus() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index 9d890dd..51eb3b5 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -51,20 +51,20 @@ import org.junit.Before;
import org.junit.Test;
public class AttachmentDeserializerTest extends Assert {
-
+
private MessageImpl msg;
-
+
@Before
public void setUp() throws Exception {
msg = new MessageImpl();
Exchange exchange = new ExchangeImpl();
msg.setExchange(exchange);
}
-
+
@Test
public void testNoBoundaryInCT() throws Exception {
//CXF-2623
- String message = "SomeHeader: foo\n"
+ String message = "SomeHeader: foo\n"
+ "------=_Part_34950_1098328613.1263781527359\n"
+ "Content-Type: text/xml; charset=UTF-8\n"
+ "Content-Transfer-Encoding: binary\n"
@@ -78,12 +78,12 @@ public class AttachmentDeserializerTest extends Assert {
+ "\n"
+ "<message>\n"
+ "------=_Part_34950_1098328613.1263781527359--";
-
+
Matcher m = Pattern.compile("^--(\\S*)$").matcher(message);
Assert.assertFalse(m.find());
m = Pattern.compile("^--(\\S*)$", Pattern.MULTILINE).matcher(message);
Assert.assertTrue(m.find());
-
+
msg = new MessageImpl();
msg.setContent(InputStream.class, new ByteArrayInputStream(message.getBytes(StandardCharsets.UTF_8)));
msg.put(Message.CONTENT_TYPE, "multipart/related");
@@ -91,7 +91,7 @@ public class AttachmentDeserializerTest extends Assert {
ad.initializeAttachments();
assertEquals(1, msg.getAttachments().size());
}
-
+
@Test
public void testLazyAttachmentCollection() throws Exception {
InputStream is = getClass().getResourceAsStream("mimedata2");
@@ -99,13 +99,13 @@ public class AttachmentDeserializerTest extends Assert {
+ "start=\"<so...@xfire.codehaus.org>\"; "
+ "start-info=\"text/xml; charset=utf-8\"; "
+ "boundary=\"----=_Part_4_701508.1145579811786\"";
-
+
msg.put(Message.CONTENT_TYPE, ct);
msg.setContent(InputStream.class, is);
-
+
AttachmentDeserializer deserializer = new AttachmentDeserializer(msg);
deserializer.initializeAttachments();
-
+
InputStream attBody = msg.getContent(InputStream.class);
assertTrue(attBody != is);
assertTrue(attBody instanceof DelegatingInputStream);
@@ -114,7 +114,7 @@ public class AttachmentDeserializerTest extends Assert {
List<String> cidlist = new ArrayList<>();
cidlist.add("xfire_logo.jpg");
cidlist.add("xfire_logo2.jpg");
-
+
for (Iterator<Attachment> it = msg.getAttachments().iterator(); it.hasNext();) {
Attachment a = it.next();
assertTrue(cidlist.remove(a.getId()));
@@ -124,7 +124,7 @@ public class AttachmentDeserializerTest extends Assert {
assertEquals(0, msg.getAttachments().size());
is.close();
}
-
+
@Test
public void testDeserializerMtom() throws Exception {
InputStream is = getClass().getResourceAsStream("mimedata");
@@ -132,41 +132,41 @@ public class AttachmentDeserializerTest extends Assert {
+ "start=\"<so...@xfire.codehaus.org>\"; "
+ "start-info=\"text/xml; charset=utf-8\"; "
+ "boundary=\"----=_Part_4_701508.1145579811786\"";
-
+
msg.put(Message.CONTENT_TYPE, ct);
msg.setContent(InputStream.class, is);
-
+
AttachmentDeserializer deserializer = new AttachmentDeserializer(msg);
deserializer.initializeAttachments();
-
+
InputStream attBody = msg.getContent(InputStream.class);
assertTrue(attBody != is);
assertTrue(attBody instanceof DelegatingInputStream);
-
+
Collection<Attachment> atts = msg.getAttachments();
assertNotNull(atts);
-
+
Iterator<Attachment> itr = atts.iterator();
assertTrue(itr.hasNext());
-
+
Attachment a = itr.next();
assertNotNull(a);
-
+
InputStream attIs = a.getDataHandler().getInputStream();
-
+
// check the cached output stream
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
IOUtils.copy(attBody, out);
assertTrue(out.toString().startsWith("<env:Envelope"));
}
-
+
// try streaming a character off the wire
assertEquals(255, attIs.read());
assertEquals(216, (char)attIs.read());
-
+
// Attachment invalid = atts.get("INVALID");
// assertNull(invalid.getDataHandler().getInputStream());
-//
+//
// assertTrue(attIs instanceof ByteArrayInputStream);
is.close();
}
@@ -216,7 +216,7 @@ public class AttachmentDeserializerTest extends Assert {
// assertTrue(attIs instanceof ByteArrayInputStream);
is.close();
}
-
+
@Test
public void testDeserializerSwA() throws Exception {
InputStream is = getClass().getResourceAsStream("swadata");
@@ -224,26 +224,26 @@ public class AttachmentDeserializerTest extends Assert {
+ "start=\"<86048FF3556694F7DA1918466DDF8143>\"; "
+ "boundary=\"----=_Part_0_14158819.1167275505862\"";
-
+
msg.put(Message.CONTENT_TYPE, ct);
msg.setContent(InputStream.class, is);
-
+
AttachmentDeserializer deserializer = new AttachmentDeserializer(msg);
deserializer.initializeAttachments();
-
+
InputStream attBody = msg.getContent(InputStream.class);
assertTrue(attBody != is);
assertTrue(attBody instanceof DelegatingInputStream);
-
+
Collection<Attachment> atts = msg.getAttachments();
assertNotNull(atts);
-
+
Iterator<Attachment> itr = atts.iterator();
assertTrue(itr.hasNext());
-
+
Attachment a = itr.next();
assertNotNull(a);
-
+
InputStream attIs = a.getDataHandler().getInputStream();
// check the cached output stream
@@ -251,7 +251,7 @@ public class AttachmentDeserializerTest extends Assert {
IOUtils.copy(attBody, out);
assertTrue(out.toString().startsWith("<?xml"));
}
-
+
// try streaming a character off the wire
assertTrue(attIs.read() == 'f');
assertTrue(attIs.read() == 'o');
@@ -263,40 +263,40 @@ public class AttachmentDeserializerTest extends Assert {
is.close();
}
-
+
@Test
public void testDeserializerSwAWithoutBoundryInContentType() throws Exception {
InputStream is = getClass().getResourceAsStream("swadata");
String ct = "multipart/related; type=\"text/xml\"; ";
-
+
msg.put(Message.CONTENT_TYPE, ct);
msg.setContent(InputStream.class, is);
-
+
AttachmentDeserializer deserializer = new AttachmentDeserializer(msg);
deserializer.initializeAttachments();
-
+
InputStream attBody = msg.getContent(InputStream.class);
assertTrue(attBody != is);
assertTrue(attBody instanceof DelegatingInputStream);
-
+
Collection<Attachment> atts = msg.getAttachments();
assertNotNull(atts);
-
+
Iterator<Attachment> itr = atts.iterator();
assertTrue(itr.hasNext());
-
+
Attachment a = itr.next();
assertNotNull(a);
-
+
InputStream attIs = a.getDataHandler().getInputStream();
-
+
// check the cached output stream
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
IOUtils.copy(attBody, out);
assertTrue(out.toString().startsWith("<?xml"));
}
-
+
// try streaming a character off the wire
assertTrue(attIs.read() == 'f');
assertTrue(attIs.read() == 'o');
@@ -305,11 +305,11 @@ public class AttachmentDeserializerTest extends Assert {
assertTrue(attIs.read() == 'a');
assertTrue(attIs.read() == 'r');
assertTrue(attIs.read() == -1);
-
+
assertFalse(itr.hasNext());
is.close();
}
-
+
@Test
public void testDeserializerWithCachedFile() throws Exception {
InputStream is = getClass().getResourceAsStream("mimedata");
@@ -317,39 +317,39 @@ public class AttachmentDeserializerTest extends Assert {
+ "start=\"<so...@xfire.codehaus.org>\"; "
+ "start-info=\"text/xml; charset=utf-8\"; "
+ "boundary=\"----=_Part_4_701508.1145579811786\"";
-
+
msg.put(Message.CONTENT_TYPE, ct);
msg.setContent(InputStream.class, is);
msg.put(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD, "10");
-
+
AttachmentDeserializer deserializer = new AttachmentDeserializer(msg);
deserializer.initializeAttachments();
-
+
InputStream attBody = msg.getContent(InputStream.class);
assertTrue(attBody != is);
assertTrue(attBody instanceof DelegatingInputStream);
-
+
Collection<Attachment> atts = msg.getAttachments();
assertNotNull(atts);
-
+
Iterator<Attachment> itr = atts.iterator();
assertTrue(itr.hasNext());
-
+
Attachment a = itr.next();
assertNotNull(a);
-
+
InputStream attIs = a.getDataHandler().getInputStream();
-
+
assertFalse(itr.hasNext());
-
+
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
IOUtils.copy(attIs, out);
assertTrue(out.size() > 1000);
}
is.close();
}
-
-
+
+
@Test
public void testSmallStream() throws Exception {
byte[] messageBytes = ("------=_Part_1\n\nJJJJ\n------=_Part_1\n\n"
@@ -362,13 +362,13 @@ public class AttachmentDeserializerTest extends Assert {
MimeBodyPartInputStream m = new MimeBodyPartInputStream(pushbackStream, "------=_Part_1".getBytes(),
2048);
-
+
assertEquals(10, m.read(new byte[1000]));
assertEquals(-1, m.read(new byte[1000]));
assertEquals(-1, m.read(new byte[1000]));
m.close();
}
-
+
@Test
public void testCXF2542() throws Exception {
StringBuilder buf = new StringBuilder();
@@ -387,7 +387,7 @@ public class AttachmentDeserializerTest extends Assert {
InputStream rawInputStream = new ByteArrayInputStream(buf.toString().getBytes());
MessageImpl message = new MessageImpl();
message.setContent(InputStream.class, rawInputStream);
- message.put(Message.CONTENT_TYPE,
+ message.put(Message.CONTENT_TYPE,
"multipart/related; type=\"application/xop+xml\"; "
+ "start=\"<so...@xfire.codehaus.org>\"; "
+ "start-info=\"text/xml\"; boundary=\"----=_Part_0_2180223.1203118300920\"");
@@ -399,7 +399,7 @@ public class AttachmentDeserializerTest extends Assert {
inputStreamWithoutAttachments.close();
rawInputStream.close();
}
-
+
@Test
public void imitateAttachmentInInterceptorForMessageWithMissingBoundary() throws Exception {
ByteArrayInputStream inputStream;
@@ -419,8 +419,8 @@ public class AttachmentDeserializerTest extends Assert {
.valueOf(AttachmentDeserializer.THRESHOLD));
- AttachmentDeserializer ad
- = new AttachmentDeserializer(message,
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
Collections.singletonList("multipart/mixed"));
ad.initializeAttachments();
@@ -446,10 +446,10 @@ public class AttachmentDeserializerTest extends Assert {
+ "------=_Part_1--").getBytes(StandardCharsets.UTF_8);
ByteArrayInputStream in = new ByteArrayInputStream(messageBytes) {
public int read(byte[] b, int off, int len) {
- return super.read(b, off, len >= 2 ? 2 : len);
+ return super.read(b, off, len >= 2 ? 2 : len);
}
};
-
+
Message message = new MessageImpl();
message.put(Message.CONTENT_TYPE, contentType);
message.setContent(InputStream.class, in);
@@ -459,12 +459,12 @@ public class AttachmentDeserializerTest extends Assert {
.valueOf(AttachmentDeserializer.THRESHOLD));
- AttachmentDeserializer ad
- = new AttachmentDeserializer(message,
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
Collections.singletonList("multipart/mixed"));
ad.initializeAttachments();
-
+
String s = getString(message.getContent(InputStream.class));
assertEquals("JJJJ", s.trim());
int count = 1;
@@ -475,7 +475,7 @@ public class AttachmentDeserializerTest extends Assert {
in.close();
}
-
+
private String getString(InputStream ins) throws Exception {
try (ByteArrayOutputStream bout = new ByteArrayOutputStream(100)) {
byte b[] = new byte[100];
@@ -490,13 +490,13 @@ public class AttachmentDeserializerTest extends Assert {
return bout.toString();
}
}
-
+
@Test
public void testCXF3383() throws Exception {
String contentType = "multipart/related; type=\"application/xop+xml\";"
- + " boundary=\"uuid:7a555f51-c9bb-4bd4-9929-706899e2f793\"; start="
+ + " boundary=\"uuid:7a555f51-c9bb-4bd4-9929-706899e2f793\"; start="
+ "\"<ro...@cxf.apache.org>\"; start-info=\"text/xml\"";
-
+
Message message = new MessageImpl();
message.put(Message.CONTENT_TYPE, contentType);
message.setContent(InputStream.class, getClass().getResourceAsStream("cxf3383.data"));
@@ -506,18 +506,18 @@ public class AttachmentDeserializerTest extends Assert {
.valueOf(AttachmentDeserializer.THRESHOLD));
- AttachmentDeserializer ad
- = new AttachmentDeserializer(message,
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
Collections.singletonList("multipart/related"));
-
+
ad.initializeAttachments();
-
-
+
+
for (int x = 1; x < 50; x++) {
String cid = "1882f79d-e20a-4b36-a222-7a75518cf395-" + x + "@cxf.apache.org";
DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
byte bts[] = new byte[1024];
-
+
InputStream ins = ds.getInputStream();
int count = 0;
int sz = ins.read(bts, 0, bts.length);
@@ -532,14 +532,14 @@ public class AttachmentDeserializerTest extends Assert {
}
}
-
+
@Test
public void testCXF3582() throws Exception {
String contentType = "multipart/related; type=\"application/xop+xml\"; "
+ "boundary=\"uuid:906fa67b-85f9-4ef5-8e3d-52416022d463\"; "
+ "start=\"<ro...@cxf.apache.org>\"; start-info=\"text/xml\"";
-
-
+
+
Message message = new MessageImpl();
message.put(Message.CONTENT_TYPE, contentType);
message.setContent(InputStream.class, getClass().getResourceAsStream("cxf3582.data"));
@@ -549,12 +549,12 @@ public class AttachmentDeserializerTest extends Assert {
.valueOf(AttachmentDeserializer.THRESHOLD));
- AttachmentDeserializer ad
- = new AttachmentDeserializer(message,
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
Collections.singletonList("multipart/related"));
-
+
ad.initializeAttachments();
-
+
String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
byte bts[] = new byte[1024];
@@ -580,8 +580,8 @@ public class AttachmentDeserializerTest extends Assert {
String contentType = "multipart/related; type=\"application/xop+xml\"; "
+ "boundary=\"uuid:906fa67b-85f9-4ef5-8e3d-52416022d463\"; "
+ "start=\"<ro...@cxf.apache.org>\"; start-info=\"text/xml\"";
-
-
+
+
Message message = new MessageImpl();
message.put(Message.CONTENT_TYPE, contentType);
message.setContent(InputStream.class, getClass().getResourceAsStream("cxf3582.data"));
@@ -591,12 +591,12 @@ public class AttachmentDeserializerTest extends Assert {
.valueOf(AttachmentDeserializer.THRESHOLD));
- AttachmentDeserializer ad
- = new AttachmentDeserializer(message,
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
Collections.singletonList("multipart/related"));
-
+
ad.initializeAttachments();
-
+
String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
byte bts[] = new byte[1024];
@@ -631,8 +631,8 @@ public class AttachmentDeserializerTest extends Assert {
String contentType = "multipart/related; type=\"application/xop+xml\"; "
+ "boundary=\"uuid:906fa67b-85f9-4ef5-8e3d-52416022d463\"; "
+ "start=\"<ro...@cxf.apache.org>\"; start-info=\"text/xml\"";
-
-
+
+
Message message = new MessageImpl();
message.put(Message.CONTENT_TYPE, contentType);
message.setContent(InputStream.class, getClass().getResourceAsStream("cxf3582.data"));
@@ -642,12 +642,12 @@ public class AttachmentDeserializerTest extends Assert {
.valueOf(AttachmentDeserializer.THRESHOLD));
- AttachmentDeserializer ad
- = new AttachmentDeserializer(message,
+ AttachmentDeserializer ad
+ = new AttachmentDeserializer(message,
Collections.singletonList("multipart/related"));
-
+
ad.initializeAttachments();
-
+
String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
byte bts[] = new byte[1024];
[41/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
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);
[07/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index 6abed2e..c2dde5e 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -184,8 +184,8 @@ public final class JAXBEncoderDecoder {
private JAXBEncoderDecoder() {
}
- public static void marshall(Marshaller marshaller,
- Object elValue,
+ public static void marshall(Marshaller marshaller,
+ Object elValue,
MessagePartInfo part,
Object source) {
try {
@@ -196,7 +196,7 @@ public final class JAXBEncoderDecoder {
} catch (javax.xml.bind.PropertyException e) {
// intentionally empty.
}
-
+
Class<?> cls = null;
if (part != null) {
cls = part.getTypeClass();
@@ -233,7 +233,7 @@ public final class JAXBEncoderDecoder {
} else if (part.getMessageInfo().getOperation().isUnwrapped()
&& (mObj.getClass().isArray() || mObj instanceof List)
&& el.getMaxOccurs() != 1) {
- writeArrayObject(marshaller,
+ writeArrayObject(marshaller,
source,
elName,
mObj);
@@ -247,8 +247,8 @@ public final class JAXBEncoderDecoder {
} else if (mObj instanceof JAXBElement) {
writeObject(marshaller, source, mObj);
} else if (marshaller.getSchema() != null) {
- //force xsi:type so types can be validated instead of trying to
- //use the RPC/lit element names that aren't in the schema
+ //force xsi:type so types can be validated instead of trying to
+ //use the RPC/lit element names that aren't in the schema
writeObject(marshaller, source, newJAXBElement(elName, Object.class, mObj));
} else {
writeObject(marshaller, source, newJAXBElement(elName, cls, mObj));
@@ -293,8 +293,8 @@ public final class JAXBEncoderDecoder {
if (source instanceof XMLStreamWriter) {
bridge.marshal(elValue, (XMLStreamWriter)source, am);
} else if (source instanceof OutputStream) {
- //the namespace is missing when marshal the xsd:QName type
- //to the OutputStream directly
+ //the namespace is missing when marshal the xsd:QName type
+ //to the OutputStream directly
java.io.StringWriter sw = new java.io.StringWriter();
StreamResult s1 = new StreamResult(sw);
bridge.marshal(elValue, s1);
@@ -316,7 +316,7 @@ public final class JAXBEncoderDecoder {
}
}
-
+
// TODO: cache the JAXBRIContext
public static Object unmarshalWithBridge(QName qname,
Class<?> cls,
@@ -324,13 +324,13 @@ public final class JAXBEncoderDecoder {
Set<Class<?>> ctxClasses,
Object source,
AttachmentUnmarshaller am) {
-
+
try {
JAXBUtils.BridgeWrapper bridge = JAXBUtils.createBridge(ctxClasses, qname, cls, anns);
-
+
if (source instanceof XMLStreamReader) {
//DOMUtils.writeXml(StaxUtils.read((XMLStreamReader)source), System.out);
- return bridge.unmarshal((XMLStreamReader)source, am);
+ return bridge.unmarshal((XMLStreamReader)source, am);
} else if (source instanceof InputStream) {
return bridge.unmarshal((InputStream)source);
} else if (source instanceof Node) {
@@ -349,7 +349,7 @@ public final class JAXBEncoderDecoder {
}
}
- }
+ }
public static void marshallException(Marshaller marshaller, Exception elValue,
MessagePartInfo part, Object source) {
@@ -361,7 +361,7 @@ public final class JAXBEncoderDecoder {
XmlAccessType accessType = Utils.getXmlAccessType(cls);
String namespace = part.getElementQName().getNamespaceURI();
String attNs = namespace;
-
+
SchemaInfo sch = part.getMessageInfo().getOperation().getInterface()
.getService().getSchema(namespace);
if (sch == null) {
@@ -388,7 +388,7 @@ public final class JAXBEncoderDecoder {
Object o = Utils.getFieldValue(f, elValue);
Document doc = DOMUtils.newDocument();
writeObject(marshaller, doc, newJAXBElement(fname, String.class, o));
-
+
if (attNs != null) {
writer.writeAttribute(attNs, fname.getLocalPart(),
DOMUtils.getAllContent(doc.getDocumentElement()));
@@ -407,7 +407,7 @@ public final class JAXBEncoderDecoder {
XmlAttribute at = m.getAnnotation(XmlAttribute.class);
QName mname = new QName(namespace, StringUtils.isEmpty(at.name()) ? name : at.name());
Document doc = DOMUtils.newDocument();
- Object o = Utils.getMethodValue(m, elValue);
+ Object o = Utils.getMethodValue(m, elValue);
writeObject(marshaller, doc, newJAXBElement(mname, String.class, o));
if (attNs != null) {
writer.writeAttribute(attNs, mname.getLocalPart(),
@@ -435,7 +435,7 @@ public final class JAXBEncoderDecoder {
if (JAXBSchemaInitializer.isArray(f.getGenericType())) {
writeArrayObject(marshaller, writer, fname, f.get(elValue));
} else {
- Object o = Utils.getFieldValue(f, elValue);
+ Object o = Utils.getFieldValue(f, elValue);
writeObject(marshaller, writer, newJAXBElement(fname, String.class, o));
}
} else { // it's a Method
@@ -447,7 +447,7 @@ public final class JAXBEncoderDecoder {
if (JAXBSchemaInitializer.isArray(m.getGenericReturnType())) {
writeArrayObject(marshaller, writer, mname, m.invoke(elValue));
} else {
- Object o = Utils.getMethodValue(m, elValue);
+ Object o = Utils.getMethodValue(m, elValue);
writeObject(marshaller, writer, newJAXBElement(mname, String.class, o));
}
}
@@ -461,8 +461,8 @@ public final class JAXBEncoderDecoder {
StaxUtils.close(writer);
}
}
-
- private static void writeArrayObject(Marshaller marshaller,
+
+ private static void writeArrayObject(Marshaller marshaller,
Object source,
QName mname,
Object mObj) throws Fault, JAXBException {
@@ -484,12 +484,12 @@ public final class JAXBEncoderDecoder {
int len = Array.getLength(objArray);
for (int x = 0; x < len; x++) {
Object o = Array.get(objArray, x);
- writeObject(marshaller, source,
+ writeObject(marshaller, source,
newJAXBElement(mname, cls == null ? o.getClass() : cls, o));
- }
+ }
}
- public static Exception unmarshallException(Unmarshaller u,
+ public static Exception unmarshallException(Unmarshaller u,
Object source,
MessagePartInfo part) {
XMLStreamReader reader;
@@ -594,7 +594,7 @@ public final class JAXBEncoderDecoder {
ReflectionUtil.setAccessible(fn);
fn.set(obj, o);
}
- }
+ }
}
if (reader.getEventType() == XMLStreamReader.END_ELEMENT && q.equals(reader.getName())) {
reader.next();
@@ -622,7 +622,7 @@ public final class JAXBEncoderDecoder {
if (source instanceof MarshallerAwareXMLWriter) {
((MarshallerAwareXMLWriter) source).setMarshaller(u);
}
-
+
u.marshal(mObj, (XMLEventWriter)source);
} else {
throw new Fault(new Message("UNKNOWN_SOURCE", LOG, source.getClass().getName()));
@@ -653,8 +653,8 @@ public final class JAXBEncoderDecoder {
}
- public static Object unmarshall(Unmarshaller u,
- Object source,
+ public static Object unmarshall(Unmarshaller u,
+ Object source,
MessagePartInfo part,
boolean unwrap) {
Class<?> clazz = part != null ? (Class<?>)part.getTypeClass() : null;
@@ -669,7 +669,7 @@ public final class JAXBEncoderDecoder {
XmlSchemaElement el = (XmlSchemaElement)part.getXmlSchema();
if (el.getSchemaType() instanceof XmlSchemaSimpleType
- && ((XmlSchemaSimpleType)el.getSchemaType()).getContent()
+ && ((XmlSchemaSimpleType)el.getSchemaType()).getContent()
instanceof XmlSchemaSimpleTypeList) {
Object obj = unmarshall(u, source, elName, null, unwrap);
@@ -719,7 +719,7 @@ public final class JAXBEncoderDecoder {
}
private static Object updateSourceWithXSIType(Object source, final QName typeQName) {
- if (source instanceof XMLStreamReader
+ if (source instanceof XMLStreamReader
&& typeQName != null) {
XMLStreamReader reader = (XMLStreamReader)source;
String type = reader.getAttributeValue(Constants.URI_2001_SCHEMA_XSI, "type");
@@ -742,7 +742,7 @@ public final class JAXBEncoderDecoder {
} catch (Exception e) {
c = new HashSet<>();
}
-
+
c.addAll(ret);
return c;
}
@@ -766,7 +766,7 @@ public final class JAXBEncoderDecoder {
private static List<Object> createList(MessagePartInfo part) {
Type genericType = (Type)part.getProperty("generic.type");
- return createList(genericType);
+ return createList(genericType);
}
private static List<Object> createList(Type genericType) {
if (genericType instanceof ParameterizedType) {
@@ -810,28 +810,28 @@ public final class JAXBEncoderDecoder {
final QName elName,
final Class<?> clazz,
final boolean unwrap) throws Exception {
-
+
Object obj = null;
boolean unmarshalWithClass = true;
if (clazz == null
- || (!clazz.isPrimitive()
- && !clazz.isArray()
- && !clazz.isEnum()
+ || (!clazz.isPrimitive()
+ && !clazz.isArray()
+ && !clazz.isEnum()
&& !clazz.equals(Calendar.class)
- && (Modifier.isAbstract(clazz.getModifiers())
+ && (Modifier.isAbstract(clazz.getModifiers())
|| Modifier.isInterface(clazz.getModifiers())))) {
unmarshalWithClass = false;
}
if (clazz != null
- && (clazz.getName().equals("javax.xml.datatype.XMLGregorianCalendar")
+ && (clazz.getName().equals("javax.xml.datatype.XMLGregorianCalendar")
|| clazz.getName().equals("javax.xml.datatype.Duration"))) {
// special treat two jaxb defined built-in abstract types
unmarshalWithClass = true;
}
if (source instanceof Node) {
- obj = unmarshalWithClass ? u.unmarshal((Node)source, clazz)
+ obj = unmarshalWithClass ? u.unmarshal((Node)source, clazz)
: u.unmarshal((Node)source);
} else if (source instanceof DepthXMLStreamReader) {
// JAXB optimizes a ton of stuff depending on the StreamReader impl. Thus,
@@ -839,15 +839,15 @@ public final class JAXBEncoderDecoder {
// as it doesn't read beyond the end so the DepthXMLStreamReader state
// would be OK when it returns. The main winner is FastInfoset where parsing
// a testcase I have goes from about 300/sec to well over 1000.
-
+
DepthXMLStreamReader dr = (DepthXMLStreamReader)source;
XMLStreamReader reader = dr.getReader();
-
+
// allows the XML Stream Reader to adjust it's behaviour based on the state of the unmarshaller
if (reader instanceof UnmarshallerAwareXMLReader) {
((UnmarshallerAwareXMLReader) reader).setUnmarshaller(u);
}
-
+
if (u.getSchema() != null) {
//validating, but we may need more namespaces
reader = findExtraNamespaces(reader);
@@ -856,12 +856,12 @@ public final class JAXBEncoderDecoder {
.unmarshal(dr.getReader());
} else if (source instanceof XMLStreamReader) {
XMLStreamReader reader = (XMLStreamReader)source;
-
+
// allows the XML Stream Reader to adjust it's behaviour based on the state of the unmarshaller
if (reader instanceof UnmarshallerAwareXMLReader) {
((UnmarshallerAwareXMLReader) reader).setUnmarshaller(u);
}
-
+
if (u.getSchema() != null) {
//validating, but we may need more namespaces
reader = findExtraNamespaces(reader);
@@ -873,7 +873,7 @@ public final class JAXBEncoderDecoder {
if (source instanceof UnmarshallerAwareXMLReader) {
((UnmarshallerAwareXMLReader) source).setUnmarshaller(u);
}
-
+
obj = unmarshalWithClass ? u.unmarshal((XMLEventReader)source, clazz) : u
.unmarshal((XMLEventReader)source);
} else if (source == null) {
@@ -902,34 +902,34 @@ public final class JAXBEncoderDecoder {
if (ex instanceof javax.xml.bind.UnmarshalException) {
javax.xml.bind.UnmarshalException unmarshalEx = (javax.xml.bind.UnmarshalException)ex;
if (unmarshalEx.getLinkedException() != null) {
- throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
+ throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
unmarshalEx.getLinkedException().getMessage()), ex);
} else {
- throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
- unmarshalEx.getMessage()), ex);
+ throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
+ unmarshalEx.getMessage()), ex);
}
}
throw new Fault(new Message("UNMARSHAL_ERROR", LOG, ex.getMessage()), ex);
- }
+ }
}
-
+
private static XMLStreamReader findExtraNamespaces(XMLStreamReader source) {
//due to a deficiency in the Stax API, there isn't a way to get all
//the namespace prefixes that are "valid" at this point. Thus, JAXB
//cannot set all the prefixes into the validator (which also doesn't allow
- //setting a NSContext, just allows declaring of prefixes) so resolving
- //prefixes and such will fail if they were declared on any of the parent
+ //setting a NSContext, just allows declaring of prefixes) so resolving
+ //prefixes and such will fail if they were declared on any of the parent
//elements.
//
//We'll use some reflection to grab the known namespaces from woodstox
//or the xerces parser and fake extra namespace decls on the root elements.
//slight performance penalty, but there already is a penalty if you are validating
//anyway.
-
+
NamespaceContext c = source.getNamespaceContext();
final Map<String, String> nsMap = new TreeMap<String, String>();
try {
- if (c instanceof W3CNamespaceContext) {
+ if (c instanceof W3CNamespaceContext) {
Element element = ((W3CNamespaceContext)c).getElement();
while (element != null) {
NamedNodeMap namedNodeMap = element.getAttributes();
@@ -944,7 +944,7 @@ public final class JAXBEncoderDecoder {
} else {
try {
//Woodstox version
- c = (NamespaceContext)c.getClass().getMethod("createNonTransientNsContext",
+ c = (NamespaceContext)c.getClass().getMethod("createNonTransientNsContext",
Location.class)
.invoke(c, new Object[1]);
} catch (Throwable t) {
@@ -983,7 +983,7 @@ public final class JAXBEncoderDecoder {
if (!nsMap.isEmpty()) {
for (int x = 0; x < source.getNamespaceCount(); x++) {
String pfx = source.getNamespacePrefix(x);
- if (pfx == null) {
+ if (pfx == null) {
nsMap.remove("");
} else {
nsMap.remove(pfx);
@@ -991,14 +991,14 @@ public final class JAXBEncoderDecoder {
}
if (!nsMap.isEmpty()) {
@SuppressWarnings("unchecked")
- final Map.Entry<String, String> namespaces[]
+ final Map.Entry<String, String> namespaces[]
= nsMap.entrySet().toArray(new Map.Entry[nsMap.size()]);
//OK. we have extra namespaces. We'll need to wrapper the reader
//with a new one that will fake extra namespace events
source = new DepthXMLStreamReader(source) {
public int getNamespaceCount() {
if (getDepth() == 0 && isStartElement()) {
- return super.getNamespaceCount() + nsMap.size();
+ return super.getNamespaceCount() + nsMap.size();
}
return super.getNamespaceCount();
}
@@ -1024,11 +1024,11 @@ public final class JAXBEncoderDecoder {
}
return super.getNamespaceURI(arg0);
}
-
+
};
}
}
-
+
return source;
}
@@ -1077,7 +1077,7 @@ public final class JAXBEncoderDecoder {
if (type != null) {
ret.add(type.getValue());
}
- while (reader.getEventType() != XMLStreamConstants.START_ELEMENT
+ while (reader.getEventType() != XMLStreamConstants.START_ELEMENT
&& reader.getEventType() != XMLStreamConstants.END_ELEMENT) {
reader.nextTag();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
index 8268c33..380942e 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
@@ -279,7 +279,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
static JAXBBeanInfo findFromTypeAdapter(JAXBContextProxy context,
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings("rawtypes")
Class<? extends XmlAdapter> aclass) {
Class<?> c2 = aclass;
Type sp = c2.getGenericSuperclass();
@@ -469,8 +469,8 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
}
}
-
-
+
+
private void buildExceptionType(MessagePartInfo part, Class<?> cls) {
SchemaInfo schemaInfo = null;
for (SchemaInfo s : serviceInfo.getSchemas()) {
@@ -484,22 +484,22 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
String[] propertyOrder = null;
boolean respectXmlTypeNS = false;
XmlSchema faultBeanSchema = null;
- if (xmlTypeAnno != null && !StringUtils.isEmpty(xmlTypeAnno.namespace())
+ if (xmlTypeAnno != null && !StringUtils.isEmpty(xmlTypeAnno.namespace())
&& !xmlTypeAnno.namespace().equals(part.getElementQName().getNamespaceURI())) {
respectXmlTypeNS = true;
NamespaceMap nsMap = new NamespaceMap();
nsMap.add(WSDLConstants.CONVENTIONAL_TNS_PREFIX, xmlTypeAnno.namespace());
nsMap.add(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NS_SCHEMA_XSD);
-
+
SchemaInfo faultBeanSchemaInfo = createSchemaIfNeeded(xmlTypeAnno.namespace(), nsMap);
- faultBeanSchema = faultBeanSchemaInfo.getSchema();
+ faultBeanSchema = faultBeanSchemaInfo.getSchema();
}
-
+
if (xmlTypeAnno != null && xmlTypeAnno.propOrder().length > 0) {
propertyOrder = xmlTypeAnno.propOrder();
//TODO: handle @XmlAccessOrder
}
-
+
XmlSchema schema = null;
if (schemaInfo == null) {
NamespaceMap nsMap = new NamespaceMap();
@@ -507,14 +507,14 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
nsMap.add(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NS_SCHEMA_XSD);
schemaInfo = createSchemaIfNeeded(part.getElementQName().getNamespaceURI(), nsMap);
- }
+ }
schema = schemaInfo.getSchema();
-
+
// Before updating everything, make sure we haven't added this
// type yet. Multiple methods that throw the same exception
// types will cause duplicates.
- String faultTypeName = xmlTypeAnno != null && !StringUtils.isEmpty(xmlTypeAnno.name())
+ String faultTypeName = xmlTypeAnno != null && !StringUtils.isEmpty(xmlTypeAnno.name())
? xmlTypeAnno.name() : part.getElementQName().getLocalPart();
XmlSchemaType existingType = schema.getTypeByName(faultTypeName);
if (existingType != null) {
@@ -525,11 +525,11 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
el.setName(part.getElementQName().getLocalPart());
part.setXmlSchema(el);
schemaInfo.setElement(null);
-
+
if (respectXmlTypeNS) {
schema = faultBeanSchema; //create complexType in the new created schema for xmlType
}
-
+
XmlSchemaComplexType ct = new XmlSchemaComplexType(schema, true);
ct.setName(faultTypeName);
@@ -568,7 +568,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
if ((type == null) && (m.getGenericReturnType() instanceof ParameterizedType)) {
type = m.getGenericReturnType();
}
-
+
if (generateGenericType(type)) {
buildGenericElements(schema, seq, m, type);
} else {
@@ -586,22 +586,22 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
if (Exception.class.isAssignableFrom(cls)) {
addExceptionMessage(cls, schema, seq);
}
-
+
if (propertyOrder != null) {
if (propertyOrder.length == seq.getItems().size()) {
sortItems(seq, propertyOrder);
- } else if (propertyOrder.length > 1
+ } else if (propertyOrder.length > 1
|| (propertyOrder.length == 1 && !propertyOrder[0].isEmpty())) {
- LOG.log(Level.WARNING, "propOrder in @XmlType doesn't define all schema elements :"
+ LOG.log(Level.WARNING, "propOrder in @XmlType doesn't define all schema elements :"
+ Arrays.toString(propertyOrder));
}
}
-
+
if (xmlAccessorOrder != null && xmlAccessorOrder.value().equals(XmlAccessOrder.ALPHABETICAL)
&& propertyOrder == null) {
sort(seq);
}
-
+
schemas.addCrossImports();
part.setProperty(JAXBDataBinding.class.getName() + ".CUSTOM_EXCEPTION", Boolean.TRUE);
}
@@ -622,7 +622,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
//ignore, just won't have the message element
}
}
-
+
private boolean generateGenericType(Type type) {
if (type instanceof ParameterizedType) {
ParameterizedType paramType = (ParameterizedType)type;
@@ -633,7 +633,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
}
return false;
}
-
+
private void buildGenericElements(XmlSchema schema, XmlSchemaSequence seq, Field f) {
XmlSchemaComplexType generics = new XmlSchemaComplexType(schema, true);
Type type = f.getGenericType();
@@ -642,7 +642,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
generics.setName(typeName);
Class<?> genericsClass = f.getType();
- buildGenericSeq(schema, generics, genericsClass);
+ buildGenericSeq(schema, generics, genericsClass);
String name = Character.toLowerCase(f.getName().charAt(0)) + f.getName().substring(1);
XmlSchemaElement newel = new XmlSchemaElement(schema, false);
@@ -653,20 +653,20 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
seq.getItems().add(newel);
}
}
-
- private void buildGenericElements(XmlSchema schema, XmlSchemaSequence seq, Method m, Type type) {
+
+ private void buildGenericElements(XmlSchema schema, XmlSchemaSequence seq, Method m, Type type) {
String rawType = ((ParameterizedType)type).getRawType().toString();
String typeName = StringUtils.uncapitalize(rawType.substring(rawType.lastIndexOf(".") + 1));
-
- XmlSchemaComplexType generics = (XmlSchemaComplexType)schema.getTypeByName(typeName);
+
+ XmlSchemaComplexType generics = (XmlSchemaComplexType)schema.getTypeByName(typeName);
if (generics == null) {
generics = new XmlSchemaComplexType(schema, true);
generics.setName(typeName);
}
-
+
Class<?> genericsClass = m.getReturnType();
- buildGenericSeq(schema, generics, genericsClass);
-
+ buildGenericSeq(schema, generics, genericsClass);
+
int idx = m.getName().startsWith("get") ? 3 : 2;
String name = m.getName().substring(idx);
name = Character.toLowerCase(name.charAt(0)) + name.substring(1);
@@ -678,19 +678,19 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
seq.getItems().add(newel);
}
}
-
+
private void buildGenericSeq(XmlSchema schema, XmlSchemaComplexType generics, Class<?> genericsClass) {
XmlSchemaSequence genericsSeq = new XmlSchemaSequence();
generics.setParticle(genericsSeq);
XmlAccessType accessType = Utils.getXmlAccessType(genericsClass);
-
+
for (Field f : Utils.getFields(genericsClass, accessType)) {
- if (f.getGenericType() instanceof TypeVariable) {
+ if (f.getGenericType() instanceof TypeVariable) {
String genericName = Character.toLowerCase(f.getName().charAt(0)) + f.getName().substring(1);
XmlSchemaElement genericEle = new XmlSchemaElement(schema, false);
genericEle.setName(genericName);
genericEle.setMinOccurs(0);
- JAXBBeanInfo anyBean = getBeanInfo(context, f.getType());
+ JAXBBeanInfo anyBean = getBeanInfo(context, f.getType());
Iterator<QName> itr = anyBean.getTypeNames().iterator();
if (!itr.hasNext()) {
return;
@@ -700,7 +700,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
genericsSeq.getItems().add(genericEle);
}
}
-
+
for (Method genericMethod : Utils.getGetters(genericsClass, accessType)) {
if (genericMethod.getGenericReturnType() instanceof TypeVariable) {
int idx = genericMethod.getName().startsWith("get") ? 3 : 2;
@@ -709,7 +709,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
XmlSchemaElement genericEle = new XmlSchemaElement(schema, false);
genericEle.setName(genericName);
genericEle.setMinOccurs(0);
- JAXBBeanInfo anyBean = getBeanInfo(context, genericMethod.getReturnType());
+ JAXBBeanInfo anyBean = getBeanInfo(context, genericMethod.getReturnType());
Iterator<QName> itr = anyBean.getTypeNames().iterator();
if (!itr.hasNext()) {
return;
@@ -718,11 +718,11 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
genericEle.setSchemaTypeName(typeName);
genericsSeq.getItems().add(genericEle);
}
-
- }
+
+ }
}
-
-
+
+
static boolean isArray(Type cls) {
if (cls instanceof Class) {
return ((Class<?>)cls).isArray();
@@ -777,7 +777,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
seq.getItems().add(el);
}
-
+
private SchemaInfo createSchemaIfNeeded(String namespace, NamespaceMap nsMap) {
SchemaInfo schemaInfo = serviceInfo.getSchema(namespace);
if (schemaInfo == null) {
@@ -799,7 +799,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
private boolean isExistSchemaElement(XmlSchema schema, QName qn) {
return schema.getElementByName(qn) != null;
}
-
+
private void sortItems(final XmlSchemaSequence seq, final String[] propertyOrder) {
final List<String> propList = Arrays.asList(propertyOrder);
Collections.sort(seq.getItems(), new Comparator<XmlSchemaSequenceMember>() {
@@ -810,7 +810,7 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
int index2 = propList.indexOf(element2.getName());
return index1 - index2;
}
-
+
});
}
//sort to Alphabetical order
@@ -821,8 +821,8 @@ class JAXBSchemaInitializer extends ServiceModelVisitor {
XmlSchemaElement element2 = (XmlSchemaElement)o2;
return element1.getName().compareTo(element2.getName());
}
-
+
});
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
index 8f252c3..7546355 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBWrapperHelper.java
@@ -28,40 +28,40 @@ import javax.xml.bind.JAXBElement;
import org.apache.cxf.databinding.AbstractWrapperHelper;
/**
- *
+ *
*/
public class JAXBWrapperHelper extends AbstractWrapperHelper {
- protected final Method jaxbObjectMethods[];
+ protected final Method jaxbObjectMethods[];
protected final Object objectFactory;
protected JAXBWrapperHelper(Class<?> wt, Method[] sets, Method[] gets,
Method jaxbs[], Field[] f, Object of) {
super(wt, sets, gets, f);
jaxbObjectMethods = jaxbs;
- objectFactory = of;
+ objectFactory = of;
}
@Override
- protected Object createWrapperObject(Class<?> typeClass) throws Exception {
+ protected Object createWrapperObject(Class<?> typeClass) throws Exception {
return typeClass.newInstance();
}
-
+
@Override
protected Object getWrapperObject(Object object) {
return object;
}
-
+
@Override
protected Object getValue(Method method, Object in) throws IllegalAccessException,
InvocationTargetException {
if ("javax.xml.bind.JAXBElement".equals(method.getReturnType().getCanonicalName())) {
JAXBElement<?> je = (JAXBElement<?>)method.invoke(in);
return je == null ? je : je.getValue();
- } else {
- return method.invoke(in);
+ } else {
+ return method.invoke(in);
}
}
-
+
@Override
protected Object getPartObject(int index, Object object) throws Exception {
Object result = object;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
index 2af2605..b2d24fa 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/Utils.java
@@ -42,7 +42,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
final class Utils {
private Utils() {
}
-
+
static XmlAccessType getXmlAccessType(Class<?> cls) {
XmlAccessorType accessorType = cls.getAnnotation(XmlAccessorType.class);
if (accessorType == null && cls.getPackage() != null) {
@@ -75,7 +75,7 @@ final class Utils {
private static Collection<Method> getMethods(Class<?> cls, XmlAccessType accessType, boolean acceptSetters) {
return getMethodsInternal(cls, accessType, acceptSetters);
}
-
+
private static Collection<Method> getMethodsInternal(Class<?> cls, XmlAccessType accessType,
boolean acceptSetters) {
Set<Method> methods = new HashSet<>();
@@ -92,7 +92,7 @@ final class Utils {
}
return methods;
}
-
+
static Method getMethod(Class<?> cls, XmlAccessType accessType, String methodName,
Class<?>... paramTypes) {
for (Method m : getMethods(cls, accessType, true)) {
@@ -102,7 +102,7 @@ final class Utils {
}
return null;
}
-
+
static Field getField(Class<?> cls, XmlAccessType accessType, String fieldName) {
for (final Field f : getFields(cls, accessType)) {
if (f.getName().equals(fieldName)) {
@@ -111,7 +111,7 @@ final class Utils {
}
return null;
}
-
+
static Collection<Method> getGetters(Class<?> cls, XmlAccessType accessType) {
return getMethods(cls, accessType, false);
}
@@ -126,7 +126,7 @@ final class Utils {
return false;
}
// Allow only public methods if PUBLIC_MEMBER access is requested
- if (accessType == XmlAccessType.PUBLIC_MEMBER && !Modifier.isPublic(method.getModifiers())) {
+ if (accessType == XmlAccessType.PUBLIC_MEMBER && !Modifier.isPublic(method.getModifiers())) {
return false;
}
if (isGetter(method)) {
@@ -146,7 +146,7 @@ final class Utils {
// method accepted
return true;
}
-
+
private static boolean isGetter(Method m) {
if (m.getReturnType() != Void.class && m.getReturnType() != Void.TYPE && m.getParameterTypes().length == 0) {
Method setter = getSetter(m);
@@ -169,10 +169,10 @@ final class Utils {
}
return null;
}
-
+
private static boolean isSetter(Method m) {
Class<?> declaringClass = m.getDeclaringClass();
- boolean isVoidReturnType = m.getReturnType() == Void.class || m.getReturnType() == Void.TYPE;
+ boolean isVoidReturnType = m.getReturnType() == Void.class || m.getReturnType() == Void.TYPE;
if (isVoidReturnType && m.getParameterTypes().length == 1 && m.getName().startsWith("set")) {
String getterName = "get" + m.getName().substring(3);
Class<?> setterParamType = m.getParameterTypes()[0];
@@ -218,7 +218,7 @@ final class Utils {
// if there is no adapter, yet we have a collection make sure
// we return the Generic type; if there is an annotation let the
// adapter handle what gets populated
- if (adapter == null && m.getGenericReturnType() instanceof ParameterizedType
+ if (adapter == null && m.getGenericReturnType() instanceof ParameterizedType
&& ((ParameterizedType)m.getGenericReturnType()).getActualTypeArguments().length < 2) {
return null;
}
@@ -230,14 +230,14 @@ final class Utils {
static Object getFieldValue(Field f, Object target) throws Exception {
XmlJavaTypeAdapter adapterAnnotation = getFieldXJTA(f);
XmlAdapter adapter = getXmlAdapter(adapterAnnotation);
- return adapter != null ? adapter.marshal(f.get(target)) : f.get(target);
+ return adapter != null ? adapter.marshal(f.get(target)) : f.get(target);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
static Object getMethodValue(Method m, Object target) throws Exception {
XmlJavaTypeAdapter adapterAnnotation = getMethodXJTA(m);
XmlAdapter adapter = getXmlAdapter(adapterAnnotation);
- return adapter != null ? adapter.marshal(m.invoke(target)) : m.invoke(target);
+ return adapter != null ? adapter.marshal(m.invoke(target)) : m.invoke(target);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -254,7 +254,7 @@ final class Utils {
setter.invoke(target, adapter != null ? adapter.unmarshal(value) : value);
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings("rawtypes")
static XmlAdapter getXmlAdapter(XmlJavaTypeAdapter adapterAnnotation)
throws InstantiationException, IllegalAccessException {
return adapterAnnotation != null ? adapterAnnotation.value().newInstance() : null;
@@ -303,7 +303,7 @@ final class Utils {
}
return adapter;
}
-
+
static Type getTypeFromXmlAdapter(XmlJavaTypeAdapter xjta) {
if (xjta != null) {
Class<?> c2 = xjta.value();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
index c401ee0..70613a2 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
@@ -28,8 +28,8 @@ import org.apache.cxf.common.util.ASMHelper;
import org.apache.cxf.databinding.WrapperHelper;
final class WrapperHelperCompiler extends ASMHelper {
-
-
+
+
final Class<?> wrapperType;
final Method setMethods[];
final Method getMethods[];
@@ -66,17 +66,17 @@ final class WrapperHelperCompiler extends ASMHelper {
jaxbMethods,
fields,
objectFactory).compile();
-
+
} catch (Throwable t) {
// Some error - probably a bad version of ASM or similar
}
return null;
}
-
-
-
-
+
+
+
+
public WrapperHelper compile() {
if (cw == null) {
return null;
@@ -103,16 +103,16 @@ final class WrapperHelperCompiler extends ASMHelper {
return null;
}
}
-
-
-
+
+
+
cw.visit(Opcodes.V1_5,
Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER,
newClassName,
null,
"java/lang/Object",
new String[] {periodToSlashes(WrapperHelper.class.getName())});
-
+
addConstructor(newClassName, objectFactory == null ? null : objectFactory.getClass());
boolean b = addSignature();
if (b) {
@@ -122,11 +122,11 @@ final class WrapperHelperCompiler extends ASMHelper {
if (b) {
b = addGetWrapperParts(newClassName, wrapperType);
}
-
+
try {
if (b) {
cw.visitEnd();
- byte bt[] = cw.toByteArray();
+ byte bt[] = cw.toByteArray();
Class<?> cl = loadClass(newClassName.replace('/', '.'), wrapperType, bt);
Object o = cl.newInstance();
return WrapperHelper.class.cast(o);
@@ -136,7 +136,7 @@ final class WrapperHelperCompiler extends ASMHelper {
}
return null;
}
-
+
private String computeSignature() {
StringBuilder b = new StringBuilder();
b.append(setMethods.length).append(':');
@@ -145,12 +145,12 @@ final class WrapperHelperCompiler extends ASMHelper {
b.append("null,");
} else {
b.append(getMethods[x].getName()).append('/');
- b.append(getMethods[x].getReturnType().getName()).append(',');
+ b.append(getMethods[x].getReturnType().getName()).append(',');
}
}
return b.toString();
}
-
+
private boolean addSignature() {
String sig = computeSignature();
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
@@ -166,9 +166,9 @@ final class WrapperHelperCompiler extends ASMHelper {
return true;
}
- private void addConstructor(String newClassName,
+ private void addConstructor(String newClassName,
Class<?> objectFactoryCls) {
-
+
if (objectFactoryCls != null) {
String ofName = "L" + periodToSlashes(objectFactoryCls.getName()) + ";";
FieldVisitor fv = cw.visitField(0, "factory",
@@ -176,13 +176,13 @@ final class WrapperHelperCompiler extends ASMHelper {
null, null);
fv.visitEnd();
}
-
+
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
mv.visitCode();
Label l0 = createLabel();
mv.visitLabel(l0);
mv.visitLineNumber(102, l0);
-
+
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
"java/lang/Object",
@@ -197,10 +197,10 @@ final class WrapperHelperCompiler extends ASMHelper {
"<init>", "()V", false);
mv.visitFieldInsn(Opcodes.PUTFIELD, periodToSlashes(newClassName),
"factory", "L" + periodToSlashes(objectFactoryCls.getName()) + ";");
- }
-
+ }
+
mv.visitInsn(Opcodes.RETURN);
-
+
Label l1 = createLabel();
mv.visitLabel(l1);
mv.visitLineNumber(103, l0);
@@ -209,10 +209,10 @@ final class WrapperHelperCompiler extends ASMHelper {
mv.visitMaxs(0, 0);
mv.visitEnd();
}
-
+
private boolean addCreateWrapperObject(String newClassName,
Class<?> objectFactoryClass) {
-
+
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
"createWrapperObject",
"(Ljava/util/List;)Ljava/lang/Object;",
@@ -230,9 +230,9 @@ final class WrapperHelperCompiler extends ASMHelper {
mv.visitMethodInsn(Opcodes.INVOKESPECIAL, periodToSlashes(wrapperType.getName()),
"<init>", "()V", false);
mv.visitVarInsn(Opcodes.ASTORE, 2);
-
+
for (int x = 0; x < setMethods.length; x++) {
- if (getMethods[x] == null) {
+ if (getMethods[x] == null) {
if (setMethods[x] == null
&& fields[x] == null) {
// null placeholder
@@ -242,11 +242,11 @@ final class WrapperHelperCompiler extends ASMHelper {
}
}
Class<?> tp = getMethods[x].getReturnType();
- mv.visitVarInsn(Opcodes.ALOAD, 2);
-
+ mv.visitVarInsn(Opcodes.ALOAD, 2);
+
if (List.class.isAssignableFrom(tp)) {
doCollection(mv, x);
- } else {
+ } else {
if (JAXBElement.class.isAssignableFrom(tp)) {
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitFieldInsn(Opcodes.GETFIELD, periodToSlashes(newClassName),
@@ -256,14 +256,14 @@ final class WrapperHelperCompiler extends ASMHelper {
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitIntInsn(Opcodes.SIPUSH, x);
mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "get", "(I)Ljava/lang/Object;", true);
-
+
if (tp.isPrimitive()) {
mv.visitTypeInsn(Opcodes.CHECKCAST, NONPRIMITIVE_MAP.get(tp));
Label l45 = createLabel();
Label l46 = createLabel();
mv.visitInsn(Opcodes.DUP);
mv.visitJumpInsn(Opcodes.IFNULL, l45);
- mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, NONPRIMITIVE_MAP.get(tp),
+ mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, NONPRIMITIVE_MAP.get(tp),
tp.getName() + "Value", "()" + PRIMITIVE_MAP.get(tp), false);
mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
periodToSlashes(wrapperType.getName()),
@@ -281,7 +281,7 @@ final class WrapperHelperCompiler extends ASMHelper {
mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
periodToSlashes(wrapperType.getName()),
setMethods[x].getName(), "(" + getClassCode(tp) + ")V", false);
- } else if (tp.isArray()) {
+ } else if (tp.isArray()) {
mv.visitTypeInsn(Opcodes.CHECKCAST, getClassCode(tp));
mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
periodToSlashes(wrapperType.getName()),
@@ -294,10 +294,10 @@ final class WrapperHelperCompiler extends ASMHelper {
}
}
}
-
+
mv.visitVarInsn(Opcodes.ALOAD, 2);
mv.visitInsn(Opcodes.ARETURN);
-
+
Label lEnd = createLabel();
mv.visitLabel(lEnd);
mv.visitLocalVariable("this", "L" + newClassName + ";", null, lBegin, lEnd, 0);
@@ -308,7 +308,7 @@ final class WrapperHelperCompiler extends ASMHelper {
mv.visitEnd();
return true;
}
-
+
private void doCollection(MethodVisitor mv, int x) {
// List aVal = obj.getA();
// List newA = (List)lst.get(99);
@@ -317,7 +317,7 @@ final class WrapperHelperCompiler extends ASMHelper {
// } else if (newA != null) {
// aVal.addAll(newA);
// }
-
+
Label l3 = createLabel();
mv.visitLabel(l3);
mv.visitLineNumber(114, l3);
@@ -370,39 +370,39 @@ final class WrapperHelperCompiler extends ASMHelper {
mv.visitLabel(jumpOverLabel);
mv.visitLineNumber(107, jumpOverLabel);
}
-
+
private boolean addGetWrapperParts(String newClassName,
Class<?> wrapperClass) {
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
"getWrapperParts",
"(Ljava/lang/Object;)Ljava/util/List;",
- "(Ljava/lang/Object;)Ljava/util/List<Ljava/lang/Object;>;",
+ "(Ljava/lang/Object;)Ljava/util/List<Ljava/lang/Object;>;",
new String[] {
- "org/apache/cxf/interceptor/Fault"
+ "org/apache/cxf/interceptor/Fault"
});
mv.visitCode();
Label lBegin = createLabel();
mv.visitLabel(lBegin);
mv.visitLineNumber(108, lBegin);
-
+
// the ret List
mv.visitTypeInsn(Opcodes.NEW, "java/util/ArrayList");
mv.visitInsn(Opcodes.DUP);
mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/util/ArrayList", "<init>", "()V", false);
mv.visitVarInsn(Opcodes.ASTORE, 2);
-
+
// cast the Object to the wrapperType type
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitTypeInsn(Opcodes.CHECKCAST, periodToSlashes(wrapperClass.getName()));
mv.visitVarInsn(Opcodes.ASTORE, 3);
-
+
for (int x = 0; x < getMethods.length; x++) {
Method method = getMethods[x];
if (method == null && fields[x] != null) {
// fallback to reflection mode
return false;
}
-
+
if (method == null) {
Label l3 = createLabel();
mv.visitLabel(l3);
@@ -417,12 +417,12 @@ final class WrapperHelperCompiler extends ASMHelper {
Label l3 = createLabel();
mv.visitLabel(l3);
mv.visitLineNumber(250 + x, l3);
-
+
mv.visitVarInsn(Opcodes.ALOAD, 2);
mv.visitVarInsn(Opcodes.ALOAD, 3);
- mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
- periodToSlashes(wrapperClass.getName()),
- method.getName(),
+ mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL,
+ periodToSlashes(wrapperClass.getName()),
+ method.getName(),
getMethodSignature(method), false);
if (method.getReturnType().isPrimitive()) {
// wrap into Object type
@@ -438,20 +438,20 @@ final class WrapperHelperCompiler extends ASMHelper {
"getValue", "()Ljava/lang/Object;", false);
mv.visitLabel(jumpOverLabel);
}
-
+
mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "add", "(Ljava/lang/Object;)Z", true);
mv.visitInsn(Opcodes.POP);
}
}
-
+
// return the list
Label l2 = createLabel();
mv.visitLabel(l2);
mv.visitLineNumber(108, l2);
mv.visitVarInsn(Opcodes.ALOAD, 2);
mv.visitInsn(Opcodes.ARETURN);
-
-
+
+
Label lEnd = createLabel();
mv.visitLabel(lEnd);
mv.visitLocalVariable("this", "L" + newClassName + ";", null, lBegin, lEnd, 0);
@@ -464,13 +464,13 @@ final class WrapperHelperCompiler extends ASMHelper {
mv.visitEnd();
return true;
}
-
-
+
+
private static void createObjectWrapper(MethodVisitor mv, Class<?> cl) {
mv.visitMethodInsn(Opcodes.INVOKESTATIC, NONPRIMITIVE_MAP.get(cl),
- "valueOf", "(" + PRIMITIVE_MAP.get(cl) + ")L"
+ "valueOf", "(" + PRIMITIVE_MAP.get(cl) + ")L"
+ NONPRIMITIVE_MAP.get(cl) + ";", false);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java
index cc6d162..40c6156 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentMarshaller.java
@@ -45,14 +45,14 @@ public class JAXBAttachmentMarshaller extends AttachmentMarshaller {
atts = attachments;
isXop = attachments != null;
}
-
+
public QName getLastMTOMElementName() {
return lastElementName;
}
public String addMtomAttachment(byte[] data, int offset, int length, String mimeType, String elementNS,
String elementLocalName) {
-
+
Attachment att = AttachmentUtil.createMtomAttachment(
isXop, mimeType, elementNS, data, offset, length, threshold);
if (att != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
index ae5b9ab..709b3bd 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentSchemaValidationHack.java
@@ -35,21 +35,21 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
public final class JAXBAttachmentSchemaValidationHack extends AbstractPhaseInterceptor<Message> {
- public static final JAXBAttachmentSchemaValidationHack INSTANCE
+ public static final JAXBAttachmentSchemaValidationHack INSTANCE
= new JAXBAttachmentSchemaValidationHack();
- private static final String SAVED_DATASOURCES
+ private static final String SAVED_DATASOURCES
= JAXBAttachmentSchemaValidationHack.class.getName() + ".SAVED_DATASOURCES";
private JAXBAttachmentSchemaValidationHack() {
super(Phase.POST_PROTOCOL);
}
-
+
public void handleMessage(Message message) throws Fault {
// This assumes that this interceptor is only use in IN / IN Fault chains.
- if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message)
+ if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message)
&& message.getAttachments() != null) {
Collection<AttachmentDataSource> dss = new ArrayList<>();
for (Attachment at : message.getAttachments()) {
@@ -69,10 +69,10 @@ public final class JAXBAttachmentSchemaValidationHack extends AbstractPhaseInter
}
}
}
-
+
static class EndingInterceptor extends AbstractPhaseInterceptor<Message> {
static final EndingInterceptor INSTANCE = new EndingInterceptor();
-
+
EndingInterceptor() {
super(Phase.PRE_LOGICAL);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentUnmarshaller.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentUnmarshaller.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentUnmarshaller.java
index 2a434cb..1aba2b3 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentUnmarshaller.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/attachment/JAXBAttachmentUnmarshaller.java
@@ -38,7 +38,7 @@ public class JAXBAttachmentUnmarshaller extends AttachmentUnmarshaller {
private static final Logger LOG = LogUtils.getL7dLogger(JAXBAttachmentUnmarshaller.class);
private Collection<Attachment> attachments;
-
+
public JAXBAttachmentUnmarshaller(Collection<Attachment> attachments) {
super();
this.attachments = attachments;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
index fc01732..10da669 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
@@ -51,7 +51,7 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
boolean unwrapJAXBElement = true;
ValidationEventHandler veventHandler;
boolean setEventHandler = true;
-
+
public DataReaderImpl(JAXBDataBinding binding, boolean unwrap) {
super(binding.getContext());
unwrapJAXBElement = unwrap;
@@ -61,31 +61,31 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
public Object read(T input) {
return read(null, input);
}
-
+
private static class WSUIDValidationHandler implements ValidationEventHandler {
ValidationEventHandler origHandler;
WSUIDValidationHandler(ValidationEventHandler o) {
origHandler = o;
}
-
+
public boolean handleEvent(ValidationEvent event) {
// if the original handler has already handled the event, no need for us
- // to do anything, otherwise if not yet handled, then do this 'hack'
+ // to do anything, otherwise if not yet handled, then do this 'hack'
if (origHandler != null && origHandler.handleEvent(event)) {
return true;
} else {
// hack for CXF-3453
String msg = event.getMessage();
- return msg != null
- && msg.contains(":Id")
- && (msg.startsWith("cvc-type.3.1.1")
- || msg.startsWith("cvc-type.3.2.2")
+ return msg != null
+ && msg.contains(":Id")
+ && (msg.startsWith("cvc-type.3.1.1")
+ || msg.startsWith("cvc-type.3.2.2")
|| msg.startsWith("cvc-complex-type.3.1.1")
|| msg.startsWith("cvc-complex-type.3.2.2"));
}
}
}
-
+
public void setProperty(String prop, Object value) {
if (prop.equals(JAXBDataBinding.UNWRAP_JAXB_ELEMENT)) {
unwrapJAXBElement = Boolean.TRUE.equals(value);
@@ -100,9 +100,9 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
if (veventHandler == null) {
veventHandler = databinding.getValidationEventHandler();
}
- setEventHandler = MessageUtils.getContextualBoolean(m,
+ setEventHandler = MessageUtils.getContextualBoolean(m,
JAXBDataBinding.SET_VALIDATION_EVENT_HANDLER, true);
-
+
Object unwrapProperty = m.get(JAXBDataBinding.UNWRAP_JAXB_ELEMENT);
if (unwrapProperty == null) {
unwrapProperty = m.getExchange().get(JAXBDataBinding.UNWRAP_JAXB_ELEMENT);
@@ -112,7 +112,7 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
}
}
}
-
+
private Unmarshaller createUnmarshaller() {
try {
Unmarshaller um = null;
@@ -124,7 +124,7 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
um.setEventHandler(new WSUIDValidationHandler(veventHandler));
}
if (databinding.getUnmarshallerProperties() != null) {
- for (Map.Entry<String, Object> propEntry
+ for (Map.Entry<String, Object> propEntry
: databinding.getUnmarshallerProperties().entrySet()) {
try {
um.setProperty(propEntry.getKey(), propEntry.getValue());
@@ -161,25 +161,25 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
// TODO:Cache the JAXBRIContext
QName qname = new QName(null, part.getConcreteName().getLocalPart());
- Object obj = JAXBEncoderDecoder.unmarshalWithBridge(qname,
- part.getTypeClass(),
- anns,
- databinding.getContextClasses(),
- reader,
+ Object obj = JAXBEncoderDecoder.unmarshalWithBridge(qname,
+ part.getTypeClass(),
+ anns,
+ databinding.getContextClasses(),
+ reader,
getAttachmentUnmarshaller());
-
+
onCompleteUnmarshalling();
-
+
return obj;
}
}
-
+
Unmarshaller um = createUnmarshaller();
try {
- Object obj = JAXBEncoderDecoder.unmarshall(um, reader, part,
+ Object obj = JAXBEncoderDecoder.unmarshall(um, reader, part,
unwrapJAXBElement);
onCompleteUnmarshalling();
-
+
return obj;
} finally {
JAXBUtils.closeUnmarshaller(um);
@@ -188,13 +188,13 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
public Object read(QName name, T input, Class<?> type) {
Unmarshaller um = createUnmarshaller();
-
+
try {
Object obj = JAXBEncoderDecoder.unmarshall(um, input,
- name, type,
+ name, type,
unwrapJAXBElement);
onCompleteUnmarshalling();
-
+
return obj;
} finally {
JAXBUtils.closeUnmarshaller(um);
@@ -208,7 +208,7 @@ public class DataReaderImpl<T> extends JAXBDataBase implements DataReader<T> {
((UnmarshallerEventHandler) veventHandler).onUnmarshalComplete();
} catch (UnmarshalException e) {
if (e.getLinkedException() != null) {
- throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
+ throw new Fault(new Message("UNMARSHAL_ERROR", LOG,
e.getLinkedException().getMessage()), e);
} else {
throw new Fault(new Message("UNMARSHAL_ERROR", LOG, e.getMessage()), e);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
index 53a99ea..a2de176 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/io/DataWriterImpl.java
@@ -60,34 +60,34 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
ValidationEventHandler veventHandler;
boolean setEventHandler = true;
private JAXBDataBinding databinding;
-
+
public DataWriterImpl(JAXBDataBinding binding) {
super(binding.getContext());
databinding = binding;
}
-
+
public void write(Object obj, T output) {
write(obj, null, output);
}
-
+
public void setProperty(String prop, Object value) {
if (prop.equals(org.apache.cxf.message.Message.class.getName())) {
org.apache.cxf.message.Message m = (org.apache.cxf.message.Message)value;
veventHandler = (ValidationEventHandler)m.getContextualProperty(
JAXBDataBinding.WRITER_VALIDATION_EVENT_HANDLER);
-
+
if (veventHandler == null) {
veventHandler = (ValidationEventHandler)m.getContextualProperty(
"jaxb-validation-event-handler");
}
if (veventHandler == null) {
veventHandler = databinding.getValidationEventHandler();
- }
- setEventHandler = MessageUtils.getContextualBoolean(m,
+ }
+ setEventHandler = MessageUtils.getContextualBoolean(m,
JAXBDataBinding.SET_VALIDATION_EVENT_HANDLER, true);
}
}
-
+
private static class MtomValidationHandler implements ValidationEventHandler {
ValidationEventHandler origHandler;
JAXBAttachmentMarshaller marshaller;
@@ -96,7 +96,7 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
origHandler = v;
marshaller = m;
}
-
+
public boolean handleEvent(ValidationEvent event) {
// CXF-1194 this hack is specific to MTOM, so pretty safe to leave in here before calling the origHandler.
String msg = event.getMessage();
@@ -104,15 +104,15 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
&& msg.contains(marshaller.getLastMTOMElementName().getLocalPart())) {
return true;
}
-
+
if (origHandler != null) {
return origHandler.handleEvent(event);
}
return false;
}
-
+
}
-
+
public Marshaller createMarshaller(Object elValue, MessagePartInfo part) {
Class<?> cls = null;
if (part != null) {
@@ -129,7 +129,7 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
}
Marshaller marshaller;
try {
-
+
marshaller = context.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_ENCODING, StandardCharsets.UTF_8.name());
marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
@@ -147,7 +147,7 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
}
marshaller.setEventHandler(h);
}
-
+
final Map<String, String> nspref = databinding.getDeclaredNamespaceMappings();
final Map<String, String> nsctxt = databinding.getContextualNamespaceMap();
// set the prefix mapper if either of the prefix map is configured
@@ -158,7 +158,7 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
}
}
if (databinding.getMarshallerProperties() != null) {
- for (Map.Entry<String, Object> propEntry
+ for (Map.Entry<String, Object> propEntry
: databinding.getMarshallerProperties().entrySet()) {
try {
marshaller.setProperty(propEntry.getKey(), propEntry.getValue());
@@ -167,14 +167,14 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
}
}
}
-
+
marshaller.setSchema(schema);
AttachmentMarshaller atmarsh = getAttachmentMarshaller();
marshaller.setAttachmentMarshaller(atmarsh);
-
+
if (schema != null
&& atmarsh instanceof JAXBAttachmentMarshaller) {
- //we need a special even handler for XOP attachments
+ //we need a special even handler for XOP attachments
marshaller.setEventHandler(new MtomValidationHandler(marshaller.getEventHandler(),
(JAXBAttachmentMarshaller)atmarsh));
}
@@ -193,11 +193,11 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
}
return marshaller;
}
-
+
//REVISIT should this go into JAXBUtils?
private static void setContextualNamespaceDecls(Object mapper, Map<String, String> nsctxt) {
try {
- Method m = ReflectionUtil.getDeclaredMethod(mapper.getClass(),
+ Method m = ReflectionUtil.getDeclaredMethod(mapper.getClass(),
"setContextualNamespaceDecls", new Class<?>[]{String[].class});
String[] args = new String[nsctxt.size() * 2];
int ai = 0;
@@ -210,7 +210,7 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
// ignore
LOG.log(Level.WARNING, "Failed to set the contextual namespace map", e);
}
-
+
}
public void write(Object obj, MessagePartInfo part, T output) {
@@ -219,17 +219,17 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
honorJaxbAnnotation = true;
}
checkPart(part, obj);
-
+
if (obj != null
|| !(part.getXmlSchema() instanceof XmlSchemaElement)) {
-
- if (obj instanceof Exception
+
+ if (obj instanceof Exception
&& part != null
- && Boolean.TRUE.equals(part.getProperty(JAXBDataBinding.class.getName()
+ && Boolean.TRUE.equals(part.getProperty(JAXBDataBinding.class.getName()
+ ".CUSTOM_EXCEPTION"))) {
JAXBEncoderDecoder.marshallException(createMarshaller(obj, part),
(Exception)obj,
- part,
+ part,
output);
onCompleteMarshalling();
} else {
@@ -238,23 +238,23 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
JAXBEncoderDecoder.marshall(createMarshaller(obj, part), obj, part, output);
onCompleteMarshalling();
} else if (honorJaxbAnnotation && anns.length > 0) {
- //RpcLit will use the JAXB Bridge to marshall part message when it is
+ //RpcLit will use the JAXB Bridge to marshall part message when it is
//annotated with @XmlList,@XmlAttachmentRef,@XmlJavaTypeAdapter
//TODO:Cache the JAXBRIContext
-
+
JAXBEncoderDecoder.marshalWithBridge(part.getConcreteName(),
part.getTypeClass(),
- anns,
- databinding.getContextClasses(),
- obj,
- output,
+ anns,
+ databinding.getContextClasses(),
+ obj,
+ output,
getAttachmentMarshaller());
}
}
} else if (needToRender(part)) {
JAXBEncoderDecoder.marshallNullElement(createMarshaller(null, part),
output, part);
-
+
onCompleteMarshalling();
}
}
@@ -290,8 +290,8 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
return;
}
if (!typeClass.isInstance(object)) {
- throw new IllegalArgumentException("Part " + part.getName() + " should be of type "
- + typeClass.getName() + ", not "
+ throw new IllegalArgumentException("Part " + part.getName() + " should be of type "
+ + typeClass.getName() + ", not "
+ object.getClass().getName());
}
}
@@ -303,14 +303,14 @@ public class DataWriterImpl<T> extends JAXBDataBase implements DataWriter<T> {
}
return false;
}
-
+
private void onCompleteMarshalling() {
if (setEventHandler && veventHandler instanceof MarshallerEventHandler) {
try {
((MarshallerEventHandler) veventHandler).onMarshalComplete();
} catch (MarshalException e) {
if (e.getLinkedException() != null) {
- throw new Fault(new Message("MARSHAL_ERROR", LOG,
+ throw new Fault(new Message("MARSHAL_ERROR", LOG,
e.getLinkedException().getMessage()), e);
} else {
throw new Fault(new Message("MARSHAL_ERROR", LOG, e.getMessage()), e);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
index 20eb683..975b235 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareInInterceptorTest.java
@@ -64,7 +64,7 @@ import static org.easymock.EasyMock.createNiceControl;
import static org.easymock.EasyMock.expect;
public class BareInInterceptorTest extends Assert {
-
+
PhaseInterceptorChain chain;
MessageImpl message;
Bus bus;
@@ -74,7 +74,7 @@ public class BareInInterceptorTest extends Assert {
EndpointInfo endpointInfo;
EndpointImpl endpoint;
BindingOperationInfo operation;
-
+
@Before
public void setUp() throws Exception {
bus = BusFactory.newInstance().createBus();
@@ -89,16 +89,16 @@ public class BareInInterceptorTest extends Assert {
.andStubReturn(new ArrayList<Interceptor<? extends Message>>());
expect(binding.getOutFaultInterceptors())
.andStubReturn(new ArrayList<Interceptor<? extends Message>>());
-
- bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", bf);
-
+
+ bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", bf);
+
}
-
+
@Test
public void testInterceptorInbound() throws Exception {
setUpUsingHelloWorld();
- BareInInterceptor interceptor = new BareInInterceptor();
+ BareInInterceptor interceptor = new BareInInterceptor();
message.setContent(XMLStreamReader.class, XMLInputFactory.newInstance()
.createXMLStreamReader(getTestStream(getClass(), "resources/GreetMeDocLiteralReq.xml")));
@@ -114,14 +114,14 @@ public class BareInInterceptorTest extends Assert {
Object obj = parameters.get(0);
assertTrue(obj instanceof GreetMe);
GreetMe greet = (GreetMe)obj;
- assertEquals("TestSOAPInputPMessage", greet.getRequestType());
+ assertEquals("TestSOAPInputPMessage", greet.getRequestType());
}
@Test
public void testInterceptorInbound1() throws Exception {
setUpUsingDocLit();
- BareInInterceptor interceptor = new BareInInterceptor();
+ BareInInterceptor interceptor = new BareInInterceptor();
message.setContent(XMLStreamReader.class, XMLInputFactory.newInstance()
.createXMLStreamReader(getTestStream(getClass(), "resources/sayHiDocLitBareReq.xml")));
@@ -137,18 +137,18 @@ public class BareInInterceptorTest extends Assert {
Object obj = parameters.get(0);
assertTrue(obj instanceof TradePriceData);
TradePriceData greet = (TradePriceData)obj;
- assertTrue(1.0 == greet.getTickerPrice());
- assertEquals("CXF", greet.getTickerSymbol());
+ assertTrue(1.0 == greet.getTickerPrice());
+ assertEquals("CXF", greet.getTickerSymbol());
}
-
+
@Test
public void testInterceptorInboundBareNoParameter() throws Exception {
setUpUsingDocLit();
-
- BareInInterceptor interceptor = new BareInInterceptor();
+
+ BareInInterceptor interceptor = new BareInInterceptor();
message.setContent(XMLStreamReader.class, XMLInputFactory.newInstance()
.createXMLStreamReader(getTestStream(getClass(), "resources/bareNoParamDocLitBareReq.xml")));
-
+
XMLStreamReader reader = message.getContent(XMLStreamReader.class);
// skip to the end element of soap body, so that we can serve an empty request to
// interceptor
@@ -164,7 +164,7 @@ public class BareInInterceptorTest extends Assert {
List<?> parameters = message.getContent(List.class);
assertNull(parameters);
}
-
+
@Test
public void testInterceptorOutbound() throws Exception {
setUpUsingHelloWorld();
@@ -185,7 +185,7 @@ public class BareInInterceptorTest extends Assert {
GreetMeResponse greet = (GreetMeResponse)obj;
assertEquals("TestSOAPOutputPMessage", greet.getResponseType());
}
-
+
//TODO: remove duplicate code in setUpUsingHelloWorld and setUpUsingDocLit
private void setUpUsingHelloWorld() throws Exception {
String ns = "http://apache.org/hello_world_soap_http";
@@ -215,8 +215,8 @@ public class BareInInterceptorTest extends Assert {
exchange.put(Service.class, service);
exchange.put(Endpoint.class, endpoint);
exchange.put(Binding.class, endpoint.getBinding());
- }
-
+ }
+
private void setUpUsingDocLit() throws Exception {
String ns = "http://apache.org/hello_world_doc_lit_bare";
WSDLServiceFactory factory = new WSDLServiceFactory(bus, getClass()
@@ -245,7 +245,7 @@ public class BareInInterceptorTest extends Assert {
exchange.put(Endpoint.class, endpoint);
exchange.put(Binding.class, endpoint.getBinding());
}
-
+
public InputStream getTestStream(Class<?> clz, String file) {
return clz.getResourceAsStream(file);
}
@@ -257,5 +257,5 @@ public class BareInInterceptorTest extends Assert {
public XMLStreamWriter getXMLStreamWriter(OutputStream os) {
return StaxUtils.createXMLStreamWriter(os);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
index 572cac1..140c98c 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/BareOutInterceptorTest.java
@@ -47,14 +47,14 @@ import org.junit.Test;
public class BareOutInterceptorTest extends TestBase {
BareOutInterceptor interceptor;
-
+
private ByteArrayOutputStream baos;
private XMLStreamWriter writer;
-
+
@Before
public void setUp() throws Exception {
super.setUp();
-
+
interceptor = new BareOutInterceptor();
baos = new ByteArrayOutputStream();
writer = getXMLStreamWriter(baos);
@@ -75,13 +75,13 @@ public class BareOutInterceptorTest extends TestBase {
public void testWriteOutbound() throws Exception {
GreetMeResponse greetMe = new GreetMeResponse();
greetMe.setResponseType("responseType");
-
+
message.setContent(List.class, Arrays.asList(greetMe));
interceptor.handleMessage(message);
writer.close();
-
+
assertNull(message.getContent(Exception.class));
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
@@ -91,7 +91,7 @@ public class BareOutInterceptorTest extends TestBase {
StaxUtils.toNextElement(reader);
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "greetMeResponse"),
reader.getName());
-
+
StaxUtils.nextEvent(reader);
StaxUtils.toNextElement(reader);
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "responseType"),
@@ -102,14 +102,14 @@ public class BareOutInterceptorTest extends TestBase {
public void testWriteInbound() throws Exception {
GreetMe greetMe = new GreetMe();
greetMe.setRequestType("requestType");
-
+
message.setContent(List.class, Arrays.asList(greetMe));
message.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
-
+
interceptor.handleMessage(message);
-
+
writer.close();
-
+
assertNull(message.getContent(Exception.class));
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
@@ -118,7 +118,7 @@ public class BareOutInterceptorTest extends TestBase {
StaxUtils.toNextElement(reader);
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "greetMe"),
reader.getName());
-
+
StaxUtils.nextEvent(reader);
StaxUtils.toNextElement(reader);
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "requestType"),
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
index 82b594b..a583648 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DataBindingMarshallerPropertiesTest.java
@@ -25,15 +25,15 @@ import java.util.Map;
import org.junit.Test;
public class DataBindingMarshallerPropertiesTest extends TestBase {
- @Test
+ @Test
public void testInitializeUnmarshallerProperties() throws Exception {
JAXBDataBinding db = new JAXBDataBinding();
Map<String, Object> unmarshallerProperties = new HashMap<String, Object>();
unmarshallerProperties.put("someproperty", "somevalue");
db.setUnmarshallerProperties(unmarshallerProperties);
-
+
db.initialize(service);
-
+
assertTrue("somevalue".equals(db.getUnmarshallerProperties().get("someproperty")));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java
index ff16ccb..ce40be6 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/DatatypeFactoryTest.java
@@ -24,7 +24,7 @@ import org.junit.Assert;
import org.junit.Test;
public class DatatypeFactoryTest {
-
+
@Test
public void testNewFactory() throws Exception {
Class.forName("org.apache.cxf.jaxb.DatatypeFactory");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java
index cae032b..55d2f61 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/FixNamespacesXMLEventWriter.java
@@ -29,11 +29,11 @@ import javax.xml.stream.events.XMLEvent;
public class FixNamespacesXMLEventWriter implements XMLEventWriter, MarshallerAwareXMLWriter {
private final XMLEventWriter delegate;
private Marshaller marshaller;
-
+
public FixNamespacesXMLEventWriter(XMLEventWriter delegate) {
this.delegate = delegate;
}
-
+
public void flush() throws XMLStreamException {
delegate.flush();
}
[03/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
index b32d5f7..bca6532 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/AttachmentBuilder.java
@@ -28,43 +28,43 @@ import org.apache.cxf.jaxrs.impl.MetadataMap;
* Fluid builder class for {@link Attachment} objects.
*/
public class AttachmentBuilder {
- private MultivaluedMap<String, String> headers =
+ private MultivaluedMap<String, String> headers =
new MetadataMap<String, String>(false, true);
private Object object;
private DataHandler dataHandler;
private ContentDisposition contentDisposition;
-
+
public AttachmentBuilder() {
//
}
-
+
public AttachmentBuilder id(String id) {
headers.putSingle("Content-Id", id);
return this;
-
+
}
-
+
public AttachmentBuilder mediaType(String mediaType) {
headers.putSingle("Content-Type", mediaType);
return this;
}
-
+
public AttachmentBuilder object(Object theObject) {
this.object = theObject;
return this;
}
-
+
public AttachmentBuilder dataHandler(DataHandler newDataHandler) {
this.dataHandler = newDataHandler;
return this;
}
-
-
+
+
public AttachmentBuilder header(String key, String value) {
headers.putSingle(key, value);
return this;
}
-
+
/**
* Set all of the headers. This will overwrite any content ID,
* media type, ContentDisposition, or other header set by previous calls.
@@ -76,12 +76,12 @@ public class AttachmentBuilder {
contentDisposition = null;
return this;
}
-
+
public AttachmentBuilder contentDisposition(ContentDisposition newContentDisposition) {
this.contentDisposition = newContentDisposition;
return this;
}
-
+
public Attachment build() {
if (contentDisposition != null) {
headers.putSingle("Content-Disposition", contentDisposition.toString());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java
index 4536bca..dcb2899 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/ContentDisposition.java
@@ -21,7 +21,7 @@ package org.apache.cxf.jaxrs.ext.multipart;
public class ContentDisposition extends org.apache.cxf.attachment.ContentDisposition {
-
+
public ContentDisposition(String value) {
super(value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java
index 114875b..4a351ba 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/InputStreamDataSource.java
@@ -30,18 +30,18 @@ public class InputStreamDataSource implements DataSource {
private InputStream is;
private String contentType;
private String name;
-
+
public InputStreamDataSource(InputStream is, String contentType) {
this.is = is;
this.contentType = contentType;
}
-
+
public InputStreamDataSource(InputStream is, String contentType, String name) {
this.is = is;
this.contentType = contentType;
this.name = name;
}
-
+
public String getContentType() {
return contentType;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
index 8aa95e6..f956b0e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Multipart.java
@@ -41,10 +41,10 @@ public @interface Multipart {
String type() default "*/*";
/**
* How to handle a missing part. By default, if no part matches,
- * the {@link org.apache.cxf.jaxrs.provider.MultipartProvider}
+ * the {@link org.apache.cxf.jaxrs.provider.MultipartProvider}
* throws a {@link javax.ws.rs.WebApplicationException}
* with status 400. If this option is set to <strong>false</strong>,
* the parameter is set to <strong>null</strong> instead.
*/
- boolean required() default true;
+ boolean required() default true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
index 7fe7b71..bafc333 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/MultipartBody.java
@@ -27,49 +27,49 @@ import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
public class MultipartBody {
-
+
public static final String INBOUND_MESSAGE_ATTACHMENTS = "org.apache.cxf.jaxrs.attachments.inbound";
public static final String OUTBOUND_MESSAGE_ATTACHMENTS = "org.apache.cxf.jaxrs.attachments.outbound";
-
- private static final MediaType MULTIPART_RELATED_TYPE = JAXRSUtils.toMediaType("multipart/related");
+
+ private static final MediaType MULTIPART_RELATED_TYPE = JAXRSUtils.toMediaType("multipart/related");
private boolean outbound;
private List<Attachment> atts;
- private MediaType mt;
-
+ private MediaType mt;
+
public MultipartBody(List<Attachment> atts, MediaType mt, boolean outbound) {
this.atts = atts;
this.outbound = outbound;
this.mt = mt == null ? MULTIPART_RELATED_TYPE : mt;
}
-
+
public MultipartBody(List<Attachment> atts, boolean outbound) {
this(atts, MULTIPART_RELATED_TYPE, outbound);
}
-
+
public MultipartBody(Attachment att) {
atts = new ArrayList<>();
atts.add(att);
outbound = true;
this.mt = MULTIPART_RELATED_TYPE;
}
-
+
public MultipartBody(List<Attachment> atts) {
this(atts, MULTIPART_RELATED_TYPE, false);
}
-
+
public MultipartBody(boolean outbound) {
this(new ArrayList<>(), MULTIPART_RELATED_TYPE, outbound);
}
-
+
public MediaType getType() {
return mt;
}
-
+
public List<Attachment> getAllAttachments() {
-
+
return outbound ? atts : Collections.unmodifiableList(atts);
}
-
+
public List<Attachment> getChildAttachments() {
List<Attachment> childAtts = new ArrayList<>();
for (int i = 1; i < atts.size(); i++) {
@@ -77,11 +77,11 @@ public class MultipartBody {
}
return childAtts;
}
-
+
public Attachment getRootAttachment() {
return atts.size() > 0 ? atts.get(0) : null;
}
-
+
public Attachment getAttachment(String contentId) {
for (Attachment a : atts) {
if (contentId.equalsIgnoreCase(a.getContentId())) {
@@ -94,7 +94,7 @@ public class MultipartBody {
}
return null;
}
-
+
public <T> T getAttachmentObject(String contentId, Class<T> cls) {
Attachment att = getAttachment(contentId);
if (att != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java
index 65abc34..0cf9807 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/ElementClass.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
/**
* Can be applied to methods returning a JAX-RS {@link Response}
- *
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD })
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java
index 0b698b4..37f6a4a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLInstruction.java
@@ -24,8 +24,8 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Can be used to add custom XML processing
- * instructions to out-bound XML messages
+ * Can be used to add custom XML processing
+ * instructions to out-bound XML messages
*/
@Target({ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java
index 8b94958..e3282e0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLName.java
@@ -26,8 +26,8 @@ import java.lang.annotation.Target;
/**
* Can be used to assign qualified XML names to arbitrary classes
- * for the purpose of matching them with external schema definitions
- *
+ * for the purpose of matching them with external schema definitions
+ *
*/
@Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER })
@Retention(RetentionPolicy.RUNTIME)
@@ -37,7 +37,7 @@ public @interface XMLName {
*/
String value() default "";
/**
- * Optional prefix
+ * Optional prefix
**/
String prefix() default "";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
index b3f4d9b..0b2cb53 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XMLSource.java
@@ -58,16 +58,16 @@ import org.apache.cxf.staxutils.StaxUtils;
*
*/
public class XMLSource {
-
- private static final String XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace";
-
+
+ private static final String XML_NAMESPACE = "http://www.w3.org/XML/1998/namespace";
+
private InputStream stream;
- private Document doc;
-
+ private Document doc;
+
public XMLSource(InputStream is) {
stream = is;
}
-
+
/**
* Allows for multiple queries against the same stream by buffering to DOM
*/
@@ -80,11 +80,11 @@ public class XMLSource {
e.printStackTrace();
}
}
-
+
/**
* Find the matching XML node and convert it into an instance of the provided class.
* The default JAXB MessageBodyReader is currently used in case of non-primitive types.
- *
+ *
* @param expression XPath expression
* @param cls class of the node
* @return the instance representing the matching node
@@ -92,11 +92,11 @@ public class XMLSource {
public <T> T getNode(String expression, Class<T> cls) {
return getNode(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class), cls);
}
-
+
/**
* Find the matching XML node and convert it into an instance of the provided class.
* The default JAXB MessageBodyReader is currently used in case of non-primitive types.
- *
+ *
* @param expression XPath expression
* @param namespaces the namespaces map, prefixes which are used in the XPath expression
* are the keys, namespace URIs are the values; note, the prefixes do not have to match
@@ -113,19 +113,19 @@ public class XMLSource {
if (obj instanceof Node) {
Node node = (Node)obj;
if (cls.isPrimitive() || cls == String.class) {
- return (T)readPrimitiveValue(node, cls);
+ return (T)readPrimitiveValue(node, cls);
} else {
return readNode(node, cls);
}
}
return cls.cast(evaluate(expression, namespaces, XPathConstants.STRING));
}
-
+
/**
* Find the list of matching XML nodes and convert them into
* an array of instances of the provided class.
* The default JAXB MessageBodyReader is currently used in case of non-primitive types.
- *
+ *
* @param expression XPath expression
* @param cls class of the node
* @return the array of instances representing the matching nodes
@@ -133,12 +133,12 @@ public class XMLSource {
public <T> T[] getNodes(String expression, Class<T> cls) {
return getNodes(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class), cls);
}
-
+
/**
* Find the list of matching XML nodes and convert them into
* an array of instances of the provided class.
* The default JAXB MessageBodyReader is currently used in case of non-primitive types.
- *
+ *
* @param expression XPath expression
* @param namespaces the namespaces map, prefixes which are used in the XPath expression
* are the keys, namespace URIs are the values; note, the prefixes do not have to match
@@ -148,7 +148,7 @@ public class XMLSource {
*/
@SuppressWarnings("unchecked")
public <T> T[] getNodes(String expression, Map<String, String> namespaces, Class<T> cls) {
-
+
NodeList nodes = (NodeList)evaluate(expression, namespaces, XPathConstants.NODESET);
if (nodes == null || nodes.getLength() == 0) {
return null;
@@ -174,7 +174,7 @@ public class XMLSource {
public URI getLink(String expression) {
return getLink(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class));
}
-
+
/**
* Find an attribute or text node representing
* an absolute or relative link and convert it to URI
@@ -188,7 +188,7 @@ public class XMLSource {
String value = getValue(expression, namespaces);
return value == null ? null : URI.create(value);
}
-
+
/**
* Find attributes or text nodes representing
* absolute or relative links and convert them to URIs
@@ -209,12 +209,12 @@ public class XMLSource {
}
return uris;
}
-
+
/**
* Returns the value of the xml:base attribute, if any.
- * This can be used to calculate an absolute URI provided
- * the links in the actual XML instance are relative.
- *
+ * This can be used to calculate an absolute URI provided
+ * the links in the actual XML instance are relative.
+ *
* @return the xml:base value
*/
public URI getBaseURI() {
@@ -222,7 +222,7 @@ public class XMLSource {
map.put("xml", XML_NAMESPACE);
return getLink("/*/@xml:base", map);
}
-
+
/**
* Find the attribute or simple/text node
* @param expression the XPath expression
@@ -231,7 +231,7 @@ public class XMLSource {
public String getValue(String expression) {
return getValue(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class));
}
-
+
/**
* Find the attribute or simple/text node
* @param expression the XPath expression
@@ -243,7 +243,7 @@ public class XMLSource {
public String getValue(String expression, Map<String, String> namespaces) {
return getValue(expression, namespaces, String.class);
}
-
+
/**
* Find the attributes or simple/text nodes
* @param expression the XPath expression
@@ -252,7 +252,7 @@ public class XMLSource {
public String[] getValues(String expression) {
return getValues(expression, CastUtils.cast(Collections.emptyMap(), String.class, String.class));
}
-
+
/**
* Find the attributes or simple/text nodes
* @param expression the XPath expression
@@ -264,10 +264,10 @@ public class XMLSource {
public String[] getValues(String expression, Map<String, String> namespaces) {
return getNodes(expression, namespaces, String.class);
}
-
+
/**
* Find the attribute or simple/text node and convert the string value to the
- * instance of the provided class, example, Integer.class.
+ * instance of the provided class, example, Integer.class.
* @param expression the XPath expression
* @param namespaces the namespaces map, prefixes which are used in the XPath expression
* are the keys, namespace URIs are the values; note, the prefixes do not have to match
@@ -278,10 +278,10 @@ public class XMLSource {
@SuppressWarnings("unchecked")
public <T> T getValue(String expression, Map<String, String> namespaces, Class<T> cls) {
Object result = evaluate(expression, namespaces, XPathConstants.STRING);
- return result == null ? null : (T)InjectionUtils.convertStringToPrimitive(result.toString(), cls);
+ return result == null ? null : (T)InjectionUtils.convertStringToPrimitive(result.toString(), cls);
}
-
-
+
+
private Object evaluate(String expression, Map<String, String> namespaces, QName type) {
XPathFactory factory = XPathFactory.newInstance();
try {
@@ -294,10 +294,10 @@ public class XMLSource {
boolean releaseDoc = false;
try {
if (stream != null) {
- //xalan xpath evaluate parses to a DOM via a DocumentBuilderFactory, but doesn't
- //set the SecureProcessing on that. Since a DOM is always created, might as well
- //do it via stax and avoid the service factory performance hits that the
- //DocumentBuilderFactory will entail as well as get the extra security
+ //xalan xpath evaluate parses to a DOM via a DocumentBuilderFactory, but doesn't
+ //set the SecureProcessing on that. Since a DOM is always created, might as well
+ //do it via stax and avoid the service factory performance hits that the
+ //DocumentBuilderFactory will entail as well as get the extra security
//that woodstox provides
setBuffering();
releaseDoc = true;
@@ -312,14 +312,14 @@ public class XMLSource {
}
}
}
-
-
+
+
private static class NamespaceContextImpl implements NamespaceContext {
-
+
private Map<String, String> namespaces;
-
+
NamespaceContextImpl(Map<String, String> namespaces) {
- this.namespaces = namespaces;
+ this.namespaces = namespaces;
}
public String getNamespaceURI(String prefix) {
@@ -343,7 +343,7 @@ public class XMLSource {
return Collections.singletonList(prefix).iterator();
}
}
-
+
private <T> Object readPrimitiveValue(Node node, Class<T> cls) {
if (String.class == cls) {
if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -351,25 +351,25 @@ public class XMLSource {
} else {
return cls.cast(node.getNodeValue());
}
- }
-
+ }
+
return InjectionUtils.convertStringToPrimitive(node.getNodeValue(), cls);
}
-
-
+
+
private <T> T readNode(Node node, Class<T> cls) {
-
+
if (Node.class.isAssignableFrom(cls)) {
return cls.cast(node);
}
-
+
DOMSource s = new DOMSource(node);
if (Source.class == cls || DOMSource.class == cls) {
return cls.cast(s);
}
-
+
try {
-
+
JAXBElementProvider<?> provider = new JAXBElementProvider<Object>();
JAXBContext c = provider.getPackageContext(cls);
if (c == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java
index 4cd6b39..113273e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSISchemaLocation.java
@@ -24,24 +24,24 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * This annotation can be used to simplify adding
+ * This annotation can be used to simplify adding
* xsi:schemaLocation attributes
*/
@Target({ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface XSISchemaLocation {
/**
- * Schema location
+ * Schema location
* By default it is assumed to be relative to a base URI of the web application
*/
String value();
-
+
/**
- * If the location is relative and this property is set to true then
+ * If the location is relative and this property is set to true then
* the location will be resolved against the base URI of the web application
*/
boolean resolve() default true;
-
+
/**
* Can be used to get xsi:noNamespaceSchemaLocation produced.
* By default, xsi:schemaLocation will be set.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java
index 71c9a30..032e5e1 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/xml/XSLTTransform.java
@@ -25,8 +25,8 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Can be used to enable server-side XSLT transformations
- *
+ * Can be used to enable server-side XSLT transformations
+ *
*/
@Target({ElementType.METHOD, ElementType.PARAMETER })
@Retention(RetentionPolicy.RUNTIME)
@@ -39,7 +39,7 @@ public @interface XSLTTransform {
*/
String value();
/**
- * Supported media types
+ * Supported media types
**/
String[] mediaTypes() default { };
TransformType type() default TransformType.SERVER;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java
index 6781356..d5fa076 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractInterceptorContextImpl.java
@@ -38,11 +38,11 @@ public class AbstractInterceptorContextImpl extends AbstractPropertiesImpl {
this.type = type;
this.anns = anns;
}
-
+
public Class<?> getType() {
return cls;
}
-
+
public Annotation[] getAnnotations() {
return anns;
}
@@ -69,7 +69,7 @@ public class AbstractInterceptorContextImpl extends AbstractPropertiesImpl {
}
cls = ctype;
}
-
+
protected void providerSelectionPropertyChanged() {
m.put(ProviderFactory.PROVIDER_SELECTION_PROPERTY_CHANGED, Boolean.TRUE);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java
index caf8139..bf34a35 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractPropertiesImpl.java
@@ -30,7 +30,7 @@ public abstract class AbstractPropertiesImpl {
holder = PropertyHolderFactory.getPropertyHolder(message);
this.m = message;
}
-
+
public Object getProperty(String name) {
return holder.getProperty(name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java
index 7d54415..944c132 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractRequestContextImpl.java
@@ -41,7 +41,7 @@ public abstract class AbstractRequestContextImpl extends AbstractPropertiesImpl
this.h = new HttpHeadersImpl(message);
this.responseContext = responseContext;
}
-
+
public void abortWith(Response response) {
checkContext();
m.getExchange().put(Response.class, JAXRSUtils.copyResponseIfNeeded(response));
@@ -92,7 +92,7 @@ public abstract class AbstractRequestContextImpl extends AbstractPropertiesImpl
protected HttpHeaders getHttpHeaders() {
return h != null ? h : new HttpHeadersImpl(m);
}
-
+
protected void checkContext() {
if (responseContext) {
throw new IllegalStateException();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
index de1b96d..94f7fa8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AbstractResponseContextImpl.java
@@ -45,7 +45,7 @@ public abstract class AbstractResponseContextImpl {
this.m = m;
this.r = r;
}
-
+
public Set<String> getAllowedMethods() {
return r.getAllowedMethods();
}
@@ -62,7 +62,7 @@ public abstract class AbstractResponseContextImpl {
return r.getEntity();
}
-
+
public EntityTag getEntityTag() {
return r.getEntityTag();
}
@@ -130,16 +130,16 @@ public abstract class AbstractResponseContextImpl {
m.put(Message.CONTENT_TYPE, mt.toString());
}
}
-
+
public void setEntity(Object entity) {
((ResponseImpl)r).setEntity(entity, getResponseEntityAnnotations());
}
-
+
protected Annotation[] getResponseEntityAnnotations() {
return ((ResponseImpl)r).getEntityAnnotations();
}
-
-
+
+
public void setStatus(int status) {
m.getExchange().put(Message.RESPONSE_CODE, status);
m.put(Message.RESPONSE_CODE, status);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index f1606c9..ace39eac 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -46,7 +46,7 @@ import org.apache.cxf.message.Message;
public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
-
+
private Continuation cont;
private Message inMessage;
private TimeoutHandler timeoutHandler;
@@ -55,19 +55,19 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
private volatile boolean done;
private volatile boolean resumedByApplication;
private volatile Long pendingTimeout;
-
+
private List<CompletionCallback> completionCallbacks = new LinkedList<CompletionCallback>();
private List<ConnectionCallback> connectionCallbacks = new LinkedList<ConnectionCallback>();
private Throwable unmappedThrowable;
-
+
public AsyncResponseImpl(Message inMessage) {
inMessage.put(AsyncResponse.class, this);
inMessage.getExchange().put(ContinuationCallback.class, this);
this.inMessage = inMessage;
-
+
initContinuation();
}
-
+
@Override
public boolean resume(Object response) {
return doResume(response);
@@ -77,11 +77,11 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
public boolean resume(Throwable response) {
return doResume(response);
}
-
+
private boolean isCancelledOrNotSuspended() {
return isCancelled() || !isSuspended();
}
-
+
private boolean doResume(Object response) {
if (isCancelledOrNotSuspended()) {
return false;
@@ -99,7 +99,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
return true;
}
-
+
@Override
public boolean cancel() {
return doCancel(null);
@@ -114,7 +114,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
public boolean cancel(Date retryAfter) {
return doCancel(HttpUtils.getHttpDateFormat().format(retryAfter));
}
-
+
private boolean doCancel(String retryAfterHeader) {
if (cancelled) {
return true;
@@ -182,20 +182,20 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
@Override
- public Map<Class<?>, Collection<Class<?>>> register(Class<?> callback, Class<?>... callbacks)
+ public Map<Class<?>, Collection<Class<?>>> register(Class<?> callback, Class<?>... callbacks)
throws NullPointerException {
try {
Object[] extraCallbacks = new Object[callbacks.length];
for (int i = 0; i < callbacks.length; i++) {
extraCallbacks[i] = callbacks[i].newInstance();
}
- return register(callback.newInstance(), extraCallbacks);
+ return register(callback.newInstance(), extraCallbacks);
} catch (NullPointerException e) {
throw e;
} catch (Throwable t) {
return Collections.emptyMap();
}
-
+
}
@Override
@@ -204,15 +204,15 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
@Override
- public Map<Class<?>, Collection<Class<?>>> register(Object callback, Object... callbacks)
+ public Map<Class<?>, Collection<Class<?>>> register(Object callback, Object... callbacks)
throws NullPointerException {
- Map<Class<?>, Collection<Class<?>>> map =
+ Map<Class<?>, Collection<Class<?>>> map =
new HashMap<Class<?>, Collection<Class<?>>>();
-
+
Object[] allCallbacks = new Object[1 + callbacks.length];
allCallbacks[0] = callback;
System.arraycopy(callbacks, 0, allCallbacks, 1, callbacks.length);
-
+
for (int i = 0; i < allCallbacks.length; i++) {
if (allCallbacks[i] == null) {
throw new NullPointerException();
@@ -223,18 +223,18 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
knownCallbacks = new HashSet<Class<?>>();
map.put(callbackCls, knownCallbacks);
}
-
+
if (allCallbacks[i] instanceof CompletionCallback) {
knownCallbacks.add(CompletionCallback.class);
- completionCallbacks.add((CompletionCallback)allCallbacks[i]);
+ completionCallbacks.add((CompletionCallback)allCallbacks[i]);
} else if (allCallbacks[i] instanceof ConnectionCallback) {
knownCallbacks.add(ConnectionCallback.class);
- connectionCallbacks.add((ConnectionCallback)allCallbacks[i]);
+ connectionCallbacks.add((ConnectionCallback)allCallbacks[i]);
}
}
return map;
}
-
+
@Override
public void onComplete() {
done = true;
@@ -245,21 +245,21 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
public void onError(Throwable error) {
updateCompletionCallbacks(error);
}
-
+
private void updateCompletionCallbacks(Throwable error) {
Throwable actualError = error instanceof Fault ? ((Fault)error).getCause() : error;
for (CompletionCallback completionCallback : completionCallbacks) {
completionCallback.onComplete(actualError);
}
}
-
+
@Override
public void onDisconnect() {
for (ConnectionCallback connectionCallback : connectionCallbacks) {
connectionCallback.onDisconnect(this);
}
}
-
+
public synchronized boolean suspendContinuationIfNeeded() {
if (!resumedByApplication && !cont.isPending() && !cont.isResumed()) {
cont.suspend(AsyncResponse.NO_TIMEOUT);
@@ -269,7 +269,7 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
return false;
}
}
-
+
public Object getResponseObject() {
Object obj = cont.getObject();
if (!(obj instanceof Response) && !(obj instanceof Throwable)) {
@@ -281,11 +281,11 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
return obj;
}
-
+
public boolean isResumedByApplication() {
return resumedByApplication;
}
-
+
public synchronized void handleTimeout() {
if (!resumedByApplication) {
if (pendingTimeout != null) {
@@ -301,21 +301,21 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
}
private void initContinuation() {
- ContinuationProvider provider =
+ ContinuationProvider provider =
(ContinuationProvider)inMessage.get(ContinuationProvider.class.getName());
cont = provider.getContinuation();
initialSuspend = true;
}
-
+
public void prepareContinuation() {
initContinuation();
}
-
+
public void setUnmappedThrowable(Throwable t) {
unmappedThrowable = t;
}
public void reset() {
cont.reset();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
index 7887101..5e2e56e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CacheControlHeaderProvider.java
@@ -36,16 +36,16 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl> {
-
+
public static final String CACHE_CONTROL_SEPARATOR_PROPERTY =
"org.apache.cxf.http.cache-control.separator";
private static final String DEFAULT_SEPARATOR = ",";
-
- private static final String COMPLEX_HEADER_EXPRESSION =
+
+ private static final String COMPLEX_HEADER_EXPRESSION =
"(([\\w-]+=\"[^\"]*\")|([\\w-]+=[\\w]+)|([\\w-]+))";
private static final Pattern COMPLEX_HEADER_PATTERN =
Pattern.compile(COMPLEX_HEADER_EXPRESSION);
-
+
private static final String PUBLIC = "public";
private static final String PRIVATE = "private";
private static final String NO_CACHE = "no-cache";
@@ -68,7 +68,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
int maxAge = -1;
int sMaxAge = -1;
Map<String, String> extensions = new HashMap<String, String>();
-
+
String[] tokens = getTokens(c);
for (String rawToken : tokens) {
String token = rawToken.trim();
@@ -98,7 +98,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
extensions.put(extPair[0], value);
}
}
-
+
CacheControl cc = new CacheControl();
cc.setMaxAge(maxAge);
cc.setSMaxAge(sMaxAge);
@@ -111,7 +111,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
cc.setNoStore(noStore);
cc.setNoTransform(noTransform);
cc.getCacheExtension().putAll(extensions);
-
+
return cc;
}
@@ -134,10 +134,10 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
return StringUtils.split(c, separator);
}
}
-
+
public String toString(CacheControl c) {
String separator = getSeparator();
-
+
StringBuilder sb = new StringBuilder();
if (c.isPrivate()) {
sb.append(PRIVATE);
@@ -182,9 +182,9 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
sb.append(separator);
}
String s = sb.toString();
- return s.endsWith(separator) ? s.substring(0, s.length() - 1) : s;
+ return s.endsWith(separator) ? s.substring(0, s.length() - 1) : s;
}
-
+
private static void addFields(List<String> fields, String token) {
int i = token.indexOf('=');
if (i != -1) {
@@ -201,7 +201,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
}
}
}
-
+
}
private static void handleFields(List<String> fields, StringBuilder sb) {
@@ -218,13 +218,13 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
}
sb.append('\"');
}
-
+
protected String getSeparator() {
-
+
String separator = DEFAULT_SEPARATOR;
-
+
Message message = getCurrentMessage();
-
+
if (message != null) {
Object sepProperty = message.getContextualProperty(CACHE_CONTROL_SEPARATOR_PROPERTY);
if (sepProperty != null) {
@@ -236,7 +236,7 @@ public class CacheControlHeaderProvider implements HeaderDelegate<CacheControl>
}
return separator;
}
-
+
protected Message getCurrentMessage() {
return PhaseInterceptorChain.getCurrentMessage();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
index 6d5c9dc..9be144d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurableImpl.java
@@ -36,22 +36,22 @@ public class ConfigurableImpl<C extends Configurable<C>> implements Configurable
public ConfigurableImpl(C configurable, RuntimeType rt, Class<?>[] supportedProviderClasses) {
this(configurable, supportedProviderClasses, new ConfigurationImpl(rt));
}
-
+
public ConfigurableImpl(C configurable, Class<?>[] supportedProviderClasses, Configuration config) {
this(configurable, supportedProviderClasses);
- this.config = config instanceof ConfigurationImpl
+ this.config = config instanceof ConfigurationImpl
? (ConfigurationImpl)config : new ConfigurationImpl(config, supportedProviderClasses);
}
-
+
private ConfigurableImpl(C configurable, Class<?>[] supportedProviderClasses) {
this.configurable = configurable;
this.supportedProviderClasses = supportedProviderClasses;
}
-
+
protected C getConfigurable() {
return configurable;
}
-
+
@Override
public Configuration getConfiguration() {
return config;
@@ -72,25 +72,25 @@ public class ConfigurableImpl<C extends Configurable<C>> implements Configurable
public C register(Object provider, int bindingPriority) {
return doRegister(provider, bindingPriority, supportedProviderClasses);
}
-
+
@Override
public C register(Object provider, Class<?>... contracts) {
return doRegister(provider, Priorities.USER, contracts);
}
-
+
@Override
public C register(Object provider, Map<Class<?>, Integer> contracts) {
if (provider instanceof Feature) {
Feature feature = (Feature)provider;
boolean enabled = feature.configure(new FeatureContextImpl(this));
config.setFeature(feature, enabled);
-
+
return configurable;
}
config.register(provider, contracts);
return configurable;
}
-
+
@Override
public C register(Class<?> providerClass) {
return register(providerClass, AnnotationUtils.getBindingPriority(providerClass));
@@ -98,7 +98,7 @@ public class ConfigurableImpl<C extends Configurable<C>> implements Configurable
@Override
public C register(Class<?> providerClass, int bindingPriority) {
- return doRegister(ConfigurationImpl.createProvider(providerClass),
+ return doRegister(ConfigurationImpl.createProvider(providerClass),
bindingPriority, supportedProviderClasses);
}
@@ -111,7 +111,7 @@ public class ConfigurableImpl<C extends Configurable<C>> implements Configurable
public C register(Class<?> providerClass, Map<Class<?>, Integer> contracts) {
return register(ConfigurationImpl.createProvider(providerClass), contracts);
}
-
+
private C doRegister(Object provider, int bindingPriority, Class<?>... contracts) {
return register(provider, ConfigurationImpl.initContractsMap(bindingPriority, contracts));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
index 9c0a8e6..0fc667d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
@@ -39,19 +39,19 @@ public class ConfigurationImpl implements Configuration {
private static final Logger LOG = LogUtils.getL7dLogger(ConfigurationImpl.class);
private Map<String, Object> props = new HashMap<String, Object>();
private RuntimeType runtimeType;
- private Map<Object, Map<Class<?>, Integer>> providers =
- new LinkedHashMap<Object, Map<Class<?>, Integer>>();
+ private Map<Object, Map<Class<?>, Integer>> providers =
+ new LinkedHashMap<Object, Map<Class<?>, Integer>>();
private Map<Feature, Boolean> features = new LinkedHashMap<Feature, Boolean>();
-
+
public ConfigurationImpl(RuntimeType rt) {
this.runtimeType = rt;
}
-
+
public ConfigurationImpl(Configuration parent, Class<?>[] defaultContracts) {
if (parent != null) {
this.props.putAll(parent.getProperties());
this.runtimeType = parent.getRuntimeType();
-
+
Set<Class<?>> providerClasses = new HashSet<Class<?>>(parent.getClasses());
for (Object o : parent.getInstances()) {
if (!(o instanceof Feature)) {
@@ -65,10 +65,10 @@ public class ConfigurationImpl implements Configuration {
for (Class<?> cls : providerClasses) {
registerParentProvider(createProvider(cls), parent, defaultContracts);
}
-
+
}
}
-
+
private void registerParentProvider(Object o, Configuration parent, Class<?>[] defaultContracts) {
Map<Class<?>, Integer> contracts = parent.getContracts(o.getClass());
if (contracts != null) {
@@ -77,7 +77,7 @@ public class ConfigurationImpl implements Configuration {
register(o, AnnotationUtils.getBindingPriority(o.getClass()), defaultContracts);
}
}
-
+
@Override
public Set<Class<?>> getClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
@@ -167,17 +167,17 @@ public class ConfigurationImpl implements Configuration {
props.put(name, value);
}
}
-
+
public void setFeature(Feature f, boolean enabled) {
features.put(f, enabled);
}
-
-
+
+
private void register(Object provider, int bindingPriority, Class<?>... contracts) {
register(provider, initContractsMap(bindingPriority, contracts));
}
-
- public boolean register(Object provider, Map<Class<?>, Integer> contracts) {
+
+ public boolean register(Object provider, Map<Class<?>, Integer> contracts) {
if (provider.getClass() == Class.class) {
if (isRegistered((Class<?>)provider)) {
LOG.warning("Provider class " + ((Class<?>)provider).getName() + " has already been registered");
@@ -189,7 +189,7 @@ public class ConfigurationImpl implements Configuration {
LOG.warning("Provider " + provider.getClass().getName() + " has already been registered");
return false;
}
-
+
Map<Class<?>, Integer> metadata = providers.get(provider);
if (metadata == null) {
metadata = new HashMap<Class<?>, Integer>();
@@ -202,7 +202,7 @@ public class ConfigurationImpl implements Configuration {
}
return true;
}
-
+
public static Map<Class<?>, Integer> initContractsMap(int bindingPriority, Class<?>... contracts) {
Map<Class<?>, Integer> metadata = new HashMap<Class<?>, Integer>();
for (Class<?> contract : contracts) {
@@ -210,12 +210,12 @@ public class ConfigurationImpl implements Configuration {
}
return metadata;
}
-
+
public static Object createProvider(Class<?> cls) {
try {
return cls.newInstance();
} catch (Throwable ex) {
- throw new RuntimeException(ex);
+ throw new RuntimeException(ex);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
index 94a8ce6..3dd0479 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerRequestContextImpl.java
@@ -33,11 +33,11 @@ import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.HttpUtils;
import org.apache.cxf.message.Message;
-public class ContainerRequestContextImpl extends AbstractRequestContextImpl
+public class ContainerRequestContextImpl extends AbstractRequestContextImpl
implements ContainerRequestContext {
private static final String ENDPOINT_ADDRESS_PROPERTY = "org.apache.cxf.transport.endpoint.address";
-
+
private boolean preMatch;
public ContainerRequestContextImpl(Message message, boolean preMatch, boolean responseContext) {
super(message, responseContext);
@@ -110,11 +110,11 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl
}
requestUri = URI.create(requestUriString);
}
-
+
}
doSetRequestUri(requestUri);
}
-
+
protected void doSetRequestUri(URI requestUri) throws IllegalStateException {
checkNotPreMatch();
HttpUtils.resetRequestURI(m, requestUri.getRawPath());
@@ -139,7 +139,7 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl
checkContext();
m.put(SecurityContext.class, sc);
if (sc instanceof org.apache.cxf.security.SecurityContext) {
- m.put(org.apache.cxf.security.SecurityContext.class,
+ m.put(org.apache.cxf.security.SecurityContext.class,
(org.apache.cxf.security.SecurityContext)sc);
}
}
@@ -149,8 +149,8 @@ public class ContainerRequestContextImpl extends AbstractRequestContextImpl
throw new IllegalStateException();
}
}
-
- @Override
+
+ @Override
public void setMethod(String method) throws IllegalStateException {
checkNotPreMatch();
super.setMethod(method);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java
index 44fc249..47f4708 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ContainerResponseContextImpl.java
@@ -29,13 +29,13 @@ import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.utils.InjectionUtils;
import org.apache.cxf.message.Message;
-public class ContainerResponseContextImpl extends AbstractResponseContextImpl
+public class ContainerResponseContextImpl extends AbstractResponseContextImpl
implements ContainerResponseContext {
private Class<?> serviceCls;
private Method invoked;
-
- public ContainerResponseContextImpl(ResponseImpl r,
+
+ public ContainerResponseContextImpl(ResponseImpl r,
Message m,
Class<?> serviceCls,
Method invoked) {
@@ -43,7 +43,7 @@ public class ContainerResponseContextImpl extends AbstractResponseContextImpl
this.serviceCls = serviceCls;
this.invoked = invoked;
}
-
+
@Override
public Annotation[] getEntityAnnotations() {
return super.getResponseEntityAnnotations();
@@ -57,17 +57,17 @@ public class ContainerResponseContextImpl extends AbstractResponseContextImpl
@Override
public Type getEntityType() {
return InjectionUtils.getGenericResponseType(invoked,
- serviceCls,
- super.r.getActualEntity(),
- getEntityClass(),
+ serviceCls,
+ super.r.getActualEntity(),
+ getEntityClass(),
super.m.getExchange());
}
-
+
@Override
public MultivaluedMap<String, Object> getHeaders() {
return r.getMetadata();
}
-
+
@Override
public OutputStream getEntityStream() {
return m.getContent(OutputStream.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
index 89df061..2ef296e 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/CookieHeaderProvider.java
@@ -28,19 +28,19 @@ public class CookieHeaderProvider implements HeaderDelegate<Cookie> {
private static final String VERSION = "$Version";
private static final String PATH = "$Path";
private static final String DOMAIN = "$Domain";
-
+
public Cookie fromString(String c) {
-
+
if (c == null) {
throw new IllegalArgumentException("Cookie value can not be null");
}
-
+
int version = 0;
String name = null;
String value = null;
String path = null;
String domain = null;
-
+
// ignore the fact the possible version may be seperated by ','
String[] tokens = StringUtils.split(c, ";");
for (String token : tokens) {
@@ -56,22 +56,22 @@ public class CookieHeaderProvider implements HeaderDelegate<Cookie> {
int i = theToken.indexOf('=');
if (i != -1) {
name = theToken.substring(0, i);
- value = i == theToken.length() + 1 ? ""
+ value = i == theToken.length() + 1 ? ""
: NewCookieHeaderProvider.stripQuotes(theToken.substring(i + 1));
}
}
}
-
+
if (name == null || value == null) {
throw new IllegalArgumentException("Cookie is malformed : " + c);
}
-
+
return new Cookie(name, value, path, domain, version);
}
public String toString(Cookie c) {
StringBuilder sb = new StringBuilder();
-
+
if (c.getVersion() != 0) {
sb.append(VERSION).append('=').append(c.getVersion()).append(';');
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java
index 2d2e046..c1ac24f 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/DateHeaderProvider.java
@@ -26,9 +26,9 @@ import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
import org.apache.cxf.jaxrs.utils.HttpUtils;
public class DateHeaderProvider implements HeaderDelegate<Date> {
-
+
public Date fromString(String value) {
-
+
if (value == null) {
throw new IllegalArgumentException("Date value can not be null");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
index 4cfa6fb..9d5a58a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
@@ -25,18 +25,18 @@ import javax.ws.rs.ext.RuntimeDelegate.HeaderDelegate;
public class EntityTagHeaderProvider implements HeaderDelegate<EntityTag> {
private static final String WEAK_PREFIX = "W/";
-
+
public EntityTag fromString(String header) {
-
-
+
+
if (header == null) {
throw new IllegalArgumentException("ETag value can not be null");
}
-
+
if ("*".equals(header)) {
return new EntityTag("*");
}
-
+
String tag = null;
boolean weak = false;
int i = header.indexOf(WEAK_PREFIX);
@@ -56,7 +56,7 @@ public class EntityTagHeaderProvider implements HeaderDelegate<EntityTag> {
if (tag.length() < 2 || !tag.startsWith("\"") || !tag.endsWith("\"")) {
throw new IllegalArgumentException("Misformatted ETag : " + header);
}
- tag = tag.length() == 2 ? "" : tag.substring(1, tag.length() - 1);
+ tag = tag.length() == 2 ? "" : tag.substring(1, tag.length() - 1);
return new EntityTag(tag, weak);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java
index 3ee6379..33211c3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/FeatureContextImpl.java
@@ -31,7 +31,7 @@ public class FeatureContextImpl implements FeatureContext {
}
public FeatureContextImpl() {
}
-
+
@Override
public Configuration getConfiguration() {
return cfg.getConfiguration();
@@ -95,5 +95,5 @@ public class FeatureContextImpl implements FeatureContext {
}
public void setConfigurable(Configurable<?> configurable) {
this.cfg = configurable;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
index 042ce89..f4b9a28 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java
@@ -61,8 +61,8 @@ public class HttpHeadersImpl implements HttpHeaders {
private static final String COOKIE_VERSION_PARAM = DOLLAR_CHAR + "Version";
private static final String COOKIE_PATH_PARAM = DOLLAR_CHAR + "Path";
private static final String COOKIE_DOMAIN_PARAM = DOLLAR_CHAR + "Domain";
-
- private static final String COMPLEX_HEADER_EXPRESSION =
+
+ private static final String COMPLEX_HEADER_EXPRESSION =
"(([\\w]+=\"[^\"]*\")|([\\w]+=[\\w]+)|([\\w]+))(;(([\\w]+=\"[^\"]*\")|([\\w]+=[\\w]+)|([\\w]+)))?";
private static final Pattern COMPLEX_HEADER_PATTERN =
Pattern.compile(COMPLEX_HEADER_EXPRESSION);
@@ -78,8 +78,8 @@ public class HttpHeadersImpl implements HttpHeaders {
HEADERS_WITH_POSSIBLE_QUOTES.add(HttpHeaders.COOKIE);
HEADERS_WITH_POSSIBLE_QUOTES.add(HttpHeaders.SET_COOKIE);
}
-
-
+
+
private Message message;
private Map<String, List<String>> headers;
public HttpHeadersImpl(Message message) {
@@ -89,7 +89,7 @@ public class HttpHeadersImpl implements HttpHeaders {
headers = Collections.emptyMap();
}
}
-
+
public List<MediaType> getAcceptableMediaTypes() {
List<String> lValues = headers.get(HttpHeaders.ACCEPT);
if (lValues == null || lValues.isEmpty() || lValues.get(0) == null) {
@@ -99,7 +99,7 @@ public class HttpHeadersImpl implements HttpHeaders {
for (String value : lValues) {
mediaTypes.addAll(JAXRSUtils.parseMediaTypes(value));
}
- sortMediaTypesUsingQualityFactor(mediaTypes);
+ sortMediaTypesUsingQualityFactor(mediaTypes);
return mediaTypes;
}
@@ -108,15 +108,15 @@ public class HttpHeadersImpl implements HttpHeaders {
if (values == null || values.isEmpty()) {
return Collections.emptyMap();
}
-
+
Map<String, Cookie> cl = new HashMap<String, Cookie>();
for (String value : values) {
if (value == null) {
continue;
}
-
-
- List<String> cs = getHeaderValues(HttpHeaders.COOKIE, value,
+
+
+ List<String> cs = getHeaderValues(HttpHeaders.COOKIE, value,
getCookieSeparator(value));
for (String c : cs) {
Cookie cookie = Cookie.valueOf(c);
@@ -137,7 +137,7 @@ public class HttpHeadersImpl implements HttpHeaders {
|| value.contains(COOKIE_DOMAIN_PARAM))) {
return DEFAULT_SEPARATOR;
}
-
+
return DEFAULT_COOKIE_SEPARATOR;
}
}
@@ -155,8 +155,8 @@ public class HttpHeadersImpl implements HttpHeaders {
} else {
return null;
}
- }
-
+ }
+
public Locale getLanguage() {
List<String> values = getListValues(HttpHeaders.CONTENT_LANGUAGE);
return values.size() == 0 ? null : HttpUtils.getLocale(values.get(0).trim());
@@ -168,10 +168,10 @@ public class HttpHeadersImpl implements HttpHeaders {
}
public MultivaluedMap<String, String> getRequestHeaders() {
- boolean splitIndividualValue
+ boolean splitIndividualValue
= MessageUtils.isTrue(message.getContextualProperty(HEADER_SPLIT_PROPERTY));
if (splitIndividualValue) {
- Map<String, List<String>> newHeaders =
+ Map<String, List<String>> newHeaders =
new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
newHeaders.put(entry.getKey(), getRequestHeader(entry.getKey()));
@@ -187,14 +187,14 @@ public class HttpHeadersImpl implements HttpHeaders {
if (ls.isEmpty()) {
return Collections.singletonList(new Locale("*"));
}
-
- List<Locale> newLs = new ArrayList<>();
+
+ List<Locale> newLs = new ArrayList<>();
Map<Locale, Float> prefs = new HashMap<Locale, Float>();
for (String l : ls) {
String[] pair = StringUtils.split(l, ";");
-
+
Locale locale = HttpUtils.getLocale(pair[0].trim());
-
+
newLs.add(locale);
if (pair.length > 1) {
String[] pair2 = StringUtils.split(pair[1], "=");
@@ -210,23 +210,23 @@ public class HttpHeadersImpl implements HttpHeaders {
if (newLs.size() <= 1) {
return newLs;
}
-
+
Collections.sort(newLs, new AcceptLanguageComparator(prefs));
return newLs;
-
+
}
public List<String> getRequestHeader(String name) {
- boolean splitIndividualValue
+ boolean splitIndividualValue
= MessageUtils.isTrue(message.getContextualProperty(HEADER_SPLIT_PROPERTY));
-
+
List<String> values = headers.get(name);
if (!splitIndividualValue
|| values == null
|| HttpUtils.isDateRelatedHeader(name)) {
return values;
}
-
+
List<String> ls = new LinkedList<String>();
for (String value : values) {
if (value == null) {
@@ -252,11 +252,11 @@ public class HttpHeadersImpl implements HttpHeaders {
}
return actualValues;
}
-
+
private List<String> getHeaderValues(String headerName, String originalValue) {
return getHeaderValues(headerName, originalValue, DEFAULT_SEPARATOR);
}
-
+
private List<String> getHeaderValues(String headerName, String originalValue, String sep) {
if (!originalValue.contains(QUOTE)
|| HEADERS_WITH_POSSIBLE_QUOTES.contains(headerName)) {
@@ -272,7 +272,7 @@ public class HttpHeadersImpl implements HttpHeaders {
}
}
if (originalValue.startsWith("\"") && originalValue.endsWith("\"")) {
- String actualValue = originalValue.length() == 2 ? ""
+ String actualValue = originalValue.length() == 2 ? ""
: originalValue.substring(1, originalValue.length() - 1);
return Collections.singletonList(actualValue);
}
@@ -286,10 +286,10 @@ public class HttpHeadersImpl implements HttpHeaders {
}
return values;
}
-
+
private static class AcceptLanguageComparator implements Comparator<Locale> {
private Map<Locale, Float> prefs;
-
+
AcceptLanguageComparator(Map<Locale, Float> prefs) {
this.prefs = prefs;
}
@@ -300,7 +300,7 @@ public class HttpHeadersImpl implements HttpHeaders {
return Float.compare(p1, p2) * -1;
}
}
-
+
private void sortMediaTypesUsingQualityFactor(List<MediaType> types) {
if (types.size() > 1) {
Collections.sort(types, new Comparator<MediaType>() {
@@ -308,7 +308,7 @@ public class HttpHeadersImpl implements HttpHeaders {
public int compare(MediaType mt1, MediaType mt2) {
return JAXRSUtils.compareMediaTypesQualityFactors(mt1, mt2);
}
-
+
});
}
}
@@ -332,5 +332,5 @@ public class HttpHeadersImpl implements HttpHeaders {
}
return HttpUtils.getContentLength(values.get(0));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
index eb1758a..b1724f3 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletRequestFilter.java
@@ -109,10 +109,10 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
public String nextElement() {
return it.next();
}
-
+
};
}
-
+
private void readFromParamsIfNeeded() {
if (formParams == null) {
formParams = new MetadataMap<String, String>();
@@ -121,7 +121,7 @@ public class HttpServletRequestFilter extends HttpServletRequestWrapper {
String body = FormUtils.readBody(m.getContent(InputStream.class), enc);
FormUtils.populateMapFromString(formParams, m, body, enc, true);
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java
index e9b1e1f..1a64f16 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/HttpServletResponseFilter.java
@@ -39,13 +39,13 @@ public class HttpServletResponseFilter extends HttpServletResponseWrapper {
super.setStatus(sc);
m.getExchange().put(Message.RESPONSE_CODE, sc);
}
-
+
@Override
public void setContentType(String ct) {
super.setContentType(ct);
m.getExchange().put(Message.CONTENT_TYPE, ct);
}
-
+
@Override
public void addHeader(String name, String value) {
if (Message.CONTENT_TYPE.equals(name)) {
@@ -54,7 +54,7 @@ public class HttpServletResponseFilter extends HttpServletResponseWrapper {
super.addHeader(name, value);
}
}
-
+
@Override
public ServletOutputStream getOutputStream() throws IOException {
return new ServletOutputStreamFilter(super.getOutputStream(), m);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
index 2b99c98..0e23048 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkBuilderImpl.java
@@ -40,7 +40,7 @@ public class LinkBuilderImpl implements Builder {
private UriBuilder ub;
private URI baseUri;
private Map<String, String> params = new HashMap<String, String>(6);
-
+
@Override
public Link build(Object... values) {
URI resolvedLinkUri = getResolvedUri(values);
@@ -58,20 +58,20 @@ public class LinkBuilderImpl implements Builder {
if (ub == null) {
ub = new UriBuilderImpl();
if (baseUri != null) {
- ub.uri(baseUri);
+ ub.uri(baseUri);
}
-
+
}
URI uri = ub.build(values);
-
+
if (!uri.isAbsolute() && baseUri != null && baseUri.isAbsolute()) {
UriBuilder linkUriBuilder = UriBuilder.fromUri(baseUri);
- return HttpUtils.resolve(linkUriBuilder, uri);
+ return HttpUtils.resolve(linkUriBuilder, uri);
} else {
return uri;
}
}
-
+
@Override
public Builder link(Link link) {
ub = UriBuilder.fromLink(link);
@@ -81,7 +81,7 @@ public class LinkBuilderImpl implements Builder {
@Override
public Builder link(String link) {
-
+
link = link.trim();
if (link.length() > 1 && link.startsWith("<")) {
int index = link.lastIndexOf(">", link.length());
@@ -95,7 +95,7 @@ public class LinkBuilderImpl implements Builder {
}
}
}
-
+
String[] tokens = StringUtils.split(link, ";");
for (String token : tokens) {
String theToken = token.trim();
@@ -122,7 +122,7 @@ public class LinkBuilderImpl implements Builder {
@Override
public Builder rel(String rel) {
String exisingRel = params.get(Link.REL);
- String newRel = exisingRel == null ? rel : exisingRel + " " + rel;
+ String newRel = exisingRel == null ? rel : exisingRel + " " + rel;
return param(Link.REL, newRel);
}
@@ -163,18 +163,18 @@ public class LinkBuilderImpl implements Builder {
throw new IllegalArgumentException(value);
}
}
-
+
static class LinkImpl extends Link {
- private static final Set<String> MAIN_PARAMETERS =
+ private static final Set<String> MAIN_PARAMETERS =
new HashSet<>(Arrays.asList(Link.REL, Link.TITLE, Link.TYPE));
-
+
private URI uri;
private Map<String, String> params;
LinkImpl(URI uri, Map<String, String> params) {
this.uri = uri;
this.params = params;
}
-
+
@Override
public Map<String, String> getParams() {
return Collections.unmodifiableMap(params);
@@ -243,18 +243,18 @@ public class LinkBuilderImpl implements Builder {
}
}
return sb.toString();
- }
-
+ }
+
@Override
public int hashCode() {
return uri.hashCode() + 37 * params.hashCode();
}
-
+
@Override
public boolean equals(Object o) {
if (o instanceof Link) {
Link other = (Link)o;
- return uri.equals(other.getUri())
+ return uri.equals(other.getUri())
&& getParams().equals(other.getParams());
} else {
return false;
@@ -271,6 +271,6 @@ public class LinkBuilderImpl implements Builder {
@Override
public Builder baseUri(String uri) {
baseUri = URI.create(uri);
- return this;
+ return this;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
index 36c22dd..5bcc2f6 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/LinkHeaderProvider.java
@@ -34,14 +34,14 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
private static final String REL = "rel";
private static final String TYPE = "type";
private static final String TITLE = "title";
-
+
private static final Set<String> KNOWN_PARAMETERS;
static {
KNOWN_PARAMETERS = new HashSet<>(Arrays.asList(REL, TYPE, TITLE));
}
-
+
public Link fromString(String value) {
-
+
if (value == null) {
throw new IllegalArgumentException("Link value can not be null");
}
@@ -53,7 +53,7 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
Link.Builder builder = new LinkBuilderImpl();
builder.uri(value.substring(1, closeIndex).trim());
if (closeIndex < value.length() - 1) {
-
+
String[] tokens = StringUtils.split(value.substring(closeIndex + 1), ";");
for (String token : tokens) {
String theToken = token.trim();
@@ -82,7 +82,7 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
}
}
return builder.build();
-
+
}
private String removeQuotesIfNeeded(String value) {
@@ -92,14 +92,14 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
return value;
}
}
-
+
public String toString(Link link) {
StringBuilder sb = new StringBuilder();
-
+
sb.append('<');
sb.append(link.getUri());
sb.append('>');
-
+
String rels = link.getRel();
if (!rels.isEmpty()) {
sb.append(";").append(REL).append('=');
@@ -118,9 +118,9 @@ public class LinkHeaderProvider implements HeaderDelegate<Link> {
sb.append(";").append(entry.getKey()).append('=');
writeListParamValues(sb, entry.getValue());
}
-
+
return sb.toString();
-
+
}
private void writeListParamValues(StringBuilder sb, String value) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
index 5d297b6..281d0ca 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
@@ -41,17 +41,17 @@ import org.apache.cxf.phase.PhaseInterceptorChain;
public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
private static final Logger LOG = LogUtils.getL7dLogger(MediaTypeHeaderProvider.class);
- private static final String STRICT_MEDIA_TYPE_CHECK =
+ private static final String STRICT_MEDIA_TYPE_CHECK =
"org.apache.cxf.jaxrs.mediaTypeCheck.strict";
- private static final Pattern COMPLEX_PARAMETERS =
+ private static final Pattern COMPLEX_PARAMETERS =
Pattern.compile("(([\\w-]+=\"[^\"]*\")|([\\w-]+=[\\w-/\\+]+))");
-
+
private static Map<String, MediaType> map = new ConcurrentHashMap<String, MediaType>();
- private static final int MAX_MT_CACHE_SIZE =
+ private static final int MAX_MT_CACHE_SIZE =
Integer.getInteger("org.apache.cxf.jaxrs.max_mediatype_cache_size", 200);
public MediaType fromString(String mType) {
-
+
return valueOf(mType);
}
@@ -59,7 +59,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
if (mType == null) {
throw new IllegalArgumentException("Media type value can not be null");
}
-
+
MediaType result = map.get(mType);
if (result == null) {
result = internalValueOf(mType);
@@ -73,28 +73,28 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
public static MediaType internalValueOf(String mType) {
-
+
int i = mType.indexOf('/');
if (i == -1) {
return handleMediaTypeWithoutSubtype(mType.trim());
} else if (i == 0) {
throw new IllegalArgumentException("Invalid media type string: " + mType);
}
-
+
int paramsStart = mType.indexOf(';', i + 1);
int end = paramsStart == -1 ? mType.length() : paramsStart;
-
- String type = mType.substring(0, i);
+
+ String type = mType.substring(0, i);
String subtype = mType.substring(i + 1, end);
if (subtype.indexOf("/") != -1) {
throw new IllegalArgumentException("Invalid media type string: " + mType);
}
-
+
Map<String, String> parameters = Collections.emptyMap();
if (paramsStart != -1) {
parameters = new LinkedHashMap<String, String>();
-
+
String paramString = mType.substring(paramsStart + 1);
if (paramString.contains("\"")) {
Matcher m = COMPLEX_PARAMETERS.matcher(paramString);
@@ -109,28 +109,28 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
}
}
-
- return new MediaType(type.trim().toLowerCase(),
- subtype.trim().toLowerCase(),
+
+ return new MediaType(type.trim().toLowerCase(),
+ subtype.trim().toLowerCase(),
parameters);
}
-
+
private static void addParameter(Map<String, String> parameters, String token) {
int equalSign = token.indexOf('=');
if (equalSign == -1) {
throw new IllegalArgumentException("Wrong media type parameter, separator is missing");
}
- parameters.put(token.substring(0, equalSign).trim().toLowerCase(),
+ parameters.put(token.substring(0, equalSign).trim().toLowerCase(),
token.substring(equalSign + 1).trim());
}
-
+
public String toString(MediaType type) {
return typeToString(type);
}
public static String typeToString(MediaType type) {
return typeToString(type, null);
}
- // Max number of parameters that may be ignored is 3, at least as known
+ // Max number of parameters that may be ignored is 3, at least as known
// to the implementation
public static String typeToString(MediaType type, List<String> ignoreParams) {
if (type == null) {
@@ -138,7 +138,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
}
StringBuilder sb = new StringBuilder();
sb.append(type.getType()).append('/').append(type.getSubtype());
-
+
Map<String, String> params = type.getParameters();
if (params != null) {
for (Iterator<Map.Entry<String, String>> iter = params.entrySet().iterator();
@@ -150,7 +150,7 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
sb.append(';').append(entry.getKey()).append('=').append(entry.getValue());
}
}
-
+
return sb.toString();
}
@@ -168,14 +168,14 @@ public class MediaTypeHeaderProvider implements HeaderDelegate<MediaType> {
return new MediaType(MediaType.MEDIA_TYPE_WILDCARD,
MediaType.MEDIA_TYPE_WILDCARD,
parameters);
- } else {
+ } else {
return MediaType.WILDCARD_TYPE;
}
-
+
}
}
Message message = PhaseInterceptorChain.getCurrentMessage();
- if (message != null
+ if (message != null
&& !MessageUtils.isTrue(message.getContextualProperty(STRICT_MEDIA_TYPE_CHECK))) {
MediaType mt = null;
if (mType.equals(MediaType.TEXT_PLAIN_TYPE.getType())) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
index abd88dc..f228737 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/MetadataMap.java
@@ -37,36 +37,36 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
private boolean caseInsensitive;
private boolean readOnly;
private Map<K, List<V>> m;
-
+
public MetadataMap() {
this.m = new LinkedHashMap<K, List<V>>();
}
-
+
public MetadataMap(int size) {
this.m = new LinkedHashMap<K, List<V>>(size);
}
-
+
public MetadataMap(Map<K, List<V>> store) {
this(store, true);
}
-
+
public MetadataMap(Map<K, List<V>> store, boolean copy) {
this(store, copy, false, false);
}
-
+
public MetadataMap(boolean readOnly, boolean caseInsensitive) {
this(null, readOnly, caseInsensitive);
}
-
+
public MetadataMap(Map<K, List<V>> store, boolean readOnly, boolean caseInsensitive) {
-
+
this (store, true, readOnly, caseInsensitive);
-
+
}
-
- public MetadataMap(Map<K, List<V>> store, boolean copyStore,
+
+ public MetadataMap(Map<K, List<V>> store, boolean copyStore,
boolean readOnly, boolean caseInsensitive) {
-
+
if (copyStore) {
this.m = new LinkedHashMap<K, List<V>>();
if (store != null) {
@@ -83,13 +83,13 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
}
this.caseInsensitive = caseInsensitive;
this.readOnly = readOnly;
-
+
}
-
+
public void add(K key, V value) {
addValue(key, value, true);
}
-
+
private void addValue(K key, V value, boolean last) {
List<V> data = getList(key);
try {
@@ -113,12 +113,12 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
private List<V> getList(K key) {
List<V> data = this.get(key);
if (data == null) {
- data = new ArrayList<>();
+ data = new ArrayList<>();
m.put(key, data);
}
return readOnly ? Collections.unmodifiableList(data) : data;
}
-
+
public V getFirst(K key) {
List<V> data = this.get(key);
return data == null || data.isEmpty() ? null : data.get(0);
@@ -156,7 +156,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
K realKey = getMatchingKey(key);
return realKey == null ? null : m.get(realKey);
}
-
+
private K getMatchingKey(Object key) {
for (K entry : m.keySet()) {
if (entry != null && entry.toString().equalsIgnoreCase(key.toString())
@@ -217,16 +217,16 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
public int hashCode() {
return m.hashCode();
}
-
+
@Override
public boolean equals(Object o) {
return m.equals(o);
}
-
+
public String toString() {
return m.toString();
}
-
+
private static class KeyComparator<K> implements Comparator<K> {
public int compare(K k1, K k2) {
@@ -234,7 +234,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
String s2 = k2.toString();
return s1.compareToIgnoreCase(s2);
}
-
+
}
@SafeVarargs
@@ -255,7 +255,7 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
}
getList(key).addAll(newValues);
}
-
+
public void addFirst(K key, V value) {
addValue(key, value, false);
}
@@ -265,11 +265,11 @@ public class MetadataMap<K, V> implements MultivaluedMap<K, V> {
if (mapKeys.size() != m.keySet().size()) {
return false;
}
-
+
for (K key : mapKeys) {
List<V> localValues = this.get(key);
List<V> mapValues = map.get(key);
- if (localValues == null
+ if (localValues == null
|| localValues.size() != mapValues.size()
|| !localValues.containsAll(mapValues)) {
return false;
[22/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
index 5231747..cb5cc77 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBActivationSpec.java
@@ -21,16 +21,16 @@ package org.apache.cxf.jca.inbound;
/**
*
* DispatchMDBActivationSpec is an {@link javax.resource.spi.ActivationSpec}
- * that activates a CXF service endpoint facade to dispatch call to the target
+ * that activates a CXF service endpoint facade to dispatch call to the target
* Stateless Session Bean.
- *
+ *
*/
public class DispatchMDBActivationSpec extends MDBActivationSpec {
private String targetBeanJndiName;
/**
- * @param targetBeanJndiName
+ * @param targetBeanJndiName
*/
public void setTargetBeanJndiName(String targetBeanJndiName) {
this.targetBeanJndiName = targetBeanJndiName;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
index 3f02803..03ae56d 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
@@ -30,15 +30,15 @@ import org.apache.cxf.message.Exchange;
/**
* DispatchMDBInvoker is executed in the context of a Message Driven Bean
* that dispatches calls to the target Session Bean where the service logic is
- * implemented. The target must be a Stateless Session Bean. Since
- * DispatchMDBInvoker makes EJB local invocation to the target bean, the
+ * implemented. The target must be a Stateless Session Bean. Since
+ * DispatchMDBInvoker makes EJB local invocation to the target bean, the
* Message Driven Bean must be configured to include a local reference to
* the target bean in the deployment descriptor. The advantage of using
- * DispatchMDBInvoker is that no modification to the resource adapter's
+ * DispatchMDBInvoker is that no modification to the resource adapter's
* deployment descriptor (ra.xml) is required to add or remove inbound endpoints.
*/
public class DispatchMDBInvoker extends MDBInvoker {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(DispatchMDBInvoker.class);
private String targetJndiName;
@@ -50,29 +50,29 @@ public class DispatchMDBInvoker extends MDBInvoker {
super(factory);
this.targetJndiName = targetJndiName;
}
-
+
@Override
public Object getServiceObject(Exchange context) {
MessageEndpoint ep = null;
MessageEndpoint epFromMessage = null;
-
+
if (context != null) {
epFromMessage = context.getInMessage().getContent(MessageEndpoint.class);
}
-
+
if (epFromMessage == null) {
ep = getMessageEndpoint();
} else {
ep = epFromMessage;
}
-
+
Object target = null;
if (ep == null) {
LOG.log(Level.SEVERE, "Failed to obtain MessageEndpoint");
return null;
}
-
+
try {
target = ((DispatchMDBMessageListener)ep)
.lookupTargetObject(targetJndiName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
index 87eaeec..10aba8b 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListener.java
@@ -20,9 +20,9 @@ package org.apache.cxf.jca.inbound;
/**
- * The DispatchMDBMessageListener is intended to be used as the
- * <messagelistener-type> of an <inbound-resourcesadapter> in the resource
- * adapter's deployment descriptor (ra.xml). The default implementation
+ * The DispatchMDBMessageListener is intended to be used as the
+ * <messagelistener-type> of an <inbound-resourcesadapter> in the resource
+ * adapter's deployment descriptor (ra.xml). The default implementation
* class is {@link DispatchMDBMessageListenerImpl}.
* The benefit of using DispatchMDBMessageListener is that users
* are not required to put the Service Endpoint Interface (SEI) in the resource
@@ -33,7 +33,7 @@ public interface DispatchMDBMessageListener {
/**
* Looks up the target object by JNDI name.
- *
+ *
* @param targetJndiName
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
index d543463..d889a06 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBMessageListenerImpl.java
@@ -25,24 +25,24 @@ import javax.ejb.MessageDrivenContext;
import javax.naming.InitialContext;
/**
- * DispatchMDBMessageListenerImpl supports dispatching of calls to a
+ * DispatchMDBMessageListenerImpl supports dispatching of calls to a
* Stateless Session Bean.
- *
+ *
* DispatchMDBMessageListenerImpl is intended to be used as the <ejb-class> of
* the <message-driven> bean in the resource adaptor's deployment descriptor
- * (ra.xml). When it is used, the <messaging-type> should be set to
+ * (ra.xml). When it is used, the <messaging-type> should be set to
* org.apache.cxf.jca.inbound.DispatchMDBMessageListener. Also, the resource
* adaptor's deployment descriptor should specify the same interface
- * (org.apache.cxf.jca.inbound.DispatchMDBMessageListener) in the
- * <messagelistener-type> in order to activate the inbound facade endpoint.
- * Since the Message Driven Bean is used to activate the inbound
- * endpoint facade by CXF JCA connector, all the required resources (such as,
- * service endpoint interface class, WSDL, or bus configuration) should be put
- * in the same jar with the Message Driven Bean.
+ * (org.apache.cxf.jca.inbound.DispatchMDBMessageListener) in the
+ * <messagelistener-type> in order to activate the inbound facade endpoint.
+ * Since the Message Driven Bean is used to activate the inbound
+ * endpoint facade by CXF JCA connector, all the required resources (such as,
+ * service endpoint interface class, WSDL, or bus configuration) should be put
+ * in the same jar with the Message Driven Bean.
*/
-public class DispatchMDBMessageListenerImpl
+public class DispatchMDBMessageListenerImpl
implements MessageDrivenBean, DispatchMDBMessageListener {
-
+
private static final long serialVersionUID = -8428728265893081763L;
/**
@@ -65,6 +65,6 @@ public class DispatchMDBMessageListenerImpl
public void setMessageDrivenContext(MessageDrivenContext mdc) {
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
index 5ce741c..d39c968 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
@@ -23,20 +23,20 @@ import org.apache.cxf.endpoint.Server;
/**
* An inbound endpoint is a CXF service endpoint facade exposed by
- * the JCA connector. Its role is to accept service requests from
- * ordinary CXF clients and forward them to an invoker (running in
+ * the JCA connector. Its role is to accept service requests from
+ * ordinary CXF clients and forward them to an invoker (running in
* the context of the activating message driven bean). The invoker
* either contains the service implementation or dispatches the call
- * to a Stateless Session Bean. This class holds objects that are
- * needed to accomplish the task and provides a shutdown method to
- * clean up the endpoint.
- *
+ * to a Stateless Session Bean. This class holds objects that are
+ * needed to accomplish the task and provides a shutdown method to
+ * clean up the endpoint.
+ *
*/
public class InboundEndpoint {
-
+
private Server server;
private MDBInvoker invoker;
-
+
/**
* @param server the server object that has already been started
* @param invoker the invoker that invoker an EJB
@@ -45,7 +45,7 @@ public class InboundEndpoint {
this.server = server;
this.invoker = invoker;
}
-
+
/**
* @return the invoker
*/
@@ -79,16 +79,16 @@ public class InboundEndpoint {
/**
* Shuts down the endpoint
- *
+ *
* @throws Exception
*/
public void shutdown() throws Exception {
invoker = null;
-
+
if (server != null) {
server.destroy();
server = null;
- }
+ }
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
index 86b6646..ad513d3 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationSpec.java
@@ -25,7 +25,7 @@ import javax.resource.spi.ResourceAdapter;
/**
* MDBActivationSpec is an {@link javax.resource.spi.ActivationSpec} that
- * activates a CXF service endpoint facade. All resource locations are
+ * activates a CXF service endpoint facade. All resource locations are
* relative to the message driven bean jar.
*
*/
@@ -40,18 +40,18 @@ public class MDBActivationSpec implements ActivationSpec {
private String endpointName;
private String serviceName;
private String displayName;
-
+
/**
- * Gets the transport address used by
+ * Gets the transport address used by
* {@link org.apache.cxf.frontend.ServerFactoryBean}.
- *
+ *
* @return the address
*/
public String getAddress() {
return address;
}
- /**
+ /**
* @return the busConfigLocation
*/
public String getBusConfigLocation() {
@@ -66,7 +66,7 @@ public class MDBActivationSpec implements ActivationSpec {
}
/**
- *
+ *
* @return the endpointName
*/
public String getEndpointName() {
@@ -79,7 +79,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
* Comma separated schema locations
- *
+ *
* @return the schemaLocations
*/
public String getSchemaLocations() {
@@ -88,10 +88,10 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- * Gets the service endpoint interface classname.
- *
+ * Gets the service endpoint interface classname.
+ *
* The class should be available in the Message Driven Bean jar.
- *
+ *
* @return the serviceInterfaceClass
*/
public String getServiceInterfaceClass() {
@@ -107,7 +107,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- *
+ *
* @return the wsdlLocation
*/
public String getWsdlLocation() {
@@ -116,9 +116,9 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- * Sets the transport address used by
+ * Sets the transport address used by
* {@link org.apache.cxf.frontend.ServerFactoryBean}.
- *
+ *
* @param address the address to set
*/
public void setAddress(String address) {
@@ -127,7 +127,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- *
+ *
* @param busConfigLocation the busConfigLocation to set
*/
public void setBusConfigLocation(String busConfigLocation) {
@@ -138,7 +138,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
* A unique name that is readable to human and it is to
* identify an inbound endpoint within a application server.
- *
+ *
* @param displayName the displayName to set
*/
public void setDisplayName(String displayName) {
@@ -158,7 +158,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
* Comma separated schema locations
- *
+ *
* @param schemaLocations the schemaLocations to set
*/
public void setSchemaLocations(String schemaLocations) {
@@ -181,7 +181,7 @@ public class MDBActivationSpec implements ActivationSpec {
/**
- *
+ *
* @param wsdlLocation the wsdlLocation to set
*/
public void setWsdlLocation(String wsdlLocation) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
index 0b7168a..cc63164 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
@@ -44,14 +44,14 @@ import org.apache.cxf.service.model.EndpointInfo;
/**
*
- * MDBActivationWork is a type of {@link Work} that is executed by
+ * MDBActivationWork is a type of {@link Work} that is executed by
* {@link javax.resource.spi.work.WorkManager}. MDBActivationWork
* starts an CXF service endpoint to accept inbound calls for
* the JCA connector.
- *
+ *
*/
public class MDBActivationWork implements Work {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(MDBActivationWork.class);
private static final String MESSAGE_LISTENER_METHOD = "lookupTargetObject";
private static final String MESSAGE_ENDPOINT_FACTORY = "MessageEndpointFactory";
@@ -62,8 +62,8 @@ public class MDBActivationWork implements Work {
private Map<String, InboundEndpoint> endpoints;
- public MDBActivationWork(MDBActivationSpec spec,
- MessageEndpointFactory endpointFactory,
+ public MDBActivationWork(MDBActivationSpec spec,
+ MessageEndpointFactory endpointFactory,
Map<String, InboundEndpoint> endpoints) {
this.spec = spec;
this.endpointFactory = endpointFactory;
@@ -81,9 +81,9 @@ public class MDBActivationWork implements Work {
MDBInvoker invoker = createInvoker();
MessageEndpoint mep = invoker.getMessageEndpoint();
if (mep == null) {
- return;
+ return;
}
-
+
ClassLoader savedClassLoader = null;
try {
@@ -98,10 +98,10 @@ public class MDBActivationWork implements Work {
}
}
}
-
+
/**
* @param endpoint
- * @param classLoader
+ * @param classLoader
*/
private void activate(MDBInvoker invoker, ClassLoader classLoader) {
Class<?> serviceClass = null;
@@ -110,28 +110,28 @@ public class MDBActivationWork implements Work {
serviceClass = Class.forName(spec.getServiceInterfaceClass(),
false, classLoader);
} catch (ClassNotFoundException e) {
- LOG.severe("Failed to activate service endpoint "
- + spec.getDisplayName()
+ LOG.severe("Failed to activate service endpoint "
+ + spec.getDisplayName()
+ " due to unable to endpoint listener.");
return;
- }
+ }
}
-
+
Bus bus = null;
if (spec.getBusConfigLocation() != null) {
URL url = classLoader.getResource(spec.getBusConfigLocation());
if (url == null) {
- LOG.warning("Unable to get bus configuration from "
+ LOG.warning("Unable to get bus configuration from "
+ spec.getBusConfigLocation());
- } else {
+ } else {
bus = new SpringBusFactory().createBus(url);
}
}
-
+
if (bus == null) {
bus = BusFactory.getDefaultBus();
}
-
+
Method method = null;
try {
@@ -143,18 +143,18 @@ public class MDBActivationWork implements Work {
}
Server server = createServer(bus, serviceClass, invoker);
-
+
if (server == null) {
LOG.severe("Failed to create CXF facade service endpoint.");
return;
}
-
+
EndpointInfo ei = server.getEndpoint().getEndpointInfo();
ei.setProperty(MESSAGE_ENDPOINT_FACTORY, endpointFactory);
ei.setProperty(MDB_TRANSACTED_METHOD, method);
server.start();
-
+
// save the server for clean up later
endpoints.put(spec.getDisplayName(), new InboundEndpoint(server, invoker));
}
@@ -169,49 +169,49 @@ public class MDBActivationWork implements Work {
} else {
factory = new ServerFactoryBean();
}
-
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Creating a server using " + factory.getClass().getName());
}
-
+
if (serviceClass != null) {
factory.setServiceClass(serviceClass);
}
-
- if (spec.getWsdlLocation() != null) {
+
+ if (spec.getWsdlLocation() != null) {
factory.setWsdlLocation(spec.getWsdlLocation());
}
-
+
if (spec.getAddress() != null) {
factory.setAddress(spec.getAddress());
}
-
+
factory.setBus(bus);
-
+
if (spec.getEndpointName() != null) {
factory.setEndpointName(QName.valueOf(spec.getEndpointName()));
}
-
+
if (spec.getSchemaLocations() != null) {
factory.setSchemaLocations(getListOfString(spec.getSchemaLocations()));
}
-
+
if (spec.getServiceName() != null) {
factory.setServiceName(QName.valueOf(spec.getServiceName()));
}
-
+
factory.setInvoker(invoker);
// Don't start the server yet
factory.setStart(false);
-
+
Server retval = null;
if (factory instanceof JaxWsServerFactoryBean) {
retval = createServerFromJaxwsEndpoint((JaxWsServerFactoryBean)factory);
} else {
retval = factory.create();
}
-
+
return retval;
}
@@ -219,17 +219,17 @@ public class MDBActivationWork implements Work {
* Creates a server from EndpointImpl so that jaxws-endpoint config can be injected.
*/
private Server createServerFromJaxwsEndpoint(JaxWsServerFactoryBean factory) {
-
+
@SuppressWarnings("resource")
EndpointImpl endpoint = new EndpointImpl(factory.getBus(), null, factory);
-
+
endpoint.setWsdlLocation(factory.getWsdlURL());
endpoint.setImplementorClass(factory.getServiceClass());
endpoint.setEndpointName(factory.getEndpointName());
endpoint.setServiceName(factory.getServiceName());
endpoint.setInvoker(factory.getInvoker());
endpoint.setSchemaLocations(factory.getSchemaLocations());
-
+
return endpoint.getServer(factory.getAddress());
}
@@ -241,7 +241,7 @@ public class MDBActivationWork implements Work {
if (str == null) {
return null;
}
-
+
return Arrays.asList(str.split(","));
}
@@ -252,7 +252,7 @@ public class MDBActivationWork implements Work {
private MDBInvoker createInvoker() {
MDBInvoker answer = null;
if (spec instanceof DispatchMDBActivationSpec) {
- answer = new DispatchMDBInvoker(endpointFactory,
+ answer = new DispatchMDBInvoker(endpointFactory,
((DispatchMDBActivationSpec)spec).getTargetBeanJndiName());
} else {
answer = new MDBInvoker(endpointFactory);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
index 8e5e440..cdf71f5 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
@@ -29,12 +29,12 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.service.invoker.AbstractInvoker;
/**
- * An invoker that supports direct Message Driven Bean invocation.
- * It get invoked in the context of the Message Driven Bean that
- * activates the CXF service endpoint facade. Applications that put
- * service implementation inside the Message Driven Bean that activates
- * the inbound endpoint facade should choose this invoker. It is
- * more straightforward and faster than {@link DispatchMBDInvoker} but
+ * An invoker that supports direct Message Driven Bean invocation.
+ * It get invoked in the context of the Message Driven Bean that
+ * activates the CXF service endpoint facade. Applications that put
+ * service implementation inside the Message Driven Bean that activates
+ * the inbound endpoint facade should choose this invoker. It is
+ * more straightforward and faster than {@link DispatchMBDInvoker} but
* it requires to modify resource adapter's deployment descriptor (ra.xml)
* as the <messaging-type> needs to be set to the Service Endpoint Interface
* (SEI) class.
@@ -43,7 +43,7 @@ public class MDBInvoker extends AbstractInvoker {
private static final Logger LOG = LogUtils.getL7dLogger(MDBInvoker.class);
private static final int MAX_ATTEMPTS = 5;
private static final long RETRY_SLEEP = 2000;
-
+
private final MessageEndpointFactory endpointFactory;
/**
@@ -68,7 +68,7 @@ public class MDBInvoker extends AbstractInvoker {
public Object getServiceObject(Exchange context) {
return getMessageEndpoint();
}
-
+
public void releaseServiceObject(final Exchange context, Object obj) {
if (obj instanceof MessageEndpoint) {
MessageEndpoint mep = (MessageEndpoint)obj;
@@ -95,7 +95,7 @@ public class MDBInvoker extends AbstractInvoker {
}
}
}
-
+
return ep;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
index 3d75bdd..22cc445 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
@@ -54,7 +54,7 @@ public final class JarLoader {
return getBytesFromInputStream(is, -1);
}
- public static synchronized Map<?, ?> getJarContents(String path)
+ public static synchronized Map<?, ?> getJarContents(String path)
throws MalformedURLException, IOException {
if (!archives.containsKey(path)) {
loadArchive(path);
@@ -76,9 +76,9 @@ public final class JarLoader {
// This byte array has now been exploded into a Map so the raw bytes are
// no longer needed, replace the entry with the exploded Map
//
- Map<String, Object> parentMap =
+ Map<String, Object> parentMap =
CastUtils.cast((Map<?, ?>)archives.get(buildPartialName(nameComponents, i)));
- Map<?, ?> archiveMap =
+ Map<?, ?> archiveMap =
(Map<?, ?>)archives.get(buildPartialName(nameComponents, i + 1));
parentMap.put(nameComponents.get(i), archiveMap);
@@ -133,13 +133,13 @@ public final class JarLoader {
List<String> nameComponents = tokenizePathComponents(name);
Map<String, Object> map = null;
- if (nameComponents.size() == 1) {
+ if (nameComponents.size() == 1) {
map = readZipStream((new URL(getRootArchiveName(name))).openStream());
} else {
- Map<?, ?> parentMap
+ Map<?, ?> parentMap
= (Map<?, ?>)archives.get(buildPartialName(nameComponents, nameComponents.size() - 1));
byte bytes[] = (byte[])(parentMap.get(nameComponents.get(nameComponents.size() - 1)));
-
+
if (null == bytes) {
// unexpected, classpath entry in error, referenced jar is not in the archive
throw new IOException(
@@ -160,8 +160,8 @@ public final class JarLoader {
for (ZipEntry ze = zis.getNextEntry(); ze != null; ze = zis.getNextEntry()) {
if (ze.isDirectory()) {
- map.put(ze.getName(), ze.getName());
- } else {
+ map.put(ze.getName(), ze.getName());
+ } else {
byte bytes[] = getBytesFromInputStream(zis, ze.getSize());
map.put(ze.getName(), bytes);
}
@@ -171,15 +171,15 @@ public final class JarLoader {
}
private static byte[] getBytesFromInputStream(InputStream is, long size) throws IOException {
-
+
byte chunk[] = new byte[((size > CHUNK_SIZE) && (size < MAX_CHUNK_SIZE)) ? (int)size : CHUNK_SIZE];
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
+
for (int i = is.read(chunk, 0, chunk.length); i != -1; i = is.read(chunk, 0, chunk.length)) {
- baos.write(chunk, 0, i);
+ baos.write(chunk, 0, i);
}
-
+
return baos.toByteArray();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
index 90bf47e..80d58c2 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnection.java
@@ -25,23 +25,23 @@ package org.apache.cxf.jca.outbound;
*/
public interface CXFConnection {
-
+
/**
* Retrieves a service object to invoke. The serviceInterface class must
* match the serviceClass in the CXFConnectionSpec that is used to
* obtain this CXFConnection. Application should not continue to use the service
* object after the the connection has been closed by calling {@link #close()}.
- *
+ *
* @param <T>
* @param serviceClass
* @return service object
* @throws Exception
*/
<T> T getService(Class<T> serviceClass) throws Exception;
-
+
/**
* Closes the connection handle. A caller should not use a closed connection.
- *
+ *
* @throws Exception if an error occurs during close.
*/
void close() throws Exception;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
index 06064d7..ffdab73 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionFactory.java
@@ -26,21 +26,21 @@ import javax.resource.ResourceException;
/**
* Provides methods to create a {@link CXFConnection} object that provides access
- * to a Web Service defined from the supplied specifications. A CXFConnectionFactory
- * is returned from an environment naming context JNDI lookup by the Application
+ * to a Web Service defined from the supplied specifications. A CXFConnectionFactory
+ * is returned from an environment naming context JNDI lookup by the Application
* Server.
*/
public interface CXFConnectionFactory extends Serializable, Referenceable {
-
+
/**
- * Creates a CXFConnection object which allows access to CXF web service based on
- * the CXFConnectionSpec object. Required CXFConnectionSpec fields are wsdlURL,
- * serviceClass, endpointName, and serviceName. Each connection returned by this
- * method MUST be closed by calling the {@link CXFConnection#close()} when it is no
- * longer needed.
- *
+ * Creates a CXFConnection object which allows access to CXF web service based on
+ * the CXFConnectionSpec object. Required CXFConnectionSpec fields are wsdlURL,
+ * serviceClass, endpointName, and serviceName. Each connection returned by this
+ * method MUST be closed by calling the {@link CXFConnection#close()} when it is no
+ * longer needed.
+ *
* @param spec
- * @return CXFConnection
+ * @return CXFConnection
* @throws ResourceException
*/
CXFConnection getConnection(CXFConnectionSpec spec) throws ResourceException;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
index 1bc611a..b20a4d7 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFConnectionSpec.java
@@ -31,14 +31,14 @@ import org.apache.commons.lang.ObjectUtils;
* a {@link CXFConnection}.
*/
public class CXFConnectionSpec implements ConnectionRequestInfo {
-
+
private Class<?> serviceClass;
private URL wsdlURL;
private URL busConfigURL;
private QName serviceName;
private QName endpointName;
private String address;
-
+
/**
* @return the serviceClass
*/
@@ -111,8 +111,8 @@ public class CXFConnectionSpec implements ConnectionRequestInfo {
public void setAddress(String address) {
this.address = address;
}
-
- // Required by JCA Spec
+
+ // Required by JCA Spec
public boolean equals(Object other) {
if (other != null && !this.getClass().isAssignableFrom(other.getClass())) {
return false;
@@ -121,62 +121,62 @@ public class CXFConnectionSpec implements ConnectionRequestInfo {
if (!(other instanceof CXFConnectionSpec)) {
return false;
}
-
+
CXFConnectionSpec that = (CXFConnectionSpec)other;
-
+
if (!ObjectUtils.equals(that.getWsdlURL(), wsdlURL)) {
return false;
}
-
+
if (!ObjectUtils.equals(that.getBusConfigURL(), busConfigURL)) {
return false;
}
-
+
if (!ObjectUtils.equals(that.getServiceClass(), serviceClass)) {
return false;
}
-
+
if (!ObjectUtils.equals(that.getServiceName(), serviceName)) {
return false;
}
-
+
if (!ObjectUtils.equals(that.getEndpointName(), endpointName)) {
return false;
}
-
+
return ObjectUtils.equals(that.getAddress(), address);
}
// Required by JCA Spec
public int hashCode() {
int retval = 0;
-
+
if (wsdlURL != null) {
retval += wsdlURL.hashCode(); //NOSONAR
}
-
+
if (busConfigURL != null) {
retval += busConfigURL.hashCode(); //NOSONAR
}
-
+
if (serviceClass != null) {
retval += serviceClass.hashCode();
}
-
+
if (serviceName != null) {
retval += serviceName.hashCode();
}
-
+
if (endpointName != null) {
retval += endpointName.hashCode();
}
-
+
if (address != null) {
retval += address.hashCode();
}
-
+
return retval;
-
+
}
public String toString() {
@@ -189,5 +189,5 @@ public class CXFConnectionSpec implements ConnectionRequestInfo {
buf.append(",address=" + address);
return buf.toString();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
index b0f6f39..50dae9d 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/CXFManagedConnectionMetaData.java
@@ -40,7 +40,7 @@ public class CXFManagedConnectionMetaData implements ManagedConnectionMetaData {
return "Apache CXF";
}
-
+
public String getEISProductVersion() throws ResourceException {
return "2.0";
}
@@ -52,7 +52,7 @@ public class CXFManagedConnectionMetaData implements ManagedConnectionMetaData {
return -1;
}
-
+
public String getUserName() throws ResourceException {
return userName;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
index 9e8c1c1..e183432 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ConnectionFactoryImpl.java
@@ -42,7 +42,7 @@ public class ConnectionFactoryImpl implements CXFConnectionFactory {
}
public void setReference(Reference reference) {
- this.reference = reference;
+ this.reference = reference;
}
public Reference getReference() throws NamingException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
index c187da0..e5ee5c3 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/DefaultConnectionManager.java
@@ -32,7 +32,7 @@ import javax.resource.spi.ManagedConnectionFactory;
import org.apache.cxf.common.logging.LogUtils;
/**
- * Default Connection Manager which does not support connection pool.
+ * Default Connection Manager which does not support connection pool.
* Connection will be destroyed upon closing by application.
*/
public class DefaultConnectionManager implements ConnectionManager, ConnectionEventListener {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
index 19f7e8b..ba4bd07 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
@@ -40,24 +40,24 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.logging.LoggerHelper;
import org.apache.cxf.jca.cxf.ResourceAdapterImpl;
-public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
+public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
ResourceAdapterAssociation {
private static final long serialVersionUID = -5294527634981120642L;
private static final Logger LOG = LogUtils.getL7dLogger(ManagedConnectionFactoryImpl.class);
-
+
private String busConfigURL;
private PrintWriter printWriter;
private ResourceAdapter resourceAdapter;
-
- private ConnectionManager defaultConnectionManager =
+
+ private ConnectionManager defaultConnectionManager =
new DefaultConnectionManager();
static {
// first use of log, default init if necessary
LoggerHelper.init();
}
-
+
/* --------------------------------------------------------------------
* Bean Properties
*/
@@ -68,8 +68,8 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
public String getBusConfigURL() {
return busConfigURL;
}
-
-
+
+
/* --------------------------------------------------------------------
* ManagedConnectionFactory methods
*/
@@ -79,17 +79,17 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
}
return new ConnectionFactoryImpl(this, defaultConnectionManager);
}
-
- public Object createConnectionFactory(ConnectionManager connMgr)
+
+ public Object createConnectionFactory(ConnectionManager connMgr)
throws ResourceException {
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("Create connection factory by app server connMgr " + connMgr);
}
- return new ConnectionFactoryImpl(this,
+ return new ConnectionFactoryImpl(this,
connMgr == null ? defaultConnectionManager : connMgr);
}
- public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo connReqInfo)
+ public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo connReqInfo)
throws ResourceException {
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("Create managed connection subject=" + subject + "connReqInfo="
@@ -97,7 +97,7 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
}
return new ManagedConnectionImpl(this, connReqInfo, subject);
}
-
+
// hashCode method is required by JCA 1.5 because on properties
public int hashCode() {
int retval = 0;
@@ -105,10 +105,10 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
if (busConfigURL != null) {
retval += busConfigURL.hashCode();
}
-
+
return retval;
}
-
+
// equals method is required by JCA 1.5 because on properties
public boolean equals(Object o) {
if (o != null && !this.getClass().isAssignableFrom(o.getClass())) {
@@ -118,12 +118,12 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
if (!(o instanceof ManagedConnectionFactoryImpl)) {
return false;
}
-
+
ManagedConnectionFactoryImpl that = (ManagedConnectionFactoryImpl)o;
-
+
return ObjectUtils.equals(that.getBusConfigURL(), busConfigURL);
}
-
+
public PrintWriter getLogWriter() throws ResourceException {
return printWriter;
}
@@ -136,8 +136,8 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
printWriter = aPrintWriter;
LoggerHelper.initializeLoggingOnWriter(printWriter);
}
-
- public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes") Set mcs, Subject subject,
+
+ public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes") Set mcs, Subject subject,
ConnectionRequestInfo reqInfo) throws ResourceException {
if (LOG.isLoggable(Level.FINER)) {
@@ -153,18 +153,18 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
if (!(obj instanceof ManagedConnectionImpl)) {
continue;
}
-
+
ManagedConnectionImpl mc = (ManagedConnectionImpl)obj;
-
+
if (!ObjectUtils.equals(busConfigURL,
mc.getManagedConnectionFactoryImpl().getBusConfigURL())) {
continue;
}
-
+
if (!ObjectUtils.equals(reqInfo, mc.getRequestInfo())) {
continue;
}
-
+
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("found matched connection " + mc);
}
@@ -172,7 +172,7 @@ public class ManagedConnectionFactoryImpl implements ManagedConnectionFactory,
}
return null;
}
-
+
/* --------------------------------------------------------------------
* ResourceAdapterAssociation methods
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
index c516728..bf584f7 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionImpl.java
@@ -64,21 +64,21 @@ import org.apache.cxf.jca.core.logging.LoggerHelper;
*/
public class ManagedConnectionImpl implements ManagedConnection {
private static final Logger LOG = LogUtils.getL7dLogger(ManagedConnectionImpl.class);
-
- private Set<ConnectionEventListener> listeners =
+
+ private Set<ConnectionEventListener> listeners =
Collections.synchronizedSet(new HashSet<>());
-
- private Map<Object, Subject> handles =
+
+ private Map<Object, Subject> handles =
Collections.synchronizedMap(new HashMap<Object, Subject>());
private PrintWriter printWriter;
-
+
private ManagedConnectionFactoryImpl mcf;
private ConnectionRequestInfo connReqInfo;
private boolean isClosed;
private Bus bus;
private Object associatedHandle;
private Object clientProxy;
-
+
public ManagedConnectionImpl(ManagedConnectionFactoryImpl mcf,
ConnectionRequestInfo connReqInfo, Subject subject) {
this.mcf = mcf;
@@ -88,7 +88,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
/* -------------------------------------------------------------------
* ManagedConnection Methods
*/
-
+
public void addConnectionEventListener(ConnectionEventListener listener) {
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("add listener : " + listener);
@@ -116,7 +116,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
if (LOG.isLoggable(Level.FINER)) {
LOG.finer("destroy");
}
-
+
Client client = ClientProxy.getClient(clientProxy);
client.destroy();
@@ -132,24 +132,24 @@ public class ManagedConnectionImpl implements ManagedConnection {
LOG.finer("get handle for subject=" + subject + " cxRequestInfo="
+ cxRequestInfo);
}
-
+
if (isClosed) {
throw new ResourceException("connection has been closed");
}
-
+
// check request info
if (!connReqInfo.equals(cxRequestInfo)) {
throw new ResourceException("connection request info: " + cxRequestInfo
+ " does not match " + connReqInfo);
}
-
+
CXFConnectionSpec spec = (CXFConnectionSpec)cxRequestInfo;
Object handle = createConnectionHandle(spec);
handles.put(handle, subject);
associatedHandle = handle;
return handle;
-
+
}
public LocalTransaction getLocalTransaction() throws ResourceException {
@@ -179,7 +179,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
LoggerHelper.initializeLoggingOnWriter(printWriter);
}
}
-
+
/* -------------------------------------------------------------------
* Public Methods
*/
@@ -187,15 +187,15 @@ public class ManagedConnectionImpl implements ManagedConnection {
public ConnectionRequestInfo getRequestInfo() {
return connReqInfo;
}
-
+
public ManagedConnectionFactoryImpl getManagedConnectionFactoryImpl() {
return mcf;
}
-
+
/* -------------------------------------------------------------------
* Private Methods
*/
-
+
private void sendEvent(final ConnectionEvent coEvent) {
synchronized (listeners) {
Iterator<ConnectionEventListener> iterator = listeners.iterator();
@@ -205,7 +205,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
}
}
- private void sendEventToListener(ConnectionEventListener listener,
+ private void sendEventToListener(ConnectionEventListener listener,
ConnectionEvent coEvent) {
if (coEvent.getId() == ConnectionEvent.CONNECTION_CLOSED) {
listener.connectionClosed(coEvent);
@@ -226,53 +226,53 @@ public class ManagedConnectionImpl implements ManagedConnection {
if (coEvent.getId() == ConnectionEvent.CONNECTION_ERROR_OCCURRED) {
listener.connectionErrorOccurred(coEvent);
}
-
+
}
-
+
private String getUserName() {
if (associatedHandle != null) {
Subject subject = handles.get(associatedHandle);
if (subject != null) {
return subject.toString();
}
- }
+ }
return null;
-
+
}
private Object createConnectionHandle(final CXFConnectionSpec spec) {
-
- Class<?> interfaces[] = {CXFConnection.class, BindingProvider.class,
+
+ Class<?> interfaces[] = {CXFConnection.class, BindingProvider.class,
spec.getServiceClass()};
- return Proxy.newProxyInstance(spec.getServiceClass().getClassLoader(),
+ return Proxy.newProxyInstance(spec.getServiceClass().getClassLoader(),
interfaces, new ConnectionInvocationHandler(
createClientProxy(spec), spec));
}
-
+
private synchronized Object createClientProxy(final CXFConnectionSpec spec) {
if (clientProxy == null) {
validateConnectionSpec(spec);
ClientProxyFactoryBean factory = null;
-
+
if (EndpointUtils.hasWebServiceAnnotation(spec.getServiceClass())) {
factory = new JaxWsProxyFactoryBean();
} else {
factory = new ClientProxyFactoryBean();
}
-
+
factory.setBus(getBus(spec.getBusConfigURL()));
factory.setServiceClass(spec.getServiceClass());
factory.getServiceFactory().setEndpointName(spec.getEndpointName());
factory.getServiceFactory().setServiceName(spec.getServiceName());
factory.getServiceFactory().setWsdlURL(spec.getWsdlURL());
-
+
if (spec.getAddress() != null) {
factory.setAddress(spec.getAddress());
}
-
+
configureObject(spec.getEndpointName().toString() + ".jaxws-client.proxyFactory", factory);
-
+
clientProxy = factory.create();
}
@@ -283,15 +283,15 @@ public class ManagedConnectionImpl implements ManagedConnection {
if (spec.getServiceClass() == null) {
throw new IllegalArgumentException("no serviceClass in connection spec");
}
-
+
if (spec.getEndpointName() == null) {
throw new IllegalArgumentException("no endpointName in connection spec");
}
-
+
if (spec.getServiceName() == null) {
throw new IllegalArgumentException("no serviceName in connection spec");
}
-
+
if (spec.getWsdlURL() == null) {
throw new IllegalArgumentException("no wsdlURL in connection spec");
}
@@ -303,7 +303,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
configurer.configureBean(name, instance);
}
}
-
+
private synchronized Bus getBus(URL busConfigLocation) {
if (bus == null) {
if (busConfigLocation != null) {
@@ -312,11 +312,11 @@ public class ManagedConnectionImpl implements ManagedConnection {
}
bus = new SpringBusFactory().createBus(busConfigLocation);
} else if (mcf.getBusConfigURL() != null) {
-
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Create bus from URL " + mcf.getBusConfigURL());
}
-
+
URL url = null;
try {
url = new URL(mcf.getBusConfigURL());
@@ -327,8 +327,8 @@ public class ManagedConnectionImpl implements ManagedConnection {
if (url != null) {
bus = new SpringBusFactory().createBus(url);
}
- }
-
+ }
+
if (bus == null) {
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Create default bus");
@@ -342,7 +342,7 @@ public class ManagedConnectionImpl implements ManagedConnection {
private class ConnectionInvocationHandler implements InvocationHandler {
private Object target;
private CXFConnectionSpec spec;
-
+
ConnectionInvocationHandler(Object target, CXFConnectionSpec spec) {
this.target = target;
this.spec = spec;
@@ -350,37 +350,37 @@ public class ManagedConnectionImpl implements ManagedConnection {
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable {
-
+
if (LOG.isLoggable(Level.FINEST)) {
LOG.finest("invoke connection spec:" + spec + " method=" + method);
}
-
+
if ("hashCode".equals(method.getName())) {
return method.invoke(Proxy.getInvocationHandler(proxy), args);
}
-
+
if ("equals".equals(method.getName())) {
// These are proxies. We don't really care if their targets are equal.
- // We do care if these are the same proxy instances that we created.
- // Therefore, if their proxy and invocation handler are consistent,
+ // We do care if these are the same proxy instances that we created.
+ // Therefore, if their proxy and invocation handler are consistent,
// we believe they are equal.
boolean result = false;
try {
result = proxy == args[0] && this == Proxy.getInvocationHandler(args[0]);
} catch (Exception e) {
// ignore and assume not equal
- }
+ }
return result;
}
-
+
if ("toString".equals(method.getName())) {
return "ManagedConnection: " + spec;
}
-
+
if (!handles.containsKey(proxy)) {
throw new IllegalArgumentException("Stale connection");
}
-
+
if ("getService".equals(method.getName())) {
return handleGetServiceMethod(proxy, method, args);
} else if ("close".equals(method.getName())) {
@@ -395,25 +395,25 @@ public class ManagedConnectionImpl implements ManagedConnection {
Object[] args) {
if (!spec.getServiceClass().equals(args[0])) {
- throw new IllegalArgumentException("serviceClass "
+ throw new IllegalArgumentException("serviceClass "
+ args[0] + " does not match " + spec.getServiceClass());
- }
-
+ }
+
return target;
}
-
+
private Object handleCloseMethod(Object proxy, Method method,
- Object[] args) {
-
+ Object[] args) {
+
handles.remove(proxy);
associatedHandle = null;
ConnectionEvent event = new ConnectionEvent(ManagedConnectionImpl.this,
ConnectionEvent.CONNECTION_CLOSED);
event.setConnectionHandle(proxy);
sendEvent(event);
-
+
return null;
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
index 71fb54e..cb3494e 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
@@ -44,63 +44,63 @@ import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
public class EJBEndpoint {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(EJBEndpoint.class);
-
+
private static final int DEFAULT_HTTP_PORT = 80;
-
+
private static final String HTTPS_PREFIX = "https";
-
+
private EJBServantConfig config;
-
+
private Context jndiContext;
-
+
private EJBHome ejbHome;
-
+
private String ejbServantBaseURL;
-
+
private WorkManager workManager;
-
+
public EJBEndpoint(EJBServantConfig ejbConfig) {
this.config = ejbConfig;
}
-
+
public Server publish() throws Exception {
jndiContext = new InitialContext();
Object obj = jndiContext.lookup(config.getJNDIName());
ejbHome = (EJBHome) PortableRemoteObject.narrow(obj, EJBHome.class);
-
+
Class<?> interfaceClass = Class.forName(getServiceClassName());
boolean isJaxws = isJaxWsServiceInterface(interfaceClass);
ServerFactoryBean factory = isJaxws ? new JaxWsServerFactoryBean() : new ServerFactoryBean();
factory.setServiceClass(interfaceClass);
-
+
if (config.getWsdlURL() != null) {
factory.getServiceFactory().setWsdlURL(config.getWsdlURL());
}
-
+
factory.setInvoker(new EJBInvoker(ejbHome));
-
- String baseAddress = isNotNull(getEjbServantBaseURL()) ? getEjbServantBaseURL()
+
+ String baseAddress = isNotNull(getEjbServantBaseURL()) ? getEjbServantBaseURL()
: getDefaultEJBServantBaseURL();
String address = baseAddress + "/" + config.getJNDIName();
factory.setAddress(address);
-
+
if (address.length() >= 5 && HTTPS_PREFIX.equalsIgnoreCase(address.substring(0, 5))) {
throw new UnsupportedOperationException("EJBEndpoint creation by https protocol is unsupported");
}
-
+
if (getWorkManager() != null) {
setWorkManagerThreadPoolToJetty(factory.getBus(), baseAddress);
}
-
+
Server server = factory.create();
LOG.info("Published EJB Endpoint of [" + config.getJNDIName() + "] at [" + address + "]");
-
+
return server;
}
-
-
+
+
protected void setWorkManagerThreadPoolToJetty(Bus bus, String baseAddress) {
JettyHTTPServerEngineFactory engineFactory = bus.getExtension(JettyHTTPServerEngineFactory.class);
int port = getAddressPort(baseAddress);
@@ -110,19 +110,19 @@ public class EJBEndpoint {
JettyHTTPServerEngine engine = new JettyHTTPServerEngine();
engine.setThreadPool(new WorkManagerThreadPool(getWorkManager()));
engine.setPort(port);
-
+
List<JettyHTTPServerEngine> engineList = new ArrayList<>();
engineList.add(engine);
engineFactory.setEnginesList(engineList);
}
-
+
public String getServiceClassName() throws Exception {
String packageName = PackageUtils.parsePackageName(config.getServiceName().getNamespaceURI(), null);
- String interfaceName = packageName + "."
+ String interfaceName = packageName + "."
+ config.getJNDIName().substring(0, config.getJNDIName().length() - 4);
return interfaceName;
}
-
+
public String getDefaultEJBServantBaseURL() throws Exception {
String hostName = "";
try {
@@ -133,7 +133,7 @@ public class EJBEndpoint {
}
return "http://" + hostName + ":9999";
}
-
+
public int getAddressPort(String address) {
int index = address.lastIndexOf(":");
int end = address.lastIndexOf("/");
@@ -142,10 +142,10 @@ public class EJBEndpoint {
}
if (end < index) {
return Integer.parseInt(address.substring(index + 1));
- }
+ }
return Integer.parseInt(address.substring(index + 1, end));
}
-
+
private static boolean isJaxWsServiceInterface(Class<?> cls) {
if (cls == null) {
return false;
@@ -160,7 +160,7 @@ public class EJBEndpoint {
public void setEjbServantBaseURL(String ejbServantBaseURL) {
this.ejbServantBaseURL = ejbServantBaseURL;
}
-
+
private static boolean isNotNull(String value) {
return value != null && !"".equals(value.trim());
}
@@ -172,7 +172,7 @@ public class EJBEndpoint {
public void setWorkManager(WorkManager workManager) {
this.workManager = workManager;
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java
index d689a2b..2039ec1 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBInvoker.java
@@ -28,13 +28,13 @@ import org.apache.cxf.service.invoker.AbstractInvoker;
public class EJBInvoker extends AbstractInvoker {
-
+
private static final Object[] EMPTY_OBJECT = new Object[0];
-
+
private EJBHome home;
-
+
private Method createMethod;
-
+
public EJBInvoker(EJBHome home) {
this.home = home;
try {
@@ -46,8 +46,8 @@ public class EJBInvoker extends AbstractInvoker {
throw new IllegalArgumentException("Unable to initialize invoker: " + ex);
}
}
-
-
+
+
@Override
public Object getServiceObject(Exchange context) {
Object ejbObject = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java
index 7c24aa4..9d3c46b 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBServantConfig.java
@@ -25,13 +25,13 @@ import javax.xml.namespace.QName;
public class EJBServantConfig {
-
+
private String jndiName;
-
+
private QName serviceName;
-
+
private String wsdlURL;
-
+
public EJBServantConfig(String jndiName, String value) {
this.jndiName = jndiName;
StringTokenizer st = new StringTokenizer(value, "@", true);
@@ -48,9 +48,9 @@ public class EJBServantConfig {
}
}
}
-
+
}
-
+
public String getJNDIName() {
return jndiName;
}
@@ -74,8 +74,8 @@ public class EJBServantConfig {
public void setWsdlURL(String wsdlURL) {
this.wsdlURL = wsdlURL;
}
-
-
+
+
private QName getServiceName(String sname) {
StringTokenizer st = new StringTokenizer(sname, "}", false);
String namespace = "";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
index 23914e6..7b5b017 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/FireWallClassLoaderTest.java
@@ -34,18 +34,18 @@ public class FireWallClassLoaderTest extends Assert {
public FireWallClassLoaderTest() {
}
-
+
@Test
public void testJavaLangStringAlt() throws Exception {
ClassLoader c = new FireWallClassLoader(ClassLoader.getSystemClassLoader(), new String[] {"java.*"});
Class<?> c1 = c.loadClass("java.lang.String");
assertNotNull("Should have returned a class here", c1);
}
-
+
@Test
public void testJavaLangStringBlock() throws Exception {
- ClassLoader c = new FireWallClassLoader(ClassLoader.getSystemClassLoader(),
- new String[] {},
+ ClassLoader c = new FireWallClassLoader(ClassLoader.getSystemClassLoader(),
+ new String[] {},
new String[] {"java.lang.String"});
try {
c.loadClass("java.lang.String");
@@ -86,7 +86,7 @@ public class FireWallClassLoaderTest extends Assert {
}
fail("Should not have found the " + urlConn.getClass().getName() + " class");
}
-
+
@Test
public void testSecurityException() {
try {
@@ -94,7 +94,7 @@ public class FireWallClassLoaderTest extends Assert {
} catch (SecurityException se) {
return;
}
- fail("Constructing a FireWallClassLoader that does not pass through java."
+ fail("Constructing a FireWallClassLoader that does not pass through java."
+ " should cause a SecurityException.");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
index 7a7c235..48936b5 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderTest.java
@@ -37,8 +37,8 @@ public class PlugInClassLoaderTest extends Assert {
private static final Logger LOG = LogUtils.getLogger(PlugInClassLoaderTest.class);
private static boolean debug;
PlugInClassLoader plugInClassLoader;
-
-
+
+
@Before
public void setUp() throws Exception {
@@ -100,14 +100,14 @@ public class PlugInClassLoaderTest extends Assert {
throws Exception {
String className = "javax.resource.ResourceException";
// ensure it is available
- getClass().getClassLoader().loadClass(className);
+ getClass().getClassLoader().loadClass(className);
try {
Class<?> claz = plugInClassLoader.loadClass(className);
assertEquals("That should be same classloader ", claz.getClassLoader(),
getClass().getClassLoader());
-
+
} catch (ClassNotFoundException ex) {
- fail("Do not Expect ClassNotFoundException");
+ fail("Do not Expect ClassNotFoundException");
}
}
@@ -119,7 +119,7 @@ public class PlugInClassLoaderTest extends Assert {
URL url = resultClass.getResource("dummy.txt");
LOG.info("URL: " + url);
assertTrue("bad url: " + url, url.toString().startsWith("classloader:"));
-
+
InputStream configStream = url.openStream();
assertNotNull("stream must not be null. ", configStream);
@@ -142,15 +142,15 @@ public class PlugInClassLoaderTest extends Assert {
URL url = resultClass.getResource("/META-INF/MANIFEST.MF");
LOG.info("URL: " + url);
assertTrue("bad url: " + url, url.toString().startsWith("classloader:"));
-
+
InputStream configStream = url.openStream();
assertNotNull("stream must not be null. ", configStream);
assertTrue("unexpected stream class: " + configStream.getClass(),
configStream instanceof java.io.ByteArrayInputStream);
-
+
byte[] bytes = new byte[21];
configStream.read(bytes, 0, bytes.length);
-
+
String result = IOUtils.newStringFromBytes(bytes);
LOG.fine("dummy.txt contents: " + result);
assertTrue("unexpected dummy.txt contents:" + result, result.indexOf("Manifest-Version: 1.0") != -1);
@@ -176,5 +176,5 @@ public class PlugInClassLoaderTest extends Assert {
URL url = plugInClassLoader.findResource("foo!/bar/");
assertNull("url must be null. ", url);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
index 892e31b..9c88d02 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/logging/LoggerHelperTest.java
@@ -46,7 +46,7 @@ public class LoggerHelperTest extends Assert {
public void testEnableDisableConsoleLogging() {
Logger rootLogger = LogUtils.getLogger(this.getClass(), null, "");
Handler handler;
-
+
/*Handler handler = LoggerHelper.getHandler(rootLogger, LoggerHelper.CONSOLE_HANDLER);
assertNotNull("default console appender is there", handler);*/
@@ -104,5 +104,5 @@ public class LoggerHelperTest extends Assert {
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java
index 75b16e9..abf4d38 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/DummyManagedConnectionImpl.java
@@ -75,7 +75,7 @@ public class DummyManagedConnectionImpl extends AbstractManagedConnectionImpl {
con = o;
}
/*
- public CXFManagedConnectionFactory getManagedConnectionFactory() {
+ public CXFManagedConnectionFactory getManagedConnectionFactory() {
return (CXFManagedConnectionFactory)theManagedConnectionFactory();
- } */
+ } */
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
index c19e219..4df0f58 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/HandlerTest.java
@@ -28,16 +28,16 @@ import org.junit.Test;
public class HandlerTest extends Assert {
- Handler h;
-
-
+ Handler h;
+
+
@Before
- public void setUp() throws ClassNotFoundException {
+ public void setUp() throws ClassNotFoundException {
h = new Handler();
- }
-
+ }
+
@Test
- public void testGetStreamToThisResource() throws Exception {
+ public void testGetStreamToThisResource() throws Exception {
String urlpath = HandlerTest.class.getName().replace('.', '/') + ".class";
String urls = "resourceadapter:" + urlpath;
URL res = new URL(null, urls, h);
@@ -47,7 +47,7 @@ public class HandlerTest extends Assert {
@Test
- public void testGetStreamToNonExistantResourceThrows() throws Exception {
+ public void testGetStreamToNonExistantResourceThrows() throws Exception {
String path = "some gobbledy rubbish/that/does/not/exist";
String urls = "resourceadapter:" + path;
URL res = new URL(null, urls, h);
@@ -60,7 +60,7 @@ public class HandlerTest extends Assert {
}
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
index b6f92fe..68b03f8 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionFactoryImplTest.java
@@ -122,7 +122,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
@Test
public void testGetSetLogWriter() throws Exception {
- PrintWriter writer = EasyMock.createMock(PrintWriter.class);
+ PrintWriter writer = EasyMock.createMock(PrintWriter.class);
writer.write(EasyMock.isA(String.class));
EasyMock.expectLastCall().anyTimes();
writer.flush();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
index cc9795f..c2f443a 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ManagedConnectionImplTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
public class ManagedConnectionImplTest extends Assert {
private DummyManagedConnectionImpl mc;
-
+
@Before
public void setUp() throws Exception {
mc = new DummyManagedConnectionImpl(null, null, null);
@@ -47,7 +47,7 @@ public class ManagedConnectionImplTest extends Assert {
assertTrue(mc.getLogWriter() == writer);
writer.close();
EasyMock.expectLastCall();
- EasyMock.replay(writer);
+ EasyMock.replay(writer);
mc.destroy();
EasyMock.verify(writer);
@@ -83,7 +83,7 @@ public class ManagedConnectionImplTest extends Assert {
@Test
public void testGetMetaData() throws Exception {
try {
- mc.getMetaData();
+ mc.getMetaData();
} catch (NotSupportedException expected) {
fail("Got the Exception here");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
index b107e0c..159da3c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceAdapterInternalExceptionTest.java
@@ -29,21 +29,21 @@ import org.junit.Test;
public class ResourceAdapterInternalExceptionTest extends Assert {
- private static final Logger EXCEPTION_LOGGER =
+ private static final Logger EXCEPTION_LOGGER =
LogUtils.getLogger(ResourceAdapterInternalException.class);
- private Level logLevel;
+ private Level logLevel;
- @Before
- public void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
logLevel = EXCEPTION_LOGGER.getLevel();
EXCEPTION_LOGGER.setLevel(Level.SEVERE);
- }
-
+ }
+
@After
public void tearDown() throws Exception {
EXCEPTION_LOGGER.setLevel(logLevel);
}
-
+
@Test
public void testMessage() {
final String msg = "msg1";
@@ -65,7 +65,7 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
assertTrue(e.toString().indexOf(msg) != -1);
assertTrue(e.toString().indexOf("reason") == -1);
assertEquals(e.getMessage(), msg);
- assertNull(e.getCause());
+ assertNull(e.getCause());
}
@Test
@@ -94,7 +94,7 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
assertTrue(e.toString().indexOf(msg) != -1);
assertTrue(e.toString().indexOf("reason") != -1);
assertTrue(e.toString().indexOf(causeMsg) != -1);
- assertEquals(e.getCause(), cause);
+ assertEquals(e.getCause(), cause);
}
@@ -104,11 +104,11 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
final String causeMsg = "cause";
Exception cause = new RuntimeException(causeMsg);
- javax.resource.spi.ResourceAdapterInternalException re =
+ javax.resource.spi.ResourceAdapterInternalException re =
new ResourceAdapterInternalException(
- msg,
+ msg,
new java.lang.reflect.InvocationTargetException(cause));
-
+
assertTrue(re.toString().indexOf(msg) != -1);
assertTrue(re.toString().indexOf("reason") != -1);
assertTrue(re.toString().indexOf(causeMsg) != -1);
@@ -122,14 +122,14 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
final String causeMsg = "cause";
java.lang.Throwable cause = new java.lang.UnknownError(causeMsg);
- ResourceAdapterInternalException re =
+ ResourceAdapterInternalException re =
new ResourceAdapterInternalException(
msg,
new java.lang.reflect.InvocationTargetException(cause));
assertEquals(re.getCause(), cause);
}
-
+
@Test
public void testGetLinkedExceptionReturnNullIfNoCause() throws Exception {
ResourceAdapterInternalException re = new ResourceAdapterInternalException("ex");
@@ -149,5 +149,5 @@ public class ResourceAdapterInternalExceptionTest extends Assert {
ResourceAdapterInternalException re = new ResourceAdapterInternalException("ex", cause);
assertEquals("get same exception", cause, re.getLinkedException());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
index 4d617cc..0c748db 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/ResourceBeanTest.java
@@ -31,6 +31,6 @@ public class ResourceBeanTest extends Assert {
ResourceBean rb = new ResourceBean();
rb.setDisableConsoleLogging(true);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
index 4027980..6932961 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInitTest.java
@@ -28,7 +28,7 @@ public class UriHandlerInitTest extends Assert {
private static final String PROP_NAME = "java.protocol.handler.pkgs";
private static final String PKG_ADD = "do.do";
-
+
@Test
public void testAppendToProp() {
final Properties properties = System.getProperties();
@@ -53,8 +53,8 @@ public class UriHandlerInitTest extends Assert {
}
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
index 1e295d9..c038625 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImplTest.java
@@ -33,11 +33,11 @@ import org.easymock.EasyMock;
import org.junit.Test;
public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectionFactoryImplTest {
-
-
+
+
@Test
public void testSetResourceAdapter() throws Exception {
- TestableAssociatedManagedConnectionFactoryImpl mci =
+ TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
ResourceAdapterImpl rai = new ResourceAdapterImpl();
mci.setResourceAdapter(rai);
@@ -70,7 +70,7 @@ public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectio
}
/*
public void testBusInitializedAndRegisteredToResourceAdapter() throws ResourceException, Exception {
- DummyBus.reset();
+ DummyBus.reset();
System.setProperty("test.bus.class", DummyBus.class.getName());
TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
@@ -82,14 +82,14 @@ public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectio
Thread.currentThread().setContextClassLoader(mci.getClass().getClassLoader());
Class dummyBusClass = Class.forName(DummyBus.class.getName(), true, mci.getClass()
- .getClassLoader());
+ .getClassLoader());
Method initializeCount = dummyBusClass.getMethod("getInitializeCount", new Class[]{});
- ConnectionManager cm =
+ ConnectionManager cm =
(ConnectionManager)EasyMock.createMock(
Class.forName(ConnectionManager.class.getName(), true, mci.getClass().getClassLoader()));
mci.createConnectionFactory(cm);
- assertEquals("bus should be initialized once", 1,
+ assertEquals("bus should be initialized once", 1,
initializeCount.invoke(null, new Object[]{}));
assertEquals("bus registered once after first call", 1, rai.registeredCount);
} finally {
@@ -105,7 +105,7 @@ public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectio
TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
-
+
assertEquals("before associate, one props", 0, mci.getPluginProps().size());
assertTrue("before associate, key1 not set", !mci.getPluginProps().containsKey("key1"));
@@ -115,7 +115,7 @@ public class AssociatedManagedConnectionFactoryImplTest extends ManagedConnectio
assertTrue("after associate, key1 is set", mci.getPluginProps().containsKey("key1"));
}
-
+
protected ManagedConnectionFactoryImpl createManagedConnectionFactoryImpl() {
TestableAssociatedManagedConnectionFactoryImpl mci =
new TestableAssociatedManagedConnectionFactoryImpl();
@@ -146,5 +146,5 @@ class DummyResourceAdapterImpl extends ResourceAdapterImpl {
class TestableAssociatedManagedConnectionFactoryImpl extends AssociatedManagedConnectionFactoryImpl {
private static final long serialVersionUID = -1077391534536084071L;
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
index 75e4703..29f62ed 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfoTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
public class CXFConnectionRequestInfoTest extends Assert {
-
+
@Test
public void testCXFConnectionRequestInfoEquals() throws Exception {
@@ -89,5 +89,5 @@ public class CXFConnectionRequestInfoTest extends Assert {
}
-
+
}
[20/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
index d75fa9d..4294eda 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveContextProvider.java
@@ -28,7 +28,7 @@ import org.apache.cxf.tracing.brave.BraveTracerContext;
public class BraveContextProvider implements ContextProvider< TracerContext > {
private final Brave brave;
-
+
public BraveContextProvider(final Brave brave) {
this.brave = brave;
}
@@ -37,13 +37,13 @@ public class BraveContextProvider implements ContextProvider< TracerContext > {
public TracerContext createContext(final Message message) {
// Check if there is a server span passed along with the message
final ServerSpan continuationSpan = message.get(ServerSpan.class);
-
- // If server span is already present, let us check if it is detached
+
+ // If server span is already present, let us check if it is detached
// (asynchronous invocation)
if (continuationSpan != null) {
return new BraveTracerContext(brave, continuationSpan);
}
-
+
return new BraveTracerContext(brave);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
index 8fdc1da..3ad14b8 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveFeature.java
@@ -27,11 +27,11 @@ import com.github.kristofa.brave.Brave;
public class BraveFeature implements Feature {
private final Brave brave;
-
+
public BraveFeature() {
this("cxf-svc-" + UUID.randomUUID().toString());
}
-
+
public BraveFeature(final String name) {
this(new Brave.Builder(name).build());
}
@@ -39,7 +39,7 @@ public class BraveFeature implements Feature {
public BraveFeature(final Brave brave) {
this.brave = brave;
}
-
+
@Override
public boolean configure(FeatureContext context) {
context.register(new BraveProvider(brave));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
index cfd917a..e4f4f33 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveProvider.java
@@ -36,36 +36,36 @@ import com.github.kristofa.brave.ServerSpan;
import org.apache.cxf.tracing.brave.AbstractBraveProvider;
@Provider
-public class BraveProvider extends AbstractBraveProvider
+public class BraveProvider extends AbstractBraveProvider
implements ContainerRequestFilter, ContainerResponseFilter {
- @Context
+ @Context
private ResourceInfo resourceInfo;
-
+
public BraveProvider(final Brave brave) {
super(brave);
}
@Override
public void filter(final ContainerRequestContext requestContext) throws IOException {
- final TraceScopeHolder<ServerSpan> holder = super.startTraceSpan(requestContext.getHeaders(),
+ final TraceScopeHolder<ServerSpan> holder = super.startTraceSpan(requestContext.getHeaders(),
requestContext.getUriInfo().getRequestUri(),
requestContext.getMethod());
-
+
if (holder != null) {
requestContext.setProperty(TRACE_SPAN, holder);
}
}
-
+
@SuppressWarnings("unchecked")
@Override
public void filter(final ContainerRequestContext requestContext,
final ContainerResponseContext responseContext) throws IOException {
- super.stopTraceSpan(requestContext.getHeaders(),
- responseContext.getHeaders(),
+ super.stopTraceSpan(requestContext.getHeaders(),
+ responseContext.getHeaders(),
responseContext.getStatus(),
(TraceScopeHolder<ServerSpan>)requestContext.getProperty(TRACE_SPAN));
}
-
+
@Override
protected boolean isAsyncResponse() {
for (final Annotation[] annotations: resourceInfo.getResourceMethod().getParameterAnnotations()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
index 7a70a18..af30930 100644
--- a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
+++ b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/BraveTraceTest.java
@@ -36,7 +36,7 @@ import zipkin.Span;
import zipkin.reporter.Reporter;
public class BraveTraceTest {
-
+
private static final String ADDRESS = "http://localhost:8182";
private Server server;
private BraveFeature logging;
@@ -61,12 +61,12 @@ public class BraveTraceTest {
Assert.assertEquals(2, localReporter.spans.size());
}
-
+
@After
public void stopServer() {
server.destroy();
}
-
+
private static Server createServer(Feature logging) {
JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean();
factory.setAddress(ADDRESS);
@@ -74,7 +74,7 @@ public class BraveTraceTest {
factory.setFeatures(Arrays.asList(logging));
return factory.create();
}
-
+
private static MyService createProxy(Feature trace) {
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
factory.setServiceClass(MyService.class);
@@ -87,12 +87,12 @@ public class BraveTraceTest {
Brave brave = new Brave.Builder("myservice").reporter(reporter).build();
return new BraveFeature(brave);
}
-
+
private static BraveClientFeature createClientLoggingFeature(Reporter<Span> reporter) {
Brave brave = new Brave.Builder("myservice").reporter(reporter).build();
return new BraveClientFeature(brave);
}
-
+
static final class Localreporter implements Reporter<Span> {
List<Span> spans = new ArrayList<>();
@@ -100,7 +100,7 @@ public class BraveTraceTest {
public void report(Span span) {
spans.add(span);
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java
index 5751e2c..867d548 100644
--- a/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java
+++ b/integration/tracing/tracing-brave/src/test/java/org/apache/cxf/tracing/brave/LoggingSpanNameProvider.java
@@ -25,7 +25,7 @@ public class LoggingSpanNameProvider implements SpanNameProvider {
@Override
public String spanName(HttpRequest request) {
- return (request instanceof SpanNameProvider) ? ((SpanNameProvider)request).spanName(request) : "";
+ return (request instanceof SpanNameProvider) ? ((SpanNameProvider)request).spanName(request) : "";
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientInterceptor.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientInterceptor.java
index 1358bd8..b632dd0 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientInterceptor.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientInterceptor.java
@@ -26,16 +26,16 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
import org.apache.htrace.core.Tracer;
-public abstract class AbstractHTraceClientInterceptor extends AbstractHTraceClientProvider
+public abstract class AbstractHTraceClientInterceptor extends AbstractHTraceClientProvider
implements PhaseInterceptor<Message> {
-
+
private String phase;
protected AbstractHTraceClientInterceptor(final String phase, final Tracer tracer) {
super(tracer);
this.phase = phase;
}
-
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return null;
}
@@ -55,7 +55,7 @@ public abstract class AbstractHTraceClientInterceptor extends AbstractHTraceClie
public String getPhase() {
return phase;
}
-
+
public void handleFault(Message message) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java
index 5d6e2ac..88dd10b 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceClientProvider.java
@@ -30,44 +30,44 @@ import org.apache.htrace.core.Span;
import org.apache.htrace.core.TraceScope;
import org.apache.htrace.core.Tracer;
-public abstract class AbstractHTraceClientProvider extends AbstractTracingProvider {
+public abstract class AbstractHTraceClientProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractHTraceClientProvider.class);
protected static final String TRACE_SPAN = "org.apache.cxf.tracing.client.htrace.span";
-
+
private final Tracer tracer;
-
+
public AbstractHTraceClientProvider(final Tracer tracer) {
this.tracer = tracer;
}
- protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String, List<String>> requestHeaders,
+ protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String, List<String>> requestHeaders,
String path, String method) {
Span span = Tracer.getCurrentSpan();
TraceScope traceScope = null;
-
+
if (span == null) {
traceScope = tracer.newScope(buildSpanDescription(path, method));
span = traceScope.getSpan();
}
-
+
if (span != null) {
final String spanIdHeader = getSpanIdHeader();
// Transfer tracing headers into the response headers
requestHeaders.put(spanIdHeader, Collections.singletonList(span.getSpanId().toString()));
}
-
- // In case of asynchronous client invocation, the span should be detached as JAX-RS
+
+ // In case of asynchronous client invocation, the span should be detached as JAX-RS
// client request / response filters are going to be executed in different threads.
boolean detached = false;
if (isAsyncInvocation() && traceScope != null) {
traceScope.detach();
detached = true;
}
-
+
return new TraceScopeHolder<TraceScope>(traceScope, detached);
}
-
+
private boolean isAsyncInvocation() {
return !JAXRSUtils.getCurrentMessage().getExchange().isSynchronous();
}
@@ -76,13 +76,13 @@ public abstract class AbstractHTraceClientProvider extends AbstractTracingProvid
if (holder == null) {
return;
}
-
+
final TraceScope scope = holder.getScope();
if (scope != null) {
- // If the client invocation was asynchronous , the trace scope has been created
+ // If the client invocation was asynchronous , the trace scope has been created
// in another thread and should be re-attached to the current one.
if (holder.isDetached()) {
- scope.reattach();
+ scope.reattach();
scope.close();
} else {
scope.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceInterceptor.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceInterceptor.java
index 04f907e..7e93842 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceInterceptor.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceInterceptor.java
@@ -32,7 +32,7 @@ public abstract class AbstractHTraceInterceptor extends AbstractHTraceProvider i
super(tracer);
this.phase = phase;
}
-
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return null;
}
@@ -52,7 +52,7 @@ public abstract class AbstractHTraceInterceptor extends AbstractHTraceProvider i
public String getPhase() {
return phase;
}
-
+
public void handleFault(Message message) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
index 0cc179d..df218fb 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/AbstractHTraceProvider.java
@@ -31,29 +31,29 @@ import org.apache.htrace.core.SpanId;
import org.apache.htrace.core.TraceScope;
import org.apache.htrace.core.Tracer;
-public abstract class AbstractHTraceProvider extends AbstractTracingProvider {
+public abstract class AbstractHTraceProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractHTraceProvider.class);
protected static final String TRACE_SPAN = "org.apache.cxf.tracing.htrace.span";
-
+
private final Tracer tracer;
-
+
public AbstractHTraceProvider(final Tracer tracer) {
this.tracer = tracer;
}
- protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String, List<String>> requestHeaders,
+ protected TraceScopeHolder<TraceScope> startTraceSpan(final Map<String, List<String>> requestHeaders,
String path, String method) {
-
+
// Try to extract the Span Id value from the request header
- final SpanId spanId = getFirstValueOrDefault(requestHeaders, getSpanIdHeader(), SpanId.INVALID);
-
+ final SpanId spanId = getFirstValueOrDefault(requestHeaders, getSpanIdHeader(), SpanId.INVALID);
+
TraceScope traceScope = null;
if (SpanId.INVALID.equals(spanId)) {
traceScope = tracer.newScope(buildSpanDescription(path, method));
} else {
traceScope = tracer.newScope(buildSpanDescription(path, method), spanId);
}
-
+
// If the service resource is using asynchronous processing mode, the trace
// scope will be closed in another thread and as such should be detached.
boolean detached = false;
@@ -62,7 +62,7 @@ public abstract class AbstractHTraceProvider extends AbstractTracingProvider {
propagateContinuationSpan(traceScope);
detached = true;
}
-
+
return new TraceScopeHolder<TraceScope>(traceScope, detached);
}
@@ -75,34 +75,34 @@ public abstract class AbstractHTraceProvider extends AbstractTracingProvider {
if (requestHeaders.containsKey(spanIdHeader)) {
responseHeaders.put(spanIdHeader, CastUtils.cast(requestHeaders.get(spanIdHeader)));
}
-
+
if (holder == null) {
return;
}
-
+
final TraceScope span = holder.getScope();
if (span != null) {
// If the service resource is using asynchronous processing mode, the trace
- // scope has been created in another thread and should be re-attached to the current
+ // scope has been created in another thread and should be re-attached to the current
// one.
if (holder.isDetached()) {
- span.reattach();
+ span.reattach();
span.close();
- } else {
+ } else {
span.close();
}
}
}
-
+
private void propagateContinuationSpan(final TraceScope continuationScope) {
PhaseInterceptorChain.getCurrentMessage().put(TraceScope.class, continuationScope);
}
-
+
protected boolean isAsyncResponse() {
return !PhaseInterceptorChain.getCurrentMessage().getExchange().isSynchronous();
}
-
- private static SpanId getFirstValueOrDefault(final Map<String, List<String>> headers,
+
+ private static SpanId getFirstValueOrDefault(final Map<String, List<String>> headers,
final String header, final SpanId defaultValue) {
List<String> value = headers.get(header);
if (value != null && !value.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStartInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStartInterceptor.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStartInterceptor.java
index 8af55ff..716a6d9 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStartInterceptor.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStartInterceptor.java
@@ -40,13 +40,13 @@ public class HTraceClientStartInterceptor extends AbstractHTraceClientIntercepto
@Override
public void handleMessage(Message message) throws Fault {
final Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
- final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(headers,
- (String)message.get(Message.ENDPOINT_ADDRESS),
+ final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(headers,
+ (String)message.get(Message.ENDPOINT_ADDRESS),
(String)message.get(Message.HTTP_REQUEST_METHOD));
-
+
if (holder != null) {
message.getExchange().put(TRACE_SPAN, holder);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStopInterceptor.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStopInterceptor.java
index e58f529..a469d0e 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStopInterceptor.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceClientStopInterceptor.java
@@ -27,7 +27,7 @@ public class HTraceClientStopInterceptor extends AbstractHTraceClientInterceptor
public HTraceClientStopInterceptor() {
this(Phase.RECEIVE);
}
-
+
public HTraceClientStopInterceptor(final String phase) {
super(phase, null);
}
@@ -35,7 +35,7 @@ public class HTraceClientStopInterceptor extends AbstractHTraceClientInterceptor
@Override
public void handleMessage(Message message) throws Fault {
@SuppressWarnings("unchecked")
- final TraceScopeHolder<TraceScope> holder =
+ final TraceScopeHolder<TraceScope> holder =
(TraceScopeHolder<TraceScope>)message.getExchange().get(TRACE_SPAN);
super.stopTraceSpan(holder);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStartInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStartInterceptor.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStartInterceptor.java
index 5301c4a..644ca03 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStartInterceptor.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStartInterceptor.java
@@ -35,13 +35,13 @@ public class HTraceStartInterceptor extends AbstractHTraceInterceptor {
@Override
public void handleMessage(Message message) throws Fault {
final Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
- final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(headers,
- (String)message.get(Message.REQUEST_URI),
+ final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(headers,
+ (String)message.get(Message.REQUEST_URI),
(String)message.get(Message.HTTP_REQUEST_METHOD));
-
+
if (holder != null) {
message.getExchange().put(TRACE_SPAN, holder);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java
index 75be08b..92f3aba 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceStopInterceptor.java
@@ -36,23 +36,23 @@ public class HTraceStopInterceptor extends AbstractHTraceInterceptor {
@Override
public void handleMessage(Message message) throws Fault {
Map<String, List<Object>> responseHeaders = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
-
+
if (responseHeaders == null) {
responseHeaders = new HashMap<String, List<Object>>();
message.put(Message.PROTOCOL_HEADERS, responseHeaders);
}
-
+
boolean isRequestor = MessageUtils.isRequestor(message);
- Message requestMessage = isRequestor ? message.getExchange().getOutMessage()
+ Message requestMessage = isRequestor ? message.getExchange().getOutMessage()
: message.getExchange().getInMessage();
- Map<String, List<String>> requestHeaders =
+ Map<String, List<String>> requestHeaders =
CastUtils.cast((Map<?, ?>)requestMessage.get(Message.PROTOCOL_HEADERS));
-
+
@SuppressWarnings("unchecked")
- final TraceScopeHolder<TraceScope> holder =
+ final TraceScopeHolder<TraceScope> holder =
(TraceScopeHolder<TraceScope>)message.getExchange().get(TRACE_SPAN);
-
+
super.stopTraceSpan(requestHeaders, responseHeaders, holder);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java
index 52a43f9..0c53f78 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/HTraceTracerContext.java
@@ -38,13 +38,13 @@ public class HTraceTracerContext implements TracerContext {
this.tracer = tracer;
this.continuationScope = continuationScope;
}
-
+
@Override
@SuppressWarnings("unchecked")
public TraceScope startSpan(final String description) {
return tracer.newScope(description);
}
-
+
@Override
public <T> T continueSpan(final Traceable<T> traceable) throws Exception {
boolean attached = false;
@@ -52,7 +52,7 @@ public class HTraceTracerContext implements TracerContext {
continuationScope.reattach();
attached = true;
}
-
+
try {
return traceable.call(new HTraceTracerContext(tracer));
} finally {
@@ -61,7 +61,7 @@ public class HTraceTracerContext implements TracerContext {
}
}
}
-
+
@Override
public <T> Callable<T> wrap(final String description, final Traceable<T> traceable) {
final Callable<T> callable = new Callable<T>() {
@@ -70,10 +70,10 @@ public class HTraceTracerContext implements TracerContext {
return traceable.call(new HTraceTracerContext(tracer));
}
};
-
+
return tracer.wrap(callable, description);
}
-
+
@Override
public void annotate(String key, String value) {
final Span currentSpan = Tracer.getCurrentSpan();
@@ -81,7 +81,7 @@ public class HTraceTracerContext implements TracerContext {
currentSpan.addKVAnnotation(key, value);
}
}
-
+
@Override
public void timeline(String message) {
final Span currentSpan = Tracer.getCurrentSpan();
@@ -89,7 +89,7 @@ public class HTraceTracerContext implements TracerContext {
currentSpan.addTimelineAnnotation(message);
}
}
-
+
private boolean isTracing() {
return Tracer.getCurrentSpan() != null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceClientProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceClientProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceClientProvider.java
index 0c7c238..8ead3d4 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceClientProvider.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceClientProvider.java
@@ -31,7 +31,7 @@ import org.apache.htrace.core.TraceScope;
import org.apache.htrace.core.Tracer;
@Provider
-public class HTraceClientProvider extends AbstractHTraceClientProvider
+public class HTraceClientProvider extends AbstractHTraceClientProvider
implements ClientRequestFilter, ClientResponseFilter {
public HTraceClientProvider(final Tracer tracer) {
@@ -40,19 +40,19 @@ public class HTraceClientProvider extends AbstractHTraceClientProvider
@Override
public void filter(final ClientRequestContext requestContext) throws IOException {
- final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(requestContext.getStringHeaders(),
+ final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(requestContext.getStringHeaders(),
requestContext.getUri().toString(), requestContext.getMethod());
if (holder != null) {
requestContext.setProperty(TRACE_SPAN, holder);
}
}
-
+
@SuppressWarnings("unchecked")
@Override
public void filter(final ClientRequestContext requestContext,
final ClientResponseContext responseContext) throws IOException {
- final TraceScopeHolder<TraceScope> holder =
+ final TraceScopeHolder<TraceScope> holder =
(TraceScopeHolder<TraceScope>)requestContext.getProperty(TRACE_SPAN);
super.stopTraceSpan(holder);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceContextProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceContextProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceContextProvider.java
index 73be373..a706f9d 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceContextProvider.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceContextProvider.java
@@ -30,7 +30,7 @@ import org.apache.htrace.core.Tracer;
@Provider
public class HTraceContextProvider implements ContextProvider< TracerContext > {
private final Tracer tracer;
-
+
public HTraceContextProvider(final Tracer tracer) {
this.tracer = tracer;
}
@@ -39,13 +39,13 @@ public class HTraceContextProvider implements ContextProvider< TracerContext > {
public TracerContext createContext(final Message message) {
// Check if there is a trace scope passed along with the message
final TraceScope continuationScope = message.get(TraceScope.class);
-
- // If trace scope is already present, let us check if it is detached
+
+ // If trace scope is already present, let us check if it is detached
// (asynchronous invocation)
if (continuationScope != null) {
return new HTraceTracerContext(tracer, continuationScope);
}
-
+
return new HTraceTracerContext(tracer);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java
index d9b8623..c891b65 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceFeature.java
@@ -30,7 +30,7 @@ import org.apache.htrace.core.Tracer;
public class HTraceFeature extends AbstractFeature {
private HTraceConfiguration configuration;
private String name;
-
+
public HTraceFeature() {
this(HTraceConfiguration.EMPTY, "");
}
@@ -49,25 +49,25 @@ public class HTraceFeature extends AbstractFeature {
final Tracer tracer = new Tracer.Builder(name)
.conf(configuration)
.build();
-
+
if (providerFactory != null) {
- providerFactory.setUserProviders(Arrays.asList(new HTraceProvider(tracer),
+ providerFactory.setUserProviders(Arrays.asList(new HTraceProvider(tracer),
new HTraceContextProvider(tracer)));
}
}
-
+
public void setConfiguration(final HTraceConfiguration configuration) {
this.configuration = configuration;
}
-
+
public HTraceConfiguration getConfiguration() {
return configuration;
}
-
+
public void setName(String name) {
this.name = name;
}
-
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceProvider.java b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceProvider.java
index 47c4d74..504df2c 100644
--- a/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceProvider.java
+++ b/integration/tracing/tracing-htrace/src/main/java/org/apache/cxf/tracing/htrace/jaxrs/HTraceProvider.java
@@ -35,35 +35,35 @@ import org.apache.htrace.core.TraceScope;
import org.apache.htrace.core.Tracer;
@Provider
-public class HTraceProvider extends AbstractHTraceProvider
+public class HTraceProvider extends AbstractHTraceProvider
implements ContainerRequestFilter, ContainerResponseFilter {
- @Context
+ @Context
private ResourceInfo resourceInfo;
-
+
public HTraceProvider(final Tracer tracer) {
super(tracer);
}
@Override
public void filter(final ContainerRequestContext requestContext) throws IOException {
- final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(requestContext.getHeaders(),
+ final TraceScopeHolder<TraceScope> holder = super.startTraceSpan(requestContext.getHeaders(),
requestContext.getUriInfo().getPath(),
requestContext.getMethod());
-
+
if (holder != null) {
requestContext.setProperty(TRACE_SPAN, holder);
}
}
-
+
@SuppressWarnings("unchecked")
@Override
public void filter(final ContainerRequestContext requestContext,
final ContainerResponseContext responseContext) throws IOException {
- super.stopTraceSpan(requestContext.getHeaders(),
- responseContext.getHeaders(),
+ super.stopTraceSpan(requestContext.getHeaders(),
+ responseContext.getHeaders(),
(TraceScopeHolder<TraceScope>)requestContext.getProperty(TRACE_SPAN));
}
-
+
@Override
protected boolean isAsyncResponse() {
for (final Annotation[] annotations: resourceInfo.getResourceMethod().getParameterAnnotations()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
index e20d7d0..7570279 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorld.java
@@ -5,9 +5,9 @@
## to you under the Apache License, Version 2.0 (the
## "License"); you may not use this file except in compliance
## with the License. You may obtain a copy of the License at
-##
+##
## http://www.apache.org/licenses/LICENSE-2.0
-##
+##
## Unless required by applicable law or agreed to in writing,
## software distributed under the License is distributed on an
## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
index ee938f0..efb9820 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java
@@ -5,9 +5,9 @@
## to you under the Apache License, Version 2.0 (the
## "License"); you may not use this file except in compliance
## with the License. You may obtain a copy of the License at
-##
+##
## http://www.apache.org/licenses/LICENSE-2.0
-##
+##
## Unless required by applicable law or agreed to in writing,
## software distributed under the License is distributed on an
## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
index 182ec5f..d49207a 100644
--- a/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
+++ b/maven-plugins/archetypes/cxf-jaxws-javafirst/src/main/resources/archetype-resources/src/test/java/HelloWorldImplTest.java
@@ -5,9 +5,9 @@
## to you under the Apache License, Version 2.0 (the
## "License"); you may not use this file except in compliance
## with the License. You may obtain a copy of the License at
-##
+##
## http://www.apache.org/licenses/LICENSE-2.0
-##
+##
## Unless required by applicable law or agreed to in writing,
## software distributed under the License is distributed on an
## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/main/java/HelloWorldPortTypeImpl.java
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/main/java/HelloWorldPortTypeImpl.java b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/main/java/HelloWorldPortTypeImpl.java
index d075820..e9e3446 100644
--- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/main/java/HelloWorldPortTypeImpl.java
+++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/main/java/HelloWorldPortTypeImpl.java
@@ -5,9 +5,9 @@
## to you under the Apache License, Version 2.0 (the
## "License"); you may not use this file except in compliance
## with the License. You may obtain a copy of the License at
-##
+##
## http://www.apache.org/licenses/LICENSE-2.0
-##
+##
## Unless required by applicable law or agreed to in writing,
## software distributed under the License is distributed on an
## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,9 +19,9 @@ package ${package};
import javax.jws.WebService;
import org.apache.contract.helloworld.HelloWorldPortType;
-@WebService(targetNamespace = "http://www.apache.org/contract/HelloWorld",
+@WebService(targetNamespace = "http://www.apache.org/contract/HelloWorld",
portName="HelloWorldPort",
- serviceName="HelloWorldService",
+ serviceName="HelloWorldService",
endpointInterface = "org.apache.contract.helloworld.HelloWorldPortType")
public class HelloWorldPortTypeImpl implements HelloWorldPortType {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/test/java/HelloWorldPortTypeImplTest.java
----------------------------------------------------------------------
diff --git a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/test/java/HelloWorldPortTypeImplTest.java b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/test/java/HelloWorldPortTypeImplTest.java
index b03ee82..1a27a5e 100644
--- a/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/test/java/HelloWorldPortTypeImplTest.java
+++ b/maven-plugins/archetypes/cxf-jaxws-wsdlfirst/src/main/resources/archetype-resources/src/test/java/HelloWorldPortTypeImplTest.java
@@ -5,9 +5,9 @@
## to you under the Apache License, Version 2.0 (the
## "License"); you may not use this file except in compliance
## with the License. You may obtain a copy of the License at
-##
+##
## http://www.apache.org/licenses/LICENSE-2.0
-##
+##
## Unless required by applicable law or agreed to in writing,
## software distributed under the License is distributed on an
## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -23,7 +23,7 @@ public class HelloWorldPortTypeImplTest {
@Test
public void testSayHi() {
- HelloWorldPortTypeImpl helloWorldPortTypeImpl = new HelloWorldPortTypeImpl();
+ HelloWorldPortTypeImpl helloWorldPortTypeImpl = new HelloWorldPortTypeImpl();
String response = helloWorldPortTypeImpl.sayHi("Sam");
assertEquals("HelloWorldPortTypeImpl not properly saying hi", "Hello Sam", response);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index 51269ed..1bfa6b0 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -68,7 +68,7 @@ import org.codehaus.plexus.util.cli.StreamConsumer;
import org.sonatype.plexus.build.incremental.BuildContext;
public abstract class AbstractCodegenMoho extends AbstractMojo {
-
+
/**
* JVM/System property name holding the hostname of the http proxy.
*/
@@ -84,28 +84,28 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
* should not use the proxy configuration.
*/
private static final String HTTP_NON_PROXY_HOSTS = "http.nonProxyHosts";
-
+
/**
* JVM/System property name holding the username of the http proxy.
*/
private static final String HTTP_PROXY_USER = "http.proxyUser";
-
+
/**
* JVM/System property name holding the password of the http proxy.
*/
private static final String HTTP_PROXY_PASSWORD = "http.proxyPassword";
-
+
@Parameter(property = "project.build.outputDirectory", required = true)
protected String classesDirectory;
-
+
/**
* By default all maven dependencies of type "wsdl" are added to the effective wsdlOptions. Setting this
* parameter to true disables this functionality
*/
@Parameter(property = "cxf.disableDependencyScan", defaultValue = "false")
protected boolean disableDependencyScan;
-
+
/**
* Disables the scanning of the wsdlRoot/testWsdlRoot directories.
* By default, we scan for *.wsdl (see include/exclude params as well) in the wsdlRoot
@@ -114,14 +114,14 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
*/
@Parameter(property = "cxf.disableDirectoryScan", defaultValue = "false")
protected boolean disableDirectoryScan;
-
+
/**
* Allows running the JavaToWs in a separate process. Valid values are "false", "always", and "once" The
* value of "true" is equal to "once"
*/
@Parameter(defaultValue = "false")
protected String fork;
-
+
/**
* A list of wsdl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
* *.wsdl
@@ -133,39 +133,39 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
*/
@Parameter(property = "cxf.markerDirectory", defaultValue = "${project.build.directory}/cxf-codegen-plugin-markers")
protected File markerDirectory;
-
+
/**
* The plugin dependencies, needed for the fork mode
*/
@Parameter(required = true, readonly = true, property = "plugin.artifacts")
protected List<Artifact> pluginArtifacts;
-
+
@Parameter(required = true, property = "project")
protected MavenProject project;
-
+
/**
* Use the compile classpath rather than the test classpath for execution useful if the test dependencies
* clash with those of wsdl2java
*/
@Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
protected boolean useCompileClasspath;
-
+
/**
* A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
*/
@Parameter
protected String excludes[];
-
+
@Parameter(property = "cxf.testWsdlRoot", defaultValue = "${basedir}/src/test/resources/wsdl")
protected File testWsdlRoot;
-
+
@Parameter(property = "cxf.wsdlRoot", defaultValue = "${basedir}/src/main/resources/wsdl")
protected File wsdlRoot;
-
+
@Component
protected BuildContext buildContext;
-
-
+
+
/**
* Sets the JVM arguments (i.e. <code>-Xms128m -Xmx128m</code>) if fork is set to <code>true</code>.
*/
@@ -189,13 +189,13 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
*/
@Parameter(readonly = true, required = true, property = "session")
private MavenSession mavenSession;
-
+
@Component
private ProjectDependenciesResolver projectDependencyResolver;
-
+
@Component
private RepositorySystem repositorySystem;
-
+
public AbstractCodegenMoho() {
super();
@@ -211,7 +211,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
project.addTestCompileSourceRoot(getGeneratedTestRoot().getAbsolutePath());
}
checkResources();
-
+
// if this is an m2e configuration build then return immediately without doing any work
if (project != null && buildContext.isIncremental() && !buildContext.hasDelta(project.getBasedir())) {
return;
@@ -228,7 +228,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
"*.wsdl"
};
}
-
+
markerDirectory.mkdirs();
String originalProxyHost = SystemPropertyAction.getProperty(HTTP_PROXY_HOST);
@@ -236,7 +236,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
String originalNonProxyHosts = SystemPropertyAction.getProperty(HTTP_NON_PROXY_HOSTS);
String originalProxyUser = SystemPropertyAction.getProperty(HTTP_PROXY_USER);
String originalProxyPassword = SystemPropertyAction.getProperty(HTTP_PROXY_PASSWORD);
-
+
configureProxyServerSettings();
List<GenericWsdlOption> effectiveWsdlOptions = createWsdlOptionsFromScansAndExplicitWsdlOptions();
@@ -258,7 +258,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
} else {
for (GenericWsdlOption o : effectiveWsdlOptions) {
bus = generate(o, bus, cp);
-
+
File dirs[] = o.getDeleteDirs();
if (dirs != null) {
for (int idx = 0; idx < dirs.length; ++idx) {
@@ -295,13 +295,13 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
File genroot = getGeneratedSourceRoot();
if (genroot != null) {
-
+
List<Resource> resources = project.getBuild().getResources();
for (Resource r : resources) {
File d = new File(root, r.getDirectory());
if (d.equals(genroot)) {
sourceRoot = r;
- }
+ }
}
Resource r2 = scanForResources(genroot, sourceRoot);
if (r2 != sourceRoot) {
@@ -316,7 +316,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
File d = new File(root, r.getDirectory());
if (d.equals(genroot)) {
testRoot = r;
- }
+ }
}
Resource r2 = scanForResources(genroot, testRoot);
if (r2 != testRoot) {
@@ -381,13 +381,13 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
System.getProperties().remove(HTTP_PROXY_PASSWORD);
}
Proxy proxy = mavenSession.getSettings().getActiveProxy();
- if (proxy != null && !StringUtils.isEmpty(proxy.getUsername())
+ if (proxy != null && !StringUtils.isEmpty(proxy.getUsername())
&& !StringUtils.isEmpty(proxy.getPassword())) {
Authenticator.setDefault(null);
}
}
- protected abstract Bus generate(GenericWsdlOption o,
+ protected abstract Bus generate(GenericWsdlOption o,
Bus bus, Set<URI> cp) throws MojoExecutionException;
protected void addPluginArtifact(Set<URI> artifactsPath) {
@@ -438,7 +438,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
if (proxy.getNonProxyHosts() != null) {
System.setProperty(HTTP_NON_PROXY_HOSTS, proxy.getNonProxyHosts());
}
- if (!StringUtils.isEmpty(proxy.getUsername())
+ if (!StringUtils.isEmpty(proxy.getUsername())
&& !StringUtils.isEmpty(proxy.getPassword())) {
final String authUser = proxy.getUsername();
final String authPassword = proxy.getPassword();
@@ -455,13 +455,13 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
}
}
-
- protected abstract List<GenericWsdlOption> createWsdlOptionsFromScansAndExplicitWsdlOptions()
+
+ protected abstract List<GenericWsdlOption> createWsdlOptionsFromScansAndExplicitWsdlOptions()
throws MojoExecutionException;
/**
* Recursively delete the given directory
- *
+ *
* @param f
* @return
*/
@@ -482,12 +482,12 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
return true;
}
-
+
protected abstract String getMarkerSuffix();
-
+
protected List<String> generateCommandLine(GenericWsdlOption wsdlOption)
throws MojoExecutionException {
-
+
File outputDirFile = wsdlOption.getOutputDir();
outputDirFile.mkdirs();
URI basedir = project.getBasedir().toURI();
@@ -495,7 +495,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
return wsdlOption.generateCommandLine(outputDirFile, basedir, wsdlURI,
getLog().isDebugEnabled());
}
-
+
protected void forkOnce(Set<URI> classPath, List<GenericWsdlOption> effectiveWsdlOptions)
throws MojoExecutionException {
List<GenericWsdlOption> toDo = new LinkedList<GenericWsdlOption>();
@@ -553,9 +553,9 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
}
}
}
-
+
protected abstract Class<?> getForkClass();
-
+
protected File getDoneFile(URI basedir, URI wsdlURI, String mojo) {
String doneFileName = wsdlURI.toString();
@@ -567,7 +567,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
doneFileName = new javax.xml.bind.annotation.adapters.HexBinaryAdapter().marshal(cript.digest());
} catch (Exception e) {
//ignore,we'll try and fake it based on the wsdl
-
+
// Strip the basedir from the doneFileName
if (doneFileName.startsWith(basedir.toString())) {
doneFileName = doneFileName.substring(basedir.toString().length());
@@ -578,16 +578,16 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
.replace(':', '_');
doneFileName += ".DONE";
}
-
+
return new File(markerDirectory, "." + doneFileName);
}
protected abstract File getGeneratedSourceRoot();
protected abstract File getGeneratedTestRoot();
-
- protected void runForked(Set<URI> classPath,
- String mainClassName,
+
+ protected void runForked(Set<URI> classPath,
+ String mainClassName,
String[] args) throws MojoExecutionException {
getLog().info("Running code generation in fork mode...");
getLog().debug("Running code generation in fork mode with args " + Arrays.asList(args));
@@ -631,7 +631,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
jar.createArchive();
cmd.createArg().setValue("-jar");
-
+
String tmpFilePath = file.getAbsolutePath();
if (tmpFilePath.contains(" ")) {
//ensure the path is in double quotation marks if the path contain space
@@ -664,7 +664,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
getLog().debug(e);
throw new MojoExecutionException(e.getMessage(), e);
}
-
+
String cmdLine = CommandLineUtils.toString(cmd.getCommandline());
@@ -687,10 +687,10 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
}
}
-
+
/**
* Determine if code should be generated from the given wsdl
- *
+ *
* @param wsdlOption
* @param doneFile
* @param wsdlURI
@@ -701,7 +701,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
protected void createMarkerFile(GenericWsdlOption wsdlOption, File doneFile, URI wsdlURI) throws IOException {
doneFile.createNewFile();
}
-
+
private String[] createForkOnceArgs(List<List<String>> wargs) throws MojoExecutionException {
try {
File f = FileUtils.createTempFile("cxf-w2j", "args");
@@ -721,11 +721,11 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
throw new MojoExecutionException("Could not create argument file", ex);
}
}
-
+
/**
* Try to find a file matching the wsdl path (either absolutely, relatively to the current dir or to
* the project base dir)
- *
+ *
* @return wsdl file
*/
public File getWsdlFile(GenericWsdlOption option, File baseDir) {
@@ -749,18 +749,18 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
}
return file;
}
-
+
public URI getWsdlURI(GenericWsdlOption option, URI baseURI) throws MojoExecutionException {
String wsdlLocation = option.getUri();
if (wsdlLocation == null) {
throw new MojoExecutionException("No wsdl available for base URI " + baseURI);
}
File wsdlFile = new File(wsdlLocation);
- return wsdlFile.exists() ? wsdlFile.toURI()
+ return wsdlFile.exists() ? wsdlFile.toURI()
: baseURI.resolve(URIParserUtil.escapeChars(wsdlLocation));
}
- protected void downloadRemoteWsdls(List<GenericWsdlOption> effectiveWsdlOptions)
+ protected void downloadRemoteWsdls(List<GenericWsdlOption> effectiveWsdlOptions)
throws MojoExecutionException {
for (GenericWsdlOption wsdlOption : effectiveWsdlOptions) {
@@ -770,7 +770,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
}
Artifact wsdlArtifact = repositorySystem.createArtifactWithClassifier(wsdlA.getGroupId(),
wsdlA.getArtifactId(),
- wsdlA.getVersion(),
+ wsdlA.getVersion(),
wsdlA.getType(),
wsdlA.getClassifier());
wsdlArtifact = resolveRemoteWsdlArtifact(wsdlArtifact);
@@ -807,13 +807,13 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
throw new IOException(
"The java executable '"
+ javaExe
- + "' doesn't exist or is not a file."
+ + "' doesn't exist or is not a file."
+ "Verify the <javaExecutable/> parameter or toolchain configuration.");
}
getLog().info("The java executable is " + javaExe.getAbsolutePath());
return javaExe;
}
-
+
private Artifact resolveRemoteWsdlArtifact(Artifact artifact) throws MojoExecutionException {
Artifact remoteWsdl = resolveDependentWsdl(artifact);
if (remoteWsdl == null) {
@@ -861,9 +861,9 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
request.setMirrors(mavenSession.getRequest().getMirrors());
request.setProxies(mavenSession.getRequest().getProxies());
request.setLocalRepository(mavenSession.getLocalRepository());
- request.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
+ request.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
ArtifactResolutionResult result = repositorySystem.resolve(request);
-
+
return result.getOriginatingArtifact();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index 8b24b43..4457860 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -53,7 +53,7 @@ public class ClassLoaderSwitcher {
/**
* Create and set the classloader that is needed for creating the java sources from wsdl
- *
+ *
* @param project
* @param useCompileClasspath
* @param classesDir
@@ -64,7 +64,7 @@ public class ClassLoaderSwitcher {
List<URL> urlList = new ArrayList<>();
StringBuilder buf = new StringBuilder();
Set<URI> ret = new LinkedHashSet<URI>();
-
+
try {
urlList.add(classesDir.toURI().toURL());
if (!useCompileClasspath) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
index 610b2de..58d420f 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlArtifact.java
@@ -28,11 +28,11 @@ public class WsdlArtifact {
private String version;
private String classifier;
private String type;
-
+
public WsdlArtifact() {
type = "wsdl";
}
-
+
public String getGroupId() {
return groupId;
}
@@ -57,9 +57,9 @@ public class WsdlArtifact {
public void setType(String type) {
this.type = type;
}
-
+
/**
- * Not quite the same as equals: null in version
+ * Not quite the same as equals: null in version
* matches anything.
* @param artifact
* @return
@@ -73,7 +73,7 @@ public class WsdlArtifact {
}
return ((classifier == null && artifact.classifier == null)
|| classifier != null && classifier.equals(artifact.classifier))
- && artifactId.equals(artifact.getArtifactId())
+ && artifactId.equals(artifact.getArtifactId())
&& (version == null || version.equals(artifact.getVersion()));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
index c49aebf..399de26 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
@@ -34,9 +34,9 @@ public final class WsdlUtilities {
private WsdlUtilities() {
}
-
- public static boolean fillWsdlOptionFromArtifact(GenericWsdlOption option,
- Artifact artifact,
+
+ public static boolean fillWsdlOptionFromArtifact(GenericWsdlOption option,
+ Artifact artifact,
File outputDir) {
if (!WSDL_TYPE.equals(artifact.getType())) {
return false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
index 92902c5..3103621 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
@@ -27,7 +27,7 @@ import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
/**
- *
+ *
*/
public final class ForkOnceWSDL2Java {
private ForkOnceWSDL2Java() {
@@ -47,9 +47,9 @@ public final class ForkOnceWSDL2Java {
for (int x = 0; x < i; x++) {
wargs[x] = reader.readLine();
}
-
+
new WSDLToJava(wargs).run(new ToolContext());
-
+
line = reader.readLine();
}
reader.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
index a99abdc..f9b04d1 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
@@ -34,13 +34,13 @@ public class Option {
/**
* As maven will set null for an empty parameter we need
- * this horrid initial value to tell if it has been
+ * this horrid initial value to tell if it has been
* configured or not yet.
*/
private static final String DEFAULT_WSDL_LOCATION = "DEFAULTWSDLLOCATION - WORKAROUND";
/**
- *
+ *
*/
protected List<String> packagenames = new ArrayList<>();
@@ -55,7 +55,7 @@ public class Option {
* For compatibility as well as to specify any extra flags not addressed by other parameters
*/
protected List<String> xjcargs = new ArrayList<>();
-
+
protected String[] asyncMethods;
protected String[] bareMethods;
protected String[] mimeMethods;
@@ -67,7 +67,7 @@ public class Option {
/**
* Ignore the specified WSDL schema namespace when generating code.
- * Also, optionally specifies the Java package name used by types described in the excluded
+ * Also, optionally specifies the Java package name used by types described in the excluded
* namespace(s) using schema-namespace[=java-packagename]
*/
List<String> namespaceExcludes = new ArrayList<>();
@@ -78,15 +78,15 @@ public class Option {
Boolean defaultExcludesNamespace;
/**
- * Enables or disables the loading of the default namespace package name mapping. Default is true and
+ * Enables or disables the loading of the default namespace package name mapping. Default is true and
* <a href=""http://www.w3.org/2005/08/addressing">
- * http://www.w3.org/2005/08/addressing=org.apache.cxf.ws.addressingnamespace</a>
+ * http://www.w3.org/2005/08/addressing=org.apache.cxf.ws.addressingnamespace</a>
* package mapping will be enabled.
*/
Boolean defaultNamespacePackageMapping;
/**
- * A set of dependent files used to detect that the generator must process WSDL, even
+ * A set of dependent files used to detect that the generator must process WSDL, even
* if generator marker files are up to date.
*/
String dependencies[];
@@ -102,7 +102,7 @@ public class Option {
Set<String> bindingFiles = new HashSet<>();
/**
- * Specifies the value of the @WebServiceClient annotation's wsdlLocation property.
+ * Specifies the value of the @WebServiceClient annotation's wsdlLocation property.
*/
String wsdlLocation = DEFAULT_WSDL_LOCATION;
@@ -133,17 +133,17 @@ public class Option {
String catalog;
/**
- * Enables or disables processing of implicit SOAP headers (i.e. SOAP headers defined in the
+ * Enables or disables processing of implicit SOAP headers (i.e. SOAP headers defined in the
* wsdl:binding but not wsdl:portType section.) Default is false.
*/
Boolean extendedSoapHeaders;
/**
- * Enables validating the WSDL before generating the code.
+ * Enables validating the WSDL before generating the code.
*/
String validateWsdl;
-
-
+
+
/**
* Enables or disables generation of the type classes. Default value is false.
*/
@@ -183,9 +183,9 @@ public class Option {
* Disable generation of service address binding in the generated Java classes
*/
Boolean noAddressBinding;
-
+
/**
- * Allow element references when determining if an operation can be unwrapped or not
+ * Allow element references when determining if an operation can be unwrapped or not
*/
Boolean allowElementRefs;
@@ -229,7 +229,7 @@ public class Option {
public String[] getBareMethods() {
return bareMethods;
}
-
+
public List<String> getPackagenames() {
return packagenames;
@@ -282,7 +282,7 @@ public class Option {
public void setOutputDir(File f) {
outputDir = f;
}
-
+
public void setBindingFiles(Set<String> files) {
bindingFiles = files;
}
@@ -292,7 +292,7 @@ public class Option {
public void addBindingFile(File file) {
bindingFiles.add(file.getAbsolutePath());
}
-
+
public void addDefaultBindingFileIfExists(File baseDir) {
File defaultBindingFile = new File(baseDir, DEFAULT_BINDING_FILE_PATH);
if (defaultBindingFile.exists()) {
@@ -370,11 +370,11 @@ public class Option {
public void setValidate(String v) {
this.validateWsdl = v;
}
-
+
public boolean isNoTypes() {
return noTypes == null ? false : noTypes;
}
-
+
public void setNoTypes(boolean noTypes) {
this.noTypes = noTypes;
}
@@ -386,18 +386,18 @@ public class Option {
public void setFaultSerialVersionUID(String faultSerialVersionUID) {
this.faultSerialVersionUID = faultSerialVersionUID;
}
-
+
public String getExceptionSuper() {
return exceptionSuper;
}
-
+
public void setExceptionSuper(String exceptionSuper) {
this.exceptionSuper = exceptionSuper;
}
public List<String> getSeiSuper() {
return seiSuper;
}
-
+
public void setSeiSuper(List<String> seiSuper) {
this.seiSuper.clear();
this.seiSuper.addAll(seiSuper);
@@ -491,14 +491,14 @@ public class Option {
destination.setBareMethods(getBareMethods());
destination.setExceptionSuper(getExceptionSuper());
}
-
+
private <T> T setIfNull(T dest, T source) {
if (dest == null) {
dest = source;
}
return dest;
}
-
+
public void merge(Option defaultOptions) {
wsdlList = setIfNull(wsdlList, defaultOptions.wsdlList);
exceptionSuper = setIfNull(exceptionSuper, defaultOptions.exceptionSuper);
@@ -512,7 +512,7 @@ public class Option {
autoNameResolution = setIfNull(autoNameResolution, defaultOptions.autoNameResolution);
noAddressBinding = setIfNull(noAddressBinding, defaultOptions.noAddressBinding);
allowElementRefs = setIfNull(allowElementRefs, defaultOptions.allowElementRefs);
- defaultExcludesNamespace = setIfNull(defaultExcludesNamespace,
+ defaultExcludesNamespace = setIfNull(defaultExcludesNamespace,
defaultOptions.defaultExcludesNamespace);
defaultNamespacePackageMapping = setIfNull(defaultNamespacePackageMapping,
defaultOptions.defaultNamespacePackageMapping);
@@ -536,7 +536,7 @@ public class Option {
wsdlLocation = defaultOptions.getWsdlLocation();
}
}
-
+
@SuppressWarnings("unchecked")
private <T> T[] mergeList(T[] l1, T[] l2, Class<T> cls) {
if (l1 == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
index 07d9935..5c483f8 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WSDL2JavaMojo.java
@@ -66,9 +66,9 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
public void addError(final String file, int line, int column, String message, Throwable t) {
super.addError(file, line, column, message, t);
-
+
File f = mapFile(file);
-
+
if (f != null && !errorfiles.contains(f)) {
buildContext.removeMessages(f);
errorfiles.add(f);
@@ -129,16 +129,16 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
/**
* Path where the generated sources should be placed
- *
+ *
*/
@Parameter(required = true, defaultValue = "${project.build.directory}/generated-sources/cxf",
property = "cxf.sourceRoot")
File sourceRoot;
/**
- * Options that specify WSDLs to process and/or control the processing of wsdls.
+ * Options that specify WSDLs to process and/or control the processing of wsdls.
* If you have enabled wsdl scanning, these elements attach options to particular wsdls.
- * If you have not enabled wsdl scanning, these options call out the wsdls to process.
+ * If you have not enabled wsdl scanning, these options call out the wsdls to process.
*/
@Parameter
WsdlOption wsdlOptions[];
@@ -158,12 +158,12 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
/**
* Merge WsdlOptions that point to the same file by adding the extraargs to the first option and deleting
* the second from the options list
- *
+ *
* @param options
*/
protected void mergeOptions(List<GenericWsdlOption> effectiveWsdlOptions) {
- File outputDirFile = getGeneratedTestRoot() == null
+ File outputDirFile = getGeneratedTestRoot() == null
? getGeneratedSourceRoot() : getGeneratedTestRoot();
List<GenericWsdlOption> newList = new ArrayList<>();
@@ -206,13 +206,13 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
/**
* Determine if code should be generated from the given wsdl
- *
+ *
* @param wsdlOption
* @param doneFile
* @param wsdlURI
* @return
*/
- protected boolean shouldRun(GenericWsdlOption genericWsdlOption,
+ protected boolean shouldRun(GenericWsdlOption genericWsdlOption,
File doneFile, URI wsdlURI) {
WsdlOption wsdlOption = (WsdlOption) genericWsdlOption;
long timestamp = getTimestamp(wsdlURI);
@@ -260,7 +260,7 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
}
return doWork;
}
-
+
protected void createMarkerFile(GenericWsdlOption wsdlOption, File doneFile, URI wsdlURI) throws IOException {
doneFile.createNewFile();
URI basedir = project.getBasedir().toURI();
@@ -270,12 +270,12 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
writer.flush();
}
}
-
+
/**
* Finds the timestamp for a given URI. Calls {@link #getBaseFileURI(URI)} prior to the timestamp
* check in order to handle "classpath" and "jar" URIs.
- *
+ *
* @param uri the URI to timestamp
* @return a timestamp
*/
@@ -298,7 +298,7 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
* Finds the base file URI that 'contains' the given URI. If the URI can not be resolved to a file URI
* then the original URI is returned. This method currently attempts to resolve only "classpath" and
* "jar" URIs.
- *
+ *
* @param uri the URI to resolve
* @return uri a file URI if the original URI is contained in a file, otherwise the original URI
*/
@@ -338,7 +338,7 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
}
@Override
- protected Bus generate(GenericWsdlOption genericWsdlOption,
+ protected Bus generate(GenericWsdlOption genericWsdlOption,
Bus bus,
Set<URI> classPath) throws MojoExecutionException {
WsdlOption wsdlOption = (WsdlOption) genericWsdlOption;
@@ -370,8 +370,8 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
}
}
}
-
- List<String> list = wsdlOption.generateCommandLine(outputDirFile, basedir, wsdlURI,
+
+ List<String> list = wsdlOption.generateCommandLine(outputDirFile, basedir, wsdlURI,
getLog().isDebugEnabled());
if (encoding != null) {
list.add(0, "-encoding");
@@ -403,8 +403,8 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
}
try {
ToolContext ctx = new ToolContext();
- final List<File> files = new ArrayList<>();
- final List<File> errorfiles = new ArrayList<>();
+ final List<File> files = new ArrayList<>();
+ final List<File> errorfiles = new ArrayList<>();
ctx.put(OutputStreamCreator.class, new OutputStreamCreator() {
public OutputStream createOutputStream(File file) throws IOException {
files.add(file);
@@ -413,7 +413,7 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
});
ctx.setErrorListener(new MavenToolErrorListener(errorfiles));
new WSDLToJava(args).run(ctx);
-
+
List<File> oldFiles = CastUtils.cast((List<?>)buildContext
.getValue("cxf.file.list." + doneFile.getName()));
if (oldFiles != null) {
@@ -482,7 +482,7 @@ public class WSDL2JavaMojo extends AbstractCodegenMoho {
effectiveWsdlOptions.addAll(temp);
}
if (!disableDependencyScan) {
- temp = WsdlOptionLoader.loadWsdlOptionsFromDependencies(project,
+ temp = WsdlOptionLoader.loadWsdlOptionsFromDependencies(project,
getGeneratedSourceRoot());
effectiveWsdlOptions.addAll(temp);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOption.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOption.java
index 8d74931..77d141b 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOption.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOption.java
@@ -52,7 +52,7 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
public WsdlArtifact getWsdlArtifact() {
return wsdlArtifact;
}
-
+
public void setArtifact(WsdlArtifact artifact) {
wsdlArtifact = artifact;
}
@@ -60,11 +60,11 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
public void setWsdlArtifact(WsdlArtifact wsdlArtifact) {
this.wsdlArtifact = wsdlArtifact;
}
-
+
/**
* Try to find a file matching the wsdl path (either absolutely, relatively to the current dir or to
* the project base dir)
- *
+ *
* @return wsdl file
*/
public File getWsdlFile(File baseDir) {
@@ -88,14 +88,14 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
}
return file;
}
-
+
public URI getWsdlURI(URI baseURI) throws MojoExecutionException {
String wsdlLocation = getWsdl();
if (wsdlLocation == null) {
throw new MojoExecutionException("No wsdl available for base URI " + baseURI);
}
File wsdlFile = new File(wsdlLocation);
- return wsdlFile.exists() ? wsdlFile.toURI()
+ return wsdlFile.exists() ? wsdlFile.toURI()
: baseURI.resolve(URIParserUtil.escapeChars(wsdlLocation));
}
@@ -179,10 +179,10 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
+ ToolConstants.CFG_EXCEPTION_SUPER);
addList(list, "-" + ToolConstants.CFG_SEI_SUPER, true,
getSeiSuper());
-
- addIfTrue(list, isAutoNameResolution(), "-"
+
+ addIfTrue(list, isAutoNameResolution(), "-"
+ ToolConstants.CFG_AUTORESOLVE);
- addIfTrue(list, isNoAddressBinding(), "-"
+ addIfTrue(list, isNoAddressBinding(), "-"
+ ToolConstants.CFG_NO_ADDRESS_BINDING);
addList(list, "-xjc", false, getXJCargs());
addList(list, "", false, getExtraargs());
@@ -196,7 +196,7 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
addEqualsArray(list, "-bareMethods", getBareMethods());
addEqualsArray(list, "-mimeMethods", getMimeMethods());
list.add(wsdlURI.toString());
-
+
return list;
}
@@ -229,8 +229,8 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
}
}
}
- private static void addEqualsArray(List<String> destList,
- String key,
+ private static void addEqualsArray(List<String> destList,
+ String key,
String[] sourceList) {
if (sourceList == null) {
return;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
index 616617b..4262c77 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
@@ -37,11 +37,11 @@ import org.apache.maven.project.MavenProject;
public final class WsdlOptionLoader {
private static final String WSDL_OPTIONS = "-options$";
private static final String WSDL_BINDINGS = "-binding-?\\d*.xml$";
-
+
private WsdlOptionLoader() {
}
-
- public static List<GenericWsdlOption> loadWsdlOptionsFromDependencies(MavenProject project,
+
+ public static List<GenericWsdlOption> loadWsdlOptionsFromDependencies(MavenProject project,
File outputDir) {
List<GenericWsdlOption> options = new ArrayList<>();
Set<Artifact> dependencies = CastUtils.cast(project.getDependencyArtifacts());
@@ -67,7 +67,7 @@ public final class WsdlOptionLoader {
* Scan files in a directory and generate one wsdlOption per file found. Extra args for code generation
* can be defined in a file that is named like the wsdl file and ends in -options. Binding files can be
* defined in files named like the wsdl file and end in -binding-*.xml
- *
+ *
* @param wsdlBasedir
* @param includes file name patterns to include
* @param excludes file name patterns to exclude
@@ -75,7 +75,7 @@ public final class WsdlOptionLoader {
* @return list of one WsdlOption object for each wsdl found
* @throws MojoExecutionException
*/
- public static List<GenericWsdlOption> loadWsdlOptionsFromFiles(File wsdlBasedir,
+ public static List<GenericWsdlOption> loadWsdlOptionsFromFiles(File wsdlBasedir,
String includes[],
String excludes[],
File defaultOutputDir)
@@ -90,7 +90,7 @@ public final class WsdlOptionLoader {
}
List<File> wsdlFiles = WsdlUtilities.getWsdlFiles(wsdlBasedir, includes, excludes);
- List<GenericWsdlOption> wsdlOptions
+ List<GenericWsdlOption> wsdlOptions
= new ArrayList<>();
for (File wsdl : wsdlFiles) {
WsdlOption wsdlOption = generateWsdlOptionFromFile(wsdl, defaultOutputDir);
@@ -123,7 +123,7 @@ public final class WsdlOptionLoader {
}
}
- protected static WsdlOption generateWsdlOptionFromFile(final File wsdl,
+ protected static WsdlOption generateWsdlOptionFromFile(final File wsdl,
File defaultOutputDir)
throws MojoExecutionException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
index 19c2224..148b64a 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
@@ -27,7 +27,7 @@ import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.javascript.WSDLToJavaScript;
/**
- *
+ *
*/
public final class ForkOnceWSDL2Javascript {
private ForkOnceWSDL2Javascript() {
@@ -47,9 +47,9 @@ public final class ForkOnceWSDL2Javascript {
for (int x = 0; x < i; x++) {
wargs[x] = reader.readLine();
}
-
+
new WSDLToJavaScript(wargs).run(new ToolContext());
-
+
line = reader.readLine();
}
reader.close();
[51/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
Remove all trailing whitespaces
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8cea7c87
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8cea7c87
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8cea7c87
Branch: refs/heads/master
Commit: 8cea7c879658e83d7a4f54f6d4e8dfa0e449c67d
Parents: c783e60
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Feb 14 09:48:35 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Feb 14 09:48:35 2017 +0000
----------------------------------------------------------------------
.../cxf/performance/client/BenchClient.java | 80 +-
.../cxf/performance/server/BenchmarkImpl.java | 62 +-
.../cxf/performance/server/BenchmarkServer.java | 12 +-
.../apache/cxf/pat/internal/TestCaseBase.java | 24 +-
.../org/apache/cxf/pat/internal/TestResult.java | 14 +-
.../org/apache/cxf/pat/internal/TestRunner.java | 8 +-
.../performance/basic_type/client/Client.java | 16 +-
.../performance/basic_type/server/Server.java | 10 +-
.../basic_type/server/ServerImpl.java | 12 +-
.../performance/complex_type/client/Client.java | 30 +-
.../performance/complex_type/server/Server.java | 10 +-
.../complex_type/server/ServerImpl.java | 8 +-
.../performance/complex_type/client/Client.java | 20 +-
.../common/KeystorePasswordCallback.java | 8 +-
.../performance/complex_type/server/Server.java | 14 +-
.../complex_type/server/ServerImpl.java | 10 +-
.../cxf/profile/ClientEndpointCreationLoop.java | 10 +-
.../cxf/profile/DefaultBusInitialization.java | 4 +-
.../DynamicClientEndpointCreationLoop.java | 14 +-
.../cxf/profile/EndpointCreationLoop.java | 10 +-
.../cxf/profile/EndpointCreationLoop2.java | 14 +-
.../cxf/profile/EndpointCreationLoop3.java | 12 +-
.../cxf/profile/FastInfosetExperiment.java | 32 +-
bin/DoMerges.java | 126 +--
core/src/main/java/org/apache/cxf/Bus.java | 20 +-
.../main/java/org/apache/cxf/BusFactory.java | 20 +-
.../org/apache/cxf/annotations/DataBinding.java | 4 +-
.../cxf/annotations/EndpointProperties.java | 4 +-
.../cxf/annotations/EndpointProperty.java | 18 +-
.../org/apache/cxf/annotations/FactoryType.java | 14 +-
.../org/apache/cxf/annotations/FastInfoset.java | 2 +-
.../org/apache/cxf/annotations/Logging.java | 16 +-
.../org/apache/cxf/annotations/Policies.java | 4 +-
.../java/org/apache/cxf/annotations/Policy.java | 22 +-
.../org/apache/cxf/annotations/Provider.java | 4 +-
.../cxf/annotations/SchemaValidation.java | 2 +-
.../apache/cxf/annotations/UseAsyncMethod.java | 14 +-
.../java/org/apache/cxf/annotations/UseNio.java | 2 +-
.../cxf/annotations/WSDLDocumentation.java | 20 +-
.../WSDLDocumentationCollection.java | 6 +-
.../cxf/attachment/AttachmentDataSource.java | 12 +-
.../cxf/attachment/AttachmentDeserializer.java | 18 +-
.../apache/cxf/attachment/AttachmentImpl.java | 4 +-
.../cxf/attachment/AttachmentSerializer.java | 76 +-
.../apache/cxf/attachment/AttachmentUtil.java | 88 +-
.../cxf/attachment/Base64DecoderStream.java | 4 +-
.../cxf/attachment/ContentDisposition.java | 2 +-
.../cxf/attachment/DelegatingInputStream.java | 2 +-
.../cxf/attachment/ImageDataContentHandler.java | 18 +-
.../attachment/LazyAttachmentCollection.java | 36 +-
.../apache/cxf/attachment/LazyDataSource.java | 16 +-
.../cxf/attachment/MimeBodyPartInputStream.java | 20 +-
.../cxf/binding/AbstractBindingFactory.java | 6 +-
.../java/org/apache/cxf/binding/Binding.java | 14 +-
.../org/apache/cxf/binding/BindingFactory.java | 12 +-
.../cxf/binding/BindingFactoryManager.java | 4 +-
.../java/org/apache/cxf/bus/CXFBusFactory.java | 8 +-
.../java/org/apache/cxf/bus/ManagedBus.java | 14 +-
.../cxf/bus/blueprint/BlueprintBeanLocator.java | 34 +-
.../apache/cxf/bus/blueprint/BlueprintBus.java | 10 +-
.../BlueprintNameSpaceHandlerFactory.java | 2 +-
.../blueprint/BundleDelegatingClassLoader.java | 20 +-
.../cxf/bus/blueprint/BusDefinitionParser.java | 8 +-
.../cxf/bus/blueprint/ConfigurerImpl.java | 26 +-
.../org/apache/cxf/bus/extension/Extension.java | 50 +-
.../cxf/bus/extension/ExtensionException.java | 2 +-
.../cxf/bus/extension/ExtensionManager.java | 6 +-
.../cxf/bus/extension/ExtensionManagerBus.java | 82 +-
.../cxf/bus/extension/ExtensionManagerImpl.java | 78 +-
.../cxf/bus/extension/ExtensionRegistry.java | 10 +-
.../extension/TextExtensionFragmentParser.java | 8 +-
.../bus/managers/BindingFactoryManagerImpl.java | 42 +-
.../bus/managers/CXFBusLifeCycleManager.java | 22 +-
.../managers/ClientLifeCycleManagerImpl.java | 12 +-
.../managers/ConduitInitiatorManagerImpl.java | 14 +-
.../managers/DestinationFactoryManagerImpl.java | 10 +-
.../managers/EndpointResolverRegistryImpl.java | 42 +-
.../cxf/bus/managers/HeaderManagerImpl.java | 12 +-
.../cxf/bus/managers/PhaseManagerImpl.java | 4 +-
.../managers/ServerLifeCycleManagerImpl.java | 8 +-
.../cxf/bus/managers/ServerRegistryImpl.java | 20 +-
.../ServiceContractResolverRegistryImpl.java | 14 +-
.../bus/managers/WorkQueueImplMBeanWrapper.java | 30 +-
.../cxf/bus/managers/WorkQueueManagerImpl.java | 48 +-
.../WorkQueueManagerImplMBeanWrapper.java | 22 +-
.../org/apache/cxf/bus/osgi/CXFActivator.java | 18 +-
.../bus/osgi/CXFExtensionBundleListener.java | 22 +-
.../cxf/bus/osgi/ManagedWorkQueueList.java | 12 +-
.../apache/cxf/bus/osgi/OSGIBusListener.java | 16 +-
.../apache/cxf/bus/osgi/OSGiBeanLocator.java | 22 +-
.../cxf/bus/resource/ResourceManagerImpl.java | 4 +-
.../cxf/bus/spring/BusApplicationContext.java | 76 +-
.../BusApplicationContextResourceResolver.java | 16 +-
.../cxf/bus/spring/BusDefinitionParser.java | 44 +-
.../cxf/bus/spring/BusEntityResolver.java | 20 +-
.../bus/spring/BusExtensionPostProcessor.java | 10 +-
.../BusWiringBeanFactoryPostProcessor.java | 12 +-
...rolledValidationXmlBeanDefinitionReader.java | 38 +-
.../cxf/bus/spring/Jsr250BeanPostProcessor.java | 20 +-
.../apache/cxf/bus/spring/NamespaceHandler.java | 4 +-
.../cxf/bus/spring/SpringBeanLocator.java | 32 +-
.../org/apache/cxf/bus/spring/SpringBus.java | 24 +-
.../apache/cxf/bus/spring/SpringBusFactory.java | 54 +-
.../cxf/bus/spring/TunedDocumentLoader.java | 36 +-
.../cxf/buslifecycle/BusCreationListener.java | 12 +-
.../cxf/buslifecycle/BusLifeCycleListener.java | 2 +-
.../catalog/CatalogXmlSchemaURIResolver.java | 10 +-
.../apache/cxf/catalog/OASISCatalogManager.java | 20 +-
.../cxf/catalog/OASISCatalogManagerHelper.java | 4 +-
.../annotation/AbstractAnnotationVisitor.java | 28 +-
.../common/annotation/AnnotationProcessor.java | 60 +-
.../common/annotation/AnnotationVisitor.java | 30 +-
.../common/classloader/ClassLoaderUtils.java | 30 +-
.../org/apache/cxf/common/i18n/BundleUtils.java | 24 +-
.../org/apache/cxf/common/i18n/Exception.java | 16 +-
.../org/apache/cxf/common/i18n/Message.java | 12 +-
.../cxf/common/i18n/UncheckedException.java | 26 +-
.../common/injection/NoJSR250Annotations.java | 6 +-
.../cxf/common/injection/ResourceInjector.java | 186 ++--
.../cxf/common/jaxb/JAXBContextCache.java | 50 +-
.../cxf/common/jaxb/JAXBContextProxy.java | 2 +-
.../org/apache/cxf/common/jaxb/JAXBUtils.java | 288 ++---
.../apache/cxf/common/jaxb/NamespaceMapper.java | 8 +-
.../jaxb/SchemaCollectionContextProxy.java | 18 +-
.../logging/AbstractDelegatingLogger.java | 8 +-
.../apache/cxf/common/logging/JDKBugHacks.java | 24 +-
.../apache/cxf/common/logging/Log4jLogger.java | 32 +-
.../org/apache/cxf/common/logging/LogUtils.java | 124 +--
.../apache/cxf/common/logging/Slf4jLogger.java | 8 +-
.../apache/cxf/common/security/SimpleGroup.java | 20 +-
.../cxf/common/security/SimplePrincipal.java | 14 +-
.../common/security/SimpleSecurityContext.java | 2 +-
.../cxf/common/security/UsernameToken.java | 4 +-
.../org/apache/cxf/common/util/ASMHelper.java | 100 +-
.../cxf/common/util/Base64OutputStream.java | 10 +-
.../cxf/common/util/Base64UrlUtility.java | 12 +-
.../apache/cxf/common/util/Base64Utility.java | 118 +-
.../org/apache/cxf/common/util/CacheMap.java | 24 +-
.../cxf/common/util/CglibProxyHelper.java | 20 +-
.../org/apache/cxf/common/util/ClassHelper.java | 24 +-
.../cxf/common/util/ClasspathScanner.java | 110 +-
.../apache/cxf/common/util/CollectionUtils.java | 8 +-
.../org/apache/cxf/common/util/Compiler.java | 34 +-
.../cxf/common/util/CompressionUtils.java | 22 +-
.../common/util/MessageDigestInputStream.java | 4 +-
.../util/ModCountCopyOnWriteArrayList.java | 14 +-
.../apache/cxf/common/util/PackageUtils.java | 18 +-
.../apache/cxf/common/util/PrimitiveUtils.java | 10 +-
.../cxf/common/util/PropertiesLoaderUtils.java | 12 +-
.../apache/cxf/common/util/PropertyUtils.java | 16 +-
.../cxf/common/util/ProxyClassLoader.java | 4 +-
.../org/apache/cxf/common/util/ProxyHelper.java | 12 +-
.../util/ReflectionInvokationHandler.java | 24 +-
.../apache/cxf/common/util/ReflectionUtil.java | 38 +-
.../apache/cxf/common/util/SortedArraySet.java | 30 +-
.../cxf/common/util/SpringAopClassHelper.java | 20 +-
.../cxf/common/util/SpringClasspathScanner.java | 84 +-
.../apache/cxf/common/util/SpringOsgiUtil.java | 2 +-
.../org/apache/cxf/common/util/StringUtils.java | 46 +-
.../cxf/common/util/SystemPropertyAction.java | 10 +-
.../apache/cxf/common/util/URIParserUtil.java | 10 +-
.../org/apache/cxf/common/util/UrlUtils.java | 34 +-
.../cxf/common/util/WeakIdentityHashMap.java | 6 +-
.../common/util/XmlSchemaPrimitiveUtils.java | 16 +-
.../InvalidXmlSchemaReferenceException.java | 4 +-
.../cxf/common/xmlschema/LSInputImpl.java | 2 +-
.../cxf/common/xmlschema/SchemaCollection.java | 2 +-
.../cxf/common/xmlschema/XmlSchemaUtils.java | 4 +-
.../apache/cxf/configuration/Configurable.java | 12 +-
.../configuration/ConfiguredBeanLocator.java | 26 +-
.../apache/cxf/configuration/Configurer.java | 12 +-
.../AbstractBPBeanDefinitionParser.java | 68 +-
.../blueprint/InterceptorTypeConverter.java | 4 +-
.../blueprint/SimpleBPBeanDefinitionParser.java | 16 +-
.../apache/cxf/configuration/jsse/SSLUtils.java | 160 +--
.../configuration/jsse/TLSClientParameters.java | 28 +-
.../jsse/TLSClientParametersConfig.java | 28 +-
.../configuration/jsse/TLSParameterBase.java | 22 +-
.../jsse/TLSParameterJaxBUtils.java | 8 +-
.../configuration/jsse/TLSServerParameters.java | 12 +-
.../jsse/TLSServerParametersConfig.java | 14 +-
.../spring/AbstractBeanDefinitionParser.java | 146 +--
.../AbstractFactoryBeanDefinitionParser.java | 18 +-
.../configuration/spring/ConfigurerImpl.java | 52 +-
.../configuration/spring/JAXBBeanFactory.java | 12 +-
.../spring/MappingBeanDefinitionParser.java | 8 +-
.../apache/cxf/continuations/Continuation.java | 44 +-
.../cxf/continuations/ContinuationCallback.java | 10 +-
.../cxf/continuations/ContinuationProvider.java | 6 +-
.../SuspendedInvocationException.java | 10 +-
.../cxf/databinding/AbstractDataBinding.java | 4 +-
...AbstractInterceptorProvidingDataBinding.java | 6 +-
.../cxf/databinding/AbstractWrapperHelper.java | 60 +-
.../org/apache/cxf/databinding/DataReader.java | 16 +-
.../org/apache/cxf/databinding/DataWriter.java | 12 +-
.../databinding/WrapperCapableDatabinding.java | 2 +-
.../apache/cxf/databinding/WrapperHelper.java | 10 +-
.../cxf/databinding/source/NodeDataReader.java | 12 +-
.../cxf/databinding/source/NodeDataWriter.java | 6 +-
.../databinding/source/SourceDataBinding.java | 6 +-
.../databinding/source/XMLStreamDataReader.java | 34 +-
.../databinding/source/XMLStreamDataWriter.java | 12 +-
.../databinding/source/mime/MimeAttribute.java | 6 +-
.../databinding/source/mime/MimeSerializer.java | 4 +-
.../cxf/databinding/stax/StaxDataBinding.java | 14 +-
.../stax/StaxDataBindingFeature.java | 2 +-
.../stax/StaxDataBindingInterceptor.java | 16 +-
.../cxf/endpoint/AbstractConduitSelector.java | 68 +-
.../cxf/endpoint/AbstractEndpointFactory.java | 26 +-
.../java/org/apache/cxf/endpoint/Client.java | 88 +-
.../org/apache/cxf/endpoint/ClientImpl.java | 58 +-
.../cxf/endpoint/ClientLifeCycleListener.java | 2 +-
.../cxf/endpoint/ClientLifeCycleManager.java | 2 +-
.../apache/cxf/endpoint/ConduitSelector.java | 10 +-
.../cxf/endpoint/ConduitSelectorHolder.java | 2 +-
.../cxf/endpoint/DeferredConduitSelector.java | 14 +-
.../java/org/apache/cxf/endpoint/Endpoint.java | 20 +-
.../org/apache/cxf/endpoint/EndpointImpl.java | 32 +-
.../cxf/endpoint/EndpointImplFactory.java | 4 +-
.../apache/cxf/endpoint/EndpointResolver.java | 8 +-
.../cxf/endpoint/EndpointResolverRegistry.java | 24 +-
.../apache/cxf/endpoint/ManagedEndpoint.java | 30 +-
.../cxf/endpoint/NullConduitSelector.java | 14 +-
.../endpoint/PreexistingConduitSelector.java | 18 +-
.../java/org/apache/cxf/endpoint/Retryable.java | 2 +-
.../java/org/apache/cxf/endpoint/Server.java | 10 +-
.../org/apache/cxf/endpoint/ServerImpl.java | 50 +-
.../cxf/endpoint/ServerLifeCycleListener.java | 2 +-
.../cxf/endpoint/ServerLifeCycleManager.java | 2 +-
.../cxf/endpoint/ServiceContractResolver.java | 6 +-
.../ServiceContractResolverRegistry.java | 6 +-
.../cxf/endpoint/SimpleEndpointImplFactory.java | 8 +-
.../cxf/endpoint/UpfrontConduitSelector.java | 18 +-
.../org/apache/cxf/extension/BusExtension.java | 2 +-
.../java/org/apache/cxf/extension/Registry.java | 12 +-
.../org/apache/cxf/extension/RegistryImpl.java | 14 +-
.../org/apache/cxf/feature/AbstractFeature.java | 16 +-
.../apache/cxf/feature/FastInfosetFeature.java | 14 +-
.../java/org/apache/cxf/feature/Feature.java | 8 +-
.../java/org/apache/cxf/feature/Features.java | 2 +-
.../org/apache/cxf/feature/LoggingFeature.java | 28 +-
.../cxf/feature/StaxTransformFeature.java | 20 +-
.../org/apache/cxf/feature/WrappedFeature.java | 12 +-
.../transform/AbstractXSLTInterceptor.java | 10 +-
.../cxf/feature/transform/XSLTFeature.java | 18 +-
.../feature/transform/XSLTInInterceptor.java | 4 +-
.../feature/transform/XSLTOutInterceptor.java | 2 +-
.../apache/cxf/feature/transform/XSLTUtils.java | 2 +-
.../DefaultSchemaValidationTypeProvider.java | 4 +-
.../validation/SchemaValidationFeature.java | 8 +-
.../SchemaValidationTypeProvider.java | 2 +-
.../java/org/apache/cxf/headers/Header.java | 26 +-
.../org/apache/cxf/headers/HeaderManager.java | 4 +-
.../org/apache/cxf/headers/HeaderProcessor.java | 6 +-
.../java/org/apache/cxf/helpers/CastUtils.java | 14 +-
.../java/org/apache/cxf/helpers/DOMUtils.java | 54 +-
.../java/org/apache/cxf/helpers/FileUtils.java | 56 +-
.../apache/cxf/helpers/HttpHeaderHelper.java | 22 +-
.../java/org/apache/cxf/helpers/IOUtils.java | 54 +-
.../java/org/apache/cxf/helpers/JavaUtils.java | 6 +-
.../helpers/LoadingByteArrayOutputStream.java | 20 +-
.../apache/cxf/helpers/MapNamespaceContext.java | 2 +-
.../java/org/apache/cxf/helpers/NSStack.java | 6 +-
.../org/apache/cxf/helpers/ServiceUtils.java | 52 +-
.../java/org/apache/cxf/helpers/XPathUtils.java | 6 +-
.../AbstractAttributedInterceptorProvider.java | 16 +-
.../AbstractBasicInterceptorProvider.java | 14 +-
.../AbstractFaultChainInitiatorObserver.java | 30 +-
.../AbstractInDatabindingInterceptor.java | 48 +-
.../interceptor/AbstractLoggingInterceptor.java | 64 +-
.../AbstractOutDatabindingInterceptor.java | 46 +-
.../cxf/interceptor/AnnotationInterceptors.java | 28 +-
.../interceptor/AttachmentInInterceptor.java | 4 +-
.../interceptor/AttachmentOutInterceptor.java | 32 +-
.../cxf/interceptor/ClientFaultConverter.java | 26 +-
.../cxf/interceptor/FIStaxInInterceptor.java | 22 +-
.../cxf/interceptor/FIStaxOutInterceptor.java | 20 +-
.../java/org/apache/cxf/interceptor/Fault.java | 26 +-
.../cxf/interceptor/FaultOutInterceptor.java | 12 +-
.../InFaultChainInitiatorObserver.java | 10 +-
.../cxf/interceptor/InFaultInterceptors.java | 8 +-
.../apache/cxf/interceptor/InInterceptors.java | 8 +-
.../org/apache/cxf/interceptor/Interceptor.java | 8 +-
.../cxf/interceptor/InterceptorChain.java | 34 +-
.../cxf/interceptor/InterceptorProvider.java | 12 +-
.../cxf/interceptor/LoggingInInterceptor.java | 26 +-
.../apache/cxf/interceptor/LoggingMessage.java | 14 +-
.../cxf/interceptor/LoggingOutInterceptor.java | 38 +-
.../interceptor/MessageSenderInterceptor.java | 12 +-
.../interceptor/OneWayProcessorInterceptor.java | 42 +-
.../OutFaultChainInitiatorObserver.java | 8 +-
.../cxf/interceptor/OutFaultInterceptors.java | 8 +-
.../apache/cxf/interceptor/OutInterceptors.java | 10 +-
.../interceptor/OutgoingChainInterceptor.java | 36 +-
.../interceptor/ServiceInvokerInterceptor.java | 28 +-
.../interceptor/StaxInEndingInterceptor.java | 4 +-
.../cxf/interceptor/StaxInInterceptor.java | 20 +-
.../interceptor/StaxOutEndingInterceptor.java | 8 +-
.../cxf/interceptor/StaxOutInterceptor.java | 16 +-
.../AbstractAuthorizingInInterceptor.java | 36 +-
.../AbstractSecurityContextInInterceptor.java | 26 +-
.../AbstractUsernameTokenInInterceptor.java | 8 +-
.../security/AuthenticationException.java | 2 +-
.../security/DefaultSecurityContext.java | 36 +-
.../DelegatingAuthenticationInterceptor.java | 20 +-
.../DepthRestrictingStreamInterceptor.java | 28 +-
.../security/JAASAuthenticationFeature.java | 116 +-
.../security/JAASLoginInterceptor.java | 40 +-
.../NameDigestPasswordCallbackHandler.java | 80 +-
.../security/NamePasswordCallbackHandler.java | 68 +-
.../OperationInfoAuthorizingInterceptor.java | 192 ++--
.../security/RolePrefixSecurityContextImpl.java | 18 +-
.../security/SecureAnnotationsInterceptor.java | 22 +-
.../security/SimpleAuthorizingInterceptor.java | 22 +-
.../CallbackHandlerProviderUsernameToken.java | 2 +-
.../callback/CallbackHandlerTlsCert.java | 10 +-
.../callback/CertKeyToUserNameMapper.java | 2 +-
.../transform/TransformInInterceptor.java | 24 +-
.../transform/TransformOutInterceptor.java | 42 +-
.../cxf/internal/CXFAPINamespaceHandler.java | 10 +-
.../cxf/io/AbstractThresholdOutputStream.java | 18 +-
.../cxf/io/AbstractWrappedOutputStream.java | 6 +-
.../cxf/io/CacheAndWriteOutputStream.java | 16 +-
.../org/apache/cxf/io/CachedOutputStream.java | 48 +-
.../java/org/apache/cxf/io/CachedWriter.java | 42 +-
.../main/java/org/apache/cxf/io/CipherPair.java | 10 +-
.../org/apache/cxf/io/CopyingOutputStream.java | 4 +-
.../apache/cxf/io/DelegatingInputStream.java | 6 +-
.../apache/cxf/io/WriteOnCloseOutputStream.java | 8 +-
.../org/apache/cxf/logging/FaultListener.java | 2 +-
.../cxf/management/InstrumentationManager.java | 22 +-
.../apache/cxf/management/ManagedComponent.java | 6 +-
.../cxf/management/ManagementConstants.java | 6 +-
.../management/annotation/ManagedResource.java | 2 +-
.../cxf/message/AbstractWrappedMessage.java | 16 +-
.../java/org/apache/cxf/message/Attachment.java | 10 +-
.../java/org/apache/cxf/message/Exchange.java | 46 +-
.../org/apache/cxf/message/ExchangeImpl.java | 20 +-
.../java/org/apache/cxf/message/FaultMode.java | 6 +-
.../java/org/apache/cxf/message/Message.java | 116 +-
.../apache/cxf/message/MessageContentsList.java | 12 +-
.../org/apache/cxf/message/MessageImpl.java | 30 +-
.../org/apache/cxf/message/MessageUtils.java | 30 +-
.../java/org/apache/cxf/message/StringMap.java | 4 +-
.../org/apache/cxf/message/StringMapImpl.java | 8 +-
.../cxf/phase/AbstractPhaseInterceptor.java | 58 +-
.../main/java/org/apache/cxf/phase/Phase.java | 26 +-
.../org/apache/cxf/phase/PhaseChainCache.java | 30 +-
.../org/apache/cxf/phase/PhaseComparator.java | 2 +-
.../org/apache/cxf/phase/PhaseInterceptor.java | 20 +-
.../apache/cxf/phase/PhaseInterceptorChain.java | 186 ++--
.../org/apache/cxf/policy/PolicyCalculator.java | 4 +-
.../cxf/resource/ClassLoaderResolver.java | 14 +-
.../apache/cxf/resource/ClasspathResolver.java | 8 +-
.../cxf/resource/DefaultResourceManager.java | 78 +-
.../cxf/resource/ExtendedURIResolver.java | 6 +-
.../apache/cxf/resource/ObjectTypeResolver.java | 6 +-
.../apache/cxf/resource/PropertiesResolver.java | 12 +-
.../apache/cxf/resource/ResourceManager.java | 22 +-
.../apache/cxf/resource/ResourceResolver.java | 2 +-
.../cxf/resource/SinglePropertyResolver.java | 6 +-
.../org/apache/cxf/resource/URIResolver.java | 70 +-
.../cxf/security/LoginSecurityContext.java | 8 +-
.../apache/cxf/security/SecurityContext.java | 2 +-
.../security/claims/authorization/Claim.java | 8 +-
.../cxf/security/transport/TLSSessionInfo.java | 6 +-
.../java/org/apache/cxf/service/Service.java | 14 +-
.../org/apache/cxf/service/ServiceImpl.java | 16 +-
.../service/ServiceModelSchemaValidator.java | 10 +-
.../apache/cxf/service/ServiceModelVisitor.java | 32 +-
.../factory/AbstractServiceFactoryBean.java | 24 +-
.../factory/AnnotationsFactoryBeanListener.java | 30 +-
.../service/factory/FactoryBeanListener.java | 56 +-
.../factory/FactoryBeanListenerManager.java | 20 +-
.../service/factory/SimpleMethodDispatcher.java | 28 +-
.../cxf/service/invoker/AbstractInvoker.java | 78 +-
.../apache/cxf/service/invoker/BeanInvoker.java | 2 +-
.../org/apache/cxf/service/invoker/Factory.java | 10 +-
.../cxf/service/invoker/FactoryInvoker.java | 10 +-
.../cxf/service/invoker/MethodDispatcher.java | 4 +-
.../cxf/service/invoker/PooledFactory.java | 22 +-
.../cxf/service/invoker/SessionFactory.java | 8 +-
.../cxf/service/invoker/SingletonFactory.java | 4 +-
.../invoker/spring/SpringBeanFactory.java | 12 +-
.../model/AbstractDescriptionElement.java | 2 +-
.../service/model/AbstractMessageContainer.java | 44 +-
.../service/model/AbstractPropertiesHolder.java | 36 +-
.../cxf/service/model/BindingFaultInfo.java | 6 +-
.../apache/cxf/service/model/BindingInfo.java | 32 +-
.../cxf/service/model/BindingMessageInfo.java | 6 +-
.../cxf/service/model/BindingOperationInfo.java | 34 +-
.../cxf/service/model/DescriptionInfo.java | 8 +-
.../apache/cxf/service/model/EndpointInfo.java | 44 +-
.../apache/cxf/service/model/Extensible.java | 16 +-
.../org/apache/cxf/service/model/FaultInfo.java | 16 +-
.../apache/cxf/service/model/InterfaceInfo.java | 24 +-
.../apache/cxf/service/model/MessageInfo.java | 18 +-
.../cxf/service/model/MessagePartInfo.java | 24 +-
.../apache/cxf/service/model/OperationInfo.java | 48 +-
.../apache/cxf/service/model/ServiceInfo.java | 4 +-
.../cxf/service/model/ServiceModelUtil.java | 4 +-
.../cxf/service/model/ServiceSchemaInfo.java | 4 +-
.../service/model/UnwrappedOperationInfo.java | 14 +-
.../cxf/staxutils/AbstractDOMStreamReader.java | 44 +-
.../cxf/staxutils/CachingXmlEventWriter.java | 58 +-
.../staxutils/DelegatingXMLStreamWriter.java | 12 +-
.../staxutils/DepthExceededStaxException.java | 6 +-
.../staxutils/DepthRestrictingStreamReader.java | 22 +-
.../cxf/staxutils/DepthXMLStreamReader.java | 6 +-
.../cxf/staxutils/DocumentDepthProperties.java | 12 +-
.../cxf/staxutils/FragmentStreamReader.java | 30 +-
.../staxutils/OverlayW3CDOMStreamWriter.java | 16 +-
.../cxf/staxutils/PartialXMLStreamReader.java | 12 +-
.../staxutils/PrettyPrintXMLStreamWriter.java | 12 +-
.../PropertiesExpandingStreamReader.java | 10 +-
.../org/apache/cxf/staxutils/StaxSource.java | 12 +-
.../org/apache/cxf/staxutils/StaxUtils.java | 352 +++---
.../staxutils/StreamWriterContentHandler.java | 12 +-
.../cxf/staxutils/W3CDOMStreamReader.java | 22 +-
.../cxf/staxutils/W3CDOMStreamWriter.java | 14 +-
.../cxf/staxutils/W3CNamespaceContext.java | 14 +-
.../apache/cxf/staxutils/WoodstoxHelper.java | 6 +-
.../cxf/staxutils/XMLStreamReaderWrapper.java | 4 +-
.../transform/DelegatingNamespaceContext.java | 16 +-
.../staxutils/transform/ElementProperty.java | 10 +-
.../transform/IgnoreNamespacesWriter.java | 10 +-
.../staxutils/transform/InTransformReader.java | 68 +-
.../staxutils/transform/OutTransformWriter.java | 84 +-
.../cxf/staxutils/transform/ParsingEvent.java | 6 +-
.../cxf/staxutils/transform/QNamesMap.java | 12 +-
.../cxf/staxutils/transform/TransformUtils.java | 40 +-
.../staxutils/validation/EmbeddedSchema.java | 2 +-
.../validation/Stax2ValidationUtils.java | 22 +-
.../StaxSchemaValidationInInterceptor.java | 6 +-
.../StaxSchemaValidationOutInterceptor.java | 6 +-
.../validation/W3CMultiSchemaFactory.java | 28 +-
.../validation/WoodstoxValidationImpl.java | 8 +-
.../apache/cxf/transport/AbstractConduit.java | 10 +-
.../cxf/transport/AbstractDestination.java | 26 +-
.../transport/AbstractMultiplexDestination.java | 10 +-
.../cxf/transport/AbstractObservable.java | 20 +-
.../cxf/transport/AbstractTransportFactory.java | 4 +-
.../java/org/apache/cxf/transport/Assertor.java | 4 +-
.../cxf/transport/ChainInitiationObserver.java | 32 +-
.../java/org/apache/cxf/transport/Conduit.java | 18 +-
.../apache/cxf/transport/ConduitInitiator.java | 8 +-
.../cxf/transport/ConduitInitiatorManager.java | 8 +-
.../org/apache/cxf/transport/Destination.java | 10 +-
.../cxf/transport/DestinationFactory.java | 8 +-
.../transport/DestinationFactoryManager.java | 6 +-
.../org/apache/cxf/transport/HttpUriMapper.java | 12 +-
.../apache/cxf/transport/MessageObserver.java | 2 +-
.../cxf/transport/MultipleEndpointObserver.java | 20 +-
.../cxf/transport/MultiplexDestination.java | 12 +-
.../org/apache/cxf/transport/Observable.java | 6 +-
.../java/org/apache/cxf/transport/Session.java | 4 +-
.../apache/cxf/transport/TransportFinder.java | 64 +-
.../cxf/transport/TransportURIResolver.java | 26 +-
.../cxf/transport/common/gzip/GZIPFeature.java | 28 +-
.../common/gzip/GZIPInInterceptor.java | 6 +-
.../common/gzip/GZIPOutInterceptor.java | 28 +-
.../AbstractBeanValidationInterceptor.java | 8 +-
.../AbstractValidationInterceptor.java | 36 +-
.../cxf/validation/BeanValidationFeature.java | 2 +-
.../BeanValidationOutInterceptor.java | 16 +-
.../cxf/validation/BeanValidationProvider.java | 48 +-
.../validation/ClientBeanValidationFeature.java | 6 +-
.../cxf/validation/ValidationConfiguration.java | 8 +-
.../java/org/apache/cxf/version/Version.java | 6 +-
.../cxf/workqueue/AutomaticWorkQueue.java | 10 +-
.../cxf/workqueue/AutomaticWorkQueueImpl.java | 158 +--
.../cxf/workqueue/OneShotAsyncExecutor.java | 12 +-
.../cxf/workqueue/SynchronousExecutor.java | 10 +-
.../org/apache/cxf/workqueue/WorkQueue.java | 8 +-
.../apache/cxf/workqueue/WorkQueueManager.java | 6 +-
.../cxf/ws/addressing/AddressingConstants.java | 56 +-
.../cxf/ws/addressing/AddressingProperties.java | 28 +-
.../apache/cxf/ws/addressing/ContextUtils.java | 132 +--
.../ws/addressing/EndpointReferenceUtils.java | 214 ++--
.../ws/addressing/EndpointUtilsException.java | 2 +-
.../cxf/ws/addressing/JAXWSAConstants.java | 22 +-
.../apache/cxf/ws/addressing/MAPAggregator.java | 36 +-
.../cxf/ws/addressing/MessageIdCache.java | 4 +-
.../org/apache/cxf/ws/addressing/Names.java | 94 +-
.../cxf/ws/addressing/VersionTransformer.java | 158 +--
.../cxf/ws/addressing/WSAContextUtils.java | 4 +-
.../cxf/ws/addressing/WSAddressingFeature.java | 18 +-
.../java/org/apache/cxf/BusFactoryTest.java | 8 +-
.../attachment/AttachmentDeserializerTest.java | 190 ++--
.../attachment/AttachmentSerializerTest.java | 92 +-
.../java/org/apache/cxf/bus/CXFBusImplTest.java | 30 +-
.../cxf/bus/extension/ExtensionManagerTest.java | 26 +-
.../apache/cxf/bus/extension/ExtensionTest.java | 36 +-
.../TextExtensionFragmentParserTest.java | 6 +-
.../EndpointResolverRegistryImplTest.java | 64 +-
.../cxf/bus/managers/ServerRegistryImpTest.java | 10 +-
...ServiceContractResolverRegistryImplTest.java | 30 +-
.../cxf/bus/osgi/OSGiBusListenerTest.java | 420 ++++----
.../bus/spring/BusApplicationContextTest.java | 4 +-
.../bus/spring/BusApplicationListenerTest.java | 2 +-
.../cxf/bus/spring/BusDefinitionParserTest.java | 34 +-
.../cxf/bus/spring/SpringBusFactoryTest.java | 76 +-
.../CXFBusLifeCycleManagerTest.java | 30 +-
.../common/annotation/AnnotatedGreeterImpl.java | 18 +-
.../annotation/AnnotationProcessorTest.java | 74 +-
.../apache/cxf/common/i18n/BundleUtilsTest.java | 6 +-
.../org/apache/cxf/common/i18n/MessageTest.java | 18 +-
.../common/injection/ResourceInjectorTest.java | 190 ++--
.../apache/cxf/common/logging/LogUtilsTest.java | 24 +-
.../cxf/common/security/SimpleGroupTest.java | 14 +-
.../common/security/SimplePrincipalTest.java | 4 +-
.../cxf/common/util/Base64UtilityTest.java | 24 +-
.../cxf/common/util/CollectionUtilsTest.java | 10 +-
.../cxf/common/util/PackageUtilsTest.java | 26 +-
.../common/util/PropertiesLoaderUtilsTest.java | 6 +-
.../cxf/common/util/PropertyUtilsTest.java | 26 +-
.../apache/cxf/common/util/StringUtilsTest.java | 22 +-
.../cxf/common/util/URIParserUtilsTest.java | 2 +-
.../apache/cxf/common/util/UrlUtilsTest.java | 8 +-
.../util/XmlSchemaPrimitiveUtilsTest.java | 4 +-
.../cxf/common/xmlschema/DOMErrorException.java | 4 +-
.../apache/cxf/common/xmlschema/DOMLSInput.java | 6 +-
.../cxf/common/xmlschema/ImportRepairTest.java | 20 +-
.../apache/cxf/configuration/foo/Address.java | 36 +-
.../org/apache/cxf/configuration/foo/Foo.java | 48 +-
.../cxf/configuration/foo/ObjectFactory.java | 36 +-
.../org/apache/cxf/configuration/foo/Point.java | 16 +-
.../spring/ConfigurerImplTest.java | 128 +--
.../SuspendedInvocationExceptionTest.java | 16 +-
.../databinding/AbstractDataBindingTest.java | 4 +-
.../source/XMLStreamDataReaderTest.java | 24 +-
.../org/apache/cxf/endpoint/DummyServer.java | 10 +-
.../apache/cxf/endpoint/EndpointImplTest.java | 16 +-
.../feature/transform/XSLTInterceptorsTest.java | 300 +++---
.../org/apache/cxf/helpers/FileUtilsTest.java | 6 +-
.../cxf/helpers/HttpHeaderHelperTest.java | 12 +-
.../org/apache/cxf/helpers/IOUtilsTest.java | 4 +-
.../org/apache/cxf/helpers/NameSpaceTest.java | 20 +-
.../apache/cxf/helpers/ServiceUtilsTest.java | 62 +-
.../interceptor/LoggingOutInterceptorTest.java | 28 +-
.../ServiceInvokerInterceptorTest.java | 24 +-
.../security/DefaultSecurityContextTest.java | 20 +-
.../NamePasswordCallbackHandlerTest.java | 16 +-
...OperationInfoAuthorizingInterceptorTest.java | 6 +-
.../RolePrefixSecurityContextImplTest.java | 22 +-
.../SecureAnnotationsInterceptorTest.java | 30 +-
.../SimpleAuthorizingInterceptorTest.java | 94 +-
.../internal/CXFAPINamespaceHandlerTest.java | 4 +-
.../cxf/io/CacheAndWriteOutputStreamTest.java | 2 +-
.../apache/cxf/io/CachedOutputStreamTest.java | 20 +-
.../org/apache/cxf/io/CachedStreamTestBase.java | 40 +-
.../org/apache/cxf/io/CachedWriterTest.java | 12 +-
.../cxf/phase/PhaseInterceptorChainTest.java | 56 +-
.../cxf/resource/ClassLoaderResolverTest.java | 28 +-
.../apache/cxf/resource/URIResolverTest.java | 60 +-
.../cxf/service/model/BindingFaultInfoTest.java | 4 +-
.../service/model/BindingOperationInfoTest.java | 20 +-
.../apache/cxf/service/model/FaultInfoTest.java | 8 +-
.../cxf/service/model/InterfaceInfoTest.java | 10 +-
.../cxf/service/model/MessageInfoTest.java | 10 +-
.../cxf/service/model/MessagePartInfoTest.java | 14 +-
.../cxf/service/model/OperationInfoTest.java | 20 +-
.../DepthRestrictingStreamReaderTest.java | 60 +-
.../cxf/staxutils/DepthXMLStreamReaderTest.java | 10 +-
.../cxf/staxutils/FragmentStreamReaderTest.java | 24 +-
.../staxutils/PartialXMLStreamReaderTest.java | 20 +-
.../PropertiesExpandingStreamReaderTest.java | 4 +-
.../cxf/staxutils/StaxStreamFilterTest.java | 16 +-
.../org/apache/cxf/staxutils/StaxUtilsTest.java | 122 +--
.../cxf/staxutils/W3CDOMStreamReaderTest.java | 6 +-
.../DelegatingNamespaceContextTest.java | 14 +-
.../transform/InTransformReaderTest.java | 242 ++---
.../transform/OutTransformWriterTest.java | 218 ++--
.../staxutils/transform/TransformTestUtils.java | 56 +-
.../transport/ChainInitiationObserverTest.java | 18 +-
.../apache/cxf/transport/HttpUriMapperTest.java | 6 +-
.../common/gzip/GZIPAcceptEncodingTest.java | 4 +-
.../cxf/workqueue/AutomaticWorkQueueTest.java | 40 +-
.../src/main/java/demo/hw/client/Client.java | 2 +-
.../main/java/demo/hw/server/HelloWorld.java | 2 +-
.../apache/cxf/sample/test/TestAegisSample.java | 4 +-
.../apache/cxf/demo/aegis/commands/ReadZoo.java | 2 +-
.../cxf/demo/aegis/commands/WriteZoo.java | 2 +-
.../org/apache/cxf/demo/aegis/types/Zoo.java | 4 +-
.../src/demo/hw_http/server/GreeterImpl.java | 10 +-
.../java/demo/callback/client/CallbackImpl.java | 8 +-
.../main/java/demo/callback/client/Client.java | 24 +-
.../java/demo/callback/server/ServerImpl.java | 22 +-
.../main/java/demo/stream/client/Client.java | 10 +-
.../stream/interceptor/StreamInterceptor.java | 10 +-
.../java/demo/stream/server/GreeterImpl.java | 16 +-
.../bank/src/main/java/cxf/client/Client.java | 16 +-
.../bank/src/main/java/cxf/server/BankImpl.java | 6 +-
.../src/main/java/corba/client/Client.java | 6 +-
.../src/main/java/corba/server/AccountImpl.java | 6 +-
.../src/main/java/corba/server/BankImpl.java | 14 +-
.../src/main/java/corba/server/Server.java | 6 +-
.../src/main/java/cxf/client/Client.java | 14 +-
.../src/main/java/cxf/server/AccountImpl.java | 4 +-
.../src/main/java/cxf/server/BankImpl.java | 8 +-
.../src/main/java/corba/client/Client.java | 2 +-
.../main/java/cxf/server/HelloWorldImpl.java | 4 +-
.../main/java/demo/spring/client/Client.java | 2 +-
.../colocated/client/DispatchSourceClient.java | 34 +-
.../src/main/java/demo/hw/client/Client.java | 8 +-
.../main/java/demo/hw/server/HelloWorld.java | 2 +-
.../demo/hw/server/IntegerUserMapAdapter.java | 2 +-
.../src/main/java/demo/hw/client/Client.java | 2 +-
.../src/main/java/demo/server/ServerJMS.java | 4 +-
.../src/main/java/demo/hw/client/Client.java | 2 +-
.../main/java/demo/hw/server/HelloWorld.java | 2 +-
.../main/java/demo/spring/client/Client.java | 2 +-
.../src/main/java/demo/jaxrs/server/Server.java | 2 +-
.../src/main/java/httpsdemo/client/Client.java | 14 +-
.../java/httpsdemo/common/CustomerService.java | 4 +-
.../src/main/java/httpsdemo/server/Server.java | 4 +-
.../java/demo/jaxrs/server/IdTokenService.java | 2 +-
.../demo/jaxrs/server/BigQueryResponse.java | 6 +-
.../java/demo/jaxrs/server/BigQueryServer.java | 28 +-
.../java/demo/jaxrs/server/BigQueryService.java | 30 +-
.../java/demo/jaxrs/server/BigQueryStart.java | 2 +-
.../java/demo/jaxrs/server/ShakespeareText.java | 2 +-
.../src/main/java/demo/jaxrs/server/Server.java | 2 +-
.../java/demo/jaxrs/swagger/server/Item.java | 6 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 36 +-
.../java/demo/jaxrs/swagger/server/Server.java | 14 +-
.../jaxrs/swagger/server/ApiOriginFilter.java | 6 +-
.../java/demo/jaxrs/swagger/server/Item.java | 6 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 36 +-
.../java/demo/jaxrs/swagger/server/Server.java | 8 +-
.../jaxrs/swagger/server/ApiOriginFilter.java | 6 +-
.../java/demo/jaxrs/swagger/server/Item.java | 6 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 36 +-
.../jaxrs/swagger/server/ApiOriginFilter.java | 6 +-
.../java/demo/jaxrs/swagger/server/Item.java | 6 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 36 +-
.../java/demo/jaxrs/swagger/server/Server.java | 2 +-
.../jaxrs/swagger/server/ApiOriginFilter.java | 6 +-
.../java/demo/jaxrs/swagger/server/Item.java | 6 +-
.../java/demo/jaxrs/swagger/server/Sample.java | 36 +-
.../java/demo/jaxrs/swagger/server/Sample2.java | 36 +-
.../main/java/minimalosgi/SampleServlet.java | 2 +-
.../java/demo/jaxrs/search/client/Client.java | 70 +-
.../java/demo/jaxrs/search/server/Catalog.java | 106 +-
.../java/demo/jaxrs/search/server/Server.java | 16 +-
.../java/demo/jaxrs/search/server/Storage.java | 28 +-
.../main/java/demo/jaxrs/server/SparkUtils.java | 12 +-
.../java/demo/jaxrs/server/simple/Server.java | 8 +-
.../server/simple/SparkStreamingListener.java | 8 +-
.../server/simple/SparkStreamingOutput.java | 8 +-
.../jaxrs/server/simple/StreamingService.java | 40 +-
.../jaxrs/server/simple/StringListReceiver.java | 4 +-
.../java/demo/jaxrs/server/socket/Server.java | 40 +-
.../java/demo/jaxrs/server/socket/SparkJob.java | 2 +-
.../jaxrs/server/socket/SparkResultJob.java | 4 +-
.../server/socket/SparkStreamingOutput.java | 2 +-
.../jaxrs/server/socket/StreamingService.java | 14 +-
.../rs/client/SampleRestClientApplication.java | 6 +-
.../java/sample/rs/service/HelloService.java | 6 +-
.../rs/service/SampleRestApplication.java | 2 +-
.../rs/service/hello1/HelloServiceImpl1.java | 6 +-
.../rs/service/hello2/HelloServiceImpl2.java | 4 +-
.../java/sample/rs/service/HelloService.java | 6 +-
.../rs/service/SampleRestApplication.java | 2 +-
.../rs/service/hello1/HelloServiceImpl1.java | 6 +-
.../rs/service/hello2/HelloServiceImpl2.java | 4 +-
.../rs/client/SampleRestClientApplication.java | 8 +-
.../java/sample/rs/service/HelloService.java | 6 +-
.../src/main/java/demo/jaxrs/client/Client.java | 68 +-
.../service/AbstractCustomerServiceSecured.java | 6 +-
.../demo/jaxrs/service/CustomerService.java | 4 +-
.../jaxrs/service/CustomerServiceSecured.java | 4 +-
.../service/CustomerServiceSecuredImpl.java | 2 +-
.../src/main/java/demo/jaxrs/sse/Stats.java | 4 +-
.../java/demo/jaxrs/sse/StatsApplication.java | 2 +-
.../demo/jaxrs/sse/StatsRestServiceImpl.java | 2 +-
.../main/java/demo/jaxrs/sse/StatsServer.java | 4 +-
.../src/main/java/demo/jaxrs/sse/Stats.java | 4 +-
.../main/java/demo/jaxrs/sse/StatsConfig.java | 4 +-
.../demo/jaxrs/sse/StatsRestServiceImpl.java | 4 +-
.../main/java/demo/jaxrs/sse/StatsServer.java | 4 +-
.../src/main/java/demo/jaxrs/sse/Stats.java | 4 +-
.../demo/jaxrs/sse/StatsRestServiceImpl.java | 4 +-
.../main/java/demo/jaxrs/sse/StatsServer.java | 10 +-
.../java/demo/jaxrs/tracing/client/Client.java | 6 +-
.../java/demo/jaxrs/tracing/server/Catalog.java | 28 +-
.../demo/jaxrs/tracing/server/CatalogStore.java | 16 +-
.../java/demo/jaxrs/tracing/server/Server.java | 6 +-
.../java/demo/jaxrs/tracing/server/Catalog.java | 28 +-
.../demo/jaxrs/tracing/server/CatalogStore.java | 16 +-
.../java/demo/jaxrs/tracing/client/Client.java | 8 +-
.../tracing/conf/TracingConfiguration.java | 4 +-
.../java/demo/jaxrs/tracing/server/Catalog.java | 28 +-
.../tracing/server/CatalogApplication.java | 2 +-
.../demo/jaxrs/tracing/server/CatalogStore.java | 24 +-
.../java/demo/jaxrs/tracing/server/Server.java | 6 +-
.../src/main/java/demo/jaxrs/client/Client.java | 8 +-
.../demo/jaxrs/client/WebSocketTestClient.java | 44 +-
.../java/demo/jaxrs/server/CustomerService.java | 18 +-
.../src/main/java/demo/jaxrs/server/Server.java | 2 +-
.../java/demo/jaxrs/server/CustomerService.java | 18 +-
.../java/demo/jaxrs/server/CustomerService.java | 18 +-
.../src/main/java/demo/hw/client/Client.java | 2 +-
.../main/java/demo/hw/client/HelloWorld.java | 2 +-
.../main/java/demo/hw/server/HelloWorld.java | 2 +-
.../src/main/java/demo/hw/client/Client.java | 26 +-
.../java/demo/hw/client/TestAsyncHandler.java | 6 +-
.../main/java/demo/hw/server/GreeterImpl.java | 26 +-
.../src/main/java/demo/hw/server/Server.java | 8 +-
.../java/demo/hwDispatch/client/Client.java | 4 +-
.../server/GreeterDOMSourceMessageProvider.java | 6 +-
.../server/GreeterDOMSourcePayloadProvider.java | 6 +-
.../java/demo/hwDispatch/server/Server.java | 6 +-
.../handlers/common/SmallNumberHandler.java | 10 +-
.../main/java/demo/handlers/server/Server.java | 6 +-
.../sample/ws/SampleWsApplicationClient.java | 2 +-
.../src/main/java/sample/ws/service/Hello.java | 8 +-
.../java/sample/ws/service/HelloPortImpl.java | 4 +-
.../java/demo/jaxws/tracing/server/Book.java | 4 +-
.../tracing/server/impl/CatalogServiceImpl.java | 14 +-
.../demo/jms_greeter/server/GreeterJMSImpl.java | 4 +-
.../java/demo/jms_greeter/server/Server.java | 2 +-
.../demo/jms_greeter/server/GreeterJMSImpl.java | 4 +-
.../client/CustomerServiceSpringClient.java | 8 +-
.../client/CustomerServiceTester.java | 22 +-
.../server/CustomerServiceImpl.java | 4 +-
.../server/CustomerServiceSpringServer.java | 2 +-
.../demo/hw/server/JavascriptExampleImpl.java | 12 +-
.../main/java/demo/hw/server/data/Beverage.java | 4 +-
.../java/demo/hw/server/data/Ingredient.java | 8 +-
.../src/main/java/demo/hw/client/Client.java | 20 +-
.../src/main/java/demo/hw/client/Get.java | 4 +-
.../main/java/demo/hw/server/GreeterImpl.java | 18 +-
.../main/java/demo/hw/server/GreeterImpl.java | 16 +-
.../src/main/java/demo/mtom/server/Server.java | 4 +-
.../demo/mtom/server/TestMtomPortTypeImpl.java | 8 +-
.../GetProtectedResourceController.java | 2 +-
.../TemporaryCredentialsController.java | 2 +-
.../controllers/TokenRequestController.java | 2 +-
.../main/java/demo/oauth/server/CustomAuth.java | 2 +-
.../controllers/ApplicationController.java | 4 +-
.../controllers/MemoryOAuthDataProvider.java | 18 +-
.../controllers/SampleOAuthDataProvider.java | 4 +-
.../main/java/demo/spring/client/Client.java | 2 +-
.../java/demo/soap_header/client/Client.java | 10 +-
.../soap_header/server/HeaderTesterImpl.java | 8 +-
.../src/main/java/demo/wssec/client/Client.java | 6 +-
.../wssec/client/ClientCallbackHandler.java | 2 +-
.../java/demo/wssec/server/GreeterImpl.java | 10 +-
.../java/demo/wssec/sts/STSCallbackHandler.java | 2 +-
.../java/demo/throttling/client/Client.java | 20 +-
.../java/demo/throttling/server/Customer.java | 16 +-
.../server/CustomerMetricsInterceptor.java | 2 +-
.../demo/throttling/server/GreeterImpl.java | 6 +-
.../java/demo/throttling/server/Server.java | 12 +-
.../demo/ws_addressing/server/GreeterImpl.java | 16 +-
.../apache/cxf/samples/discovery/Client.java | 6 +-
.../cxf/samples/discovery/GreeterImpl.java | 2 +-
.../org/apache/cxf/samples/discovery/Main.java | 4 +-
.../src/main/java/demo/client/Client.java | 16 +-
.../java/demo/ws_policy/server/GreeterImpl.java | 14 +-
.../src/main/java/demo/ws_rm/client/Client.java | 2 +-
.../demo/ws_rm/common/MessageLossSimulator.java | 40 +-
.../java/demo/ws_rm/server/GreeterImpl.java | 8 +-
.../src/main/java/demo/ws_rm/server/Server.java | 2 +-
.../src/main/java/demo/wssec/client/Client.java | 8 +-
.../main/java/demo/wssec/client/StaxClient.java | 16 +-
.../demo/wssec/client/UTPasswordCallback.java | 8 +-
.../java/demo/wssec/server/GreeterImpl.java | 8 +-
.../src/main/java/demo/wssec/server/Server.java | 10 +-
.../main/java/demo/wssec/server/StaxServer.java | 16 +-
.../demo/wssec/server/UTPasswordCallback.java | 10 +-
.../src/main/java/demo/wssec/client/Client.java | 2 +-
.../java/demo/wssec/server/GreeterImpl.java | 6 +-
.../main/java/demo/wssec/client/StaxClient.java | 4 +-
.../java/demo/wssec/server/GreeterImpl.java | 8 +-
.../src/main/java/demo/wssec/server/Server.java | 2 +-
.../main/java/demo/wssec/server/StaxServer.java | 8 +-
.../src/main/java/demo/wssec/client/Client.java | 2 +-
.../java/demo/wssec/server/GreeterImpl.java | 6 +-
.../client/CustomerServiceClient.java | 6 +-
.../client/CustomerServiceSpringClient.java | 4 +-
.../client/CustomerServiceTester.java | 16 +-
.../server/CustomerServiceImpl.java | 4 +-
.../server/CustomerServiceSpringServer.java | 2 +-
.../main/java/demo/hw/client/ComplexClient.java | 22 +-
.../apache/cxf/demo/complex/ComplexImpl.java | 6 +-
.../demo/hw_https/client/ClientNonSpring.java | 22 +-
.../java/demo/hw_https/server/GreeterImpl.java | 10 +-
.../src/main/java/demo/hw/client/Client.java | 2 +-
.../main/java/demo/hw/server/GreeterImpl.java | 4 +-
.../main/java/demo/hwRPCLit/client/Client.java | 24 +-
.../demo/hwRPCLit/server/GreeterRPCLitImpl.java | 4 +-
.../main/java/demo/hwRPCLit/server/Server.java | 4 +-
.../src/main/java/demo/hw/client/Client.java | 20 +-
.../main/java/demo/hw/server/GreeterImpl.java | 16 +-
.../src/main/java/demo/hw/client/Client.java | 4 +-
.../main/java/demo/hw/server/GreeterImpl.java | 2 +-
.../java/org/apache/cxf/cdi/CXFCdiServlet.java | 22 +-
.../java/org/apache/cxf/cdi/CdiBusBean.java | 12 +-
.../org/apache/cxf/cdi/CdiResourceProvider.java | 8 +-
.../cxf/cdi/JAXRSCdiResourceExtension.java | 56 +-
...AXRSServerFactoryCustomizationExtension.java | 4 +-
.../cxf/connector/CXFConnectionFactory.java | 8 +-
.../cxf/connector/CXFConnectionParam.java | 26 +-
.../org/apache/cxf/connector/Connection.java | 2 +-
.../core/classloader/FireWallClassLoader.java | 26 +-
.../jca/core/classloader/PlugInClassLoader.java | 30 +-
.../classloader/PlugInClassLoaderHelper.java | 10 +-
.../cxf/jca/core/logging/LoggerHelper.java | 16 +-
.../AbstractManagedConnectionFactoryImpl.java | 12 +-
.../AbstractManagedConnectionImpl.java | 10 +-
.../jca/core/resourceadapter/ResourceBean.java | 16 +-
.../core/resourceadapter/UriHandlerInit.java | 2 +-
.../AssociatedManagedConnectionFactoryImpl.java | 12 +-
.../cxf/jca/cxf/CXFConnectionRequestInfo.java | 8 +-
.../cxf/jca/cxf/CXFInvocationHandler.java | 6 +-
.../cxf/jca/cxf/CXFInvocationHandlerData.java | 20 +-
.../cxf/jca/cxf/CXFManagedConnection.java | 6 +-
.../jca/cxf/CXFManagedConnectionMetaData.java | 2 +-
.../org/apache/cxf/jca/cxf/CXFWorkAdapter.java | 14 +-
.../cxf/jca/cxf/ConnectionFactoryImpl.java | 20 +-
.../org/apache/cxf/jca/cxf/JCABusFactory.java | 60 +-
.../jca/cxf/ManagedConnectionFactoryImpl.java | 22 +-
.../cxf/jca/cxf/ManagedConnectionImpl.java | 48 +-
.../apache/cxf/jca/cxf/ResourceAdapterImpl.java | 30 +-
.../cxf/jca/cxf/WorkManagerThreadPool.java | 36 +-
.../cxf/handlers/CXFInvocationHandlerBase.java | 8 +-
.../cxf/handlers/InvocationHandlerFactory.java | 14 +-
.../cxf/handlers/InvokingInvocationHandler.java | 10 +-
.../cxf/handlers/ProxyInvocationHandler.java | 10 +-
.../jca/inbound/DispatchMDBActivationSpec.java | 6 +-
.../cxf/jca/inbound/DispatchMDBInvoker.java | 18 +-
.../jca/inbound/DispatchMDBMessageListener.java | 8 +-
.../inbound/DispatchMDBMessageListenerImpl.java | 24 +-
.../apache/cxf/jca/inbound/InboundEndpoint.java | 26 +-
.../cxf/jca/inbound/MDBActivationSpec.java | 34 +-
.../cxf/jca/inbound/MDBActivationWork.java | 74 +-
.../org/apache/cxf/jca/inbound/MDBInvoker.java | 18 +-
.../org/apache/cxf/jca/jarloader/JarLoader.java | 26 +-
.../apache/cxf/jca/outbound/CXFConnection.java | 8 +-
.../cxf/jca/outbound/CXFConnectionFactory.java | 20 +-
.../cxf/jca/outbound/CXFConnectionSpec.java | 40 +-
.../outbound/CXFManagedConnectionMetaData.java | 4 +-
.../cxf/jca/outbound/ConnectionFactoryImpl.java | 2 +-
.../jca/outbound/DefaultConnectionManager.java | 2 +-
.../outbound/ManagedConnectionFactoryImpl.java | 48 +-
.../cxf/jca/outbound/ManagedConnectionImpl.java | 112 +-
.../org/apache/cxf/jca/servant/EJBEndpoint.java | 64 +-
.../org/apache/cxf/jca/servant/EJBInvoker.java | 12 +-
.../cxf/jca/servant/EJBServantConfig.java | 16 +-
.../classloader/FireWallClassLoaderTest.java | 12 +-
.../core/classloader/PlugInClassLoaderTest.java | 20 +-
.../cxf/jca/core/logging/LoggerHelperTest.java | 4 +-
.../DummyManagedConnectionImpl.java | 4 +-
.../jca/core/resourceadapter/HandlerTest.java | 20 +-
.../ManagedConnectionFactoryImplTest.java | 2 +-
.../ManagedConnectionImplTest.java | 6 +-
.../ResourceAdapterInternalExceptionTest.java | 30 +-
.../core/resourceadapter/ResourceBeanTest.java | 2 +-
.../resourceadapter/UriHandlerInitTest.java | 8 +-
...ociatedManagedConnectionFactoryImplTest.java | 20 +-
.../jca/cxf/CXFConnectionRequestInfoTest.java | 4 +-
.../cxf/jca/cxf/ConnectionFactoryImplTest.java | 82 +-
.../test/java/org/apache/cxf/jca/cxf/Imple.java | 4 +-
.../apache/cxf/jca/cxf/JCABusFactoryTest.java | 18 +-
.../cxf/ManagedConnectionFactoryImplTest.java | 32 +-
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 28 +-
.../cxf/jca/cxf/ManagedConnectionTestBase.java | 40 +-
.../cxf/jca/cxf/ResourceAdapterImplTest.java | 6 +-
.../handlers/AbstractInvocationHandlerTest.java | 18 +-
.../cxf/jca/cxf/handlers/DummyHandler.java | 18 +-
.../cxf/jca/cxf/handlers/HandlerTestBase.java | 16 +-
.../handlers/InvocationHandlerFactoryTest.java | 28 +-
.../handlers/InvokingInvocationHandlerTest.java | 4 +-
.../ObjectMethodInvocationHandlerTest.java | 110 +-
.../handlers/ProxyInvocationHandlerTest.java | 16 +-
.../apache/cxf/jca/cxf/handlers/TestTarget.java | 80 +-
.../org/apache/cxf/jca/cxf/test/DummyBus.java | 40 +-
.../apache/cxf/jca/jarloader/JarLoaderTest.java | 6 +-
.../jca/outbound/ManagedConnectionImplTest.java | 2 +-
.../apache/cxf/jca/servant/EJBEndpointTest.java | 16 +-
.../cxf/jca/servant/EJBServantConfigTest.java | 18 +-
.../org/apache/cxf/jca/servant/Greeter.java | 2 +-
.../org/apache/cxf/jca/servant/GreeterImpl.java | 4 +-
.../jca/servant/ThreadContextCheckerHome.java | 6 +-
.../autoconfigure/CxfAutoConfiguration.java | 8 +-
.../brave/AbstractBraveClientInterceptor.java | 8 +-
.../brave/AbstractBraveClientProvider.java | 26 +-
.../tracing/brave/AbstractBraveInterceptor.java | 20 +-
.../tracing/brave/AbstractBraveProvider.java | 38 +-
.../brave/BraveClientStartInterceptor.java | 8 +-
.../brave/BraveClientStopInterceptor.java | 8 +-
.../apache/cxf/tracing/brave/BraveFeature.java | 2 +-
.../tracing/brave/BraveStartInterceptor.java | 8 +-
.../cxf/tracing/brave/BraveStopInterceptor.java | 20 +-
.../cxf/tracing/brave/BraveTracerContext.java | 20 +-
.../tracing/brave/ClientSpanNameProvider.java | 2 +-
.../tracing/brave/ServerSpanNameProvider.java | 2 +-
.../apache/cxf/tracing/brave/TraceScope.java | 6 +-
.../brave/jaxrs/BraveClientProvider.java | 10 +-
.../brave/jaxrs/BraveContextProvider.java | 8 +-
.../cxf/tracing/brave/jaxrs/BraveFeature.java | 6 +-
.../cxf/tracing/brave/jaxrs/BraveProvider.java | 18 +-
.../cxf/tracing/brave/BraveTraceTest.java | 14 +-
.../tracing/brave/LoggingSpanNameProvider.java | 2 +-
.../htrace/AbstractHTraceClientInterceptor.java | 8 +-
.../htrace/AbstractHTraceClientProvider.java | 26 +-
.../htrace/AbstractHTraceInterceptor.java | 4 +-
.../tracing/htrace/AbstractHTraceProvider.java | 36 +-
.../htrace/HTraceClientStartInterceptor.java | 8 +-
.../htrace/HTraceClientStopInterceptor.java | 4 +-
.../tracing/htrace/HTraceStartInterceptor.java | 8 +-
.../tracing/htrace/HTraceStopInterceptor.java | 16 +-
.../cxf/tracing/htrace/HTraceTracerContext.java | 16 +-
.../htrace/jaxrs/HTraceClientProvider.java | 8 +-
.../htrace/jaxrs/HTraceContextProvider.java | 8 +-
.../cxf/tracing/htrace/jaxrs/HTraceFeature.java | 14 +-
.../tracing/htrace/jaxrs/HTraceProvider.java | 18 +-
.../src/main/java/HelloWorld.java | 4 +-
.../src/main/java/HelloWorldImpl.java | 4 +-
.../src/test/java/HelloWorldImplTest.java | 4 +-
.../src/main/java/HelloWorldPortTypeImpl.java | 8 +-
.../test/java/HelloWorldPortTypeImplTest.java | 6 +-
.../cxf/maven_plugin/AbstractCodegenMoho.java | 118 +-
.../cxf/maven_plugin/ClassLoaderSwitcher.java | 4 +-
.../apache/cxf/maven_plugin/WsdlArtifact.java | 10 +-
.../apache/cxf/maven_plugin/WsdlUtilities.java | 6 +-
.../wsdl2java/ForkOnceWSDL2Java.java | 6 +-
.../cxf/maven_plugin/wsdl2java/Option.java | 52 +-
.../maven_plugin/wsdl2java/WSDL2JavaMojo.java | 40 +-
.../cxf/maven_plugin/wsdl2java/WsdlOption.java | 22 +-
.../wsdl2java/WsdlOptionLoader.java | 14 +-
.../wsdl2js/ForkOnceWSDL2Javascript.java | 6 +-
.../apache/cxf/maven_plugin/wsdl2js/Option.java | 12 +-
.../wsdl2js/WSDL2JavaScriptMojo.java | 16 +-
.../cxf/maven_plugin/wsdl2js/WsdlOption.java | 14 +-
.../corba/maven/plugins/IDLToWSDLPlugin.java | 6 +-
.../corba/maven/plugins/IdltowsdlOption.java | 2 +-
.../corba/maven/plugins/WSDLToIDLPlugin.java | 26 +-
.../corba/maven/plugins/WsdltoidlOption.java | 2 +-
.../maven_plugin/javatowadl/DumpJavaDoc.java | 14 +-
.../maven_plugin/javatowadl/Java2WADLMojo.java | 110 +-
.../javatowadl/ParseJavaDocMojo.java | 26 +-
.../javatowadl/ResourceMapJavaDocProvider.java | 30 +-
.../cxf/maven_plugin/ClassLoaderSwitcher.java | 4 +-
.../apache/cxf/maven_plugin/Java2WSMojo.java | 4 +-
.../common/ClassLoaderSwitcher.java | 4 +-
.../maven_plugin/common/DocumentArtifact.java | 8 +-
.../common/ForkOnceCodeGenerator.java | 4 +-
.../wadlto/AbstractCodeGeneratorMojo.java | 92 +-
.../apache/cxf/maven_plugin/wadlto/Option.java | 50 +-
.../cxf/maven_plugin/wadlto/OptionLoader.java | 26 +-
.../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 26 +-
.../cxf/maven_plugin/wadlto/WadlOption.java | 20 +-
.../cxf/maven_plugin/WSDLValidatorMojo.java | 30 +-
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 2 +-
.../apache/cxf/osgi/itests/OSGiTestSupport.java | 6 +-
.../osgi/itests/BundlesAndNamespacesTest.java | 4 +-
.../cxf/osgi/itests/CXFOSGiTestSupport.java | 18 +-
.../org/apache/cxf/osgi/itests/jaxrs/Book.java | 10 +-
.../apache/cxf/osgi/itests/jaxrs/BookStore.java | 16 +-
.../cxf/osgi/itests/jaxrs/JaxRsServiceTest.java | 8 +-
.../cxf/osgi/itests/soap/HttpServiceTest.java | 6 +-
.../cxf/osgi/itests/soap/HttpTestActivator.java | 2 +-
.../cxf/osgi/itests/soap/JmsServiceTest.java | 2 +-
.../cxf/osgi/itests/soap/JmsTestActivator.java | 2 +-
.../cxf/karaf/commands/ListBussesCommand.java | 2 +-
.../karaf/commands/ListEndpointsCommand.java | 22 +-
.../karaf/commands/StartEndpointCommand.java | 14 +-
.../cxf/karaf/commands/StopEndpointCommand.java | 14 +-
.../karaf/commands/completers/BusCompleter.java | 6 +-
.../completers/EndpointCompleterSupport.java | 8 +-
.../completers/StoppedEndpointCompleter.java | 2 +-
.../cxf/binding/coloc/ColocInInterceptor.java | 6 +-
.../cxf/binding/coloc/ColocMessageObserver.java | 32 +-
.../binding/coloc/ColocOutFaultObserver.java | 2 +-
.../cxf/binding/coloc/ColocOutInterceptor.java | 56 +-
.../org/apache/cxf/binding/coloc/ColocUtil.java | 48 +-
.../binding/coloc/WebFaultInInterceptor.java | 16 +-
.../cxf/binding/coloc/blueprint/Activator.java | 2 +-
.../cxf/binding/coloc/feature/ColocFeature.java | 2 +-
.../binding/coloc/ColocMessageObserverTest.java | 14 +-
.../binding/coloc/ColocOutInterceptorTest.java | 82 +-
.../apache/cxf/binding/coloc/ColocUtilTest.java | 40 +-
.../blueprint/ColocBPNamespaceHandlerTest.java | 72 +-
.../apache/cxf/binding/corba/CorbaBinding.java | 10 +-
.../binding/corba/CorbaBindingException.java | 4 +-
.../cxf/binding/corba/CorbaBindingFactory.java | 10 +-
.../apache/cxf/binding/corba/CorbaConduit.java | 70 +-
.../cxf/binding/corba/CorbaDestination.java | 80 +-
.../apache/cxf/binding/corba/CorbaMessage.java | 28 +-
.../cxf/binding/corba/CorbaServerConduit.java | 22 +-
.../apache/cxf/binding/corba/CorbaTypeMap.java | 2 +-
.../apache/cxf/binding/corba/TypeMapCache.java | 4 +-
.../CorbaStreamFaultInInterceptor.java | 36 +-
.../CorbaStreamFaultOutInterceptor.java | 54 +-
.../interceptors/CorbaStreamInInterceptor.java | 52 +-
.../CorbaStreamOutEndingInterceptor.java | 6 +-
.../interceptors/CorbaStreamOutInterceptor.java | 4 +-
.../interceptors/SystemExceptionHelper.java | 30 +-
.../binding/corba/runtime/CorbaDSIServant.java | 30 +-
.../corba/runtime/CorbaObjectReader.java | 18 +-
.../corba/runtime/CorbaObjectWriter.java | 14 +-
.../corba/runtime/CorbaStreamReader.java | 10 +-
.../corba/runtime/CorbaStreamWriter.java | 18 +-
.../binding/corba/runtime/OrbConfigurer.java | 6 +-
.../corba/types/AbstractCorbaTypeListener.java | 2 +-
.../types/AbstractNoStartEndEventProducer.java | 4 +-
.../types/AbstractStartEndEventProducer.java | 6 +-
.../types/CorbaAnonStructEventProducer.java | 2 +-
.../corba/types/CorbaAnyEventProducer.java | 10 +-
.../binding/corba/types/CorbaAnyHandler.java | 14 +-
.../binding/corba/types/CorbaAnyListener.java | 4 +-
.../binding/corba/types/CorbaArrayHandler.java | 12 +-
.../binding/corba/types/CorbaArrayListener.java | 2 +-
.../corba/types/CorbaEnumEventProducer.java | 2 +-
.../binding/corba/types/CorbaEnumHandler.java | 10 +-
.../binding/corba/types/CorbaEnumListener.java | 2 +-
.../corba/types/CorbaExceptionHandler.java | 22 +-
.../corba/types/CorbaExceptionListener.java | 4 +-
.../corba/types/CorbaFixedEventProducer.java | 4 +-
.../binding/corba/types/CorbaFixedHandler.java | 18 +-
.../binding/corba/types/CorbaFixedListener.java | 2 +-
.../binding/corba/types/CorbaObjectHandler.java | 20 +-
.../CorbaObjectReferenceEventProducer.java | 48 +-
.../types/CorbaObjectReferenceHandler.java | 2 +-
.../types/CorbaOctetSequenceEventProducer.java | 4 +-
.../corba/types/CorbaOctetSequenceHandler.java | 12 +-
.../types/CorbaPrimitiveArrayEventProducer.java | 2 +-
.../corba/types/CorbaPrimitiveHandler.java | 28 +-
.../corba/types/CorbaPrimitiveListener.java | 4 +-
.../CorbaPrimitiveSequenceEventProducer.java | 2 +-
.../types/CorbaPrimitiveTypeEventProducer.java | 2 +-
.../corba/types/CorbaSequenceHandler.java | 14 +-
.../corba/types/CorbaSequenceListener.java | 6 +-
.../corba/types/CorbaStructEventProducer.java | 8 +-
.../binding/corba/types/CorbaStructHandler.java | 16 +-
.../corba/types/CorbaStructListener.java | 4 +-
.../corba/types/CorbaTypeEventProducer.java | 18 +-
.../binding/corba/types/CorbaTypeListener.java | 2 +-
.../corba/types/CorbaUnionEventProducer.java | 8 +-
.../binding/corba/types/CorbaUnionHandler.java | 48 +-
.../binding/corba/types/CorbaUnionListener.java | 16 +-
.../binding/corba/types/HandlerIterator.java | 10 +-
.../corba/types/ParameterEventProducer.java | 2 +-
.../corba/types/SkipStartEndEventProducer.java | 4 +-
.../cxf/binding/corba/utils/ContextUtils.java | 4 +-
.../cxf/binding/corba/utils/CorbaAnyHelper.java | 66 +-
.../binding/corba/utils/CorbaBindingHelper.java | 40 +-
.../corba/utils/CorbaObjectReferenceHelper.java | 26 +-
.../cxf/binding/corba/utils/EprMetaData.java | 22 +-
.../cxf/binding/corba/utils/OrbConfig.java | 36 +-
.../cxf/binding/corba/wsdl/CorbaConstants.java | 4 +-
.../cxf/binding/corba/wsdl/CorbaTypeImpl.java | 12 +-
.../cxf/binding/corba/wsdl/W3CConstants.java | 6 +-
.../corba/wsdl/WSDLExtensionRegister.java | 16 +-
.../binding/corba/CorbaBindingFactoryTest.java | 70 +-
.../cxf/binding/corba/CorbaBindingTest.java | 28 +-
.../cxf/binding/corba/CorbaConduitTest.java | 178 +--
.../cxf/binding/corba/CorbaDestinationTest.java | 46 +-
.../cxf/binding/corba/CorbaMessageTest.java | 40 +-
.../binding/corba/CorbaServerConduitTest.java | 172 +--
.../cxf/binding/corba/CorbaTypeMapTest.java | 10 +-
.../org/apache/cxf/binding/corba/TestUtils.java | 28 +-
.../corba/runtime/CorbaDSIServantTest.java | 68 +-
.../corba/runtime/CorbaObjectReaderTest.java | 202 ++--
.../corba/runtime/CorbaObjectWriterTest.java | 158 +--
.../corba/runtime/CorbaStreamReaderTest.java | 22 +-
.../corba/runtime/CorbaStreamableTest.java | 42 +-
.../corba/types/CorbaAnyHandlerTest.java | 6 +-
.../corba/types/CorbaArrayHandlerTest.java | 8 +-
.../corba/types/CorbaEnumHandlerTest.java | 16 +-
.../corba/types/CorbaFixedHandlerTest.java | 16 +-
.../corba/types/CorbaHandlerUtilsTest.java | 56 +-
.../types/CorbaHandlerUtilsYokoNSTest.java | 4 +-
.../corba/types/CorbaObjectHandlerTest.java | 16 +-
.../corba/types/CorbaPrimitiveHandlerTest.java | 68 +-
.../corba/types/CorbaSequenceHandlerTest.java | 12 +-
.../corba/types/CorbaStructHandlerTest.java | 36 +-
.../binding/corba/utils/ContextUtilsTest.java | 8 +-
.../cxf/binding/corba/utils/CorbaUtilsTest.java | 44 +-
.../cxf/binding/soap/SOAPBindingUtil.java | 4 +-
.../org/apache/cxf/binding/soap/Soap11.java | 16 +-
.../org/apache/cxf/binding/soap/Soap12.java | 12 +-
.../apache/cxf/binding/soap/SoapBinding.java | 18 +-
.../binding/soap/SoapBindingConfiguration.java | 18 +-
.../cxf/binding/soap/SoapBindingConstants.java | 6 +-
.../cxf/binding/soap/SoapBindingFactory.java | 118 +-
.../org/apache/cxf/binding/soap/SoapFault.java | 46 +-
.../org/apache/cxf/binding/soap/SoapHeader.java | 6 +-
.../apache/cxf/binding/soap/SoapMessage.java | 14 +-
.../cxf/binding/soap/SoapTransportFactory.java | 38 +-
.../apache/cxf/binding/soap/SoapVersion.java | 22 +-
.../cxf/binding/soap/SoapVersionFactory.java | 8 +-
...SoapBindingBPInfoConfigDefinitionParser.java | 6 +-
.../interceptor/AbstractSoapInterceptor.java | 18 +-
.../soap/interceptor/CheckFaultInterceptor.java | 4 +-
.../EndpointSelectionInterceptor.java | 6 +-
.../interceptor/MustUnderstandInterceptor.java | 46 +-
.../soap/interceptor/RPCInInterceptor.java | 28 +-
.../soap/interceptor/RPCOutInterceptor.java | 10 +-
.../interceptor/ReadHeadersInterceptor.java | 30 +-
.../interceptor/Soap11FaultInInterceptor.java | 4 +-
.../interceptor/Soap11FaultOutInterceptor.java | 32 +-
.../interceptor/Soap12FaultInInterceptor.java | 38 +-
.../interceptor/Soap12FaultOutInterceptor.java | 24 +-
.../interceptor/SoapActionInInterceptor.java | 32 +-
.../soap/interceptor/SoapHeaderInterceptor.java | 18 +-
.../SoapHeaderOutFilterInterceptor.java | 6 +-
.../soap/interceptor/SoapOutInterceptor.java | 80 +-
.../SoapPreProtocolOutInterceptor.java | 36 +-
.../soap/interceptor/StartBodyInterceptor.java | 12 +-
.../interceptor/TibcoSoapActionInterceptor.java | 4 +-
.../binding/soap/jms/interceptor/JMSFault.java | 2 +-
.../soap/jms/interceptor/JMSFaultFactory.java | 6 +-
.../soap/jms/interceptor/JMSFaultType.java | 8 +-
.../soap/jms/interceptor/SoapFaultFactory.java | 20 +-
.../soap/jms/interceptor/SoapJMSConstants.java | 16 +-
.../jms/interceptor/SoapJMSInInterceptor.java | 4 +-
.../cxf/binding/soap/model/SoapBindingInfo.java | 4 +-
.../cxf/binding/soap/model/SoapBodyInfo.java | 4 +-
.../cxf/binding/soap/model/SoapHeaderInfo.java | 6 +-
.../binding/soap/model/SoapOperationInfo.java | 6 +-
.../binding/soap/saaj/SAAJFactoryResolver.java | 6 +-
.../binding/soap/saaj/SAAJInInterceptor.java | 50 +-
.../binding/soap/saaj/SAAJOutInterceptor.java | 42 +-
.../cxf/binding/soap/saaj/SAAJStreamWriter.java | 20 +-
.../apache/cxf/binding/soap/saaj/SAAJUtils.java | 10 +-
.../binding/soap/spring/NamespaceHandler.java | 2 +-
.../soap/spring/SoapVersionRegistrar.java | 2 +-
.../soap/wsdl/extensions/SoapBinding.java | 2 +-
.../binding/soap/wsdl/extensions/SoapBody.java | 2 +-
.../binding/soap/wsdl11/SoapAddressPlugin.java | 2 +-
.../soap/MustUnderstandInterceptorTest.java | 10 +-
.../cxf/binding/soap/MyComplexStruct.java | 28 +-
.../cxf/binding/soap/RPCInInterceptorTest.java | 6 +-
.../cxf/binding/soap/RPCOutInterceptorTest.java | 8 +-
.../binding/soap/ReadHeaderInterceptorTest.java | 22 +-
.../cxf/binding/soap/ServiceModelUtilTest.java | 14 +-
.../binding/soap/SoapActionInterceptorTest.java | 14 +-
.../binding/soap/SoapBindingFactoryTest.java | 40 +-
.../cxf/binding/soap/SoapBindingTest.java | 8 +-
.../soap/SoapDestinationFactoryTest.java | 4 +-
.../binding/soap/SoapOutInterceptorTest.java | 16 +-
.../org/apache/cxf/binding/soap/TestBase.java | 4 +-
.../org/apache/cxf/binding/soap/TestUtil.java | 22 +-
.../org/apache/cxf/binding/soap/XopType.java | 24 +-
.../blueprint/SoapBindingBPHandlerTest.java | 4 +-
.../interceptor/ReadHeadersInterceptorTest.java | 12 +-
.../SoapActionInInterceptorTest.java | 24 +-
.../interceptor/SoapFaultSerializerTest.java | 86 +-
.../SoapPreProtocolOutInterceptorTest.java | 20 +-
.../jms/interceptor/SoapFaultFactoryTest.java | 28 +-
.../cxf/binding/soap/saaj/ParseBodyTest.java | 22 +-
.../soap/saaj/SAAJInInterceptorTest.java | 22 +-
.../soap/saaj/SAAJOutInterceptorTest.java | 6 +-
.../org/apache/cxf/binding/xml/XMLBinding.java | 10 +-
.../cxf/binding/xml/XMLBindingFactory.java | 28 +-
.../org/apache/cxf/binding/xml/XMLFault.java | 8 +-
.../cxf/binding/xml/XMLFormatValidator.java | 4 +-
.../xml/interceptor/XMLFaultInInterceptor.java | 4 +-
.../xml/interceptor/XMLFaultOutInterceptor.java | 16 +-
.../interceptor/XMLMessageInInterceptor.java | 12 +-
.../interceptor/XMLMessageOutInterceptor.java | 2 +-
.../xml/wsdl11/XMLWSDLExtensionLoader.java | 14 +-
.../cxf/binding/xml/XMLBindingFactoryTest.java | 6 +-
.../cxf/binding/xml/interceptor/TestBase.java | 28 +-
.../interceptor/XMLFaultOutInterceptorTest.java | 12 +-
.../XMLMessageInInterceptorTest.java | 12 +-
.../XMLMessageOutInterceptorTest.java | 12 +-
.../apache/cxf/aegis/util/jdom/StaxBuilder.java | 22 +-
.../apache/cxf/aegis/AbstractAegisIoImpl.java | 14 +-
.../java/org/apache/cxf/aegis/AegisContext.java | 70 +-
.../cxf/aegis/AegisElementDataReader.java | 4 +-
.../cxf/aegis/AegisElementDataWriter.java | 8 +-
.../main/java/org/apache/cxf/aegis/AegisIo.java | 4 +-
.../java/org/apache/cxf/aegis/AegisReader.java | 2 +-
.../java/org/apache/cxf/aegis/AegisWriter.java | 8 +-
.../cxf/aegis/AegisXMLStreamDataReader.java | 12 +-
.../cxf/aegis/AegisXMLStreamDataWriter.java | 28 +-
.../main/java/org/apache/cxf/aegis/Context.java | 10 +-
.../apache/cxf/aegis/DatabindingException.java | 16 +-
.../aegis/databinding/ElementDataReader.java | 10 +-
.../InconsistentInitializationException.java | 2 +-
.../aegis/databinding/XMLStreamDataReader.java | 8 +-
.../aegis/databinding/XMLStreamDataWriter.java | 16 +-
.../cxf/aegis/type/AbstractTypeCreator.java | 32 +-
.../org/apache/cxf/aegis/type/AegisType.java | 32 +-
.../cxf/aegis/type/DefaultTypeCreator.java | 2 +-
.../cxf/aegis/type/DefaultTypeMapping.java | 30 +-
.../aegis/type/ParameterizedTypeFactory.java | 2 +-
.../cxf/aegis/type/SimpleParameterizedType.java | 10 +-
.../apache/cxf/aegis/type/TypeClassInfo.java | 26 +-
.../cxf/aegis/type/TypeCreationOptions.java | 20 +-
.../org/apache/cxf/aegis/type/TypeCreator.java | 16 +-
.../org/apache/cxf/aegis/type/TypeMapping.java | 6 +-
.../org/apache/cxf/aegis/type/TypeUtil.java | 48 +-
.../apache/cxf/aegis/type/XMLTypeCreator.java | 50 +-
.../apache/cxf/aegis/type/basic/Base64Type.java | 12 +-
.../apache/cxf/aegis/type/basic/BeanType.java | 4 +-
.../cxf/aegis/type/basic/BeanTypeInfo.java | 20 +-
.../aegis/type/basic/CharacterAsStringType.java | 12 +-
.../type/basic/InterfaceInvocationHandler.java | 8 +-
.../aegis/type/basic/TimezoneLessDateType.java | 2 +-
.../cxf/aegis/type/basic/XMLBeanTypeInfo.java | 24 +-
.../aegis/type/collection/CollectionType.java | 4 +-
.../cxf/aegis/type/encoded/ArrayTypeInfo.java | 6 +-
.../cxf/aegis/type/encoded/MarshalRegistry.java | 2 +-
.../cxf/aegis/type/encoded/SoapArrayType.java | 6 +-
.../cxf/aegis/type/encoded/StructType.java | 8 +-
.../cxf/aegis/type/encoded/TrailingBlocks.java | 2 +-
.../cxf/aegis/type/java5/AnnotatedTypeInfo.java | 6 +-
.../cxf/aegis/type/java5/Java5TypeCreator.java | 30 +-
.../cxf/aegis/type/java5/XmlFlattenedArray.java | 2 +-
.../cxf/aegis/type/mtom/AbstractXOPType.java | 24 +-
.../cxf/aegis/type/mtom/AttachmentUtil.java | 2 +-
.../apache/cxf/aegis/type/xml/DocumentType.java | 2 +-
.../apache/cxf/aegis/type/xml/SourceType.java | 2 +-
.../apache/cxf/aegis/util/NamespaceHelper.java | 30 +-
.../org/apache/cxf/aegis/util/ServiceUtils.java | 2 +-
.../java/org/apache/cxf/aegis/util/UID.java | 2 +-
.../util/date/TimezoneLessXsDateFormat.java | 2 +-
.../cxf/aegis/util/date/XsDateTimeFormat.java | 6 +-
.../aegis/util/stax/JDOMNamespaceContext.java | 4 +-
.../cxf/aegis/util/stax/JDOMStreamWriter.java | 2 +-
.../aegis/util/stax/W3CNamespaceContext.java | 2 +-
.../cxf/aegis/xml/AbstractMessageWriter.java | 6 +-
.../org/apache/cxf/aegis/xml/MessageReader.java | 4 +-
.../org/apache/cxf/aegis/xml/MessageWriter.java | 6 +-
.../cxf/aegis/xml/stax/AttributeWriter.java | 2 +-
.../cxf/aegis/xml/stax/ElementReader.java | 4 +-
.../cxf/aegis/xml/stax/ElementWriter.java | 14 +-
.../org/apache/cxf/aegis/AbstractAegisTest.java | 30 +-
.../apache/cxf/aegis/client/BookService.java | 6 +-
.../aegis/client/ClientServiceConfigTest.java | 2 +-
.../cxf/aegis/custom/CustomBeansTest.java | 6 +-
.../cxf/aegis/custom/service/Service.java | 2 +-
.../cxf/aegis/custom/service/ServiceImpl.java | 4 +-
.../cxf/aegis/exception/HelloException.java | 8 +-
.../cxf/aegis/inheritance/AbstractUser.java | 2 +-
.../apache/cxf/aegis/inheritance/Employee.java | 2 +-
.../aegis/inheritance/InheritanceService.java | 2 +-
.../cxf/aegis/inheritance/intf/IGrandChild.java | 2 +-
.../inheritance/intf/IInterfaceService.java | 4 +-
.../inheritance/ws1/WS1ExtendedException.java | 2 +-
.../aegis/integration/ParameterMappingTest.java | 16 +-
.../aegis/integration/SchemaValidationTest.java | 10 +-
.../cxf/aegis/integration/WrappedTest.java | 26 +-
.../aegis/namespaces/ExplicitPrefixTest.java | 24 +-
.../namespaces/NamespaceConfusionTest.java | 32 +-
.../apache/cxf/aegis/namespaces/data/Name.java | 2 +-
.../aegis/namespaces/impl/NameServiceImpl.java | 4 +-
.../cxf/aegis/override/OverrideTypeTest.java | 10 +-
.../apache/cxf/aegis/services/ArrayService.java | 18 +-
.../cxf/aegis/services/AttributeBean.java | 2 +-
.../apache/cxf/aegis/services/BeanWithDOM.java | 10 +-
.../org/apache/cxf/aegis/services/DataBean.java | 4 +-
.../cxf/aegis/services/DocumentService.java | 4 +-
.../org/apache/cxf/aegis/services/Echo.java | 4 +-
.../cxf/aegis/services/NillableService.java | 6 +-
.../apache/cxf/aegis/services/SimpleBean.java | 12 +-
.../aegis/services/base64/BinaryDataTest.java | 6 +-
.../aegis/standalone/StandaloneReadTest.java | 30 +-
.../aegis/standalone/StandaloneWriteTest.java | 20 +-
.../type/TypeCreationOptionsSpringTest.java | 18 +-
.../type/array/DuplicateArrayReturnItem.java | 2 +-
.../aegis/type/array/DuplicateArrayService.java | 14 +-
.../type/array/DuplicateArrayServiceBean.java | 2 +-
.../cxf/aegis/type/array/FlatArrayService.java | 10 +-
.../type/array/FlatArrayServiceInterface.java | 2 +-
.../cxf/aegis/type/basic/BadBeanDescriptor.java | 4 +-
.../apache/cxf/aegis/type/basic/BeanTest.java | 10 +-
.../cxf/aegis/type/basic/ByteDataTest.java | 2 +-
.../cxf/aegis/type/basic/DateTimezoneTest.java | 38 +-
.../cxf/aegis/type/basic/DynamicProxyTest.java | 2 +-
.../cxf/aegis/type/basic/QualificationTest.java | 22 +-
.../aegis/type/encoded/AbstractEncodedTest.java | 8 +-
.../aegis/type/encoded/SoapArrayTypeTest.java | 6 +-
.../cxf/aegis/type/encoded/StructTypeTest.java | 4 +-
.../apache/cxf/aegis/type/java5/ClassTest.java | 26 +-
.../cxf/aegis/type/java5/CollectionService.java | 8 +-
.../type/java5/CollectionServiceInterface.java | 12 +-
.../cxf/aegis/type/java5/CollectionTest.java | 16 +-
.../aegis/type/java5/DualOutServiceTest.java | 4 +-
.../cxf/aegis/type/java5/EnumTypeTest.java | 6 +-
.../cxf/aegis/type/java5/JaxbTypeTest.java | 2 +-
.../aegis/type/java5/JaxbXmlParamTypeTest.java | 4 +-
.../cxf/aegis/type/java5/map/Student.java | 4 +-
.../aegis/type/java5/map/StudentService.java | 4 +-
.../java5/map/StudentServiceDocLiteral.java | 4 +-
.../java5/map/StudentServiceDocLiteralImpl.java | 8 +-
.../type/java5/map/StudentServiceImpl.java | 8 +-
.../org/apache/cxf/aegis/type/map/MapsTest.java | 28 +-
.../cxf/aegis/type/map/fortest/MapTest.java | 8 +-
.../aegis/type/map/fortest/ObjectWithAMap.java | 2 +-
.../aegis/type/map/ns2/ObjectWithAMapNs2.java | 2 +-
.../apache/cxf/aegis/type/missing/Inner.java | 2 +-
.../cxf/aegis/type/missing/MissingTypeImpl.java | 4 +-
.../aegis/type/missing/MissingTypeWSDLTest.java | 2 +-
.../apache/cxf/aegis/type/missing/Outer.java | 22 +-
.../streams/XMLStreamReaderMappingTest.java | 10 +-
.../cxf/aegis/xmlconfig/BeanWithDate.java | 2 +-
.../cxf/aegis/xmlconfig/TestDateMapping.java | 8 +-
.../java/org/apache/cxf/doclitbare/Course.java | 10 +-
.../apache/cxf/doclitbare/DocLitBareTest.java | 8 +-
.../java/org/apache/cxf/doclitbare/Teacher.java | 10 +-
.../org/apache/cxf/doclitbare/University.java | 6 +-
.../apache/cxf/doclitbare/UniversityImpl.java | 8 +-
.../org/apache/cxf/jaxb/DatatypeFactory.java | 6 +-
.../apache/cxf/jaxb/JAXBContextInitializer.java | 56 +-
.../java/org/apache/cxf/jaxb/JAXBDataBase.java | 30 +-
.../org/apache/cxf/jaxb/JAXBDataBinding.java | 12 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 120 +--
.../apache/cxf/jaxb/JAXBSchemaInitializer.java | 88 +-
.../org/apache/cxf/jaxb/JAXBWrapperHelper.java | 18 +-
.../main/java/org/apache/cxf/jaxb/Utils.java | 28 +-
.../apache/cxf/jaxb/WrapperHelperCompiler.java | 110 +-
.../attachment/JAXBAttachmentMarshaller.java | 4 +-
.../JAXBAttachmentSchemaValidationHack.java | 14 +-
.../attachment/JAXBAttachmentUnmarshaller.java | 2 +-
.../org/apache/cxf/jaxb/io/DataReaderImpl.java | 54 +-
.../org/apache/cxf/jaxb/io/DataWriterImpl.java | 72 +-
.../apache/cxf/jaxb/BareInInterceptorTest.java | 42 +-
.../apache/cxf/jaxb/BareOutInterceptorTest.java | 22 +-
.../DataBindingMarshallerPropertiesTest.java | 6 +-
.../apache/cxf/jaxb/DatatypeFactoryTest.java | 2 +-
.../cxf/jaxb/FixNamespacesXMLEventWriter.java | 4 +-
.../apache/cxf/jaxb/JAXBDataBindingTest.java | 46 +-
.../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 178 +--
.../java/org/apache/cxf/jaxb/JAXBUtilsTest.java | 86 +-
.../apache/cxf/jaxb/JAXBWrapperHelperTest.java | 28 +-
.../org/apache/cxf/jaxb/OrderException.java | 14 +-
.../org/apache/cxf/jaxb/StaxEventFilter.java | 2 +-
.../test/java/org/apache/cxf/jaxb/TestBase.java | 2 +-
.../apache/cxf/jaxb/fortest/QualifiedBean.java | 12 +-
.../org/apache/cxf/jaxb/io/MyCustomHandler.java | 2 +-
.../cxf/jaxb/io/MyCustomMarshallerHandler.java | 12 +-
.../cxf/jaxb/io/XMLStreamDataReaderTest.java | 42 +-
.../cxf/jaxb/io/XMLStreamDataWriterTest.java | 88 +-
.../org/apache/cxf/jaxb_misc/TestJAXBClass.java | 4 +-
.../AbstractStaticFailoverStrategy.java | 30 +-
.../CircuitBreakerTargetSelector.java | 82 +-
.../cxf/clustering/FailoverFailedException.java | 6 +-
.../apache/cxf/clustering/FailoverFeature.java | 14 +-
.../apache/cxf/clustering/FailoverStrategy.java | 14 +-
.../cxf/clustering/FailoverTargetSelector.java | 118 +-
.../cxf/clustering/LoadDistributorFeature.java | 6 +-
.../LoadDistributorTargetSelector.java | 14 +-
.../apache/cxf/clustering/RandomStrategy.java | 10 +-
.../apache/cxf/clustering/RetryStrategy.java | 8 +-
.../cxf/clustering/SequentialStrategy.java | 6 +-
.../ClusteringBPBeanDefinitionParser.java | 2 +-
.../circuitbreaker/CircuitBreaker.java | 4 +-
.../CircuitBreakerFailoverFeature.java | 22 +-
.../circuitbreaker/ZestCircuitBreaker.java | 12 +-
...cuitBreakerFailoverBeanDefinitionParser.java | 2 +-
.../spring/FailoverBeanDefinitionParser.java | 2 +-
.../LoadDistributorBeanDefinitionParser.java | 2 +-
.../cxf/clustering/spring/NamespaceHandler.java | 2 +-
.../ClusteringBPNamespaceHandlerTest.java | 4 +-
.../ext/logging/AbstractLoggingInterceptor.java | 12 +-
.../apache/cxf/ext/logging/LoggingFeature.java | 18 +-
.../cxf/ext/logging/LoggingInInterceptor.java | 28 +-
.../cxf/ext/logging/LoggingOutInterceptor.java | 10 +-
.../org/apache/cxf/ext/logging/WireTapIn.java | 8 +-
.../logging/event/DefaultLogEventMapper.java | 8 +-
.../apache/cxf/ext/logging/event/LogEvent.java | 22 +-
.../ext/logging/event/PrettyLoggingFilter.java | 8 +-
.../logging/event/PrintWriterEventSender.java | 14 +-
.../apache/cxf/ext/logging/osgi/Activator.java | 6 +-
.../cxf/ext/logging/slf4j/Slf4jEventSender.java | 8 +-
.../ext/logging/DefaultLogEventMapperTest.java | 4 +-
.../org/apache/cxf/metrics/ExchangeMetrics.java | 10 +-
.../org/apache/cxf/metrics/MetricsContext.java | 8 +-
.../org/apache/cxf/metrics/MetricsFeature.java | 24 +-
.../org/apache/cxf/metrics/MetricsProvider.java | 2 +-
.../codahale/CodahaleMetricsContext.java | 14 +-
.../codahale/CodahaleMetricsProvider.java | 16 +-
.../AbstractMetricsInterceptor.java | 10 +-
.../interceptors/CountingOutInterceptor.java | 2 +-
.../interceptors/CountingOutputStream.java | 2 +-
.../MetricsMessageInOneWayInterceptor.java | 2 +-
.../MetricsMessageInPostInvokeInterceptor.java | 2 +-
.../MetricsMessageInPreInvokeInterceptor.java | 2 +-
.../MetricsMessageOutInterceptor.java | 2 +-
.../cxf/throttling/SimpleThrottlingManager.java | 4 +-
.../apache/cxf/throttling/ThrottleResponse.java | 14 +-
.../cxf/throttling/ThrottlingFeature.java | 6 +-
.../cxf/throttling/ThrottlingInterceptor.java | 8 +-
.../cxf/throttling/ThrottlingManager.java | 10 +-
.../ThrottlingResponseInterceptor.java | 6 +-
.../cxf/jaxrs/AbstractJAXRSFactoryBean.java | 116 +-
.../java/org/apache/cxf/jaxrs/JAXRSBinding.java | 10 +-
.../apache/cxf/jaxrs/JAXRSBindingFactory.java | 18 +-
.../java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 88 +-
.../cxf/jaxrs/JAXRSServerFactoryBean.java | 126 +--
.../cxf/jaxrs/JAXRSServiceFactoryBean.java | 58 +-
.../org/apache/cxf/jaxrs/JAXRSServiceImpl.java | 38 +-
.../blueprint/BlueprintResourceFactory.java | 6 +-
.../blueprint/JAXRSBPNamespaceHandler.java | 16 +-
.../JAXRSServerFactoryBeanDefinitionParser.java | 22 +-
.../apache/cxf/jaxrs/ext/MessageContext.java | 12 +-
.../cxf/jaxrs/ext/MessageContextImpl.java | 80 +-
.../java/org/apache/cxf/jaxrs/ext/Nullable.java | 6 +-
.../java/org/apache/cxf/jaxrs/ext/Oneway.java | 2 +-
.../apache/cxf/jaxrs/ext/ProtocolHeaders.java | 12 +-
.../cxf/jaxrs/ext/ProtocolHeadersImpl.java | 4 +-
.../cxf/jaxrs/ext/ResourceComparator.java | 12 +-
.../cxf/jaxrs/ext/multipart/Attachment.java | 58 +-
.../jaxrs/ext/multipart/AttachmentBuilder.java | 24 +-
.../jaxrs/ext/multipart/ContentDisposition.java | 2 +-
.../ext/multipart/InputStreamDataSource.java | 6 +-
.../cxf/jaxrs/ext/multipart/Multipart.java | 4 +-
.../cxf/jaxrs/ext/multipart/MultipartBody.java | 32 +-
.../apache/cxf/jaxrs/ext/xml/ElementClass.java | 2 +-
.../cxf/jaxrs/ext/xml/XMLInstruction.java | 4 +-
.../org/apache/cxf/jaxrs/ext/xml/XMLName.java | 6 +-
.../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 98 +-
.../cxf/jaxrs/ext/xml/XSISchemaLocation.java | 10 +-
.../apache/cxf/jaxrs/ext/xml/XSLTTransform.java | 6 +-
.../impl/AbstractInterceptorContextImpl.java | 6 +-
.../cxf/jaxrs/impl/AbstractPropertiesImpl.java | 2 +-
.../jaxrs/impl/AbstractRequestContextImpl.java | 4 +-
.../jaxrs/impl/AbstractResponseContextImpl.java | 12 +-
.../cxf/jaxrs/impl/AsyncResponseImpl.java | 60 +-
.../jaxrs/impl/CacheControlHeaderProvider.java | 34 +-
.../apache/cxf/jaxrs/impl/ConfigurableImpl.java | 22 +-
.../cxf/jaxrs/impl/ConfigurationImpl.java | 34 +-
.../jaxrs/impl/ContainerRequestContextImpl.java | 14 +-
.../impl/ContainerResponseContextImpl.java | 18 +-
.../cxf/jaxrs/impl/CookieHeaderProvider.java | 16 +-
.../cxf/jaxrs/impl/DateHeaderProvider.java | 4 +-
.../cxf/jaxrs/impl/EntityTagHeaderProvider.java | 12 +-
.../cxf/jaxrs/impl/FeatureContextImpl.java | 4 +-
.../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 64 +-
.../jaxrs/impl/HttpServletRequestFilter.java | 6 +-
.../jaxrs/impl/HttpServletResponseFilter.java | 6 +-
.../apache/cxf/jaxrs/impl/LinkBuilderImpl.java | 36 +-
.../cxf/jaxrs/impl/LinkHeaderProvider.java | 20 +-
.../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 48 +-
.../org/apache/cxf/jaxrs/impl/MetadataMap.java | 48 +-
.../cxf/jaxrs/impl/NewCookieHeaderProvider.java | 36 +-
.../apache/cxf/jaxrs/impl/PathSegmentImpl.java | 14 +-
.../cxf/jaxrs/impl/PropertyHolderFactory.java | 20 +-
.../apache/cxf/jaxrs/impl/ProvidersImpl.java | 2 +-
.../impl/ReaderInterceptorContextImpl.java | 6 +-
.../cxf/jaxrs/impl/ReaderInterceptorMBR.java | 16 +-
.../org/apache/cxf/jaxrs/impl/RequestImpl.java | 86 +-
.../cxf/jaxrs/impl/RequestPreprocessor.java | 50 +-
.../cxf/jaxrs/impl/ResourceContextImpl.java | 8 +-
.../apache/cxf/jaxrs/impl/ResourceInfoImpl.java | 4 +-
.../cxf/jaxrs/impl/ResponseBuilderImpl.java | 30 +-
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 136 +--
.../cxf/jaxrs/impl/RuntimeDelegateImpl.java | 22 +-
.../cxf/jaxrs/impl/SecurityContextImpl.java | 6 +-
.../jaxrs/impl/ServletOutputStreamFilter.java | 8 +-
.../impl/ServletRequestPropertyHolder.java | 4 +-
.../apache/cxf/jaxrs/impl/UriBuilderImpl.java | 260 ++---
.../org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 24 +-
.../cxf/jaxrs/impl/VariantListBuilderImpl.java | 18 +-
.../impl/WebApplicationExceptionMapper.java | 30 +-
.../impl/WriterInterceptorContextImpl.java | 10 +-
.../cxf/jaxrs/impl/WriterInterceptorMBW.java | 34 +-
.../jaxrs/impl/tl/AbstractThreadLocalProxy.java | 6 +-
.../impl/tl/ThreadLocalContextResolver.java | 4 +-
.../jaxrs/impl/tl/ThreadLocalHttpHeaders.java | 2 +-
.../impl/tl/ThreadLocalHttpServletRequest.java | 2 +-
.../impl/tl/ThreadLocalHttpServletResponse.java | 30 +-
.../impl/tl/ThreadLocalInvocationHandler.java | 4 +-
.../impl/tl/ThreadLocalMessageContext.java | 4 +-
.../impl/tl/ThreadLocalProtocolHeaders.java | 4 +-
.../cxf/jaxrs/impl/tl/ThreadLocalProviders.java | 8 +-
.../cxf/jaxrs/impl/tl/ThreadLocalProxy.java | 2 +-
.../cxf/jaxrs/impl/tl/ThreadLocalRequest.java | 2 +-
.../impl/tl/ThreadLocalSecurityContext.java | 2 +-
.../jaxrs/impl/tl/ThreadLocalServletConfig.java | 6 +-
.../impl/tl/ThreadLocalServletContext.java | 10 +-
.../cxf/jaxrs/impl/tl/ThreadLocalUriInfo.java | 6 +-
.../interceptor/AttachmentInputInterceptor.java | 12 +-
.../AttachmentOutputInterceptor.java | 12 +-
.../JAXRSDefaultFaultOutInterceptor.java | 22 +-
.../jaxrs/interceptor/JAXRSInInterceptor.java | 84 +-
.../JAXRSOutExceptionMapperInterceptor.java | 2 +-
.../jaxrs/interceptor/JAXRSOutInterceptor.java | 146 +--
.../lifecycle/PerRequestResourceProvider.java | 22 +-
.../cxf/jaxrs/lifecycle/ResourceProvider.java | 8 +-
.../lifecycle/SingletonResourceProvider.java | 20 +-
.../cxf/jaxrs/model/AbstractResourceInfo.java | 100 +-
.../apache/cxf/jaxrs/model/ApplicationInfo.java | 6 +-
.../apache/cxf/jaxrs/model/BeanParamInfo.java | 2 +-
.../cxf/jaxrs/model/BeanResourceInfo.java | 26 +-
.../cxf/jaxrs/model/ClassResourceInfo.java | 90 +-
.../model/ClassResourceInfoComparator.java | 10 +-
.../cxf/jaxrs/model/FilterProviderInfo.java | 8 +-
.../cxf/jaxrs/model/MethodDispatcher.java | 18 +-
.../cxf/jaxrs/model/MethodInvocationInfo.java | 10 +-
.../cxf/jaxrs/model/OperationResourceInfo.java | 62 +-
.../model/OperationResourceInfoComparator.java | 30 +-
.../org/apache/cxf/jaxrs/model/Parameter.java | 42 +-
.../apache/cxf/jaxrs/model/ParameterType.java | 2 +-
.../apache/cxf/jaxrs/model/ProviderInfo.java | 20 +-
.../apache/cxf/jaxrs/model/SubresourceKey.java | 10 +-
.../org/apache/cxf/jaxrs/model/URITemplate.java | 52 +-
.../apache/cxf/jaxrs/model/UserApplication.java | 14 +-
.../apache/cxf/jaxrs/model/UserOperation.java | 36 +-
.../apache/cxf/jaxrs/model/UserResource.java | 34 +-
.../cxf/jaxrs/model/doc/JavaDocProvider.java | 112 +-
.../cxf/jaxrs/nio/DelegatingNioInputStream.java | 16 +-
.../jaxrs/nio/DelegatingNioOutputStream.java | 10 +-
.../cxf/jaxrs/nio/NioMessageBodyWriter.java | 8 +-
.../org/apache/cxf/jaxrs/nio/NioReadEntity.java | 2 +-
.../cxf/jaxrs/nio/NioReadListenerImpl.java | 4 +-
.../apache/cxf/jaxrs/nio/NioWriteEntity.java | 6 +-
.../AbstractCachingMessageProvider.java | 16 +-
.../provider/AbstractConfigurableProvider.java | 50 +-
.../jaxrs/provider/AbstractJAXBProvider.java | 302 +++---
.../cxf/jaxrs/provider/BinaryDataProvider.java | 86 +-
.../provider/CachingMessageBodyReader.java | 22 +-
.../provider/CachingMessageBodyWriter.java | 24 +-
.../cxf/jaxrs/provider/DataBindingProvider.java | 20 +-
.../cxf/jaxrs/provider/DataSourceProvider.java | 30 +-
.../jaxrs/provider/FormEncodingProvider.java | 86 +-
.../provider/JAXBAttachmentMarshaller.java | 10 +-
.../provider/JAXBAttachmentUnmarshaller.java | 4 +-
.../cxf/jaxrs/provider/JAXBElementProvider.java | 212 ++--
.../provider/JAXBElementTypedProvider.java | 12 +-
.../cxf/jaxrs/provider/JAXRSDataBinding.java | 48 +-
.../cxf/jaxrs/provider/MultipartProvider.java | 128 +--
.../jaxrs/provider/PrimitiveTextProvider.java | 18 +-
.../cxf/jaxrs/provider/ProviderCache.java | 16 +-
.../cxf/jaxrs/provider/ProviderFactory.java | 458 ++++----
.../provider/RequestDispatcherProvider.java | 144 +--
.../jaxrs/provider/ServerProviderFactory.java | 182 ++--
.../cxf/jaxrs/provider/SourceProvider.java | 58 +-
.../provider/StreamingResponseProvider.java | 18 +-
.../cxf/jaxrs/provider/StringTextProvider.java | 4 +-
.../cxf/jaxrs/provider/XPathProvider.java | 26 +-
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 172 +--
.../security/JAASAuthenticationFilter.java | 40 +-
.../security/KerberosAuthOutInterceptor.java | 16 +-
.../security/KerberosAuthenticationFilter.java | 68 +-
.../servlet/CXFJaxrsRuntimeDelegateServlet.java | 8 +-
.../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 164 +--
.../spring/AbstractJaxrsClassesScanServer.java | 14 +-
.../AbstractSpringComponentScanServer.java | 50 +-
.../AbstractSpringConfigurationFactory.java | 22 +-
.../JAXRSServerFactoryBeanDefinitionParser.java | 54 +-
.../cxf/jaxrs/spring/NamespaceHandler.java | 10 +-
.../jaxrs/spring/SpringComponentScanServer.java | 2 +-
.../spring/SpringJaxrsClassesScanServer.java | 2 +-
.../cxf/jaxrs/spring/SpringResourceFactory.java | 36 +-
.../apache/cxf/jaxrs/utils/AnnotationUtils.java | 10 +-
.../apache/cxf/jaxrs/utils/ExceptionUtils.java | 64 +-
.../org/apache/cxf/jaxrs/utils/FormUtils.java | 68 +-
.../org/apache/cxf/jaxrs/utils/HttpUtils.java | 194 ++--
.../apache/cxf/jaxrs/utils/InjectionUtils.java | 364 +++----
.../org/apache/cxf/jaxrs/utils/JAXBUtils.java | 28 +-
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 708 ++++++------
.../utils/ParameterizedCollectionType.java | 2 +-
.../apache/cxf/jaxrs/utils/ResourceUtils.java | 266 ++---
.../apache/cxf/jaxrs/utils/SpecExceptions.java | 46 +-
.../jaxrs/utils/multipart/AttachmentUtils.java | 90 +-
.../utils/multipart/MultipartReadException.java | 10 +-
.../cxf/jaxrs/utils/schemas/SchemaHandler.java | 40 +-
.../JAXRSBeanValidationInInterceptor.java | 8 +-
.../validation/JAXRSBeanValidationInvoker.java | 24 +-
.../JAXRSBeanValidationOutInterceptor.java | 8 +-
.../validation/JAXRSParameterNameProvider.java | 14 +-
.../validation/ValidationExceptionMapper.java | 14 +-
.../cxf/jaxrs/validation/ValidationUtils.java | 4 +-
.../org/apache/cxf/jaxrs/AbstractCustomer.java | 30 +-
.../java/org/apache/cxf/jaxrs/Customer.java | 228 ++--
.../java/org/apache/cxf/jaxrs/Customer2.java | 8 +-
.../apache/cxf/jaxrs/CustomerApplication.java | 2 +-
.../org/apache/cxf/jaxrs/CustomerGender.java | 2 +-
.../java/org/apache/cxf/jaxrs/CustomerInfo.java | 6 +-
.../apache/cxf/jaxrs/DefaultMethodResource.java | 6 +-
.../apache/cxf/jaxrs/JAXBContextProvider.java | 2 +-
.../apache/cxf/jaxrs/JAXBContextProvider2.java | 2 +-
.../cxf/jaxrs/JAXRSServerFactoryBeanTest.java | 24 +-
.../cxf/jaxrs/JAXRSServiceFactoryBeanTest.java | 36 +-
.../cxf/jaxrs/SelectMethodCandidatesTest.java | 416 +++----
.../org/apache/cxf/jaxrs/SimpleFactory.java | 4 +-
.../java/org/apache/cxf/jaxrs/Timezone.java | 4 +-
.../blueprint/JAXRSBPNamespaceHandlerTest.java | 4 +-
.../cxf/jaxrs/ext/MessageContextImplTest.java | 40 +-
.../cxf/jaxrs/ext/multipart/AttachmentTest.java | 6 +-
.../ext/multipart/ContentDispositionTest.java | 6 +-
.../jaxrs/ext/multipart/MultipartBodyTest.java | 6 +-
.../apache/cxf/jaxrs/ext/xml/XMLSourceTest.java | 70 +-
.../cxf/jaxrs/fortest/AbstractEntity.java | 16 +-
.../jaxrs/fortest/AbstractRestController.java | 2 +-
.../jaxrs/fortest/ConcreteRestController.java | 4 +-
.../apache/cxf/jaxrs/fortest/GenericEntity.java | 4 +-
.../cxf/jaxrs/fortest/GenericEntityImpl.java | 4 +-
.../cxf/jaxrs/fortest/GenericEntityImpl2.java | 4 +-
.../cxf/jaxrs/fortest/GenericEntityImpl3.java | 4 +-
.../cxf/jaxrs/fortest/GenericEntityImpl4.java | 4 +-
.../org/apache/cxf/jaxrs/fortest/jaxb/Book.java | 10 +-
.../cxf/jaxrs/fortest/jaxb/ObjectFactory.java | 8 +-
.../cxf/jaxrs/fortest/jaxb/SuperBook.java | 6 +-
.../cxf/jaxrs/fortest/jaxb/SuperBook2.java | 6 +-
.../jaxrs/fortest/jaxb/index/SuperBook3.java | 6 +-
.../fortest/jaxb/jaxbelement/ObjectFactory.java | 6 +-
.../jaxb/jaxbelement/ParamJAXBElement.java | 2 +-
.../fortest/jaxb/jaxbelement/ParamType.java | 4 +-
.../fortest/jaxb/jaxbelement/package-info.java | 2 +-
.../jaxrs/fortest/jaxb/packageinfo/Book2.java | 8 +-
.../jaxb/packageinfo/Book2NoRootElement.java | 8 +-
.../cxf/jaxrs/impl/AsyncResponseImplTest.java | 56 +-
.../impl/CacheControlHeaderProviderTest.java | 40 +-
.../cxf/jaxrs/impl/ConfigurationImplTest.java | 14 +-
.../jaxrs/impl/CookieHeaderProviderTest.java | 26 +-
.../cxf/jaxrs/impl/DateHeaderProviderTest.java | 8 +-
.../jaxrs/impl/EntityTagHeaderProviderTest.java | 10 +-
.../jaxrs/impl/EvaluatePreconditionsTest.java | 2 +-
.../cxf/jaxrs/impl/HttpHeadersImplTest.java | 168 +--
.../cxf/jaxrs/impl/LinkBuilderImplTest.java | 24 +-
.../cxf/jaxrs/impl/LinkHeaderProviderTest.java | 12 +-
.../jaxrs/impl/MediaTypeHeaderProviderTest.java | 76 +-
.../apache/cxf/jaxrs/impl/MetadataMapTest.java | 102 +-
.../jaxrs/impl/NewCookieHeaderProviderTest.java | 30 +-
.../cxf/jaxrs/impl/PathSegmentImplTest.java | 12 +-
.../apache/cxf/jaxrs/impl/RequestImplTest.java | 154 +--
.../cxf/jaxrs/impl/RequestPreprocessorTest.java | 28 +-
.../cxf/jaxrs/impl/ResponseBuilderImplTest.java | 90 +-
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 108 +-
.../cxf/jaxrs/impl/RuntimeDelegateImplTest.java | 8 +-
.../cxf/jaxrs/impl/SecurityContextImplTest.java | 2 +-
.../cxf/jaxrs/impl/UriBuilderImplTest.java | 404 +++----
.../apache/cxf/jaxrs/impl/UriInfoImplTest.java | 134 +--
.../jaxrs/impl/VariantListBuilderImplTest.java | 36 +-
.../PerRequestResourceProviderTest.java | 4 +-
.../cxf/jaxrs/model/ClassResourceInfoTest.java | 100 +-
.../jaxrs/model/OperationResourceInfoTest.java | 70 +-
.../apache/cxf/jaxrs/model/URITemplateTest.java | 80 +-
.../jaxrs/model/doc/JavaDocProviderTest.java | 12 +-
.../cxf/jaxrs/model/wadl/petstore/PetStore.java | 20 +-
.../jaxrs/provider/BinaryDataProviderTest.java | 44 +-
.../jaxrs/provider/DataSourceProviderTest.java | 52 +-
.../provider/FormEncodingProviderTest.java | 166 +--
.../jaxrs/provider/JAXBElementProviderTest.java | 582 +++++-----
.../provider/PrimitiveTextProviderTest.java | 92 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 412 +++----
.../provider/RequestDispatcherProviderTest.java | 10 +-
.../cxf/jaxrs/provider/SourceProviderTest.java | 56 +-
.../cxf/jaxrs/provider/XPathProviderTest.java | 6 +-
.../jaxrs/provider/XSLTJaxbProviderTest.java | 48 +-
.../org/apache/cxf/jaxrs/resources/Book.java | 26 +-
.../cxf/jaxrs/resources/BookInterface.java | 4 +-
.../cxf/jaxrs/resources/BookNoRootElement.java | 10 +-
.../cxf/jaxrs/resources/BookNoSubResource.java | 10 +-
.../apache/cxf/jaxrs/resources/BookStore.java | 6 +-
.../jaxrs/resources/BookStoreNoAnnotations.java | 6 +-
.../jaxrs/resources/BookStoreNoSubResource.java | 10 +-
.../resources/BookStoreSubresourcesOnly.java | 14 +-
.../cxf/jaxrs/resources/BookStoreTemplates.java | 6 +-
.../cxf/jaxrs/resources/BookSuperClass.java | 2 +-
.../org/apache/cxf/jaxrs/resources/Chapter.java | 8 +-
.../jaxrs/resources/CollectionsResource.java | 28 +-
.../apache/cxf/jaxrs/resources/ManyTags.java | 10 +-
.../apache/cxf/jaxrs/resources/SuperBook.java | 6 +-
.../org/apache/cxf/jaxrs/resources/TagVO.java | 18 +-
.../org/apache/cxf/jaxrs/resources/TagVO2.java | 6 +-
.../org/apache/cxf/jaxrs/resources/Tags.java | 10 +-
.../cxf/jaxrs/resources/TestResource.java | 26 +-
.../spring/JAXRSServerFactoryBeanTest.java | 16 +-
.../jaxrs/spring/SpringResourceFactoryTest.java | 14 +-
.../jaxrs/utils/AnnotationTestUtilsTest.java | 24 +-
.../apache/cxf/jaxrs/utils/FormUtilsTest.java | 24 +-
.../apache/cxf/jaxrs/utils/HttpUtilsTest.java | 58 +-
.../cxf/jaxrs/utils/InjectionUtilsTest.java | 70 +-
.../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 982 ++++++++---------
.../cxf/jaxrs/utils/ResourceUtilsTest.java | 58 +-
.../cxf/jaxws/AbstractJAXWSMethodInvoker.java | 44 +-
.../java/org/apache/cxf/jaxws/CXFService.java | 16 +-
.../java/org/apache/cxf/jaxws/DispatchImpl.java | 86 +-
.../java/org/apache/cxf/jaxws/EndpointImpl.java | 150 +--
.../cxf/jaxws/EndpointReferenceBuilder.java | 18 +-
.../org/apache/cxf/jaxws/EndpointUtils.java | 12 +-
.../apache/cxf/jaxws/JAXWSMethodDispatcher.java | 14 +-
.../apache/cxf/jaxws/JAXWSMethodInvoker.java | 30 +-
.../jaxws/JAXWSProviderMethodDispatcher.java | 6 +-
.../cxf/jaxws/JaxWsClientFactoryBean.java | 8 +-
.../org/apache/cxf/jaxws/JaxWsClientProxy.java | 42 +-
.../cxf/jaxws/JaxWsConfigurationException.java | 2 +-
.../apache/cxf/jaxws/JaxWsProxyFactoryBean.java | 34 +-
.../cxf/jaxws/JaxWsServerFactoryBean.java | 68 +-
.../apache/cxf/jaxws/JaxwsClientCallback.java | 8 +-
.../apache/cxf/jaxws/JaxwsResponseCallback.java | 2 +-
.../apache/cxf/jaxws/JaxwsServiceBuilder.java | 20 +-
.../apache/cxf/jaxws/ServerAsyncResponse.java | 8 +-
.../java/org/apache/cxf/jaxws/ServiceImpl.java | 138 +--
.../apache/cxf/jaxws/WrapperClassGenerator.java | 66 +-
.../cxf/jaxws/binding/AbstractBindingImpl.java | 6 +-
.../cxf/jaxws/binding/DefaultBindingImpl.java | 2 +-
.../cxf/jaxws/binding/http/HTTPBindingImpl.java | 10 +-
.../soap/JaxWsSoapBindingConfiguration.java | 8 +-
.../cxf/jaxws/binding/soap/SOAPBindingImpl.java | 16 +-
.../apache/cxf/jaxws/blueprint/Activator.java | 2 +-
.../blueprint/EndpointDefinitionParser.java | 16 +-
.../blueprint/JAXWSBPNamespaceHandler.java | 18 +-
.../jaxws/context/WebServiceContextImpl.java | 16 +-
.../WebServiceContextResourceResolver.java | 10 +-
.../cxf/jaxws/context/WrappedAttachments.java | 20 +-
.../jaxws/context/WrappedMessageContext.java | 94 +-
.../dynamic/JaxWsDynamicClientFactory.java | 12 +-
.../AbstractJAXWSHandlerInterceptor.java | 42 +-
.../AbstractProtocolHandlerInterceptor.java | 12 +-
.../handler/AnnotationHandlerChainBuilder.java | 50 +-
.../cxf/jaxws/handler/HandlerChainBuilder.java | 16 +-
.../cxf/jaxws/handler/HandlerChainInvoker.java | 14 +-
.../cxf/jaxws/handler/HandlerResolverImpl.java | 22 +-
.../handler/InitParamResourceResolver.java | 16 +-
.../LogicalHandlerFaultInInterceptor.java | 12 +-
.../LogicalHandlerFaultOutInterceptor.java | 58 +-
.../logical/LogicalHandlerInInterceptor.java | 22 +-
.../logical/LogicalHandlerOutInterceptor.java | 60 +-
.../logical/LogicalMessageContextImpl.java | 4 +-
.../handler/logical/LogicalMessageImpl.java | 20 +-
.../soap/SOAPHandlerFaultInInterceptor.java | 4 +-
.../soap/SOAPHandlerFaultOutInterceptor.java | 14 +-
.../handler/soap/SOAPHandlerInterceptor.java | 28 +-
.../handler/soap/SOAPMessageContextImpl.java | 16 +-
.../apache/cxf/jaxws/handler/types/CString.java | 10 +-
.../jaxws/handler/types/DescriptionType.java | 6 +-
.../jaxws/handler/types/DisplayNameType.java | 6 +-
.../handler/types/FullyQualifiedClassType.java | 2 +-
.../cxf/jaxws/handler/types/IconType.java | 18 +-
.../cxf/jaxws/handler/types/ParamValueType.java | 18 +-
.../cxf/jaxws/handler/types/PathType.java | 2 +-
.../handler/types/PortComponentHandlerType.java | 32 +-
.../cxf/jaxws/handler/types/XsdQNameType.java | 10 +-
.../cxf/jaxws/handler/types/XsdStringType.java | 10 +-
.../cxf/jaxws/handler/types/package-info.java | 2 +-
.../jaxws/interceptors/HolderInInterceptor.java | 6 +-
.../interceptors/HolderOutInterceptor.java | 8 +-
.../interceptors/MessageModeInInterceptor.java | 24 +-
.../interceptors/MessageModeOutInterceptor.java | 60 +-
.../jaxws/interceptors/SwAInInterceptor.java | 22 +-
.../jaxws/interceptors/SwAOutInterceptor.java | 68 +-
.../interceptors/WebFaultOutInterceptor.java | 22 +-
.../interceptors/WrapperClassInInterceptor.java | 42 +-
.../WrapperClassOutInterceptor.java | 22 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 68 +-
.../jaxws/spring/EndpointDefinitionParser.java | 24 +-
.../JaxWsProxyFactoryBeanDefinitionParser.java | 8 +-
...xWsWebServicePublisherBeanPostProcessor.java | 68 +-
.../org/apache/cxf/jaxws/support/BindingID.java | 12 +-
.../jaxws/support/JaxWsClientEndpointImpl.java | 8 +-
.../cxf/jaxws/support/JaxWsEndpointImpl.java | 130 +--
.../jaxws/support/JaxWsEndpointImplFactory.java | 4 +-
.../cxf/jaxws/support/JaxWsImplementorInfo.java | 46 +-
.../support/JaxWsServiceConfiguration.java | 140 +--
.../jaxws/support/JaxWsServiceFactoryBean.java | 4 +-
.../jaxws/support/ServiceDelegateAccessor.java | 10 +-
.../WebServiceProviderConfiguration.java | 6 +-
.../org/apache/cxf/jaxws22/EndpointImpl.java | 4 +-
.../org/apache/cxf/jaxws22/JAXWS22Invoker.java | 2 +-
.../apache/cxf/jaxws22/spi/ProviderImpl.java | 2 +-
.../HttpServletRequestAdapter.java | 12 +-
.../HttpServletResponseAdapter.java | 10 +-
.../http_jaxws_spi/JAXWSHttpSpiDestination.java | 16 +-
.../JAXWSHttpSpiTransportFactory.java | 2 +-
.../org/apache/cxf/jaxws/AbstractJaxWsTest.java | 4 +-
.../org/apache/cxf/jaxws/CodeFirstTest.java | 194 ++--
.../org/apache/cxf/jaxws/CodeFirstWSDLTest.java | 84 +-
.../cxf/jaxws/ConfiguredEndpointTest.java | 112 +-
.../org/apache/cxf/jaxws/EndpointImplTest.java | 70 +-
.../apache/cxf/jaxws/EndpointReferenceTest.java | 96 +-
.../java/org/apache/cxf/jaxws/GreeterTest.java | 16 +-
.../java/org/apache/cxf/jaxws/HeaderTest.java | 24 +-
.../cxf/jaxws/JAXWSMethodInvokerTest.java | 58 +-
.../org/apache/cxf/jaxws/JaxWsClientTest.java | 4 +-
.../cxf/jaxws/JaxWsServerFactoryBeanTest.java | 16 +-
.../apache/cxf/jaxws/MessageReplayObserver.java | 6 +-
.../apache/cxf/jaxws/SEIWithJAXBAnnoTest.java | 12 +-
.../org/apache/cxf/jaxws/SOAPBindingTest.java | 38 +-
.../cxf/jaxws/SchemaFirstXmlConfigTest.java | 8 +-
.../org/apache/cxf/jaxws/ServiceImplTest.java | 92 +-
.../apache/cxf/jaxws/ServiceModelUtilsTest.java | 34 +-
.../org/apache/cxf/jaxws/SoapFaultTest.java | 6 +-
.../cxf/jaxws/WrapperClassGeneratorTest.java | 48 +-
.../blueprint/JAXWSBPNamespaceHandlerTest.java | 4 +-
.../context/WebServiceContextImplTest.java | 24 +-
.../jaxws/context/WrappedAttachmentsTest.java | 20 +-
.../context/WrappedMessageContextTest.java | 18 +-
.../cxf/jaxws/dispatch/DispatchOpTest.java | 16 +-
.../apache/cxf/jaxws/dispatch/DispatchTest.java | 16 +-
.../AbstractProtocolHandlerInterceptorTest.java | 22 +-
.../AnnotationHandlerChainBuilderTest.java | 16 +-
.../jaxws/handler/HandlerChainInvokerTest.java | 280 ++---
.../handler/InitParamResourceResolverTest.java | 40 +-
.../handler/LogicalHandlerInterceptorTest.java | 2 +-
.../jaxws/handler/LogicalMessageImplTest.java | 10 +-
.../soap/SOAPHandlerInterceptorTest.java | 90 +-
.../jaxws/header/HeaderClientServerTest.java | 94 +-
.../cxf/jaxws/header/TestRPCHeaderProvider.java | 6 +-
.../apache/cxf/jaxws/holder/HolderService.java | 4 +-
.../org/apache/cxf/jaxws/holder/HolderTest.java | 8 +-
.../WebFaultOutInterceptorTestCase.java | 6 +-
.../cxf/jaxws/logging/SOAPLoggingTest.java | 16 +-
.../cxf/jaxws/logging/TestEventSender.java | 2 +-
.../provider/ProviderServiceFactoryTest.java | 26 +-
.../apache/cxf/jaxws/provider/ProviderTest.java | 22 +-
.../cxf/jaxws/service/AddNumbersException.java | 8 +-
.../jaxws/service/AddNumbersSubException.java | 6 +-
.../cxf/jaxws/service/AnnotationFeature.java | 12 +-
.../service/AnnotationInterceptorTest.java | 114 +-
.../apache/cxf/jaxws/service/ArrayService.java | 2 +-
.../org/apache/cxf/jaxws/service/Entity.java | 4 +-
.../apache/cxf/jaxws/service/FooService.java | 2 +-
.../cxf/jaxws/service/GenericsService.java | 4 +-
.../cxf/jaxws/service/GenericsService2.java | 14 +-
.../cxf/jaxws/service/GreeterImplDoc.java | 10 +-
.../org/apache/cxf/jaxws/service/Hello.java | 12 +-
.../org/apache/cxf/jaxws/service/Hello2.java | 2 +-
.../org/apache/cxf/jaxws/service/Hello3.java | 4 +-
.../cxf/jaxws/service/HelloExcludeImpl.java | 2 +-
.../jaxws/service/HelloExcludeOnInterface.java | 6 +-
.../apache/cxf/jaxws/service/QueryResult.java | 6 +-
.../apache/cxf/jaxws/service/QuerySummary.java | 2 +-
.../org/apache/cxf/jaxws/service/SayHiImpl.java | 6 +-
.../cxf/jaxws/service/Test2Interceptor.java | 4 +-
.../cxf/jaxws/service/TestInterceptor.java | 4 +-
.../apache/cxf/jaxws/spi/ProviderImplTest.java | 34 +-
.../cxf/jaxws/spring/ClientHolderBean.java | 10 +-
.../jaxws/spring/PostConstructCalledCount.java | 8 +-
.../cxf/jaxws/spring/SpringBeansTest.java | 34 +-
.../support/ContextPropertiesMappingTest.java | 38 +-
.../jaxws/support/JaxWsImplementorInfoTest.java | 6 +-
.../support/JaxWsServiceConfigurationTest.java | 26 +-
.../support/JaxWsServiceFactoryBeanTest.java | 112 +-
.../cxf/jaxws/ws/PolicyAnnotationTest.java | 52 +-
.../apache/cxf/jaxws/ws/PolicyFeatureTest.java | 66 +-
.../http_jaxws_spi/HttpHandlerImplTest.java | 12 +-
.../JAXWSHttpSpiDestinationTest.java | 26 +-
.../JAXWSHttpSpiTransportFactoryTest.java | 18 +-
.../cxf/js/rhino/AbstractDOMProvider.java | 6 +-
.../apache/cxf/js/rhino/DOMMessageProvider.java | 2 +-
.../cxf/js/rhino/JsServiceFactoryBean.java | 18 +-
.../apache/cxf/js/rhino/ProviderFactory.java | 2 +-
.../org/apache/cxf/js/rhino/ServerAppTest.java | 6 +-
.../endpoint/dynamic/DynamicClientFactory.java | 134 +--
.../endpoint/dynamic/TypeClassInitializer.java | 50 +-
.../cxf/frontend/AbstractServiceFactory.java | 10 +-
.../AbstractWSDLBasedEndpointFactory.java | 72 +-
.../apache/cxf/frontend/ClientFactoryBean.java | 8 +-
.../org/apache/cxf/frontend/ClientProxy.java | 6 +-
.../cxf/frontend/ClientProxyFactoryBean.java | 22 +-
.../apache/cxf/frontend/FaultInfoException.java | 2 +-
.../apache/cxf/frontend/ServerFactoryBean.java | 44 +-
.../apache/cxf/frontend/WSDLGetInterceptor.java | 22 +-
.../cxf/frontend/WSDLGetOutInterceptor.java | 6 +-
.../org/apache/cxf/frontend/WSDLGetUtils.java | 4 +-
.../cxf/frontend/blueprint/Activator.java | 4 +-
.../ClientProxyFactoryBeanDefinitionParser.java | 8 +-
.../ServerFactoryBeanDefinitionParser.java | 22 +-
.../blueprint/SimpleBPNamespaceHandler.java | 8 +-
.../ClientProxyFactoryBeanDefinitionParser.java | 12 +-
.../cxf/frontend/spring/NamespaceHandler.java | 4 +-
.../ServerFactoryBeanDefinitionParser.java | 26 +-
.../apache/cxf/simple/SimpleServiceBuilder.java | 2 +-
.../blueprint/SimpleBPNamespaceHandlerTest.java | 4 +-
.../frontend/soap/SoapBindingSelectionTest.java | 34 +-
.../cxf/frontend/spring/ClientServerTest.java | 20 +-
.../cxf/frontend/spring/SpringBeansTest.java | 8 +-
.../factory/AbstractSimpleFrontendTest.java | 10 +-
.../service/factory/ClientFactoryBeanTest.java | 24 +-
.../cxf/service/factory/HelloService.java | 2 +-
.../cxf/service/factory/HelloServiceImpl.java | 2 +-
.../factory/HelloServiceInterceptor.java | 6 +-
.../factory/HelloServiceProxyFactory.java | 8 +-
.../factory/ReflectionServiceFactoryTest.java | 78 +-
.../cxf/service/factory/RountripTest.java | 12 +-
.../cxf/service/factory/ServerFactoryTest.java | 12 +-
.../cxf/service/stax/StaxDatabindingTest.java | 22 +-
.../apache/cxf/javascript/BasicNameManager.java | 24 +-
.../javascript/JavascriptGetInterceptor.java | 14 +-
.../javascript/JavascriptOptionsFeature.java | 2 +-
.../apache/cxf/javascript/JavascriptPrefix.java | 6 +-
.../javascript/JavascriptServerListener.java | 2 +-
.../apache/cxf/javascript/JavascriptUtils.java | 78 +-
.../javascript/NamespacePrefixAccumulator.java | 16 +-
.../cxf/javascript/UnsupportedConstruct.java | 8 +-
.../service/ServiceJavascriptBuilder.java | 6 +-
.../org/apache/cxf/javascript/AegisTest.java | 34 +-
.../java/org/apache/cxf/javascript/AnyTest.java | 34 +-
.../cxf/javascript/BasicNameManagerTest.java | 2 +-
.../cxf/javascript/DocLitBareClientTest.java | 70 +-
.../cxf/javascript/DocLitWrappedClientTest.java | 80 +-
.../apache/cxf/javascript/GenericAegisTest.java | 2 +-
.../cxf/javascript/GreeterClientTest.java | 34 +-
.../cxf/javascript/JavascriptRhinoTest.java | 8 +-
.../cxf/javascript/JavascriptTestUtilities.java | 16 +-
.../cxf/javascript/JsHttpRequestTest.java | 32 +-
.../apache/cxf/javascript/JsNamedNodeMap.java | 22 +-
.../apache/cxf/javascript/JsXMLHttpRequest.java | 68 +-
.../org/apache/cxf/javascript/MtoMTest.java | 22 +-
.../apache/cxf/javascript/QueryHandlerTest.java | 18 +-
.../apache/cxf/javascript/RPCClientTest.java | 48 +-
.../javascript/fortest/AegisServiceImpl.java | 10 +-
.../apache/cxf/javascript/fortest/AnyImpl.java | 22 +-
.../javascript/fortest/AttributeTestBean.java | 4 +-
.../fortest/AttributeTestService.java | 2 +-
.../fortest/AttributeTestServiceImpl.java | 6 +-
.../BasicTypeFunctionReturnStringWrapper.java | 2 +-
.../javascript/fortest/BeanRequestWrapper.java | 4 +-
.../javascript/fortest/GenericGenericClass.java | 4 +-
.../javascript/fortest/InheritanceTestBase.java | 2 +-
.../fortest/InheritanceTestDerived.java | 2 +-
.../org/apache/cxf/javascript/fortest/MtoM.java | 2 +-
.../apache/cxf/javascript/fortest/MtoMImpl.java | 10 +-
.../fortest/MtoMParameterBeanNoDataHandler.java | 6 +-
.../MtoMParameterBeanWithDataHandler.java | 6 +-
.../javascript/fortest/SimpleDocLitBare.java | 22 +-
.../fortest/SimpleDocLitBareImpl.java | 20 +-
.../javascript/fortest/SimpleDocLitWrapped.java | 48 +-
.../fortest/SimpleDocLitWrappedImpl.java | 12 +-
.../cxf/javascript/fortest/SimpleRPC.java | 2 +-
.../cxf/javascript/fortest/SimpleRPCImpl.java | 6 +-
.../fortest/SpecificGenericClass.java | 4 +-
.../cxf/javascript/fortest/StringWrapper.java | 2 +-
.../cxf/javascript/fortest/TestBean1.java | 22 +-
.../cxf/javascript/fortest/TestBean2.java | 12 +-
.../cxf/javascript/fortest/TestBean3.java | 20 +-
.../fortest/aegis/BeanWithAnyTypeArray.java | 2 +-
.../cxf/javascript/fortest/aegis/Mammal.java | 4 +-
.../cxf/javascript/fortest/aegis/Vegetable.java | 8 +-
.../cxf/javascript/fortest/package-info.java | 2 +-
.../cxf/javascript/hwdemo/GreeterImpl.java | 12 +-
.../cxf/javascript/types/AttributeTest.java | 4 +-
.../cxf/javascript/types/SerializationTest.java | 2 +-
.../apache/cxf/management/counters/Counter.java | 12 +-
.../management/counters/CounterRepository.java | 38 +-
.../counters/MessageHandlingTimeRecorder.java | 24 +-
.../counters/ResponseTimeCounter.java | 50 +-
.../counters/ResponseTimeCounterMBean.java | 8 +-
.../AbstractMessageResponseTimeInterceptor.java | 16 +-
.../interceptor/PersistInInterceptor.java | 2 +-
.../interceptor/ResponseTimeFeature.java | 8 +-
.../ResponseTimeMessageInInterceptor.java | 14 +-
.../ResponseTimeMessageInvokerInterceptor.java | 6 +-
.../ResponseTimeMessageOutInterceptor.java | 8 +-
.../jmx/InstrumentationManagerImpl.java | 132 +--
.../jmx/MBServerConnectorFactory.java | 66 +-
.../jmx/export/runtime/ModelMBeanAssembler.java | 138 +--
.../export/runtime/ModelMBeanInfoSupporter.java | 154 +--
.../cxf/management/utils/ManagementConsole.java | 96 +-
.../cxf/tracing/AbstractTracingProvider.java | 18 +-
.../org/apache/cxf/tracing/TracerContext.java | 16 +-
.../org/apache/cxf/tracing/TracerHeaders.java | 2 +-
.../management/InstrumentationManagerTest.java | 32 +-
.../counters/CounterRepositoryTest.java | 48 +-
.../AbstractMessageResponseTestBase.java | 44 +-
.../ResponseTimeMessageInInterceptorTest.java | 48 +-
...sponseTimeMessageInvokerInterceptorTest.java | 12 +-
.../ResponseTimeMessageOutInterceptorTest.java | 34 +-
.../cxf/management/jmx/BusRegistrationTest.java | 22 +-
.../apache/cxf/management/jmx/HelloWorld.java | 4 +-
.../jmx/JMXManagedComponentManagerTest.java | 74 +-
.../management/jmx/MBServerConnectorTest.java | 10 +-
.../export/AnnotationTestInstrumentation.java | 8 +-
.../jmx/export/ModelMBeanAssemblerTest.java | 64 +-
.../management/utils/ManagementConsoleTest.java | 16 +-
.../apache/cxf/jaxrs/client/AbstractClient.java | 368 +++----
.../apache/cxf/jaxrs/client/AsyncClient.java | 2 +-
.../cxf/jaxrs/client/AsyncInvokerImpl.java | 22 +-
.../org/apache/cxf/jaxrs/client/Client.java | 82 +-
.../cxf/jaxrs/client/ClientConfiguration.java | 64 +-
.../cxf/jaxrs/client/ClientMessageObserver.java | 8 +-
.../cxf/jaxrs/client/ClientProviderFactory.java | 42 +-
.../cxf/jaxrs/client/ClientProxyImpl.java | 346 +++---
.../apache/cxf/jaxrs/client/ClientState.java | 32 +-
.../client/CompletionStageRxInvokerImpl.java | 4 +-
.../cxf/jaxrs/client/FrontendClientAdapter.java | 22 +-
.../jaxrs/client/InvocationHandlerAware.java | 4 +-
.../cxf/jaxrs/client/JAXRSClientFactory.java | 102 +-
.../jaxrs/client/JAXRSClientFactoryBean.java | 118 +-
.../cxf/jaxrs/client/JaxrsClientCallback.java | 30 +-
.../jaxrs/client/JaxrsClientStageCallback.java | 14 +-
.../cxf/jaxrs/client/LocalClientState.java | 42 +-
.../jaxrs/client/ResponseExceptionMapper.java | 4 +-
.../cxf/jaxrs/client/SyncInvokerImpl.java | 6 +-
.../jaxrs/client/ThreadLocalClientState.java | 50 +-
.../jaxrs/client/UrlEncodingParamConverter.java | 10 +-
.../org/apache/cxf/jaxrs/client/WebClient.java | 462 ++++----
.../blueprint/JAXRSBPNamespaceHandler.java | 6 +-
.../JAXRSClientFactoryBeanDefinitionParser.java | 16 +-
.../cxf/jaxrs/client/cache/BytesEntity.java | 6 +-
.../CacheControlClientReaderInterceptor.java | 36 +-
.../jaxrs/client/cache/CacheControlFeature.java | 2 +-
.../jaxrs/client/spec/ClientBuilderImpl.java | 12 +-
.../client/spec/ClientConfigurableImpl.java | 10 +-
.../cxf/jaxrs/client/spec/ClientImpl.java | 82 +-
.../client/spec/ClientRequestContextImpl.java | 26 +-
.../spec/ClientRequestFilterInterceptor.java | 18 +-
.../client/spec/ClientResponseContextImpl.java | 12 +-
.../spec/ClientResponseFilterInterceptor.java | 20 +-
.../client/spec/InvocationBuilderImpl.java | 32 +-
.../cxf/jaxrs/client/spec/TLSConfiguration.java | 4 +-
.../AbstractJaxRsClientConfiguration.java | 22 +-
.../JAXRSClientFactoryBeanDefinitionParser.java | 40 +-
.../spring/JaxRsProxyClientConfiguration.java | 12 +-
.../spring/JaxRsWebClientConfiguration.java | 12 +-
.../jaxrs/client/spring/NamespaceHandler.java | 2 +-
...JAXRSClientBeanValidationOutInterceptor.java | 2 +-
.../client/JAXRSClientFactoryBeanTest.java | 62 +-
.../apache/cxf/jaxrs/client/WebClientTest.java | 104 +-
.../blueprint/JAXRSBPNamespaceHandlerTest.java | 4 +-
.../cxf/jaxrs/client/cache/ClientCacheTest.java | 20 +-
.../cxf/jaxrs/client/cache/ClientTest.java | 4 +-
.../jaxrs/client/logging/RESTLoggingTest.java | 26 +-
.../jaxrs/client/logging/TestEventSender.java | 2 +-
.../client/logging/TestServiceRestBinary.java | 2 +-
.../spring/JAXRSClientFactoryBeanTest.java | 8 +-
.../org/apache/cxf/jaxrs/resources/Book.java | 26 +-
.../cxf/jaxrs/resources/BookInterface.java | 4 +-
.../apache/cxf/jaxrs/resources/BookStore.java | 6 +-
.../jaxrs/resources/BookStoreNoAnnotations.java | 6 +-
.../resources/BookStoreSubresourcesOnly.java | 14 +-
.../cxf/jaxrs/resources/BookSuperClass.java | 2 +-
.../org/apache/cxf/jaxrs/resources/Chapter.java | 8 +-
.../jaxrs/swagger/AbstractSwaggerFeature.java | 16 +-
.../jaxrs/swagger/ApplicationBeanConfig.java | 2 +-
.../jaxrs/swagger/DelegatingServletConfig.java | 10 +-
.../jaxrs/swagger/OsgiSwaggerUiResolver.java | 8 +-
.../cxf/jaxrs/swagger/Swagger2Feature.java | 88 +-
.../cxf/jaxrs/swagger/Swagger2Serializers.java | 2 +-
.../cxf/jaxrs/swagger/SwaggerFeature.java | 18 +-
.../cxf/jaxrs/swagger/SwaggerUiResolver.java | 12 +-
.../apache/cxf/jaxrs/swagger/SwaggerUtils.java | 54 +-
.../jaxrs/swagger/SyntheticServletConfig.java | 10 +-
.../cxf/jaxrs/swagger/SwaggerUtilsTest.java | 10 +-
.../cxf/jaxrs/model/wadl/Description.java | 10 +-
.../cxf/jaxrs/model/wadl/Descriptions.java | 2 +-
.../apache/cxf/jaxrs/model/wadl/DocTarget.java | 16 +-
.../cxf/jaxrs/model/wadl/WadlGenerator.java | 248 ++---
.../cxf/jaxrs/model/wadl/AbstractStore.java | 4 +-
.../cxf/jaxrs/model/wadl/BookChapters.java | 2 +-
.../apache/cxf/jaxrs/model/wadl/BookStore.java | 84 +-
.../model/wadl/BookStoreWithSingleSlash.java | 8 +-
.../apache/cxf/jaxrs/model/wadl/Chapter.java | 6 +-
.../cxf/jaxrs/model/wadl/FormInterface.java | 10 +-
.../org/apache/cxf/jaxrs/model/wadl/Orders.java | 2 +-
.../model/wadl/ServerProviderFactoryTest.java | 24 +-
.../jaxrs/model/wadl/WadlGeneratorJsonTest.java | 20 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 368 +++----
.../apache/cxf/jaxrs/model/wadl/jaxb/Book.java | 18 +-
.../cxf/jaxrs/model/wadl/jaxb/Chapter.java | 6 +-
.../jaxrs/model/wadl/jaxb/ObjectFactory.java | 6 +-
.../model/wadl/jaxb/packageinfo/Book2.java | 8 +-
.../cxf/jaxrs/model/wadl/petstore/PetStore.java | 20 +-
.../cxf/jaxrs/json/basic/JsonMapObject.java | 14 +-
.../json/basic/JsonMapObjectReaderWriter.java | 46 +-
.../basic/JsonMapObjectReaderWriterTest.java | 2 +-
.../provider/aegis/AbstractAegisProvider.java | 32 +-
.../provider/aegis/AegisElementProvider.java | 20 +-
.../atom/AbstractAtomElementBuilder.java | 40 +-
.../provider/atom/AbstractAtomProvider.java | 16 +-
.../provider/atom/AbstractEntryBuilder.java | 12 +-
.../provider/atom/AbstractFeedBuilder.java | 14 +-
.../jaxrs/provider/atom/AtomElementReader.java | 10 +-
.../jaxrs/provider/atom/AtomElementWriter.java | 8 +-
.../jaxrs/provider/atom/AtomEntryProvider.java | 6 +-
.../jaxrs/provider/atom/AtomFeedProvider.java | 2 +-
.../jaxrs/provider/atom/AtomPojoProvider.java | 252 ++---
.../cxf/jaxrs/provider/dom4j/DOM4JProvider.java | 8 +-
.../cxf/jaxrs/provider/json/JSONProvider.java | 228 ++--
.../provider/json/JsonMapObjectProvider.java | 4 +-
.../provider/json/SimpleTypeJsonProvider.java | 14 +-
.../jaxrs/provider/json/utils/JSONUtils.java | 108 +-
.../utils/PrefixCollectingXMLStreamWriter.java | 10 +-
.../jsonp/AbstractJsonpOutInterceptor.java | 6 +-
.../provider/jsonp/JsonpInInterceptor.java | 8 +-
.../jsonp/JsonpJaxrsWriterInterceptor.java | 14 +-
.../jsonp/JsonpPostStreamInterceptor.java | 4 +-
.../jsonp/JsonpPreStreamInterceptor.java | 8 +-
.../provider/jsrjsonp/JsrJsonpProvider.java | 24 +-
.../jaxrs/provider/ProviderFactoryAllTest.java | 50 +-
.../aegis/AegisElementProviderTest.java | 16 +-
.../provider/atom/AtomEntryProviderTest.java | 28 +-
.../provider/atom/AtomFeedProviderTest.java | 20 +-
.../provider/atom/AtomPojoProviderTest.java | 134 +--
.../jaxrs/provider/dom4j/DOM4JProviderTest.java | 52 +-
.../jaxrs/provider/json/JSONProviderTest.java | 722 ++++++-------
.../provider/jsonp/JsonpInterceptorTest.java | 12 +-
.../provider/jsrjsonp/JsrJsonpProviderTest.java | 78 +-
.../cxf/jaxrs/resources/AegisTestBean.java | 2 +-
.../org/apache/cxf/jaxrs/resources/Book.java | 28 +-
.../jaxrs/resources/CollectionsResource.java | 14 +-
.../apache/cxf/jaxrs/resources/ManyTags.java | 10 +-
.../apache/cxf/jaxrs/resources/SuperBook.java | 6 +-
.../org/apache/cxf/jaxrs/resources/TagVO.java | 16 +-
.../org/apache/cxf/jaxrs/resources/TagVO2.java | 6 +-
.../org/apache/cxf/jaxrs/resources/Tags.java | 10 +-
.../apache/cxf/jaxrs/resources/jaxb/Book2.java | 8 +-
.../resources/jaxb/Book2NoRootElement.java | 8 +-
.../client/JaxrsClientObservableCallback.java | 10 +-
.../rx/client/ObservableRxInvokerImpl.java | 8 +-
.../rx/client/ObservableRxInvokerProvider.java | 2 +-
.../cxf/jaxrs/rx/provider/ObservableReader.java | 6 +-
.../cxf/jaxrs/rx/provider/ObservableWriter.java | 16 +-
.../rx/server/AbstractAsyncSubscriber.java | 10 +-
.../rx/server/JsonStreamingAsyncSubscriber.java | 2 +-
.../jaxrs/rx/server/ListAsyncSubscriber.java | 4 +-
.../rx/server/StreamingAsyncSubscriber.java | 10 +-
.../jaxrs/rx/provider/ObservableWriterTest.java | 4 +-
.../ext/search/AbstractComplexCondition.java | 12 +-
.../search/AbstractSearchConditionParser.java | 706 ++++++------
.../jaxrs/ext/search/AndSearchCondition.java | 12 +-
.../cxf/jaxrs/ext/search/Beanspector.java | 26 +-
.../search/DefaultParamConverterProvider.java | 44 +-
.../cxf/jaxrs/ext/search/InterfaceProxy.java | 2 +-
.../cxf/jaxrs/ext/search/OrSearchCondition.java | 10 +-
.../jaxrs/ext/search/ParamConverterUtils.java | 36 +-
.../ext/search/PrimitiveSearchCondition.java | 38 +-
.../jaxrs/ext/search/PrimitiveStatement.java | 12 +-
.../ext/search/PropertyNotFoundException.java | 2 +-
.../cxf/jaxrs/ext/search/QueryContext.java | 48 +-
.../jaxrs/ext/search/QueryContextProvider.java | 18 +-
.../apache/cxf/jaxrs/ext/search/SearchBean.java | 12 +-
.../cxf/jaxrs/ext/search/SearchCondition.java | 36 +-
.../ext/search/SearchConditionVisitor.java | 6 +-
.../cxf/jaxrs/ext/search/SearchContext.java | 76 +-
.../cxf/jaxrs/ext/search/SearchContextImpl.java | 98 +-
.../cxf/jaxrs/ext/search/SearchUtils.java | 78 +-
.../jaxrs/ext/search/SimpleSearchCondition.java | 84 +-
.../ext/search/client/CompleteCondition.java | 8 +-
.../client/FiqlSearchConditionBuilder.java | 88 +-
.../ext/search/client/PartialCondition.java | 4 +-
.../cxf/jaxrs/ext/search/client/Property.java | 40 +-
.../search/client/SearchConditionBuilder.java | 8 +-
.../collections/CollectionCheckCondition.java | 12 +-
.../search/collections/CollectionCheckInfo.java | 2 +-
.../collections/CollectionCheckStatement.java | 2 +-
.../cxf/jaxrs/ext/search/fiql/FiqlParser.java | 80 +-
.../ext/search/hbase/HBaseQueryVisitor.java | 22 +-
.../jpa/AbstractJPATypedQueryVisitor.java | 106 +-
.../ext/search/jpa/JPACriteriaQueryVisitor.java | 50 +-
.../ext/search/jpa/JPALanguageVisitor.java | 16 +-
.../ext/search/jpa/JPATypedQueryVisitor.java | 24 +-
.../jaxrs/ext/search/ldap/LdapQueryVisitor.java | 20 +-
.../ext/search/lucene/LuceneQueryVisitor.java | 156 +--
.../cxf/jaxrs/ext/search/odata/ODataParser.java | 112 +-
.../jaxrs/ext/search/sql/SQLPrinterVisitor.java | 38 +-
.../ext/search/tika/LuceneDocumentMetadata.java | 20 +-
.../ext/search/tika/TikaContentExtractor.java | 122 +--
.../search/tika/TikaLuceneContentExtractor.java | 126 +--
.../visitor/AbstractSearchConditionVisitor.java | 50 +-
.../AbstractUntypedSearchConditionVisitor.java | 14 +-
.../ext/search/visitor/LocalVisitorState.java | 6 +-
.../search/visitor/ThreadLocalVisitorState.java | 4 +-
.../cxf/jaxrs/ext/search/BeanspectorTest.java | 12 +-
.../org/apache/cxf/jaxrs/ext/search/Book.java | 26 +-
.../SearchContextImplCustomParserTest.java | 10 +-
.../jaxrs/ext/search/SearchContextImplTest.java | 90 +-
.../cxf/jaxrs/ext/search/SearchUtilsTest.java | 10 +-
.../ext/search/SimpleSearchConditionTest.java | 4 +-
.../client/FiqlSearchConditionBuilderTest.java | 78 +-
.../ext/search/fiql/FiqlCollectionsTest.java | 40 +-
.../jaxrs/ext/search/fiql/FiqlParserTest.java | 38 +-
.../ext/search/hbase/HBaseVisitorTest.java | 10 +-
.../jpa/AbstractJPATypedQueryVisitorTest.java | 114 +-
.../apache/cxf/jaxrs/ext/search/jpa/Book.java | 2 +-
.../cxf/jaxrs/ext/search/jpa/BookReview.java | 4 +-
.../apache/cxf/jaxrs/ext/search/jpa/Book_.java | 2 +-
.../ext/search/jpa/JPALanguageVisitorTest.java | 4 +-
.../jpa/JPATypedQueryVisitorFiqlTest.java | 734 ++++++-------
.../jpa/JPATypedQueryVisitorODataTest.java | 658 ++++++------
.../cxf/jaxrs/ext/search/jpa/Library.java | 6 +-
.../apache/cxf/jaxrs/ext/search/jpa/Name.java | 8 +-
.../cxf/jaxrs/ext/search/jpa/OwnerAddress.java | 6 +-
.../cxf/jaxrs/ext/search/jpa/OwnerInfo.java | 6 +-
.../ext/search/ldap/LdapQueryVisitorTest.java | 24 +-
.../lucene/AbstractLuceneQueryVisitorTest.java | 404 +++----
.../LuceneQueryVisitorAnalyzerFiqlTest.java | 28 +-
.../lucene/LuceneQueryVisitorFiqlTest.java | 110 +-
.../lucene/LuceneQueryVisitorODataTest.java | 392 +++----
.../jaxrs/ext/search/odata/ODataParserTest.java | 44 +-
.../ext/search/sql/SQLPrinterVisitorTest.java | 34 +-
.../search/tika/TikaContentExtractorTest.java | 22 +-
.../tika/TikaLuceneContentExtractorTest.java | 66 +-
.../sci/JaxrsServletContainerInitializer.java | 44 +-
.../cors/CrossOriginResourceSharing.java | 24 +-
.../cors/CrossOriginResourceSharingFilter.java | 156 +--
.../cxf/rs/security/cors/LocalPreflight.java | 4 +-
.../jose/jaxrs/AbstractJweDecryptingFilter.java | 6 +-
.../jaxrs/AbstractJweJsonDecryptingFilter.java | 12 +-
.../jaxrs/AbstractJweJsonWriterProvider.java | 18 +-
.../jaxrs/AbstractJwsJsonReaderProvider.java | 20 +-
.../jaxrs/AbstractJwsJsonWriterProvider.java | 18 +-
.../jose/jaxrs/AbstractJwsReaderProvider.java | 10 +-
.../jose/jaxrs/AbstractJwsWriterProvider.java | 16 +-
.../jaxrs/AbstractJwtAuthenticationFilter.java | 24 +-
.../jose/jaxrs/JsonWebKeysProvider.java | 6 +-
.../jose/jaxrs/JweJsonWriterInterceptor.java | 26 +-
.../jose/jaxrs/JweWriterInterceptor.java | 30 +-
.../jose/jaxrs/JwsContainerRequestFilter.java | 10 +-
.../jose/jaxrs/JwsJsonClientResponseFilter.java | 2 +-
.../jaxrs/JwsJsonContainerRequestFilter.java | 4 +-
.../jose/jaxrs/JwsJsonWriterInterceptor.java | 22 +-
.../jose/jaxrs/JwsWriterInterceptor.java | 16 +-
.../jaxrs/JwtAuthenticationClientFilter.java | 24 +-
.../jose/jaxrs/JwtAuthenticationFilter.java | 4 +-
.../jaxrs/JwtCookieAuthenticationFilter.java | 4 +-
.../jose/jaxrs/JwtTokenSecurityContext.java | 4 +-
.../cxf/rs/security/jose/jaxrs/Priorities.java | 8 +-
.../jose/common/AbstractJoseConsumer.java | 14 +-
.../jose/common/AbstractJoseProducer.java | 10 +-
.../rs/security/jose/common/JoseConstants.java | 120 +--
.../rs/security/jose/common/JoseHeaders.java | 62 +-
.../cxf/rs/security/jose/common/JoseType.java | 4 +-
.../cxf/rs/security/jose/common/JoseUtils.java | 38 +-
.../jose/common/KeyManagementUtils.java | 92 +-
.../jose/common/PrivateKeyPasswordProvider.java | 2 +-
.../rs/security/jose/jwa/AlgorithmUtils.java | 50 +-
.../rs/security/jose/jwa/ContentAlgorithm.java | 16 +-
.../cxf/rs/security/jose/jwa/KeyAlgorithm.java | 14 +-
.../security/jose/jwa/SignatureAlgorithm.java | 26 +-
.../jwe/AbstractContentEncryptionAlgorithm.java | 12 +-
...stractContentEncryptionCipherProperties.java | 4 +-
.../jose/jwe/AbstractJweDecryption.java | 16 +-
.../jose/jwe/AbstractJweEncryption.java | 70 +-
.../jwe/AbstractWrapKeyEncryptionAlgorithm.java | 10 +-
.../jose/jwe/AesCbcHmacJweDecryption.java | 10 +-
.../jose/jwe/AesCbcHmacJweEncryption.java | 42 +-
.../jwe/AesGcmContentEncryptionAlgorithm.java | 20 +-
.../jwe/AesGcmWrapKeyDecryptionAlgorithm.java | 12 +-
.../jwe/AesGcmWrapKeyEncryptionAlgorithm.java | 8 +-
.../jose/jwe/AesWrapKeyDecryptionAlgorithm.java | 16 +-
.../jose/jwe/AesWrapKeyEncryptionAlgorithm.java | 8 +-
.../jose/jwe/DirectKeyDecryptionAlgorithm.java | 6 +-
.../jose/jwe/DirectKeyJweDecryption.java | 4 +-
.../jwe/EcdhAesWrapKeyDecryptionAlgorithm.java | 14 +-
.../jwe/EcdhAesWrapKeyEncryptionAlgorithm.java | 18 +-
.../jose/jwe/EcdhDirectKeyJweDecryption.java | 8 +-
.../jose/jwe/EcdhDirectKeyJweEncryption.java | 18 +-
.../security/jose/jwe/JweCompactConsumer.java | 26 +-
.../security/jose/jwe/JweCompactProducer.java | 46 +-
.../cxf/rs/security/jose/jwe/JweDecryption.java | 4 +-
.../security/jose/jwe/JweDecryptionInput.java | 2 +-
.../cxf/rs/security/jose/jwe/JweEncryption.java | 4 +-
.../security/jose/jwe/JweEncryptionInput.java | 4 +-
.../security/jose/jwe/JweEncryptionOutput.java | 12 +-
.../jose/jwe/JweEncryptionProvider.java | 2 +-
.../cxf/rs/security/jose/jwe/JweHeaders.java | 22 +-
.../rs/security/jose/jwe/JweJsonConsumer.java | 30 +-
.../rs/security/jose/jwe/JweJsonProducer.java | 44 +-
.../jose/jwe/JweJwtCompactConsumer.java | 8 +-
.../jose/jwe/JweJwtCompactProducer.java | 2 +-
.../rs/security/jose/jwe/JweOutputStream.java | 22 +-
.../cxf/rs/security/jose/jwe/JweUtils.java | 210 ++--
.../PbesHmacAesWrapKeyDecryptionAlgorithm.java | 20 +-
.../PbesHmacAesWrapKeyEncryptionAlgorithm.java | 44 +-
.../jose/jwe/RSAKeyDecryptionAlgorithm.java | 6 +-
.../jose/jwe/RSAKeyEncryptionAlgorithm.java | 2 +-
.../jose/jwe/WrappedKeyDecryptionAlgorithm.java | 18 +-
.../cxf/rs/security/jose/jwk/JsonWebKey.java | 50 +-
.../cxf/rs/security/jose/jwk/JsonWebKeys.java | 12 +-
.../cxf/rs/security/jose/jwk/JwkUtils.java | 72 +-
.../cxf/rs/security/jose/jwk/KeyOperation.java | 4 +-
.../cxf/rs/security/jose/jwk/KeyType.java | 6 +-
.../cxf/rs/security/jose/jwk/PublicKeyUse.java | 8 +-
.../jose/jws/AbstractJwsSignatureProvider.java | 10 +-
.../jose/jws/EcDsaJwsSignatureProvider.java | 42 +-
.../jose/jws/EcDsaJwsSignatureVerifier.java | 6 +-
.../jose/jws/HmacJwsSignatureProvider.java | 8 +-
.../jose/jws/HmacJwsSignatureVerifier.java | 14 +-
.../security/jose/jws/JwsCompactConsumer.java | 2 +-
.../security/jose/jws/JwsCompactProducer.java | 36 +-
.../cxf/rs/security/jose/jws/JwsHeaders.java | 8 +-
.../rs/security/jose/jws/JwsJsonConsumer.java | 48 +-
.../security/jose/jws/JwsJsonOutputStream.java | 10 +-
.../rs/security/jose/jws/JwsJsonProducer.java | 34 +-
.../jose/jws/JwsJsonSignatureEntry.java | 8 +-
.../jose/jws/JwsJwtCompactConsumer.java | 2 +-
.../jose/jws/JwsJwtCompactProducer.java | 8 +-
.../rs/security/jose/jws/JwsOutputStream.java | 4 +-
.../cxf/rs/security/jose/jws/JwsUtils.java | 128 +--
.../jose/jws/NoneJwsSignatureProvider.java | 4 +-
.../jose/jws/NoneJwsSignatureVerifier.java | 2 +-
.../jws/PrivateKeyJwsSignatureProvider.java | 14 +-
.../jose/jws/PublicKeyJwsSignatureVerifier.java | 12 +-
.../rs/security/jose/jwt/JoseJwtConsumer.java | 32 +-
.../rs/security/jose/jwt/JoseJwtProducer.java | 12 +-
.../cxf/rs/security/jose/jwt/JwtClaims.java | 42 +-
.../cxf/rs/security/jose/jwt/JwtConstants.java | 10 +-
.../cxf/rs/security/jose/jwt/JwtToken.java | 8 +-
.../cxf/rs/security/jose/jwt/JwtUtils.java | 32 +-
.../jose/cookbook/JwsJoseCookBookTest.java | 12 +-
.../jose/jwe/JweCompactReaderWriterTest.java | 128 +--
.../security/jose/jwe/JweJsonConsumerTest.java | 106 +-
.../security/jose/jwe/JweJsonProducerTest.java | 108 +-
.../jose/jwe/JwePbeHmacAesWrapTest.java | 20 +-
.../rs/security/jose/jwk/JsonWebKeyTest.java | 22 +-
.../cxf/rs/security/jose/jwk/JwkUtilsTest.java | 22 +-
.../security/jose/jws/JwsCompactHeaderTest.java | 42 +-
.../jose/jws/JwsCompactReaderWriterTest.java | 92 +-
.../security/jose/jws/JwsJsonConsumerTest.java | 22 +-
.../security/jose/jws/JwsJsonProducerTest.java | 22 +-
.../cxf/rs/security/jose/jws/JwsUtilsTest.java | 10 +-
.../cxf/rs/security/jose/jwt/JwtUtilsTest.java | 36 +-
.../security/oauth/client/OAuthClientUtils.java | 74 +-
.../cxf/rs/security/oauth/data/AccessToken.java | 2 +-
.../oauth/data/AccessTokenRegistration.java | 4 +-
.../security/oauth/data/AuthorizationInput.java | 4 +-
.../cxf/rs/security/oauth/data/Client.java | 18 +-
.../oauth/data/OAuthAuthorizationData.java | 4 +-
.../rs/security/oauth/data/OAuthContext.java | 8 +-
.../rs/security/oauth/data/OAuthPermission.java | 6 +-
.../cxf/rs/security/oauth/data/Permission.java | 10 +-
.../rs/security/oauth/data/RequestToken.java | 10 +-
.../oauth/data/RequestTokenRegistration.java | 10 +-
.../cxf/rs/security/oauth/data/Token.java | 8 +-
.../cxf/rs/security/oauth/data/UserSubject.java | 8 +-
.../oauth/filters/AbstractAuthFilter.java | 84 +-
.../rs/security/oauth/filters/OAuthInfo.java | 10 +-
.../oauth/filters/OAuthRequestFilter.java | 8 +-
.../oauth/filters/OAuthServletFilter.java | 12 +-
.../oauth/provider/DefaultOAuthValidator.java | 6 +-
.../oauth/provider/OAuthDataProvider.java | 18 +-
.../oauth/provider/OAuthServiceException.java | 4 +-
.../oauth/services/AbstractOAuthService.java | 14 +-
.../oauth/services/AccessTokenHandler.java | 16 +-
.../oauth/services/AccessTokenService.java | 8 +-
.../services/AuthorizationRequestHandler.java | 60 +-
.../services/AuthorizationRequestService.java | 20 +-
.../oauth/services/OAuthDefaultServices.java | 20 +-
.../oauth/services/OOBResponseProvider.java | 32 +-
.../oauth/services/RequestTokenHandler.java | 26 +-
.../oauth/services/RequestTokenService.java | 10 +-
.../rs/security/oauth/utils/OAuthConstants.java | 12 +-
.../cxf/rs/security/oauth/utils/OAuthUtils.java | 62 +-
.../rs/security/oauth/utils/OAuthUtilsTest.java | 2 +-
.../auth/saml/Saml2BearerAuthHandler.java | 38 +-
.../saml/Saml2BearerAuthOutInterceptor.java | 2 +-
.../grants/saml/AbstractSaml2BearerGrant.java | 8 +-
.../oauth2/grants/saml/Saml2BearerGrant.java | 8 +-
.../grants/saml/Saml2BearerGrantHandler.java | 66 +-
.../saml/SamlBearerClientCredentialsGrant.java | 4 +-
.../oauth2/grants/saml/SamlUserSubject.java | 2 +-
.../cxf/rs/security/oauth2/saml/Constants.java | 10 +-
.../oauth2/saml/SamlOAuthValidator.java | 52 +-
.../oauth2/client/AccessTokenClientFilter.java | 6 +-
.../oauth2/client/AccessTokenGrantWriter.java | 2 +-
.../oauth2/client/BearerAuthSupplier.java | 22 +-
.../oauth2/client/ClientCodeRequestFilter.java | 90 +-
.../oauth2/client/ClientCodeStateManager.java | 4 +-
.../oauth2/client/ClientTokenContextImpl.java | 4 +-
.../oauth2/client/CodeAuthSupplier.java | 4 +-
.../cxf/rs/security/oauth2/client/Consumer.java | 6 +-
.../oauth2/client/HttpRequestProperties.java | 16 +-
.../client/JoseClientCodeStateManager.java | 44 +-
.../client/MemoryClientCodeStateManager.java | 8 +-
.../client/MemoryClientTokenContextManager.java | 6 +-
.../oauth2/client/OAuthClientUtils.java | 144 +--
.../rs/security/oauth2/client/OAuthInvoker.java | 20 +-
.../oauth2/client/StaticClientTokenContext.java | 6 +-
.../common/AbstractAuthorizationResponse.java | 2 +-
.../rs/security/oauth2/common/AccessToken.java | 28 +-
.../oauth2/common/AccessTokenGrant.java | 8 +-
.../oauth2/common/AccessTokenRegistration.java | 32 +-
.../oauth2/common/AccessTokenValidation.java | 18 +-
.../cxf/rs/security/oauth2/common/Client.java | 10 +-
.../oauth2/common/ClientAccessToken.java | 12 +-
.../oauth2/common/OAuthAuthorizationData.java | 32 +-
.../rs/security/oauth2/common/OAuthContext.java | 18 +-
.../rs/security/oauth2/common/OAuthError.java | 34 +-
.../security/oauth2/common/OAuthPermission.java | 18 +-
.../oauth2/common/OAuthRedirectionState.java | 14 +-
.../oauth2/common/OOBAuthorizationResponse.java | 4 +-
.../oauth2/common/ServerAccessToken.java | 2 +-
.../oauth2/common/TokenIntrospection.java | 8 +-
.../filters/AccessTokenIntrospectionClient.java | 8 +-
.../filters/AccessTokenValidatorClient.java | 8 +-
.../oauth2/filters/ConfidentialClient.java | 2 +-
.../oauth2/filters/JwtAccessTokenValidator.java | 16 +-
.../oauth2/filters/OAuthRequestFilter.java | 76 +-
.../oauth2/filters/OAuthRequestInterceptor.java | 14 +-
.../oauth2/filters/OAuthScopesFilter.java | 16 +-
.../cxf/rs/security/oauth2/filters/Scopes.java | 4 +-
.../security/oauth2/grants/AbstractGrant.java | 16 +-
.../oauth2/grants/AbstractGrantHandler.java | 62 +-
.../clientcred/ClientCredentialsGrant.java | 12 +-
.../ClientCredentialsGrantHandler.java | 6 +-
.../AbstractAuthorizationCodeDataProvider.java | 10 +-
.../grants/code/AbstractCodeDataProvider.java | 16 +-
.../code/AuthorizationCodeDataProvider.java | 8 +-
.../grants/code/AuthorizationCodeGrant.java | 14 +-
.../code/AuthorizationCodeGrantHandler.java | 50 +-
.../code/AuthorizationCodeRegistration.java | 18 +-
.../grants/code/CodeVerifierTransformer.java | 2 +-
.../code/DefaultEHCacheCodeDataProvider.java | 32 +-
.../code/DefaultEncryptingCodeDataProvider.java | 20 +-
.../oauth2/grants/code/DigestCodeVerifier.java | 4 +-
.../grants/code/JCacheCodeDataProvider.java | 6 +-
.../grants/code/JwtRequestCodeFilter.java | 24 +-
.../oauth2/grants/code/JwtRequestCodeGrant.java | 16 +-
.../oauth2/grants/code/PlainCodeVerifier.java | 2 +-
.../grants/jwt/AbstractJwtBearerGrant.java | 8 +-
.../oauth2/grants/jwt/AbstractJwtHandler.java | 24 +-
.../security/oauth2/grants/jwt/Constants.java | 8 +-
.../oauth2/grants/jwt/JwtBearerAuthHandler.java | 34 +-
.../jwt/JwtBearerClientCredentialsGrant.java | 4 +-
.../oauth2/grants/jwt/JwtBearerGrant.java | 8 +-
.../grants/jwt/JwtBearerGrantHandler.java | 18 +-
.../owner/JAASResourceOwnerLoginHandler.java | 14 +-
.../oauth2/grants/owner/ResourceOwnerGrant.java | 12 +-
.../grants/owner/ResourceOwnerGrantHandler.java | 6 +-
.../grants/owner/ResourceOwnerLoginHandler.java | 2 +-
.../grants/refresh/RefreshTokenGrant.java | 6 +-
.../refresh/RefreshTokenGrantHandler.java | 6 +-
.../provider/AbstractOAuthDataProvider.java | 108 +-
.../oauth2/provider/AccessTokenValidator.java | 2 +-
.../provider/AuthorizationRequestFilter.java | 2 +-
.../oauth2/provider/ClientIdProvider.java | 4 +-
.../provider/ClientRegistrationProvider.java | 4 +-
.../provider/ClientSecretHashVerifier.java | 2 +-
.../oauth2/provider/ClientSecretVerifier.java | 4 +-
.../DefaultEHCacheOAuthDataProvider.java | 54 +-
.../DefaultEncryptingOAuthDataProvider.java | 8 +-
.../oauth2/provider/DefaultSubjectCreator.java | 4 +-
.../provider/JCacheOAuthDataProvider.java | 32 +-
.../provider/JoseSessionTokenProvider.java | 24 +-
.../oauth2/provider/OAuthDataProvider.java | 44 +-
.../oauth2/provider/OAuthJSONProvider.java | 28 +-
.../oauth2/provider/OAuthJoseJwtConsumer.java | 10 +-
.../oauth2/provider/OAuthJoseJwtProducer.java | 6 +-
.../provider/OAuthServerJoseJwtConsumer.java | 14 +-
.../provider/OAuthServerJoseJwtProducer.java | 20 +-
.../oauth2/provider/OAuthServiceException.java | 16 +-
.../SessionAuthenticityTokenProvider.java | 16 +-
.../oauth2/provider/SubjectCreator.java | 4 +-
.../services/AbstractAccessTokenValidator.java | 34 +-
.../services/AbstractImplicitGrantService.java | 66 +-
.../oauth2/services/AbstractOAuthService.java | 48 +-
.../oauth2/services/AbstractTokenService.java | 64 +-
.../oauth2/services/AccessTokenService.java | 50 +-
.../services/AccessTokenValidatorService.java | 2 +-
.../services/AuthorizationCodeGrantService.java | 50 +-
.../services/AuthorizationMetadataService.java | 22 +-
.../oauth2/services/AuthorizationService.java | 20 +-
.../oauth2/services/ClientRegistration.java | 16 +-
.../services/ClientRegistrationResponse.java | 8 +-
.../services/DirectAuthorizationService.java | 30 +-
.../services/DynamicRegistrationService.java | 78 +-
.../ImplicitConfidentialGrantService.java | 8 +-
.../oauth2/services/ImplicitGrantService.java | 10 +-
.../services/RedirectionBasedGrantService.java | 188 ++--
.../services/TokenIntrospectionService.java | 14 +-
.../oauth2/services/TokenRevocationService.java | 10 +-
.../oauth2/tokens/bearer/BearerAccessToken.java | 18 +-
.../hawk/AbstractHawkAccessTokenValidator.java | 30 +-
.../oauth2/tokens/hawk/HawkAccessToken.java | 34 +-
.../tokens/hawk/HawkAccessTokenValidator.java | 14 +-
.../hawk/HawkAccessTokenValidatorClient.java | 18 +-
.../tokens/hawk/HawkAuthorizationScheme.java | 48 +-
.../oauth2/tokens/hawk/HmacAlgorithm.java | 4 +-
.../rs/security/oauth2/tokens/hawk/Nonce.java | 4 +-
.../oauth2/tokens/hawk/NonceHistory.java | 4 +-
.../oauth2/tokens/hawk/NonceVerifier.java | 2 +-
.../oauth2/tokens/hawk/NonceVerifierImpl.java | 6 +-
.../oauth2/utils/AuthorizationUtils.java | 20 +-
.../rs/security/oauth2/utils/EHCacheUtil.java | 8 +-
.../rs/security/oauth2/utils/JwtTokenUtils.java | 32 +-
.../security/oauth2/utils/OAuthConstants.java | 50 +-
.../oauth2/utils/OAuthContextUtils.java | 2 +-
.../rs/security/oauth2/utils/OAuthUtils.java | 76 +-
.../utils/crypto/ModelEncryptionSupport.java | 158 +--
.../oauth2/grants/OAuthDataProviderImpl.java | 2 +-
.../oauth2/grants/TokenGrantHandlerTest.java | 40 +-
.../grants/code/JCacheCodeDataProviderTest.java | 20 +-
.../grants/code/JPACodeDataProviderTest.java | 28 +-
.../grants/jwt/AbstractJwtHandlerTest.java | 2 +-
.../provider/JCacheOAuthDataProviderTest.java | 54 +-
.../provider/JPAOAuthDataProviderTest.java | 6 +-
.../oauth2/provider/OAuthJSONProviderTest.java | 92 +-
.../hawk/HawkAccessTokenValidatorTest.java | 22 +-
.../oauth2/utils/AuthorizationUtilsTest.java | 8 +-
.../security/oauth2/utils/OAuthUtilsTest.java | 6 +-
.../crypto/CodeGrantEncryptingDataProvider.java | 6 +-
.../oauth2/utils/crypto/CryptoUtilsTest.java | 100 +-
.../utils/crypto/EncryptingDataProvider.java | 34 +-
.../security/oidc/common/AbstractUserInfo.java | 34 +-
.../security/oidc/common/AggregatedClaims.java | 2 +-
.../rs/security/oidc/common/ClaimsRequest.java | 14 +-
.../oidc/common/DistributedClaimSource.java | 4 +-
.../security/oidc/common/DistributedClaims.java | 2 +-
.../cxf/rs/security/oidc/common/IdToken.java | 10 +-
.../rs/security/oidc/common/UserAddress.java | 6 +-
.../oidc/idp/IdTokenResponseFilter.java | 20 +-
.../oidc/idp/OidcAuthorizationCodeService.java | 16 +-
.../oidc/idp/OidcConfigurationService.java | 12 +-
.../idp/OidcDynamicRegistrationService.java | 14 +-
.../rs/security/oidc/idp/OidcHybridService.java | 34 +-
.../security/oidc/idp/OidcImplicitService.java | 52 +-
.../rs/security/oidc/idp/OidcKeysService.java | 6 +-
.../rs/security/oidc/idp/UserInfoService.java | 14 +-
.../cxf/rs/security/oidc/rp/IdTokenReader.java | 6 +-
.../security/oidc/rp/OidcClaimsValidator.java | 24 +-
.../oidc/rp/OidcClientCodeRequestFilter.java | 38 +-
.../oidc/rp/OidcClientTokenContextImpl.java | 2 +-
.../security/oidc/rp/OidcIdTokenProvider.java | 4 +-
.../oidc/rp/OidcIdTokenRequestFilter.java | 14 +-
.../cxf/rs/security/oidc/rp/OidcInvoker.java | 12 +-
.../oidc/rp/OidcRpAuthenticationFilter.java | 14 +-
.../oidc/rp/OidcRpAuthenticationService.java | 10 +-
.../security/oidc/rp/OidcSecurityContext.java | 14 +-
.../security/oidc/rp/OidcUserInfoProvider.java | 6 +-
.../cxf/rs/security/oidc/rp/UserInfoClient.java | 4 +-
.../cxf/rs/security/oidc/utils/OidcUtils.java | 20 +-
.../oidc/idp/JPAOidcUserSubjectTest.java | 24 +-
...AbstractRequestAssertionConsumerHandler.java | 92 +-
.../security/saml/sso/AbstractSSOSpHandler.java | 68 +-
.../saml/sso/AbstractServiceProviderFilter.java | 94 +-
.../security/saml/sso/AuthnRequestBuilder.java | 4 +-
.../saml/sso/DefaultAuthnRequestBuilder.java | 26 +-
.../saml/sso/EHCacheTokenReplayCache.java | 40 +-
.../cxf/rs/security/saml/sso/EHCacheUtil.java | 8 +-
.../rs/security/saml/sso/LogoutResponse.java | 8 +-
.../cxf/rs/security/saml/sso/LogoutService.java | 18 +-
.../rs/security/saml/sso/MetadataService.java | 32 +-
.../rs/security/saml/sso/MetadataWriter.java | 50 +-
.../sso/RequestAssertionConsumerFilter.java | 14 +-
.../sso/RequestAssertionConsumerService.java | 4 +-
.../saml/sso/SAMLSSOResponseValidator.java | 76 +-
.../cxf/rs/security/saml/sso/SSOConstants.java | 16 +-
.../security/saml/sso/SSOValidatorResponse.java | 8 +-
.../saml/sso/SamlPostBindingFilter.java | 38 +-
.../saml/sso/SamlRedirectBindingFilter.java | 40 +-
.../rs/security/saml/sso/SamlRequestInfo.java | 2 +-
.../saml/sso/SamlSSOAssertionValidator.java | 10 +-
.../saml/sso/SamlpRequestComponentBuilder.java | 48 +-
.../rs/security/saml/sso/TokenReplayCache.java | 2 +-
.../saml/sso/state/EHCacheSPStateManager.java | 48 +-
.../saml/sso/state/HTTPSPStateManager.java | 10 +-
.../saml/sso/state/MemorySPStateManager.java | 8 +-
.../security/saml/sso/state/RequestState.java | 8 +-
.../security/saml/sso/state/ResponseState.java | 16 +-
.../security/saml/sso/state/SPStateManager.java | 16 +-
.../saml/sso/AbstractSAMLCallbackHandler.java | 46 +-
.../saml/sso/AuthnRequestBuilderTest.java | 38 +-
.../saml/sso/CombinedValidatorTest.java | 142 +--
.../rs/security/saml/sso/EHCacheUtilTest.java | 16 +-
.../saml/sso/KeystorePasswordCallback.java | 10 +-
.../security/saml/sso/SAML2CallbackHandler.java | 12 +-
.../sso/SAML2PResponseComponentBuilder.java | 48 +-
.../saml/sso/SAMLResponseValidatorTest.java | 340 +++---
.../saml/sso/SAMLSSOResponseValidatorTest.java | 204 ++--
.../cxf/rs/security/common/CryptoLoader.java | 28 +-
.../cxf/rs/security/common/RSSecurityUtils.java | 70 +-
.../cxf/rs/security/common/TrustValidator.java | 8 +-
.../saml/AbstractSamlBase64InHandler.java | 16 +-
.../rs/security/saml/AbstractSamlInHandler.java | 126 +--
.../saml/AbstractSamlOutInterceptor.java | 14 +-
.../rs/security/saml/DeflateEncoderDecoder.java | 18 +-
.../cxf/rs/security/saml/SAMLConstants.java | 6 +-
.../apache/cxf/rs/security/saml/SAMLUtils.java | 64 +-
.../security/saml/SamlEnvelopedInHandler.java | 20 +-
.../saml/SamlEnvelopedOutInterceptor.java | 38 +-
.../cxf/rs/security/saml/SamlFormInHandler.java | 22 +-
.../security/saml/SamlFormOutInterceptor.java | 20 +-
.../rs/security/saml/SamlHeaderInHandler.java | 18 +-
.../security/saml/SamlHeaderOutInterceptor.java | 28 +-
.../cxf/rs/security/saml/assertion/Subject.java | 10 +-
.../authorization/ClaimsAuthorizingFilter.java | 8 +-
.../SecurityContextProviderImpl.java | 34 +-
.../saml/authorization/SubjectPrincipal.java | 20 +-
.../security/xml/AbstractXmlEncInHandler.java | 78 +-
.../security/xml/AbstractXmlSecInHandler.java | 24 +-
.../xml/AbstractXmlSecOutInterceptor.java | 44 +-
.../security/xml/AbstractXmlSigInHandler.java | 96 +-
.../rs/security/xml/EncryptionProperties.java | 4 +-
.../cxf/rs/security/xml/EncryptionUtils.java | 34 +-
.../rs/security/xml/SignatureProperties.java | 4 +-
.../cxf/rs/security/xml/XmlEncInHandler.java | 6 +-
.../rs/security/xml/XmlEncInInterceptor.java | 2 +-
.../rs/security/xml/XmlEncOutInterceptor.java | 152 +--
.../rs/security/xml/XmlSecInInterceptor.java | 124 +--
.../rs/security/xml/XmlSecOutInterceptor.java | 150 +--
.../cxf/rs/security/xml/XmlSigInHandler.java | 6 +-
.../rs/security/xml/XmlSigInInterceptor.java | 4 +-
.../rs/security/xml/XmlSigOutInterceptor.java | 116 +-
.../saml/DeflateEncoderDecoderTest.java | 8 +-
.../jaxrs/sse/OutboundSseEventBodyWriter.java | 36 +-
.../cxf/jaxrs/sse/OutboundSseEventImpl.java | 6 +-
.../cxf/jaxrs/sse/SseBroadcasterImpl.java | 20 +-
.../java/org/apache/cxf/jaxrs/sse/SseImpl.java | 2 +-
.../SseAtmosphereEventSinkContextProvider.java | 8 +-
.../atmosphere/SseAtmosphereEventSinkImpl.java | 30 +-
.../atmosphere/SseAtmosphereInterceptor.java | 20 +-
.../transport/sse/SseHttpTransportFactory.java | 10 +-
.../AtmosphereSseServletDestination.java | 18 +-
.../cxf/rt/security/saml/claims/ClaimBean.java | 12 +-
.../cxf/rt/security/saml/claims/SAMLClaim.java | 32 +-
.../saml/claims/SAMLSecurityContext.java | 28 +-
.../ClaimsAuthorizingInterceptor.java | 62 +-
.../interceptor/WSS4JBasicAuthValidator.java | 22 +-
.../cxf/rt/security/saml/utils/SAMLUtils.java | 38 +-
.../security/saml/xacml/CXFMessageParser.java | 6 +-
.../rt/security/saml/xacml/XACMLConstants.java | 94 +-
.../AbstractXACMLAuthorizingInterceptor.java | 34 +-
.../saml/xacml2/DefaultXACMLRequestBuilder.java | 48 +-
.../saml/xacml2/PolicyDecisionPoint.java | 4 +-
.../saml/xacml2/RequestComponentBuilder.java | 46 +-
.../xacml2/SamlRequestComponentBuilder.java | 30 +-
.../xacml2/XACMLAuthorizingInterceptor.java | 10 +-
.../saml/xacml2/XACMLRequestBuilder.java | 6 +-
.../rt/security/saml/claims/SAMLClaimsTest.java | 80 +-
.../saml/claims/SamlCallbackHandler.java | 16 +-
.../ClaimsAuthorizingInterceptorTest.java | 114 +-
.../cxf/rt/security/saml/xacml2/DummyPDP.java | 26 +-
.../xacml2/RequestComponentBuilderTest.java | 84 +-
.../xacml2/SamlRequestComponentBuilderTest.java | 52 +-
.../xacml2/XACMLAuthorizingInterceptorTest.java | 20 +-
.../saml/xacml2/XACMLRequestBuilderTest.java | 102 +-
.../cxf/rt/security/SecurityConstants.java | 176 +--
.../apache/cxf/rt/security/claims/Claim.java | 14 +-
.../cxf/rt/security/claims/ClaimCollection.java | 14 +-
.../security/claims/ClaimsSecurityContext.java | 4 +-
.../security/crypto/BouncyCastleInstaller.java | 4 +-
.../cxf/rt/security/crypto/CryptoUtils.java | 204 ++--
.../cxf/rt/security/crypto/HmacUtils.java | 42 +-
.../cxf/rt/security/crypto/KeyProperties.java | 10 +-
.../rt/security/crypto/MessageDigestUtils.java | 22 +-
.../cxf/rt/security/utils/SecurityUtils.java | 44 +-
.../cxf/rt/security/claims/ClaimTest.java | 12 +-
.../transport/http/asyncclient/Activator.java | 10 +-
.../http/asyncclient/AsyncHTTPConduit.java | 188 ++--
.../asyncclient/AsyncHTTPConduitFactory.java | 62 +-
.../asyncclient/AsyncHttpTransportFactory.java | 26 +-
.../CXFHttpAsyncRequestProducer.java | 20 +-
.../CXFHttpAsyncResponseConsumer.java | 4 +-
.../http/asyncclient/CXFHttpRequest.java | 8 +-
.../http/asyncclient/CXFResponseCallback.java | 2 +-
.../http/asyncclient/SharedInputBuffer.java | 14 +-
.../http/asyncclient/SharedOutputBuffer.java | 14 +-
.../http/asyncclient/AsyncHTTPConduitTest.java | 46 +-
.../http_jetty/JettyHTTPDestination.java | 82 +-
.../transport/http_jetty/JettyHTTPHandler.java | 2 +-
.../http_jetty/JettyHTTPServerEngine.java | 334 +++---
.../JettyHTTPServerEngineFactory.java | 118 +-
.../cxf/transport/http_jetty/ServerEngine.java | 10 +-
.../http_jetty/ThreadingParameters.java | 14 +-
.../HTTPJettyTransportNamespaceHandler.java | 4 +-
.../JettyHTTPServerEngineFactoryHolder.java | 28 +-
.../JettyServerEngineFactoryParser.java | 14 +-
.../JettyContinuationProvider.java | 12 +-
.../JettyContinuationProviderFactory.java | 14 +-
.../continuations/JettyContinuationWrapper.java | 24 +-
.../osgi/HTTPJettyTransportActivator.java | 28 +-
...ttyHTTPServerEngineBeanDefinitionParser.java | 98 +-
...ServerEngineFactoryBeanDefinitionParser.java | 44 +-
.../spring/JettySpringTypesFactory.java | 64 +-
.../http_jetty/spring/NamespaceHandler.java | 2 +-
.../http_jetty/JettyHTTPDestinationTest.java | 232 ++--
.../JettyHTTPServerEngineFactoryTest.java | 70 +-
.../http_jetty/JettyHTTPServerEngineTest.java | 90 +-
.../http_jetty/JettyHTTPTestHandler.java | 2 +-
.../HTTPJettyTransportNamespaceHandlerTest.java | 4 +-
.../spring/ApplicationContextTest.java | 68 +-
.../spring/BeanDefinitionParsersTest.java | 16 +-
.../netty/client/NettyHttpClientHandler.java | 16 +-
.../client/NettyHttpClientPipelineFactory.java | 18 +-
.../netty/client/NettyHttpClientRequest.java | 6 +-
.../http/netty/client/NettyHttpConduit.java | 44 +-
.../netty/client/NettyHttpConduitFactory.java | 24 +-
.../netty/client/NettyHttpTransportFactory.java | 38 +-
.../client/NettyHttpConduitFactoryTest.java | 14 +-
.../client/integration/NettyClientTest.java | 4 +-
.../client/integration/SSLNettyClientTest.java | 24 +-
.../http/netty/server/NettyHttpDestination.java | 20 +-
.../server/NettyHttpDestinationFactory.java | 2 +-
.../netty/server/NettyHttpServerEngine.java | 56 +-
.../server/NettyHttpServerEngineFactory.java | 28 +-
.../netty/server/NettyHttpServletHandler.java | 28 +-
.../server/NettyHttpServletPipelineFactory.java | 24 +-
.../netty/server/NettyHttpTransportFactory.java | 28 +-
.../http/netty/server/ThreadingParameters.java | 10 +-
.../http/netty/server/blueprint/Activator.java | 2 +-
.../HttpNettyTransportNamespaceHandler.java | 8 +-
.../NettyHttpServerEngineFactoryHolder.java | 14 +-
.../NettyServerEngineFactoryParser.java | 2 +-
.../interceptor/HttpSessionInterceptor.java | 6 +-
.../server/interceptor/NettyInterceptor.java | 2 +-
.../server/servlet/ChannelThreadLocal.java | 2 +-
.../server/servlet/HttpSessionThreadLocal.java | 2 +-
.../server/servlet/NettyHttpServletRequest.java | 6 +-
.../server/servlet/NettyServletInputStream.java | 4 +-
.../servlet/NettyServletOutputStream.java | 6 +-
.../server/session/DefaultHttpSessionStore.java | 4 +-
.../netty/server/spring/NamespaceHandler.java | 2 +-
...ttyHttpServerEngineBeanDefinitionParser.java | 96 +-
...ServerEngineFactoryBeanDefinitionParser.java | 46 +-
.../server/spring/NettySpringTypesFactory.java | 66 +-
.../netty/server/NettyHttpDestinationTest.java | 226 ++--
.../NettyHttpServerEngineFactoryTest.java | 18 +-
.../netty/server/NettyHttpServerEngineTest.java | 12 +-
.../server/integration/NettyServerTest.java | 6 +-
.../server/integration/SSLNettyServerTest.java | 26 +-
.../server/spring/ApplicationContextTest.java | 72 +-
.../http_undertow/CxfUndertowServlet.java | 4 +-
.../http_undertow/NotFoundHandler.java | 2 +-
.../transport/http_undertow/ServerEngine.java | 2 +-
.../http_undertow/ThreadingParameters.java | 16 +-
.../http_undertow/UndertowHTTPDestination.java | 72 +-
.../http_undertow/UndertowHTTPHandler.java | 20 +-
.../http_undertow/UndertowHTTPServerEngine.java | 158 +--
.../UndertowHTTPServerEngineFactory.java | 120 +--
.../HTTPUndertowTransportNamespaceHandler.java | 4 +-
.../UndertowHTTPServerEngineFactoryHolder.java | 34 +-
.../UndertowServerEngineFactoryParser.java | 14 +-
.../osgi/HTTPUndertowTransportActivator.java | 28 +-
.../http_undertow/spring/NamespaceHandler.java | 2 +-
...towHTTPServerEngineBeanDefinitionParser.java | 92 +-
...ServerEngineFactoryBeanDefinitionParser.java | 44 +-
.../spring/UndertowSpringTypesFactory.java | 64 +-
.../UndertowHTTPDestinationTest.java | 236 ++--
.../UndertowHTTPServerEngineFactoryTest.java | 50 +-
.../UndertowHTTPServerEngineTest.java | 74 +-
.../http_undertow/UndertowHTTPTestHandler.java | 12 +-
...TPUndertowTransportNamespaceHandlerTest.java | 4 +-
.../spring/ApplicationContextTest.java | 72 +-
.../http_undertow/spring/TestDummyHandler.java | 2 +-
.../transport/http/AbstractHTTPDestination.java | 204 ++--
.../org/apache/cxf/transport/http/Address.java | 16 +-
.../cxf/transport/http/CXFAuthenticator.java | 34 +-
.../apache/cxf/transport/http/ChunkedUtil.java | 18 +-
.../http/ContinuationProviderFactory.java | 6 +-
.../org/apache/cxf/transport/http/Cookie.java | 12 +-
.../org/apache/cxf/transport/http/Cookies.java | 18 +-
.../cxf/transport/http/DestinationRegistry.java | 8 +-
.../transport/http/DestinationRegistryImpl.java | 24 +-
.../apache/cxf/transport/http/HTTPConduit.java | 508 ++++-----
.../transport/http/HTTPConduitConfigurer.java | 2 +-
.../cxf/transport/http/HTTPConduitFactory.java | 4 +-
.../cxf/transport/http/HTTPException.java | 6 +-
.../transport/http/HTTPTransportFactory.java | 66 +-
.../transport/http/HTTPWSDLExtensionLoader.java | 12 +-
.../org/apache/cxf/transport/http/Headers.java | 78 +-
.../http/HttpAuthenticationFaultHandler.java | 8 +-
.../cxf/transport/http/HttpConduitConfig.java | 2 +-
.../transport/http/HttpDestinationFactory.java | 4 +-
.../http/HttpServletRequestSnapshot.java | 2 +-
.../transport/http/HttpURLConnectionInfo.java | 10 +-
.../apache/cxf/transport/http/HttpUrlUtil.java | 4 +-
.../cxf/transport/http/MessageTrustDecider.java | 50 +-
.../cxf/transport/http/PatternBuilder.java | 2 +-
.../apache/cxf/transport/http/ProxyFactory.java | 12 +-
.../http/ReferencingAuthenticator.java | 6 +-
.../http/Servlet3ContinuationProvider.java | 42 +-
.../http/URLConnectionHTTPConduit.java | 74 +-
.../cxf/transport/http/URLConnectionInfo.java | 10 +-
.../http/UntrustedURLConnectionIOException.java | 2 +-
.../http/auth/AbstractSpnegoAuthSupplier.java | 44 +-
.../http/auth/DefaultBasicAuthSupplier.java | 6 +-
.../transport/http/auth/DigestAuthSupplier.java | 30 +-
.../cxf/transport/http/auth/HttpAuthHeader.java | 16 +-
.../transport/http/auth/HttpAuthSupplier.java | 10 +-
.../transport/http/auth/SpnegoAuthSupplier.java | 2 +-
.../auth/WSDLGetAuthenticatorInterceptor.java | 18 +-
.../transport/http/blueprint/HttpBPHandler.java | 8 +-
.../HttpConduitBPBeanDefinitionParser.java | 32 +-
.../HttpDestinationBPBeanDefinitionParser.java | 14 +-
.../osgi/ConfigAdminHttpConduitConfigurer.java | 38 +-
.../http/osgi/HTTPTransportActivator.java | 26 +-
.../http/osgi/HttpConduitConfigApplier.java | 12 +-
.../transport/http/osgi/ServletExporter.java | 44 +-
.../http/policy/HTTPClientAssertionBuilder.java | 18 +-
.../http/policy/HTTPServerAssertionBuilder.java | 20 +-
.../policy/NoOpPolicyInterceptorProvider.java | 4 +-
.../policy/impl/ClientPolicyCalculator.java | 10 +-
.../policy/impl/ServerPolicyCalculator.java | 10 +-
.../spring/HttpConduitBeanDefinitionParser.java | 78 +-
.../HttpDestinationBeanDefinitionParser.java | 14 +-
...MessageTrustDeciderBeanDefinitionParser.java | 2 +-
.../transport/http/spring/NamespaceHandler.java | 14 +-
.../https/AliasedX509ExtendedKeyManager.java | 2 +-
.../https/AllowAllHostnameVerifier.java | 4 +-
.../cxf/transport/https/CertConstraints.java | 24 +-
.../transport/https/CertConstraintsFeature.java | 16 +-
.../https/CertConstraintsInterceptor.java | 15 +-
.../https/CertConstraintsJaxBUtils.java | 18 +-
.../https/HttpsMessageTrustDecider.java | 2 +-
.../https/HttpsURLConnectionFactory.java | 74 +-
.../transport/https/HttpsURLConnectionInfo.java | 36 +-
.../https/SSLSocketFactoryWrapper.java | 28 +-
.../apache/cxf/transport/https/SSLUtils.java | 26 +-
.../httpclient/DefaultHostnameVerifier.java | 18 +-
.../https/httpclient/InetAddressUtils.java | 4 +-
.../https/httpclient/PublicSuffixList.java | 2 +-
.../https/httpclient/PublicSuffixMatcher.java | 6 +-
.../httpclient/PublicSuffixMatcherLoader.java | 8 +-
.../transport/servlet/AbstractHTTPServlet.java | 160 +--
.../cxf/transport/servlet/BaseUrlHelper.java | 10 +-
.../transport/servlet/CXFNonSpringServlet.java | 30 +-
.../cxf/transport/servlet/CXFServlet.java | 22 +-
.../transport/servlet/ServletController.java | 36 +-
.../transport/servlet/ServletDestination.java | 20 +-
.../servlet/ServletDestinationFactory.java | 4 +-
.../servlet/blueprint/CXFBlueprintServlet.java | 6 +-
.../servicelist/FormattedServiceListWriter.java | 24 +-
.../ServiceListGeneratorServlet.java | 26 +-
.../ServiceListJAASAuthenticator.java | 10 +-
.../servlet/servicelist/ServiceListWriter.java | 2 +-
.../UnformattedServiceListWriter.java | 8 +-
.../http/CXFAuthenticatorCleanupTest.java | 30 +-
.../http/DestinationRegistryImplTest.java | 42 +-
.../cxf/transport/http/HTTPConduitTest.java | 4 +-
.../http/HTTPConduitURLConnectionTest.java | 34 +-
.../http/HTTPConduitURLEasyMockTest.java | 126 +--
.../apache/cxf/transport/http/HeadersTest.java | 16 +-
.../http/auth/DigestAuthSupplierTest.java | 8 +-
.../http/blueprint/HttpBPHandlerTest.java | 4 +-
.../http/policy/ClientPolicyCalculatorTest.java | 8 +-
.../policy/HTTPClientAssertionBuilderTest.java | 12 +-
.../policy/HTTPServerAssertionBuilderTest.java | 14 +-
.../transport/http/policy/PolicyUtilsTest.java | 32 +-
.../http/policy/ServerPolicyCalculatorTest.java | 6 +-
.../spring/HttpConduitConfigurationTest.java | 26 +-
.../transport/https/CertConstraintsTest.java | 46 +-
.../httpclient/CertificatesToPlayWith.java | 2 +-
.../httpclient/DefaultHostnameVerifierTest.java | 4 +-
.../transport/servlet/BaseUrlHelperTest.java | 6 +-
.../servlet/ServletControllerTest.java | 42 +-
.../cxf/transport/jms/BackChannelConduit.java | 36 +-
.../apache/cxf/transport/jms/JMSConduit.java | 68 +-
.../cxf/transport/jms/JMSConfigFactory.java | 24 +-
.../cxf/transport/jms/JMSConfiguration.java | 26 +-
.../apache/cxf/transport/jms/JMSConstants.java | 30 +-
.../cxf/transport/jms/JMSDestination.java | 18 +-
.../cxf/transport/jms/JMSExchangeSender.java | 4 +-
.../apache/cxf/transport/jms/JMSFactory.java | 12 +-
.../cxf/transport/jms/JMSMessageUtils.java | 82 +-
.../cxf/transport/jms/JMSTransportFactory.java | 6 +-
.../cxf/transport/jms/MessageStreamUtil.java | 8 +-
.../cxf/transport/jms/ThrottlingCounter.java | 10 +-
.../jms/continuations/JMSContinuation.java | 14 +-
.../continuations/JMSContinuationProvider.java | 12 +-
.../transport/jms/spec/JMSSpecConstants.java | 10 +-
.../cxf/transport/jms/uri/JMSEndpoint.java | 46 +-
.../transport/jms/uri/JMSEndpointWSDLUtil.java | 38 +-
.../cxf/transport/jms/uri/JMSURIParser.java | 10 +-
.../util/AbstractMessageListenerContainer.java | 20 +-
.../cxf/transport/jms/util/JMSSender.java | 4 +-
.../apache/cxf/transport/jms/util/JMSUtil.java | 10 +-
.../jms/util/MessageListenerContainer.java | 20 +-
.../util/PollingMessageListenerContainer.java | 14 +-
.../cxf/transport/jms/util/ResourceCloser.java | 6 +-
.../cxf/transport/jms/util/TestReceiver.java | 18 +-
.../cxf/transport/jms/util/package-info.java | 4 +-
.../jms/wsdl11/JMSWSDLExtensionLoader.java | 14 +-
.../cxf/transport/jms/AbstractJMSTester.java | 30 +-
.../cxf/transport/jms/JMSBrokerSetup.java | 32 +-
.../cxf/transport/jms/JMSConduitTest.java | 2 +-
.../cxf/transport/jms/JMSConfigFactoryTest.java | 10 +-
.../cxf/transport/jms/JMSDestinationTest.java | 88 +-
.../cxf/transport/jms/JMSMessageUtilTest.java | 10 +-
.../MessageIdAsCorrelationIdJMSConduitTest.java | 4 +-
.../jms/PooledConnectionTempQueueTest.java | 12 +-
.../cxf/transport/jms/RequestResponseTest.java | 14 +-
.../transport/jms/ThrottlingCounterTest.java | 8 +-
.../JMSContinuationProviderTest.java | 12 +-
.../jms/continuations/JMSContinuationTest.java | 38 +-
.../cxf/transport/jms/uri/JMSEndpointTest.java | 22 +-
.../cxf/transport/jms/uri/MyBeanLocator.java | 8 +-
.../jms/uri/URIConfiguredConduitTest.java | 8 +-
.../cxf/transport/jms/util/JMSUtilTest.java | 14 +-
.../transport/jms/util/MessageListenerTest.java | 2 +-
.../cxf/transport/local/LocalConduit.java | 32 +-
.../cxf/transport/local/LocalDestination.java | 22 +-
.../transport/local/LocalTransportFactory.java | 32 +-
.../transport/local/LocalDestinationTest.java | 10 +-
.../local/LocalTransportFactoryTest.java | 32 +-
.../cxf/transport/udp/IoSessionInputStream.java | 2 +-
.../apache/cxf/transport/udp/UDPConduit.java | 52 +-
.../cxf/transport/udp/UDPDestination.java | 50 +-
.../cxf/transport/udp/UDPTransportFactory.java | 8 +-
.../cxf/transport/udp/UDPTransportTest.java | 38 +-
.../transport/websocket/WebSocketConstants.java | 2 +-
.../websocket/WebSocketDestinationFactory.java | 12 +-
.../websocket/WebSocketDestinationService.java | 2 +-
.../websocket/WebSocketTransportFactory.java | 16 +-
.../cxf/transport/websocket/WebSocketUtils.java | 16 +-
.../websocket/ahc/AhcWebSocketConduit.java | 6 +-
.../ahc/AhcWebSocketConduitRequest.java | 2 +-
.../websocket/atmosphere/AtmosphereUtils.java | 10 +-
.../AtmosphereWebSocketJettyDestination.java | 18 +-
.../AtmosphereWebSocketServletDestination.java | 10 +-
.../atmosphere/DefaultProtocolInterceptor.java | 42 +-
.../websocket/jetty/JettyWebSocketHandler.java | 2 +-
.../websocket/jetty/WebSocketServletHolder.java | 2 +-
.../jetty/WebSocketVirtualServletRequest.java | 10 +-
.../jetty/WebSocketVirtualServletResponse.java | 8 +-
.../jetty9/Jetty9WebSocketDestination.java | 30 +-
.../websocket/jetty9/JettyWebSocketHandler.java | 18 +-
.../transport/websocket/WebSocketUtilsTest.java | 18 +-
.../websocket/ahc/AhcWebSocketConduitTest.java | 8 +-
...AtmosphereWebSocketJettyDestinationTest.java | 16 +-
...mosphereWebSocketServletDestinationTest.java | 28 +-
.../DefaultProtocolInterceptorTest.java | 22 +-
.../jetty/JettyWebSocketDestinationTest.java | 14 +-
.../cxf/ws/addressing/blueprint/Activator.java | 2 +-
.../impl/AddressingFeatureApplier.java | 12 +-
.../impl/AddressingWSDLExtensionLoader.java | 12 +-
.../addressing/impl/DefaultMessageIdCache.java | 12 +-
.../addressing/impl/InternalContextUtils.java | 74 +-
.../ws/addressing/impl/MAPAggregatorImpl.java | 212 ++--
.../impl/MAPAggregatorImplLoader.java | 2 +-
.../policy/AddressingAssertionBuilder.java | 26 +-
.../AddressingPolicyInterceptorProvider.java | 12 +-
.../ws/addressing/policy/MetadataConstants.java | 22 +-
.../policy/UsingAddressingAssertionBuilder.java | 6 +-
.../addressing/soap/DecoupledFaultHandler.java | 24 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 232 ++--
.../ws/addressing/soap/VersionTransformer.java | 18 +-
.../ws/addressing/spring/NamespaceHandler.java | 2 +-
.../addressing/blueprint/WsBPHandlerTest.java | 4 +-
.../ws/addressing/impl/ContextUtilsTest.java | 48 +-
.../ws/addressing/impl/MAPAggregatorTest.java | 244 ++---
.../soap/DecoupledFaultHandlerTest.java | 14 +-
.../cxf/ws/addressing/soap/MAPCodecTest.java | 32 +-
.../backend/database/SubscriptionTicket.java | 4 +-
.../manager/SubscriptionManagerImpl.java | 4 +-
.../EventSinkInterfaceNotificationTask.java | 8 +-
.../ws/eventing/shared/EventingConstants.java | 2 +-
.../shared/faults/CannotProcessFilter.java | 4 +-
.../ws/eventing/shared/utils/FilteringUtil.java | 2 +-
.../base/SimpleEventingIntegrationTest.java | 4 +-
.../apache/cxf/ws/eventing/base/TestUtil.java | 2 +-
.../eventing/integration/NotificationTest.java | 10 +-
.../integration/SubscriptionEndTest.java | 2 +-
.../eventsink/TestingWrappedEventSinkImpl.java | 2 +-
.../java/org/apache/cxf/ws/mex/MEXEndpoint.java | 40 +-
.../org/apache/cxf/ws/mex/MEXInInterceptor.java | 12 +-
.../apache/cxf/ws/mex/MEXServerListener.java | 2 +-
.../java/org/apache/cxf/ws/mex/MEXUtils.java | 18 +-
.../org/apache/cxf/ws/mex/MetadataExchange.java | 16 +-
.../java/org/apache/cxf/ws/mex/MEXTest.java | 10 +-
.../ws/policy/AbstractPolicyInterceptor.java | 16 +-
.../AbstractPolicyInterceptorProvider.java | 10 +-
.../cxf/ws/policy/AlternativeSelector.java | 16 +-
.../cxf/ws/policy/AssertionBuilderRegistry.java | 8 +-
.../ws/policy/AssertionBuilderRegistryImpl.java | 14 +-
.../org/apache/cxf/ws/policy/AssertionInfo.java | 8 +-
.../apache/cxf/ws/policy/AssertionInfoMap.java | 26 +-
.../java/org/apache/cxf/ws/policy/Assertor.java | 4 +-
.../policy/ClientPolicyInFaultInterceptor.java | 38 +-
.../apache/cxf/ws/policy/EffectivePolicy.java | 8 +-
.../cxf/ws/policy/EffectivePolicyImpl.java | 108 +-
.../apache/cxf/ws/policy/EndpointPolicy.java | 14 +-
.../cxf/ws/policy/EndpointPolicyImpl.java | 102 +-
.../IgnorablePolicyInterceptorProvider.java | 14 +-
.../cxf/ws/policy/PolicyAnnotationListener.java | 88 +-
.../apache/cxf/ws/policy/PolicyAssertion.java | 8 +-
.../org/apache/cxf/ws/policy/PolicyBean.java | 6 +-
.../org/apache/cxf/ws/policy/PolicyBuilder.java | 18 +-
.../apache/cxf/ws/policy/PolicyBuilderImpl.java | 14 +-
.../apache/cxf/ws/policy/PolicyConstants.java | 24 +-
.../cxf/ws/policy/PolicyDataEngineImpl.java | 18 +-
.../org/apache/cxf/ws/policy/PolicyEngine.java | 66 +-
.../apache/cxf/ws/policy/PolicyEngineImpl.java | 80 +-
.../apache/cxf/ws/policy/PolicyException.java | 4 +-
.../cxf/ws/policy/PolicyInInterceptor.java | 34 +-
.../ws/policy/PolicyInterceptorProvider.java | 16 +-
.../PolicyInterceptorProviderRegistry.java | 10 +-
.../PolicyInterceptorProviderRegistryImpl.java | 16 +-
.../cxf/ws/policy/PolicyOutInterceptor.java | 32 +-
.../apache/cxf/ws/policy/PolicyProvider.java | 12 +-
.../cxf/ws/policy/PolicyRegistryImpl.java | 6 +-
.../org/apache/cxf/ws/policy/PolicyUtils.java | 66 +-
.../PolicyVerificationInFaultInterceptor.java | 36 +-
.../policy/PolicyVerificationInInterceptor.java | 30 +-
.../PolicyVerificationOutInterceptor.java | 18 +-
.../policy/ServerPolicyOutFaultInterceptor.java | 36 +-
.../ws/policy/ServiceModelPolicyUpdater.java | 6 +-
.../apache/cxf/ws/policy/WSPolicyFeature.java | 62 +-
.../attachment/AbstractPolicyProvider.java | 28 +-
.../attachment/external/DomainExpression.java | 2 +-
.../external/DomainExpressionBuilder.java | 12 +-
.../DomainExpressionBuilderRegistry.java | 12 +-
.../EndpointReferenceDomainExpression.java | 6 +-
...ndpointReferenceDomainExpressionBuilder.java | 22 +-
.../external/ExternalAttachmentProvider.java | 78 +-
.../attachment/external/PolicyAttachment.java | 12 +-
.../external/URIDomainExpression.java | 112 +-
.../LocalDocumentReferenceResolver.java | 6 +-
.../LocalServiceModelReferenceResolver.java | 8 +-
.../attachment/reference/ReferenceResolver.java | 6 +-
.../reference/RemoteReferenceResolver.java | 12 +-
.../wsdl11/Wsdl11AttachmentPolicyProvider.java | 100 +-
.../cxf/ws/policy/blueprint/Activator.java | 2 +-
.../ws/policy/builder/jaxb/JaxbAssertion.java | 20 +-
.../builder/jaxb/JaxbAssertionBuilder.java | 32 +-
.../builder/primitive/PrimitiveAssertion.java | 12 +-
.../primitive/PrimitiveAssertionBuilder.java | 12 +-
.../ws/policy/mtom/MTOMAssertionBuilder.java | 4 +-
.../mtom/MTOMPolicyInterceptorProvider.java | 12 +-
.../cxf/ws/policy/mtom/MetadataConstants.java | 4 +-
.../selector/BaseAlternativeSelector.java | 10 +-
.../selector/FirstAlternativeSelector.java | 8 +-
.../selector/MaximalAlternativeSelector.java | 8 +-
.../selector/MinimalAlternativeSelector.java | 16 +-
...lAttachmentProviderBeanDefinitionParser.java | 4 +-
.../cxf/ws/policy/spring/NamespaceHandler.java | 4 +-
.../spring/PolicyBeanDefinitionParser.java | 8 +-
.../PolicyEngineBeanDefinitionParser.java | 16 +-
.../PolicyFeatureBeanDefinitionParser.java | 10 +-
.../policy/spring/PolicyNamespaceHandler.java | 2 +-
.../AssertionBuilderRegistryImplTest.java | 18 +-
.../cxf/ws/policy/AssertionInfoMapTest.java | 82 +-
.../cxf/ws/policy/EffectivePolicyImplTest.java | 124 +--
.../cxf/ws/policy/EndpointPolicyImplTest.java | 2 +-
.../IgnorablePolicyInterceptorProviderTest.java | 2 +-
.../org/apache/cxf/ws/policy/NormalizeTest.java | 34 +-
.../apache/cxf/ws/policy/PolicyBuilderTest.java | 30 +-
.../cxf/ws/policy/PolicyDataEngineImplTest.java | 16 +-
.../cxf/ws/policy/PolicyEngineImplInitTest.java | 2 +-
.../apache/cxf/ws/policy/PolicyEngineTest.java | 234 ++--
.../cxf/ws/policy/PolicyExtensionsTest.java | 30 +-
...licyInterceptorProviderRegistryImplTest.java | 2 +-
.../cxf/ws/policy/PolicyInterceptorsTest.java | 148 +--
.../cxf/ws/policy/PolicyRegistryImplTest.java | 4 +-
...olicyVerificationInFaultInterceptorTest.java | 54 +-
.../PolicyVerificationInInterceptorTest.java | 42 +-
.../PolicyVerificationOutInterceptorTest.java | 30 +-
.../org/apache/cxf/ws/policy/TestAssertion.java | 10 +-
.../DomainExpressionBuilderRegistryTest.java | 32 +-
.../EndpointReferenceDomainExpressionTest.java | 26 +-
.../ExternalAttachmentProviderTest.java | 68 +-
.../external/PolicyAttachmentTest.java | 50 +-
.../external/URIDomainExpressionTest.java | 34 +-
.../reference/ReferenceResolverTest.java | 42 +-
.../Wsdl11AttachmentPolicyProviderTest.java | 154 +--
.../policy/blueprint/PolicyBPHandlerTest.java | 8 +-
.../builder/jaxb/JaxbAssertionBuilderTest.java | 22 +-
.../policy/builder/jaxb/JaxbAssertionTest.java | 30 +-
.../selector/FirstAlternativeSelectorTest.java | 38 +-
.../MinimalMaximalAlternativeSelectorTest.java | 50 +-
.../cxf/ws/policy/spring/PolicyBeansTest.java | 18 +-
.../org/apache/cxf/ws/rm/AbstractEndpoint.java | 20 +-
.../apache/cxf/ws/rm/AbstractRMInterceptor.java | 24 +-
.../org/apache/cxf/ws/rm/AbstractSequence.java | 20 +-
.../cxf/ws/rm/AcknowledgementNotification.java | 2 +-
.../apache/cxf/ws/rm/BindingFaultFactory.java | 8 +-
.../apache/cxf/ws/rm/CapturingXMLWriter.java | 76 +-
.../java/org/apache/cxf/ws/rm/Destination.java | 26 +-
.../apache/cxf/ws/rm/DestinationSequence.java | 134 +--
.../org/apache/cxf/ws/rm/EncoderDecoder.java | 106 +-
.../apache/cxf/ws/rm/EncoderDecoder10AImpl.java | 14 +-
.../apache/cxf/ws/rm/EncoderDecoder10Impl.java | 12 +-
.../apache/cxf/ws/rm/EncoderDecoder11Impl.java | 14 +-
.../apache/cxf/ws/rm/InternalContextUtils.java | 38 +-
.../org/apache/cxf/ws/rm/ManagedRMEndpoint.java | 166 +--
.../org/apache/cxf/ws/rm/ManagedRMManager.java | 12 +-
.../org/apache/cxf/ws/rm/MessageCallback.java | 2 +-
.../cxf/ws/rm/MessageCountingCallback.java | 14 +-
.../org/apache/cxf/ws/rm/ProtocolVariation.java | 14 +-
.../main/java/org/apache/cxf/ws/rm/Proxy.java | 126 +--
.../org/apache/cxf/ws/rm/RM10Constants.java | 132 +--
.../org/apache/cxf/ws/rm/RM11Constants.java | 156 +--
.../cxf/ws/rm/RMCaptureInInterceptor.java | 6 +-
.../cxf/ws/rm/RMCaptureOutInterceptor.java | 68 +-
.../org/apache/cxf/ws/rm/RMConfiguration.java | 26 +-
.../java/org/apache/cxf/ws/rm/RMConstants.java | 98 +-
.../org/apache/cxf/ws/rm/RMContextUtils.java | 16 +-
.../apache/cxf/ws/rm/RMDeliveryInterceptor.java | 12 +-
.../java/org/apache/cxf/ws/rm/RMEndpoint.java | 62 +-
.../java/org/apache/cxf/ws/rm/RMException.java | 2 +-
.../org/apache/cxf/ws/rm/RMInInterceptor.java | 64 +-
.../java/org/apache/cxf/ws/rm/RMManager.java | 144 +--
.../apache/cxf/ws/rm/RMMessageConstants.java | 24 +-
.../org/apache/cxf/ws/rm/RMOutInterceptor.java | 50 +-
.../java/org/apache/cxf/ws/rm/RMProperties.java | 38 +-
.../main/java/org/apache/cxf/ws/rm/RMUtils.java | 50 +-
.../org/apache/cxf/ws/rm/RedeliveryQueue.java | 24 +-
.../cxf/ws/rm/RetransmissionInterceptor.java | 20 +-
.../apache/cxf/ws/rm/RetransmissionQueue.java | 34 +-
.../java/org/apache/cxf/ws/rm/RetryStatus.java | 12 +-
.../apache/cxf/ws/rm/RewindableInputStream.java | 22 +-
.../org/apache/cxf/ws/rm/SequenceFault.java | 24 +-
.../apache/cxf/ws/rm/SequenceFaultFactory.java | 16 +-
.../cxf/ws/rm/SequenceIdentifierGenerator.java | 2 +-
.../org/apache/cxf/ws/rm/SequenceMonitor.java | 8 +-
.../main/java/org/apache/cxf/ws/rm/Servant.java | 110 +-
.../main/java/org/apache/cxf/ws/rm/Source.java | 58 +-
.../org/apache/cxf/ws/rm/SourceSequence.java | 24 +-
.../apache/cxf/ws/rm/VersionTransformer.java | 146 +--
.../org/apache/cxf/ws/rm/WrappedEndpoint.java | 16 +-
.../org/apache/cxf/ws/rm/WrappedService.java | 20 +-
.../apache/cxf/ws/rm/blueprint/Activator.java | 2 +-
.../rm/blueprint/RMBPBeanDefinitionParser.java | 18 +-
.../RMBPTxStoreBeanDefinitionParser.java | 10 +-
.../org/apache/cxf/ws/rm/feature/RMFeature.java | 2 +-
.../cxf/ws/rm/persistence/PersistenceUtils.java | 16 +-
.../apache/cxf/ws/rm/persistence/RMMessage.java | 14 +-
.../apache/cxf/ws/rm/persistence/RMStore.java | 56 +-
.../cxf/ws/rm/persistence/RMStoreException.java | 2 +-
.../cxf/ws/rm/persistence/jdbc/RMTxStore.java | 288 ++---
.../cxf/ws/rm/policy/MC11AssertionBuilder.java | 6 +-
.../cxf/ws/rm/policy/MC11PolicyLoader.java | 6 +-
.../cxf/ws/rm/policy/RM10AssertionBuilder.java | 16 +-
.../cxf/ws/rm/policy/RM12AssertionBuilder.java | 24 +-
.../rm/policy/RMPolicyInterceptorProvider.java | 2 +-
.../cxf/ws/rm/policy/RMPolicyUtilities.java | 78 +-
.../cxf/ws/rm/policy/RSPAssertionBuilder.java | 6 +-
.../cxf/ws/rm/policy/RSPPolicyLoader.java | 6 +-
.../cxf/ws/rm/policy/WSRMP12PolicyLoader.java | 6 +-
.../cxf/ws/rm/soap/RMSoapInInterceptor.java | 96 +-
.../cxf/ws/rm/soap/RMSoapOutInterceptor.java | 30 +-
.../cxf/ws/rm/soap/RedeliveryQueueImpl.java | 76 +-
.../cxf/ws/rm/soap/RetransmissionQueueImpl.java | 116 +-
.../apache/cxf/ws/rm/soap/SoapFaultFactory.java | 26 +-
.../cxf/ws/rm/spring/NamespaceHandler.java | 2 +-
.../spring/RMFeatureBeanDefinitionParser.java | 30 +-
.../spring/RMManagerBeanDefinitionParser.java | 28 +-
.../spring/RMTxStoreBeanDefinitionParser.java | 4 +-
.../apache/cxf/ws/rm/AbstractEndpointTest.java | 14 +-
.../cxf/ws/rm/AbstractRMInterceptorTest.java | 38 +-
.../apache/cxf/ws/rm/AbstractSequenceTest.java | 12 +-
.../cxf/ws/rm/DestinationSequenceTest.java | 238 ++--
.../org/apache/cxf/ws/rm/DestinationTest.java | 50 +-
.../apache/cxf/ws/rm/ManagedRMManagerTest.java | 160 +--
.../apache/cxf/ws/rm/ProtocolVariationTest.java | 6 +-
.../java/org/apache/cxf/ws/rm/ProxyTest.java | 120 +--
.../apache/cxf/ws/rm/RMContextUtilsTest.java | 46 +-
.../org/apache/cxf/ws/rm/RMEndpointTest.java | 8 +-
.../apache/cxf/ws/rm/RMInInterceptorTest.java | 134 +--
.../cxf/ws/rm/RMManagerConfigurationTest.java | 36 +-
.../org/apache/cxf/ws/rm/RMManagerTest.java | 240 ++---
.../apache/cxf/ws/rm/RMOutInterceptorTest.java | 54 +-
.../java/org/apache/cxf/ws/rm/RMUtilsTest.java | 20 +-
.../java/org/apache/cxf/ws/rm/ServantTest.java | 120 +--
.../apache/cxf/ws/rm/SourceSequenceTest.java | 148 +--
.../cxf/ws/rm/blueprint/RMBPHandlerTest.java | 4 +-
.../ws/rm/persistence/PersistenceUtilsTest.java | 12 +-
.../ws/rm/persistence/RMLargeMessageTest.java | 4 +-
.../cxf/ws/rm/persistence/RMMessageTest.java | 14 +-
.../jdbc/RMTxStoreConfigurationTest.java | 30 +-
.../jdbc/RMTxStorePooledConnectionTest.java | 10 +-
.../ws/rm/persistence/jdbc/RMTxStoreTest.java | 30 +-
.../rm/persistence/jdbc/RMTxStoreTestBase.java | 348 +++---
.../jdbc/RMTxStoreTwoSchemasTest.java | 274 ++---
.../persistence/jdbc/RMTxStoreUpgradeTest.java | 58 +-
.../cxf/ws/rm/policy/PolicyUtilsTest.java | 44 +-
.../cxf/ws/rm/soap/RMSoapInInterceptorTest.java | 12 +-
.../ws/rm/soap/RMSoapOutInterceptorTest.java | 54 +-
.../ws/rm/soap/RetransmissionQueueImplTest.java | 122 +--
.../cxf/ws/rm/soap/SoapFaultFactoryTest.java | 62 +-
.../cxf/ws/security/SecurityConstants.java | 216 ++--
.../security/cache/CXFEHCacheReplayCache.java | 6 +-
.../ws/security/cache/CacheCleanupListener.java | 12 +-
.../cxf/ws/security/cache/EHCacheUtils.java | 8 +-
.../ws/security/kerberos/KerberosClient.java | 18 +-
.../cxf/ws/security/kerberos/KerberosUtils.java | 38 +-
.../cxf/ws/security/policy/PolicyUtils.java | 20 +-
.../security/policy/WSSecurityPolicyLoader.java | 44 +-
.../policy/custom/AlgorithmSuiteBuilder.java | 6 +-
.../custom/DefaultAlgorithmSuiteLoader.java | 22 +-
.../HttpsTokenInterceptorProvider.java | 106 +-
.../IssuedTokenInterceptorProvider.java | 54 +-
.../KerberosTokenInterceptorProvider.java | 86 +-
.../policy/interceptors/NegotiationUtils.java | 46 +-
.../policy/interceptors/STSInvoker.java | 44 +-
.../interceptors/STSTokenOutInterceptor.java | 26 +-
.../SamlTokenInterceptorProvider.java | 8 +-
.../SecureConversationInInterceptor.java | 96 +-
.../SecureConversationOutInterceptor.java | 28 +-
...ureConversationTokenInterceptorProvider.java | 20 +-
.../SecurityVerificationOutInterceptor.java | 26 +-
.../SpnegoContextTokenInInterceptor.java | 118 +-
.../SpnegoContextTokenOutInterceptor.java | 36 +-
.../SpnegoTokenInterceptorProvider.java | 20 +-
.../UsernameTokenInterceptorProvider.java | 10 +-
.../WSSecurityInterceptorProvider.java | 12 +-
.../WSSecurityPolicyInterceptorProvider.java | 8 +-
.../ws/security/sts/provider/STSException.java | 28 +-
.../sts/provider/SecurityTokenService.java | 50 +-
.../sts/provider/SecurityTokenServiceImpl.java | 12 +-
.../provider/SecurityTokenServiceProvider.java | 80 +-
.../sts/provider/operation/CancelOperation.java | 2 +-
.../sts/provider/operation/IssueOperation.java | 2 +-
.../provider/operation/ValidateOperation.java | 2 +-
.../security/tokenstore/EHCacheTokenStore.java | 26 +-
.../tokenstore/EHCacheTokenStoreFactory.java | 4 +-
.../security/tokenstore/MemoryTokenStore.java | 32 +-
.../tokenstore/MemoryTokenStoreFactory.java | 4 +-
.../ws/security/tokenstore/SecurityToken.java | 142 +--
.../cxf/ws/security/tokenstore/TokenStore.java | 10 +-
.../security/tokenstore/TokenStoreFactory.java | 14 +-
.../ws/security/tokenstore/TokenStoreUtils.java | 6 +-
.../ws/security/trust/AbstractSTSClient.java | 278 ++---
.../trust/AuthPolicyValidatingInterceptor.java | 16 +-
.../security/trust/DefaultSymmetricBinding.java | 8 +-
.../cxf/ws/security/trust/STSAuthParams.java | 12 +-
.../apache/cxf/ws/security/trust/STSClient.java | 30 +-
.../cxf/ws/security/trust/STSLoginModule.java | 88 +-
.../trust/STSSamlAssertionValidator.java | 16 +-
.../security/trust/STSStaxTokenValidator.java | 136 +--
.../ws/security/trust/STSTokenRetriever.java | 6 +-
.../ws/security/trust/STSTokenValidator.java | 56 +-
.../apache/cxf/ws/security/trust/STSUtils.java | 110 +-
.../cxf/ws/security/trust/TrustException.java | 4 +-
.../security/trust/claims/ClaimsCallback.java | 20 +-
.../trust/claims/RoleClaimsCallbackHandler.java | 12 +-
.../trust/delegation/DelegationCallback.java | 20 +-
.../ReceivedTokenCallbackHandler.java | 30 +-
.../delegation/WSSUsernameCallbackHandler.java | 16 +-
.../wss4j/AbstractTokenInterceptor.java | 48 +-
...tUsernameTokenAuthenticatingInterceptor.java | 86 +-
.../wss4j/AbstractWSS4JInterceptor.java | 40 +-
.../wss4j/AbstractWSS4JStaxInterceptor.java | 96 +-
.../wss4j/AlgorithmSuiteTranslater.java | 46 +-
.../wss4j/AttachmentCallbackHandler.java | 12 +-
.../wss4j/BinarySecurityTokenInterceptor.java | 28 +-
.../ws/security/wss4j/CXFCallbackLookup.java | 6 +-
.../cxf/ws/security/wss4j/CXFRequestData.java | 8 +-
.../security/wss4j/CryptoCoverageChecker.java | 76 +-
.../ws/security/wss4j/CryptoCoverageUtil.java | 92 +-
.../wss4j/DefaultCryptoCoverageChecker.java | 84 +-
.../DefaultWSS4JSecurityContextCreator.java | 52 +-
.../wss4j/DelegatingCallbackHandler.java | 6 +-
.../wss4j/KerberosTokenInterceptor.java | 6 +-
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 150 +--
.../wss4j/PolicyBasedWSS4JOutInterceptor.java | 44 +-
.../PolicyBasedWSS4JStaxInInterceptor.java | 106 +-
.../PolicyBasedWSS4JStaxOutInterceptor.java | 48 +-
.../ws/security/wss4j/SamlTokenInterceptor.java | 62 +-
.../security/wss4j/StaxActionInInterceptor.java | 44 +-
.../wss4j/StaxCryptoCoverageChecker.java | 138 +--
.../wss4j/StaxSecurityContextInInterceptor.java | 62 +-
.../cxf/ws/security/wss4j/StaxSerializer.java | 28 +-
.../wss4j/TokenStoreCallbackHandler.java | 4 +-
.../wss4j/UsernameTokenInterceptor.java | 110 +-
.../ws/security/wss4j/WSS4JInInterceptor.java | 178 +--
.../ws/security/wss4j/WSS4JOutInterceptor.java | 80 +-
.../ws/security/wss4j/WSS4JPolicyAsserter.java | 8 +-
.../wss4j/WSS4JSecurityContextCreator.java | 4 +-
.../security/wss4j/WSS4JStaxInInterceptor.java | 130 +--
.../security/wss4j/WSS4JStaxOutInterceptor.java | 76 +-
.../ws/security/wss4j/WSS4JTokenConverter.java | 8 +-
.../cxf/ws/security/wss4j/WSS4JUtils.java | 78 +-
.../policyhandlers/AbstractBindingBuilder.java | 582 +++++-----
.../AbstractCommonBindingHandler.java | 88 +-
.../AbstractStaxBindingHandler.java | 286 ++---
.../AsymmetricBindingHandler.java | 162 +--
.../StaxAsymmetricBindingHandler.java | 116 +-
.../StaxSymmetricBindingHandler.java | 172 +--
.../StaxTransportBindingHandler.java | 110 +-
.../policyhandlers/SymmetricBindingHandler.java | 222 ++--
.../policyhandlers/TransportBindingHandler.java | 140 +--
.../policyhandlers/WSSecurityTokenHolder.java | 6 +-
.../AbstractBindingPolicyValidator.java | 106 +-
.../AbstractSamlPolicyValidator.java | 4 +-
.../AbstractSecurityPolicyValidator.java | 4 +-
.../AbstractSupportingTokenPolicyValidator.java | 210 ++--
.../AlgorithmSuitePolicyValidator.java | 80 +-
.../AsymmetricBindingPolicyValidator.java | 54 +-
.../policyvalidators/ClaimsPolicyValidator.java | 6 +-
.../ConcreteSupportingTokenPolicyValidator.java | 24 +-
.../DefaultClaimsPolicyValidator.java | 44 +-
.../EncryptedTokenPolicyValidator.java | 28 +-
.../EndorsingEncryptedTokenPolicyValidator.java | 30 +-
.../EndorsingTokenPolicyValidator.java | 24 +-
.../IssuedTokenPolicyValidator.java | 54 +-
.../KerberosTokenPolicyValidator.java | 54 +-
.../policyvalidators/LayoutPolicyValidator.java | 66 +-
.../PolicyValidatorParameters.java | 24 +-
.../RequiredElementsPolicyValidator.java | 14 +-
.../RequiredPartsPolicyValidator.java | 12 +-
.../SamlTokenPolicyValidator.java | 30 +-
.../SecuredElementsPolicyValidator.java | 30 +-
.../SecuredPartsPolicyValidator.java | 34 +-
.../SecurityContextTokenPolicyValidator.java | 14 +-
.../SecurityPolicyValidator.java | 6 +-
.../SignedEncryptedTokenPolicyValidator.java | 30 +-
...dEndorsingEncryptedTokenPolicyValidator.java | 28 +-
.../SignedEndorsingTokenPolicyValidator.java | 24 +-
.../SignedTokenPolicyValidator.java | 22 +-
.../SymmetricBindingPolicyValidator.java | 36 +-
.../TransportBindingPolicyValidator.java | 18 +-
.../UsernameTokenPolicyValidator.java | 36 +-
.../wss4j/policyvalidators/ValidatorUtils.java | 24 +-
.../policyvalidators/WSS11PolicyValidator.java | 22 +-
.../X509TokenPolicyValidator.java | 52 +-
.../cxf/ws/security/cache/EHCacheUtilsTest.java | 24 +-
.../cxf/ws/security/sts/STSClientTest.java | 24 +-
.../tokenstore/EHCacheTokenStoreTest.java | 12 +-
.../tokenstore/MemoryTokenStoreTest.java | 16 +-
.../AuthPolicyValidatingInterceptorTest.java | 34 +-
.../wss4j/AbstractPolicySecurityTest.java | 240 ++---
.../ws/security/wss4j/AbstractSecurityTest.java | 14 +-
.../wss4j/CryptoCoverageCheckerTest.java | 60 +-
.../wss4j/CustomPolicyAlgorithmsTest.java | 4 +-
.../cxf/ws/security/wss4j/CustomProcessor.java | 8 +-
.../DOMToStaxEncryptionIdentifierTest.java | 80 +-
.../security/wss4j/DOMToStaxRoundTripTest.java | 220 ++--
.../wss4j/DOMToStaxSignatureIdentifierTest.java | 78 +-
.../wss4j/DefaultCryptoCoverageCheckerTest.java | 38 +-
.../wss4j/KeystorePasswordCallback.java | 10 +-
.../wss4j/PluggablePolicyValidatorTest.java | 20 +-
.../wss4j/PolicyBasedWss4JInOutTest.java | 108 +-
.../cxf/ws/security/wss4j/RoundTripTest.java | 4 +-
.../security/wss4j/SecurityActionTokenTest.java | 34 +-
.../wss4j/SecurityVerificationOutTest.java | 20 +-
.../wss4j/SignatureConfirmationTest.java | 28 +-
.../wss4j/SimpleSubjectCreatingInterceptor.java | 8 +-
.../wss4j/StaxCryptoCoverageCheckerTest.java | 156 +--
.../security/wss4j/StaxRoundTripActionTest.java | 256 ++---
.../ws/security/wss4j/StaxRoundTripTest.java | 400 +++----
.../StaxToDOMEncryptionIdentifierTest.java | 80 +-
.../security/wss4j/StaxToDOMRoundTripTest.java | 428 ++++----
.../wss4j/StaxToDOMSignatureIdentifierTest.java | 78 +-
.../wss4j/UserNameTokenAuthorizationTest.java | 34 +-
.../ws/security/wss4j/WSS4JFaultCodeTest.java | 36 +-
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 122 +--
.../security/wss4j/WSS4JOutInterceptorTest.java | 28 +-
.../wss4j/WSS4JPrincipalInterceptor.java | 12 +-
.../wss4j/saml/AbstractSAMLCallbackHandler.java | 34 +-
.../wss4j/saml/CustomSamlValidator.java | 22 +-
.../wss4j/saml/CustomStaxSamlValidator.java | 20 +-
.../security/wss4j/saml/DOMToStaxSamlTest.java | 106 +-
.../wss4j/saml/PasswordCallbackHandler.java | 2 +-
.../wss4j/saml/PolicyBasedSamlTest.java | 10 +-
.../wss4j/saml/SAML1CallbackHandler.java | 16 +-
.../wss4j/saml/SAML2CallbackHandler.java | 18 +-
.../ws/security/wss4j/saml/SamlTokenTest.java | 174 +--
.../security/wss4j/saml/StaxToDOMSamlTest.java | 216 ++--
.../apache/cxf/ws/transfer/dialect/Dialect.java | 10 +-
.../fragment/FragmentDialectConstants.java | 26 +-
.../language/FragmentDialectLanguage.java | 4 +-
.../language/FragmentDialectLanguageQName.java | 8 +-
.../FragmentDialectLanguageXPath10.java | 10 +-
.../ws/transfer/manager/ResourceManager.java | 10 +-
.../cxf/ws/transfer/resource/ResourceLocal.java | 22 +-
.../ws/transfer/resource/ResourceRemote.java | 2 +-
.../resourcefactory/ResourceFactoryImpl.java | 22 +-
.../resolver/ResourceReference.java | 12 +-
.../resolver/ResourceResolver.java | 6 +-
.../resolver/SimpleResourceResolver.java | 16 +-
.../ws/transfer/shared/TransferConstants.java | 16 +-
.../ResourceTransformer.java | 2 +-
.../ResourceTypeIdentifierResult.java | 12 +-
.../ResourceValidator.java | 2 +-
.../ValidAndTransformHelper.java | 8 +-
.../integration/FragmentGetQNameTest.java | 52 +-
.../integration/FragmentGetXPath10Test.java | 112 +-
.../integration/FragmentPutAddTest.java | 48 +-
.../integration/FragmentPutInsertAfterTest.java | 40 +-
.../FragmentPutInsertBeforeTest.java | 40 +-
.../integration/FragmentPutRemoveTest.java | 24 +-
.../integration/FragmentPutReplaceTest.java | 74 +-
.../integration/IntegrationBaseTest.java | 44 +-
.../integration/ResourceFactoryTest.java | 36 +-
.../ws/transfer/integration/ResourceTest.java | 44 +-
.../unit/MemoryResourceManagerTest.java | 52 +-
.../transfer/unit/XSDResourceValidatorTest.java | 8 +-
.../unit/XSLTResourceTransformerTest.java | 6 +-
.../cxf/wsdl/JAXBExtensibilityElement.java | 2 +-
.../apache/cxf/wsdl/JAXBExtensionHelper.java | 124 +--
.../cxf/wsdl/TExtensibilityElementImpl.java | 4 +-
.../cxf/wsdl/WSAEndpointReferenceUtils.java | 28 +-
.../java/org/apache/cxf/wsdl/WSDLConstants.java | 24 +-
.../apache/cxf/wsdl/WSDLExtensionLoader.java | 2 +-
.../java/org/apache/cxf/wsdl/WSDLHelper.java | 4 +-
.../java/org/apache/cxf/wsdl/WSDLLibrary.java | 8 +-
.../java/org/apache/cxf/wsdl/WSDLManager.java | 30 +-
.../binding/AbstractWSDLBindingFactory.java | 12 +-
.../AbstractEndpointSelectionInterceptor.java | 4 +-
.../wsdl/interceptors/BareInInterceptor.java | 4 +-
.../wsdl/interceptors/BareOutInterceptor.java | 6 +-
.../interceptors/DocLiteralInInterceptor.java | 78 +-
.../interceptors/WrappedOutInterceptor.java | 6 +-
.../factory/AbstractServiceConfiguration.java | 56 +-
.../cxf/wsdl/service/factory/ClassReader.java | 6 +-
.../factory/DefaultServiceConfiguration.java | 42 +-
...ethodNameSoapActionServiceConfiguration.java | 2 +-
.../cxf/wsdl/service/factory/ParamReader.java | 12 +-
.../factory/ReflectionServiceFactoryBean.java | 28 +-
.../factory/WSDLBasedServiceConfiguration.java | 2 +-
.../factory/XercesSchemaValidationUtils.java | 26 +-
.../factory/XercesXsdValidationImpl.java | 2 +-
.../cxf/wsdl11/AbstractWrapperWSDLLocator.java | 8 +-
.../apache/cxf/wsdl11/CatalogWSDLLocator.java | 10 +-
.../java/org/apache/cxf/wsdl11/NSManager.java | 4 +-
.../apache/cxf/wsdl11/PartialWSDLProcessor.java | 38 +-
.../cxf/wsdl11/ResourceManagerWSDLLocator.java | 4 +-
.../org/apache/cxf/wsdl11/SOAPBindingUtil.java | 4 +-
.../org/apache/cxf/wsdl11/SchemaSerializer.java | 2 +-
.../java/org/apache/cxf/wsdl11/SchemaUtil.java | 34 +-
.../apache/cxf/wsdl11/ServiceWSDLBuilder.java | 128 +--
.../apache/cxf/wsdl11/WSDLEndpointFactory.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLManagerImpl.java | 56 +-
.../apache/cxf/wsdl11/WSDLRuntimeException.java | 4 +-
.../apache/cxf/wsdl11/WSDLServiceBuilder.java | 26 +-
.../apache/cxf/wsdl11/WSDLServiceFactory.java | 14 +-
.../cxf/wsdl/JAXBExtensionHelperTest.java | 10 +-
.../DocLiteralInInterceptorTest.java | 70 +-
.../ReflectionServiceFactorBeanTest.java | 18 +-
.../cxf/wsdl11/ServiceWSDLBuilderTest.java | 76 +-
.../apache/cxf/wsdl11/WSDLManagerImplTest.java | 28 +-
.../cxf/wsdl11/WSDLServiceBuilderTest.java | 102 +-
.../java/org/apache/cxf/sts/IdentityMapper.java | 2 +-
.../java/org/apache/cxf/sts/QNameConstants.java | 74 +-
.../java/org/apache/cxf/sts/RealmParser.java | 6 +-
.../java/org/apache/cxf/sts/STSConstants.java | 64 +-
.../org/apache/cxf/sts/STSPropertiesMBean.java | 58 +-
.../org/apache/cxf/sts/SignatureProperties.java | 18 +-
.../org/apache/cxf/sts/StaticSTSProperties.java | 88 +-
.../cxf/sts/cache/AbstractIdentityCache.java | 28 +-
.../org/apache/cxf/sts/cache/CacheUtils.java | 12 +-
.../sts/cache/DefaultInMemoryTokenStore.java | 2 +-
.../cxf/sts/cache/EHCacheIdentityCache.java | 28 +-
.../org/apache/cxf/sts/cache/IdentityCache.java | 10 +-
.../cxf/sts/cache/MemoryIdentityCache.java | 26 +-
.../cache/MemoryIdentityCacheStatistics.java | 12 +-
.../org/apache/cxf/sts/claims/ClaimTypes.java | 80 +-
.../ClaimsAttributeStatementProvider.java | 14 +-
.../apache/cxf/sts/claims/ClaimsHandler.java | 1 -
.../apache/cxf/sts/claims/ClaimsManager.java | 76 +-
.../org/apache/cxf/sts/claims/ClaimsMapper.java | 2 +-
.../apache/cxf/sts/claims/ClaimsParameters.java | 24 +-
.../org/apache/cxf/sts/claims/ClaimsParser.java | 2 +-
.../org/apache/cxf/sts/claims/ClaimsUtils.java | 8 +-
.../cxf/sts/claims/IdentityClaimsParser.java | 14 +-
.../cxf/sts/claims/LdapClaimsHandler.java | 48 +-
.../cxf/sts/claims/LdapGroupClaimsHandler.java | 62 +-
.../org/apache/cxf/sts/claims/LdapUtils.java | 46 +-
.../apache/cxf/sts/claims/ProcessedClaim.java | 6 +-
.../sts/claims/ProcessedClaimCollection.java | 2 +-
.../cxf/sts/claims/StaticClaimsHandler.java | 12 +-
.../sts/claims/StaticEndpointClaimsHandler.java | 12 +-
.../cxf/sts/claims/mapper/ClaimUtils.java | 20 +-
.../claims/mapper/PassThroughClaimsMapper.java | 4 +-
.../apache/cxf/sts/event/AbstractSTSEvent.java | 4 +-
.../cxf/sts/event/AbstractSTSFailureEvent.java | 8 +-
.../cxf/sts/event/AbstractSTSSuccessEvent.java | 4 +-
.../cxf/sts/event/LoggerPatternLayoutLog4J.java | 16 +-
.../sts/event/LoggerPatternLayoutLogback.java | 6 +-
.../cxf/sts/event/STSCancelFailureEvent.java | 4 +-
.../cxf/sts/event/STSCancelSuccessEvent.java | 8 +-
.../apache/cxf/sts/event/STSEventListener.java | 2 +-
.../apache/cxf/sts/event/STSFailureEvent.java | 2 +-
.../cxf/sts/event/STSIssueFailureEvent.java | 8 +-
.../cxf/sts/event/STSIssueSuccessEvent.java | 4 +-
.../cxf/sts/event/STSRenewFailureEvent.java | 10 +-
.../cxf/sts/event/STSRenewSuccessEvent.java | 6 +-
.../cxf/sts/event/STSValidateFailureEvent.java | 8 +-
.../cxf/sts/event/STSValidateSuccessEvent.java | 8 +-
.../event/TokenCancellerParametersSupport.java | 4 +-
.../event/TokenProviderParametersSupport.java | 4 +-
.../event/TokenRenewerParametersSupport.java | 4 +-
.../event/TokenValidatorParametersSupport.java | 4 +-
.../apache/cxf/sts/event/map/EventMapper.java | 8 +-
.../org/apache/cxf/sts/event/map/MapEvent.java | 2 +-
.../cxf/sts/event/map/MapEventLogger.java | 6 +-
.../cxf/sts/interceptor/SCTInInterceptor.java | 8 +-
.../cxf/sts/interceptor/SCTOutInterceptor.java | 6 +-
.../cxf/sts/operation/AbstractOperation.java | 152 +--
.../cxf/sts/operation/DefaultTokenWrapper.java | 4 +-
.../cxf/sts/operation/TokenCancelOperation.java | 42 +-
.../cxf/sts/operation/TokenIssueOperation.java | 96 +-
.../cxf/sts/operation/TokenRenewOperation.java | 70 +-
.../TokenRequestCollectionOperation.java | 22 +-
.../sts/operation/TokenValidateOperation.java | 90 +-
.../apache/cxf/sts/operation/TokenWrapper.java | 6 +-
.../DefaultSecurityTokenServiceProvider.java | 34 +-
.../apache/cxf/sts/request/BinarySecret.java | 8 +-
.../org/apache/cxf/sts/request/Entropy.java | 8 +-
.../apache/cxf/sts/request/KeyRequirements.java | 44 +-
.../org/apache/cxf/sts/request/Lifetime.java | 6 +-
.../apache/cxf/sts/request/Participants.java | 10 +-
.../org/apache/cxf/sts/request/ReceivedKey.java | 6 +-
.../apache/cxf/sts/request/ReceivedToken.java | 22 +-
.../org/apache/cxf/sts/request/Renewing.java | 2 +-
.../apache/cxf/sts/request/RequestParser.java | 136 +--
.../cxf/sts/request/RequestRequirements.java | 10 +-
.../cxf/sts/request/TokenRequirements.java | 38 +-
.../cxf/sts/rest/RESTSecurityTokenService.java | 12 +-
.../sts/rest/RESTSecurityTokenServiceImpl.java | 98 +-
.../cxf/sts/service/EncryptionProperties.java | 28 +-
.../apache/cxf/sts/service/ServiceMBean.java | 18 +-
.../apache/cxf/sts/service/StaticService.java | 22 +-
.../cxf/sts/token/canceller/SCTCanceller.java | 38 +-
.../cxf/sts/token/canceller/TokenCanceller.java | 4 +-
.../canceller/TokenCancellerParameters.java | 14 +-
.../token/canceller/TokenCancellerResponse.java | 4 +-
.../token/delegation/HOKDelegationHandler.java | 8 +-
.../token/delegation/SAMLDelegationHandler.java | 28 +-
.../delegation/TokenDelegationHandler.java | 6 +-
.../delegation/TokenDelegationParameters.java | 16 +-
.../delegation/TokenDelegationResponse.java | 8 +-
.../UsernameTokenDelegationHandler.java | 8 +-
.../provider/AbstractSAMLTokenProvider.java | 14 +-
.../ActAsAttributeStatementProvider.java | 18 +-
.../provider/AttributeStatementProvider.java | 2 +-
.../provider/AuthDecisionStatementProvider.java | 2 +-
.../AuthenticationStatementProvider.java | 2 +-
.../sts/token/provider/ConditionsProvider.java | 6 +-
.../DefaultAttributeStatementProvider.java | 12 +-
.../provider/DefaultConditionsProvider.java | 54 +-
.../token/provider/DefaultSubjectProvider.java | 2 +-
.../sts/token/provider/SAMLTokenProvider.java | 124 +--
.../cxf/sts/token/provider/SCTProvider.java | 50 +-
.../sts/token/provider/SamlCallbackHandler.java | 30 +-
.../sts/token/provider/SamlCustomHandler.java | 64 +-
.../cxf/sts/token/provider/SubjectProvider.java | 2 +-
.../provider/SubjectProviderParameters.java | 26 +-
.../sts/token/provider/SymmetricKeyHandler.java | 42 +-
.../cxf/sts/token/provider/TokenProvider.java | 4 +-
.../token/provider/TokenProviderParameters.java | 22 +-
.../token/provider/TokenProviderResponse.java | 24 +-
.../sts/token/provider/TokenProviderUtils.java | 50 +-
.../cxf/sts/token/provider/TokenReference.java | 24 +-
.../provider/jwt/DefaultJWTClaimsProvider.java | 82 +-
.../token/provider/jwt/JWTClaimsProvider.java | 2 +-
.../jwt/JWTClaimsProviderParameters.java | 8 +-
.../token/provider/jwt/JWTTokenProvider.java | 70 +-
.../sts/token/realm/CertConstraintsParser.java | 10 +-
.../cxf/sts/token/realm/JWTRealmCodec.java | 4 +-
.../cxf/sts/token/realm/RealmProperties.java | 46 +-
.../cxf/sts/token/realm/RealmSupport.java | 3 +-
.../cxf/sts/token/realm/Relationship.java | 28 +-
.../sts/token/realm/RelationshipResolver.java | 16 +-
.../apache/cxf/sts/token/realm/SAMLRealm.java | 2 +-
.../cxf/sts/token/realm/SAMLRealmCodec.java | 4 +-
.../token/realm/UsernameTokenRealmCodec.java | 4 +-
.../cxf/sts/token/renewer/SAMLTokenRenewer.java | 134 +--
.../cxf/sts/token/renewer/TokenRenewer.java | 8 +-
.../token/renewer/TokenRenewerParameters.java | 22 +-
.../sts/token/renewer/TokenRenewerResponse.java | 24 +-
.../token/validator/DefaultSAMLRoleParser.java | 16 +-
.../validator/DefaultSubjectRoleParser.java | 18 +-
.../cxf/sts/token/validator/SAMLRoleParser.java | 2 +-
.../sts/token/validator/SAMLTokenValidator.java | 88 +-
.../cxf/sts/token/validator/SCTValidator.java | 20 +-
.../sts/token/validator/SubjectRoleParser.java | 6 +-
.../cxf/sts/token/validator/TokenValidator.java | 4 +-
.../validator/TokenValidatorParameters.java | 16 +-
.../token/validator/TokenValidatorResponse.java | 16 +-
.../token/validator/UsernameTokenValidator.java | 64 +-
.../sts/token/validator/X509TokenValidator.java | 28 +-
.../validator/jwt/DefaultJWTRoleParser.java | 10 +-
.../sts/token/validator/jwt/JWTRoleParser.java | 2 +-
.../token/validator/jwt/JWTTokenValidator.java | 48 +-
.../cxf/sts/cache/CacheIdentityMapper.java | 10 +-
.../cxf/sts/cache/EhCacheIdentityCacheTest.java | 38 +-
.../cxf/sts/cache/HazelCastTokenStoreTest.java | 16 +-
.../cxf/sts/cache/MemoryIdentityCacheTest.java | 32 +-
.../sts/claims/mapper/JexlClaimsMapperTest.java | 12 +-
.../claims/mapper/JexlIssueSamlClaimsTest.java | 2 +-
.../cxf/sts/common/CustomAttributeProvider.java | 28 +-
.../cxf/sts/common/CustomClaimParser.java | 12 +-
.../cxf/sts/common/CustomClaimsHandler.java | 32 +-
.../cxf/sts/common/CustomUserClaimsHandler.java | 20 +-
.../sts/common/RealmSupportClaimsHandler.java | 24 +-
.../org/apache/cxf/sts/common/TestUtils.java | 4 +-
.../cxf/sts/operation/CancelSCTUnitTest.java | 64 +-
.../cxf/sts/operation/CustomClaimsMapper.java | 6 +-
.../cxf/sts/operation/CustomRealmParser.java | 4 +-
.../CustomUsernameTokenRealmCodec.java | 4 +-
.../cxf/sts/operation/DummyTokenProvider.java | 26 +-
.../cxf/sts/operation/DummyTokenValidator.java | 18 +-
.../sts/operation/IssueEncryptedUnitTest.java | 190 ++--
.../sts/operation/IssueJWTClaimsUnitTest.java | 244 ++---
.../operation/IssueJWTOnbehalfofUnitTest.java | 116 +-
.../sts/operation/IssueJWTRealmUnitTest.java | 150 +--
.../cxf/sts/operation/IssueJWTUnitTest.java | 56 +-
.../sts/operation/IssueOnbehalfofUnitTest.java | 290 ++---
.../cxf/sts/operation/IssueSCTUnitTest.java | 108 +-
.../sts/operation/IssueSamlClaimsUnitTest.java | 326 +++---
.../sts/operation/IssueSamlRealmUnitTest.java | 184 ++--
.../cxf/sts/operation/IssueSamlUnitTest.java | 578 +++++-----
.../apache/cxf/sts/operation/IssueUnitTest.java | 190 ++--
.../cxf/sts/operation/RenewSamlUnitTest.java | 182 ++--
.../ValidateJWTTransformationTest.java | 150 +--
.../cxf/sts/operation/ValidateJWTUnitTest.java | 64 +-
.../cxf/sts/operation/ValidateSCTUnitTest.java | 68 +-
.../cxf/sts/operation/ValidateSamlUnitTest.java | 76 +-
.../ValidateTokenTransformationUnitTest.java | 312 +++---
.../cxf/sts/operation/ValidateUnitTest.java | 122 +--
.../ValidateUsernameTokenUnitTest.java | 80 +-
.../operation/ValidateX509TokenUnitTest.java | 86 +-
.../cxf/sts/request/RequestParserUnitTest.java | 62 +-
.../sts/token/canceller/SCTCancellerTest.java | 64 +-
.../provider/CustomAuthDecisionProvider.java | 4 +-
.../provider/CustomAuthenticationProvider.java | 6 +-
.../token/provider/CustomSubjectProvider.java | 14 +-
.../cxf/sts/token/provider/JWTClaimsTest.java | 106 +-
.../token/provider/JWTProviderActAsTest.java | 62 +-
.../token/provider/JWTProviderLifetimeTest.java | 156 +--
.../provider/JWTProviderOnBehalfOfTest.java | 62 +-
.../provider/JWTTokenProviderRealmTest.java | 32 +-
.../token/provider/JWTTokenProviderTest.java | 160 +--
.../cxf/sts/token/provider/SAMLClaimsTest.java | 168 +--
.../token/provider/SAMLProviderActAsTest.java | 160 +--
.../token/provider/SAMLProviderCustomTest.java | 118 +-
.../token/provider/SAMLProviderKeyTypeTest.java | 214 ++--
.../provider/SAMLProviderLifetimeTest.java | 142 +--
.../provider/SAMLProviderOnBehalfOfTest.java | 84 +-
.../token/provider/SAMLProviderRealmTest.java | 48 +-
.../cxf/sts/token/provider/SCTProviderTest.java | 76 +-
.../cxf/sts/token/realm/RealmSupportTest.java | 84 +-
.../renewer/SAMLTokenRenewerLifetimeTest.java | 120 +--
.../token/renewer/SAMLTokenRenewerPOPTest.java | 94 +-
.../renewer/SAMLTokenRenewerRealmTest.java | 102 +-
.../sts/token/renewer/SAMLTokenRenewerTest.java | 200 ++--
.../token/validator/CacheSAMLRealmCodec.java | 2 +-
.../token/validator/IssuerSAMLRealmCodec.java | 4 +-
.../validator/JWTTokenValidatorRealmTest.java | 86 +-
.../token/validator/JWTTokenValidatorTest.java | 158 +--
.../SAMLTokenValidatorCachedRealmTest.java | 72 +-
.../validator/SAMLTokenValidatorRealmTest.java | 74 +-
.../token/validator/SAMLTokenValidatorTest.java | 242 ++---
.../sts/token/validator/SCTValidatorTest.java | 68 +-
.../validator/UsernameTokenValidatorTest.java | 88 +-
.../token/validator/X509TokenValidatorTest.java | 62 +-
.../AsymmetricEncryptionTest.java | 22 +-
.../systest/sts/asymmetric_encr/STSServer.java | 2 +-
.../sts/asymmetric_encr/StaxSTSServer.java | 2 +-
.../sts/basic_auth/DoubleItPortTypeImpl.java | 10 +-
.../sts/basic_auth/JaxrsBasicAuthTest.java | 16 +-
.../sts/basic_auth/JaxwsBasicAuthTest.java | 36 +-
.../cxf/systest/sts/batch/BatchRequest.java | 6 +-
.../systest/sts/batch/SAMLBatchUnitTest.java | 48 +-
.../apache/cxf/systest/sts/batch/STSServer.java | 2 +-
.../systest/sts/batch/SimpleBatchSTSClient.java | 138 +--
.../cxf/systest/sts/batch/StaxSTSServer.java | 2 +-
.../BinarySecurityTokenTest.java | 40 +-
.../cxf/systest/sts/caching/CachingTest.java | 50 +-
.../sts/caching/DoubleItPortTypeImpl.java | 12 +-
.../systest/sts/caching/ServerCachingTest.java | 64 +-
.../sts/claims/ClaimsCallbackHandler.java | 12 +-
.../cxf/systest/sts/claims/ClaimsTest.java | 124 +--
.../cxf/systest/sts/claims/ClaimsValidator.java | 22 +-
.../systest/sts/claims/StaxClaimsValidator.java | 28 +-
.../sts/common/DoubleItPortTypeImpl.java | 14 +-
.../systest/sts/common/SecurityTestUtil.java | 8 +-
.../cxf/systest/sts/common/TestParam.java | 8 +-
.../cxf/systest/sts/common/TokenTestUtils.java | 12 +-
.../sts/cross_domain/CrossDomainTest.java | 34 +-
.../sts/cross_domain/CrossDomainValidator.java | 4 +-
.../cxf/systest/sts/cross_domain/STSServer.java | 2 +-
.../systest/sts/cross_domain/STSServer2.java | 2 +-
.../systest/sts/custom/CustomClaimsHandler.java | 16 +-
.../systest/sts/custom/CustomParameterTest.java | 82 +-
.../systest/sts/custom/CustomUTValidator.java | 10 +-
.../cxf/systest/sts/custom/STSServer.java | 2 +-
.../CustomBSTTokenValidator.java | 6 +-
.../custom_onbehalfof/CustomOnBehalfOfTest.java | 14 +-
.../sts/custom_onbehalfof/STSServer.java | 2 +-
.../CustomAttributeStatementProvider.java | 12 +-
.../sts/deployment/CustomBSTTokenProvider.java | 16 +-
.../sts/deployment/CustomBSTTokenValidator.java | 16 +-
.../sts/deployment/CustomClaimsHandler.java | 14 +-
.../sts/deployment/CustomClaimsParser.java | 16 +-
.../cxf/systest/sts/deployment/STSServer.java | 2 +-
.../systest/sts/deployment/StaxSTSServer.java | 2 +-
.../CustomUsernameTokenProvider.java | 16 +-
.../DistributedCachingTest.java | 24 +-
.../distributed_caching/SCTTokenValidator.java | 16 +-
.../sts/distributed_caching/STSServer.java | 2 +-
.../sts/distributed_caching/STSServer2.java | 2 +-
.../systest/sts/jwt/DoubleItPortTypeImpl.java | 10 +-
.../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 22 +-
.../cxf/systest/sts/jwt/JaxrsJWTTest.java | 34 +-
.../sts/kerberos/DoubleItPortTypeImpl.java | 14 +-
.../sts/kerberos/IntermediaryPortTypeImpl.java | 26 +-
.../kerberos/JAXRSIntermediaryPortTypeImpl.java | 20 +-
.../kerberos/KerberosDelegationTokenTest.java | 34 +-
.../systest/sts/realms/DifferentRealmTest.java | 34 +-
.../sts/realms/DifferentRealmValidator.java | 6 +-
.../sts/realms/IssuerSAMLRealmCodec.java | 4 +-
.../cxf/systest/sts/realms/STSServer.java | 2 +-
.../cxf/systest/sts/realms/STSServer2.java | 2 +-
.../cxf/systest/sts/realms/URLRealmParser.java | 4 +-
.../cxf/systest/sts/renew/SAMLRenewTest.java | 58 +-
.../systest/sts/renew/SAMLRenewUnitTest.java | 124 +--
.../apache/cxf/systest/sts/renew/STSServer.java | 2 +-
.../cxf/systest/sts/renew/STSServerPOP.java | 2 +-
.../cxf/systest/sts/renew/StaxSTSServer.java | 2 +-
.../sts/renew/UsernameTokenValidator.java | 12 +-
.../sts/secure_conv/DoubleItPortTypeImpl.java | 10 +-
.../sts/secure_conv/SCTSAMLTokenProvider.java | 12 +-
.../sts/secure_conv/SCTTokenValidator.java | 8 +-
.../cxf/systest/sts/secure_conv/STSServer.java | 2 +-
.../sts/secure_conv/SecureConversationTest.java | 30 +-
.../SecurityContextTokenCancelTest.java | 32 +-
.../SecurityContextTokenUnitTest.java | 58 +-
.../systest/sts/secure_conv/StaxSTSServer.java | 2 +-
.../cxf/systest/sts/soap12/Soap12Test.java | 56 +-
.../STSSenderVouchesTest.java | 28 +-
.../sts/sts_sender_vouches/STSServer.java | 2 +-
.../sts_sender_vouches/SVSubjectProvider.java | 6 +-
.../sts/sts_sender_vouches/StaxSTSServer.java | 2 +-
.../transformation/DoubleItPortTypeImpl.java | 16 +-
.../sts/transformation/TransformationTest.java | 26 +-
.../sts/usernametoken/UsernameTokenTest.java | 58 +-
.../sts/asymmetric/AsymmetricBindingTest.java | 70 +-
.../cxf/systest/sts/bearer/BearerTest.java | 44 +-
.../sts/bearer/Saml2CallbackHandler.java | 12 +-
.../cxf/systest/sts/common/DoubleItImpl.java | 10 +-
.../sts/common/DoubleItPortTypeImpl.java | 12 +-
.../systest/sts/common/SecurityTestUtil.java | 8 +-
.../cxf/systest/sts/common/TestParam.java | 8 +-
.../cxf/systest/sts/common/TokenTestUtils.java | 10 +-
.../cxf/systest/sts/common/UriRealmParser.java | 8 +-
.../sts/delegation/SAMLDelegationTest.java | 114 +-
.../sts/deployment/CustomClaimsHandler.java | 14 +-
.../cxf/systest/sts/deployment/STSServer.java | 4 +-
.../systest/sts/deployment/StaxSTSServer.java | 4 +-
.../IntermediaryCachingPortTypeImpl.java | 26 +-
.../IntermediaryPortTypeImpl.java | 22 +-
.../IntermediaryTransformationCachingTest.java | 36 +-
.../IntermediaryTransformationTest.java | 38 +-
.../OnBehalfOfValidator.java | 12 +-
.../cxf/systest/sts/issuer/IssuerTest.java | 34 +-
.../systest/sts/issueunit/IssueUnitTest.java | 178 +--
.../systest/sts/jaas/DoubleItPortTypeImpl.java | 10 +-
.../apache/cxf/systest/sts/jaas/JAASTest.java | 128 +--
.../cxf/systest/sts/rest/STSRESTTest.java | 484 ++++-----
.../sts/sendervouches/DoubleItPortTypeImpl.java | 20 +-
.../sts/sendervouches/Saml2CallbackHandler.java | 18 +-
.../sts/sendervouches/SenderVouchesTest.java | 26 +-
.../systest/sts/stsclient/STSClientTest.java | 24 +-
.../stsclient/STSTokenOutInterceptorTest.java | 78 +-
.../sts/stsclient/STSTokenRetrieverTest.java | 38 +-
.../sts/symmetric/SymmetricBindingTest.java | 116 +-
.../cxf/systest/sts/template/TemplateTest.java | 104 +-
.../sts/transport/TransportBindingTest.java | 136 +--
.../sts/username_actas/ActAsValidator.java | 12 +-
.../UsernameActAsCachingTest.java | 128 +--
.../sts/username_actas/UsernameActAsTest.java | 48 +-
.../UsernameOnBehalfOfCachingTest.java | 140 +--
.../UsernameOnBehalfOfTest.java | 46 +-
.../UsernameTokenValidator.java | 12 +-
.../cxf/systest/sts/x509/AsymmetricServer.java | 2 +-
.../x509/CustomWSS4JSecurityContextCreator.java | 30 +-
.../org/apache/cxf/systest/sts/x509/Server.java | 2 +-
.../apache/cxf/systest/sts/x509/StaxServer.java | 2 +-
.../sts/x509/X509AsymmetricBindingTest.java | 22 +-
.../sts/x509/X509SymmetricBindingTest.java | 84 +-
.../sts/itests/BasicSTSIntegrationTest.java | 2 +-
.../systest/sts/itests/unit/STSUnitTest.java | 30 +-
.../org/apache/cxf/ws/discovery/WSDVersion.java | 24 +-
.../cxf/ws/discovery/WSDiscoveryClient.java | 68 +-
.../cxf/ws/discovery/WSDiscoveryService.java | 8 +-
.../internal/WSDiscoveryServiceImpl.java | 90 +-
.../listeners/WSDiscoveryServerListener.java | 16 +-
.../cxf/ws/discovery/WSDiscoveryClientTest.java | 46 +-
.../org/apache/cxf/wsn/client/Consumer.java | 4 +-
.../apache/cxf/wsn/client/CreatePullPoint.java | 10 +-
.../cxf/wsn/client/NotificationBroker.java | 64 +-
.../org/apache/cxf/wsn/client/Publisher.java | 18 +-
.../org/apache/cxf/wsn/client/PullPoint.java | 2 +-
.../org/apache/cxf/wsn/util/CXFWSNHelper.java | 12 +-
.../org/apache/cxf/wsn/util/IdGenerator.java | 14 +-
.../java/org/apache/cxf/wsn/util/WSNHelper.java | 28 +-
.../org/apache/cxf/wsn/wsdl/WSNWSDLLocator.java | 6 +-
.../apache/cxf/wsn/AbstractCreatePullPoint.java | 14 +-
.../org/apache/cxf/wsn/AbstractEndpoint.java | 4 +-
.../cxf/wsn/AbstractNotificationBroker.java | 60 +-
.../org/apache/cxf/wsn/AbstractPublisher.java | 16 +-
.../org/apache/cxf/wsn/AbstractPullPoint.java | 28 +-
.../apache/cxf/wsn/AbstractSubscription.java | 66 +-
.../apache/cxf/wsn/CreatePullPointMBean.java | 6 +-
.../java/org/apache/cxf/wsn/EndpointMBean.java | 6 +-
.../apache/cxf/wsn/NotificationBrokerMBean.java | 10 +-
.../apache/cxf/wsn/jms/JmsCreatePullPoint.java | 4 +-
.../cxf/wsn/jms/JmsNotificationBroker.java | 8 +-
.../org/apache/cxf/wsn/jms/JmsPublisher.java | 6 +-
.../org/apache/cxf/wsn/jms/JmsPullPoint.java | 10 +-
.../org/apache/cxf/wsn/jms/JmsSubscription.java | 10 +-
.../cxf/wsn/services/JaxwsCreatePullPoint.java | 2 +-
.../cxf/wsn/services/JaxwsEndpointManager.java | 14 +-
.../wsn/services/JaxwsNotificationBroker.java | 4 +-
.../services/JaxwsNotificationBrokerMBean.java | 2 +-
.../cxf/wsn/services/JaxwsSubscription.java | 2 +-
.../wsn/services/OSGiJaxwsEndpointManager.java | 12 +-
.../org/apache/cxf/wsn/services/Service.java | 18 +-
.../test/java/org/apache/cxf/wsn/RiTest.java | 2 +-
.../java/org/apache/cxf/wsn/WsnBrokerTest.java | 54 +-
.../org/apache/cxf/wsn/types/CustomType.java | 16 +-
.../org/apache/cxf/xkms/cache/EHCacheUtil.java | 8 +-
.../cxf/xkms/cache/EHCacheXKMSClientCache.java | 38 +-
.../apache/cxf/xkms/cache/XKMSCacheToken.java | 10 +-
.../apache/cxf/xkms/cache/XKMSClientCache.java | 2 +-
.../cxf/xkms/client/XKMSClientFactory.java | 8 +-
.../org/apache/cxf/xkms/client/XKMSInvoker.java | 12 +-
.../crypto/provider/CryptoProviderUtils.java | 2 +-
.../crypto/provider/XkmsCryptoProvider.java | 60 +-
.../provider/XkmsCryptoProviderFactory.java | 10 +-
.../cxf/xkms/cache/XKMSClientCacheTest.java | 48 +-
.../cxf/xkms/crypto/CryptoProviderFactory.java | 158 +--
.../cxf/xkms/exception/XKMSException.java | 2 +-
.../apache/cxf/xkms/handlers/Applications.java | 4 +-
.../org/apache/cxf/xkms/handlers/DnUtils.java | 6 +-
.../cxf/xkms/handlers/HandlerContext.java | 2 +-
.../org/apache/cxf/xkms/handlers/Register.java | 2 +-
.../handlers/validator/ValidatorCRLTest.java | 16 +-
.../handlers/validator/ValidatorTest.java | 10 +-
.../xkms/itests/service/XKMSServiceTest.java | 6 +-
.../xkms/itests/service/XKRSSDisableTest.java | 2 +-
.../service/CertificateRepoProxyFactory.java | 4 +-
.../apache/cxf/xkms/service/XKMSService.java | 8 +-
.../cxf/xkms/x509/handlers/X509Locator.java | 4 +-
.../x509/repo/file/FileCertificateRepo.java | 16 +-
.../apache/cxf/xkms/x509/utils/X509Utils.java | 2 +-
.../x509/validator/DirectTrustValidator.java | 2 +-
.../validator/TrustedAuthorityValidator.java | 16 +-
.../cxf/xkms/x509/handlers/X509LocatorTest.java | 2 +-
.../TrustedAuthorityValidatorCRLTest.java | 6 +-
.../x509/repo/ldap/LdapCertificateRepo.java | 20 +-
.../cxf/xkms/x509/repo/ldap/LdapSearch.java | 16 +-
.../x509/repo/ldap/LDAPCertificateRepoTest.java | 6 +-
.../cdi/base/AbstractCdiMultiAppTest.java | 6 +-
.../cdi/base/AbstractCdiSingleAppTest.java | 2 +-
.../systests/cdi/base/BookStoreVersioned.java | 2 +-
.../cdi/base/jetty/AbstractJettyServer.java | 26 +-
.../cdi/base/tomcat/AbstractTomcatServer.java | 22 +-
.../jaxrs/cdi/jetty/JettyEmbeddedTest.java | 4 +-
.../systest/jaxrs/cdi/jetty/JettyWarTest.java | 4 +-
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 4 +-
.../jaxrs/cdi/jetty/JettyEmbeddedTest.java | 4 +-
.../systest/jaxrs/cdi/jetty/JettyWarTest.java | 4 +-
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 4 +-
.../jaxrs/cdi/WeldDiscoverableContainer.java | 4 +-
.../jaxrs/cdi/jetty/JettyEmbeddedTest.java | 4 +-
.../systest/jaxrs/cdi/jetty/JettyWarTest.java | 4 +-
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 4 +-
.../jaxrs/cdi/WeldDiscoverableContainer.java | 4 +-
.../jaxrs/cdi/jetty/JettyEmbeddedTest.java | 4 +-
.../systest/jaxrs/cdi/jetty/JettyWarTest.java | 4 +-
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 4 +-
.../cxf/systest/grizzly/EndpointAPITest.java | 12 +-
.../jaxb/service/TestServiceException.java | 4 +-
.../systest/aegis/AegisClientServerTest.java | 40 +-
.../apache/cxf/systest/aegis/AegisJaxWs.java | 10 +-
.../cxf/systest/aegis/AegisJaxWsImpl.java | 8 +-
.../cxf/systest/aegis/AegisJaxWsTest.java | 32 +-
.../cxf/systest/aegis/AegisJaxWsWsdlNs.java | 4 +-
.../cxf/systest/aegis/AegisJaxWsWsdlNsImpl.java | 6 +-
.../apache/cxf/systest/aegis/AegisServer.java | 6 +-
.../cxf/systest/aegis/AegisWSDLNSTest.java | 28 +-
.../apache/cxf/systest/aegis/AttributeBean.java | 2 +-
.../cxf/systest/aegis/CharacterSchemaTest.java | 16 +-
.../systest/aegis/ServerPasswordCallback.java | 2 +-
.../apache/cxf/systest/aegis/SportsService.java | 12 +-
.../cxf/systest/aegis/SportsServiceImpl.java | 24 +-
.../java/org/apache/cxf/systest/aegis/Team.java | 6 +-
.../org/apache/cxf/systest/aegis/bean/Item.java | 2 +-
.../apache/cxf/systest/jaxb/HashMapAdapter.java | 6 +-
.../apache/cxf/systest/jaxb/MTOMBase64Test.java | 18 +-
.../org/apache/cxf/systest/jaxb/MTOMTest.java | 18 +-
.../jaxb/MultipleServiceShareClassTest.java | 14 +-
.../cxf/systest/jaxb/TestServiceTest.java | 10 +-
.../cxf/systest/jaxb/model/ExtendedWidget.java | 8 +-
.../jaxb/model/ExtendedWidgetWithMime.java | 2 +-
.../apache/cxf/systest/jaxb/model/Widget.java | 6 +-
.../cxf/systest/jaxb/service/TestService.java | 2 +-
.../systest/jaxb/service/TestServiceImpl.java | 2 +-
.../jaxb/shareclasses/model/NameElement.java | 84 +-
.../jaxb/shareclasses/model/bar/BarName.java | 56 +-
.../jaxb/shareclasses/model/foo/FooName.java | 58 +-
.../shareclasses/server/bar/BarServiceImpl.java | 62 +-
.../shareclasses/server/foo/FooServiceImpl.java | 62 +-
.../jaxb/shareclasses/service/Getter.java | 50 +-
.../shareclasses/service/bar/BarService.java | 54 +-
.../shareclasses/service/foo/FooService.java | 54 +-
.../validators/CustomValidatorJAXBTest.java | 20 +-
.../cxf/systest/jaxb/validators/HelloWorld.java | 2 +-
.../systest/jaxb/validators/HelloWorldImpl.java | 4 +-
.../jaxb/validators/MyCustomHandler.java | 2 +-
.../systest/source/ClientServerSourceTest.java | 28 +-
.../apache/cxf/systest/source/GreeterImpl.java | 20 +-
.../systest/source/PutLastTradePriceImpl.java | 10 +-
.../org/apache/cxf/systest/source/Server.java | 4 +-
.../jaxrs/AbstractGenericBookStoreSpring.java | 6 +-
.../jaxrs/AbstractJAXRSContinuationsTest.java | 80 +-
.../cxf/systest/jaxrs/AbstractSpringServer.java | 16 +-
.../apache/cxf/systest/jaxrs/AsyncResource.java | 68 +-
.../cxf/systest/jaxrs/AsyncResource2.java | 6 +-
.../org/apache/cxf/systest/jaxrs/AtomBook.java | 14 +-
.../cxf/systest/jaxrs/AtomBookServer.java | 14 +-
.../apache/cxf/systest/jaxrs/AtomBookStore.java | 50 +-
.../cxf/systest/jaxrs/AtomBookStore2.java | 8 +-
.../cxf/systest/jaxrs/AtomBookStore3.java | 2 +-
.../org/apache/cxf/systest/jaxrs/AtomUtils.java | 16 +-
.../cxf/systest/jaxrs/BadgerFishProvider.java | 32 +-
.../java/org/apache/cxf/systest/jaxrs/Book.java | 34 +-
.../org/apache/cxf/systest/jaxrs/Book2.java | 30 +-
.../cxf/systest/jaxrs/BookApplication.java | 42 +-
.../cxf/systest/jaxrs/BookAsyncInterface.java | 2 +-
.../org/apache/cxf/systest/jaxrs/BookBean.java | 34 +-
.../systest/jaxrs/BookContinuationClient.java | 100 +-
.../systest/jaxrs/BookContinuationFilter.java | 2 +-
.../systest/jaxrs/BookContinuationServer.java | 4 +-
.../jaxrs/BookContinuationServlet3Server.java | 4 +-
.../systest/jaxrs/BookContinuationStore.java | 106 +-
.../jaxrs/BookCxfContinuationServer.java | 4 +-
.../systest/jaxrs/BookCxfContinuationStore.java | 48 +-
.../systest/jaxrs/BookDataBindingServer.java | 10 +-
.../cxf/systest/jaxrs/BookExceptionMapper.java | 8 +-
.../apache/cxf/systest/jaxrs/BookInterface.java | 8 +-
.../cxf/systest/jaxrs/BookNoXmlRootElement.java | 30 +-
.../cxf/systest/jaxrs/BookNonSpringServer.java | 2 +-
.../cxf/systest/jaxrs/BookNotFoundFault.java | 2 +-
.../apache/cxf/systest/jaxrs/BookServer.java | 86 +-
.../apache/cxf/systest/jaxrs/BookServer20.java | 140 +--
.../systest/jaxrs/BookServerAsyncClient.java | 18 +-
.../systest/jaxrs/BookServerProxySpring.java | 10 +-
.../jaxrs/BookServerRequestDispatch.java | 10 +-
.../jaxrs/BookServerResourceCreatedOutside.java | 4 +-
.../jaxrs/BookServerResourceCreatedSpring.java | 10 +-
...ookServerResourceCreatedSpringProviders.java | 10 +-
...ookServerResourceJacksonSpringProviders.java | 12 +-
.../cxf/systest/jaxrs/BookServerRestSoap.java | 10 +-
.../systest/jaxrs/BookServerServletFilter.java | 10 +-
.../cxf/systest/jaxrs/BookServerSpring.java | 10 +-
.../cxf/systest/jaxrs/BookServerThrottled.java | 10 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 554 +++++-----
.../cxf/systest/jaxrs/BookStoreDispatch.java | 8 +-
.../systest/jaxrs/BookStoreNoAnnotations.java | 14 +-
.../jaxrs/BookStoreNoAnnotationsImpl.java | 16 +-
.../jaxrs/BookStoreNoAnnotationsInterface.java | 8 +-
.../cxf/systest/jaxrs/BookStorePerRequest.java | 32 +-
.../cxf/systest/jaxrs/BookStoreSimple.java | 16 +-
.../cxf/systest/jaxrs/BookStoreSpring.java | 98 +-
.../cxf/systest/jaxrs/BookStoreStorage.java | 6 +-
.../systest/jaxrs/BookStoreWithInterface.java | 8 +-
.../systest/jaxrs/BookStoreWithInterface2.java | 16 +-
.../cxf/systest/jaxrs/BookSubresource.java | 20 +-
.../cxf/systest/jaxrs/BookSubresourceImpl.java | 34 +-
.../org/apache/cxf/systest/jaxrs/BookType.java | 34 +-
.../apache/cxf/systest/jaxrs/BookWrapper.java | 8 +-
.../org/apache/cxf/systest/jaxrs/Books.java | 4 +-
.../java/org/apache/cxf/systest/jaxrs/CD.java | 14 +-
.../org/apache/cxf/systest/jaxrs/Chapter.java | 20 +-
.../cxf/systest/jaxrs/ChapterNoAnnotations.java | 8 +-
.../systest/jaxrs/CustomAtomFeedProvider.java | 6 +-
.../systest/jaxrs/CustomFaultInInterceptor.java | 6 +-
.../jaxrs/CustomInFaultyInterceptor.java | 4 +-
.../cxf/systest/jaxrs/CustomJAXRSInvoker.java | 6 +-
.../jaxrs/CustomJaxbElementProvider.java | 8 +-
.../jaxrs/CustomOutFaultInterceptor.java | 8 +-
.../cxf/systest/jaxrs/CustomOutInterceptor.java | 6 +-
.../cxf/systest/jaxrs/CustomResponse.java | 2 +-
.../systest/jaxrs/CustomXmlStreamReader.java | 2 +-
.../systest/jaxrs/CustomXmlStreamWriter.java | 6 +-
.../cxf/systest/jaxrs/FaultyRequestHandler.java | 10 +-
.../systest/jaxrs/FormatResponseHandler.java | 6 +-
.../jaxrs/GenericBookServiceInterface.java | 2 +-
.../systest/jaxrs/GenericBookStoreSpring2.java | 10 +-
.../cxf/systest/jaxrs/GenericHandler.java | 6 +-
.../cxf/systest/jaxrs/GenericHandlerWriter.java | 14 +-
.../cxf/systest/jaxrs/GlobalNameBinding.java | 4 +-
.../InternalServerErrorExceptionMapper.java | 2 +-
.../jaxrs/JAXRS20ClientServerBookTest.java | 332 +++---
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java | 88 +-
.../cxf/systest/jaxrs/JAXRSAtomBookTest.java | 96 +-
.../jaxrs/JAXRSClientServerBookTest.java | 820 +++++++-------
.../JAXRSClientServerNonSpringBookTest.java | 98 +-
.../jaxrs/JAXRSClientServerODataSearchTest.java | 110 +-
.../JAXRSClientServerProxySpringBookTest.java | 78 +-
...entServerResourceCreatedOutsideBookTest.java | 60 +-
...ientServerResourceCreatedSpringBookTest.java | 44 +-
...ServerResourceCreatedSpringProviderTest.java | 128 +--
...ServerResourceJacksonSpringProviderTest.java | 190 ++--
.../jaxrs/JAXRSClientServerSpringBookTest.java | 404 +++----
.../jaxrs/JAXRSClientServerStreamingTest.java | 24 +-
.../jaxrs/JAXRSClientServerThrottledTest.java | 4 +-
...AXRSClientServerUserResourceDefaultTest.java | 50 +-
.../JAXRSClientServerUserResourceTest.java | 42 +-
.../jaxrs/JAXRSContinuationsServlet3Test.java | 66 +-
.../systest/jaxrs/JAXRSContinuationsTest.java | 10 +-
.../jaxrs/JAXRSCxfContinuationsTest.java | 32 +-
.../cxf/systest/jaxrs/JAXRSDataBindingTest.java | 2 +-
.../systest/jaxrs/JAXRSLocalTransportTest.java | 86 +-
.../cxf/systest/jaxrs/JAXRSMultipartTest.java | 380 +++----
.../jaxrs/JAXRSMultithreadedClientTest.java | 100 +-
.../jaxrs/JAXRSOverlappingDestinationsTest.java | 64 +-
.../jaxrs/JAXRSRequestDispatcherTest.java | 30 +-
.../systest/jaxrs/JAXRSServletFilterTest.java | 8 +-
.../jaxrs/JAXRSSimpleRequestDispatcherTest.java | 20 +-
.../cxf/systest/jaxrs/JAXRSSoapBookTest.java | 422 ++++----
.../jaxrs/JAXRSSoapRestBlueprintTest.java | 20 +-
.../cxf/systest/jaxrs/JAXRSUriInfoTest.java | 12 +-
.../apache/cxf/systest/jaxrs/JMSBookStore.java | 40 +-
.../cxf/systest/jaxrs/MultipartServer.java | 10 +-
.../cxf/systest/jaxrs/MultipartStore.java | 220 ++--
.../org/apache/cxf/systest/jaxrs/OrderBean.java | 10 +-
.../org/apache/cxf/systest/jaxrs/PetStore.java | 22 +-
.../systest/jaxrs/ResponseCheckInterceptor.java | 2 +-
.../systest/jaxrs/RuntimeExceptionMapper.java | 4 +-
.../cxf/systest/jaxrs/SimpleBookStore.java | 6 +-
.../cxf/systest/jaxrs/SimpleLoggingAspect.java | 6 +-
.../systest/jaxrs/SpringServletConfigStore.java | 2 +-
.../cxf/systest/jaxrs/StringTextWriter.java | 14 +-
.../org/apache/cxf/systest/jaxrs/SuperBook.java | 6 +-
.../apache/cxf/systest/jaxrs/SuperBook2.java | 6 +-
.../jaxrs/XMLStreamReaderInInterceptor.java | 4 +-
.../jaxrs/XMLStreamWriterOutInterceptor.java | 4 +-
.../systest/jaxrs/XmlStreamReaderProvider.java | 8 +-
.../systest/jaxrs/XmlStreamWriterProvider.java | 2 +-
.../org/apache/cxf/systest/jaxrs/XopType.java | 10 +-
.../systest/jaxrs/cors/AnnotatedCorsServer.java | 8 +-
.../cxf/systest/jaxrs/cors/ConfigServer.java | 6 +-
.../jaxrs/cors/CrossOriginSimpleTest.java | 78 +-
.../jaxrs/cors/UnannotatedCorsServer.java | 20 +-
.../AbstractSwagger2ServiceDescriptionTest.java | 26 +-
.../AbstractSwaggerServiceDescriptionTest.java | 36 +-
.../jaxrs/description/BookStoreSwagger.java | 18 +-
.../jaxrs/description/BookStoreSwagger2.java | 18 +-
.../Swagger2FilterServiceDescriptionTest.java | 10 +-
...gger2NonAnnotatedServiceDescriptionTest.java | 14 +-
.../Swagger2RegularServiceDescriptionTest.java | 10 +-
.../SwaggerFilterServiceDescriptionTest.java | 10 +-
.../SwaggerRegularServiceDescriptionTest.java | 10 +-
.../jaxrs/description/group1/BookStore.java | 2 +-
.../cxf/systest/jaxrs/discovery/BookStore.java | 6 +-
.../JAXRSServerSpringDiscoveryTest.java | 18 +-
.../jaxrs/discovery/sub/BookStoreInterface.java | 2 +-
.../systest/jaxrs/extraction/BookCatalog.java | 38 +-
.../extraction/JAXRSClientServerTikaTest.java | 42 +-
.../jaxrs/failover/AbstractFailoverTest.java | 134 +--
.../failover/CircuitBreakerFailoverTest.java | 50 +-
.../systest/jaxrs/failover/FailoverTest.java | 22 +-
.../jaxrs/failover/LoadDistributorTest.java | 54 +-
.../cxf/systest/jaxrs/failover/Server.java | 12 +-
.../systest/jaxrs/jaxws/BookSoapService.java | 8 +-
.../cxf/systest/jaxrs/jaxws/BookStoreJaxrs.java | 2 +-
.../jaxrs/jaxws/BookStoreJaxrsJaxws.java | 10 +-
.../cxf/systest/jaxrs/jaxws/BookStoreJaxws.java | 2 +-
.../jaxrs/jaxws/BookStoreSoapRestImpl.java | 30 +-
.../jaxrs/jaxws/BookStoreSoapRestImpl2.java | 2 +-
.../cxf/systest/jaxrs/jaxws/HelloWorld.java | 6 +-
.../jaxrs/jaxws/IntegerUserMapAdapter.java | 2 +-
.../cxf/systest/jaxrs/jaxws/UserImpl.java | 4 +-
.../cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 106 +-
.../apache/cxf/systest/jaxrs/jms/JMSServer.java | 4 +-
.../cxf/systest/jaxrs/nio/NioBookStore.java | 18 +-
.../systest/jaxrs/nio/NioBookStoreServer.java | 12 +-
.../cxf/systest/jaxrs/nio/NioBookStoreTest.java | 22 +-
.../apache/cxf/systest/jaxrs/provider/Book.java | 8 +-
.../cxf/systest/jaxrs/provider/BookChapter.java | 8 +-
.../systest/jaxrs/provider/BookJsonStore.java | 24 +-
.../jaxrs/provider/JsrJsonpProviderTest.java | 42 +-
.../systest/jaxrs/reactive/HelloWorldBean.java | 2 +-
.../jaxrs/reactive/JAXRSReactiveTest.java | 24 +-
.../systest/jaxrs/reactive/ReactiveServer.java | 10 +-
.../systest/jaxrs/reactive/ReactiveService.java | 20 +-
.../jaxrs/security/AbstractSecureBookStore.java | 6 +-
.../security/AbstractSpringSecurityTest.java | 24 +-
.../security/AllowAllHostnameVerifier.java | 4 +-
.../systest/jaxrs/security/BookHttpsServer.java | 12 +-
.../systest/jaxrs/security/BookLoginModule.java | 10 +-
.../jaxrs/security/BookServerJaasSecurity.java | 4 +-
.../security/BookServerSecuritySpringClass.java | 2 +-
.../BookServerSecuritySpringInterface.java | 4 +-
.../BookServerSecuritySpringNoAnnotations.java | 2 +-
.../security/BookServerSimpleSecurity.java | 6 +-
.../jaxrs/security/JAXRS20HttpsBookTest.java | 44 +-
.../jaxrs/security/JAXRSHttpsBookTest.java | 86 +-
.../JAXRSJaasConfigurationSecurityTest.java | 24 +-
.../jaxrs/security/JAXRSJaasSecurityTest.java | 50 +-
.../jaxrs/security/JAXRSSimpleSecurityTest.java | 24 +-
.../security/JAXRSSpringSecurityClassTest.java | 50 +-
.../JAXRSSpringSecurityInterfaceTest.java | 58 +-
.../JAXRSSpringSecurityNoAnnotationsTest.java | 26 +-
.../systest/jaxrs/security/JettyJAASFilter.java | 2 +-
.../cxf/systest/jaxrs/security/SecureBook.java | 16 +-
.../jaxrs/security/SecureBookInterface.java | 12 +-
.../systest/jaxrs/security/SecureBookStore.java | 14 +-
.../jaxrs/security/SecureBookStoreGenerics.java | 4 +-
.../security/SecureBookStoreNoAnnotations.java | 6 +-
.../security/SecureBookStoreNoInterface.java | 14 +-
.../security/SecurityOutFaultInterceptor.java | 8 +-
.../validation/AbstractJAXRSValidationTest.java | 2 +-
.../validation/BookStoreWithValidation.java | 28 +-
.../BookStoreWithValidationPerRequest.java | 12 +-
.../jaxrs/validation/BookWithValidation.java | 12 +-
.../JAXRSClientServerValidationTest.java | 50 +-
.../JAXRSPerRequestValidationTest.java | 16 +-
.../spring/BookStoreWithValidation.java | 10 +-
.../JAXRSClientServerValidationSpringTest.java | 32 +-
.../jaxrs/websocket/BookServerWebSocket.java | 12 +-
.../jaxrs/websocket/BookStoreWebSocket.java | 18 +-
.../JAXRSClientConduitWebSocketTest.java | 18 +-
...ntServerWebSocketSpringNoAtmosphereTest.java | 2 +-
.../JAXRSClientServerWebSocketSpringTest.java | 4 +-
...RSClientServerWebSocketSpringWebAppTest.java | 8 +-
.../JAXRSClientServerWebSocketTest.java | 50 +-
.../jaxrs/websocket/WebSocketTestClient.java | 42 +-
.../dispatch/DispatchClientServerTest.java | 182 ++--
...ispatchClientServerWithHugeResponseTest.java | 66 +-
...chClientServerWithMalformedResponseTest.java | 32 +-
.../dispatch/DispatchXMLClientServerTest.java | 32 +-
.../dispatch/HugeResponseInterceptor.java | 2 +-
.../dispatch/MalformedResponseInterceptor.java | 2 +-
.../org/apache/cxf/systest/dispatch/Server.java | 4 +-
.../systest/dispatch/TestDispatchFeature.java | 6 +-
.../cxf/systest/handlers/AddNumbersImpl.java | 8 +-
.../systest/handlers/AddNumbersNoHandlers.java | 8 +-
.../handlers/AddNumbersServiceUnwrap.java | 14 +-
.../AddNumbersServiceWithAnnotation.java | 10 +-
.../cxf/systest/handlers/AddNumbersUnwrap.java | 6 +-
.../handlers/DispatchHandlerInvocationTest.java | 38 +-
.../systest/handlers/HandlerInvocationTest.java | 246 ++---
.../HandlerInvocationUsingAddNumbersTest.java | 34 +-
.../cxf/systest/handlers/HandlerServer.java | 8 +-
.../HandlerTestServiceWithAnnotation.java | 12 +-
.../handlers/MessageContextSecondHandler.java | 2 +-
.../systest/handlers/ModifyNumberHandler.java | 2 +-
.../org/apache/cxf/systest/handlers/Server.java | 10 +-
.../systest/handlers/SmallNumberHandler.java | 36 +-
.../systest/handlers/SoapFaultHandlerTest.java | 14 +-
...ingConfiguredAutoRewriteSoapAddressTest.java | 2 +-
.../handlers/SpringConfiguredHandlerTest.java | 6 +-
.../cxf/systest/handlers/TestHandler.java | 64 +-
.../cxf/systest/handlers/TestHandlerBase.java | 78 +-
.../handlers/TestMustUnderstandHandler.java | 12 +-
.../systest/handlers/TestResourceResolver.java | 2 +-
.../cxf/systest/handlers/TestSOAPHandler.java | 120 +--
.../cxf/systest/handlers/TestUnusedHandler.java | 26 +-
.../TrivialSOAPHandlerAnnotatedGreeterImpl.java | 2 +-
.../handlers/TrivialSOAPHandlerTest.java | 24 +-
.../cxf/systest/handlers/types/AddNumbers.java | 16 +-
.../handlers/types/AddNumbersResponse.java | 12 +-
.../systest/handlers/types/package-info.java | 2 +-
.../cxf/systest/jaxws/AnyClientServerTest.java | 22 +-
.../cxf/systest/jaxws/ArrayServiceImpl.java | 2 +-
.../apache/cxf/systest/jaxws/CXF5061Test.java | 6 +-
.../apache/cxf/systest/jaxws/CXF6655Test.java | 2 +-
.../ClientServerGreeterBaseNoWsdlTest.java | 4 +-
.../jaxws/ClientServerGreeterBaseTest.java | 4 +-
.../jaxws/ClientServerGreeterNoWsdlTest.java | 8 +-
.../cxf/systest/jaxws/ClientServerMiscTest.java | 256 ++---
.../jaxws/ClientServerMixedStyleTest.java | 22 +-
.../jaxws/ClientServerPartialWsdlTest.java | 24 +-
.../ClientServerRPCLitDefatulAnnoTest.java | 2 +-
.../systest/jaxws/ClientServerRPCLitTest.java | 78 +-
.../cxf/systest/jaxws/ClientServerTest.java | 300 +++---
.../cxf/systest/jaxws/ClientServerXMLTest.java | 18 +-
.../cxf/systest/jaxws/ComplexException.java | 12 +-
.../cxf/systest/jaxws/CustomException.java | 2 +-
.../jaxws/DocLitBareCodeFirstService.java | 68 +-
.../jaxws/DocLitBareCodeFirstServiceImpl.java | 4 +-
.../DocLitWrappedCodeFirstBaseService.java | 6 +-
.../jaxws/DocLitWrappedCodeFirstService.java | 102 +-
.../DocLitWrappedCodeFirstServiceImpl.java | 36 +-
...DocLitWrappedCodeFirstServiceMissingOps.java | 4 +-
.../java/org/apache/cxf/systest/jaxws/Echo.java | 8 +-
.../apache/cxf/systest/jaxws/EchoResponse.java | 8 +-
.../org/apache/cxf/systest/jaxws/HelloImpl.java | 2 +-
.../apache/cxf/systest/jaxws/HelloService.java | 8 +-
.../systest/jaxws/JaxWsClientThreadTest.java | 32 +-
.../systest/jaxws/JaxWsDynamicClientTest.java | 20 +-
.../systest/jaxws/JaxwsAsyncFailOverTest.java | 28 +-
.../cxf/systest/jaxws/JaxwsExecutorTest.java | 44 +-
.../systest/jaxws/LocatorClientServerTest.java | 18 +-
.../cxf/systest/jaxws/LocatorServiceImpl.java | 22 +-
.../cxf/systest/jaxws/OASISCatalogTest.java | 24 +-
.../systest/jaxws/RpcLitCodeFirstService.java | 20 +-
.../jaxws/RpcLitCodeFirstServiceImpl.java | 14 +-
.../jaxws/SchemaValidationClientServerTest.java | 32 +-
.../org/apache/cxf/systest/jaxws/Server.java | 58 +-
.../systest/jaxws/ServerGreeterBaseNoWsdl.java | 6 +-
.../apache/cxf/systest/jaxws/ServerMisc.java | 46 +-
.../cxf/systest/jaxws/ServerMixedStyle.java | 42 +-
.../cxf/systest/jaxws/ServerXMLBinding.java | 8 +-
.../cxf/systest/jaxws/ServicePortTypeImpl.java | 2 +-
.../cxf/systest/jaxws/ServiceTestFault.java | 8 +-
.../apache/cxf/systest/jaxws/TestService.java | 70 +-
.../cxf/systest/jaxws/TestServiceImpl.java | 72 +-
.../cxf/systest/jaxws/WsdlGetUtilsTest.java | 12 +-
.../cxf/systest/jaxws/base/WrapperString.java | 128 +--
.../BeanPostProcessorTest.java | 4 +-
.../CustomizedfBeanPostProcessorTest.java | 8 +-
.../jaxws/beanpostprocessor/WebServiceRUs.java | 12 +-
.../cxf/systest/jaxws/cxf5064/HeaderObj.java | 2 +-
.../systest/jaxws/cxf5064/SOAPHeaderSEI.java | 2 +-
.../jaxws/cxf5064/SOAPHeaderServiceImpl.java | 2 +-
.../JavaFirstSchemaValidationTest.java | 78 +-
.../PersonServiceAnnotatedImpl.java | 4 +-
.../schemavalidation/PersonServiceImpl.java | 4 +-
.../schemavalidation/PersonServiceRPCImpl.java | 4 +-
.../PersonServiceWithRequestResponseAnns.java | 2 +-
...ersonServiceWithRequestResponseAnnsImpl.java | 4 +-
.../jaxws/schemavalidation/package-info.java | 2 +-
.../org/apache/cxf/systest/jaxws/types/Bar.java | 4 +-
.../apache/cxf/systest/jaxws/types/BarImpl.java | 6 +-
.../websocket/ClientServerWebSocketTest.java | 96 +-
.../cxf/systest/jaxws/websocket/Server.java | 10 +-
.../provider/AbstractSourcePayloadProvider.java | 20 +-
.../AttachmentProviderXMLClientServerTest.java | 26 +-
.../cxf/systest/provider/AttachmentServer.java | 4 +-
.../AttachmentStreamSourceXMLProvider.java | 24 +-
.../cxf/systest/provider/CXF4130Provider.java | 6 +-
.../cxf/systest/provider/CXF4130Test.java | 12 +-
.../cxf/systest/provider/CXF4818Test.java | 22 +-
.../provider/HWDOMSourceMessageProvider.java | 8 +-
.../provider/HWDOMSourcePayloadProvider.java | 38 +-
.../HWDOMSourcePayloadXMLBindingProvider.java | 6 +-
.../provider/HWSAXSourceMessageProvider.java | 10 +-
.../provider/HWSAXSourcePayloadProvider.java | 18 +-
.../provider/HWSoapMessageDocProvider.java | 48 +-
.../systest/provider/HWSoapMessageProvider.java | 22 +-
.../provider/HWSourcePayloadProvider.java | 4 +-
.../provider/HWStreamSourceMessageProvider.java | 6 +-
.../provider/HWStreamSourcePayloadProvider.java | 16 +-
.../InterpretNullAsOnewayProviderTest.java | 22 +-
.../provider/NBProviderClientServerTest.java | 24 +-
.../provider/NBSoapMessageDocProvider.java | 10 +-
.../provider/ProviderClientServerTest.java | 40 +-
.../provider/ProviderRPCClientServerTest.java | 34 +-
.../provider/ProviderXMLClientServerTest.java | 6 +-
.../org/apache/cxf/systest/provider/Server.java | 12 +-
.../systest/provider/TestLogicalHandler.java | 2 +-
.../cxf/systest/provider/TestSOAPHandler.java | 4 +-
.../apache/cxf/systest/provider/XMLServer.java | 6 +-
.../provider/datasource/AbstractProvider.java | 14 +-
.../datasource/DataSourceProviderTest.java | 14 +-
.../cxf/systest/provider/datasource/Server.java | 8 +-
.../provider/datasource/TestProvider.java | 12 +-
.../provider/datasource/WebProvider.java | 2 +-
.../cxf/systest/swa/ClientServerSwaTest.java | 76 +-
.../java/org/apache/cxf/systest/swa/Server.java | 6 +-
.../cxf/systest/swa/SwANoMimeServiceImpl.java | 14 +-
.../apache/cxf/systest/swa/SwAServiceImpl.java | 22 +-
.../systest/kerberos/common/DoubleItImpl.java | 10 +-
.../kerberos/common/DoubleItPortTypeImpl.java | 14 +-
.../common/KerberosClientPasswordCallback.java | 4 +-
.../common/KerberosServicePasswordCallback.java | 6 +-
.../common/KeystorePasswordCallback.java | 10 +-
.../kerberos/common/SecurityTestUtil.java | 14 +-
.../systest/kerberos/jaxrs/kerberos/Book.java | 34 +-
.../jaxrs/kerberos/BookKerberosServer.java | 12 +-
.../jaxrs/kerberos/BookNotFoundFault.java | 2 +-
.../kerberos/jaxrs/kerberos/BookStore.java | 20 +-
.../kerberos/jaxrs/kerberos/BookStoreImpl.java | 18 +-
.../kerberos/jaxrs/kerberos/Chapter.java | 20 +-
.../jaxrs/kerberos/JAXRSKerberosBookTest.java | 46 +-
.../kerberos/jaxrs/kerberos/SuperBook.java | 6 +-
.../systest/kerberos/ldap/LDAPClaimsTest.java | 112 +-
.../wssec/kerberos/KerberosTokenTest.java | 158 +--
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 66 +-
.../systest/kerberos/wssec/sts/STSServer.java | 2 +-
.../kerberos/wssec/sts/StaxSTSServer.java | 2 +-
.../cxf/jaxrs/servlet/AbstractSciTest.java | 8 +-
.../servlet/jetty/AbstractJettyServer.java | 36 +-
.../jetty/JettyEmptyApplicationTest.java | 8 +-
.../jetty/JettyEmptyPathApplicationTest.java | 12 +-
.../servlet/jetty/JettyNoApplicationTest.java | 10 +-
.../JettySingleApplicationOnlyClassesTest.java | 6 +-
...ettySingleApplicationOnlySingletonsTest.java | 6 +-
.../jetty/JettySingleApplicationTest.java | 6 +-
.../applications/classes/BookApplication.java | 2 +-
.../applications/complete/BookApplication.java | 4 +-
.../applications/empty/BookApplication.java | 2 +-
.../applications/emptypath/BookApplication.java | 2 +-
.../singletons/BookApplication.java | 2 +-
.../java/org/apache/demo/resources/Book.java | 12 +-
.../org/apache/demo/resources/BookStore.java | 2 +-
.../apache/cxf/systest/jaxrs/security/Book.java | 12 +-
.../cxf/systest/jaxrs/security/BookStore.java | 8 +-
.../jaxrs/security/SecurityTestUtil.java | 8 +-
.../jaxrs/security/jcs/BookJcsServer.java | 8 +-
.../systest/jaxrs/security/jcs/BookStore.java | 14 +-
.../jaxrs/security/jcs/JAXRSJcsTest.java | 22 +-
.../systest/jaxrs/security/jose/BookStore.java | 10 +-
.../jose/jwejws/BookServerAlgorithms.java | 8 +-
.../security/jose/jwejws/BookServerJweJson.java | 8 +-
.../security/jose/jwejws/BookServerJwsJson.java | 8 +-
.../security/jose/jwejws/BookServerJwt.java | 8 +-
.../jose/jwejws/BookServerReference.java | 8 +-
.../security/jose/jwejws/JAXRSJweJsonTest.java | 22 +-
.../security/jose/jwejws/JAXRSJweJwsTest.java | 68 +-
.../security/jose/jwejws/JAXRSJwsJsonTest.java | 50 +-
.../jose/jwejws/JweJwsAlgorithmTest.java | 104 +-
.../jose/jwejws/JweJwsReferenceTest.java | 64 +-
.../jwejws/PrivateKeyPasswordProviderImpl.java | 4 +-
.../jose/jwt/BookServerJwtAlgorithms.java | 8 +-
.../jose/jwt/BookServerJwtAuthnAuthz.java | 8 +-
.../jose/jwt/BookServerJwtProperties.java | 8 +-
.../jaxrs/security/jose/jwt/BookStoreAuthn.java | 14 +-
.../security/jose/jwt/JWTAlgorithmTest.java | 196 ++--
.../security/jose/jwt/JWTAuthnAuthzTest.java | 66 +-
.../security/jose/jwt/JWTPropertiesTest.java | 122 +--
.../jwt/PrivateKeyPasswordProviderImpl.java | 4 +-
.../security/oauth/MemoryOAuthDataProvider.java | 26 +-
.../jaxrs/security/oauth/OAuthServer.java | 6 +-
.../jaxrs/security/oauth/OAuthTestUtils.java | 2 +-
.../oauth/TemporaryCredentialServiceTest.java | 20 +-
.../security/oauth2/common/OAuth2TestUtils.java | 52 +-
.../oauth2/common/OAuthDataProviderImpl.java | 74 +-
.../oauth2/common/SamlCallbackHandler.java | 44 +-
.../oauth2/common/WSS4JBasicAuthFilter.java | 2 +-
.../oauth2/filters/BookServerOAuth2Filters.java | 8 +-
.../filters/BookServerOAuth2FiltersJwt.java | 8 +-
.../oauth2/filters/BookServerOAuth2Service.java | 8 +-
.../filters/BookServerOAuth2ServiceJwt.java | 8 +-
.../oauth2/filters/OAuth2FiltersTest.java | 146 +--
.../oauth2/filters/OAuth2JwtFiltersTest.java | 30 +-
.../grants/AuthorizationGrantNegativeTest.java | 244 ++---
.../oauth2/grants/AuthorizationGrantTest.java | 82 +-
.../oauth2/grants/BookServerOAuth2.java | 8 +-
.../oauth2/grants/BookServerOAuth2Grants.java | 8 +-
.../grants/BookServerOAuth2GrantsNegative.java | 8 +-
.../grants/BookServerOAuth2Introspection.java | 8 +-
.../grants/CallbackHandlerLoginHandler.java | 16 +-
.../oauth2/grants/CustomGrantHandler.java | 4 +-
.../oauth2/grants/IntrospectionServiceTest.java | 122 +--
.../security/oauth2/grants/JAXRSOAuth2Test.java | 192 ++--
.../security/oidc/IdTokenProviderImpl.java | 4 +-
.../oidc/OIDCDynRegistrationServer.java | 8 +-
.../oidc/OIDCDynamicRegistrationTest.java | 28 +-
.../jaxrs/security/oidc/OIDCFlowTest.java | 344 +++---
.../jaxrs/security/oidc/OIDCNegativeServer.java | 8 +-
.../jaxrs/security/oidc/OIDCNegativeTest.java | 150 +--
.../systest/jaxrs/security/oidc/OIDCServer.java | 8 +-
.../security/oidc/UserInfoProviderImpl.java | 2 +-
.../jaxrs/security/oidc/UserInfoServer.java | 8 +-
.../jaxrs/security/oidc/UserInfoTest.java | 118 +-
.../oidc/filters/BookServerOIDCFilters.java | 8 +-
.../oidc/filters/BookServerOIDCService.java | 8 +-
.../security/oidc/filters/OIDCFiltersTest.java | 48 +-
.../jaxrs/security/saml/BookServerSaml.java | 8 +-
.../saml/CustomSecurityContextProvider.java | 6 +-
.../saml/JAXRSSamlAuthorizationTest.java | 44 +-
.../jaxrs/security/saml/JAXRSSamlTest.java | 80 +-
.../security/saml/KeystorePasswordCallback.java | 6 +-
.../security/saml/SamlCallbackHandler.java | 50 +-
.../security/saml/SamlRetrievalInterceptor.java | 12 +-
.../security/saml/SecureBookServerSaml.java | 8 +-
.../jaxrs/security/saml/SecureBookStore.java | 6 +-
.../security/saml/SecureClaimBookStore.java | 12 +-
.../samlsso/KeystorePasswordCallback.java | 6 +-
.../jaxrs/security/samlsso/MetadataServer.java | 8 +-
.../jaxrs/security/samlsso/MetadataTest.java | 12 +-
.../jaxrs/security/xml/BookServerXmlSec.java | 6 +-
.../jaxrs/security/xml/JAXRSXmlSecTest.java | 224 ++--
.../security/xml/StaxBookServerXmlSec.java | 6 +-
.../jaxrs/sse/AbstractBroadcasterSseTest.java | 14 +-
.../systest/jaxrs/sse/AbstractSseBaseTest.java | 10 +-
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 10 +-
.../org/apache/cxf/systest/jaxrs/sse/Book.java | 12 +-
.../apache/cxf/systest/jaxrs/sse/BookStore.java | 20 +-
.../jaxrs/sse/jetty/AbstractJettyServer.java | 28 +-
.../jaxrs/sse/jetty/JettyBroadcasterTest.java | 4 +-
.../jaxrs/sse/jetty/JettyEmbeddedTest.java | 4 +-
.../systest/jaxrs/sse/jetty/JettyWarTest.java | 6 +-
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 26 +-
.../jaxrs/sse/tomcat/TomcatBroadcasterTest.java | 6 +-
.../jaxrs/sse/tomcat/TomcatEmbeddedTest.java | 6 +-
.../systest/jaxrs/sse/tomcat/TomcatWarTest.java | 6 +-
.../test/java/org/apache/cxf/systest/Book.java | 14 +-
.../apache/cxf/systest/TestSpanReceiver.java | 4 +-
.../apache/cxf/systest/TestSpanReporter.java | 2 +-
.../cxf/systest/jaxrs/tracing/BookStore.java | 28 +-
.../jaxrs/tracing/brave/BraveTracingTest.java | 120 +--
.../systest/jaxrs/tracing/brave/HasSpan.java | 12 +-
.../tracing/brave/IsAnnotationContaining.java | 2 +-
.../brave/IsBinaryAnnotationContaining.java | 2 +-
.../htrace/HTraceTracingCustomHeadersTest.java | 26 +-
.../jaxrs/tracing/htrace/HTraceTracingTest.java | 108 +-
.../systest/jaxrs/tracing/htrace/HasSpan.java | 12 +-
.../tracing/htrace/IsTimelineContaining.java | 2 +-
.../jaxrs/tracing/htrace/IsTimelineEmpty.java | 2 +-
.../systest/jaxws/tracing/brave/BookStore.java | 8 +-
.../jaxws/tracing/brave/BraveTracingTest.java | 90 +-
.../systest/jaxws/tracing/htrace/BookStore.java | 2 +-
.../jaxws/tracing/htrace/HTraceTracingTest.java | 64 +-
.../jms/testsuite/services/GreeterSpecImpl.java | 4 +-
.../services/GreeterSpecWithPortError.java | 4 +-
.../jms/testsuite/services/Test0001Impl.java | 2 +-
.../jms/testsuite/services/Test0003Impl.java | 2 +-
.../jms/testsuite/services/Test0005Impl.java | 2 +-
.../jms/testsuite/services/Test0006Impl.java | 2 +-
.../jms/testsuite/services/Test0008Impl.java | 2 +-
.../jms/testsuite/services/Test0009Impl.java | 2 +-
.../jms/testsuite/services/Test0010Impl.java | 2 +-
.../jms/testsuite/services/Test0011Impl.java | 2 +-
.../jms/testsuite/services/Test0012Impl.java | 2 +-
.../jms/testsuite/services/Test0013Impl.java | 2 +-
.../jms/testsuite/services/Test0014Impl.java | 2 +-
.../jms/testsuite/services/Test0101Impl.java | 2 +-
.../jms/testsuite/services/Test1001Impl.java | 2 +-
.../jms/testsuite/services/Test1002Impl.java | 2 +-
.../jms/testsuite/services/Test1003Impl.java | 2 +-
.../jms/testsuite/services/Test1004Impl.java | 2 +-
.../jms/testsuite/services/Test1006Impl.java | 2 +-
.../jms/testsuite/services/Test1007Impl.java | 2 +-
.../jms/testsuite/services/Test1008Impl.java | 2 +-
.../jms/testsuite/services/Test1101Impl.java | 2 +-
.../jms/testsuite/services/Test1102Impl.java | 2 +-
.../jms/testsuite/services/Test1103Impl.java | 2 +-
.../jms/testsuite/services/Test1104Impl.java | 2 +-
.../jms/testsuite/services/Test1105Impl.java | 2 +-
.../jms/testsuite/services/Test1106Impl.java | 2 +-
.../jms/testsuite/services/Test1107Impl.java | 2 +-
.../jms/testsuite/services/Test1108Impl.java | 2 +-
.../jms/testsuite/services/TestSuiteServer.java | 4 +-
.../testcases/JavaFirstNoWsdlTest.java | 2 +-
.../testcases/SOAPJMSTestSuiteTest.java | 84 +-
.../testsuite/testcases/SoapJmsSpecTest.java | 8 +-
.../cxf/jms/testsuite/util/JMSTestUtil.java | 12 +-
.../cxf/systest/jms/AbstractVmJMSTest.java | 18 +-
.../cxf/systest/jms/GreeterByteMessageImpl.java | 6 +-
.../apache/cxf/systest/jms/GreeterImplDoc.java | 4 +-
.../cxf/systest/jms/GreeterImplDocBase.java | 4 +-
.../jms/GreeterImplQueueDecoupledOneWays.java | 20 +-
...rImplQueueDecoupledOneWaysDeferredReply.java | 8 +-
.../cxf/systest/jms/GreeterImplQueueOneWay.java | 4 +-
.../cxf/systest/jms/GreeterImplSoap12.java | 4 +-
.../cxf/systest/jms/GreeterImplTopicOneWay.java | 4 +-
.../cxf/systest/jms/GreeterImplTwoWayJMS.java | 6 +-
.../org/apache/cxf/systest/jms/HelloImpl.java | 2 +-
.../systest/jms/JMSClientServerSoap12Test.java | 10 +-
.../cxf/systest/jms/JMSClientServerTest.java | 82 +-
.../org/apache/cxf/systest/jms/JMSMTOMImpl.java | 10 +-
.../org/apache/cxf/systest/jms/JMSTestMtom.java | 20 +-
.../apache/cxf/systest/jms/JaxWsAPITest.java | 2 +-
.../cxf/systest/jms/JmsDestPubSubImpl.java | 4 +-
.../java/org/apache/cxf/systest/jms/Server.java | 8 +-
.../systest/jms/SoapService6SoapPort6Impl.java | 4 +-
.../systest/jms/SoapService7SoapPort7Impl.java | 4 +-
.../cxf/systest/jms/TwoWayJMSImplBase.java | 22 +-
.../GreeterImplWithContinuationsJMS.java | 28 +-
.../continuations/HWSoapMessageDocProvider.java | 30 +-
.../jms/continuations/HelloContinuation.java | 4 +-
.../continuations/HelloContinuationService.java | 10 +-
.../systest/jms/continuations/HelloWorker.java | 14 +-
...HelloWorldContinuationsClientServerTest.java | 14 +-
.../HelloWorldContinuationsThrottleTest.java | 18 +-
.../HelloWorldWithContinuationsJMS.java | 52 +-
.../HelloWorldWithContinuationsJMS2.java | 52 +-
.../IncomingMessageCounterInterceptor.java | 8 +-
.../JMSContinuationsClientServerTest.java | 6 +-
.../ProviderJMSContinuationTest.java | 6 +-
.../MultiTransportClientServerTest.java | 2 +-
.../systest/jms/security/JMSWSSecurityTest.java | 78 +-
.../jms/security/KeystorePasswordCallback.java | 10 +-
.../jms/security/SamlCallbackHandler.java | 30 +-
.../security/SecurityGreeterImplTwoWayJMS.java | 6 +-
.../apache/cxf/systest/jms/security/Server.java | 14 +-
.../systest/jms/security/TwoWayJMSImplBase.java | 22 +-
...GreeterImplTwoWayJMSAppCorrelationIDEng.java | 6 +-
...erImplTwoWayJMSAppCorrelationIDNoPrefix.java | 6 +-
...eeterImplTwoWayJMSAppCorrelationIDSales.java | 6 +-
...woWayJMSAppCorrelationIDStaticPrefixEng.java | 6 +-
...WayJMSAppCorrelationIDStaticPrefixSales.java | 6 +-
...WayJMSRuntimeCorrelationIDDynamicPrefix.java | 6 +-
...yJMSRuntimeCorrelationIDStaticPrefixEng.java | 6 +-
...MSRuntimeCorrelationIDStaticPrefixSales.java | 6 +-
.../systest/jms/swa/ClientServerSwaTest.java | 20 +-
.../apache/cxf/systest/jms/swa/SwAService.java | 2 +-
.../cxf/systest/jms/swa/SwAServiceImpl.java | 22 +-
.../jms/tx/GreeterImplWithTransaction.java | 8 +-
.../cxf/systest/jms/tx/JMSTransactionTest.java | 24 +-
.../cxf/systest/jms/tx/MyBeanLocator.java | 8 +-
.../http_undertow/ClientServerSessionTest.java | 86 +-
.../cxf/systest/http_undertow/GreeterImpl.java | 74 +-
.../http_undertow/GreeterSessionImpl.java | 36 +-
.../http_undertow/MapIdentityManager.java | 2 +-
.../PerRequestAnnotationGreeterImpl.java | 10 +-
.../cxf/systest/http_undertow/Server.java | 12 +-
.../SessionAnnotationGreeterImpl.java | 12 +-
.../systest/http_undertow/SessionServer.java | 6 +-
.../SpringAnnotationGreeterImpl.java | 12 +-
.../http_undertow/StatefulGreeterImpl.java | 10 +-
.../systest/http_undertow/ThreadPoolTest.java | 10 +-
.../http_undertow/UndertowBasicAuthHandler.java | 10 +-
.../http_undertow/UndertowBasicAuthServer.java | 10 +-
.../http_undertow/UndertowBasicAuthTest.java | 12 +-
.../UndertowDigestAuthHandler.java | 10 +-
.../http_undertow/UndertowDigestAuthTest.java | 28 +-
.../ClientServerWrappedContinuationTest.java | 40 +-
.../continuations/ControlWorker.java | 8 +-
.../continuations/HelloContinuation.java | 4 +-
.../continuations/HelloContinuationService.java | 10 +-
.../HelloImplWithWrapppedContinuation.java | 40 +-
.../continuations/HelloWorker.java | 14 +-
.../org/apache/cxf/https/ssl3/GreeterImpl.java | 18 +-
.../org/apache/cxf/https/ssl3/SSLv3Test.java | 144 +--
.../org/apache/cxf/systest/http/BareServer.java | 6 +-
.../org/apache/cxf/systest/http/BusServer.java | 4 +-
.../systest/http/ClientServerSessionTest.java | 86 +-
.../apache/cxf/systest/http/GreeterImpl.java | 18 +-
.../cxf/systest/http/GreeterSessionImpl.java | 36 +-
.../cxf/systest/http/HTTPConduitTest.java | 80 +-
.../systest/http/HTTPProxyAuthConduitTest.java | 18 +-
.../cxf/systest/http/HTTPProxyConduitTest.java | 18 +-
.../http/PerRequestAnnotationGreeterImpl.java | 10 +-
.../systest/http/PublishedEndpointUrlTest.java | 16 +-
.../org/apache/cxf/systest/http/Server.java | 14 +-
.../http/SessionAnnotationGreeterImpl.java | 12 +-
.../apache/cxf/systest/http/SessionServer.java | 6 +-
.../http/SpringAnnotationGreeterImpl.java | 12 +-
.../cxf/systest/http/StatefulGreeterImpl.java | 10 +-
.../systest/http/WSDLAddressRewriteTest.java | 4 +-
.../cxf/systest/http/auth/DigestAuthTest.java | 26 +-
.../cxf/systest/http/auth/DigestServer.java | 12 +-
.../systest/http_jetty/EngineLifecycleTest.java | 86 +-
.../cxf/systest/http_jetty/GreeterImpl.java | 74 +-
.../http_jetty/JettyBasicAuthServer.java | 10 +-
.../systest/http_jetty/JettyBasicAuthTest.java | 12 +-
.../JettyCachedOutDigestAuthTest.java | 4 +-
.../systest/http_jetty/JettyDigestAuthTest.java | 28 +-
.../apache/cxf/systest/http_jetty/Server.java | 12 +-
.../cxf/systest/http_jetty/ThreadPoolTest.java | 10 +-
.../ClientServerWrappedContinuationTest.java | 38 +-
.../http_jetty/continuations/ControlWorker.java | 8 +-
.../continuations/HelloContinuation.java | 4 +-
.../continuations/HelloContinuationService.java | 10 +-
.../HelloImplWithWrapppedContinuation.java | 40 +-
.../http_jetty/continuations/HelloWorker.java | 14 +-
.../org/apache/cxf/systest/https/BusServer.java | 4 +-
.../https/ciphersuites/CipherSuiteChecker.java | 8 +-
.../https/ciphersuites/CipherSuitesTest.java | 264 ++---
.../https/clientauth/ClientAuthTest.java | 110 +-
.../systest/https/conduit/HTTPSClientTest.java | 64 +-
.../systest/https/conduit/HTTPSConduitTest.java | 248 ++---
.../conduit/HTTPSProxyAuthConduitTest.java | 18 +-
.../https/conduit/HTTPSProxyConduitTest.java | 18 +-
.../cxf/systest/https/conduit/PushBack401.java | 44 +-
.../cxf/systest/https/conduit/Server.java | 14 +-
.../https/constraints/CertConstraintsTest.java | 34 +-
.../hostname/HostnameVerificationTest.java | 68 +-
.../systest/https/trust/TrustManagerTest.java | 62 +-
.../DirectDispatchClientTest.java | 32 +-
.../cxf/systest/local_transport/Server.java | 12 +-
.../systest/servlet/AbstractServletTest.java | 8 +-
.../cxf/systest/servlet/CXFFilterTest.java | 14 +-
.../cxf/systest/servlet/CXFServletTest.java | 146 +--
.../systest/servlet/ErrorContextSerletTest.java | 10 +-
.../servlet/ExternalServicesServletTest.java | 30 +-
.../servlet/GetMethodQueryWebRequest.java | 14 +-
.../apache/cxf/systest/servlet/HelloImpl.java | 2 +-
.../cxf/systest/servlet/JaxRsServletTest.java | 24 +-
.../systest/servlet/JsFrontEndServletTest.java | 14 +-
.../servlet/NoSpringServletClientTest.java | 8 +-
.../systest/servlet/NoSpringServletServer.java | 6 +-
.../servlet/SpringAutoPublishServletTest.java | 40 +-
.../cxf/systest/servlet/SpringServletTest.java | 52 +-
.../apache/cxf/systest/servlet/TestServlet.java | 2 +-
.../systest/servlet/resolver/ResolverTest.java | 8 +-
.../org/apache/cxf/systest/soap_udp/Server.java | 14 +-
.../cxf/systest/soap_udp/SoapUDPTest.java | 16 +-
.../java/org/apache/cxf/cxf1226/HelloWorld.java | 4 +-
.../org/apache/cxf/cxf1226/HelloWorldImpl.java | 14 +-
.../cxf1226/MissingQualification1226Test.java | 4 +-
.../org/apache/cxf/cxf1226/package-info.java | 2 +-
.../org/apache/cxf/cxf1332/Cxf1332Impl.java | 4 +-
.../org/apache/cxf/cxf1332/Cxf1332Test.java | 6 +-
.../RespectBindingFeatureClientServerTest.java | 26 +-
.../java/org/apache/cxf/cxf2006/Server.java | 16 +-
.../basicDOCBare/DOCBareClientServerTest.java | 14 +-
.../basicDOCBare/PutLastTradedPriceImpl.java | 10 +-
.../apache/cxf/systest/basicDOCBare/Server.java | 8 +-
.../AddNumbersPortType.java | 2 +-
.../BeanInCreationExceptionTest.java | 4 +-
.../systest/bus/BusExtensionLoadingTest.java | 6 +-
.../apache/cxf/systest/bus/BusShutdownTest.java | 28 +-
.../cxf/systest/bus/SpringBusFactoryTest.java | 84 +-
.../callback/CallbackClientServerTest.java | 26 +-
.../cxf/systest/callback/CallbackImpl.java | 12 +-
.../org/apache/cxf/systest/callback/Server.java | 8 +-
.../apache/cxf/systest/callback/ServerImpl.java | 42 +-
.../clustering/CircuitBreakerFailoverTest.java | 10 +-
.../cxf/systest/clustering/ControlImpl.java | 26 +-
.../clustering/FailoverAddressOverrideTest.java | 44 +-
.../cxf/systest/clustering/FailoverTest.java | 124 +--
.../cxf/systest/clustering/GreeterImplA.java | 8 +-
.../cxf/systest/clustering/GreeterImplB.java | 8 +-
.../cxf/systest/clustering/GreeterImplC.java | 6 +-
.../cxf/systest/clustering/GreeterImplD.java | 6 +-
.../cxf/systest/clustering/GreeterImplE.java | 6 +-
.../LoadDistributorAddressOverrideTest.java | 10 +-
.../LoadDistributorSequentialStrategy.java | 10 +-
.../LoadDistributorStaticStrategy.java | 8 +-
.../systest/clustering/LoadDistributorTest.java | 20 +-
.../apache/cxf/systest/clustering/Server.java | 8 +-
.../cxf/systest/coloc/AbstractColocTest.java | 2 +-
.../coloc/AbstractHeaderServiceRpcLitTest.java | 16 +-
.../coloc/AbstractWrappedDocLitTest.java | 4 +-
.../coloc/BaseHeaderTesterDocLitImpl.java | 2 +-
.../coloc/BaseHeaderTesterRpcLitImpl.java | 26 +-
.../systest/coloc/ColocWrappedDocLitTest.java | 2 +-
.../cxf/systest/coloc/HeaderTesterUtil.java | 4 +-
.../systest/coloc/ThrowFaultInterceptor.java | 2 +-
.../cxf/systest/corba/BaseGreeterImpl.java | 4 +-
.../CorbaBindingFactoryConfigurerTest.java | 36 +-
.../org/apache/cxf/systest/corba/CorbaTest.java | 12 +-
.../cxf/systest/corba/CorbaTimeoutTest.java | 2 +-
.../org/apache/cxf/systest/corba/Server.java | 2 +-
.../apache/cxf/systest/cxf6319/ServiceImpl.java | 2 +-
.../apache/cxf/systest/cxf993/Cxf993Impl.java | 2 +-
.../apache/cxf/systest/cxf993/Cxf993Test.java | 2 +-
.../systest/exception/GenericExceptionTest.java | 8 +-
.../cxf/systest/exception/GenericsEchoImpl.java | 8 +-
.../systest/exception/ObjectWithGenerics.java | 12 +-
.../factory_pattern/HttpNumberFactoryImpl.java | 20 +-
.../systest/factory_pattern/HttpNumberImpl.java | 4 +-
.../ManualHttpMulitplexClientServerTest.java | 52 +-
.../ManualNumberFactoryImpl.java | 12 +-
.../factory_pattern/ManualNumberImpl.java | 8 +-
.../MultiplexClientServerTest.java | 48 +-
.../MultiplexHttpAddressClientServerTest.java | 72 +-
.../factory_pattern/NumberFactoryImpl.java | 16 +-
.../cxf/systest/factory_pattern/NumberImpl.java | 16 +-
.../apache/cxf/systest/fault/GreeterImpl.java | 10 +-
.../systest/fault/IntFaultClientServerTest.java | 6 +-
.../interceptor/FaultHandlingInterceptor.java | 12 +-
.../cxf/systest/interceptor/GreeterImpl.java | 2 +-
.../interceptor/InterceptorFaultTest.java | 108 +-
.../cxf/systest/jca/OutBoundConnectionTest.java | 42 +-
.../cxf/systest/js/JSClientServerTest.java | 6 +-
.../java/org/apache/cxf/systest/js/Server.java | 8 +-
.../cxf/systest/lifecycle/LifeCycleTest.java | 66 +-
.../management/CountersClientServerTest.java | 72 +-
.../cxf/systest/management/ManagedBusTest.java | 60 +-
.../management/ManagedClientServerTest.java | 8 +-
.../cxf/systest/mtom/ClientMtomXopTest.java | 58 +-
.../apache/cxf/systest/mtom/EchoService.java | 8 +-
.../apache/cxf/systest/mtom/MtomPolicyTest.java | 32 +-
.../apache/cxf/systest/mtom/MtomServerTest.java | 2 +-
.../mtom/TestAttachmentOutInterceptor.java | 2 +-
.../cxf/systest/mtom/TestMtomJMSImpl.java | 8 +-
.../apache/cxf/systest/mtom/package-info.java | 4 +-
.../cxf/systest/mtom_bindingtype/HelloImpl.java | 2 +-
.../mtom_bindingtype/MTOMBindingTypeTest.java | 6 +-
.../cxf/systest/mtom_bindingtype/Server.java | 2 +-
.../cxf/systest/mtom_feature/HelloImpl.java | 2 +-
.../MtomFeatureClientServerTest.java | 32 +-
.../apache/cxf/systest/mtom_feature/Server.java | 2 +-
.../mtom_schema_validation/ExceptionType.java | 4 +-
.../ExceptionTypeException.java | 6 +-
.../systest/mtom_schema_validation/Hello.java | 24 +-
.../mtom_schema_validation/HelloResponse.java | 16 +-
.../systest/mtom_schema_validation/HelloWS.java | 4 +-
.../systest/mtom_schema_validation/Server.java | 8 +-
.../CallbackClientServerTest.java | 40 +-
.../systest/nested_callback/CallbackImpl.java | 8 +-
.../cxf/systest/nested_callback/Server.java | 10 +-
.../cxf/systest/nested_callback/ServerImpl.java | 42 +-
.../outofband/header/OOBHdrServiceImpl.java | 28 +-
.../systest/outofband/header/OOBHeaderTest.java | 90 +-
.../cxf/systest/outofband/header/Server.java | 26 +-
.../cxf/systest/resolver/JarResolverTest.java | 8 +-
.../resolver/JarServiceContractResolver.java | 2 +-
.../org/apache/cxf/systest/resolver/Server.java | 4 +-
.../schema_validation/SchemaValidationImpl.java | 6 +-
.../ValidationClientServerTest.java | 72 +-
.../schema_validation/ValidationServer.java | 22 +-
.../cxf/systest/schemaimport/RequestType.java | 4 +-
.../cxf/systest/schemaimport/ResponseType.java | 4 +-
.../apache/cxf/systest/schemaimport/SayHi.java | 16 +-
.../cxf/systest/schemaimport/SayHiImpl.java | 20 +-
.../cxf/systest/schemaimport/SayHiImpl2.java | 20 +-
.../systest/schemaimport/SchemaImportTest.java | 4 +-
.../cxf/systest/schemaimport/ServiceV1Port.java | 4 +-
.../systest/schemaimport/TestEndpointImpl.java | 4 +-
.../cxf/systest/simple/SimpleFrontendTest.java | 16 +-
.../cxf/systest/simple/impl/WSSimpleImpl.java | 2 +-
.../cxf/systest/simple/intf/WSSimple.java | 2 +-
.../soap/RPCEncodedSoapActionGreeterImpl.java | 2 +-
.../soap/RPCLitSoapActionGreeterImpl.java | 2 +-
.../cxf/systest/soap/SoapActionGreeterImpl.java | 2 +-
.../apache/cxf/systest/soap/SoapActionTest.java | 116 +-
.../WrappedEncodedSoapActionGreeterImpl.java | 2 +-
.../soap/WrappedSoapActionGreeterImpl.java | 2 +-
.../apache/cxf/systest/soap12/GreeterImpl.java | 12 +-
.../org/apache/cxf/systest/soap12/Server.java | 6 +-
.../systest/soap12/Soap12ClientServerTest.java | 24 +-
.../cxf/systest/soapfault/SOAPFaultImpl.java | 2 +-
.../apache/cxf/systest/soapfault/Server.java | 2 +-
.../soapfault/details/GreeterImpl11.java | 4 +-
.../soapfault/details/GreeterImpl12.java | 12 +-
.../cxf/systest/soapfault/details/Server11.java | 2 +-
.../cxf/systest/soapfault/details/Server12.java | 2 +-
.../details/Soap11ClientServerTest.java | 36 +-
.../details/Soap12ClientServerTest.java | 6 +-
.../soapheader/HeaderClientServerTest.java | 6 +-
.../ExtSoapHeaderClientServerTest.java | 32 +-
.../StaxTransformFeatureTest.java | 38 +-
.../apache/cxf/systest/stringarray/Server.java | 4 +-
.../systest/stringarray/StringArrayTest.java | 20 +-
.../cxf/systest/transform/feature/Echo.java | 58 +-
.../cxf/systest/transform/feature/EchoImpl.java | 70 +-
.../systest/transform/feature/EchoServer.java | 96 +-
.../transform/feature/TransformFeatureTest.java | 158 +--
.../cxf/systest/type_substitution/Apple.java | 2 +-
.../AppleFindClientServerTest.java | 8 +-
.../type_substitution/AppleFinderImpl.java | 6 +-
.../cxf/systest/type_substitution/Server.java | 2 +-
.../TypeSubClientServerTest.java | 18 +-
.../type_test/AbstractTypeTestClient.java | 8 +-
.../type_test/AbstractTypeTestClient2.java | 104 +-
.../type_test/AbstractTypeTestClient3.java | 60 +-
.../type_test/AbstractTypeTestClient4.java | 46 +-
.../type_test/AbstractTypeTestClient5.java | 18 +-
.../cxf/systest/type_test/I18NStrings.java | 2 +-
.../corba/CORBADocLitClientTypeTest.java | 18 +-
.../type_test/corba/CORBADocLitServerImpl.java | 8 +-
.../soap/SOAPDocLitClientTypeTest.java | 24 +-
.../type_test/soap/SOAPDocLitServerImpl.java | 8 +-
.../soap/SOAPRpcLitClientTypeTest.java | 6 +-
.../type_test/xml/XMLClientTypeTest.java | 4 +-
.../systest/type_test/xml/XMLServerImpl.java | 8 +-
.../versioning/ClientServerVersioningTest.java | 2 +-
.../versioning/MediatorInInterceptor.java | 28 +-
.../apache/cxf/systest/versioning/Server.java | 4 +-
.../systest/wsdl/CrossSchemaImportsTests.java | 10 +-
.../systest/wsdl/LifeCycleListenerTester.java | 10 +-
.../ws/rm/AbstractClientPersistenceTest.java | 100 +-
.../ws/rm/AbstractServerPersistenceTest.java | 86 +-
.../ws/rm/CachedOutClientPersistenceTest.java | 8 +-
.../cxf/systest/ws/rm/CachedOutMessageTest.java | 26 +-
.../ws/rm/CachedOutServerPersistenceTest.java | 6 +-
.../systest/ws/rm/ClientPersistenceTest.java | 8 +-
.../apache/cxf/systest/ws/rm/ControlImpl.java | 18 +-
.../cxf/systest/ws/rm/DecoupledBareTest.java | 18 +-
.../ws/rm/DecoupledClientServerOnewayTest.java | 22 +-
.../ws/rm/DecoupledClientServerTest.java | 36 +-
.../ws/rm/DeliveryAssuranceOnewayTest.java | 110 +-
.../apache/cxf/systest/ws/rm/GreeterImpl.java | 2 +-
.../cxf/systest/ws/rm/ManagedEndpointsTest.java | 200 ++--
.../ws/rm/MessageCallbackOnewayTest.java | 92 +-
.../cxf/systest/ws/rm/MessageLossSimulator.java | 28 +-
.../systest/ws/rm/PersistentGreeterImpl.java | 2 +-
.../systest/ws/rm/ProtocolVariationsTest.java | 140 +--
.../systest/ws/rm/RetransmissionGZIPTest.java | 42 +-
.../systest/ws/rm/RetransmissionQueueTest.java | 40 +-
.../ws/rm/RobustServiceAtMostOnceTest.java | 22 +-
.../ws/rm/RobustServiceWithFaultTest.java | 44 +-
.../apache/cxf/systest/ws/rm/SequenceTest.java | 500 ++++-----
.../org/apache/cxf/systest/ws/rm/Server.java | 16 +-
.../systest/ws/rm/ServerPersistenceTest.java | 6 +-
.../systest/ws/rm/ServiceInvocationAckBase.java | 46 +-
.../rm/ServiceInvocationAckPersistenceTest.java | 2 +-
.../systest/ws/rm/ServiceInvocationAckTest.java | 4 +-
.../rm/ServiceInvocationAtMostOnceAckTest.java | 2 +-
.../systest/ws/rm/SlowProcessingSimulator.java | 12 +-
.../systest/ws/rm/WSRMPolicyResolveTest.java | 2 +-
.../cxf/systest/ws/rm/policy/Greeting.java | 2 +-
.../systest/ws/rm/policy/GreetingService.java | 4 +-
.../systest/ws/rm/sec/UTPasswordCallback.java | 10 +-
.../ws/rm/sec/WSRMWithWSSecurityPolicyTest.java | 16 +-
.../cxf/systest/ws/util/ConnectionHelper.java | 4 +-
.../apache/cxf/systest/ws/util/MessageFlow.java | 120 +--
.../examples/common/CommonPasswordCallback.java | 10 +-
.../wssec/examples/common/DoubleItImpl.java | 10 +-
.../examples/common/DoubleItPortTypeImpl.java | 14 +-
.../wssec/examples/common/SecurityTestUtil.java | 8 +-
.../wssec/examples/common/TestParam.java | 8 +-
.../examples/saml/SamlCallbackHandler.java | 30 +-
.../wssec/examples/saml/SamlTokenTest.java | 110 +-
.../secconv/SecureConversationTest.java | 22 +-
.../wssec/examples/ut/UsernameTokenTest.java | 78 +-
.../wssec/examples/x509/X509TokenTest.java | 56 +-
.../cxf/systest/ws/action/ActionTest.java | 92 +-
.../ws/action/SecretKeyPasswordCallback.java | 6 +-
.../ws/action/SignatureWhitespaceTest.java | 52 +-
.../systest/ws/algsuite/AlgorithmSuiteTest.java | 94 +-
.../ws/algsuite/StaxAlgorithmSuiteTest.java | 32 +-
.../ws/bindings/BindingPropertiesTest.java | 184 ++--
.../cxf/systest/ws/cache/CachingTest.java | 70 +-
.../cxf/systest/ws/common/DoubleIt2Impl.java | 10 +-
.../cxf/systest/ws/common/DoubleItImpl.java | 10 +-
.../systest/ws/common/DoubleItPortTypeImpl.java | 14 +-
.../ws/common/KeystorePasswordCallback.java | 10 +-
.../cxf/systest/ws/common/SecurityTestUtil.java | 12 +-
.../apache/cxf/systest/ws/common/TestParam.java | 8 +-
.../systest/ws/common/UTPasswordCallback.java | 10 +-
.../CryptoCoverageCheckerTest.java | 258 ++---
.../fault/AbstractModifyRequestInterceptor.java | 22 +-
.../systest/ws/fault/DoubleItPortTypeImpl.java | 16 +-
.../ws/fault/DoubleItPortTypeImplJavaFirst.java | 16 +-
.../apache/cxf/systest/ws/fault/FaultTest.java | 60 +-
.../systest/ws/fault/ModifiedRequestTest.java | 130 +--
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 100 +-
.../ws/gcm/MGF256AlgorithmSuiteLoader.java | 16 +-
.../cxf/systest/ws/httpget/HTTPGetTest.java | 50 +-
.../cxf/systest/ws/https/HttpsTokenTest.java | 44 +-
.../cxf/systest/ws/mtom/DoubleIt4Impl.java | 14 +-
.../cxf/systest/ws/mtom/MTOMSecurityTest.java | 82 +-
.../cxf/systest/ws/parts/DoubleIt3Impl.java | 14 +-
.../apache/cxf/systest/ws/parts/PartsTest.java | 198 ++--
.../JavaFirstAttachmentPolicyService.java | 6 +-
.../JavaFirstAttachmentPolicyServiceImpl.java | 4 +-
.../ws/policy/JavaFirstPolicyServer.java | 2 +-
.../ws/policy/JavaFirstPolicyService.java | 16 +-
.../ws/policy/JavaFirstPolicyServiceImpl.java | 4 +-
.../ws/policy/JavaFirstPolicyServiceTest.java | 20 +-
.../ws/policy/JavaFirstUriDomainExpression.java | 12 +-
.../ws/policy/PolicyAlternativeTest.java | 78 +-
.../SslUsernamePasswordAttachmentService.java | 2 +-
...slUsernamePasswordAttachmentServiceImpl.java | 4 +-
.../policy/handler/CommonPasswordCallback.java | 114 +-
.../systest/ws/policy/handler/DummyHandler.java | 108 +-
.../systest/ws/policy/handler/HelloService.java | 84 +-
.../ws/policy/handler/HelloServiceImpl.java | 90 +-
.../cxf/systest/ws/policy/handler/MyFault.java | 74 +-
.../javafirst/BindingSimpleServiceImpl.java | 6 +-
.../NoAlternativesOperationSimpleService.java | 4 +-
...oAlternativesOperationSimpleServiceImpl.java | 10 +-
.../javafirst/OperationSimpleService.java | 2 +-
.../javafirst/OperationSimpleServiceImpl.java | 8 +-
.../systest/ws/saml/CustomSaml2Validator.java | 12 +-
.../ws/saml/PolicyDecisionPointMockImpl.java | 42 +-
.../cxf/systest/ws/saml/SamlTokenTest.java | 318 +++---
.../ws/saml/client/SamlCallbackHandler.java | 30 +-
.../saml/client/SamlElementCallbackHandler.java | 12 +-
.../ws/saml/client/SamlRoleCallbackHandler.java | 32 +-
.../saml/subjectconf/SamlSubjectConfTest.java | 114 +-
.../cxf/systest/ws/security/GreeterImpl.java | 18 +-
.../systest/ws/security/SecurityPolicyTest.java | 252 ++---
.../apache/cxf/systest/ws/security/Server.java | 8 +-
.../cxf/systest/ws/security/StaxServer.java | 8 +-
.../cxf/systest/ws/security/TestOutHandler.java | 4 +-
.../ws/security/WSSecurityClientTest.java | 56 +-
.../ws/security/handler/HelloWorldImpl.java | 2 +-
.../systest/ws/security/handler/WSSecTest.java | 4 +-
.../cxf/systest/ws/swa/DoubleIt3Impl.java | 14 +-
.../cxf/systest/ws/swa/SWAActionTest.java | 52 +-
.../cxf/systest/ws/swa/SWAPolicyTest.java | 98 +-
.../ws/tokens/BinarySecurityTokenTest.java | 22 +-
.../cxf/systest/ws/tokens/DoubleItBSTImpl.java | 26 +-
.../ws/tokens/EndorsingSupportingTokenTest.java | 56 +-
.../systest/ws/tokens/SupportingTokenTest.java | 106 +-
.../systest/ws/ut/CustomStaxUTValidator.java | 8 +-
.../cxf/systest/ws/ut/CustomUTValidator.java | 10 +-
.../ws/ut/SecurityHeaderCacheInterceptor.java | 24 +-
.../systest/ws/ut/UsernameTokenDerivedTest.java | 66 +-
.../systest/ws/ut/UsernameTokenPolicyTest.java | 104 +-
.../cxf/systest/ws/ut/UsernameTokenTest.java | 146 +--
.../cxf/systest/ws/wssc/PingServiceImpl.java | 4 +-
.../org/apache/cxf/systest/ws/wssc/Server.java | 188 ++--
.../apache/cxf/systest/ws/wssc/StaxServer.java | 188 ++--
.../apache/cxf/systest/ws/wssc/WSSCTest.java | 46 +-
.../cxf/systest/ws/wssc/WSSCUnitTest.java | 116 +-
.../systest/ws/wssec10/WSSecurity10Test.java | 40 +-
...curity10UsernameAuthorizationLegacyTest.java | 24 +-
.../WSSecurity10UsernameAuthorizationTest.java | 48 +-
.../ws/wssec10/server/AuthorizedServer.java | 6 +-
.../ws/wssec10/server/AuthorizedServer2.java | 6 +-
.../server/CustomUsernameTokenInterceptor.java | 24 +-
.../server/MutualCertificate10SignEncrypt.java | 8 +-
...utualCertificate10SignEncryptRestricted.java | 8 +-
...lCertificate10SignEncryptRsa15TripleDes.java | 8 +-
...te10SignEncryptRsa15TripleDesRestricted.java | 8 +-
.../ws/wssec10/server/PingServiceBase.java | 6 +-
.../cxf/systest/ws/wssec10/server/Server.java | 8 +-
.../SimpleSubjectCreatingInterceptor.java | 8 +-
.../server/SimpleUsernameTokenInterceptor.java | 18 +-
.../systest/ws/wssec10/server/StaxServer.java | 8 +-
.../wssec10/server/UserNameOverTransport.java | 9 +-
.../server/UserNameOverTransportRestricted.java | 9 +-
.../wssec11/RestrictedAlgorithmSuiteLoader.java | 12 +-
.../systest/ws/wssec11/WSSecurity111Test.java | 30 +-
.../systest/ws/wssec11/WSSecurity112Test.java | 30 +-
.../systest/ws/wssec11/WSSecurity11Common.java | 16 +-
.../ws/wssec11/server/AbstractServer.java | 160 +--
.../server/AbstractServerRestricted.java | 154 +--
.../systest/ws/wssec11/server/PingService.java | 4 +-
.../cxf/systest/ws/wssec11/server/Server11.java | 6 +-
.../ws/wssec11/server/Server11Restricted.java | 6 +-
.../cxf/systest/ws/wssec11/server/Server12.java | 6 +-
.../ws/wssec11/server/Server12Restricted.java | 6 +-
.../systest/ws/wssec11/server/StaxServer11.java | 6 +-
.../wssec11/server/StaxServer11Restricted.java | 6 +-
.../systest/ws/wssec11/server/StaxServer12.java | 6 +-
.../wssec11/server/StaxServer12Restricted.java | 6 +-
.../ws/x509/DoubleItIntermediaryImpl.java | 22 +-
.../systest/ws/x509/DoubleItPropertiesImpl.java | 12 +-
.../cxf/systest/ws/x509/SHA512PolicyLoader.java | 16 +-
.../cxf/systest/ws/x509/X509TokenTest.java | 564 +++++-----
.../apache/cxf/systest/ws/xkms/XKMSTest.java | 38 +-
.../cxf/systest/ws/AbstractWSATestBase.java | 12 +-
.../cxf/systest/ws/addr_disable/Server.java | 14 +-
.../systest/ws/addr_disable/WSADisableTest.java | 22 +-
.../systest/ws/addr_feature/AddNumberImpl.java | 6 +-
.../ws/addr_feature/FaultToEndpointServer.java | 104 +-
.../cxf/systest/ws/addr_feature/Server.java | 20 +-
.../ws/addr_feature/WSAClientServerTest.java | 32 +-
.../WSAFaultToClientServerTest.java | 34 +-
.../ws/addr_fromjava/WSAFromJavaTest.java | 34 +-
.../ws/addr_fromjava/server/AddNumberImpl.java | 10 +-
.../server/AddNumberImplNoAddr.java | 6 +-
.../systest/ws/addr_fromjava/server/Server.java | 6 +-
.../systest/ws/addr_fromwsdl/AddNumberImpl.java | 4 +-
.../cxf/systest/ws/addr_fromwsdl/Server.java | 36 +-
.../ws/addr_fromwsdl/WSAFromWSDLTest.java | 20 +-
.../systest/ws/addr_responses/HelloImpl.java | 2 +-
.../systest/ws/addr_responses/HelloService.java | 4 +-
.../cxf/systest/ws/addr_responses/Server.java | 8 +-
.../WSAResponsesClientServerTest.java | 2 +-
.../cxf/systest/ws/addr_wsdl/AddNumberImpl.java | 6 +-
.../apache/cxf/systest/ws/addr_wsdl/Server.java | 30 +-
.../systest/ws/addr_wsdl/WSAPureWsdlTest.java | 56 +-
...AddrPolicyAttachmentJaxwsMMProviderTest.java | 2 +-
.../ws/addressing/AbstractGreeterImpl.java | 74 +-
.../systest/ws/addressing/DecoupledJMSTest.java | 28 +-
.../systest/ws/addressing/HeaderVerifier.java | 42 +-
.../cxf/systest/ws/addressing/MAPTest.java | 18 +-
.../cxf/systest/ws/addressing/MAPTestBase.java | 82 +-
.../cxf/systest/ws/addressing/MAPVerifier.java | 16 +-
.../ws/addressing/NonDecoupledJMSTest.java | 26 +-
.../systest/ws/addressing/NonDecoupledTest.java | 24 +-
.../cxf/systest/ws/addressing/Server.java | 16 +-
.../ws/addressing/spring/WSAFeatureTest.java | 18 +-
.../ws/addressing/spring/WSAFeatureXmlTest.java | 26 +-
.../cxf/systest/ws/mex/AddNumberImpl.java | 6 +-
.../org/apache/cxf/systest/ws/mex/MEXTest.java | 10 +-
.../org/apache/cxf/systest/ws/mex/Server.java | 16 +-
.../policy/AddressingAnonymousPolicyTest.java | 36 +-
.../ws/policy/AddressingInlinePolicyTest.java | 46 +-
.../ws/policy/AddressingOptionalPolicyTest.java | 58 +-
.../ws/policy/AddressingPolicy0705Test.java | 34 +-
...ssingPolicyExternalAttachmentWsdl11Test.java | 28 +-
.../systest/ws/policy/AddressingPolicyTest.java | 34 +-
.../cxf/systest/ws/policy/GreeterImpl.java | 2 +-
.../systest/ws/policy/HTTPClientPolicyTest.java | 58 +-
.../systest/ws/policy/HTTPServerPolicyTest.java | 44 +-
.../cxf/systest/ws/policy/HttpGreeterImpl.java | 8 +-
.../ws/policy/NestedAddressingPolicyTest.java | 40 +-
.../ws/policy/PolicyLoggingInterceptor.java | 14 +-
.../cxf/systest/ws/policy/PolicyTestHelper.java | 8 +-
.../systest/ws/policy/RM10PolicyWsdlTest.java | 40 +-
.../systest/ws/policy/RM12PolicyWsdlTest.java | 38 +-
.../cxf/systest/ws/policy/RMPolicyTest.java | 38 +-
.../systest/ws/policy/RMPolicyWsdlTestBase.java | 36 +-
.../systest/ws/policy/ReliableGreeterImpl.java | 2 +-
.../systest/ws/policy/ReliableGreeterImpl2.java | 2 +-
.../cxf/systest/ws/util/ConnectionHelper.java | 4 +-
.../apache/cxf/systest/ws/util/MessageFlow.java | 120 +--
.../systest/ws/transfer/CreateStudentTest.java | 26 +-
.../systest/ws/transfer/CreateTeacherTest.java | 24 +-
.../cxf/systest/ws/transfer/DeleteTest.java | 26 +-
.../apache/cxf/systest/ws/transfer/GetTest.java | 24 +-
.../apache/cxf/systest/ws/transfer/PutTest.java | 38 +-
.../cxf/systest/ws/transfer/TestUtils.java | 40 +-
.../cxf/systest/ws/transfer/UIDManager.java | 12 +-
.../transfer/resolver/MyResourceResolver.java | 10 +-
.../validator/StudentPutResourceValidator.java | 12 +-
.../validator/TeacherResourceValidator.java | 10 +-
.../AnonymousComplexTypeImpl.java | 14 +-
.../org/apache/cxf/authservice/AuthService.java | 8 +-
.../apache/cxf/authservice/AuthServiceImpl.java | 2 +-
.../apache/cxf/authservice/Authenticate.java | 4 +-
.../apache/cxf/calculator/CalculatorImpl.java | 6 +-
.../java/org/apache/cxf/customer/Customer.java | 2 +-
.../cxf/customer/CustomerNotFoundFault.java | 2 +-
.../cxf/customer/bare/CustomerService.java | 18 +-
.../apache/cxf/customer/bare/package-info.java | 2 +-
.../apache/cxf/customer/book/BookService.java | 2 +-
.../cxf/customer/book/BookServiceImpl.java | 6 +-
.../cxf/customer/book/BookServiceWrapped.java | 2 +-
.../customer/book/BookServiceWrappedImpl.java | 6 +-
.../cxf/customer/book/GetAnotherBook.java | 2 +-
.../apache/cxf/customer/book/package-info.java | 2 +-
.../org/apache/cxf/customer/package-info.java | 2 +-
.../cxf/customer/wraped/package-info.java | 2 +-
.../greeter_control/AbstractGreeterImpl.java | 8 +-
.../apache/cxf/greeter_control/ControlImpl.java | 32 +-
.../FaultThrowingInterceptor.java | 8 +-
.../cxf/greeter_control/GreeterImplBase.java | 2 +-
.../cxf/greeter_control/GreeterNoWsdl.java | 30 +-
.../jaxb_element_test/JaxbElementTestImpl.java | 6 +-
.../org/apache/cxf/mtom_xop/TestMtomImpl.java | 8 +-
.../OrderedParamHolderImpl.java | 8 +-
.../apache/cxf/test/AbstractCXFSpringTest.java | 24 +-
.../org/apache/cxf/test/AbstractCXFTest.java | 48 +-
.../apache/cxf/test/TestApplicationContext.java | 4 +-
.../java/org/apache/cxf/test/TestUtilities.java | 42 +-
.../java/org/apache/cxf/test/XPathAssert.java | 40 +-
.../common/AbstractBusClientServerTestBase.java | 26 +-
.../common/AbstractBusTestServerBase.java | 16 +-
.../common/AbstractClientServerTestBase.java | 36 +-
.../testutil/common/AbstractTestServerBase.java | 38 +-
.../common/EmbeddedJMSBrokerLauncher.java | 36 +-
.../cxf/testutil/common/ServerLauncher.java | 38 +-
.../apache/cxf/testutil/common/TestUtil.java | 34 +-
.../testutil/handler/TrivialSOAPHandler.java | 12 +-
.../testutil/recorders/InMessageRecorder.java | 4 +-
.../cxf/testutil/recorders/MessageRecorder.java | 12 +-
.../testutil/recorders/OutMessageRecorder.java | 26 +-
.../org/apache/header_test/TestHeaderImpl.java | 34 +-
.../header_test/rpc/TestRPCHeaderImpl.java | 8 +-
.../org/apache/headers/HeaderTesterImpl.java | 10 +-
.../org/apache/hello_world/GreeterImpl.java | 6 +-
.../hello_world_doc_lit/GreeterImplDoc.java | 8 +-
.../hello_world_doc_lit/HTTPGreeterImpl.java | 4 +-
.../hello_world_doc_lit/JMSGreeterImpl.java | 4 +-
.../MultiTransportGreeter.java | 4 +-
.../GreeterImplMixedStyle.java | 4 +-
.../AnnotatedGreeterImpl.java | 22 +-
.../AnnotatedGreeterNoOverloadImpl.java | 18 +-
.../AnotherDerivedGreeterImpl.java | 8 +-
.../hello_world_soap_http/BaseGreeterImpl.java | 20 +-
.../DerivedGreeterImpl.java | 6 +-
.../DocLitBareGreeterImpl.java | 8 +-
.../hello_world_soap_http/DocLitBareImpl.java | 16 +-
.../HWSoapMessageProvider.java | 6 +-
.../org/apache/hello_world_soap_http/Hello.java | 2 +-
.../apache/hello_world_soap_http/HelloImpl.java | 6 +-
.../HelloWorldServiceProvider.java | 6 +-
.../HelloWrongAnnotation.java | 4 +-
.../NotAnnotatedGreeterImpl.java | 80 +-
.../NotAnnotatedGreeterImplRPCLit.java | 2 +-
.../RPCLitGreeterImpl.java | 6 +-
.../any_types/GreeterImpl.java | 6 +-
.../hello_world_xml_http/bare/GreeterImpl.java | 6 +-
.../wrapped/GreeterFaultImpl.java | 6 +-
.../wrapped/GreeterImpl.java | 8 +-
.../org/apache/cxf/test/XPathAssertTest.java | 2 +-
.../header_test/rpc/TestRPCHeaderTest.java | 2 +-
.../tools/common/AbstractCXFToolContainer.java | 18 +-
.../org/apache/cxf/tools/common/ClassUtils.java | 24 +-
.../cxf/tools/common/ProcessorTestBase.java | 8 +-
.../java/org/apache/cxf/tools/common/Tag.java | 4 +-
.../apache/cxf/tools/common/ToolConstants.java | 10 +-
.../apache/cxf/tools/common/ToolContext.java | 22 +-
.../cxf/tools/common/ToolErrorListener.java | 10 +-
.../apache/cxf/tools/common/ToolException.java | 18 +-
.../apache/cxf/tools/common/ToolTestBase.java | 30 +-
.../cxf/tools/common/VelocityGenerator.java | 10 +-
.../apache/cxf/tools/common/VelocityWriter.java | 12 +-
.../common/dom/ExtendedDocumentBuilder.java | 6 +-
.../common/dom/SchemaValidatingSAXParser.java | 6 +-
.../cxf/tools/common/model/JAnnotation.java | 2 +-
.../tools/common/model/JAnnotationElement.java | 2 +-
.../cxf/tools/common/model/JavaClass.java | 10 +-
.../tools/common/model/JavaExceptionClass.java | 8 +-
.../cxf/tools/common/model/JavaField.java | 12 +-
.../cxf/tools/common/model/JavaInterface.java | 38 +-
.../cxf/tools/common/model/JavaMethod.java | 26 +-
.../cxf/tools/common/model/JavaModel.java | 6 +-
.../cxf/tools/common/model/JavaParameter.java | 6 +-
.../apache/cxf/tools/common/model/JavaPort.java | 30 +-
.../cxf/tools/common/model/JavaReturn.java | 2 +-
.../tools/common/model/JavaServiceClass.java | 8 +-
.../apache/cxf/tools/common/model/JavaType.java | 18 +-
.../common/toolspec/AbstractToolContainer.java | 34 +-
.../tools/common/toolspec/ToolContainer.java | 2 +-
.../cxf/tools/common/toolspec/ToolRunner.java | 8 +-
.../cxf/tools/common/toolspec/ToolSpec.java | 56 +-
.../toolspec/parser/CommandLineParser.java | 34 +-
.../cxf/tools/common/toolspec/parser/Form.java | 24 +-
.../tools/common/toolspec/parser/Option.java | 42 +-
.../common/toolspec/parser/OptionGroup.java | 10 +-
.../apache/cxf/tools/util/AnnotationUtil.java | 2 +-
.../tools/util/BuiltInTypesJavaMappingUtil.java | 8 +-
.../apache/cxf/tools/util/ClassCollector.java | 16 +-
.../apache/cxf/tools/util/FileWriterUtil.java | 2 +-
.../org/apache/cxf/tools/util/JAXBUtils.java | 20 +-
.../org/apache/cxf/tools/util/NameUtil.java | 4 +-
.../cxf/tools/util/OutputStreamCreator.java | 4 +-
.../org/apache/cxf/tools/util/PropertyUtil.java | 4 +-
.../apache/cxf/tools/util/ToolsStaxUtils.java | 14 +-
.../org/apache/cxf/tools/util/URLFactory.java | 4 +-
.../cxf/tools/common/ToolContextTest.java | 12 +-
.../org/apache/cxf/tools/common/model/A.java | 2 +-
.../cxf/tools/common/model/JAnnotationTest.java | 18 +-
.../cxf/tools/common/model/JavaClassTest.java | 2 +-
.../tools/common/model/JavaParameterTest.java | 6 +-
.../cxf/tools/common/model/JavaTypeTest.java | 2 +-
.../cxf/tools/common/toolspec/ToolSpecTest.java | 4 +-
.../tools/common/toolspec/ToolSupportTest.java | 2 +-
.../toolspec/parser/CommandLineParserTest.java | 22 +-
.../util/BuiltInTypesJavaMappingUtilTest.java | 2 +-
.../cxf/tools/util/FileWriterUtilTest.java | 8 +-
.../org/apache/cxf/tools/util/NameUtilTest.java | 2 +-
.../org/apache/cxf/tools/util/StAXUtilTest.java | 2 +-
.../cxf/tools/util/URIParserUtilTest.java | 6 +-
.../tools/corba/processors/idl/IDLLexer.java | 238 ++--
.../tools/corba/processors/idl/IDLParser.java | 1014 +++++++++---------
.../corba/processors/idl/IDLTokenTypes.java | 2 +-
.../org/apache/cxf/tools/corba/IDLToWSDL.java | 18 +-
.../org/apache/cxf/tools/corba/WSDLToIDL.java | 10 +-
.../tools/corba/common/CorbaPrimitiveMap.java | 32 +-
.../tools/corba/common/PrimitiveMapBase.java | 2 +-
.../corba/common/ProcessorEnvironment.java | 12 +-
.../cxf/tools/corba/common/SchemaFactory.java | 2 +-
.../tools/corba/common/SchemaFactoryImpl.java | 10 +-
.../tools/corba/common/SchemaWriterImpl.java | 12 +-
.../tools/corba/common/ToolCorbaConstants.java | 6 +-
.../corba/common/WSDLCorbaFactoryImpl.java | 6 +-
.../tools/corba/common/WSDLCorbaWriterImpl.java | 20 +-
.../corba/common/XmlSchemaPrimitiveMap.java | 28 +-
.../tools/corba/common/idltypes/CorbaUtils.java | 20 +-
.../corba/common/idltypes/IdlAnonArray.java | 8 +-
.../corba/common/idltypes/IdlAnonFixed.java | 6 +-
.../corba/common/idltypes/IdlAnonSequence.java | 6 +-
.../tools/corba/common/idltypes/IdlArray.java | 6 +-
.../corba/common/idltypes/IdlArrayBase.java | 8 +-
.../corba/common/idltypes/IdlAttribute.java | 8 +-
.../tools/corba/common/idltypes/IdlConst.java | 8 +-
.../tools/corba/common/idltypes/IdlDefn.java | 8 +-
.../corba/common/idltypes/IdlDefnImplBase.java | 8 +-
.../tools/corba/common/idltypes/IdlEnum.java | 6 +-
.../corba/common/idltypes/IdlEnumerator.java | 6 +-
.../corba/common/idltypes/IdlException.java | 6 +-
.../tools/corba/common/idltypes/IdlField.java | 6 +-
.../tools/corba/common/idltypes/IdlFixed.java | 6 +-
.../corba/common/idltypes/IdlInterface.java | 4 +-
.../tools/corba/common/idltypes/IdlModule.java | 4 +-
.../corba/common/idltypes/IdlOperation.java | 4 +-
.../tools/corba/common/idltypes/IdlParam.java | 10 +-
.../corba/common/idltypes/IdlPrimitive.java | 8 +-
.../tools/corba/common/idltypes/IdlRoot.java | 4 +-
.../corba/common/idltypes/IdlScopeBase.java | 8 +-
.../corba/common/idltypes/IdlSequence.java | 6 +-
.../tools/corba/common/idltypes/IdlString.java | 8 +-
.../tools/corba/common/idltypes/IdlStruct.java | 4 +-
.../corba/common/idltypes/IdlStructBase.java | 6 +-
.../tools/corba/common/idltypes/IdlTypedef.java | 4 +-
.../tools/corba/common/idltypes/IdlUnion.java | 8 +-
.../corba/common/idltypes/IdlUnionBranch.java | 2 +-
.../tools/corba/common/idltypes/IdlWString.java | 8 +-
.../idlpreprocessor/DefaultIncludeResolver.java | 18 +-
.../idlpreprocessor/IdlPreprocessorReader.java | 28 +-
.../idlpreprocessor/PreprocessingException.java | 2 +-
.../processors/idl/ArrayDeferredAction.java | 26 +-
.../processors/idl/AttributeDeferredAction.java | 26 +-
.../corba/processors/idl/ConstVisitor.java | 36 +-
.../processors/idl/ConstrTypeSpecVisitor.java | 16 +-
.../idl/DeferredActionCollection.java | 16 +-
.../corba/processors/idl/DefinitionVisitor.java | 8 +-
.../processors/idl/ExceptionDeferredAction.java | 20 +-
.../processors/idl/FixedPtConstVisitor.java | 36 +-
.../processors/idl/IDLModuleProcessor.java | 2 +-
.../corba/processors/idl/IDLProcessor.java | 8 +-
.../processors/idl/IDLToWSDLProcessor.java | 220 ++--
.../corba/processors/idl/ModuleToNSMapper.java | 12 +-
.../corba/processors/idl/ModuleVisitor.java | 12 +-
.../processors/idl/OperationDeferredAction.java | 18 +-
.../corba/processors/idl/OperationVisitor.java | 4 +-
.../processors/idl/ParamTypeSpecVisitor.java | 12 +-
.../corba/processors/idl/PortTypeVisitor.java | 120 +--
.../processors/idl/PrimitiveTypesVisitor.java | 32 +-
.../cxf/tools/corba/processors/idl/Scope.java | 24 +-
.../processors/idl/ScopeNameCollection.java | 12 +-
.../corba/processors/idl/ScopedNameVisitor.java | 132 +--
.../processors/idl/SimpleTypeSpecVisitor.java | 18 +-
.../corba/processors/idl/StringVisitor.java | 2 +-
.../processors/idl/StructDeferredAction.java | 20 +-
.../processors/idl/TemplateTypeSpecVisitor.java | 10 +-
.../corba/processors/idl/TypeDclVisitor.java | 10 +-
.../processors/idl/TypedefDeferredAction.java | 20 +-
.../corba/processors/idl/TypedefVisitor.java | 38 +-
.../tools/corba/processors/idl/TypesUtils.java | 16 +-
.../corba/processors/idl/TypesVisitor.java | 14 +-
.../corba/processors/idl/TypesVisitorBase.java | 4 +-
.../processors/idl/UnionDeferredAction.java | 24 +-
.../cxf/tools/corba/processors/idl/Visitor.java | 6 +-
.../tools/corba/processors/idl/VisitorBase.java | 26 +-
.../corba/processors/idl/WSDLASTVisitor.java | 4 +-
.../processors/wsdl/WSDLToCorbaProcessor.java | 44 +-
.../corba/processors/wsdl/WSDLToIDLAction.java | 234 ++--
.../corba/processors/wsdl/WSDLToProcessor.java | 32 +-
.../processors/wsdl/WSDLToTypeProcessor.java | 2 +-
.../corba/utils/FileOutputStreamFactory.java | 8 +-
.../apache/cxf/tools/corba/IDLToWSDLTest.java | 88 +-
.../apache/cxf/tools/corba/WSDLToIDLTest.java | 50 +-
.../cxf/tools/corba/common/ToolTestBase.java | 30 +-
.../IdlPreprocessorReaderTest.java | 6 +-
.../processors/IDLToWSDLGenerationTest.java | 198 ++--
.../processors/WSDLToCorbaBindingTest.java | 222 ++--
.../processors/WSDLToCorbaBindingTypeTest.java | 352 +++---
.../processors/WSDLToIDLGenerationTest.java | 204 ++--
.../apache/cxf/tools/corba/utils/TestUtils.java | 8 +-
.../corba/utils/TestWSDLCorbaWriterImpl.java | 38 +-
.../tools/corba/utils/WSDLGenerationTester.java | 6 +-
.../org/apache/cxf/tools/java2js/JavaToJS.java | 6 +-
.../java2js/processor/JavaToJSProcessor.java | 4 +-
.../org/apache/cxf/tools/java2ws/JavaToWS.java | 12 +-
.../cxf/tools/java2ws/JavaToWSContainer.java | 28 +-
.../cxf/tools/java2ws/util/JavaFirstUtil.java | 2 +-
.../java2wsdl/generator/AbstractGenerator.java | 8 +-
.../generator/WSDLGeneratorFactory.java | 2 +-
.../generator/wsdl11/BeanGenerator.java | 16 +-
.../generator/wsdl11/FaultBeanGenerator.java | 6 +-
.../generator/wsdl11/WSDL11Generator.java | 4 +-
.../generator/wsdl11/WrapperBeanGenerator.java | 2 +-
.../wsdl11/annotator/WrapperBeanAnnotator.java | 28 +-
.../annotator/WrapperBeanFieldAnnotator.java | 10 +-
.../java2wsdl/processor/FrontendFactory.java | 6 +-
.../processor/JavaToWSDLProcessor.java | 30 +-
.../processor/internal/AntGenerator.java | 10 +-
.../internal/ServiceBuilderFactory.java | 4 +-
.../internal/SpringServiceBuilderFactory.java | 10 +-
.../processor/internal/jaxws/FaultBean.java | 18 +-
.../internal/jaxws/JAXWSFrontEndProcessor.java | 14 +-
.../internal/jaxws/RequestWrapper.java | 6 +-
.../internal/jaxws/ResponseWrapper.java | 16 +-
.../processor/internal/jaxws/Wrapper.java | 12 +-
.../processor/internal/jaxws/WrapperUtil.java | 4 +-
.../jaxws/generator/JaxwsClientGenerator.java | 2 +-
.../jaxws/generator/JaxwsSEIGenerator.java | 4 +-
.../jaxws/generator/JaxwsServerGenerator.java | 4 +-
.../simple/SimpleFrontEndProcessor.java | 10 +-
.../generator/AbstractSimpleGenerator.java | 10 +-
.../simple/generator/SimpleClientGenerator.java | 4 +-
.../simple/generator/SimpleImplGenerator.java | 8 +-
.../simple/generator/SimpleSEIGenerator.java | 4 +-
.../simple/generator/SimpleServerGenerator.java | 4 +-
.../cxf/tools/fortest/AddNumbersImpl.java | 8 +-
.../org/apache/cxf/tools/fortest/HelloReq.java | 2 +-
.../org/apache/cxf/tools/fortest/RPCHello.java | 4 +-
.../tools/fortest/action/AddNumbersImpl.java | 6 +-
.../apache/cxf/tools/fortest/addr/WSAImpl2.java | 2 +-
.../cxf/tools/fortest/aegis2ws/Something.java | 2 +-
.../classnoanno/docwrapped/Calculator.java | 2 +-
.../classnoanno/docwrapped/jaxws/GetPrice.java | 16 +-
.../docwrapped/jaxws/GetPriceResponse.java | 12 +-
.../docwrapped/jaxws/ObjectFactory.java | 32 +-
.../tools/fortest/cxf1450/WebParamService.java | 2 +-
.../cxf/tools/fortest/cxf1519/EndpointImpl.java | 2 +-
.../tools/fortest/cxf1519/UserException.java | 4 +-
.../apache/cxf/tools/fortest/cxf188/Demo.java | 2 +-
.../tools/fortest/cxf2934/WebParamService.java | 2 +-
.../apache/cxf/tools/fortest/cxf4877/Hello.java | 2 +-
.../apache/cxf/tools/fortest/cxf669/Hello.java | 2 +-
.../cxf/tools/fortest/cxf774/ListTest.java | 8 +-
.../cxf/tools/fortest/cxf774/ListTestImpl.java | 4 +-
.../cxf/tools/fortest/epr/AddNumbersImpl.java | 6 +-
.../cxf/tools/fortest/exception/Echo2Impl.java | 6 +-
.../cxf/tools/fortest/exception/Echo3Impl.java | 4 +-
.../cxf/tools/fortest/exception/EchoImpl.java | 6 +-
.../tools/fortest/exception/MyException.java | 2 +-
.../tools/fortest/exception/OrderEchoImpl.java | 6 +-
.../exception/TransientMessageException.java | 8 +-
.../fortest/exception/TypeAdapterException.java | 6 +-
.../cxf/tools/fortest/headers/SomeHeaders.java | 2 +-
.../cxf/tools/fortest/holder/HolderService.java | 4 +-
.../org/apache/cxf/tools/fortest/inherit/B.java | 6 +-
.../cxf/tools/fortest/jaxws/rpc/Greeter.java | 2 +-
.../tools/fortest/jaxws/rpc/GreeterFault.java | 2 +-
.../apache/cxf/tools/fortest/simple/Hello.java | 2 +-
.../doc/GreeterNoWrapperBean.java | 2 +-
.../withannotation/doc/HelloWithNoWebParam.java | 2 +-
.../withannotation/doc/TestDataBean.java | 12 +-
.../withannotation/doc/jaxws/GetPrice.java | 16 +-
.../doc/jaxws/GetPriceResponse.java | 12 +-
.../withannotation/doc/jaxws/ObjectFactory.java | 32 +-
.../fortest/withannotation/rpc/EchoImpl.java | 2 +-
.../tools/fortest/withannotation/rpc/Hello.java | 4 +-
.../tools/fortest/xmllist/AddNumberImpl.java | 2 +-
.../fortest/xmllist/AddNumbersPortType.java | 22 +-
.../processor/JavaToJSProcessorTest.java | 4 +-
.../org/apache/cxf/tools/java2ws/AegisTest.java | 24 +-
.../apache/cxf/tools/java2ws/JavaToWSTest.java | 30 +-
.../cxf/tools/java2ws/fortest/AddException.java | 2 +-
.../wsdl11/FaultBeanGeneratorTest.java | 2 +-
.../wsdl11/WrapperBeanGeneratorTest.java | 38 +-
.../annotator/WrapperBeanAnnotatorTest.java | 32 +-
.../WrapperBeanFieldAnnotatorTest.java | 2 +-
.../cxf/tools/java2wsdl/processor/Hello.java | 2 +-
.../tools/java2wsdl/processor/HelloBare.java | 2 +-
.../processor/JavaToProcessorTest.java | 96 +-
.../jaxws/JaxwsServiceBuilderRPCTest.java | 2 +-
.../internal/jaxws/JaxwsServiceBuilderTest.java | 22 +-
.../internal/jaxws/RequestWrapperTest.java | 16 +-
.../internal/jaxws/ResponseWrapperTest.java | 12 +-
.../processor/internal/jaxws/WrapperTest.java | 6 +-
.../java/org/apache/xmladapter/Greeter.java | 2 +-
.../test/java/org/apache/xmladapter/Money.java | 2 +-
.../cxf/tools/validator/AbstractValidator.java | 2 +-
.../cxf/tools/validator/ServiceValidator.java | 2 +-
.../cxf/tools/validator/WSDLValidator.java | 10 +-
.../internal/AbstractDefinitionValidator.java | 4 +-
.../internal/MIMEBindingValidator.java | 8 +-
.../cxf/tools/validator/internal/Stax2DOM.java | 2 +-
.../internal/UniqueBodyPartsValidator.java | 6 +-
.../validator/internal/ValidationResult.java | 8 +-
.../tools/validator/internal/ValidatorUtil.java | 32 +-
.../validator/internal/WSDL11Validator.java | 38 +-
.../validator/internal/WSDLRefValidator.java | 16 +-
.../validator/internal/WSIBPValidator.java | 10 +-
.../tools/validator/internal/model/XNode.java | 12 +-
.../cxf/tools/validator/WSDLValidationTest.java | 10 +-
.../validator/internal/WSDL11ValidatorTest.java | 2 +-
.../internal/WSDLRefValidatorTest.java | 8 +-
.../validator/internal/model/XNodeTest.java | 2 +-
.../org/apache/cxf/tools/wadlto/WADLToJava.java | 6 +-
.../cxf/tools/wadlto/WadlToolConstants.java | 20 +-
.../tools/wadlto/jaxb/CustomizationParser.java | 30 +-
.../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 78 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 674 ++++++------
.../tools/wadlto/jaxrs/JAXRSContainerTest.java | 262 ++---
.../tools/wadlto/jaxrs/ValidateWadlTest.java | 10 +-
.../cxf/tools/wadlto/jaxrs/WADLToJavaTest.java | 28 +-
.../org/apache/cxf/tools/wsdlto/WSDLToJava.java | 2 +-
.../cxf/tools/wsdlto/WSDLToJavaContainer.java | 82 +-
.../tools/wsdlto/core/AbstractGenerator.java | 6 +-
.../tools/wsdlto/core/AbstractWSDLBuilder.java | 2 +-
.../tools/wsdlto/core/DataBindingProfile.java | 6 +-
.../tools/wsdlto/core/DefaultValueProvider.java | 18 +-
.../cxf/tools/wsdlto/core/FrontEndProfile.java | 4 +-
.../tools/wsdlto/core/RandomValueProvider.java | 8 +-
.../source/SourceDatabindingProfile.java | 8 +-
.../tools/wsdlto/WSDLToJavaContainerTest.java | 4 +-
.../cxf/tools/wsdlto/core/DummyGenerator.java | 2 +-
.../wsdlto/core/WSDLDefinitionBuilderTest.java | 34 +-
.../jaxb/ClassNameAllocatorImpl.java | 6 +-
.../databinding/jaxb/JAXBBindErrorListener.java | 12 +-
.../databinding/jaxb/JAXBDataBinding.java | 30 +-
.../databinding/jaxb/TypesCodeWriter.java | 12 +-
.../wsdlto/javascript/JavaScriptContainer.java | 2 +-
.../wsdlto/javascript/JavaScriptProfile.java | 2 +-
.../wsdlto/javascript/WSDLToJavaScript.java | 2 +-
.../javascript/WSDLToJavaScriptProcessor.java | 20 +-
.../wsdlto/javascript/WSDLToJavaScriptTest.java | 22 +-
.../frontend/jaxws/CXFJAXWSContainer.java | 2 +-
.../wsdlto/frontend/jaxws/JAXWS21Container.java | 2 +-
.../wsdlto/frontend/jaxws/JAXWSContainer.java | 6 +-
.../wsdlto/frontend/jaxws/JAXWSProfile.java | 2 +-
.../jaxws/customization/CustomNodeSelector.java | 8 +-
.../customization/CustomizationParser.java | 84 +-
.../jaxws/customization/JAXWSBinding.java | 24 +-
.../generators/AbstractJAXWSGenerator.java | 2 +-
.../frontend/jaxws/generators/AntGenerator.java | 20 +-
.../jaxws/generators/ClientGenerator.java | 12 +-
.../jaxws/generators/FaultGenerator.java | 10 +-
.../generators/HandlerConfigGenerator.java | 18 +-
.../jaxws/generators/ImplGenerator.java | 18 +-
.../frontend/jaxws/generators/SEIGenerator.java | 18 +-
.../jaxws/generators/ServerGenerator.java | 18 +-
.../jaxws/generators/ServiceGenerator.java | 34 +-
.../jaxws/processor/WSDLToJavaProcessor.java | 14 +-
.../processor/internal/AbstractProcessor.java | 2 +-
.../processor/internal/FaultProcessor.java | 2 +-
.../processor/internal/OperationProcessor.java | 36 +-
.../processor/internal/ParameterProcessor.java | 52 +-
.../processor/internal/PortTypeProcessor.java | 10 +-
.../jaxws/processor/internal/ProcessorUtil.java | 10 +-
.../processor/internal/ServiceProcessor.java | 50 +-
.../internal/annotator/BindingAnnotator.java | 18 +-
.../annotator/SoapBindingAnnotator.java | 14 +-
.../internal/annotator/WSActionAnnotator.java | 28 +-
.../internal/annotator/WebMethodAnnotator.java | 2 +-
.../internal/annotator/WebParamAnnotator.java | 14 +-
.../internal/annotator/WebResultAnnotator.java | 8 +-
.../internal/annotator/WebServiceAnnotator.java | 6 +-
.../internal/annotator/WrapperAnnotator.java | 4 +-
.../annotator/XmlJavaTypeAdapterAnnotator.java | 2 +-
.../internal/annotator/XmlListAnotator.java | 4 +-
.../internal/annotator/XmlSeeAlsoAnnotator.java | 4 +-
.../internal/mapper/InterfaceMapper.java | 6 +-
.../processor/internal/mapper/MethodMapper.java | 2 +-
.../internal/mapper/ParameterMapper.java | 16 +-
.../jaxws/validator/UniqueBodyValidator.java | 6 +-
.../WrapperStyleNameCollisionValidator.java | 16 +-
.../jaxws/wsdl11/CustomizedWSDLLocator.java | 26 +-
.../jaxws/wsdl11/JAXWSDefinitionBuilder.java | 18 +-
.../wsdlto/frontend/jaxws/DummyDataBinding.java | 8 +-
.../wsdlto/frontend/jaxws/JAXWSProfileTest.java | 8 +-
.../internal/PortTypeProcessorTest.java | 2 +-
.../processor/internal/ProcessorUtilTest.java | 6 +-
.../annotator/WebParamAnnotatorTest.java | 8 +-
.../annotator/XmlSeeAlsoAnnotatorTest.java | 4 +-
.../internal/mapper/InterfaceMapperTest.java | 8 +-
.../internal/mapper/MethodMapperTest.java | 4 +-
.../wsdl11/JAXWSDefinitionBuilderTest.java | 2 +-
.../apache/cxf/tools/misc/WSDLToService.java | 2 +-
.../org/apache/cxf/tools/misc/WSDLToSoap.java | 14 +-
.../org/apache/cxf/tools/misc/WSDLToXML.java | 14 +-
.../org/apache/cxf/tools/misc/XSDToWSDL.java | 2 +-
.../misc/processor/AbstractWSDLToProcessor.java | 10 +-
.../misc/processor/WSDLToSoapProcessor.java | 2 +-
.../misc/processor/address/AddressFactory.java | 8 +-
.../processor/WSDLToServiceProcessorTest.java | 6 +-
.../misc/processor/XSDToWSDLProcessorTest.java | 6 +-
.../cxf/tools/wsdlto/AbstractCodeGenTest.java | 6 +-
.../cxf/tools/wsdlto/core/PluginLoaderTest.java | 18 +-
.../wsdlto/jaxb/JAXBCodeGenOptionTest.java | 8 +-
.../cxf/tools/wsdlto/jaxws/CodeGenBugTest.java | 14 +-
.../tools/wsdlto/jaxws/CodeGenOptionTest.java | 20 +-
.../cxf/tools/wsdlto/jaxws/CodeGenTest.java | 84 +-
.../cxf/tools/wsdlto/jaxws/DummyXjcPlugin.java | 10 +-
.../tools/wsdlto/jaxws/JAXWSContainerTest.java | 14 +-
.../wsdl11/JAXWSDefinitionBuilderTest.java | 2 +-
.../tools/wsdlto/validator/ValidatorTest.java | 6 +-
5386 files changed, 82220 insertions(+), 82225 deletions(-)
----------------------------------------------------------------------
[38/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/MessageUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/MessageUtils.java b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
index 5bcfe23..1e89239 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageUtils.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageUtils.java
@@ -37,7 +37,7 @@ public final class MessageUtils {
/**
* Determine if message is outbound.
- *
+ *
* @param message the current Message
* @return true if the message direction is outbound
*/
@@ -53,7 +53,7 @@ public final class MessageUtils {
/**
* Determine if message is fault.
- *
+ *
* @param message the current Message
* @return true if the message is a fault
*/
@@ -63,11 +63,11 @@ public final class MessageUtils {
&& (message == message.getExchange().getInFaultMessage() || message == message.getExchange()
.getOutFaultMessage());
}
-
+
/**
- * Determine the fault mode for the underlying (fault) message
+ * Determine the fault mode for the underlying (fault) message
* (for use on server side only).
- *
+ *
* @param message the fault message
* @return the FaultMode
*/
@@ -82,12 +82,12 @@ public final class MessageUtils {
return FaultMode.RUNTIME_FAULT;
}
}
- return null;
+ return null;
}
/**
* Determine if current messaging role is that of requestor.
- *
+ *
* @param message the current Message
* @return true if the current messaging role is that of requestor
*/
@@ -98,21 +98,21 @@ public final class MessageUtils {
}
return false;
}
-
+
/**
* Determine if the current message is a partial response.
- *
+ *
* @param message the current message
* @return true if the current messags is a partial response
*/
public static boolean isPartialResponse(Message message) {
return message != null && Boolean.TRUE.equals(message.get(Message.PARTIAL_RESPONSE_MESSAGE));
}
-
+
/**
* Determines if the current message is an empty partial response, which
* is a partial response with an empty content.
- *
+ *
* @param message the current message
* @return true if the current messags is a partial empty response
*/
@@ -129,7 +129,7 @@ public final class MessageUtils {
// TODO - consider deprecation as this really belongs in PropertyUtils
return PropertyUtils.isTrue(value);
}
-
+
public static boolean getContextualBoolean(Message m, String key, boolean defaultValue) {
if (m != null) {
Object o = m.getContextualProperty(key);
@@ -139,7 +139,7 @@ public final class MessageUtils {
}
return defaultValue;
}
-
+
public static Object getContextualProperty(Message m, String propPreferred, String propDefault) {
Object prop = null;
if (m != null) {
@@ -150,7 +150,7 @@ public final class MessageUtils {
}
return prop;
}
-
+
/**
* Returns true if the underlying content format is a W3C DOM or a SAAJ message.
*/
@@ -160,7 +160,7 @@ public final class MessageUtils {
for (Class c : m.getContentFormats()) {
if (c.equals(Node.class) || c.getName().equals("javax.xml.soap.SOAPMessage")) {
return true;
- }
+ }
}
return false;
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/StringMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/StringMap.java b/core/src/main/java/org/apache/cxf/message/StringMap.java
index 87115fe..ed1dc90 100644
--- a/core/src/main/java/org/apache/cxf/message/StringMap.java
+++ b/core/src/main/java/org/apache/cxf/message/StringMap.java
@@ -22,7 +22,7 @@ package org.apache.cxf.message;
import java.util.Map;
public interface StringMap extends Map<String, Object> {
-
+
/**
* Convenience method for storing/retrieving typed objects from the map.
* equivalent to: (T)get(key.getName());
@@ -30,7 +30,7 @@ public interface StringMap extends Map<String, Object> {
* @return the value
*/
<T> T get(Class<T> key);
-
+
/**
* Convenience method for storing/retrieving typed objects from the map.
* equivalent to: put(key.getName(), value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/message/StringMapImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/message/StringMapImpl.java b/core/src/main/java/org/apache/cxf/message/StringMapImpl.java
index f3acdc1..7916224 100644
--- a/core/src/main/java/org/apache/cxf/message/StringMapImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/StringMapImpl.java
@@ -26,10 +26,10 @@ import java.util.Map;
* A variation on HashMap which allows lookup by Class, via the string
* returned by {@link Class#getName()}.
*/
-public class StringMapImpl
- extends HashMap<String, Object>
+public class StringMapImpl
+ extends HashMap<String, Object>
implements StringMap {
-
+
private static final long serialVersionUID = -4590903451121887L;
public StringMapImpl() {
@@ -37,7 +37,7 @@ public class StringMapImpl
public StringMapImpl(Map<String, Object> i) {
super(i);
}
-
+
@SuppressWarnings("unchecked")
public <T> T get(Class<T> key) {
return (T)get(key.getName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java b/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
index a6ee001..2a5afc6 100644
--- a/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/phase/AbstractPhaseInterceptor.java
@@ -29,10 +29,10 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageUtils;
/**
- * Provides a starting point implementation for a interceptors that
- * participate in phased message processing. Developers should extend from
+ * Provides a starting point implementation for a interceptors that
+ * participate in phased message processing. Developers should extend from
* this class when implementing custom interceptors.
- * Developers need to provide an implementation for handleMessage() and
+ * Developers need to provide an implementation for handleMessage() and
* can override the handleFault() implementation. They should not override
* the other methods.
*/
@@ -43,7 +43,7 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
private final Set<String> after = new SortedArraySet<String>();
/**
- * Instantiates the interceptor to live in a specified phase. The
+ * Instantiates the interceptor to live in a specified phase. The
* interceptor's id will be set to the name of the implementing class.
*
* @param phase the interceptor's phase
@@ -63,10 +63,10 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
}
/**
- * Instantiates the interceptor and specifies if it gets a system
- * determined unique id. If <code>uniqueId</code> is set to true the
- * interceptor's id will be determined by the runtime. If
- * <code>uniqueId</code> is set to false, the implementing class' name
+ * Instantiates the interceptor and specifies if it gets a system
+ * determined unique id. If <code>uniqueId</code> is set to true the
+ * interceptor's id will be determined by the runtime. If
+ * <code>uniqueId</code> is set to false, the implementing class' name
* is used as the id.
*
* @param phase the interceptor's phase
@@ -77,8 +77,8 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
}
/**
- * Instantiates the interceptor with a specified id or with a system
- * determined unique id. The specified id will be used unless
+ * Instantiates the interceptor with a specified id or with a system
+ * determined unique id. The specified id will be used unless
* <code>uniqueId</code> is set to true.
*
* @param i the interceptor's id
@@ -95,12 +95,12 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
id = i;
phase = p;
}
-
+
/**
- * Specifies that the current interceptor needs to be added to the
- * interceptor chain before the specified collection of interceptors.
+ * Specifies that the current interceptor needs to be added to the
+ * interceptor chain before the specified collection of interceptors.
* This method replaces any existing list with the provided list.
- *
+ *
* @param i a collection of interceptor ids
*/
public void setBefore(Collection<String> i) {
@@ -109,10 +109,10 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
}
/**
- * Specifies that the current interceptor needs to be added to the
+ * Specifies that the current interceptor needs to be added to the
* interceptor chain after the specified collection of interceptors.
* This method replaces any existing list with the provided list.
- *
+ *
* @param i a collection of interceptor ids
*/
public void setAfter(Collection<String> i) {
@@ -121,9 +121,9 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
}
/**
- * Specifies that the current interceptor needs to be added to the
+ * Specifies that the current interceptor needs to be added to the
* interceptor chain before the specified collection of interceptors.
- *
+ *
* @param i a collection of interceptor ids
*/
public void addBefore(Collection<String> i) {
@@ -131,19 +131,19 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
}
/**
- * Specifies that the current interceptor needs to be added to the
+ * Specifies that the current interceptor needs to be added to the
* interceptor chain after the specified collection of interceptors.
- *
+ *
* @param i a collection of interceptor ids
*/
public void addAfter(Collection<String> i) {
after.addAll(i);
}
-
+
/**
- * Specifies that the current interceptor needs to be added to the
+ * Specifies that the current interceptor needs to be added to the
* interceptor chain before the specified interceptor.
- *
+ *
* @param i an interceptor id
*/
public void addBefore(String i) {
@@ -151,9 +151,9 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
}
/**
- * Specifies that the current interceptor needs to be added to the
+ * Specifies that the current interceptor needs to be added to the
* interceptor chain after the specified interceptor.
- *
+ *
* @param i an interceptor id
*/
public void addAfter(String i) {
@@ -168,7 +168,7 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
public final Set<String> getBefore() {
return before;
}
-
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return null;
}
@@ -189,15 +189,15 @@ public abstract class AbstractPhaseInterceptor<T extends Message> implements Pha
String method = (String)message.get(Message.HTTP_REQUEST_METHOD);
return "GET".equals(method) && message.getContent(XMLStreamReader.class) == null;
}
-
+
/**
* Determine if current messaging role is that of requestor.
- *
+ *
* @param message the current Message
* @return true if the current messaging role is that of requestor
*/
protected boolean isRequestor(T message) {
return MessageUtils.isRequestor(message);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/Phase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/Phase.java b/core/src/main/java/org/apache/cxf/phase/Phase.java
index 089d759..8e18bc7 100644
--- a/core/src/main/java/org/apache/cxf/phase/Phase.java
+++ b/core/src/main/java/org/apache/cxf/phase/Phase.java
@@ -20,9 +20,9 @@
package org.apache.cxf.phase;
public class Phase implements Comparable<Object> {
-
+
// can be removed from once defined as default value in configuration metadata for bus
-
+
public static final String SETUP = "setup";
public static final String SETUP_ENDING = "setup-ending";
public static final String PRE_LOGICAL = "pre-logical";
@@ -54,7 +54,7 @@ public class Phase implements Comparable<Object> {
public static final String WRITE_ENDING = "write-ending";
public static final String SEND = "send";
public static final String SEND_ENDING = "send-ending";
-
+
public static final String RECEIVE = "receive";
public static final String READ = "read";
public static final String PROTOCOL = "protocol";
@@ -64,19 +64,19 @@ public class Phase implements Comparable<Object> {
public static final String PRE_INVOKE = "pre-invoke";
public static final String INVOKE = "invoke";
public static final String POST_INVOKE = "post-invoke";
-
-
+
+
private String name;
private int priority;
-
+
public Phase() {
}
-
+
public Phase(String n, int p) {
this.name = n;
this.priority = p;
}
-
+
public String getName() {
return name;
}
@@ -89,7 +89,7 @@ public class Phase implements Comparable<Object> {
public void setPriority(int p) {
this.priority = p;
}
-
+
public int hashCode() {
return priority;
}
@@ -98,7 +98,7 @@ public class Phase implements Comparable<Object> {
return false;
}
Phase p = (Phase)o;
-
+
return p.priority == priority
&& p.name.equals(name);
}
@@ -106,15 +106,15 @@ public class Phase implements Comparable<Object> {
public int compareTo(Object o) {
if (o instanceof Phase) {
Phase p = (Phase)o;
-
+
if (priority == p.priority) {
- return name.compareTo(p.name);
+ return name.compareTo(p.name);
}
return priority - p.priority;
}
return 1;
}
-
+
public String toString() {
return "Phase(" + getName() + ")";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java b/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
index 6c17236..9e65523 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseChainCache.java
@@ -33,12 +33,12 @@ import org.apache.cxf.message.Message;
* The PhaseChainCache provides default interceptor chains for SOAP requests
* and responses, both from the client and web service side. The list of
* phases supplied in the get() methods of this class are defined by default
- * within org.apache.cxf.phase.PhaseManagerImpl. For an example of this class
+ * within org.apache.cxf.phase.PhaseManagerImpl. For an example of this class
* in use, check the sourcecode of org.apache.cxf.endpoint.ClientImpl.
*/
public final class PhaseChainCache {
AtomicReference<ChainHolder> lastData = new AtomicReference<ChainHolder>();
-
+
public PhaseInterceptorChain get(SortedSet<Phase> phaseList,
List<Interceptor<? extends Message>> p1) {
return getChain(lastData, phaseList, p1);
@@ -70,18 +70,18 @@ public final class PhaseChainCache {
List<Interceptor<? extends Message>> p5) {
return getChain(lastData, phaseList, p1, p2, p3, p4, p5);
}
-
+
@SafeVarargs
static PhaseInterceptorChain getChain(AtomicReference<ChainHolder> lastData,
SortedSet<Phase> phaseList,
List<Interceptor<? extends Message>> ... providers) {
ChainHolder last = lastData.get();
-
- if (last == null
+
+ if (last == null
|| !last.matches(providers)) {
-
+
PhaseInterceptorChain chain = new PhaseInterceptorChain(phaseList);
- List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> copy
+ List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> copy
= new ArrayList<ModCountCopyOnWriteArrayList<
Interceptor<? extends Message>>>(providers.length);
for (List<Interceptor<? extends Message>> p : providers) {
@@ -91,21 +91,21 @@ public final class PhaseChainCache {
last = new ChainHolder(chain, copy);
lastData.set(last);
}
-
-
+
+
return last.chain.cloneChain();
}
-
+
private static class ChainHolder {
List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> lists;
PhaseInterceptorChain chain;
-
- ChainHolder(PhaseInterceptorChain c,
+
+ ChainHolder(PhaseInterceptorChain c,
List<ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>> l) {
lists = l;
chain = c;
}
-
+
@SafeVarargs
final boolean matches(List<Interceptor<? extends Message>> ... providers) {
if (lists.size() == providers.length) {
@@ -113,7 +113,7 @@ public final class PhaseChainCache {
if (lists.get(x).size() != providers[x].size()) {
return false;
}
-
+
if (providers[x].getClass() == ModCountCopyOnWriteArrayList.class) {
if (((ModCountCopyOnWriteArrayList<?>)providers[x]).getModCount()
!= lists.get(x).getModCount()) {
@@ -122,7 +122,7 @@ public final class PhaseChainCache {
} else {
ListIterator<Interceptor<? extends Message>> i1 = lists.get(x).listIterator();
ListIterator<Interceptor<? extends Message>> i2 = providers[x].listIterator();
-
+
while (i1.hasNext()) {
if (i1.next() != i2.next()) {
return false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java b/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java
index 2d45385..4b292c9 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseComparator.java
@@ -26,5 +26,5 @@ public class PhaseComparator implements Comparator<Phase> {
public int compare(Phase o1, Phase o2) {
return o1.getPriority() - o2.getPriority();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
index e651ff0..0d4b324 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptor.java
@@ -26,11 +26,11 @@ import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
/**
- * A phase interceptor is an intercetor that participates in a
+ * A phase interceptor is an intercetor that participates in a
* PhaseInterceptorChain.
* The phase property controls the phase in which the interceptor is placed.
- * The before and after properties allow for fine grained control over where
- * the phase the interceptor is placed. They specify the IDs of the
+ * The before and after properties allow for fine grained control over where
+ * the phase the interceptor is placed. They specify the IDs of the
* interceptors that must be placed before and after the interceptor.
*
* @see org.apache.cxf.phase.PhaseInterceptorChain
@@ -38,18 +38,18 @@ import org.apache.cxf.message.Message;
public interface PhaseInterceptor<T extends Message> extends Interceptor<T> {
/**
- * Returns a set containing the IDs of the interceptors that should be
- * executed before this interceptor. This interceptor will be placed
+ * Returns a set containing the IDs of the interceptors that should be
+ * executed before this interceptor. This interceptor will be placed
* in the chain after the interceptors in the set.
* @return the IDs of the interceptors
*/
Set<String> getAfter();
/**
- * Returns a set containing the IDs of the interceptors that should be
- * executed after this interceptor. This interceptor will be placed in
+ * Returns a set containing the IDs of the interceptors that should be
+ * executed after this interceptor. This interceptor will be placed in
* the inteceptor chain before the interceptors in the set.
- * @return the ids of the interceptors
+ * @return the ids of the interceptors
*/
Set<String> getBefore();
@@ -64,9 +64,9 @@ public interface PhaseInterceptor<T extends Message> extends Interceptor<T> {
* @return the phase
*/
String getPhase();
-
+
/**
- * Returns a collection of Interceptors that should be added to the chain
+ * Returns a collection of Interceptors that should be added to the chain
* whenever this interceptor is added. May return null.
* @return the collection of interceptors
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
index 2ed58d1..85a4d6c 100644
--- a/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
+++ b/core/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
@@ -57,19 +57,19 @@ import org.apache.cxf.transport.MessageObserver;
* A List of phases is supplied to the PhaseInterceptorChain in the constructor.
* This class is typically instantiated from the PhaseChainCache class in this
* package. Interceptors that are added to the chain are ordered by phase.
- * Within a phase, interceptors can order themselves. Each PhaseInterceptor
- * has an ID. PhaseInterceptors can supply a Collection of IDs which they
+ * Within a phase, interceptors can order themselves. Each PhaseInterceptor
+ * has an ID. PhaseInterceptors can supply a Collection of IDs which they
* should run before or after, supplying fine grained ordering.
* <p>
- *
+ *
*/
public class PhaseInterceptorChain implements InterceptorChain {
public static final String PREVIOUS_MESSAGE = PhaseInterceptorChain.class.getName() + ".PREVIOUS_MESSAGE";
-
- private static final Logger LOG = LogUtils.getL7dLogger(PhaseInterceptorChain.class);
+
+ private static final Logger LOG = LogUtils.getL7dLogger(PhaseInterceptorChain.class);
private static final ThreadLocal<Message> CURRENT_MESSAGE = new ThreadLocal<Message>();
-
+
private final Map<String, Integer> nameMap;
private final Phase phases[];
@@ -85,37 +85,37 @@ public class PhaseInterceptorChain implements InterceptorChain {
// interceptors to the end of the list by default.
private boolean hasAfters[];
-
+
private State state;
private Message pausedMessage;
private MessageObserver faultObserver;
private PhaseInterceptorIterator iterator;
private final boolean isFineLogging;
-
- // currently one chain for one request/response, use below as signal
+
+ // currently one chain for one request/response, use below as signal
// to avoid duplicate fault processing on nested calling of
// doIntercept(), which will throw same fault multi-times
private boolean faultOccurred;
private boolean chainReleased;
-
-
+
+
private PhaseInterceptorChain(PhaseInterceptorChain src) {
isFineLogging = LOG.isLoggable(Level.FINE);
-
+
//only used for clone
state = State.EXECUTING;
-
+
//immutable, just repoint
nameMap = src.nameMap;
phases = src.phases;
-
+
int length = phases.length;
hasAfters = new boolean[length];
System.arraycopy(src.hasAfters, 0, hasAfters, 0, length);
-
+
heads = new InterceptorHolder[length];
tails = new InterceptorHolder[length];
-
+
InterceptorHolder last = null;
for (int x = 0; x < length; x++) {
InterceptorHolder ih = src.heads[x];
@@ -135,7 +135,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
}
}
-
+
public PhaseInterceptorChain(SortedSet<Phase> ps) {
state = State.EXECUTING;
isFineLogging = LOG.isLoggable(Level.FINE);
@@ -147,21 +147,21 @@ public class PhaseInterceptorChain implements InterceptorChain {
heads = new InterceptorHolder[numPhases];
tails = new InterceptorHolder[numPhases];
hasAfters = new boolean[numPhases];
-
+
int idx = 0;
for (Phase phase : ps) {
- phases[idx] = phase;
+ phases[idx] = phase;
nameMap.put(phase.getName(), idx);
++idx;
}
}
-
+
public static Message getCurrentMessage() {
return CURRENT_MESSAGE.get();
}
-
+
public static boolean setCurrentMessage(PhaseInterceptorChain chain, Message m) {
- if (getCurrentMessage() == m) {
+ if (getCurrentMessage() == m) {
return false;
}
if (chain.iterator.hasPrevious()) {
@@ -172,17 +172,17 @@ public class PhaseInterceptorChain implements InterceptorChain {
} else {
String error = "Only ServiceInvokerInterceptor can update the current chain message";
LOG.warning(error);
- throw new IllegalStateException(error);
+ throw new IllegalStateException(error);
}
}
return false;
-
+
}
-
+
public synchronized State getState() {
return state;
}
-
+
public synchronized void releaseAndAcquireChain() {
while (!chainReleased) {
try {
@@ -193,16 +193,16 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
chainReleased = false;
}
-
+
public synchronized void releaseChain() {
this.chainReleased = true;
this.notifyAll();
}
-
+
public PhaseInterceptorChain cloneChain() {
return new PhaseInterceptorChain(this);
}
-
+
private void updateIterator() {
if (iterator == null) {
iterator = new PhaseInterceptorIterator(heads);
@@ -210,7 +210,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
//System.out.println(toString());
}
}
-
+
public void add(Collection<Interceptor<? extends Message>> newhandlers) {
add(newhandlers, false);
}
@@ -228,25 +228,25 @@ public class PhaseInterceptorChain implements InterceptorChain {
public void add(Interceptor<? extends Message> i) {
add(i, false);
}
-
+
public void add(Interceptor<? extends Message> i, boolean force) {
PhaseInterceptor<? extends Message> pi = (PhaseInterceptor<? extends Message>)i;
- String phaseName = pi.getPhase();
+ String phaseName = pi.getPhase();
Integer phase = nameMap.get(phaseName);
-
+
if (phase == null) {
- LOG.warning("Skipping interceptor " + i.getClass().getName()
- + ((phaseName == null) ? ": Phase declaration is missing."
+ LOG.warning("Skipping interceptor " + i.getClass().getName()
+ + ((phaseName == null) ? ": Phase declaration is missing."
: ": Phase " + phaseName + " specified does not exist."));
- } else {
+ } else {
if (isFineLogging) {
LOG.fine("Adding interceptor " + i + " to phase " + phaseName);
}
insertInterceptor(phase, pi, force);
}
- Collection<PhaseInterceptor<? extends Message>> extras
+ Collection<PhaseInterceptor<? extends Message>> extras
= pi.getAdditionalInterceptors();
if (extras != null) {
for (PhaseInterceptor<? extends Message> p : extras) {
@@ -265,7 +265,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
pausedMessage = null;
}
}
-
+
public synchronized void suspend() {
state = State.SUSPENDED;
pausedMessage = CURRENT_MESSAGE.get();
@@ -282,8 +282,8 @@ public class PhaseInterceptorChain implements InterceptorChain {
/**
* Intercept a message, invoking each phase's handlers in turn.
- *
- * @param message the message
+ *
+ * @param message the message
* @throws Exception
*/
@SuppressWarnings("unchecked")
@@ -293,7 +293,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
Message oldMessage = CURRENT_MESSAGE.get();
try {
CURRENT_MESSAGE.set(message);
- if (oldMessage != null
+ if (oldMessage != null
&& !message.containsKey(PREVIOUS_MESSAGE)
&& message != oldMessage
&& message.getExchange() != oldMessage.getExchange()) {
@@ -311,17 +311,17 @@ public class PhaseInterceptorChain implements InterceptorChain {
// throw the exception to make sure thread exit without interrupt
throw new SuspendedInvocationException();
}
-
+
} catch (SuspendedInvocationException ex) {
-
- // Moving the chain iterator to the previous interceptor is needed
+
+ // Moving the chain iterator to the previous interceptor is needed
// for the invocation to be resumed from the same interceptor which
- // suspended the invocation.
- // If "suspend.chain.on.current.interceptor" is set to true then
- // the chain will be resumed from the interceptor which follows
- // the interceptor which suspended the invocation.
+ // suspended the invocation.
+ // If "suspend.chain.on.current.interceptor" is set to true then
+ // the chain will be resumed from the interceptor which follows
+ // the interceptor which suspended the invocation.
Object suspendProp = message.remove("suspend.chain.on.current.interceptor");
- if ((suspendProp == null || PropertyUtils.isFalse(suspendProp))
+ if ((suspendProp == null || PropertyUtils.isFalse(suspendProp))
&& iterator.hasPrevious()) {
iterator.previous();
}
@@ -333,7 +333,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
wrapExceptionAsFault(message, ex);
}
state = State.ABORTED;
- }
+ }
}
if (state == State.EXECUTING) {
state = State.COMPLETE;
@@ -346,14 +346,14 @@ public class PhaseInterceptorChain implements InterceptorChain {
private void wrapExceptionAsFault(Message message, RuntimeException ex) {
String description = getServiceInfo(message);
-
+
message.setContent(Exception.class, ex);
unwind(message);
Exception ex2 = message.getContent(Exception.class);
if (ex2 == null) {
ex2 = ex;
}
-
+
FaultListener flogger = (FaultListener)
message.getContextualProperty(FaultListener.class.getName());
boolean useDefaultLogging = true;
@@ -363,7 +363,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
if (useDefaultLogging) {
doDefaultLogging(message, ex2, description);
}
-
+
if (message.getExchange() != null && message.getContent(Exception.class) != null) {
message.getExchange().put(Exception.class, ex2);
}
@@ -427,7 +427,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
}
}
-
+
private boolean isOneWay(Message message) {
return (message.getExchange() != null) ? message.getExchange().isOneWay() && !isRobustOneWay(message) : false;
}
@@ -439,16 +439,16 @@ public class PhaseInterceptorChain implements InterceptorChain {
/**
* Intercept a message, invoking each phase's handlers in turn,
* starting after the specified interceptor.
- *
+ *
* @param message the message
- * @param startingAfterInterceptorID the id of the interceptor
+ * @param startingAfterInterceptorID the id of the interceptor
* @throws Exception
*/
public synchronized boolean doInterceptStartingAfter(Message message,
String startingAfterInterceptorID) {
updateIterator();
while (state == State.EXECUTING && iterator.hasNext()) {
- PhaseInterceptor<? extends Message> currentInterceptor
+ PhaseInterceptor<? extends Message> currentInterceptor
= (PhaseInterceptor<? extends Message>)iterator.next();
if (currentInterceptor.getId().equals(startingAfterInterceptorID)) {
break;
@@ -460,16 +460,16 @@ public class PhaseInterceptorChain implements InterceptorChain {
/**
* Intercept a message, invoking each phase's handlers in turn,
* starting at the specified interceptor.
- *
+ *
* @param message the message
- * @param startingAtInterceptorID the id of the interceptor
+ * @param startingAtInterceptorID the id of the interceptor
* @throws Exception
*/
public synchronized boolean doInterceptStartingAt(Message message,
String startingAtInterceptorID) {
updateIterator();
while (state == State.EXECUTING && iterator.hasNext()) {
- PhaseInterceptor<? extends Message> currentInterceptor
+ PhaseInterceptor<? extends Message> currentInterceptor
= (PhaseInterceptor<? extends Message>)iterator.next();
if (currentInterceptor.getId().equals(startingAtInterceptorID)) {
iterator.previous();
@@ -488,7 +488,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
iterator.reset();
}
}
-
+
@SuppressWarnings("unchecked")
public void unwind(Message message) {
while (iterator.hasPrevious()) {
@@ -557,7 +557,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
}
}
-
+
private void insertInterceptor(int phase, PhaseInterceptor<? extends Message> interc, boolean force) {
InterceptorHolder ih = new InterceptorHolder(interc, phase);
if (heads[phase] == null) {
@@ -565,7 +565,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
heads[phase] = ih;
tails[phase] = ih;
hasAfters[phase] = !interc.getAfter().isEmpty();
-
+
int idx = phase - 1;
while (idx >= 0) {
if (tails[idx] != null) {
@@ -590,7 +590,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
++idx;
}
-
+
if (idx != heads.length) {
//found something after us
ih.next = heads[idx];
@@ -598,13 +598,13 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
}
} else { // this phase already has interceptors attached
-
+
// list of interceptors that the new interceptor should precede
Set<String> beforeList = interc.getBefore();
// list of interceptors that the new interceptor should be after
Set<String> afterList = interc.getAfter();
-
+
// firstBefore will hold the first interceptor of a given phase
// that the interceptor to be added must precede
InterceptorHolder firstBefore = null;
@@ -612,10 +612,10 @@ public class PhaseInterceptorChain implements InterceptorChain {
// lastAfter will hold the last interceptor of a given phase
// that the interceptor to be added must come after
InterceptorHolder lastAfter = null;
-
+
String id = interc.getId();
if (hasAfters[phase] || !beforeList.isEmpty()) {
-
+
InterceptorHolder ih2 = heads[phase];
while (ih2 != tails[phase].next) {
PhaseInterceptor<? extends Message> cmp = ih2.interceptor;
@@ -624,8 +624,8 @@ public class PhaseInterceptorChain implements InterceptorChain {
&& (beforeList.contains(cmpId)
|| cmp.getAfter().contains(id))) {
firstBefore = ih2;
- }
- if (cmp.getBefore().contains(id)
+ }
+ if (cmp.getBefore().contains(id)
|| (cmpId != null && afterList.contains(cmpId))) {
lastAfter = ih2;
}
@@ -649,12 +649,12 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
ih2 = ih2.next;
}
-
+
//System.out.print("Skipped: " + phase.toString());
//System.out.println(" " + interc.getId());
}
hasAfters[phase] |= !afterList.isEmpty();
-
+
if (firstBefore == null
&& lastAfter == null
&& !beforeList.isEmpty()
@@ -664,13 +664,13 @@ public class PhaseInterceptorChain implements InterceptorChain {
//stick it at the beginning
firstBefore = heads[phase];
}
-
+
if (firstBefore == null) {
//just add new interceptor at the end
ih.prev = tails[phase];
ih.next = tails[phase].next;
tails[phase].next = ih;
-
+
if (ih.next != null) {
ih.next.prev = ih;
}
@@ -682,7 +682,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
ih.next = firstBefore;
firstBefore.prev = ih;
-
+
if (heads[phase] == firstBefore) {
heads[phase] = ih;
}
@@ -694,26 +694,26 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
public String toString() {
- return toString("");
+ return toString("");
}
private String toString(String message) {
StringBuilder chain = new StringBuilder();
-
+
chain.append("Chain ")
.append(super.toString())
.append(message)
.append(". Current flow:\n");
-
+
for (int x = 0; x < phases.length; x++) {
if (heads[x] != null) {
chain.append(" ");
printPhase(x, chain);
- }
+ }
}
return chain.toString();
}
private void printPhase(int ph, StringBuilder chain) {
-
+
chain.append(phases[ph].getName())
.append(" [");
InterceptorHolder i = heads[ph];
@@ -733,7 +733,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
chain.append("]\n");
}
-
+
private void outputChainToLog(boolean modified) {
if (isFineLogging) {
if (modified) {
@@ -743,30 +743,30 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
}
}
-
+
public MessageObserver getFaultObserver() {
return faultObserver;
}
-
+
public void setFaultObserver(MessageObserver faultObserver) {
this.faultObserver = faultObserver;
}
-
+
static final class PhaseInterceptorIterator implements ListIterator<Interceptor<? extends Message>> {
InterceptorHolder heads[];
InterceptorHolder prev;
InterceptorHolder first;
-
+
PhaseInterceptorIterator(InterceptorHolder h[]) {
heads = h;
first = findFirst();
}
-
+
public void reset() {
prev = null;
first = findFirst();
}
-
+
private InterceptorHolder findFirst() {
for (int x = 0; x < heads.length; x++) {
if (heads[x] != null) {
@@ -775,8 +775,8 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
return null;
}
-
-
+
+
public boolean hasNext() {
if (prev == null) {
return first != null;
@@ -812,7 +812,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
return prev;
}
-
+
public boolean hasPrevious() {
return prev != null;
}
@@ -824,7 +824,7 @@ public class PhaseInterceptorChain implements InterceptorChain {
prev = prev.prev;
return tmp.interceptor;
}
-
+
public int nextIndex() {
throw new UnsupportedOperationException();
}
@@ -842,13 +842,13 @@ public class PhaseInterceptorChain implements InterceptorChain {
}
}
-
+
static final class InterceptorHolder {
PhaseInterceptor<? extends Message> interceptor;
InterceptorHolder next;
InterceptorHolder prev;
int phaseIdx;
-
+
InterceptorHolder(PhaseInterceptor<? extends Message> i, int p) {
interceptor = i;
phaseIdx = p;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java b/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java
index 55fa77d..639edc6 100644
--- a/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java
+++ b/core/src/main/java/org/apache/cxf/policy/PolicyCalculator.java
@@ -24,9 +24,9 @@ import org.apache.cxf.message.Message;
public interface PolicyCalculator<T> {
Class<T> getDataClass();
-
+
QName getDataClassName();
-
+
T intersect(T policy1, T policy2);
boolean isAsserted(Message message, T policy, T refPolicy);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java b/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
index 7f03fe6..2d8c05c 100644
--- a/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ClassLoaderResolver.java
@@ -28,16 +28,16 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
@NoJSR250Annotations
public class ClassLoaderResolver implements ResourceResolver {
- private final ClassLoader loader;
+ private final ClassLoader loader;
- public ClassLoaderResolver() {
+ public ClassLoaderResolver() {
this(ClassLoaderResolver.class.getClassLoader());
}
- public ClassLoaderResolver(ClassLoader l) {
+ public ClassLoaderResolver(ClassLoader l) {
loader = l;
}
-
+
public <T> T resolve(String resourceName, Class<T> resourceType) {
if (resourceName == null || resourceType == null) {
return null;
@@ -47,10 +47,10 @@ public class ClassLoaderResolver implements ResourceResolver {
return resourceType.cast(url);
}
return null;
- }
+ }
- public InputStream getAsStream(String name) {
+ public InputStream getAsStream(String name) {
return loader.getResourceAsStream(name);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java b/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java
index c162ad8..83e4fe0 100644
--- a/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ClasspathResolver.java
@@ -31,7 +31,7 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
@NoJSR250Annotations
public class ClasspathResolver implements ResourceResolver {
- public <T> T resolve(String resourceName, Class<T> resourceType) {
+ public <T> T resolve(String resourceName, Class<T> resourceType) {
if (resourceName == null) {
return null;
}
@@ -40,9 +40,9 @@ public class ClasspathResolver implements ResourceResolver {
return resourceType.cast(url);
}
return null;
- }
+ }
- public InputStream getAsStream(String name) {
+ public InputStream getAsStream(String name) {
return ClassLoader.getSystemResourceAsStream(name);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java b/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
index f29667f..b2b15a8 100644
--- a/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
+++ b/core/src/main/java/org/apache/cxf/resource/DefaultResourceManager.java
@@ -30,67 +30,67 @@ import java.util.logging.Logger;
import org.apache.cxf.common.logging.LogUtils;
public class DefaultResourceManager implements ResourceManager {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(DefaultResourceManager.class);
- protected final List<ResourceResolver> registeredResolvers
+ protected final List<ResourceResolver> registeredResolvers
= new CopyOnWriteArrayList<ResourceResolver>();
protected boolean firstCalled;
- public DefaultResourceManager() {
- initializeDefaultResolvers();
- }
-
+ public DefaultResourceManager() {
+ initializeDefaultResolvers();
+ }
+
public DefaultResourceManager(ResourceResolver resolver) {
addResourceResolver(resolver);
}
-
+
public DefaultResourceManager(List<? extends ResourceResolver> resolvers) {
addResourceResolvers(resolvers);
}
-
+
protected void onFirstResolve() {
//nothing
firstCalled = true;
}
-
+
public final <T> T resolveResource(String name, Class<T> type) {
return findResource(name, type, false, registeredResolvers);
- }
+ }
- public final <T> T resolveResource(String name, Class<T> type, List<ResourceResolver> resolvers) {
+ public final <T> T resolveResource(String name, Class<T> type, List<ResourceResolver> resolvers) {
return findResource(name, type, false, resolvers);
- }
+ }
-
- public final InputStream getResourceAsStream(String name) {
+
+ public final InputStream getResourceAsStream(String name) {
return findResource(name, InputStream.class, true, registeredResolvers);
- }
+ }
- public final void addResourceResolver(ResourceResolver resolver) {
- if (!registeredResolvers.contains(resolver)) {
+ public final void addResourceResolver(ResourceResolver resolver) {
+ if (!registeredResolvers.contains(resolver)) {
registeredResolvers.add(0, resolver);
}
- }
- public final void addResourceResolvers(Collection<? extends ResourceResolver> resolvers) {
+ }
+ public final void addResourceResolvers(Collection<? extends ResourceResolver> resolvers) {
for (ResourceResolver r : resolvers) {
addResourceResolver(r);
}
- }
+ }
- public final void removeResourceResolver(ResourceResolver resolver) {
- if (registeredResolvers.contains(resolver)) {
+ public final void removeResourceResolver(ResourceResolver resolver) {
+ if (registeredResolvers.contains(resolver)) {
registeredResolvers.remove(resolver);
}
- }
+ }
public final List<ResourceResolver> getResourceResolvers() {
- return Collections.unmodifiableList(registeredResolvers);
+ return Collections.unmodifiableList(registeredResolvers);
}
-
- private <T> T findResource(String name, Class<T> type, boolean asStream,
+
+ private <T> T findResource(String name, Class<T> type, boolean asStream,
List<ResourceResolver> resolvers) {
if (!firstCalled) {
onFirstResolve();
@@ -98,30 +98,30 @@ public class DefaultResourceManager implements ResourceManager {
if (resolvers == null) {
resolvers = registeredResolvers;
}
-
- if (LOG.isLoggable(Level.FINE)) {
- LOG.fine("resolving resource <" + name + ">" + (asStream ? " as stream "
+
+ if (LOG.isLoggable(Level.FINE)) {
+ LOG.fine("resolving resource <" + name + ">" + (asStream ? " as stream "
: " type <" + type + ">"));
}
- T ret = null;
-
- for (ResourceResolver rr : resolvers) {
- if (asStream) {
+ T ret = null;
+
+ for (ResourceResolver rr : resolvers) {
+ if (asStream) {
ret = type.cast(rr.getAsStream(name));
- } else {
+ } else {
ret = rr.resolve(name, type);
}
- if (ret != null) {
+ if (ret != null) {
break;
}
- }
+ }
return ret;
- }
+ }
- private void initializeDefaultResolvers() {
+ private void initializeDefaultResolvers() {
addResourceResolver(new ClasspathResolver());
addResourceResolver(new ClassLoaderResolver(getClass().getClassLoader()));
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java b/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java
index ffd7964..ae1b0d8 100644
--- a/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ExtendedURIResolver.java
@@ -33,7 +33,7 @@ public class ExtendedURIResolver {
protected Stack<InputStream> resourceOpened = new Stack<InputStream>();
public ExtendedURIResolver() {
- currentResolver = new org.apache.cxf.resource.URIResolver();
+ currentResolver = new org.apache.cxf.resource.URIResolver();
}
public InputSource resolve(String curUri, String baseUri) {
@@ -67,7 +67,7 @@ public class ExtendedURIResolver {
return null;
// return new InputSource(schemaLocation);
}
-
+
public void close() {
while (!resourceOpened.isEmpty()) {
try {
@@ -80,7 +80,7 @@ public class ExtendedURIResolver {
}
}
}
-
+
public String getLatestImportURI() {
return this.getURI();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java b/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java
index aa1d207..86480a8 100644
--- a/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ObjectTypeResolver.java
@@ -22,9 +22,9 @@ package org.apache.cxf.resource;
import java.io.InputStream;
public class ObjectTypeResolver implements ResourceResolver {
-
+
private final Object value;
-
+
public ObjectTypeResolver(Object v) {
value = v;
}
@@ -40,5 +40,5 @@ public class ObjectTypeResolver implements ResourceResolver {
return resourceType.cast(value);
}
return null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java b/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
index b2d2419..4e6270d 100644
--- a/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/PropertiesResolver.java
@@ -23,9 +23,9 @@ import java.io.InputStream;
import java.util.Map;
public class PropertiesResolver implements ResourceResolver {
-
- private final Map<String, Object> properties;
-
+
+ private final Map<String, Object> properties;
+
public PropertiesResolver(Map<String, Object> p) {
properties = p;
}
@@ -43,7 +43,7 @@ public class PropertiesResolver implements ResourceResolver {
return resourceType.cast(properties.get(resourceName));
}
return null;
-
-
- }
+
+
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ResourceManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ResourceManager.java b/core/src/main/java/org/apache/cxf/resource/ResourceManager.java
index 4b14a22..1fc496e 100644
--- a/core/src/main/java/org/apache/cxf/resource/ResourceManager.java
+++ b/core/src/main/java/org/apache/cxf/resource/ResourceManager.java
@@ -30,22 +30,22 @@ import java.util.List;
* <code>ResourceResolver</code> to find resources.
*/
public interface ResourceManager {
-
+
/**
* Resolve a resource. The ResourceManager will query all of the
* registered <code>ResourceResovler</code> objects until one
* manages to resolve the resource
- *
+ *
* @param name name of resource to resolve.
* @param type type of resource to resolve.
* @return the resolved resource or null if nothing found.
*/
<T> T resolveResource(String name, Class<T> type);
- /**
- * Resolve a resource with via a specified list of resovlers. This allows
+ /**
+ * Resolve a resource with via a specified list of resovlers. This allows
* resources to be specified with a locally defined list of resolvers.
- *
+ *
* @param name name of resource to resolve.
* @param type type of resource to resolve.
* @param resolvers list of <code>ResourceResolvers</codea> to search.
@@ -54,15 +54,15 @@ public interface ResourceManager {
<T> T resolveResource(String name, Class<T> type, List<ResourceResolver> resolvers);
/**
- * Open stream to resource.
+ * Open stream to resource.
*
- * @param name name of resource to resolve.
+ * @param name name of resource to resolve.
* @return the InputStream to the resource or null if the resource
* cannot be found.
*/
InputStream getResourceAsStream(String name);
- /**
+ /**
* Add a <code>ResourceResolver</code>. The newly added resolver
* is added at the head of the list so the most recently added
* will be queried first.
@@ -71,7 +71,7 @@ public interface ResourceManager {
*/
void addResourceResolver(ResourceResolver resolver);
- /**
+ /**
* Remove a <code>ResourceResolver</code>.
* @param resolver the <code>ResourceResolver</code> to remove.
* If not previously registered, it is ignored.
@@ -80,8 +80,8 @@ public interface ResourceManager {
/**
- * Get all the currently registered resolvers. This method should return
- * a copy of the list of resolvers so that resolvers added after this method
+ * Get all the currently registered resolvers. This method should return
+ * a copy of the list of resolvers so that resolvers added after this method
* has been called will alter the list returned.
*/
List<ResourceResolver> getResourceResolvers();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java b/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java
index 01618c6..ad15fdc 100644
--- a/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/ResourceResolver.java
@@ -28,7 +28,7 @@ import java.io.InputStream;
*/
public interface ResourceResolver {
-
+
/**
* Resolve a resource given its name and type.
*
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java b/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java
index 1150f5d..e8779f0 100644
--- a/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/SinglePropertyResolver.java
@@ -22,10 +22,10 @@ package org.apache.cxf.resource;
import java.io.InputStream;
public class SinglePropertyResolver implements ResourceResolver {
-
+
private final String key;
private final Object value;
-
+
public SinglePropertyResolver(String k, Object v) {
key = k;
value = v;
@@ -40,5 +40,5 @@ public class SinglePropertyResolver implements ResourceResolver {
return resourceType.cast(value);
}
return null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/resource/URIResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/resource/URIResolver.java b/core/src/main/java/org/apache/cxf/resource/URIResolver.java
index ed42fd1..966e3fb 100644
--- a/core/src/main/java/org/apache/cxf/resource/URIResolver.java
+++ b/core/src/main/java/org/apache/cxf/resource/URIResolver.java
@@ -54,7 +54,7 @@ import org.apache.cxf.helpers.LoadingByteArrayOutputStream;
*/
public class URIResolver {
private static final Logger LOG = LogUtils.getLogger(URIResolver.class);
-
+
private Map<String, LoadingByteArrayOutputStream> cache
= new HashMap<String, LoadingByteArrayOutputStream>();
private File file;
@@ -73,17 +73,17 @@ public class URIResolver {
public URIResolver(String baseUriStr, String uriStr) throws IOException {
this(baseUriStr, uriStr, null);
}
-
+
public URIResolver(String baseUriStr, String uriStr, Class<?> calling) throws IOException {
this.calling = (calling != null) ? calling : getClass();
if (uriStr.startsWith("classpath:")) {
tryClasspath(uriStr);
- } else if (baseUriStr != null
- && (baseUriStr.startsWith("jar:")
+ } else if (baseUriStr != null
+ && (baseUriStr.startsWith("jar:")
|| baseUriStr.startsWith("zip:")
|| baseUriStr.startsWith("wsjar:"))) {
tryArchive(baseUriStr, uriStr);
- } else if (uriStr.startsWith("jar:")
+ } else if (uriStr.startsWith("jar:")
|| uriStr.startsWith("zip:")
|| uriStr.startsWith("wsjar:")) {
tryArchive(uriStr);
@@ -97,7 +97,7 @@ public class URIResolver {
this.uri = null;
this.is = null;
}
-
+
public void resolve(String baseUriStr, String uriStr, Class<?> callingCls) throws IOException {
this.calling = (callingCls != null) ? callingCls : getClass();
this.file = null;
@@ -107,12 +107,12 @@ public class URIResolver {
if (uriStr.startsWith("classpath:")) {
tryClasspath(uriStr);
- } else if (baseUriStr != null
- && (baseUriStr.startsWith("jar:")
+ } else if (baseUriStr != null
+ && (baseUriStr.startsWith("jar:")
|| baseUriStr.startsWith("zip:")
|| baseUriStr.startsWith("wsjar:"))) {
tryArchive(baseUriStr, uriStr);
- } else if (uriStr.startsWith("jar:")
+ } else if (uriStr.startsWith("jar:")
|| uriStr.startsWith("zip:")
|| uriStr.startsWith("wsjar:")) {
tryArchive(uriStr);
@@ -121,20 +121,20 @@ public class URIResolver {
}
}
-
-
+
+
private void tryFileSystem(String baseUriStr, String uriStr) throws IOException, MalformedURLException {
try {
URI relative;
String orig = uriStr;
-
+
// It is possible that spaces have been encoded. We should decode them first.
uriStr = uriStr.replaceAll("%20", " ");
File uriFile = new File(uriStr);
-
-
+
+
uriFile = new File(uriFile.getAbsolutePath());
if (!SecurityActions.fileExists(uriFile, CXFPermissions.RESOLVE_URI)) {
try {
@@ -154,7 +154,7 @@ public class URIResolver {
} else {
relative = uriFile.getAbsoluteFile().toURI();
}
-
+
if (relative.isAbsolute()) {
uri = relative;
url = relative.toURL();
@@ -188,7 +188,7 @@ public class URIResolver {
} else if (!StringUtils.isEmpty(baseUriStr)) {
URI base;
File baseFile = new File(baseUriStr);
-
+
if (!baseFile.exists() && baseUriStr.startsWith("file:")) {
baseFile = new File(getFilePathFromUri(baseUriStr));
}
@@ -198,7 +198,7 @@ public class URIResolver {
} else {
base = new URI(baseUriStr);
}
-
+
base = base.resolve(relative);
if (base.isAbsolute() && "file".equalsIgnoreCase(base.getScheme())) {
try {
@@ -208,19 +208,19 @@ public class URIResolver {
is = base.toURL().openStream();
uri = base;
} else {
- tryClasspath(base.toString().startsWith("file:")
+ tryClasspath(base.toString().startsWith("file:")
? base.toString().substring(5) : base.toString());
}
} catch (Throwable th) {
- tryClasspath(base.toString().startsWith("file:")
+ tryClasspath(base.toString().startsWith("file:")
? base.toString().substring(5) : base.toString());
}
} else {
- tryClasspath(base.toString().startsWith("file:")
+ tryClasspath(base.toString().startsWith("file:")
? base.toString().substring(5) : base.toString());
}
} else {
- tryClasspath(uriStr.startsWith("file:")
+ tryClasspath(uriStr.startsWith("file:")
? uriStr.substring(5) : uriStr);
}
} catch (URISyntaxException e) {
@@ -253,29 +253,29 @@ public class URIResolver {
tryClasspath(uriStr);
}
}
-
+
/**
* Assumption: URI scheme is "file"
*/
- private String getFilePathFromUri(String uriString) {
+ private String getFilePathFromUri(String uriString) {
String path = null;
-
+
try {
path = new URL(uriString).getPath();
} catch (MalformedURLException e) {
// ignore
}
-
+
if (path == null) {
if (uriString.startsWith("file:/")) {
path = uriString.substring(6);
} else if (uriString.startsWith("file:")) {
// handle Windows file URI such as "file:C:/foo/bar"
path = uriString.substring(5);
- }
+ }
}
-
- // decode spaces before returning otherwise File.exists returns false
+
+ // decode spaces before returning otherwise File.exists returns false
if (path != null) {
return path.replace("%20", " ");
}
@@ -304,10 +304,10 @@ public class URIResolver {
} catch (URISyntaxException e) {
// do nothing
}
-
+
tryFileSystem("", uriStr);
}
-
+
private void tryArchive(String uriStr) throws IOException {
int i = uriStr.indexOf('!');
if (i == -1) {
@@ -327,7 +327,7 @@ public class URIResolver {
tryClasspath(uriStr);
}
}
-
+
private void tryClasspath(String uriStr) throws IOException {
boolean isClasspathURL = false;
if (uriStr.startsWith("classpath:")) {
@@ -341,8 +341,8 @@ public class URIResolver {
try {
uri = url.toURI();
} catch (URISyntaxException e) {
- // yep, some versions of the JDK can't handle spaces when URL.toURI() is called,
- // and lots of people on windows have their maven repositories at
+ // yep, some versions of the JDK can't handle spaces when URL.toURI() is called,
+ // and lots of people on windows have their maven repositories at
// C:/Documents and Settings/<userid>/.m2/repository
// re: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6506304
if (url.toString().contains(" ")) {
@@ -367,7 +367,7 @@ public class URIResolver {
}
}
}
-
+
}
is = url.openStream();
}
@@ -419,7 +419,7 @@ public class URIResolver {
public File getFile() {
return file;
}
-
+
public boolean isResolved() {
return is != null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java b/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java
index 964628e..6934ff7 100644
--- a/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java
+++ b/core/src/main/java/org/apache/cxf/security/LoginSecurityContext.java
@@ -25,10 +25,10 @@ import javax.security.auth.Subject;
/**
* LoginSecurityContext provides additional information about the
- * authenticated principal.
- *
+ * authenticated principal.
+ *
* {@link SecurityContext} implementations which can get the authenticated
- * Subject and/or the list of the user roles may implement this interface.
+ * Subject and/or the list of the user roles may implement this interface.
*/
public interface LoginSecurityContext extends SecurityContext {
@@ -38,7 +38,7 @@ public interface LoginSecurityContext extends SecurityContext {
*/
Subject getSubject();
/**
- * Returns a set of Principals representing the roles
+ * Returns a set of Principals representing the roles
* assigned to the current authenticated user Principal
* @return the roles
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/security/SecurityContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/security/SecurityContext.java b/core/src/main/java/org/apache/cxf/security/SecurityContext.java
index d76481b..cd1034b 100644
--- a/core/src/main/java/org/apache/cxf/security/SecurityContext.java
+++ b/core/src/main/java/org/apache/cxf/security/SecurityContext.java
@@ -26,6 +26,6 @@ import java.security.Principal;
public interface SecurityContext {
Principal getUserPrincipal();
-
+
boolean isUserInRole(String role);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java b/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java
index 974a7fc..e0bdab2 100644
--- a/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java
+++ b/core/src/main/java/org/apache/cxf/security/claims/authorization/Claim.java
@@ -26,18 +26,18 @@ import java.lang.annotation.Target;
@Target({ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface Claim {
-
+
String format() default "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified";
String name() default "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/role";
String[] value();
-
+
/**
- * If set to true then all the values of this claim have to be matched
+ * If set to true then all the values of this claim have to be matched
*/
boolean matchAll() default false;
/**
* If set to ClaimMode.LAX then the match will fail only if the incoming
- * assertion has the same name and format claim with non-matching values
+ * assertion has the same name and format claim with non-matching values
*/
ClaimMode mode() default ClaimMode.STRICT;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java b/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
index 34918c7..79a5316 100644
--- a/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
+++ b/core/src/main/java/org/apache/cxf/security/transport/TLSSessionInfo.java
@@ -32,7 +32,7 @@ public class TLSSessionInfo {
private final SSLSession sslSession;
private final Certificate[] peerCertificates;
private final String cipherSuite;
-
+
/**
* This constructor has the effect of calling
* TLSSessionInfo(null, suite)
@@ -42,7 +42,7 @@ public class TLSSessionInfo {
) {
this(suite, null, null);
}
-
+
/**
* @param suite
* The negotiated cipher suite
@@ -75,7 +75,7 @@ public class TLSSessionInfo {
public final String getChipherSuite() {
return cipherSuite;
}
-
+
/**
* @return the negotiated cipher suite. This attribute is
* guaranteed to be non-null.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/Service.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/Service.java b/core/src/main/java/org/apache/cxf/service/Service.java
index 476ab10..799ec08 100644
--- a/core/src/main/java/org/apache/cxf/service/Service.java
+++ b/core/src/main/java/org/apache/cxf/service/Service.java
@@ -33,24 +33,24 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.service.model.ServiceInfo;
public interface Service extends Map<String, Object>, InterceptorProvider {
-
+
QName getName();
-
+
List<ServiceInfo> getServiceInfos();
EndpointInfo getEndpointInfo(QName endpoint);
-
+
DataBinding getDataBinding();
void setDataBinding(DataBinding dataBinding);
-
+
Executor getExecutor();
void setExecutor(Executor executor);
-
+
Invoker getInvoker();
-
+
void setInvoker(Invoker invoker);
-
+
Map<QName, Endpoint> getEndpoints();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/ServiceImpl.java b/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
index d05d2d6..2e31da5 100644
--- a/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
+++ b/core/src/main/java/org/apache/cxf/service/ServiceImpl.java
@@ -45,23 +45,23 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement
private Executor executor;
private Invoker invoker;
private Map<QName, Endpoint> endpoints = new HashMap<QName, Endpoint>();
-
+
public ServiceImpl() {
this((ServiceInfo)null);
}
-
+
public ServiceImpl(ServiceInfo si) {
serviceInfos = new ArrayList<>();
if (si != null) {
serviceInfos.add(si);
}
- executor = SynchronousExecutor.getInstance();
+ executor = SynchronousExecutor.getInstance();
}
public ServiceImpl(List<ServiceInfo> si) {
serviceInfos = si;
- executor = SynchronousExecutor.getInstance();
+ executor = SynchronousExecutor.getInstance();
}
-
+
public String getBeanName() {
return getName().toString();
}
@@ -73,7 +73,7 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement
public List<ServiceInfo> getServiceInfos() {
return serviceInfos;
}
-
+
public EndpointInfo getEndpointInfo(QName endpoint) {
for (ServiceInfo inf : serviceInfos) {
EndpointInfo ef = inf.getEndpoint(endpoint);
@@ -83,7 +83,7 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement
}
return null;
}
-
+
public Executor getExecutor() {
return executor;
@@ -120,7 +120,7 @@ public class ServiceImpl extends AbstractAttributedInterceptorProvider implement
public void setProperties(Map<String, Object> properties) {
this.putAll(properties);
}
-
+
@Override
public String toString() {
return "[ServiceImpl " + getName() + "]";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java b/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
index 38697ca..476ab8a 100644
--- a/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
+++ b/core/src/main/java/org/apache/cxf/service/ServiceModelSchemaValidator.java
@@ -25,10 +25,10 @@ import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.ServiceInfo;
/**
- *
+ *
*/
public class ServiceModelSchemaValidator extends ServiceModelVisitor {
-
+
private SchemaCollection schemaCollection;
private StringBuilder complaints;
@@ -37,7 +37,7 @@ public class ServiceModelSchemaValidator extends ServiceModelVisitor {
schemaCollection = serviceInfo.getXmlSchemaCollection();
complaints = new StringBuilder();
}
-
+
public String getComplaints() {
return complaints.toString();
}
@@ -53,8 +53,8 @@ public class ServiceModelSchemaValidator extends ServiceModelVisitor {
}
} else if (!part.getMessageInfo().getOperation().isUnwrapped()) {
if (part.getTypeQName() == null) {
- complaints.append(part.getName() + " of message "
- + part.getMessageInfo().getName()
+ complaints.append(part.getName() + " of message "
+ + part.getMessageInfo().getName()
+ " part type QName null.\n");
} else {
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java b/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java
index 17dd12e..05135b4 100644
--- a/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java
+++ b/core/src/main/java/org/apache/cxf/service/ServiceModelVisitor.java
@@ -58,24 +58,24 @@ import org.apache.cxf.service.model.UnwrappedOperationInfo;
*/
public class ServiceModelVisitor {
protected ServiceInfo serviceInfo;
-
+
public ServiceModelVisitor(ServiceInfo serviceInfo) {
super();
this.serviceInfo = serviceInfo;
}
-
+
public void walk() {
begin(serviceInfo);
begin(serviceInfo.getInterface());
-
+
for (OperationInfo o : serviceInfo.getInterface().getOperations()) {
begin(o);
-
+
visitOperation(o);
-
+
end(o);
}
-
+
end(serviceInfo.getInterface());
for (EndpointInfo endpointInfo : serviceInfo.getEndpoints()) {
begin(endpointInfo);
@@ -92,38 +92,38 @@ public class ServiceModelVisitor {
MessageInfo in = o.getInput();
if (in != null) {
begin(in);
-
+
for (MessagePartInfo part : in.getMessageParts()) {
begin(part);
end(part);
}
-
+
end(in);
}
-
+
MessageInfo out = o.getOutput();
if (out != null) {
begin(out);
-
+
for (MessagePartInfo part : out.getMessageParts()) {
begin(part);
end(part);
}
-
+
end(out);
}
-
+
for (FaultInfo f : o.getFaults()) {
begin(f);
-
+
for (MessagePartInfo part : f.getMessageParts()) {
begin(part);
end(part);
}
-
+
end(f);
}
-
+
if (o.isUnwrappedCapable()) {
OperationInfo uop = o.getUnwrappedOperation();
begin(uop);
@@ -131,7 +131,7 @@ public class ServiceModelVisitor {
end(uop);
}
}
-
+
public void begin(ServiceInfo service) {
}
public void begin(InterfaceInfo intf) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java b/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
index 379a724..31e7050 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/AbstractServiceFactoryBean.java
@@ -47,7 +47,7 @@ import org.apache.cxf.staxutils.StaxUtils;
public abstract class AbstractServiceFactoryBean {
private static final Logger LOG = LogUtils.getL7dLogger(AbstractServiceFactoryBean.class);
-
+
protected boolean dataBindingSet;
protected List<String> schemaLocations;
@@ -56,39 +56,39 @@ public abstract class AbstractServiceFactoryBean {
private Service service;
private List<FactoryBeanListener> listeners = new ModCountCopyOnWriteArrayList<FactoryBeanListener>();
private Map<String, Object> sessionState = new HashMap<String, Object>();
-
+
public abstract Service create();
-
+
/**
- * Returns a map that is useful for ServiceFactoryBeanListener to store state across
- * events during processing.
+ * Returns a map that is useful for ServiceFactoryBeanListener to store state across
+ * events during processing.
*/
public Map<String, Object> getSessionState() {
return sessionState;
}
-
+
public void sendEvent(FactoryBeanListener.Event ev, Object ... args) {
for (FactoryBeanListener l : listeners) {
l.handleEvent(ev, this, args);
}
}
-
+
protected void initializeDefaultInterceptors() {
service.getInInterceptors().add(new ServiceInvokerInterceptor());
service.getInInterceptors().add(new OutgoingChainInterceptor());
service.getInInterceptors().add(new OneWayProcessorInterceptor());
}
-
+
protected void initializeDataBindings() {
if (getDataBinding() instanceof AbstractDataBinding && schemaLocations != null) {
fillDataBindingSchemas();
}
getDataBinding().initialize(getService());
-
+
service.setDataBinding(getDataBinding());
sendEvent(FactoryBeanListener.Event.DATABINDING_INITIALIZED, dataBinding);
}
-
+
public Bus getBus() {
return bus;
}
@@ -126,7 +126,7 @@ public abstract class AbstractServiceFactoryBean {
protected void setService(Service service) {
this.service = service;
}
-
+
private void fillDataBindingSchemas() {
ResourceManager rr = getBus().getExtension(ResourceManager.class);
List<DOMSource> schemas = new ArrayList<>();
@@ -154,5 +154,5 @@ public abstract class AbstractServiceFactoryBean {
}
((AbstractDataBinding)getDataBinding()).setSchemas(schemas);
}
-
+
}
[24/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java b/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
index 5915ffe..d98f033 100644
--- a/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
+++ b/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
@@ -58,15 +58,15 @@ public final class Client {
} else {
wsdlURL = new URL(args[0]);
}
-
+
HeaderService hs = new HeaderService(wsdlURL, SERVICE_NAME);
HeaderTester proxy = hs.getSoapPort();
invokeInHeader(proxy);
- invokeOutHeader(proxy);
- invokeInOutHeader(proxy);
+ invokeOutHeader(proxy);
+ invokeInOutHeader(proxy);
}
-
+
private static void invokeInHeader(HeaderTester proxy) {
// invoke inHeader operation
System.out.println("Invoking inHeader operation");
@@ -80,7 +80,7 @@ public final class Client {
System.out.println("\t\tResult: " + response.getResponseType());
}
- private static void invokeOutHeader(HeaderTester proxy) {
+ private static void invokeOutHeader(HeaderTester proxy) {
// invoke outHeaderoperation
System.out.println("Invoking outHeader operation");
OutHeader me = new OutHeader();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/HeaderTesterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/HeaderTesterImpl.java b/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/HeaderTesterImpl.java
index 42a602e..f350d8d 100644
--- a/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/HeaderTesterImpl.java
+++ b/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/HeaderTesterImpl.java
@@ -32,8 +32,8 @@ import org.apache.headers.OutHeaderResponse;
import org.apache.headers.SOAPHeaderData;
-@javax.jws.WebService(serviceName = "HeaderService",
- portName = "SoapPort",
+@javax.jws.WebService(serviceName = "HeaderService",
+ portName = "SoapPort",
endpointInterface = "org.apache.headers.HeaderTester",
targetNamespace = "http://apache.org/headers")
@@ -52,7 +52,7 @@ public class HeaderTesterImpl implements HeaderTester {
return ihr;
}
- public void outHeader(OutHeader me,
+ public void outHeader(OutHeader me,
Holder<OutHeaderResponse> theResponse,
Holder<SOAPHeaderData> headerInfo) {
System.out.println("outHeader invoked");
@@ -87,5 +87,5 @@ public class HeaderTesterImpl implements HeaderTester {
iohr.setResponseType("Hello " + me.getRequestType());
return iohr;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java
index 94e2788..fee0536 100644
--- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java
@@ -42,12 +42,12 @@ public final class Client {
}
public static void main(String args[]) throws Exception {
-
+
if (args.length < 2) {
System.out.println("please specify wsdl and configuration file");
System.exit(1);
}
-
+
URL wsdlURL;
File wsdlFile = new File(args[0]);
if (wsdlFile.exists()) {
@@ -55,7 +55,7 @@ public final class Client {
} else {
wsdlURL = new URL(args[0]);
}
-
+
SpringBusFactory bf = new SpringBusFactory();
URL busURL;
File busFile = new File(args[1]);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java
index 3dcbfc4..8b9746f 100644
--- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java
+++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/ClientCallbackHandler.java
@@ -31,7 +31,7 @@ public class ClientCallbackHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if (pc.getUsage() == WSPasswordCallback.DECRYPT
+ if (pc.getUsage() == WSPasswordCallback.DECRYPT
|| pc.getUsage() == WSPasswordCallback.SIGNATURE) {
if ("myclientkey".equals(pc.getIdentifier())) {
pc.setPassword("ckpass");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/GreeterImpl.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/GreeterImpl.java
index f483954..a47dea4 100644
--- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/GreeterImpl.java
@@ -22,15 +22,15 @@ package demo.wssec.server;
import java.util.logging.Logger;
import org.apache.hello_world_soap_http.Greeter;
-@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
wsdlLocation = "file:./wsdl/hello_world.wsdl")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.objectweb.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java
index 59cda5f..8af89de 100644
--- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java
+++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/STSCallbackHandler.java
@@ -31,7 +31,7 @@ public class STSCallbackHandler implements CallbackHandler {
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- if (pc.getUsage() == WSPasswordCallback.DECRYPT
+ if (pc.getUsage() == WSPasswordCallback.DECRYPT
|| pc.getUsage() == WSPasswordCallback.SIGNATURE) {
if ("mystskey".equals(pc.getIdentifier())) {
pc.setPassword("stskpass");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
index 57cf5fb..5616433 100644
--- a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
+++ b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
@@ -51,7 +51,7 @@ public final class Client implements Runnable {
this.username = name;
this.service = service;
}
-
+
@Override
public void run() {
long start = System.currentTimeMillis();
@@ -79,15 +79,15 @@ public final class Client implements Runnable {
}
long end = System.currentTimeMillis();
double rate = x * 1000 / (end - start);
- System.out.println(username + " finished " + x + " invocations: " + rate + " req/sec "
+ System.out.println(username + " finished " + x + " invocations: " + rate + " req/sec "
+ (exceeded ? "(exceeded max)" : ""));
try {
- //sleep for a few seconds before the client is closed so things can be seen in JMX
+ //sleep for a few seconds before the client is closed so things can be seen in JMX
Thread.sleep(10000);
} catch (InterruptedException e) {
//ignore
- }
-
+ }
+
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -95,7 +95,7 @@ public final class Client implements Runnable {
public void stop() {
doStop = true;
}
-
+
public static void main(String args[]) throws Exception {
if (args.length == 0) {
args = new String[] {SOAPService.WSDL_LOCATION.toExternalForm()};
@@ -108,7 +108,7 @@ public final class Client implements Runnable {
} else {
wsdlURL = new URL(args[0]);
}
-
+
Map<String, Object> properties = new HashMap<>();
properties.put("bus.jmx.usePlatformMBeanServer", Boolean.TRUE);
properties.put("bus.jmx.enabled", Boolean.TRUE);
@@ -116,7 +116,7 @@ public final class Client implements Runnable {
Bus b = new CXFBusFactory().createBus(null, properties);
MetricRegistry registry = new MetricRegistry();
CodahaleMetricsProvider.setupJMXReporter(b, registry);
- b.setExtension(registry, MetricRegistry.class);
+ b.setExtension(registry, MetricRegistry.class);
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
List<Client> c = new ArrayList<>();
@@ -136,7 +136,7 @@ public final class Client implements Runnable {
client = new Client("Jonas", ss);
new Thread(client).start();
c.add(client);
-
+
System.out.println("Sleeping on main thread for 60 seconds");
Thread.sleep(60000);
for (Client c2 : c) {
@@ -148,6 +148,6 @@ public final class Client implements Runnable {
//System.exit(0);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Customer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Customer.java b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Customer.java
index d2e978d..149b4e3 100644
--- a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Customer.java
+++ b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Customer.java
@@ -26,16 +26,16 @@ import org.apache.cxf.metrics.codahale.CodahaleMetricsContext;
import org.apache.cxf.throttling.ThrottleResponse;
/**
- *
+ *
*/
public abstract class Customer {
protected final String name;
protected volatile CodahaleMetricsContext metrics;
-
+
public Customer(String n) {
name = n;
}
-
+
MetricsContext getMetricsContext(MetricRegistry registry) {
if (metrics == null) {
metrics = new CodahaleMetricsContext("demo.server:customer=" + name + ",type=Customer,", registry);
@@ -44,8 +44,8 @@ public abstract class Customer {
}
public abstract void throttle(ThrottleResponse r);
-
-
+
+
public static class PremiumCustomer extends Customer {
public PremiumCustomer(String n) {
super(n);
@@ -73,12 +73,12 @@ public abstract class Customer {
super(n);
}
public void throttle(ThrottleResponse m) {
- //Regular customers are unthrottled until they hit 25req/sec, then start delaying by 0.25 seconds
+ //Regular customers are unthrottled until they hit 25req/sec, then start delaying by 0.25 seconds
//(drops to max of 4req/sec until below the 25req/sec rate)
if (metrics.getTotals().getOneMinuteRate() > 25) {
m.setDelay(250);
}
- //They also get throttled more if they are over 10req/sec over a 5 minute period
+ //They also get throttled more if they are over 10req/sec over a 5 minute period
//(drops to max of 2req/sec until below the 10req/sec rate)
if (metrics.getTotals().getFiveMinuteRate() > 10) {
m.setDelay(500);
@@ -98,7 +98,7 @@ public abstract class Customer {
if (metrics.getTotals().getOneMinuteRate() > 5) {
delay += 1000;
}
- //They also get throttled after 5 minutes of more than
+ //They also get throttled after 5 minutes of more than
if (metrics.getTotals().getFiveMinuteRate() > 1) {
delay += 1000;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/CustomerMetricsInterceptor.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/CustomerMetricsInterceptor.java b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/CustomerMetricsInterceptor.java
index 5d05678..45e564d 100644
--- a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/CustomerMetricsInterceptor.java
+++ b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/CustomerMetricsInterceptor.java
@@ -34,7 +34,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
public class CustomerMetricsInterceptor extends AbstractPhaseInterceptor<Message> {
MetricRegistry registry;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/GreeterImpl.java b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/GreeterImpl.java
index e8664ab..a1a2eb2 100644
--- a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/GreeterImpl.java
@@ -20,11 +20,11 @@
package demo.throttling.server;
-@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
wsdlLocation = "file:./src/main/config/hello_world.wsdl",
endpointInterface = "org.apache.hello_world_soap_http.Greeter")
-
+
public class GreeterImpl {
public String greetMe(String me) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java
index aa722cf..337c7aa 100644
--- a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java
+++ b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java
@@ -40,7 +40,7 @@ import org.apache.cxf.throttling.ThrottlingManager;
public class Server {
Map<String, Customer> customers = new HashMap<>();
-
+
protected Server() throws Exception {
System.out.println("Starting Server");
@@ -49,15 +49,15 @@ public class Server {
customers.put("Vince", new Customer.RegularCustomer("Vince"));
customers.put("Malcolm", new Customer.CheapCustomer("Malcolm"));
customers.put("Jonas", new Customer.TrialCustomer("Jonas"));
-
+
Map<String, Object> properties = new HashMap<>();
properties.put("bus.jmx.usePlatformMBeanServer", Boolean.TRUE);
properties.put("bus.jmx.enabled", Boolean.TRUE);
Bus b = new CXFBusFactory().createBus(null, properties);
MetricRegistry registry = new MetricRegistry();
CodahaleMetricsProvider.setupJMXReporter(b, registry);
- b.setExtension(registry, MetricRegistry.class);
-
+ b.setExtension(registry, MetricRegistry.class);
+
ThrottlingManager manager = new ThrottlingManager() {
@Override
public ThrottleResponse getThrottleResponse(String phase, Message m) {
@@ -78,10 +78,10 @@ public class Server {
};
b.getInInterceptors().add(new CustomerMetricsInterceptor(registry, customers));
-
+
Object implementor = new GreeterImpl();
String address = "http://localhost:9001/SoapContext/SoapPort";
- Endpoint.publish(address, implementor,
+ Endpoint.publish(address, implementor,
new MetricsFeature(),
new ThrottlingFeature(manager));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java b/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java
index b36ac76..86f1df0 100644
--- a/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/GreeterImpl.java
@@ -29,15 +29,15 @@ import org.apache.hello_world_soap_http.types.FaultDetail;
@WebService(name = "SoapPort",
portName = "SoapPort",
- serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+ serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
wsdlLocation = "file:./src/main/resources/hello_world_addr.wsdl")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -47,7 +47,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
@@ -65,7 +65,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Executing operation sayHi\n");
return "Bonjour";
}
-
+
public void pingMe() throws PingMeFault {
FaultDetail faultDetail = new FaultDetail();
faultDetail.setMajor((short)2);
@@ -75,5 +75,5 @@ public class GreeterImpl implements Greeter {
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java b/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java
index c827190..444931f 100644
--- a/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java
+++ b/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Client.java
@@ -37,16 +37,16 @@ public final class Client {
//Use WS-Discovery to find references to services that implement the Greeter portType
WSDiscoveryClient client = new WSDiscoveryClient();
- List<EndpointReference> references
+ List<EndpointReference> references
= client.probe(new QName("http://cxf.apache.org/hello_world/discovery", "Greeter"));
client.close();
-
+
GreeterService service = new GreeterService();
//loop through all of them and have them greet me.
for (EndpointReference ref : references) {
Greeter g = service.getPort(ref, Greeter.class);
System.out.println(g.greetMe("World"));
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java b/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java
index 0d63a67..daa71eb 100644
--- a/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java
+++ b/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/GreeterImpl.java
@@ -26,7 +26,7 @@ import org.apache.cxf.hello_world.discovery.Greeter;
import org.apache.cxf.hello_world.discovery.PingMeFault;
/**
- *
+ *
*/
@WebService(endpointInterface = "org.apache.cxf.hello_world.discovery.Greeter",
wsdlLocation = "classpath:/org/apache/cxf/hello_world/discovery/hello_world.wsdl",
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java b/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java
index 187496c..e58c4ce 100644
--- a/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java
+++ b/distribution/src/main/release/samples/ws_discovery/src/main/java/org/apache/cxf/samples/discovery/Main.java
@@ -32,7 +32,7 @@ public final class Main {
public static void main(String[] args) throws Exception {
//find a randomish port to use. The clients will
- //use WS-Discovery to find these services so
+ //use WS-Discovery to find these services so
//it really doesn't matter what port we publish them
//on (or what URL or anything like that)
ServerSocket sock = new ServerSocket();
@@ -40,7 +40,7 @@ public final class Main {
sock.bind(s);
int port = sock.getLocalPort();
sock.close();
-
+
String address = "http://localhost:" + port + "/Greeter";
System.out.println("Publishing on " + address);
Endpoint.publish(address, new GreeterImpl(port));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_notification/src/main/java/demo/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_notification/src/main/java/demo/client/Client.java b/distribution/src/main/release/samples/ws_notification/src/main/java/demo/client/Client.java
index 3d3adaa..ebd895c 100644
--- a/distribution/src/main/release/samples/ws_notification/src/main/java/demo/client/Client.java
+++ b/distribution/src/main/release/samples/ws_notification/src/main/java/demo/client/Client.java
@@ -30,7 +30,7 @@ import org.apache.cxf.wsn.client.Subscription;
import org.oasis_open.docs.wsn.b_2.NotificationMessageHolderType;
/**
- *
+ *
*/
public final class Client {
private Client() {
@@ -45,7 +45,7 @@ public final class Client {
if (args.length > 0) {
wsnPort = args[0];
}
-
+
// Start a consumer that will listen for notification messages
// We'll just print the text content out for now.
Consumer consumer = new Consumer(new Consumer.Callback() {
@@ -57,22 +57,22 @@ public final class Client {
}
}
}, "http://localhost:9001/MyConsumer");
-
-
+
+
// Create a subscription for a Topic on the broker
- NotificationBroker notificationBroker
+ NotificationBroker notificationBroker
= new NotificationBroker("http://localhost:" + wsnPort + "/wsn/NotificationBroker");
Subscription subscription = notificationBroker.subscribe(consumer, "MyTopic");
// Send a notification on the Topic
- notificationBroker.notify("MyTopic",
+ notificationBroker.notify("MyTopic",
new JAXBElement<String>(new QName("urn:test:org", "foo"),
String.class, "Hello World!"));
-
+
// Just sleep for a bit to make sure the notification gets delivered
Thread.sleep(5000);
-
+
// Cleanup and exit
subscription.unsubscribe();
consumer.stop();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/GreeterImpl.java b/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/GreeterImpl.java
index 4e7e0b7..a172c45 100644
--- a/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/GreeterImpl.java
@@ -29,14 +29,14 @@ import org.apache.hello_world_soap_http.types.FaultDetail;
@WebService(name = "Greeter",
- serviceName = "SOAPService",
+ serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -46,7 +46,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
@@ -64,7 +64,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Executing operation sayHi\n");
return "Bonjour";
}
-
+
public void pingMe() throws PingMeFault {
FaultDetail faultDetail = new FaultDetail();
faultDetail.setMajor((short)2);
@@ -74,5 +74,5 @@ public class GreeterImpl implements Greeter {
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
index 1faecf2..2dc64da 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
+++ b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
@@ -40,7 +40,7 @@ public final class Client {
public static void main(String args[]) throws Exception {
try {
-
+
SpringBusFactory bf = new SpringBusFactory();
URL busFile = Client.class.getResource("/client.xml");
Bus bus = bf.createBus(busFile.toString());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
index 693c918..148ad38 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
+++ b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/common/MessageLossSimulator.java
@@ -38,19 +38,19 @@ import org.apache.cxf.ws.addressing.AddressingProperties;
import org.apache.cxf.ws.rm.RMContextUtils;
/**
- *
+ *
*/
public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
private static final Logger LOG = Logger.getLogger(MessageLossSimulator.class.getName());
- private int appMessageCount;
-
+ private int appMessageCount;
+
public MessageLossSimulator() {
super(Phase.PREPARE_SEND);
addBefore(MessageSenderInterceptor.class.getName());
}
-
+
public void handleMessage(Message message) throws Fault {
AddressingProperties maps =
RMContextUtils.retrieveMAPs(message, false, true);
@@ -60,7 +60,7 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
if (maps != null && null != maps.getAction()) {
action = maps.getAction().getValue();
}
- if (RMContextUtils.isRMProtocolMessage(action)) {
+ if (RMContextUtils.isRMProtocolMessage(action)) {
return;
}
appMessageCount++;
@@ -68,8 +68,8 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
if (0 != (appMessageCount % 2)) {
return;
}
-
-
+
+
// discard even-numbered message
InterceptorChain chain = message.getInterceptorChain();
ListIterator<Interceptor<? extends Message>> it = chain.getIterator();
@@ -81,8 +81,8 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
break;
}
}
-
- message.setContent(OutputStream.class, new WrappedOutputStream(message));
+
+ message.setContent(OutputStream.class, new WrappedOutputStream(message));
message.getInterceptorChain().add(new AbstractPhaseInterceptor<Message>(Phase.PREPARE_SEND_ENDING) {
@@ -93,10 +93,10 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
throw new Fault(e);
}
}
-
- });
+
+ });
}
-
+
private class WrappedOutputStream extends AbstractWrappedOutputStream {
private Message outMessage;
@@ -114,20 +114,20 @@ public class MessageLossSimulator extends AbstractPhaseInterceptor<Message> {
}
wrappedStream = new DummyOutputStream();
}
- }
+ }
+
+
-
-
private class DummyOutputStream extends OutputStream {
@Override
public void write(int b) throws IOException {
// TODO Auto-generated method stub
-
+
}
-
+
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
index cc7ca6f..e682999 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/GreeterImpl.java
@@ -27,12 +27,12 @@ import org.apache.cxf.hello_world_soap_http.Greeter;
endpointInterface = "org.apache.cxf.hello_world_soap_http.Greeter",
wsdlLocation = "file:./src/main/resources/hello_world_rm.wsdl",
targetNamespace = "http://cxf.apache.org/hello_world_soap_http")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.cxf.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -42,7 +42,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.cxf.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
index cfff8e8..f54ef73 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
+++ b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
@@ -42,7 +42,7 @@ public class Server {
SpringBusFactory bf = new SpringBusFactory();
URL busFile = Server.class.getResource("/server.xml");
Bus bus = bf.createBus(busFile.toString());
-
+
BusFactory.setDefaultBus(bus);
new Server();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
index 11af5b46c..7fdf2db 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
@@ -40,7 +40,7 @@ import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
*/
public final class Client {
- private static final String WSSE_NS
+ private static final String WSSE_NS
= "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
private static final String WSU_NS
= "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
@@ -80,7 +80,7 @@ public final class Client {
+ "{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body;"
+ "{}{http://www.w3.org/2005/08/addressing}ReplyTo;");
- outProps.put("encryptionKeyTransportAlgorithm",
+ outProps.put("encryptionKeyTransportAlgorithm",
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
outProps.put("signatureAlgorithm", "http://www.w3.org/2000/09/xmldsig#rsa-sha1");
@@ -97,7 +97,7 @@ public final class Client {
inProps.put("signaturePropFile", "etc/Client_Encrypt.properties");
inProps.put("signatureKeyIdentifier", "DirectReference");
- inProps.put("encryptionKeyTransportAlgorithm",
+ inProps.put("encryptionKeyTransportAlgorithm",
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
inProps.put("signatureAlgorithm", "http://www.w3.org/2000/09/xmldsig#rsa-sha1");
@@ -115,7 +115,7 @@ public final class Client {
client.getInInterceptors().add(new WSS4JInInterceptor(inProps));
client.getOutInterceptors().add(new WSS4JOutInterceptor(outProps));
client.getInInterceptors().add(coverageChecker);
-
+
String[] names = new String[] {"Anne", "Bill", "Chris", "Sachin Tendulkar"};
// make a sequence of 4 invocations
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java
index d64aa0d..8b00152 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java
@@ -58,12 +58,12 @@ public final class StaxClient {
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);
- Properties encCryptoProperties =
+ Properties encCryptoProperties =
CryptoFactory.getProperties("etc/Client_Encrypt.properties",
StaxClient.class.getClassLoader());
- Properties sigCryptoProperties =
+ Properties sigCryptoProperties =
CryptoFactory.getProperties("etc/Client_Sign.properties", StaxClient.class.getClassLoader());
-
+
WSSSecurityProperties properties = new WSSSecurityProperties();
properties.addAction(WSSConstants.USERNAMETOKEN);
properties.addAction(WSSConstants.TIMESTAMP);
@@ -74,7 +74,7 @@ public final class StaxClient {
properties.setTokenUser("abcd");
properties.setSignatureUser("clientx509v1");
properties.setEncryptionUser("serverx509v1");
-
+
properties.setEncryptionCryptoProperties(encCryptoProperties);
properties.setEncryptionKeyIdentifier(
WSSecurityTokenConstants.KeyIdentifier_IssuerSerial
@@ -89,7 +89,7 @@ public final class StaxClient {
properties.addEncryptionPart(
new SecurePart(new QName(WSSConstants.NS_SOAP11, "Body"), SecurePart.Modifier.Content)
);
-
+
properties.setSignatureCryptoProperties(sigCryptoProperties);
properties.setSignatureKeyIdentifier(
WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE
@@ -106,10 +106,10 @@ public final class StaxClient {
SecurePart.Modifier.Element)
);
properties.setCallbackHandler(new UTPasswordCallback());
-
+
WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(properties);
bus.getOutInterceptors().add(ohandler);
-
+
WSSSecurityProperties inProperties = new WSSSecurityProperties();
inProperties.addAction(WSSConstants.USERNAMETOKEN);
inProperties.addAction(WSSConstants.TIMESTAMP);
@@ -119,7 +119,7 @@ public final class StaxClient {
inProperties.setCallbackHandler(new UTPasswordCallback());
inProperties.setDecryptionCryptoProperties(sigCryptoProperties);
inProperties.setSignatureVerificationCryptoProperties(encCryptoProperties);
-
+
WSS4JStaxInInterceptor inhandler = new WSS4JStaxInInterceptor(inProperties);
bus.getInInterceptors().add(inhandler);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
index a202a2a..608981e 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/UTPasswordCallback.java
@@ -32,10 +32,10 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
*/
public class UTPasswordCallback implements CallbackHandler {
-
- private Map<String, String> passwords =
+
+ private Map<String, String> passwords =
new HashMap<String, String>();
-
+
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
passwords.put("abcd", "dcba");
@@ -44,7 +44,7 @@ public class UTPasswordCallback implements CallbackHandler {
}
/**
- * Here, we attempt to get the password from the private
+ * Here, we attempt to get the password from the private
* alias/passwords map.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/GreeterImpl.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/GreeterImpl.java
index 8df7dac..35cc9cc 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/GreeterImpl.java
@@ -27,12 +27,12 @@ import org.apache.cxf.hello_world_soap_http.Greeter;
endpointInterface = "org.apache.cxf.hello_world_soap_http.Greeter",
wsdlLocation = "file:./wsdl/hello_world_wssec.wsdl",
targetNamespace = "http://cxf.apache.org/hello_world_soap_http")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.cxf.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -42,7 +42,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.cxf.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
index faeac00..ae3d7f1 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
@@ -37,7 +37,7 @@ import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor;
* A DOM-based server
*/
public class Server {
- private static final String WSSE_NS
+ private static final String WSSE_NS
= "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";
private static final String WSU_NS
= "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
@@ -48,7 +48,7 @@ public class Server {
Object implementor = new GreeterImpl();
String address = "http://localhost:9000/SoapContext/GreeterPort";
EndpointImpl endpoint = (EndpointImpl)Endpoint.publish(address, implementor);
-
+
Map<String, Object> outProps = new HashMap<String, Object>();
outProps.put("action", "UsernameToken Timestamp Signature Encrypt");
@@ -69,7 +69,7 @@ public class Server {
outProps.put("signatureParts", "{Element}{" + WSU_NS + "}Timestamp;"
+ "{Element}{http://schemas.xmlsoap.org/soap/envelope/}Body");
- outProps.put("encryptionKeyTransportAlgorithm",
+ outProps.put("encryptionKeyTransportAlgorithm",
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
outProps.put("signatureAlgorithm", "http://www.w3.org/2000/09/xmldsig#rsa-sha1");
@@ -86,7 +86,7 @@ public class Server {
inProps.put("signaturePropFile", "etc/Server_SignVerf.properties");
inProps.put("signatureKeyIdentifier", "DirectReference");
- inProps.put("encryptionKeyTransportAlgorithm",
+ inProps.put("encryptionKeyTransportAlgorithm",
"http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
inProps.put("signatureAlgorithm", "http://www.w3.org/2000/09/xmldsig#rsa-sha1");
@@ -108,7 +108,7 @@ public class Server {
URL busFile = Server.class.getResource("wssec.xml");
Bus bus = bf.createBus(busFile.toString());
-
+
BusFactory.setDefaultBus(bus);
new Server();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java
index 0d10e4a..d0d8111 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java
@@ -56,11 +56,11 @@ public class StaxServer {
URL busFile = Server.class.getResource("wssec.xml");
Bus bus = bf.createBus(busFile.toString());
- Properties decCryptoProperties =
+ Properties decCryptoProperties =
CryptoFactory.getProperties("etc/Server_Decrypt.properties", StaxServer.class.getClassLoader());
- Properties sigVerCryptoProperties =
+ Properties sigVerCryptoProperties =
CryptoFactory.getProperties("etc/Server_SignVerf.properties", StaxServer.class.getClassLoader());
-
+
WSSSecurityProperties properties = new WSSSecurityProperties();
properties.addAction(WSSConstants.USERNAMETOKEN);
properties.addAction(WSSConstants.TIMESTAMP);
@@ -71,7 +71,7 @@ public class StaxServer {
properties.setTokenUser("Alice");
properties.setSignatureUser("serverx509v1");
properties.setEncryptionUser("clientx509v1");
-
+
properties.setEncryptionCryptoProperties(sigVerCryptoProperties);
properties.setEncryptionKeyIdentifier(
WSSecurityTokenConstants.KeyIdentifier_IssuerSerial
@@ -85,7 +85,7 @@ public class StaxServer {
properties.addEncryptionPart(
new SecurePart(new QName(WSSConstants.NS_SOAP11, "Body"), SecurePart.Modifier.Content)
);
-
+
properties.setSignatureCryptoProperties(decCryptoProperties);
properties.setSignatureKeyIdentifier(
WSSecurityTokenConstants.KEYIDENTIFIER_SECURITY_TOKEN_DIRECT_REFERENCE
@@ -98,10 +98,10 @@ public class StaxServer {
new SecurePart(new QName(WSSConstants.NS_SOAP11, "Body"), SecurePart.Modifier.Content)
);
properties.setCallbackHandler(new UTPasswordCallback());
-
+
WSS4JStaxOutInterceptor ohandler = new WSS4JStaxOutInterceptor(properties);
bus.getOutInterceptors().add(ohandler);
-
+
WSSSecurityProperties inProperties = new WSSSecurityProperties();
inProperties.addAction(WSSConstants.USERNAMETOKEN);
inProperties.addAction(WSSConstants.TIMESTAMP);
@@ -111,7 +111,7 @@ public class StaxServer {
inProperties.setCallbackHandler(new UTPasswordCallback());
inProperties.setDecryptionCryptoProperties(decCryptoProperties);
inProperties.setSignatureVerificationCryptoProperties(sigVerCryptoProperties);
-
+
WSS4JStaxInInterceptor inhandler = new WSS4JStaxInInterceptor(inProperties);
bus.getInInterceptors().add(inhandler);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
index b5455b6..8eb0453 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/UTPasswordCallback.java
@@ -32,10 +32,10 @@ import org.apache.wss4j.common.ext.WSPasswordCallback;
*/
public class UTPasswordCallback implements CallbackHandler {
-
- private Map<String, String> passwords =
+
+ private Map<String, String> passwords =
new HashMap<String, String>();
-
+
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
passwords.put("abcd", "dcba");
@@ -44,7 +44,7 @@ public class UTPasswordCallback implements CallbackHandler {
}
/**
- * Here, we attempt to get the password from the private
+ * Here, we attempt to get the password from the private
* alias/passwords map.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
@@ -58,7 +58,7 @@ public class UTPasswordCallback implements CallbackHandler {
}
}
}
-
+
/**
* Add an alias/password pair to the callback mechanism.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
index 86c4fad..bf3464e 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
@@ -63,7 +63,7 @@ public final class Client {
} else {
busURL = new URL(args[1]);
}
-
+
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/GreeterImpl.java b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/GreeterImpl.java
index 2ae6cd0..92098bb 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/GreeterImpl.java
@@ -22,13 +22,13 @@ package demo.wssec.server;
import java.util.logging.Logger;
import org.apache.hello_world_soap_http.Greeter;
-@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
+@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http")
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.objectweb.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java
index 8be503e..c2fcb61 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java
@@ -59,14 +59,14 @@ public final class StaxClient {
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
properties.setTokenUser("abcd");
properties.setCallbackHandler(new UTPasswordCallback());
-
+
WSSSecurityProperties inProperties = new WSSSecurityProperties();
inProperties.addAction(WSSConstants.USERNAMETOKEN);
inProperties.addAction(WSSConstants.TIMESTAMP);
inProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
inProperties.setCallbackHandler(new UTPasswordCallback());
-
+
GreeterService service = new GreeterService();
Greeter port = service.getGreeterPort();
org.apache.cxf.endpoint.Client client = ClientProxy.getClient(port);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java
index 1ec7114..1ceeca5 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java
@@ -27,12 +27,12 @@ import org.apache.cxf.hello_world_soap_http.Greeter;
endpointInterface = "org.apache.cxf.hello_world_soap_http.Greeter",
wsdlLocation = "file:./src/main/resources/hello_world_wssec.wsdl",
targetNamespace = "http://cxf.apache.org/hello_world_soap_http")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.cxf.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -42,7 +42,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.cxf.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
index 1f5ca05..472d4e3 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
@@ -43,7 +43,7 @@ public class Server {
Object implementor = new GreeterImpl();
String address = "http://localhost:9000/SoapContext/GreeterPort";
EndpointImpl impl = (EndpointImpl)Endpoint.publish(address, implementor);
-
+
Map<String, Object> outProps = new HashMap<String, Object>();
outProps.put("action", "UsernameToken Timestamp");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java
index 5324dbc..61b2d0f 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java
@@ -43,16 +43,16 @@ public class StaxServer {
Object implementor = new GreeterImpl();
String address = "http://localhost:9000/SoapContext/GreeterPort";
EndpointImpl impl = (EndpointImpl)Endpoint.publish(address, implementor);
-
+
WSSSecurityProperties properties = new WSSSecurityProperties();
properties.addAction(WSSConstants.USERNAMETOKEN);
properties.addAction(WSSConstants.TIMESTAMP);
properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
properties.setTokenUser("Alice");
-
+
properties.setCallbackHandler(new UTPasswordCallback());
-
+
impl.getOutInterceptors().add(new WSS4JStaxOutInterceptor(properties));
WSSSecurityProperties inProperties = new WSSSecurityProperties();
@@ -60,7 +60,7 @@ public class StaxServer {
inProperties.addAction(WSSConstants.TIMESTAMP);
inProperties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
inProperties.setCallbackHandler(new UTPasswordCallback());
-
+
impl.getInInterceptors().add(new WSS4JStaxInInterceptor(inProperties));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
index 86c4fad..bf3464e 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
@@ -63,7 +63,7 @@ public final class Client {
} else {
busURL = new URL(args[1]);
}
-
+
Bus bus = bf.createBus(busFile.toString());
BusFactory.setDefaultBus(bus);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/GreeterImpl.java b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/GreeterImpl.java
index 2ae6cd0..92098bb 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/GreeterImpl.java
@@ -22,13 +22,13 @@ package demo.wssec.server;
import java.util.logging.Logger;
import org.apache.hello_world_soap_http.Greeter;
-@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
+@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http")
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.objectweb.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java
index ef9989f..bb84550 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java
@@ -27,7 +27,7 @@ import com.example.customerservice.CustomerServiceService;
public class CustomerServiceClient {
protected CustomerServiceClient() {
}
-
+
public static void main(String args[]) throws Exception {
CustomerServiceService customerServiceService;
if (args.length != 0 && args[0].length() != 0) {
@@ -46,11 +46,11 @@ public class CustomerServiceClient {
}
CustomerService customerService = customerServiceService.getCustomerServicePort();
-
+
// Initialize the test class and call the tests
CustomerServiceTester client = new CustomerServiceTester();
client.setCustomerService(customerService);
client.testCustomerService();
- System.exit(0);
+ System.exit(0);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
index 159ad56..8ce3bf6 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
@@ -29,10 +29,10 @@ public final class CustomerServiceSpringClient {
public static void main(String args[]) throws Exception {
// Initialize the spring context and fetch our test client
- ClassPathXmlApplicationContext context
+ ClassPathXmlApplicationContext context
= new ClassPathXmlApplicationContext(new String[] {"classpath:client-applicationContext.xml"});
CustomerServiceTester client = (CustomerServiceTester)context.getBean("tester");
-
+
client.testCustomerService();
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceTester.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
index 6245c39..a0c6d30 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
@@ -28,10 +28,10 @@ import com.example.customerservice.CustomerService;
import com.example.customerservice.NoSuchCustomerException;
public final class CustomerServiceTester {
-
- // The CustomerService proxy will be injected either by spring or by a direct call to the setter
+
+ // The CustomerService proxy will be injected either by spring or by a direct call to the setter
CustomerService customerService;
-
+
public CustomerService getCustomerService() {
return customerService;
}
@@ -42,7 +42,7 @@ public final class CustomerServiceTester {
public void testCustomerService() throws NoSuchCustomerException {
List<Customer> customers = null;
-
+
// First we test the positive case where customers are found and we retreive
// a list of customers
System.out.println("Sending request for customers named Smith");
@@ -50,7 +50,7 @@ public final class CustomerServiceTester {
System.out.println("Response received");
Assert.assertEquals(2, customers.size());
Assert.assertEquals("Smith", customers.get(0).getName());
-
+
// Then we test for an unknown Customer name and expect the NoSuchCustomerException
try {
customers = customerService.getCustomersByName("None");
@@ -61,14 +61,14 @@ public final class CustomerServiceTester {
Assert.assertEquals("None", e.getFaultInfo().getCustomerName());
System.out.println("NoSuchCustomer exception was received as expected");
}
-
- // The implementation of updateCustomer is set to sleep for some seconds.
+
+ // The implementation of updateCustomer is set to sleep for some seconds.
// Still this method should return instantly as the method is declared
// as a one way method in the WSDL
Customer customer = new Customer();
customer.setName("Smith");
customerService.updateCustomer(customer);
-
+
System.out.println("All calls were successful");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
index f2e91c0..eac3ea7 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
@@ -34,9 +34,9 @@ import com.example.customerservice.NoSuchCustomer;
import com.example.customerservice.NoSuchCustomerException;
public class CustomerServiceImpl implements CustomerService {
-
+
/**
- * The WebServiceContext can be used to retrieve special attributes like the
+ * The WebServiceContext can be used to retrieve special attributes like the
* user principal. Normally it is not needed
*/
@Resource
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
index 11c62b3..70d52db 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
@@ -21,7 +21,7 @@ package com.example.customerservice.server;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CustomerServiceSpringServer {
-
+
protected CustomerServiceSpringServer() {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java
index bc58797..8e1b57a 100644
--- a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java
+++ b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/client/ComplexClient.java
@@ -37,14 +37,14 @@ import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.ServiceInfo;
/**
- *
+ *
*/
public final class ComplexClient {
-
- private static final QName SERVICE_NAME
- = new QName("http://Company.com/Application",
+
+ private static final QName SERVICE_NAME
+ = new QName("http://Company.com/Application",
"Company_ESB_Application_Biztalk_AgentDetails_4405_AgentDetails_Prt");
-
+
private ComplexClient() {
}
@@ -52,9 +52,9 @@ public final class ComplexClient {
* @param args
*/
public static void main(String[] args) throws Exception {
- if (args.length == 0) {
+ if (args.length == 0) {
System.out.println("please specify wsdl");
- System.exit(1);
+ System.exit(1);
}
URL wsdlURL;
@@ -64,15 +64,15 @@ public final class ComplexClient {
} else {
wsdlURL = new URL(args[0]);
}
-
+
System.out.println(wsdlURL);
-
+
JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance();
Client client = factory.createClient(wsdlURL.toExternalForm(), SERVICE_NAME);
ClientImpl clientImpl = (ClientImpl) client;
Endpoint endpoint = clientImpl.getEndpoint();
ServiceInfo serviceInfo = endpoint.getService().getServiceInfos().get(0);
- QName bindingName = new QName("http://Company.com/Application",
+ QName bindingName = new QName("http://Company.com/Application",
"Company_ESB_Application_Biztalk_AgentDetails_4405_AgentDetails_PrtSoap");
BindingInfo binding = serviceInfo.getBinding(bindingName);
//{
@@ -106,7 +106,7 @@ public final class ComplexClient {
PropertyDescriptor agentNameDescriptor = new PropertyDescriptor("agentName", wsResponseClass);
String agentName = (String)agentNameDescriptor.getReadMethod().invoke(wsResponse);
System.out.println("Agent name: " + agentName);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/org/apache/cxf/demo/complex/ComplexImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/org/apache/cxf/demo/complex/ComplexImpl.java b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/org/apache/cxf/demo/complex/ComplexImpl.java
index b497961..ebb7e25 100644
--- a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/org/apache/cxf/demo/complex/ComplexImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/org/apache/cxf/demo/complex/ComplexImpl.java
@@ -35,7 +35,7 @@ import agentwsresponse.agent.legacysystemservices.schemas.hitum.esb.company.Agen
portName = "Company_ESB_Application_Biztalk_AgentDetails_4405_AgentDetails_PrtSoap",
targetNamespace = "http://Company.com/Application",
wsdlLocation = "/wsdl/complex.wsdl",
- endpointInterface =
+ endpointInterface =
"com.company.application.CompanyESBApplicationBiztalkAgentDetails4405AgentDetailsPrtSoap")
public class ComplexImpl implements CompanyESBApplicationBiztalkAgentDetails4405AgentDetailsPrtSoap {
@@ -44,11 +44,11 @@ public class ComplexImpl implements CompanyESBApplicationBiztalkAgentDetails4405
public GetAgentDetailsResponse getAgentDetails(GetAgentDetails parameters) {
GetAgentDetailsResponse r = new GetAgentDetailsResponse();
AgentWSResponse awr = new AgentWSResponse();
-
+
int number = parameters.getPart().getAgentNumber();
awr.setAgenceNumber(number);
awr.setAgentName("Orange");
-
+
r.setAgentWSResponse(awr);
return r;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
index f8e9a6c..f2ea332 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
@@ -70,7 +70,7 @@ public final class ClientNonSpring {
System.out.println(wsdlURL);
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
- Greeter port = ss.getPort(PORT_NAME, Greeter.class);
+ Greeter port = ss.getPort(PORT_NAME, Greeter.class);
if ("secure".equals(args[1])) {
setupTLS(port);
} else if ("insecure".equals(args[1])) {
@@ -79,7 +79,7 @@ public final class ClientNonSpring {
System.out.println("arg1 needs to be either secure or insecure");
System.exit(1);
}
-
+
System.out.println("Invoking greetMe...");
try {
String resp = port.greetMe(System.getProperty("user.name"));
@@ -93,37 +93,37 @@ public final class ClientNonSpring {
System.exit(0);
}
-
- private static void setupTLS(Greeter port)
+
+ private static void setupTLS(Greeter port)
throws FileNotFoundException, IOException, GeneralSecurityException {
String keyStoreLoc = "src/main/config/clientKeystore.jks";
HTTPConduit httpConduit = (HTTPConduit) ClientProxy.getClient(port).getConduit();
-
+
TLSClientParameters tlsCP = new TLSClientParameters();
String keyPassword = "ckpass";
KeyStore keyStore = KeyStore.getInstance("JKS");
keyStore.load(new FileInputStream(keyStoreLoc), "cspass".toCharArray());
KeyManager[] myKeyManagers = getKeyManagers(keyStore, keyPassword);
tlsCP.setKeyManagers(myKeyManagers);
-
-
+
+
KeyStore trustStore = KeyStore.getInstance("JKS");
trustStore.load(new FileInputStream(keyStoreLoc), "cspass".toCharArray());
TrustManager[] myTrustStoreKeyManagers = getTrustManagers(trustStore);
tlsCP.setTrustManagers(myTrustStoreKeyManagers);
-
+
httpConduit.setTlsClientParameters(tlsCP);
}
- private static TrustManager[] getTrustManagers(KeyStore trustStore)
+ private static TrustManager[] getTrustManagers(KeyStore trustStore)
throws NoSuchAlgorithmException, KeyStoreException {
String alg = KeyManagerFactory.getDefaultAlgorithm();
TrustManagerFactory fac = TrustManagerFactory.getInstance(alg);
fac.init(trustStore);
return fac.getTrustManagers();
}
-
- private static KeyManager[] getKeyManagers(KeyStore keyStore, String keyPassword)
+
+ private static KeyManager[] getKeyManagers(KeyStore keyStore, String keyPassword)
throws GeneralSecurityException, IOException {
String alg = KeyManagerFactory.getDefaultAlgorithm();
char[] keyPass = keyPassword != null
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/GreeterImpl.java b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/GreeterImpl.java
index 5cdf6b5..04dc529 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/GreeterImpl.java
@@ -22,15 +22,15 @@ package demo.hw_https.server;
import java.util.logging.Logger;
import org.apache.hello_world_soap_http.Greeter;
-@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
wsdlLocation = "file:./src/main/config/hello_world.wsdl")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.objectweb.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java
index 5607a04..c0bdeda 100644
--- a/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java
@@ -34,7 +34,7 @@ public final class Client {
private static final QName SERVICE_NAME = new QName("http://apache.org/hello_world_xml_http/bare",
"XMLService");
- private static final QName PORT_NAME =
+ private static final QName PORT_NAME =
new QName("http://apache.org/hello_world_xml_http/bare", "XMLPort");
private Client() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/GreeterImpl.java
index 35af3d1..c1d0f79 100644
--- a/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/GreeterImpl.java
@@ -22,7 +22,7 @@ package demo.hw.server;
import org.apache.hello_world_xml_http.bare.Greeter;
import org.apache.hello_world_xml_http.bare.types.MyComplexStructType;
-@javax.jws.WebService(serviceName = "XMLService",
+@javax.jws.WebService(serviceName = "XMLService",
portName = "XMLPort",
endpointInterface = "org.apache.hello_world_xml_http.bare.Greeter",
targetNamespace = "http://apache.org/hello_world_xml_http/bare")
@@ -34,7 +34,7 @@ public class GreeterImpl implements Greeter {
public String greetMe(String me) {
// TODO Auto-generated method stub
System.out.println("received calling greetMe!");
- return "Hello " + me;
+ return "Hello " + me;
}
public String sayHi() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/client/Client.java b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/client/Client.java
index 310da2c..94da22d 100644
--- a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/client/Client.java
@@ -28,19 +28,19 @@ import org.apache.hello_world_rpclit.types.MyComplexStruct;
public final class Client {
- private static final QName SERVICE_NAME =
+ private static final QName SERVICE_NAME =
new QName("http://apache.org/hello_world_rpclit", "SOAPServiceRPCLit");
- private static final QName PORT_NAME =
+ private static final QName PORT_NAME =
new QName("http://apache.org/hello_world_rpclit", "SoapPortRPCLit");
private Client() {
- }
+ }
public static void main(String[] args) throws Exception {
- if (args.length == 0) {
+ if (args.length == 0) {
System.out.println("please specify wsdl");
- System.exit(1);
+ System.exit(1);
}
URL wsdlURL;
@@ -50,24 +50,24 @@ public final class Client {
} else {
wsdlURL = new URL(args[0]);
}
-
+
SOAPServiceRPCLit service = new SOAPServiceRPCLit(wsdlURL, SERVICE_NAME);
GreeterRPCLit greeter = (GreeterRPCLit)service.getPort(PORT_NAME, GreeterRPCLit.class);
System.out.println("Invoking sayHi...");
System.out.println("server responded with: " + greeter.sayHi());
- System.out.println();
+ System.out.println();
System.out.println("Invoking greetMe...");
System.out.println("server responded with: " + greeter.greetMe(System.getProperty("user.name")));
System.out.println();
-
+
MyComplexStruct argument = new MyComplexStruct();
MyComplexStruct retVal = null;
- String str1 = "this is element 1";
- String str2 = "this is element 2";
- int int1 = 42;
+ String str1 = "this is element 1";
+ String str2 = "this is element 2";
+ int int1 = 42;
argument.setElem1(str1);
argument.setElem2(str2);
@@ -83,6 +83,6 @@ public final class Client {
System.out.println();
- System.exit(0);
+ System.exit(0);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/GreeterRPCLitImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/GreeterRPCLitImpl.java b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/GreeterRPCLitImpl.java
index 254753a..024cb9c 100644
--- a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/GreeterRPCLitImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/GreeterRPCLitImpl.java
@@ -22,8 +22,8 @@ import java.util.logging.Logger;
import org.apache.hello_world_rpclit.GreeterRPCLit;
import org.apache.hello_world_rpclit.types.MyComplexStruct;
-@javax.jws.WebService(portName = "SoapPortRPCLit", serviceName = "SOAPServiceRPCLit",
- targetNamespace = "http://apache.org/hello_world_rpclit",
+@javax.jws.WebService(portName = "SoapPortRPCLit", serviceName = "SOAPServiceRPCLit",
+ targetNamespace = "http://apache.org/hello_world_rpclit",
endpointInterface = "org.apache.hello_world_rpclit.GreeterRPCLit")
public class GreeterRPCLitImpl implements GreeterRPCLit {
[04/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
index d7afddf..2252a8d 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingResponseInterceptor.java
@@ -32,7 +32,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
public class ThrottlingResponseInterceptor extends AbstractPhaseInterceptor<Message> {
public ThrottlingResponseInterceptor() {
@@ -50,7 +50,7 @@ public class ThrottlingResponseInterceptor extends AbstractPhaseInterceptor<Mess
}
}
Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
-
+
if (headers == null) {
headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
message.put(Message.PROTOCOL_HEADERS, headers);
@@ -63,7 +63,7 @@ public class ThrottlingResponseInterceptor extends AbstractPhaseInterceptor<Mess
}
r.add(e.getValue());
}
- if (rsp.getResponseCode() == 503 && rsp.getDelay() > 0
+ if (rsp.getResponseCode() == 503 && rsp.getDelay() > 0
&& !rsp.getResponseHeaders().containsKey("Retry-After")) {
String retryAfter = Long.toString(rsp.getDelay() / 1000);
headers.put("Retry-After", Collections.singletonList(retryAfter));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
index ad74d07..122cec5 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
@@ -60,24 +60,24 @@ import org.apache.cxf.transport.DestinationFactoryManager;
/**
- * Abstract bean holding functionality common for creating
+ * Abstract bean holding functionality common for creating
* JAX-RS Server and Client objects.
*/
public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(AbstractJAXRSFactoryBean.class);
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(AbstractJAXRSFactoryBean.class);
-
+
protected List<String> schemaLocations;
protected JAXRSServiceFactoryBean serviceFactory;
protected List<Object> entityProviders = new LinkedList<Object>();
private Comparator<?> providerComparator;
-
+
protected AbstractJAXRSFactoryBean(JAXRSServiceFactoryBean serviceFactory) {
this.serviceFactory = serviceFactory;
setBindingId(JAXRSBindingFactory.JAXRS_BINDING_ID);
}
-
+
/**
* {@inheritDoc}
*/
@@ -94,14 +94,14 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
super.setServiceName(name);
serviceFactory.setServiceName(name);
}
-
+
private void checkBindingFactory(Bus bus) {
BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
try {
bfm.getBindingFactory(JAXRSBindingFactory.JAXRS_BINDING_ID);
} catch (Throwable b) {
//not registered, let's register one
- bfm.registerBindingFactory(JAXRSBindingFactory.JAXRS_BINDING_ID,
+ bfm.registerBindingFactory(JAXRSBindingFactory.JAXRS_BINDING_ID,
new JAXRSBindingFactory(bus));
}
}
@@ -114,14 +114,14 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
checkBindingFactory(bus);
serviceFactory.setBus(bus);
}
-
+
/*
* EndpointInfo contains information form WSDL's physical part such as
* endpoint address, binding, transport etc. For JAX-RS based EndpointInfo,
* as there is no WSDL, these information are set manually, eg, default
* transport is http, binding is JAX-RS binding, endpoint address is from
* server mainline.
- */
+ */
protected EndpointInfo createEndpointInfo(Service service) throws BusException {
String transportId = getTransportId();
if (transportId == null && getAddress() != null) {
@@ -147,11 +147,11 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
EndpointInfo ei = new EndpointInfo();
ei.setTransportId(transportId);
ei.setName(serviceFactory.getService().getName());
- ei.setAddress(getAddress());
+ ei.setAddress(getAddress());
BindingInfo bindingInfo = createBindingInfo();
ei.setBinding(bindingInfo);
-
+
if (!StringUtils.isEmpty(publishedEndpointUrl)) {
ei.setProperty("publishedEndpointUrl", publishedEndpointUrl);
}
@@ -201,8 +201,8 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
}
/**
- * Sets the custom service factory which processes
- * the registered classes and providers
+ * Sets the custom service factory which processes
+ * the registered classes and providers
* @param serviceFactory the factory
*/
public void setServiceFactory(JAXRSServiceFactoryBean serviceFactory) {
@@ -218,11 +218,11 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
EndpointInfo ei = createEndpointInfo(service);
Endpoint ep = new EndpointImpl(getBus(), service, ei);
-
+
if (properties != null) {
ep.putAll(properties);
}
-
+
if (getInInterceptors() != null) {
ep.getInInterceptors().addAll(getInInterceptors());
}
@@ -235,7 +235,7 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
if (getOutFaultInterceptors() != null) {
ep.getOutFaultInterceptors().addAll(getOutFaultInterceptors());
}
-
+
List<ClassResourceInfo> list = serviceFactory.getRealClassResourceInfo();
for (ClassResourceInfo cri : list) {
initializeAnnotationInterceptors(ep, cri.getServiceClass());
@@ -245,33 +245,33 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
ep.put(JAXRSServiceFactoryBean.class.getName(), serviceFactory);
return ep;
}
-
+
/**
* Sets the location of the schema which can be used to validate
* the incoming XML or JAXB-driven JSON. JAX-RS MessageBodyReader implementations
- * which have the setSchemaLocations method accepting a list of schema locations
+ * which have the setSchemaLocations method accepting a list of schema locations
* will be injected with this value.
- *
+ *
* @param schema the schema location
*/
public void setSchemaLocation(String schema) {
- setSchemaLocations(Collections.singletonList(schema));
+ setSchemaLocations(Collections.singletonList(schema));
}
-
+
/**
* Sets the locations of the schemas which can be used to validate
* the incoming XML or JAXB-driven JSON. JAX-RS MessageBodyReader implementations
- * which have the setSchemaLocations method accepting a list of schema locations
+ * which have the setSchemaLocations method accepting a list of schema locations
* will be injected with this value.
- *
+ *
* For example, if A.xsd imports B.xsd then both A.xsd and B.xsd need to be referenced.
- *
+ *
* @param schema the schema locations
*/
public void setSchemaLocations(List<String> schemas) {
- this.schemaLocations = schemas;
+ this.schemaLocations = schemas;
}
-
+
/**
* @return the list of custom JAX-RS providers
*/
@@ -281,7 +281,7 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
/**
* Add custom JAX-RS providers to the list of providers
- *
+ *
* @param entityProviders the entityProviders
*/
public void setProviders(List<? extends Object> providers) {
@@ -289,10 +289,10 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
addToBeans(newBeans, providers);
this.entityProviders.addAll(newBeans);
}
-
+
/**
* Add custom JAX-RS provider to the list of providers
- *
+ *
* @param provider the custom provider.
*/
public void setProvider(Object provider) {
@@ -310,43 +310,43 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
}
}
if (list.size() == 0) {
- org.apache.cxf.common.i18n.Message msg =
- new org.apache.cxf.common.i18n.Message("NO_RESOURCES_AVAILABLE",
+ org.apache.cxf.common.i18n.Message msg =
+ new org.apache.cxf.common.i18n.Message("NO_RESOURCES_AVAILABLE",
BUNDLE);
LOG.severe(msg.toString());
throw new ServiceConstructionException(msg);
}
}
-
+
protected boolean isValidClassResourceInfo(ClassResourceInfo cri) {
Class<?> serviceCls = cri.getServiceClass();
- return !(cri.isCreatedFromModel() && serviceCls == cri.getResourceClass()
+ return !(cri.isCreatedFromModel() && serviceCls == cri.getResourceClass()
&& !InjectionUtils.isConcreteClass(serviceCls));
}
-
- protected void setupFactory(ProviderFactory factory, Endpoint ep) {
+
+ protected void setupFactory(ProviderFactory factory, Endpoint ep) {
if (providerComparator != null) {
factory.setProviderComparator(providerComparator);
}
if (entityProviders != null) {
- factory.setUserProviders(entityProviders);
+ factory.setUserProviders(entityProviders);
}
setDataBindingProvider(factory, ep.getService());
-
+
factory.setBus(getBus());
factory.initProviders(serviceFactory.getRealClassResourceInfo());
if (schemaLocations != null) {
factory.setSchemaLocations(schemaLocations);
}
-
+
ep.put(factory.getClass().getName(), factory);
}
-
+
protected void setDataBindingProvider(ProviderFactory factory, Service s) {
-
+
List<ClassResourceInfo> cris = serviceFactory.getRealClassResourceInfo();
if (getDataBinding() == null && cris.size() > 0) {
- org.apache.cxf.annotations.DataBinding ann =
+ org.apache.cxf.annotations.DataBinding ann =
cris.get(0).getServiceClass().getAnnotation(org.apache.cxf.annotations.DataBinding.class);
if (ann != null) {
try {
@@ -366,47 +366,47 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
db.initialize(s);
factory.setUserProviders(Collections.singletonList(new DataBindingProvider<Object>(db)));
}
-
+
/**
* Sets the description of root resources.
* Can be used to 'attach' the JAX-RS like description to the application
* classes without adding JAX-RS annotations.
- *
- * @param resources root resource descriptions
+ *
+ * @param resources root resource descriptions
*/
public void setModelBeans(UserResource... resources) {
setModelBeans(Arrays.asList(resources));
}
-
+
/**
* Sets the description of root resources.
* Can be used to 'attach' the JAX-RS like description to the application
* classes without adding JAX-RS annotations.
- *
- * @param resources root resource descriptions
+ *
+ * @param resources root resource descriptions
*/
public void setModelBeans(List<UserResource> resources) {
serviceFactory.setUserResources(resources);
}
-
+
/**
* Sets the description of root resources with the list of concrete classes.
* Can be used to 'attach' the JAX-RS like description to the application
* classes without adding JAX-RS annotations. Some models may only reference
* interfaces, thus providing a list of concrete classes that will be
* instantiated is required in such cases.
- *
+ *
* @param resources root resource descriptions.
* @param sClasses concrete root resource classes
*/
public void setModelBeansWithServiceClass(List<UserResource> resources, Class<?>... sClasses) {
serviceFactory.setUserResourcesWithServiceClass(resources, sClasses);
}
-
+
/**
- * Sets a reference to the external user model,
+ * Sets a reference to the external user model,
* Example: "classpath:/model/resources.xml"
- *
+ *
* @param modelRef the reference to the external model resource.
*/
public void setModelRef(String modelRef) {
@@ -415,13 +415,13 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
serviceFactory.setUserResources(resources);
}
}
-
+
/**
- * Sets a reference to the external user model,
+ * Sets a reference to the external user model,
* Example: "classpath:/model/resources.xml".
- * Some models may only reference interfaces, thus providing a list of
+ * Some models may only reference interfaces, thus providing a list of
* concrete classes that will be instantiated is required in such cases.
- *
+ *
* @param modelRef the reference to the external model resource.
* @param sClasses concrete root resource classes
*/
@@ -434,6 +434,6 @@ public class AbstractJAXRSFactoryBean extends AbstractEndpointFactory {
public void setProviderComparator(Comparator<?> providerComparator) {
this.providerComparator = providerComparator;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
index 92687e8..bf4cc7d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBinding.java
@@ -25,9 +25,9 @@ import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.service.model.BindingInfo;
public class JAXRSBinding extends AbstractBasicInterceptorProvider implements Binding {
-
+
private BindingInfo bindingInfo;
-
+
public JAXRSBinding(BindingInfo bindingInfo) {
super();
this.bindingInfo = bindingInfo;
@@ -43,10 +43,10 @@ public class JAXRSBinding extends AbstractBasicInterceptorProvider implements Bi
public org.apache.cxf.message.Message createMessage(org.apache.cxf.message.Message m) {
if (!m.containsKey(org.apache.cxf.message.Message.CONTENT_TYPE)) {
-
+
String ct = null;
-
- // Should this be done in ServiceInvokerInterceptor to support a case where the
+
+ // Should this be done in ServiceInvokerInterceptor to support a case where the
// response content type is detected early on the inbound chain for all the bindings ?
Exchange exchange = m.getExchange();
if (exchange != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java
index 3fa2c3f..c124661 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSBindingFactory.java
@@ -39,16 +39,16 @@ import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.transport.Destination;
/**
- * The CXF BindingFactory implementation which is used to register
+ * The CXF BindingFactory implementation which is used to register
* CXF JAX-RS interceptors with the runtime.
*/
@NoJSR250Annotations(unlessNull = { "bus" })
public class JAXRSBindingFactory extends AbstractBindingFactory {
public static final String JAXRS_BINDING_ID = "http://apache.org/cxf/binding/jaxrs";
-
+
private static final Logger LOG = LogUtils.getL7dLogger(JAXRSBindingFactory.class);
-
+
public JAXRSBindingFactory() {
}
public JAXRSBindingFactory(Bus b) {
@@ -59,15 +59,15 @@ public class JAXRSBindingFactory extends AbstractBindingFactory {
JAXRSBinding binding = new JAXRSBinding(bi);
binding.getInInterceptors().add(new JAXRSInInterceptor());
-
+
binding.getOutInterceptors().add(new JAXRSOutInterceptor());
-
+
binding.getOutFaultInterceptors().add(new JAXRSDefaultFaultOutInterceptor());
-
+
return binding;
}
-
-
+
+
/*
* The concept of Binding can not be applied to JAX-RS. Here we use
@@ -78,7 +78,7 @@ public class JAXRSBindingFactory extends AbstractBindingFactory {
info.setName(new QName(JAXRSBindingFactory.JAXRS_BINDING_ID, "binding"));
return info;
}
-
+
public void addListener(Destination d, Endpoint e) {
synchronized (d) {
if (d.getMessageObserver() != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index 32b6243..b002f50 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -64,18 +64,18 @@ public class JAXRSInvoker extends AbstractInvoker {
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JAXRSInvoker.class);
private static final String SERVICE_LOADER_AS_CONTEXT = "org.apache.cxf.serviceloader-context";
private static final String SERVICE_OBJECT_SCOPE = "org.apache.cxf.service.scope";
- private static final String REQUEST_SCOPE = "request";
+ private static final String REQUEST_SCOPE = "request";
private static final String LAST_SERVICE_OBJECT = "org.apache.cxf.service.object.last";
- private static final String PROXY_INVOCATION_ERROR_FRAGMENT
- = "object is not an instance of declaring class";
-
+ private static final String PROXY_INVOCATION_ERROR_FRAGMENT
+ = "object is not an instance of declaring class";
+
public JAXRSInvoker() {
}
public Object invoke(Exchange exchange, Object request) {
MessageContentsList responseList = checkExchangeForResponse(exchange);
if (responseList != null) {
- return responseList;
+ return responseList;
}
AsyncResponse asyncResp = exchange.get(AsyncResponse.class);
if (asyncResp != null) {
@@ -88,26 +88,26 @@ public class JAXRSInvoker extends AbstractInvoker {
return handleAsyncFault(exchange, asyncImpl, t);
}
}
-
+
ResourceProvider provider = getResourceProvider(exchange);
Object rootInstance = null;
Message inMessage = exchange.getInMessage();
try {
rootInstance = getServiceObject(exchange);
Object serviceObject = getActualServiceObject(exchange, rootInstance);
-
+
return invoke(exchange, request, serviceObject);
} catch (WebApplicationException ex) {
responseList = checkExchangeForResponse(exchange);
if (responseList != null) {
- return responseList;
+ return responseList;
}
return handleFault(ex, inMessage);
} finally {
boolean suspended = isSuspended(exchange);
if (suspended || exchange.isOneWay() || inMessage.get(Message.THREAD_CONTEXT_SWITCHED) != null) {
ServerProviderFactory.clearThreadLocalProxies(inMessage);
- }
+ }
if (suspended || isServiceObjectRequestScope(inMessage)) {
persistRoots(exchange, rootInstance, provider);
} else {
@@ -119,7 +119,7 @@ public class JAXRSInvoker extends AbstractInvoker {
private boolean isSuspended(Exchange exchange) {
return exchange.getInMessage().getInterceptorChain().getState() == State.SUSPENDED;
}
-
+
private Object handleAsyncResponse(Exchange exchange, AsyncResponseImpl ar) {
Object asyncObj = ar.getResponseObject();
if (asyncObj instanceof Throwable) {
@@ -129,7 +129,7 @@ public class JAXRSInvoker extends AbstractInvoker {
return new MessageContentsList(asyncObj);
}
}
-
+
private Object handleAsyncFault(Exchange exchange, AsyncResponseImpl ar, Throwable t) {
try {
return handleFault(new Fault(t), exchange.getInMessage(), null, null);
@@ -142,12 +142,12 @@ public class JAXRSInvoker extends AbstractInvoker {
return new MessageContentsList(Response.serverError().build());
}
}
-
+
private void persistRoots(Exchange exchange, Object rootInstance, Object provider) {
exchange.put(JAXRSUtils.ROOT_INSTANCE, rootInstance);
exchange.put(JAXRSUtils.ROOT_PROVIDER, provider);
}
-
+
@SuppressWarnings("unchecked")
public Object invoke(Exchange exchange, Object request, Object resourceObject) {
@@ -164,10 +164,10 @@ public class JAXRSInvoker extends AbstractInvoker {
inMessage);
}
}
-
-
+
+
Method methodToInvoke = getMethodToInvoke(cri, ori, resourceObject);
-
+
List<Object> params = null;
if (request instanceof List) {
params = CastUtils.cast((List<?>)request);
@@ -197,8 +197,8 @@ public class JAXRSInvoker extends AbstractInvoker {
} catch (Fault ex) {
Object faultResponse;
if (asyncResponse != null) {
- faultResponse = handleAsyncFault(exchange, asyncResponse,
- ex.getCause() == null ? ex : ex.getCause());
+ faultResponse = handleAsyncFault(exchange, asyncResponse,
+ ex.getCause() == null ? ex : ex.getCause());
} else {
faultResponse = handleFault(ex, inMessage, cri, methodToInvoke);
}
@@ -244,15 +244,15 @@ public class JAXRSInvoker extends AbstractInvoker {
acceptContentType);
exchange.put(OperationResourceInfo.class, subOri);
inMessage.put(URITemplate.TEMPLATE_PARAMETERS, values);
-
+
if (!subOri.isSubResourceLocator()
&& JAXRSUtils.runContainerRequestFilters(providerFactory,
inMessage,
- false,
+ false,
subOri.getNameBindings())) {
return new MessageContentsList(exchange.get(Response.class));
}
-
+
// work out request parameters for the sub-resource class. Here we
// presume InputStream has not been consumed yet by the root resource class.
List<Object> newParams = JAXRSUtils.processParameters(subOri, values, inMessage);
@@ -267,9 +267,9 @@ public class JAXRSInvoker extends AbstractInvoker {
return new MessageContentsList(resp);
} catch (WebApplicationException ex) {
Response excResponse;
- if (JAXRSUtils.noResourceMethodForOptions(ex.getResponse(),
+ if (JAXRSUtils.noResourceMethodForOptions(ex.getResponse(),
(String)inMessage.get(Message.HTTP_REQUEST_METHOD))) {
- excResponse = JAXRSUtils.createResponse(Collections.singletonList(subCri),
+ excResponse = JAXRSUtils.createResponse(Collections.singletonList(subCri),
null, null, 200, true);
} else {
excResponse = JAXRSUtils.convertFaultToResponse(ex, inMessage);
@@ -283,7 +283,7 @@ public class JAXRSInvoker extends AbstractInvoker {
protected Method getMethodToInvoke(ClassResourceInfo cri, OperationResourceInfo ori, Object resourceObject) {
Method resourceMethod = cri.getMethodDispatcher().getMethod(ori);
-
+
Method methodToInvoke = null;
if (Proxy.class.isInstance(resourceObject)) {
methodToInvoke = cri.getMethodDispatcher().getProxyMethod(resourceMethod);
@@ -296,7 +296,7 @@ public class JAXRSInvoker extends AbstractInvoker {
}
return methodToInvoke;
}
-
+
private MessageContentsList checkExchangeForResponse(Exchange exchange) {
Response r = exchange.get(Response.class);
if (r != null) {
@@ -306,7 +306,7 @@ public class JAXRSInvoker extends AbstractInvoker {
return null;
}
}
-
+
private void setResponseContentTypeIfNeeded(Message inMessage, Object response) {
if (response instanceof Response) {
JAXRSUtils.setMessageContentType(inMessage, (Response)response);
@@ -315,10 +315,10 @@ public class JAXRSInvoker extends AbstractInvoker {
private Object handleFault(Throwable ex, Message inMessage) {
return handleFault(new Fault(ex), inMessage, null, null);
}
- private Object handleFault(Fault ex, Message inMessage,
+ private Object handleFault(Fault ex, Message inMessage,
ClassResourceInfo cri, Method methodToInvoke) {
String errorMessage = ex.getMessage();
- if (errorMessage != null && cri != null
+ if (errorMessage != null && cri != null
&& errorMessage.contains(PROXY_INVOCATION_ERROR_FRAGMENT)) {
org.apache.cxf.common.i18n.Message errorM =
new org.apache.cxf.common.i18n.Message("PROXY_INVOCATION_FAILURE",
@@ -327,10 +327,10 @@ public class JAXRSInvoker extends AbstractInvoker {
cri.getServiceClass().getName());
LOG.severe(errorM.toString());
}
- Response excResponse =
+ Response excResponse =
JAXRSUtils.convertFaultToResponse(ex.getCause() == null ? ex : ex.getCause(), inMessage);
if (excResponse == null) {
- inMessage.getExchange().put(Message.PROPOGATE_EXCEPTION,
+ inMessage.getExchange().put(Message.PROPOGATE_EXCEPTION,
ExceptionUtils.propogateException(inMessage));
throw ex;
}
@@ -340,24 +340,24 @@ public class JAXRSInvoker extends AbstractInvoker {
@SuppressWarnings("unchecked")
protected MultivaluedMap<String, String> getTemplateValues(Message msg) {
MultivaluedMap<String, String> values = new MetadataMap<String, String>();
- MultivaluedMap<String, String> oldValues =
+ MultivaluedMap<String, String> oldValues =
(MultivaluedMap<String, String>)msg.get(URITemplate.TEMPLATE_PARAMETERS);
if (oldValues != null) {
values.putAll(oldValues);
}
return values;
}
-
+
private boolean setServiceLoaderAsContextLoader(Message inMessage) {
Object en = inMessage.getContextualProperty(SERVICE_LOADER_AS_CONTEXT);
return Boolean.TRUE.equals(en) || "true".equals(en);
}
-
+
private boolean isServiceObjectRequestScope(Message inMessage) {
Object scope = inMessage.getContextualProperty(SERVICE_OBJECT_SCOPE);
return REQUEST_SCOPE.equals(scope);
}
-
+
private ResourceProvider getResourceProvider(Exchange exchange) {
Object provider = exchange.remove(JAXRSUtils.ROOT_PROVIDER);
if (provider == null) {
@@ -368,30 +368,30 @@ public class JAXRSInvoker extends AbstractInvoker {
return (ResourceProvider)provider;
}
}
-
+
public Object getServiceObject(Exchange exchange) {
-
+
Object root = exchange.remove(JAXRSUtils.ROOT_INSTANCE);
if (root != null) {
return root;
}
-
+
OperationResourceInfo ori = exchange.get(OperationResourceInfo.class);
ClassResourceInfo cri = ori.getClassResourceInfo();
return cri.getResourceProvider().getInstance(exchange.getInMessage());
}
-
+
protected Object getActualServiceObject(Exchange exchange, Object rootInstance) {
-
+
Object last = exchange.get(LAST_SERVICE_OBJECT);
return last != null ? last : rootInstance;
}
-
-
-
+
+
+
private static Object checkResultObject(Object result, String subResourcePath) {
-
+
//the result becomes the object that will handle the request
if (result != null) {
@@ -415,5 +415,5 @@ public class JAXRSInvoker extends AbstractInvoker {
return result;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
index 47a45e7..8a424bf 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
@@ -64,18 +64,18 @@ import org.apache.cxf.service.invoker.Invoker;
* sf.setAddress("http://localhost:9080/");
* Server myServer = sf.create();
* </pre>
- * This will start a server for you and register it with the ServerManager. Note
+ * This will start a server for you and register it with the ServerManager. Note
* you should explicitly close the {@link org.apache.cxf.endpoint.Server} created
* when finished with it:
* <pre>
* myServer.close();
* myServer.destroy(); // closes first if close() not previously called
- * </pre>
+ * </pre>
*/
public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
-
+
protected Map<Class<?>, ResourceProvider> resourceProviders = new HashMap<Class<?>, ResourceProvider>();
-
+
private Server server;
private boolean start = true;
private Map<Object, Object> languageMappings;
@@ -83,7 +83,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
private ResourceComparator rc;
private ApplicationInfo appProvider;
private String documentLocation;
-
+
public JAXRSServerFactoryBean() {
this(new JAXRSServiceFactoryBean());
}
@@ -91,7 +91,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
public JAXRSServerFactoryBean(JAXRSServiceFactoryBean sf) {
super(sf);
}
-
+
/**
* Saves the reference to the JAX-RS {@link Application}
* @param app
@@ -99,7 +99,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
public void setApplication(Application app) {
setApplicationInfo(new ApplicationInfo(app, getBus()));
}
-
+
public void setApplicationInfo(ApplicationInfo provider) {
appProvider = provider;
Set<String> appNameBindings = AnnotationUtils.getNameBindings(provider.getProvider()
@@ -110,29 +110,29 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
cri.setNameBindings(clsNameBindings);
}
}
-
+
/**
- * Resource comparator which may be used to customize the way
- * a root resource or resource method is selected
+ * Resource comparator which may be used to customize the way
+ * a root resource or resource method is selected
* @param rcomp comparator
*/
public void setResourceComparator(ResourceComparator rcomp) {
rc = rcomp;
}
-
+
/**
* By default the subresources are resolved dynamically, mainly due to
* the JAX-RS specification allowing Objects being returned from the subresource
- * locators. Setting this property to true enables the runtime to do the
+ * locators. Setting this property to true enables the runtime to do the
* early resolution.
- *
+ *
* @param enableStatic enabling the static resolution if set to true
*/
public void setStaticSubresourceResolution(boolean enableStatic) {
serviceFactory.setEnableStaticResolution(enableStatic);
}
-
+
/**
* Creates the JAX-RS Server instance
* @return the server
@@ -142,7 +142,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
create();
}
}
-
+
/**
* Creates the JAX-RS Server instance
* @return the server
@@ -161,24 +161,24 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
serviceFactory.create();
updateClassResourceProviders();
}
-
+
Endpoint ep = createEndpoint();
getServiceFactory().sendEvent(FactoryBeanListener.Event.PRE_SERVER_CREATE,
server);
-
- server = new ServerImpl(getBus(),
- ep,
- getDestinationFactory(),
+
+ server = new ServerImpl(getBus(),
+ ep,
+ getDestinationFactory(),
getBindingFactory());
- Invoker invoker = serviceFactory.getInvoker();
+ Invoker invoker = serviceFactory.getInvoker();
if (invoker == null) {
ep.getService().setInvoker(createInvoker());
} else {
ep.getService().setInvoker(invoker);
}
-
+
ServerProviderFactory factory = setupFactory(ep);
ep.put(Application.class.getName(), appProvider);
factory.setRequestPreprocessor(
@@ -191,17 +191,17 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
ep.put("org.apache.cxf.jaxrs.comparator", rc);
}
checkPrivateEndpoint(ep);
-
+
factory.applyDynamicFeatures(getServiceFactory().getClassResourceInfo());
applyBusFeatures(getBus());
applyFeatures();
getServiceFactory().sendEvent(FactoryBeanListener.Event.SERVER_CREATED,
- server,
+ server,
null,
null);
-
-
+
+
if (start) {
try {
server.start();
@@ -230,9 +230,9 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
public Server getServer() {
return server;
}
-
- protected ServerProviderFactory setupFactory(Endpoint ep) {
- ServerProviderFactory factory = ServerProviderFactory.createInstance(getBus());
+
+ protected ServerProviderFactory setupFactory(Endpoint ep) {
+ ServerProviderFactory factory = ServerProviderFactory.createInstance(getBus());
setBeanInfo(factory);
factory.setApplicationProvider(appProvider);
super.setupFactory(factory, ep);
@@ -244,9 +244,9 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
for (ClassResourceInfo cri : cris) {
cri.initBeanParamInfo(factory);
}
-
+
}
-
+
protected void applyBusFeatures(final Bus bus) {
if (bus.getFeatures() != null) {
for (Feature feature : bus.getFeatures()) {
@@ -254,7 +254,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
}
}
}
-
+
protected void applyFeatures() {
if (getFeatures() != null) {
for (Feature feature : getFeatures()) {
@@ -268,29 +268,29 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
}
/**
- * Sets the language mappings,
+ * Sets the language mappings,
* example, 'en' is the key and 'en-gb' is the value.
- *
+ *
* @param lMaps the language mappings
*/
public void setLanguageMappings(Map<Object, Object> lMaps) {
languageMappings = lMaps;
}
-
+
/**
- * Sets the extension mappings,
+ * Sets the extension mappings,
* example, 'xml' is the key and 'text/xml' is the value.
- *
+ *
* @param lMaps the extension mappings
*/
public void setExtensionMappings(Map<Object, Object> extMaps) {
extensionMappings = extMaps;
}
-
+
public List<Class<?>> getResourceClasses() {
return serviceFactory.getResourceClasses();
}
-
+
/**
* This method is used primarily by Spring handler processing
* the jaxrs:server/@serviceClass attribute. It delegates to
@@ -302,7 +302,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
}
/**
- * Sets one or more root resource classes
+ * Sets one or more root resource classes
* @param classes the list of resource classes
*/
public void setResourceClasses(List<Class<?>> classes) {
@@ -310,47 +310,47 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
}
/**
- * Sets one or more root resource classes
+ * Sets one or more root resource classes
* @param classes the array of resource classes
*/
public void setResourceClasses(Class<?>... classes) {
serviceFactory.setResourceClasses(classes);
}
-
+
/**
- * Sets the resource beans. If this is set then the JAX-RS runtime
+ * Sets the resource beans. If this is set then the JAX-RS runtime
* will not be responsible for the life-cycle of resource classes.
- *
+ *
* @param beans the array of resource instances
*/
public void setServiceBeanObjects(Object... beans) {
setServiceBeans(Arrays.asList(beans));
}
-
+
/**
- * Sets the single resource bean. If this is set then the JAX-RS runtime
+ * Sets the single resource bean. If this is set then the JAX-RS runtime
* will not be responsible for the life-cycle of resource classes.
* Please avoid setting the resource class of this bean explicitly,
- * the runtime will determine it itself.
- *
+ * the runtime will determine it itself.
+ *
* @param bean resource instance
*/
public void setServiceBean(Object bean) {
setServiceBeans(Arrays.asList(bean));
}
-
+
/**
- * Sets the resource beans. If this is set then the JAX-RS runtime
+ * Sets the resource beans. If this is set then the JAX-RS runtime
* will not be responsible for the life-cycle of resource classes.
- *
+ *
* @param beans the list of resource instances
*/
public void setServiceBeans(List<Object> beans) {
List<Object> newBeans = new ArrayList<>();
addToBeans(newBeans, beans);
serviceFactory.setResourceClassesFromBeans(newBeans);
- }
-
+ }
+
/**
* Sets the provider managing the life-cycle of the given resource class
* <pre>
@@ -363,7 +363,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
public void setResourceProvider(Class<?> c, ResourceProvider rp) {
resourceProviders.put(c, rp);
}
-
+
/**
* Sets the provider managing the life-cycle of the resource class
* <pre>
@@ -375,10 +375,10 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
public void setResourceProvider(ResourceProvider rp) {
setResourceProviders(CastUtils.cast(Collections.singletonList(rp), ResourceProvider.class));
}
-
+
/**
* Sets the list of providers managing the life-cycle of the resource classes
- *
+ *
* @param rps resource providers
*/
public void setResourceProviders(List<ResourceProvider> rps) {
@@ -390,7 +390,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
}
/**
- * Sets the custom Invoker which can be used to customize the way
+ * Sets the custom Invoker which can be used to customize the way
* the default JAX-RS invoker calls on the service bean
* @param invoker
*/
@@ -411,28 +411,28 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
Application application = appProvider == null ? null : appProvider.getProvider();
for (ClassResourceInfo cri : serviceFactory.getClassResourceInfo()) {
if (cri.isSingleton()) {
- InjectionUtils.injectContextProxiesAndApplication(cri,
+ InjectionUtils.injectContextProxiesAndApplication(cri,
cri.getResourceProvider().getInstance(null),
application);
}
}
if (application != null) {
- InjectionUtils.injectContextProxiesAndApplication(appProvider,
+ InjectionUtils.injectContextProxiesAndApplication(appProvider,
application, null);
}
}
-
+
protected void updateClassResourceProviders() {
for (ClassResourceInfo cri : serviceFactory.getClassResourceInfo()) {
if (cri.getResourceProvider() != null) {
continue;
}
-
+
ResourceProvider rp = resourceProviders.get(cri.getResourceClass());
if (rp != null) {
cri.setResourceProvider(rp);
} else {
- setDefaultResourceProvider(cri);
+ setDefaultResourceProvider(cri);
}
}
injectContexts();
@@ -441,7 +441,7 @@ public class JAXRSServerFactoryBean extends AbstractJAXRSFactoryBean {
protected void setDefaultResourceProvider(ClassResourceInfo cri) {
cri.setResourceProvider(new PerRequestResourceProvider(cri.getResourceClass()));
}
-
+
/**
* Set the reference to the document (WADL, etc) describing the endpoint
* @param documentLocation document location
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java
index 576fc20..70a3871 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceFactoryBean.java
@@ -49,17 +49,17 @@ import org.apache.cxf.service.invoker.Invoker;
* Builds a JAX-RS service model from resource classes.
*/
public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
-
- protected List<ClassResourceInfo> classResourceInfos =
+
+ protected List<ClassResourceInfo> classResourceInfos =
new ArrayList<>();
-
+
private Invoker invoker;
private Executor executor;
private boolean enableStatic;
private QName serviceName;
private Class<?> defaultModelClass;
-
+
public JAXRSServiceFactoryBean() {
}
@@ -73,19 +73,19 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
super.setBus(bus);
}
}
-
+
public void setServiceName(QName name) {
this.serviceName = name;
}
-
+
public QName getServiceName() {
return serviceName;
}
-
+
public void setEnableStaticResolution(boolean staticResolution) {
this.enableStatic = staticResolution;
}
-
+
@Override
public Service create() {
sendEvent(Event.START_CREATE);
@@ -139,11 +139,11 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
public List<ClassResourceInfo> getClassResourceInfo() {
return Collections.unmodifiableList(classResourceInfos);
}
-
+
List<ClassResourceInfo> getRealClassResourceInfo() {
return classResourceInfos;
}
-
+
public void setResourceClass(Class<?> cls) {
if (getCreatedFromModel(cls) == null) {
classResourceInfos.clear();
@@ -151,10 +151,10 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
createResourceInfo(cls, isRoot);
}
}
-
+
public void setResourceClasses(List<Class<?>> classes) {
for (Class<?> resourceClass : classes) {
-
+
ClassResourceInfo cri = getCreatedFromModel(resourceClass);
if (cri != null) {
if (!InjectionUtils.isConcreteClass(cri.getServiceClass())) {
@@ -164,18 +164,18 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
}
continue;
}
-
+
createResourceInfo(resourceClass, true);
}
}
-
+
public void setUserResources(List<UserResource> resources) {
Map<String, UserResource> map = userResourcesAsMap(resources);
for (UserResource ur : resources) {
if (ur.getPath() != null) {
- ClassResourceInfo cri = ResourceUtils.createClassResourceInfo(map, ur,
- defaultModelClass,
- true,
+ ClassResourceInfo cri = ResourceUtils.createClassResourceInfo(map, ur,
+ defaultModelClass,
+ true,
enableStatic,
getBus());
if (cri != null) {
@@ -184,7 +184,7 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
}
}
}
-
+
public void setUserResourcesWithServiceClass(List<UserResource> resources, Class<?> ...sClasses) {
Map<String, UserResource> map = userResourcesAsMap(resources);
for (Class<?> sClass : sClasses) {
@@ -195,7 +195,7 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
}
}
}
-
+
private Map<String, UserResource> userResourcesAsMap(List<UserResource> resources) {
Map<String, UserResource> map = new HashMap<String, UserResource>();
for (UserResource ur : resources) {
@@ -203,9 +203,9 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
}
return map;
}
-
+
protected ClassResourceInfo createResourceInfo(Class<?> cls, boolean isRoot) {
- ClassResourceInfo classResourceInfo =
+ ClassResourceInfo classResourceInfo =
ResourceUtils.createClassResourceInfo(cls, cls, isRoot, enableStatic, getBus());
if (classResourceInfo != null) {
classResourceInfos.add(classResourceInfo);
@@ -216,12 +216,12 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
public void setResourceClasses(Class<?>... classes) {
setResourceClasses(Arrays.asList(classes));
}
-
+
public void setResourceClassesFromBeans(List<Object> beans) {
for (Object bean : beans) {
-
+
Class<?> realClass = ClassHelper.getRealClass(getBus(), bean);
-
+
ClassResourceInfo cri = getCreatedFromModel(realClass);
if (cri != null) {
if (!InjectionUtils.isConcreteClass(cri.getServiceClass())) {
@@ -232,7 +232,7 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
cri.setResourceProvider(new SingletonResourceProvider(bean));
continue;
}
-
+
cri = ResourceUtils.createClassResourceInfo(bean.getClass(), realClass, true, enableStatic,
getBus());
if (cri != null) {
@@ -242,21 +242,21 @@ public class JAXRSServiceFactoryBean extends AbstractServiceFactoryBean {
}
}
}
-
+
private ClassResourceInfo getCreatedFromModel(Class<?> realClass) {
sendEvent(Event.CREATE_FROM_CLASS, realClass);
for (ClassResourceInfo cri : classResourceInfos) {
- if (cri.isCreatedFromModel()
+ if (cri.isCreatedFromModel()
&& cri.isRoot() && cri.getServiceClass().isAssignableFrom(realClass)) {
return cri;
}
}
return null;
}
-
+
protected void initializeServiceModel() {
-
+
JAXRSServiceImpl service = new JAXRSServiceImpl(classResourceInfos, serviceName);
setService(service);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
index ecd6cdb..e4c22cb 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSServiceImpl.java
@@ -52,7 +52,7 @@ import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.service.model.ServiceInfo;
/**
- * The CXF Service implementation which is used
+ * The CXF Service implementation which is used
* to register the JAX-RS endpoint with the runtime.
*/
public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider implements Service, Configurable {
@@ -65,7 +65,7 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
private String address;
private boolean createServiceModel;
private QName serviceName;
-
+
public JAXRSServiceImpl(String address, QName qname) {
this.address = address;
this.serviceName = qname;
@@ -75,20 +75,20 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
this.classResourceInfos = cri;
this.serviceName = qname;
}
-
+
public JAXRSServiceImpl(List<ClassResourceInfo> cri) {
this(cri, null);
}
-
+
public JAXRSServiceImpl(List<ClassResourceInfo> cri, boolean create) {
this(cri, null);
createServiceModel = true;
}
-
+
public void setCreateServiceModel(boolean create) {
createServiceModel = create;
}
-
+
public String getBeanName() {
return getName().toString();
}
@@ -109,18 +109,18 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
public List<ClassResourceInfo> getClassResourceInfos() {
return classResourceInfos;
}
-
+
public List<ServiceInfo> getServiceInfos() {
if (!createServiceModel) {
return Collections.emptyList();
}
// try to convert to WSDL-centric model so that CXF DataBindings can get initialized
// might become useful too if we support wsdl2
-
- // make databindings to use databinding-specific information
+
+ // make databindings to use databinding-specific information
// like @XmlRootElement for ex to select a namespace
this.put("org.apache.cxf.databinding.namespace", "true");
-
+
List<ServiceInfo> infos = new ArrayList<>();
for (ClassResourceInfo cri : classResourceInfos) {
ServiceInfo si = new ServiceInfo();
@@ -135,15 +135,15 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
OperationInfo oi = inf.addOperation(oname);
createMessagePartInfo(oi, m.getReturnType(), qname, m, false);
for (Parameter pm : ori.getParameters()) {
-
+
if (pm.getType() == ParameterType.REQUEST_BODY) {
- createMessagePartInfo(oi,
+ createMessagePartInfo(oi,
ori.getMethodToInvoke().getParameterTypes()[pm.getIndex()],
- qname, m, true);
+ qname, m, true);
}
}
}
-
+
}
return infos;
}
@@ -156,9 +156,9 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
if (InjectionUtils.isPrimitive(type) || Response.class == type) {
return;
}
- QName mName = new QName(qname.getNamespaceURI(),
+ QName mName = new QName(qname.getNamespaceURI(),
(input ? "in" : "out") + m.getName());
- MessageInfo ms = oi.createMessage(mName,
+ MessageInfo ms = oi.createMessage(mName,
input ? MessageInfo.Type.INPUT : MessageInfo.Type.OUTPUT);
if (input) {
oi.setInput("in", ms);
@@ -171,13 +171,13 @@ public class JAXRSServiceImpl extends AbstractAttributedInterceptorProvider impl
mpi.setTypeQName(mpQName);
mpi.setTypeClass(type);
}
-
- public EndpointInfo getEndpointInfo(QName endpoint) {
+
+ public EndpointInfo getEndpointInfo(QName endpoint) {
// For WSDL-based services, this is to construct an EndpointInfo
// (transport, binding, address etc) from WSDL's physical part.
// not applicable to JAX-RS services.
return null;
- }
+ }
public Executor getExecutor() {
return executor;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
index 5b2350c..621a9b9 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/BlueprintResourceFactory.java
@@ -69,7 +69,7 @@ public class BlueprintResourceFactory implements ResourceProvider {
Object component = blueprintContainer.getComponentMetadata(beanId);
if (component instanceof BeanMetadata) {
BeanMetadata local = (BeanMetadata) component;
- isSingleton = BeanMetadata.SCOPE_SINGLETON.equals(local.getScope())
+ isSingleton = BeanMetadata.SCOPE_SINGLETON.equals(local.getScope())
|| (local.getScope() == null && local.getId() != null);
}
}
@@ -78,11 +78,11 @@ public class BlueprintResourceFactory implements ResourceProvider {
//TODO -- This is not the BP way.
ProviderInfo<?> application = m == null ? null
: (ProviderInfo<?>)m.getExchange().getEndpoint().get(Application.class.getName());
- Map<Class<?>, Object> mapValues = CastUtils.cast(application == null ? null
+ Map<Class<?>, Object> mapValues = CastUtils.cast(application == null ? null
: Collections.singletonMap(Application.class, application.getProvider()));
Object[] values = ResourceUtils.createConstructorArguments(c, m, !isSingleton(), mapValues);
//TODO Very springish...
- Object instance = values.length > 0 ? blueprintContainer.getComponentInstance(beanId)
+ Object instance = values.length > 0 ? blueprintContainer.getComponentInstance(beanId)
: blueprintContainer.getComponentInstance(beanId);
if (!isSingleton() || m == null) {
InjectionUtils.invokeLifeCycleMethod(instance, postConstructMethod);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
index ea2f919..d9d329a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSBPNamespaceHandler.java
@@ -42,10 +42,10 @@ import org.osgi.service.blueprint.reflect.Metadata;
@Namespaces("http://cxf.apache.org/blueprint/jaxrs")
public class JAXRSBPNamespaceHandler extends BaseNamespaceHandler {
private BlueprintContainer blueprintContainer;
-
+
public JAXRSBPNamespaceHandler() {
}
-
+
public URL getSchemaLocation(String namespace) {
if ("http://cxf.apache.org/blueprint/jaxrs".equals(namespace)
|| "http://cxf.apache.org/schemas/jaxrs.xsd".equals(namespace)) {
@@ -75,13 +75,13 @@ public class JAXRSBPNamespaceHandler extends BaseNamespaceHandler {
public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) {
return null;
}
-
+
private Element transformElement(Element element) {
- final Map<String, String> transformMap =
- Collections.singletonMap("{" + element.getNamespaceURI() + "}*",
+ final Map<String, String> transformMap =
+ Collections.singletonMap("{" + element.getNamespaceURI() + "}*",
"{http://cxf.apache.org/blueprint/jaxrs-client}*");
-
-
+
+
W3CDOMStreamWriter domWriter = new W3CDOMStreamWriter();
OutTransformWriter transformWriter = new OutTransformWriter(domWriter, transformMap);
try {
@@ -98,5 +98,5 @@ public class JAXRSBPNamespaceHandler extends BaseNamespaceHandler {
public void setBlueprintContainer(BlueprintContainer blueprintContainer) {
this.blueprintContainer = blueprintContainer;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
index 41f0e39..cb097e8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java
@@ -41,13 +41,13 @@ import org.osgi.service.blueprint.reflect.Metadata;
public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefinitionParser {
-
+
public JAXRSServerFactoryBeanDefinitionParser() {
super(JAXRSServerFactoryBean.class);
}
@Override
- protected void mapAttribute(MutableBeanMetadata bean,
- Element e, String name,
+ protected void mapAttribute(MutableBeanMetadata bean,
+ Element e, String name,
String val, ParserContext context) {
if ("beanNames".equals(name)) {
String[] values = StringUtils.split(val, " ");
@@ -69,7 +69,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
tempFactories.addValue(resourceBean);
}
}
- bean.addProperty("tempFactories", tempFactories);
+ bean.addProperty("tempFactories", tempFactories);
} else if ("serviceName".equals(name)) {
QName q = parseQName(e, val);
bean.addProperty(name, createValue(context, q));
@@ -82,7 +82,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
@Override
protected void mapElement(ParserContext ctx, MutableBeanMetadata bean, Element el, String name) {
- if ("properties".equals(name)
+ if ("properties".equals(name)
|| "extensionMappings".equals(name)
|| "languageMappings".equals(name)) {
bean.addProperty(name, this.parseMapData(ctx, bean, el));
@@ -95,7 +95,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
} else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name)
|| "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)) {
bean.addProperty(name, this.parseListData(ctx, bean, el));
- } else if ("features".equals(name) || "schemaLocations".equals(name)
+ } else if ("features".equals(name) || "schemaLocations".equals(name)
|| "providers".equals(name) || "serviceBeans".equals(name)
|| "modelBeans".equals(name)) {
bean.addProperty(name, this.parseListData(ctx, bean, el));
@@ -125,10 +125,10 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
}
bean.addProperty("modelBeans", list);
} else {
- setFirstChildAsProperty(el, ctx, bean, name);
- }
+ setFirstChildAsProperty(el, ctx, bean, name);
+ }
}
-
+
@Override
public Metadata parse(Element element, ParserContext context) {
@@ -145,7 +145,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
protected boolean hasBusProperty() {
return true;
}
-
+
public static class PassThroughCallable<T> implements Callable<T> {
private T value;
@@ -168,7 +168,7 @@ public class JAXRSServerFactoryBeanDefinitionParser extends SimpleBPBeanDefiniti
}
return resources;
}
-
+
private static String getResourceClassFromElement(Element e) {
return e.getAttribute("name");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContext.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContext.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContext.java
index 8078215..b9b5bb5 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContext.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContext.java
@@ -34,24 +34,24 @@ import javax.ws.rs.ext.Providers;
*
*/
public interface MessageContext {
-
+
Object get(Object key);
Object getContextualProperty(Object key);
<T> T getContent(Class<T> format);
-
+
void put(Object key, Object value);
-
+
UriInfo getUriInfo();
Request getRequest();
HttpHeaders getHttpHeaders();
SecurityContext getSecurityContext();
Providers getProviders();
-
- HttpServletRequest getHttpServletRequest();
+
+ HttpServletRequest getHttpServletRequest();
HttpServletResponse getHttpServletResponse();
ServletContext getServletContext();
ServletConfig getServletConfig();
-
+
<T> T getContext(Class<T> contextClass);
<T, E> T getResolver(Class<T> resolverClass, Class<E> resolveClazz);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
index a1ec581..270bcdc 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/MessageContextImpl.java
@@ -68,7 +68,7 @@ public class MessageContextImpl implements MessageContext {
public MessageContextImpl(Message m) {
this.m = m;
}
-
+
public Object get(Object key) {
String keyValue = key.toString();
if (MultipartBody.INBOUND_MESSAGE_ATTACHMENTS.equals(keyValue)
@@ -83,7 +83,7 @@ public class MessageContextImpl implements MessageContext {
if (keyValue.equals("WRITE-" + Message.ATTACHMENTS)) {
return m.getExchange().getOutMessage().get(Message.ATTACHMENTS);
}
-
+
Message currentMessage = getCurrentMessage();
Object value = currentMessage.get(key);
if (value == null) {
@@ -92,7 +92,7 @@ public class MessageContextImpl implements MessageContext {
}
Exchange exchange = currentMessage.getExchange();
if (exchange != null) {
- Message otherMessage = exchange.getInMessage() == currentMessage
+ Message otherMessage = exchange.getInMessage() == currentMessage
? exchange.getOutMessage() : exchange.getInMessage();
if (otherMessage != null) {
value = otherMessage.get(key);
@@ -101,10 +101,10 @@ public class MessageContextImpl implements MessageContext {
value = m.getExchange().get(key);
}
}
- }
+ }
return value;
}
-
+
private Message getCurrentMessage() {
Message currentMessage = JAXRSUtils.getCurrentMessage();
if (currentMessage == null) {
@@ -117,10 +117,10 @@ public class MessageContextImpl implements MessageContext {
if (MessageUtils.isRequestor(m) && m.getExchange().getInMessage() != null) {
Message inMessage = m.getExchange().getInMessage();
return inMessage.getContent(format);
- }
+ }
return m.getContent(format);
}
-
+
public Object getContextualProperty(Object key) {
Object value = m.getContextualProperty(key.toString());
if (value == null && key.getClass() == Class.class) {
@@ -133,22 +133,22 @@ public class MessageContextImpl implements MessageContext {
public <T> T getContext(Class<T> contextClass) {
return getContext(contextClass, contextClass);
}
-
+
protected <T> T getContext(Type genericType, Class<T> clazz) {
return JAXRSUtils.createContextValue(m, genericType, clazz);
}
-
+
public <T, E> T getResolver(Class<T> resolverClazz, Class<E> resolveClazz) {
if (ContextResolver.class == resolverClazz) {
return resolverClazz.cast(getContext(resolveClazz, ContextResolver.class));
}
return null;
}
-
+
public Request getRequest() {
return getContext(Request.class);
}
-
+
public HttpHeaders getHttpHeaders() {
return getContext(HttpHeaders.class);
}
@@ -164,7 +164,7 @@ public class MessageContextImpl implements MessageContext {
public UriInfo getUriInfo() {
return getContext(UriInfo.class);
}
-
+
public HttpServletRequest getHttpServletRequest() {
try {
return getContext(HttpServletRequest.class);
@@ -176,7 +176,7 @@ public class MessageContextImpl implements MessageContext {
public HttpServletResponse getHttpServletResponse() {
return getContext(HttpServletResponse.class);
}
-
+
public ServletConfig getServletConfig() {
return getContext(ServletConfig.class);
}
@@ -192,14 +192,14 @@ public class MessageContextImpl implements MessageContext {
Message currentMessage = getCurrentMessage();
currentMessage.put(key.toString(), value);
currentMessage.getExchange().put(key.toString(), value);
-
+
}
private void convertToAttachments(Object value) {
List<?> handlers = (List<?>)value;
- List<org.apache.cxf.message.Attachment> atts =
+ List<org.apache.cxf.message.Attachment> atts =
new ArrayList<org.apache.cxf.message.Attachment>();
-
+
for (int i = 1; i < handlers.size(); i++) {
Attachment handler = (Attachment)handlers.get(i);
AttachmentImpl att = new AttachmentImpl(handler.getContentId(), handler.getDataHandler());
@@ -213,32 +213,32 @@ public class MessageContextImpl implements MessageContext {
outMessage.setAttachments(atts);
outMessage.put(AttachmentOutInterceptor.WRITE_ATTACHMENTS, "true");
Attachment root = (Attachment)handlers.get(0);
-
+
String rootContentType = root.getContentType().toString();
MultivaluedMap<String, String> rootHeaders = new MetadataMap<String, String>(root.getHeaders());
if (!AttachmentUtil.isMtomEnabled(outMessage)) {
rootHeaders.putSingle(Message.CONTENT_TYPE, rootContentType);
}
-
+
String messageContentType = outMessage.get(Message.CONTENT_TYPE).toString();
int index = messageContentType.indexOf(";type");
if (index > 0) {
messageContentType = messageContentType.substring(0, index).trim();
}
- AttachmentOutputInterceptor attInterceptor =
+ AttachmentOutputInterceptor attInterceptor =
new AttachmentOutputInterceptor(messageContentType, rootHeaders);
-
+
outMessage.put(Message.CONTENT_TYPE, rootContentType);
- Map<String, List<String>> allHeaders =
+ Map<String, List<String>> allHeaders =
CastUtils.cast((Map<?, ?>)outMessage.get(Message.PROTOCOL_HEADERS));
if (allHeaders != null) {
allHeaders.remove(Message.CONTENT_TYPE);
}
attInterceptor.handleMessage(outMessage);
}
-
+
private Message getOutMessage() {
-
+
Message message = m.getExchange().getOutMessage();
if (message == null) {
Endpoint ep = m.getExchange().getEndpoint();
@@ -247,51 +247,51 @@ public class MessageContextImpl implements MessageContext {
message = ep.getBinding().createMessage(message);
m.getExchange().setOutMessage(message);
}
-
+
return message;
}
-
+
private MultipartBody createAttachments(String propertyName) {
Message inMessage = m.getExchange().getInMessage();
boolean embeddedAttachment = inMessage.get("org.apache.cxf.multipart.embedded") != null;
-
+
Object o = inMessage.get(propertyName);
if (o != null) {
return (MultipartBody)o;
}
-
+
if (embeddedAttachment) {
inMessage = new MessageImpl();
inMessage.setExchange(new ExchangeImpl());
- inMessage.put(AttachmentDeserializer.ATTACHMENT_DIRECTORY,
+ inMessage.put(AttachmentDeserializer.ATTACHMENT_DIRECTORY,
m.getExchange().getInMessage().get(AttachmentDeserializer.ATTACHMENT_DIRECTORY));
- inMessage.put(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD,
+ inMessage.put(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD,
m.getExchange().getInMessage().get(AttachmentDeserializer.ATTACHMENT_MEMORY_THRESHOLD));
inMessage.put(AttachmentDeserializer.ATTACHMENT_MAX_SIZE,
m.getExchange().getInMessage().get(AttachmentDeserializer.ATTACHMENT_MAX_SIZE));
- inMessage.setContent(InputStream.class,
+ inMessage.setContent(InputStream.class,
m.getExchange().getInMessage().get("org.apache.cxf.multipart.embedded.input"));
- inMessage.put(Message.CONTENT_TYPE,
+ inMessage.put(Message.CONTENT_TYPE,
m.getExchange().getInMessage().get("org.apache.cxf.multipart.embedded.ctype").toString());
}
-
-
+
+
new AttachmentInputInterceptor().handleMessage(inMessage);
-
+
List<Attachment> newAttachments = new LinkedList<Attachment>();
try {
- Map<String, List<String>> headers
+ Map<String, List<String>> headers
= CastUtils.cast((Map<?, ?>)inMessage.get(AttachmentDeserializer.ATTACHMENT_PART_HEADERS));
Attachment first = new Attachment(AttachmentUtil.createAttachment(
- inMessage.getContent(InputStream.class),
+ inMessage.getContent(InputStream.class),
headers),
new ProvidersImpl(inMessage));
newAttachments.add(first);
} catch (IOException ex) {
throw ExceptionUtils.toInternalServerErrorException(ex, null);
}
-
-
+
+
Collection<org.apache.cxf.message.Attachment> childAttachments = inMessage.getAttachments();
if (childAttachments == null) {
childAttachments = Collections.emptyList();
@@ -300,12 +300,12 @@ public class MessageContextImpl implements MessageContext {
for (org.apache.cxf.message.Attachment a : childAttachments) {
newAttachments.add(new Attachment(a, new ProvidersImpl(inMessage)));
}
- MediaType mt = embeddedAttachment
+ MediaType mt = embeddedAttachment
? (MediaType)inMessage.get("org.apache.cxf.multipart.embedded.ctype")
: getHttpHeaders().getMediaType();
MultipartBody body = new MultipartBody(newAttachments, mt, false);
inMessage.put(propertyName, body);
return body;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Nullable.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Nullable.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Nullable.java
index 4d5febc..34c6480 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Nullable.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Nullable.java
@@ -28,9 +28,9 @@ import java.lang.annotation.Target;
* Some JAX-RS providers, notably JAXB-based ones
* return 400 when the incoming payload is empty.
* This annotation can be attached to a method parameter
- * identifying a request body in order to get a null
- * injected instead
- *
+ * identifying a request body in order to get a null
+ * injected instead
+ *
*/
@Target({ElementType.PARAMETER, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Oneway.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Oneway.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Oneway.java
index bd0e3f1..e286d1d 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Oneway.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/Oneway.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
/**
* Can be used to nominate oneway methods
- *
+ *
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeaders.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeaders.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeaders.java
index 366c77f..e9ad7a2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeaders.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeaders.java
@@ -27,26 +27,26 @@ import javax.ws.rs.core.MultivaluedMap;
*
*/
public interface ProtocolHeaders {
-
+
/**
* Get the value of a request header.
* @param name the header name, case insensitive
* @return the header value
*/
String getRequestHeaderValue(String name);
-
+
/**
* Get the values of a request header.
* @param name the header name, case insensitive
* @return a read-only list of header values.
*/
List<String> getRequestHeader(String name);
-
+
/**
- * Get the values of request headers.
+ * Get the values of request headers.
* @return a read-only map of header names and values.
*/
MultivaluedMap<String, String> getRequestHeaders();
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java
index ef94feb..697341a 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ProtocolHeadersImpl.java
@@ -31,11 +31,11 @@ public class ProtocolHeadersImpl implements ProtocolHeaders {
// ProtocolHeaderImpl and HttpHeadersImpl inheriting from it given that
// HttpHeadersImpl is just a wrapper around Message.PROTOCOL_HEADERS
private HttpHeadersImpl httpHeaders;
-
+
public ProtocolHeadersImpl(Message m) {
httpHeaders = new HttpHeadersImpl(m);
}
-
+
public List<String> getRequestHeader(String name) {
return httpHeaders.getRequestHeader(name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ResourceComparator.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ResourceComparator.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ResourceComparator.java
index efe263c..1404ed2 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ResourceComparator.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/ResourceComparator.java
@@ -24,7 +24,7 @@ import org.apache.cxf.message.Message;
/**
* Can be used to affect the way the JAXRS selection algorithm chooses
- * between multiple matching resource classes and methods
+ * between multiple matching resource classes and methods
*
*/
public interface ResourceComparator {
@@ -34,20 +34,20 @@ public interface ResourceComparator {
* @param cri1 First resource class
* @param cri2 Second resource class
* @param message incoming message
- * @return -1 if cri1 < cri2, 1 if if cri1 > cri2, 0 otherwise
+ * @return -1 if cri1 < cri2, 1 if if cri1 > cri2, 0 otherwise
*/
- int compare(ClassResourceInfo cri1,
+ int compare(ClassResourceInfo cri1,
ClassResourceInfo cri2,
Message message);
-
+
/**
* Compares two resource methods
* @param oper1 First resource method
* @param oper2 Second resource method
* @param message incoming message
- * @return -1 if oper1 < oper2, 1 if if oper1 > oper2, 0 otherwise
+ * @return -1 if oper1 < oper2, 1 if if oper1 > oper2, 0 otherwise
*/
- int compare(OperationResourceInfo oper1,
+ int compare(OperationResourceInfo oper1,
OperationResourceInfo oper2,
Message message);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
index 58b37b8..ca095d0 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/multipart/Attachment.java
@@ -39,21 +39,21 @@ import org.apache.cxf.jaxrs.utils.ExceptionUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
/**
- * This class represents an attachment; generally a multipart part.
+ * This class represents an attachment; generally a multipart part.
* Some constructors in here are intended only for
- * internal use in CXF, others are suitable or preparing
- * attachments to pass to the {@link org.apache.cxf.jaxrs.client.WebClient} API.
- * See the {@link AttachmentBuilder} for a convenient
+ * internal use in CXF, others are suitable or preparing
+ * attachments to pass to the {@link org.apache.cxf.jaxrs.client.WebClient} API.
+ * See the {@link AttachmentBuilder} for a convenient
* way to create attachments for use with {@link org.apache.cxf.jaxrs.client.WebClient}.
*/
public class Attachment implements Transferable {
-
+
private DataHandler handler;
- private MultivaluedMap<String, String> headers =
+ private MultivaluedMap<String, String> headers =
new MetadataMap<String, String>(false, true);
private Object object;
private Providers providers;
-
+
public Attachment(org.apache.cxf.message.Attachment a,
Providers providers) {
handler = a.getDataHandler();
@@ -67,34 +67,34 @@ public class Attachment implements Transferable {
headers.putSingle("Content-ID", a.getId());
this.providers = providers;
}
-
+
public Attachment(String id, DataHandler dh, MultivaluedMap<String, String> headers) {
handler = dh;
this.headers = new MetadataMap<String, String>(headers, false, true);
this.headers.putSingle("Content-ID", id);
}
-
+
public Attachment(String id, DataSource ds, MultivaluedMap<String, String> headers) {
this(id, new DataHandler(ds), headers);
}
-
+
public Attachment(MultivaluedMap<String, String> headers, Object object) {
this.headers = headers;
this.object = object;
}
-
+
public Attachment(InputStream is, MultivaluedMap<String, String> headers) {
- this(headers.getFirst("Content-ID"),
- new DataHandler(new InputStreamDataSource(is, headers.getFirst("Content-Type"))),
+ this(headers.getFirst("Content-ID"),
+ new DataHandler(new InputStreamDataSource(is, headers.getFirst("Content-Type"))),
headers);
}
-
+
public Attachment(String id, String mediaType, Object object) {
this.object = object;
headers.putSingle("Content-ID", id);
headers.putSingle("Content-Type", mediaType);
}
-
+
public Attachment(String id, InputStream is, ContentDisposition cd) {
handler = new DataHandler(new InputStreamDataSource(is, "application/octet-stream"));
if (cd != null) {
@@ -103,16 +103,16 @@ public class Attachment implements Transferable {
headers.putSingle("Content-ID", id);
headers.putSingle("Content-Type", "application/octet-stream");
}
-
+
Attachment(MultivaluedMap<String, String> headers, DataHandler handler, Object object) {
this.headers = headers;
this.handler = handler;
this.object = object;
}
-
+
public ContentDisposition getContentDisposition() {
String header = getHeader("Content-Disposition");
-
+
return header == null ? null : new ContentDisposition(header);
}
@@ -132,14 +132,14 @@ public class Attachment implements Transferable {
public Object getObject() {
return object;
}
-
+
public <T> T getObject(Class<T> cls) {
if (providers != null) {
- MessageBodyReader<T> mbr =
+ MessageBodyReader<T> mbr =
providers.getMessageBodyReader(cls, cls, new Annotation[]{}, getContentType());
if (mbr != null) {
try {
- return mbr.readFrom(cls, cls, new Annotation[]{}, getContentType(),
+ return mbr.readFrom(cls, cls, new Annotation[]{}, getContentType(),
headers, getDataHandler().getInputStream());
} catch (Exception ex) {
throw ExceptionUtils.toInternalServerErrorException(ex, null);
@@ -148,7 +148,7 @@ public class Attachment implements Transferable {
}
return null;
}
-
+
public String getHeader(String name) {
List<String> header = headers.get(name);
if (header == null || header.size() == 0) {
@@ -163,7 +163,7 @@ public class Attachment implements Transferable {
}
return sb.toString();
}
-
+
public List<String> getHeaderAsList(String name) {
return headers.get(name);
}
@@ -171,25 +171,25 @@ public class Attachment implements Transferable {
public MultivaluedMap<String, String> getHeaders() {
return new MetadataMap<String, String>(headers, false, true);
}
-
+
public void transferTo(File destinationFile) throws IOException {
IOUtils.transferTo(handler.getInputStream(), destinationFile);
}
@Override
public int hashCode() {
- return headers.hashCode();
+ return headers.hashCode();
}
-
+
@Override
public boolean equals(Object o) {
- if (!(o instanceof Attachment)) {
+ if (!(o instanceof Attachment)) {
return false;
}
-
+
Attachment other = (Attachment)o;
return headers.equals(other.headers);
}
-
+
}
[31/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
index 1a3c1b8..9f87e84 100644
--- a/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/injection/ResourceInjectorTest.java
@@ -48,14 +48,14 @@ public class ResourceInjectorTest extends Assert {
private static final String RESOURCE_ONE = "resource one";
private static final String RESOURCE_TWO = "resource two";
private static final String RESOURCE_THREE = "resource three";
-
- private ResourceInjector injector;
-
- public void setUpResourceManager(String pfx) {
+
+ private ResourceInjector injector;
+
+ public void setUpResourceManager(String pfx) {
ResourceManager resMgr = EasyMock.createMock(ResourceManager.class);
List<ResourceResolver> resolvers = new ArrayList<>();
-
+
resMgr.getResourceResolvers();
EasyMock.expectLastCall().andReturn(resolvers);
resMgr.resolveResource(pfx + "resource1", String.class, resolvers);
@@ -65,44 +65,44 @@ public class ResourceInjectorTest extends Assert {
resMgr.resolveResource("resource3", CharSequence.class, resolvers);
EasyMock.expectLastCall().andReturn(RESOURCE_THREE);
EasyMock.replay(resMgr);
-
- injector = new ResourceInjector(resMgr);
- }
+
+ injector = new ResourceInjector(resMgr);
+ }
@Test
- public void testFieldInjection() {
+ public void testFieldInjection() {
setUpResourceManager(FieldTarget.class.getCanonicalName() + "/");
- doInjectTest(new FieldTarget());
+ doInjectTest(new FieldTarget());
}
-
-
+
+
@Test
- public void testFieldInSuperClassInjection() {
+ public void testFieldInSuperClassInjection() {
setUpResourceManager("org.apache.cxf.common.injection.FieldTarget/");
- doInjectTest(new SubFieldTarget());
+ doInjectTest(new SubFieldTarget());
}
-
+
@Test
public void testSetterInSuperClassInjection() {
setUpResourceManager("org.apache.cxf.common.injection.SetterTarget/");
- doInjectTest(new SubSetterTarget());
+ doInjectTest(new SubSetterTarget());
}
@Test
public void testSetterInjection() {
setUpResourceManager(SetterTarget.class.getCanonicalName() + "/");
- doInjectTest(new SetterTarget());
+ doInjectTest(new SetterTarget());
}
-
+
@Test
public void testProxyInjection() {
setUpResourceManager(SetterTarget.class.getCanonicalName() + "/");
doInjectTest(getProxyObject(), SetterTarget.class);
}
-
+
@Test
public void testEnhancedInjection() {
- setUpResourceManager(FieldTarget.class.getCanonicalName() + "/");
+ setUpResourceManager(FieldTarget.class.getCanonicalName() + "/");
doInjectTest(getEnhancedObject());
}
@@ -115,75 +115,75 @@ public class ResourceInjectorTest extends Assert {
@Test
public void testResourcesContainer() {
setUpResourceManager("");
- doInjectTest(new ResourcesContainerTarget());
+ doInjectTest(new ResourcesContainerTarget());
}
@Test
- public void testPostConstruct() {
+ public void testPostConstruct() {
setUpResourceManager(SetterTarget.class.getCanonicalName() + "/");
- SetterTarget target = new SetterTarget();
- doInjectTest(target);
- assertTrue(target.injectionCompleteCalled());
+ SetterTarget target = new SetterTarget();
+ doInjectTest(target);
+ assertTrue(target.injectionCompleteCalled());
}
@Test
- public void testPreDestroy() {
+ public void testPreDestroy() {
injector = new ResourceInjector(null, null);
- SetterTarget target = new SetterTarget();
- injector.destroy(target);
- assertTrue(target.preDestroyCalled());
+ SetterTarget target = new SetterTarget();
+ injector.destroy(target);
+ assertTrue(target.preDestroyCalled());
}
private void doInjectTest(Target target) {
doInjectTest(target, target.getClass());
}
-
+
private void doInjectTest(Target target, Class<?> clazz) {
injector.inject(target, clazz);
injector.construct(target);
- assertNotNull(target.getResource1());
- assertEquals(RESOURCE_ONE, target.getResource1());
+ assertNotNull(target.getResource1());
+ assertEquals(RESOURCE_ONE, target.getResource1());
- assertNotNull(target.getResource2());
+ assertNotNull(target.getResource2());
assertEquals(RESOURCE_TWO, target.getResource2());
-
+
assertNotNull(target.getResource3());
assertEquals(RESOURCE_THREE, target.getResource3());
}
-
+
private Target getProxyObject() {
Target t = (Target)Proxy.newProxyInstance(ISetterTarget.class.getClassLoader(),
new Class[] {ISetterTarget.class},
new ProxyClass(new SetterTarget()));
return t;
}
-
+
private FieldTarget getEnhancedObject() {
Enhancer e = new Enhancer();
- e.setSuperclass(FieldTarget.class);
+ e.setSuperclass(FieldTarget.class);
e.setCallback(new CallInterceptor());
- return (FieldTarget)e.create();
+ return (FieldTarget)e.create();
}
}
interface Target {
- String getResource1();
- String getResource2();
+ String getResource1();
+ String getResource2();
CharSequence getResource3();
}
class CallInterceptor implements MethodInterceptor {
-
+
public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) throws Throwable {
Object retValFromSuper = null;
if (!Modifier.isAbstract(method.getModifiers())) {
retValFromSuper = proxy.invokeSuper(obj, args);
- }
- return retValFromSuper;
+ }
+ return retValFromSuper;
}
}
@@ -191,27 +191,27 @@ class CallInterceptor implements MethodInterceptor {
class FieldTarget implements Target {
@Resource
- private String resource1;
+ private String resource1;
@Resource(name = "resource2")
private String resource2foo;
-
+
@Resource(name = "resource3")
private CharSequence resource3foo;
- public String getResource1() {
- return resource1;
- }
+ public String getResource1() {
+ return resource1;
+ }
- public String getResource2() {
+ public String getResource2() {
return resource2foo;
- }
-
+ }
+
public CharSequence getResource3() {
return resource3foo;
}
- public String toString() {
+ public String toString() {
return "[" + resource1 + ":" + resource2foo + ":" + resource3foo + "]";
}
@@ -221,11 +221,11 @@ class SubFieldTarget extends FieldTarget {
}
class SubSetterTarget extends SetterTarget {
-
+
}
-interface ISetterTarget extends Target {
- void setResource1(String argResource1);
+interface ISetterTarget extends Target {
+ void setResource1(String argResource1);
void setResource2(String argResource2);
void setResource3(CharSequence argResource3);
}
@@ -249,7 +249,7 @@ class ProxyClass implements InvocationHandler {
types[i] = CharSequence.class;
}
}
- }
+ }
Method target = obj.getClass().getMethod(m.getName(), types);
result = target.invoke(obj, args);
} catch (InvocationTargetException e) {
@@ -260,15 +260,15 @@ class ProxyClass implements InvocationHandler {
return result;
}
}
-class SetterTarget implements Target {
+class SetterTarget implements Target {
private String resource1;
private String resource2;
private CharSequence resource3;
- private boolean injectionCompletePublic;
- private boolean injectionCompletePrivate;
- private boolean preDestroy;
- private boolean preDestroyPrivate;
+ private boolean injectionCompletePublic;
+ private boolean injectionCompletePrivate;
+ private boolean preDestroy;
+ private boolean preDestroyPrivate;
public final String getResource1() {
return this.resource1;
@@ -278,56 +278,56 @@ class SetterTarget implements Target {
public final void setResource1(final String argResource1) {
this.resource1 = argResource1;
}
-
+
public final String getResource2() {
return this.resource2;
}
-
+
@Resource(name = "resource2")
public void setResource2(final String argResource2) {
this.resource2 = argResource2;
}
-
+
public final CharSequence getResource3() {
return this.resource3;
}
-
+
@Resource(name = "resource3")
public void setResource3(final CharSequence argResource3) {
this.resource3 = argResource3;
}
@PostConstruct
- public void injectionIsAllFinishedNowThankYouVeryMuch() {
+ public void injectionIsAllFinishedNowThankYouVeryMuch() {
injectionCompletePublic = true;
// stick this here to keep PMD happy...
injectionIsAllFinishedNowThankYouVeryMuchPrivate();
- }
-
+ }
+
@PostConstruct
- private void injectionIsAllFinishedNowThankYouVeryMuchPrivate() {
+ private void injectionIsAllFinishedNowThankYouVeryMuchPrivate() {
injectionCompletePrivate = true;
- }
-
+ }
+
@PreDestroy
- public void preDestroyMethod() {
+ public void preDestroyMethod() {
preDestroy = true;
- }
-
+ }
+
@PreDestroy
- private void preDestroyMethodPrivate() {
+ private void preDestroyMethodPrivate() {
preDestroyPrivate = true;
- }
-
- public boolean injectionCompleteCalled() {
+ }
+
+ public boolean injectionCompleteCalled() {
return injectionCompletePrivate && injectionCompletePublic;
}
- public boolean preDestroyCalled() {
+ public boolean preDestroyCalled() {
return preDestroy && preDestroyPrivate;
}
-
+
// dummy method to access the private methods to avoid compile warnings
public void dummyMethod() {
preDestroyMethodPrivate();
@@ -339,15 +339,15 @@ class SetterTarget implements Target {
@Resource(name = "resource1")
class ClassTarget implements Target {
- @Resource(name = "resource3")
+ @Resource(name = "resource3")
public CharSequence resource3foo;
- @Resource(name = "resource2")
- public String resource2foo;
- private String res1;
+ @Resource(name = "resource2")
+ public String resource2foo;
+ private String res1;
- public final void setResource1(String res) {
- res1 = res;
- }
+ public final void setResource1(String res) {
+ res1 = res;
+ }
public final String getResource1() {
return res1;
@@ -356,7 +356,7 @@ class ClassTarget implements Target {
public final String getResource2() {
return resource2foo;
}
-
+
public final CharSequence getResource3() {
return resource3foo;
}
@@ -364,18 +364,18 @@ class ClassTarget implements Target {
-@Resources({@Resource(name = "resource1"),
+@Resources({@Resource(name = "resource1"),
@Resource(name = "resource2"),
@Resource(name = "resource3") })
class ResourcesContainerTarget implements Target {
- private String res1;
- private String resource2;
+ private String res1;
+ private String resource2;
private CharSequence resource3;
- public final void setResource1(String res) {
- res1 = res;
- }
+ public final void setResource1(String res) {
+ res1 = res;
+ }
public final String getResource1() {
return res1;
@@ -384,7 +384,7 @@ class ResourcesContainerTarget implements Target {
public final String getResource2() {
return resource2;
}
-
+
public final CharSequence getResource3() {
return resource3;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
index 10c517f..b900065 100644
--- a/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/logging/LogUtilsTest.java
@@ -63,7 +63,7 @@ public class LogUtilsTest extends Assert {
EasyMock.verify(handler);
log.removeHandler(handler);
}
-
+
@Test
public void testLogNoParamsOrThrowable() {
Logger log = LogUtils.getL7dLogger(LogUtilsTest.class, null, "testLogNoParamsOrThrowable");
@@ -78,7 +78,7 @@ public class LogUtilsTest extends Assert {
EasyMock.verify(handler);
log.removeHandler(handler);
}
-
+
@Test
public void testLogNoParamsWithThrowable() {
Logger log = LogUtils.getL7dLogger(LogUtilsTest.class, null, "testLogNoParamsWithThrowable");
@@ -138,7 +138,7 @@ public class LogUtilsTest extends Assert {
public void testCXF1420() throws Exception {
Logger log = LogUtils.getL7dLogger(LogUtilsTest.class, null, "testCXF1420");
LogUtils.log(log, Level.SEVERE, "SQLException for SQL [{call FOO.ping(?, ?)}]");
- }
+ }
@Test
public void testClassMethodNames() throws Exception {
Logger log = LogUtils.getL7dLogger(LogUtilsTest.class, null, "testClassMethodNames");
@@ -147,17 +147,17 @@ public class LogUtilsTest extends Assert {
// logger called directly
log.warning("hello");
-
+
String cname = handler.cname;
String mname = handler.mname;
-
+
// logger called through LogUtils
LogUtils.log(log, Level.WARNING, "FOOBAR_MSG");
-
+
assertEquals(cname, handler.cname);
assertEquals(mname, handler.mname);
}
-
+
private static final class TestLogHandler extends Handler {
String cname;
String mname;
@@ -170,9 +170,9 @@ public class LogUtilsTest extends Assert {
public void publish(LogRecord record) {
cname = record.getSourceClassName();
mname = record.getSourceMethodName();
- }
+ }
}
-
+
private static final class LogRecordMatcher implements IArgumentMatcher {
private final LogRecord record;
@@ -187,16 +187,16 @@ public class LogUtilsTest extends Assert {
if (record.getResourceBundle() != null) {
l7dString = record.getResourceBundle().getString(record.getMessage());
}
- return (record.getMessage().equals(other.getMessage())
+ return (record.getMessage().equals(other.getMessage())
|| l7dString.equals(other.getMessage()))
&& record.getLevel().equals(other.getLevel())
&& record.getThrown() == other.getThrown();
}
return false;
- }
+ }
public void appendTo(StringBuffer buffer) {
buffer.append("log records did not match");
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
index 16d03de..13ab378 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimpleGroupTest.java
@@ -32,25 +32,25 @@ public class SimpleGroupTest extends Assert {
assertEquals("group", new SimpleGroup("group", "friend").getName());
assertEquals("group", new SimpleGroup("group", new SimplePrincipal("friend")).getName());
}
-
+
@Test
public void testIsMember() {
assertTrue(new SimpleGroup("group", "friend").isMember(new SimplePrincipal("friend")));
assertFalse(new SimpleGroup("group", "friend").isMember(new SimplePrincipal("frogs")));
}
-
+
@Test
public void testAddRemoveMembers() {
-
- Group group = new SimpleGroup("group");
+
+ Group group = new SimpleGroup("group");
assertFalse(group.members().hasMoreElements());
-
+
group.addMember(new SimpleGroup("group", "friend"));
-
+
Enumeration<? extends Principal> members = group.members();
assertEquals(new SimpleGroup("group", "friend"), members.nextElement());
assertFalse(members.hasMoreElements());
-
+
group.removeMember(new SimpleGroup("group", "friend"));
assertFalse(group.members().hasMoreElements());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
index 5e7a753..ee3c620 100644
--- a/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
+++ b/core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java
@@ -28,11 +28,11 @@ public class SimplePrincipalTest extends Assert {
public void testNullName() {
new SimplePrincipal(null);
}
-
+
public void testEquals() {
assertEquals(new SimplePrincipal("barry"), new SimplePrincipal("barry"));
}
-
+
public void testNotEquals() {
assertFalse(new SimplePrincipal("barry").equals(new SimplePrincipal("john")));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
index a05ffaf..93adf53 100644
--- a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
@@ -40,7 +40,7 @@ public class Base64UtilityTest extends Assert {
assertEquals(b1[x], b2[x]);
}
}
-
+
@Test
public void testEncodeMultipleChunks() throws Exception {
final String text = "The true sign of intelligence is not knowledge but imagination.";
@@ -48,7 +48,7 @@ public class Base64UtilityTest extends Assert {
// multiple of 3 octets
assertEquals(63, bytes.length);
String s1 = new String(Base64Utility.encodeChunk(bytes, 0, bytes.length));
-
+
StringBuilder sb = new StringBuilder();
int off = 0;
for (; off + 21 < bytes.length; off += 21) {
@@ -60,7 +60,7 @@ public class Base64UtilityTest extends Assert {
String s2 = sb.toString();
assertEquals(s1, s2);
}
-
+
@Test
public void testEncodeAndStream() throws Exception {
final String text = "The true sign of intelligence is not knowledge but imagination.";
@@ -70,14 +70,14 @@ public class Base64UtilityTest extends Assert {
String decodedText = new String(Base64Utility.decode(bos.toString()));
assertEquals(decodedText, text);
}
-
+
@Test
public void testEncodeDecodeChunk() throws Exception {
byte bytes[] = new byte[100];
for (int x = 0; x < bytes.length; x++) {
bytes[x] = (byte)x;
}
-
+
char encodedChars[] = Base64Utility.encodeChunk(bytes, 0, -2);
assertNull(encodedChars);
encodedChars = Base64Utility.encodeChunk(bytes, 0, bytes.length);
@@ -94,7 +94,7 @@ public class Base64UtilityTest extends Assert {
assertNotNull(encodedChars);
bytesDecoded = Base64Utility.decodeChunk(encodedChars, 0, encodedChars.length);
assertEquals(bytes, bytesDecoded);
-
+
//require padding
bytes = new byte[98];
for (int x = 0; x < bytes.length; x++) {
@@ -104,7 +104,7 @@ public class Base64UtilityTest extends Assert {
assertNotNull(encodedChars);
bytesDecoded = Base64Utility.decodeChunk(encodedChars, 0, encodedChars.length);
assertEquals(bytes, bytesDecoded);
-
+
//require padding
bytes = new byte[97];
for (int x = 0; x < bytes.length; x++) {
@@ -114,8 +114,8 @@ public class Base64UtilityTest extends Assert {
assertNotNull(encodedChars);
bytesDecoded = Base64Utility.decodeChunk(encodedChars, 0, encodedChars.length);
assertEquals(bytes, bytesDecoded);
-
-
+
+
bytesDecoded = Base64Utility.decodeChunk(new char[3], 0, 3);
assertNull(bytesDecoded);
}
@@ -155,8 +155,8 @@ public class Base64UtilityTest extends Assert {
encodedString.length(),
bout2);
assertEquals(bytes, bout2.toByteArray());
-
-
+
+
String in = "QWxhZGRpbjpvcGVuIHNlc2FtZQ==";
bout.reset();
bout2.reset();
@@ -166,7 +166,7 @@ public class Base64UtilityTest extends Assert {
StringWriter writer = new StringWriter();
Base64Utility.encode(bytes, 0, bytes.length, writer);
assertEquals(in, writer.toString());
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
index 8c1c1b3..4947573 100644
--- a/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/CollectionUtilsTest.java
@@ -28,7 +28,7 @@ import org.junit.Assert;
import org.junit.Test;
public class CollectionUtilsTest extends Assert {
-
+
@Test
public void testDiff() throws Exception {
List<String> l1 = Arrays.asList(new String[]{"1", "2", "3"});
@@ -37,17 +37,17 @@ public class CollectionUtilsTest extends Assert {
assertTrue(l3.size() == 2);
assertTrue(l3.contains("1"));
assertTrue(l3.contains("3"));
-
+
l3 = CollectionUtils.diff(l1, null);
assertTrue(l3.size() == 3);
assertTrue(l3.contains("1"));
assertTrue(l3.contains("2"));
assertTrue(l3.contains("3"));
-
+
l3 = CollectionUtils.diff(null, null);
- assertNull(l3);
+ assertNull(l3);
}
-
+
@Test
public void testIsEmpty() throws Exception {
List<String> l = Arrays.asList(new String[]{null, null});
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index 03ad66d..fb8f279 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -31,66 +31,66 @@ import org.junit.Test;
public class PackageUtilsTest extends Assert {
@Test
public void testGetClassPackageName() throws Exception {
- String packageName = PackageUtils.getPackageName(this.getClass());
+ String packageName = PackageUtils.getPackageName(this.getClass());
assertEquals("Should get same packageName", this.getClass().getPackage().getName(), packageName);
}
-
+
@Test
public void testGetEmptyPackageName() throws Exception {
String className = "HelloWorld";
assertEquals("Should return empty string", "", PackageUtils.getPackageName(className));
}
-
+
@Test
public void testSharedPackageNameSingleClass() throws Exception {
String packageName = PackageUtils.getSharedPackageName(
- Collections.singletonList(this.getClass()));
+ Collections.singletonList(this.getClass()));
assertEquals(this.getClass().getPackage().getName(), packageName);
}
@Test
public void testSharedPackageNameManyClassesInSamePackage() throws Exception {
String packageName = PackageUtils.getSharedPackageName(
- Arrays.asList(Integer.class, Number.class));
+ Arrays.asList(Integer.class, Number.class));
assertEquals("java.lang", packageName);
}
@Test
public void testSharedPackageNameManyClassesInDiffPackages() throws Exception {
String packageName = PackageUtils.getSharedPackageName(
- Arrays.asList(Integer.class, this.getClass()));
+ Arrays.asList(Integer.class, this.getClass()));
assertEquals("", packageName);
}
@Test
public void testSharedPackageNameManyClassesCommonRoot() throws Exception {
String packageName = PackageUtils.getSharedPackageName(
- Arrays.asList(Integer.class, Annotation.class));
+ Arrays.asList(Integer.class, Annotation.class));
assertEquals("java.lang", packageName);
}
@Test
public void testSharedPackageNameManyClassesCommonRoot2() throws Exception {
String packageName = PackageUtils.getSharedPackageName(
- Arrays.asList(Annotation.class, Integer.class));
+ Arrays.asList(Annotation.class, Integer.class));
assertEquals("java.lang", packageName);
}
@Test
public void testSharedPackageNameManyClassesCommonRoot3() throws Exception {
String packageName = PackageUtils.getSharedPackageName(
- Arrays.asList(Annotation.class, Array.class));
+ Arrays.asList(Annotation.class, Array.class));
assertEquals("java.lang", packageName);
}
@Test
public void testSharedPackageNameManyClassesCommonRoot4() throws Exception {
String packageName = PackageUtils.getSharedPackageName(
- Arrays.asList(org.apache.cxf.common.util.PackageUtils.class,
+ Arrays.asList(org.apache.cxf.common.util.PackageUtils.class,
org.apache.cxf.bus.CXFBusFactory.class,
- org.apache.cxf.common.jaxb.JAXBContextCache.class));
+ org.apache.cxf.common.jaxb.JAXBContextCache.class));
assertEquals("org.apache.cxf", packageName);
}
@Test
public void testSharedPackageNameManyClassesCommonRoot5() throws Exception {
String packageName = PackageUtils.getSharedPackageName(
- Arrays.asList(java.lang.annotation.Annotation.class,
+ Arrays.asList(java.lang.annotation.Annotation.class,
org.apache.cxf.bus.CXFBusFactory.class,
- org.apache.cxf.common.jaxb.JAXBContextCache.class));
+ org.apache.cxf.common.jaxb.JAXBContextCache.class));
assertEquals("", packageName);
}
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
index 53de031..6f356df 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertiesLoaderUtilsTest.java
@@ -29,14 +29,14 @@ public class PropertiesLoaderUtilsTest extends Assert {
Properties properties;
String soapBindingFactory = "org.apache.cxf.bindings.soap.SOAPBindingFactory";
-
+
@Before
public void setUp() throws Exception {
properties = PropertiesLoaderUtils.
loadAllProperties("org/apache/cxf/common/util/resources/bindings.properties.xml",
Thread.currentThread().getContextClassLoader());
- assertNotNull(properties);
-
+ assertNotNull(properties);
+
}
@Test
public void testLoadBindings() throws Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
index f7dbd0a..ea4e30b 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PropertyUtilsTest.java
@@ -27,50 +27,50 @@ import org.junit.Test;
public class PropertyUtilsTest extends Assert {
private static final String TEST_KEY = "my.key";
-
+
@Test
public void testIsTrueWithMap() {
Map<String, Object> props = new HashMap<String, Object>();
assertFalse(PropertyUtils.isTrue(props, TEST_KEY));
-
+
props.put(TEST_KEY, "false");
assertFalse(PropertyUtils.isTrue(props, TEST_KEY));
-
+
props.put(TEST_KEY, Boolean.FALSE);
assertFalse(PropertyUtils.isTrue(props, TEST_KEY));
-
+
props.put(TEST_KEY, "true");
assertTrue(PropertyUtils.isTrue(props, TEST_KEY));
-
+
props.put(TEST_KEY, Boolean.TRUE);
assertTrue(PropertyUtils.isTrue(props, TEST_KEY));
}
-
+
@Test
public void testIsFalseWithMap() {
Map<String, Object> props = new HashMap<String, Object>();
assertFalse(PropertyUtils.isFalse(props, TEST_KEY));
-
+
props.put(TEST_KEY, "true");
assertFalse(PropertyUtils.isFalse(props, TEST_KEY));
-
+
props.put(TEST_KEY, Boolean.TRUE);
assertFalse(PropertyUtils.isFalse(props, TEST_KEY));
-
+
props.put(TEST_KEY, "false");
assertTrue(PropertyUtils.isFalse(props, TEST_KEY));
-
+
props.put(TEST_KEY, Boolean.FALSE);
assertTrue(PropertyUtils.isFalse(props, TEST_KEY));
}
-
+
@Test
public void testTrue() {
assertTrue(PropertyUtils.isTrue(Boolean.TRUE));
assertTrue(PropertyUtils.isTrue("true"));
assertTrue(PropertyUtils.isTrue("TRUE"));
assertTrue(PropertyUtils.isTrue("TrUe"));
-
+
assertFalse(PropertyUtils.isTrue(Boolean.FALSE));
assertFalse(PropertyUtils.isTrue("false"));
assertFalse(PropertyUtils.isTrue("FALSE"));
@@ -86,7 +86,7 @@ public class PropertyUtilsTest extends Assert {
assertTrue(PropertyUtils.isFalse("false"));
assertTrue(PropertyUtils.isFalse("FALSE"));
assertTrue(PropertyUtils.isFalse("FaLSE"));
-
+
assertFalse(PropertyUtils.isFalse(Boolean.TRUE));
assertFalse(PropertyUtils.isFalse("true"));
assertFalse(PropertyUtils.isFalse("TRUE"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
index 7480135..a346e96 100644
--- a/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/StringUtilsTest.java
@@ -25,7 +25,7 @@ import org.junit.Assert;
import org.junit.Test;
public class StringUtilsTest extends Assert {
-
+
@Test
public void testDiff() throws Exception {
String str1 = "http://local/SoapContext/SoapPort/greetMe/me/CXF";
@@ -35,13 +35,13 @@ public class StringUtilsTest extends Assert {
assertEquals("greetMe/me/CXF", StringUtils.diff(str1, str3));
assertEquals("http://local/SoapContext/SoapPort/", StringUtils.diff(str3, str1));
}
-
+
@Test
- public void testGetFirstNotEmpty() throws Exception {
+ public void testGetFirstNotEmpty() throws Exception {
assertEquals("greetMe", StringUtils.getFirstNotEmpty("/greetMe/me/CXF", "/"));
assertEquals("greetMe", StringUtils.getFirstNotEmpty("greetMe/me/CXF", "/"));
}
-
+
@Test
public void testGetParts() throws Exception {
String str = "/greetMe/me/CXF";
@@ -51,7 +51,7 @@ public class StringUtilsTest extends Assert {
assertEquals("me", parts.get(1));
assertEquals("CXF", parts.get(2));
}
-
+
@Test
public void testGetPartsWithSingleSpace() throws Exception {
String str = "a b";
@@ -60,7 +60,7 @@ public class StringUtilsTest extends Assert {
assertEquals("a", parts.get(0));
assertEquals("b", parts.get(1));
}
-
+
@Test
public void testGetPartsWithManySpaces() throws Exception {
String str = "a b";
@@ -69,7 +69,7 @@ public class StringUtilsTest extends Assert {
assertEquals("a", parts.get(0));
assertEquals("b", parts.get(1));
}
-
+
@Test
public void testSplitWithDot() throws Exception {
String str = "a.b.c";
@@ -79,11 +79,11 @@ public class StringUtilsTest extends Assert {
assertEquals("b", parts[1]);
assertEquals("c", parts[2]);
}
-
+
@Test
public void testGetFound() throws Exception {
String regex = "velocity-\\d+\\.\\d+\\.jar";
-
+
assertTrue(StringUtils.isEmpty(StringUtils.getFound("velocity-dep-1.4.jar", regex)));
assertFalse(StringUtils.isEmpty(StringUtils.getFound("velocity-1.4.jar", regex)));
assertTrue(StringUtils.isEmpty(StringUtils.getFound(null, regex)));
@@ -95,8 +95,8 @@ public class StringUtilsTest extends Assert {
assertEquals("http://localhost:80/", StringUtils.addDefaultPortIfMissing("http://localhost/"));
assertEquals("http://localhost:80/abc", StringUtils.addDefaultPortIfMissing("http://localhost/abc"));
assertEquals("http://localhost:80", StringUtils.addDefaultPortIfMissing("http://localhost:80"));
-
- assertEquals("http://localhost:9090",
+
+ assertEquals("http://localhost:9090",
StringUtils.addDefaultPortIfMissing("http://localhost", "9090"));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
index 2d92315..adf3f23 100644
--- a/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/URIParserUtilsTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class URIParserUtilsTest extends Assert {
-
+
@Test
public void testRelativize() throws URISyntaxException {
assertNull(URIParserUtil.relativize(null, "foo"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
index 7ae4015..ff409de 100644
--- a/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/UrlUtilsTest.java
@@ -24,19 +24,19 @@ import org.junit.Test;
public class UrlUtilsTest extends Assert {
-
+
@Test
public void testUrlDecode() {
assertEquals("+ ", UrlUtils.urlDecode("%2B+"));
}
-
+
@Test
public void testUrlDecodeSingleCharMultipleEscapes() {
String s = "�";
String encoded = UrlUtils.urlEncode(s);
assertEquals(s, UrlUtils.urlDecode(encoded));
}
-
+
@Test
public void testUrlDecodeReserved() {
assertEquals("!$&'()*,;=", UrlUtils.urlDecode("!$&'()*,;="));
@@ -88,7 +88,7 @@ public class UrlUtilsTest extends Assert {
assertTrue(e.getMessage().startsWith("Invalid URL encoding"));
}
}
-
+
@Test
public void testPathDecode() {
assertEquals("+++", UrlUtils.pathDecode("+%2B+"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
index 5c5ea3e..a3ea8ab 100644
--- a/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/XmlSchemaPrimitiveUtilsTest.java
@@ -28,11 +28,11 @@ public class XmlSchemaPrimitiveUtilsTest extends Assert {
assertEquals("xs:int", XmlSchemaPrimitiveUtils.getSchemaRepresentation(Integer.class));
assertEquals("xs:int", XmlSchemaPrimitiveUtils.getSchemaRepresentation(int.class));
}
-
+
@Test
public void testXsdRepresentation() {
assertEquals("xsd:int", XmlSchemaPrimitiveUtils.getSchemaRepresentation(Integer.class, "xsd"));
assertEquals("xsd:int", XmlSchemaPrimitiveUtils.getSchemaRepresentation(int.class, "xsd"));
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/xmlschema/DOMErrorException.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/DOMErrorException.java b/core/src/test/java/org/apache/cxf/common/xmlschema/DOMErrorException.java
index ba79117..1db9188 100644
--- a/core/src/test/java/org/apache/cxf/common/xmlschema/DOMErrorException.java
+++ b/core/src/test/java/org/apache/cxf/common/xmlschema/DOMErrorException.java
@@ -22,12 +22,12 @@ package org.apache.cxf.common.xmlschema;
import org.w3c.dom.DOMError;
/**
- *
+ *
*/
public class DOMErrorException extends RuntimeException {
private static final long serialVersionUID = -4350285749042450625L;
private DOMError error;
-
+
public DOMErrorException(DOMError error) {
this.error = error;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/xmlschema/DOMLSInput.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/DOMLSInput.java b/core/src/test/java/org/apache/cxf/common/xmlschema/DOMLSInput.java
index 231cea9..4aab56c 100644
--- a/core/src/test/java/org/apache/cxf/common/xmlschema/DOMLSInput.java
+++ b/core/src/test/java/org/apache/cxf/common/xmlschema/DOMLSInput.java
@@ -32,18 +32,18 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.staxutils.StaxUtils;
/**
- *
+ *
*/
class DOMLSInput implements LSInput {
private static final Logger LOG = LogUtils.getL7dLogger(DOMLSInput.class);
private String systemId;
private String data;
-
+
DOMLSInput(Document doc, String systemId) throws TransformerException {
this.systemId = systemId;
data = StaxUtils.toString(doc);
LOG.fine(systemId + ": " + data);
-
+
}
/** {@inheritDoc}*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
index d00abfe..028208f 100644
--- a/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
+++ b/core/src/test/java/org/apache/cxf/common/xmlschema/ImportRepairTest.java
@@ -135,7 +135,7 @@ public class ImportRepairTest extends Assert {
collection.addCrossImports();
tryToParseSchemas();
}
-
+
Method findMethod(Object o, String name) {
for (Method m: o.getClass().getMethods()) {
if (m.getName() == name) {
@@ -164,18 +164,18 @@ public class ImportRepairTest extends Assert {
DOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();
DOMImplementation impl = registry.getDOMImplementation("XS-Loader");
-
+
try {
Object schemaLoader = findMethod(impl, "createXSLoader").invoke(impl, new Object[1]);
DOMConfiguration config = (DOMConfiguration)findMethod(schemaLoader, "getConfig").invoke(schemaLoader);
-
+
config.setParameter("validate", Boolean.TRUE);
try {
- //bug in the JDK doesn't set this, but accesses it
+ //bug in the JDK doesn't set this, but accesses it
config.setParameter("http://www.oracle.com/xml/jaxp/properties/xmlSecurityPropertyManager",
Class.forName("com.sun.org.apache.xerces.internal.utils.XMLSecurityPropertyManager")
.newInstance());
-
+
config.setParameter("http://apache.org/xml/properties/security-manager",
Class.forName("com.sun.org.apache.xerces.internal.utils.XMLSecurityManager")
.newInstance());
@@ -183,7 +183,7 @@ public class ImportRepairTest extends Assert {
//ignore
}
config.setParameter("error-handler", new DOMErrorHandler() {
-
+
public boolean handleError(DOMError error) {
LOG.info("Schema parsing error: " + error.getMessage()
+ " " + error.getType()
@@ -194,20 +194,20 @@ public class ImportRepairTest extends Assert {
}
});
config.setParameter("resource-resolver", new LSResourceResolver() {
-
+
public LSInput resolveResource(String type, String namespaceURI, String publicId,
String systemId, String baseURI) {
return resolverMap.get(namespaceURI);
}
});
-
+
Method m = findMethod(schemaLoader, "loadInputList");
String name = m.getParameterTypes()[0].getName() + "Impl";
name = name.replace("xs.LS", "impl.xs.util.LS");
Class<?> c = Class.forName(name);
Object inputList = c.getConstructor(LSInput[].class, Integer.TYPE)
.newInstance(inputs.toArray(new LSInput[inputs.size()]), inputs.size());
-
+
findMethod(schemaLoader, "loadInputList").invoke(schemaLoader, inputList);
} catch (InvocationTargetException ite) {
throw (Exception)ite.getTargetException();
@@ -218,7 +218,7 @@ public class ImportRepairTest extends Assert {
if (!dumpSchemas) {
return;
}
-
+
XMLStreamWriter xwriter = StaxUtils.createXMLStreamWriter(System.err);
xwriter = new PrettyPrintXMLStreamWriter(xwriter, 2);
StaxUtils.copy(new DOMSource(document), xwriter);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Address.java b/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
index 6bf5fde..07c9dc0 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Address.java
@@ -28,9 +28,9 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for address complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* <complexType name="address">
* <complexContent>
@@ -45,8 +45,8 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "address",
@@ -67,11 +67,11 @@ public class Address {
/**
* Gets the value of the city property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getCity() {
return city;
@@ -79,11 +79,11 @@ public class Address {
/**
* Sets the value of the city property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setCity(String value) {
this.city = value;
@@ -91,7 +91,7 @@ public class Address {
/**
* Gets the value of the zip property.
- *
+ *
*/
public int getZip() {
return zip;
@@ -99,7 +99,7 @@ public class Address {
/**
* Sets the value of the zip property.
- *
+ *
*/
public void setZip(int value) {
this.zip = value;
@@ -107,11 +107,11 @@ public class Address {
/**
* Gets the value of the street property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getStreet() {
return street;
@@ -119,11 +119,11 @@ public class Address {
/**
* Sets the value of the street property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setStreet(String value) {
this.street = value;
@@ -131,11 +131,11 @@ public class Address {
/**
* Gets the value of the nr property.
- *
+ *
* @return
* possible object is
* {@link Integer }
- *
+ *
*/
public Integer getNr() {
return nr;
@@ -143,11 +143,11 @@ public class Address {
/**
* Sets the value of the nr property.
- *
+ *
* @param value
* allowed object is
* {@link Integer }
- *
+ *
*/
public void setNr(Integer value) {
this.nr = value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java b/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
index 03c1e74..33d93e9 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Foo.java
@@ -26,9 +26,9 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for foo complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* <complexType name="foo">
* <complexContent>
@@ -44,8 +44,8 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "foo",
@@ -67,11 +67,11 @@ public class Foo {
/**
* Gets the value of the position property.
- *
+ *
* @return
* possible object is
* {@link Point }
- *
+ *
*/
public Point getPosition() {
return position;
@@ -79,11 +79,11 @@ public class Foo {
/**
* Sets the value of the position property.
- *
+ *
* @param value
* allowed object is
* {@link Point }
- *
+ *
*/
public void setPosition(Point value) {
this.position = value;
@@ -91,11 +91,11 @@ public class Foo {
/**
* Gets the value of the address property.
- *
+ *
* @return
* possible object is
* {@link Address }
- *
+ *
*/
public Address getAddress() {
return address;
@@ -103,11 +103,11 @@ public class Foo {
/**
* Sets the value of the address property.
- *
+ *
* @param value
* allowed object is
* {@link Address }
- *
+ *
*/
public void setAddress(Address value) {
this.address = value;
@@ -115,11 +115,11 @@ public class Foo {
/**
* Gets the value of the name property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getName() {
return name;
@@ -127,11 +127,11 @@ public class Foo {
/**
* Sets the value of the name property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setName(String value) {
this.name = value;
@@ -139,11 +139,11 @@ public class Foo {
/**
* Gets the value of the intDefault property.
- *
+ *
* @return
* possible object is
* {@link Integer }
- *
+ *
*/
public Integer getIntDefault() {
return intDefault;
@@ -151,11 +151,11 @@ public class Foo {
/**
* Sets the value of the intDefault property.
- *
+ *
* @param value
* allowed object is
* {@link Integer }
- *
+ *
*/
public void setIntDefault(Integer value) {
this.intDefault = value;
@@ -163,11 +163,11 @@ public class Foo {
/**
* Gets the value of the intNoDefault property.
- *
+ *
* @return
* possible object is
* {@link Integer }
- *
+ *
*/
public Integer getIntNoDefault() {
return intNoDefault;
@@ -175,11 +175,11 @@ public class Foo {
/**
* Sets the value of the intNoDefault property.
- *
+ *
* @param value
* allowed object is
* {@link Integer }
- *
+ *
*/
public void setIntNoDefault(Integer value) {
this.intNoDefault = value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java b/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java
index 8abc089..24321d0 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/ObjectFactory.java
@@ -26,18 +26,18 @@ import javax.xml.namespace.QName;
/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.apache.cxf.configuration.foo package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.apache.cxf.configuration.foo package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
* provided in this class.
- *
+ *
*/
@XmlRegistry
public class ObjectFactory {
@@ -52,14 +52,14 @@ public class ObjectFactory {
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived
* classes for package: org.apache.cxf.configuration.foo
- *
+ *
*/
public ObjectFactory() {
}
/**
* Create an instance of {@link Address }
- *
+ *
*/
public Address createAddress() {
return new Address();
@@ -67,7 +67,7 @@ public class ObjectFactory {
/**
* Create an instance of {@link Foo }
- *
+ *
*/
public Foo createFoo() {
return new Foo();
@@ -75,7 +75,7 @@ public class ObjectFactory {
/**
* Create an instance of {@link Point }
- *
+ *
*/
public Point createPoint() {
return new Point();
@@ -83,7 +83,7 @@ public class ObjectFactory {
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Point }{@code >}}
- *
+ *
*/
@XmlElementDecl(namespace = "http://cxf.apache.org/configuration/foo", name = "point")
public JAXBElement<Point> createPoint(Point value) {
@@ -92,7 +92,7 @@ public class ObjectFactory {
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Address }{@code >}}
- *
+ *
*/
@XmlElementDecl(namespace = "http://cxf.apache.org/configuration/foo", name = "address")
public JAXBElement<Address> createAddress(Address value) {
@@ -101,7 +101,7 @@ public class ObjectFactory {
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Foo }{@code >}}
- *
+ *
*/
@XmlElementDecl(namespace = "http://cxf.apache.org/configuration/foo", name = "foo")
public JAXBElement<Foo> createFoo(Foo value) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/configuration/foo/Point.java b/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
index 8a505f9..36b08f0 100644
--- a/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
+++ b/core/src/test/java/org/apache/cxf/configuration/foo/Point.java
@@ -26,9 +26,9 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for point complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* <complexType name="point">
* <complexContent>
@@ -41,8 +41,8 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "point",
@@ -57,7 +57,7 @@ public class Point {
/**
* Gets the value of the x property.
- *
+ *
*/
public int getX() {
return x;
@@ -65,7 +65,7 @@ public class Point {
/**
* Sets the value of the x property.
- *
+ *
*/
public void setX(int value) {
this.x = value;
@@ -73,7 +73,7 @@ public class Point {
/**
* Gets the value of the y property.
- *
+ *
*/
public int getY() {
return y;
@@ -81,7 +81,7 @@ public class Point {
/**
* Sets the value of the y property.
- *
+ *
*/
public void setY(int value) {
this.y = value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
index 6abcbf4..49dac5f 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/ConfigurerImplTest.java
@@ -41,7 +41,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class ConfigurerImplTest extends Assert {
-
+
static {
Class<?> cls;
try {
@@ -57,40 +57,40 @@ public class ConfigurerImplTest extends Assert {
//ignore;
}
}
-
+
@Test
public void testConfigureSimpleNoMatchingBean() {
SimpleBean sb = new SimpleBean("unknown");
-
- BusApplicationContext ac =
+
+ BusApplicationContext ac =
new BusApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml",
false);
ConfigurerImpl configurer = new ConfigurerImpl(ac);
configurer.configureBean(sb);
- assertEquals("Unexpected value for attribute stringAttr",
+ assertEquals("Unexpected value for attribute stringAttr",
"hello", sb.getStringAttr());
- assertTrue("Unexpected value for attribute booleanAttr",
+ assertTrue("Unexpected value for attribute booleanAttr",
sb.getBooleanAttr());
- assertEquals("Unexpected value for attribute integerAttr",
+ assertEquals("Unexpected value for attribute integerAttr",
BigInteger.ONE, sb.getIntegerAttr());
- assertEquals("Unexpected value for attribute intAttr",
+ assertEquals("Unexpected value for attribute intAttr",
Integer.valueOf(2), sb.getIntAttr());
- assertEquals("Unexpected value for attribute longAttr",
+ assertEquals("Unexpected value for attribute longAttr",
Long.valueOf(3L), sb.getLongAttr());
- assertEquals("Unexpected value for attribute shortAttr",
+ assertEquals("Unexpected value for attribute shortAttr",
Short.valueOf((short)4), sb.getShortAttr());
- assertEquals("Unexpected value for attribute decimalAttr",
+ assertEquals("Unexpected value for attribute decimalAttr",
new BigDecimal("5"), sb.getDecimalAttr());
- assertEquals("Unexpected value for attribute floatAttr",
+ assertEquals("Unexpected value for attribute floatAttr",
new Float(6F), sb.getFloatAttr());
- assertEquals("Unexpected value for attribute doubleAttr",
+ assertEquals("Unexpected value for attribute doubleAttr",
Double.valueOf(7.0D), sb.getDoubleAttr());
- assertEquals("Unexpected value for attribute byteAttr",
+ assertEquals("Unexpected value for attribute byteAttr",
Byte.valueOf((byte)8), sb.getByteAttr());
-
+
QName qn = sb.getQnameAttr();
- assertEquals("Unexpected value for attribute qnameAttrNoDefault",
+ assertEquals("Unexpected value for attribute qnameAttrNoDefault",
"schema", qn.getLocalPart());
assertEquals("Unexpected value for attribute qnameAttrNoDefault",
"http://www.w3.org/2001/XMLSchema", qn.getNamespaceURI());
@@ -106,100 +106,100 @@ public class ConfigurerImplTest extends Assert {
for (int i = 0; i < expected.length; i++) {
assertEquals("Unexpected value for attribute hexBinaryAttrNoDefault", expected[i], val[i]);
}
-
- assertEquals("Unexpected value for attribute unsignedIntAttrNoDefault",
+
+ assertEquals("Unexpected value for attribute unsignedIntAttrNoDefault",
Long.valueOf(9L), sb.getUnsignedIntAttr());
- assertEquals("Unexpected value for attribute unsignedShortAttrNoDefault",
+ assertEquals("Unexpected value for attribute unsignedShortAttrNoDefault",
Integer.valueOf(10), sb.getUnsignedShortAttr());
- assertEquals("Unexpected value for attribute unsignedByteAttrNoDefault",
+ assertEquals("Unexpected value for attribute unsignedByteAttrNoDefault",
Short.valueOf((short)11), sb.getUnsignedByteAttr());
}
-
+
@Test
public void testConfigureSimple() {
- // Try to configure the bean with id
+ // Try to configure the bean with id
verifyConfigureSimple("simple");
// Try to configure the bean with an alias name
verifyConfigureSimple("simpleValueBean");
}
-
-
+
+
public void verifyConfigureSimple(String beanName) {
-
+
SimpleBean sb = new SimpleBean(beanName);
- BusApplicationContext ac =
+ BusApplicationContext ac =
new BusApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml",
false);
ConfigurerImpl configurer = new ConfigurerImpl();
configurer.setApplicationContext(ac);
-
+
configurer.configureBean(sb);
- assertEquals("Unexpected value for attribute stringAttr",
+ assertEquals("Unexpected value for attribute stringAttr",
"hallo", sb.getStringAttr());
- assertTrue("Unexpected value for attribute booleanAttr",
+ assertTrue("Unexpected value for attribute booleanAttr",
!sb.getBooleanAttr());
- assertEquals("Unexpected value for attribute integerAttr",
+ assertEquals("Unexpected value for attribute integerAttr",
BigInteger.TEN, sb.getIntegerAttr());
- assertEquals("Unexpected value for attribute intAttr",
+ assertEquals("Unexpected value for attribute intAttr",
Integer.valueOf(12), sb.getIntAttr());
- assertEquals("Unexpected value for attribute longAttr",
+ assertEquals("Unexpected value for attribute longAttr",
Long.valueOf(13L), sb.getLongAttr());
- assertEquals("Unexpected value for attribute shortAttr",
+ assertEquals("Unexpected value for attribute shortAttr",
Short.valueOf((short)14), sb.getShortAttr());
- assertEquals("Unexpected value for attribute decimalAttr",
+ assertEquals("Unexpected value for attribute decimalAttr",
new BigDecimal("15"), sb.getDecimalAttr());
- assertEquals("Unexpected value for attribute floatAttr",
+ assertEquals("Unexpected value for attribute floatAttr",
new Float(16F), sb.getFloatAttr());
- assertEquals("Unexpected value for attribute doubleAttr",
+ assertEquals("Unexpected value for attribute doubleAttr",
Double.valueOf(17D), sb.getDoubleAttr());
- assertEquals("Unexpected value for attribute byteAttr",
+ assertEquals("Unexpected value for attribute byteAttr",
Byte.valueOf((byte)18), sb.getByteAttr());
-
- assertEquals("Unexpected value for attribute unsignedIntAttrNoDefault",
+
+ assertEquals("Unexpected value for attribute unsignedIntAttrNoDefault",
Long.valueOf(19L), sb.getUnsignedIntAttr());
- assertEquals("Unexpected value for attribute unsignedShortAttrNoDefault",
+ assertEquals("Unexpected value for attribute unsignedShortAttrNoDefault",
Integer.valueOf(20), sb.getUnsignedShortAttr());
- assertEquals("Unexpected value for attribute unsignedByteAttrNoDefault",
+ assertEquals("Unexpected value for attribute unsignedByteAttrNoDefault",
Short.valueOf((short)21), sb.getUnsignedByteAttr());
}
-
+
@Test
public void testConfigureSimpleMatchingStarBeanId() {
SimpleBean sb = new SimpleBean("simple2");
- BusApplicationContext ac =
+ BusApplicationContext ac =
new BusApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml",
false);
ConfigurerImpl configurer = new ConfigurerImpl();
configurer.setApplicationContext(ac);
configurer.configureBean(sb);
- assertTrue("Unexpected value for attribute booleanAttr",
+ assertTrue("Unexpected value for attribute booleanAttr",
!sb.getBooleanAttr());
- assertEquals("Unexpected value for attribute integerAttr",
+ assertEquals("Unexpected value for attribute integerAttr",
BigInteger.TEN, sb.getIntegerAttr());
- assertEquals("Unexpected value for attribute stringAttr",
+ assertEquals("Unexpected value for attribute stringAttr",
"StarHallo", sb.getStringAttr());
}
-
+
@Test
public void testConfigureSimpleMatchingStarBeanIdWithChildInstance() {
SimpleBean sb = new ChildBean("simple2");
- BusApplicationContext ac =
+ BusApplicationContext ac =
new BusApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml",
false);
ConfigurerImpl configurer = new ConfigurerImpl();
configurer.setApplicationContext(ac);
configurer.configureBean(sb);
- assertTrue("Unexpected value for attribute booleanAttr",
+ assertTrue("Unexpected value for attribute booleanAttr",
!sb.getBooleanAttr());
- assertEquals("Unexpected value for attribute integerAttr",
+ assertEquals("Unexpected value for attribute integerAttr",
BigInteger.TEN, sb.getIntegerAttr());
- assertEquals("Unexpected value for attribute stringAttr",
+ assertEquals("Unexpected value for attribute stringAttr",
"StarHallo", sb.getStringAttr());
}
-
+
@Test
public void testGetBeanName() {
ConfigurerImpl configurer = new ConfigurerImpl();
@@ -216,12 +216,12 @@ public class ConfigurerImplTest extends Assert {
return "b";
}
}
- beanInstance = new NamedBean();
+ beanInstance = new NamedBean();
assertEquals("b", configurer.getBeanName(beanInstance));
beanInstance = this;
assertNull(configurer.getBeanName(beanInstance));
}
-
+
@Test
public void testAddApplicationContext() {
ConfigurableApplicationContext context1 =
@@ -230,7 +230,7 @@ public class ConfigurerImplTest extends Assert {
configurer.setApplicationContext(context1);
// Just to simulate the OSGi's uninstall command
context1.close();
-
+
ConfigurableApplicationContext context2 =
new ClassPathXmlApplicationContext("/org/apache/cxf/configuration/spring/test-beans.xml");
configurer.addApplicationContext(context2);
@@ -238,11 +238,11 @@ public class ConfigurerImplTest extends Assert {
assertEquals("The Context's size is wrong", 1, contexts.size());
assertTrue("The conetxts' contains a wrong application context", contexts.contains(context2));
}
-
+
class SimpleBean implements Configurable {
-
+
private String beanName;
-
+
private String stringAttr = "hello";
private Boolean booleanAttr = Boolean.TRUE;
private BigInteger integerAttr = BigInteger.ONE;
@@ -259,12 +259,12 @@ public class ConfigurerImplTest extends Assert {
private Long unsignedIntAttr = Long.valueOf(9);
private Integer unsignedShortAttr = Integer.valueOf(10);
private Short unsignedByteAttr = Short.valueOf((short)11);
-
-
+
+
SimpleBean(String bn) {
beanName = bn;
}
-
+
public String getBeanName() {
return beanName;
}
@@ -399,14 +399,14 @@ public class ConfigurerImplTest extends Assert {
public void setBeanName(String beanName) {
this.beanName = beanName;
- }
+ }
}
-
+
class ChildBean extends SimpleBean {
ChildBean(String bn) {
super(bn);
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
index 2be4854..273e715 100644
--- a/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
+++ b/core/src/test/java/org/apache/cxf/continuations/SuspendedInvocationExceptionTest.java
@@ -25,25 +25,25 @@ import org.junit.Test;
public class SuspendedInvocationExceptionTest extends Assert {
-
+
@Test
public void testValidRuntimeException() {
-
+
Throwable t = new UncheckedException(new Throwable());
SuspendedInvocationException ex = new SuspendedInvocationException(t);
-
+
assertSame(t, ex.getRuntimeException());
assertSame(t, ex.getCause());
-
+
}
-
+
@Test
public void testNoRuntimeException() {
-
+
SuspendedInvocationException ex = new SuspendedInvocationException(
new Throwable());
-
+
assertNull(ex.getRuntimeException());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
index 0eaeb7b..61f797f 100644
--- a/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/AbstractDataBindingTest.java
@@ -26,7 +26,7 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
*/
public class AbstractDataBindingTest extends Assert {
@Test(expected = IllegalArgumentException.class)
@@ -36,7 +36,7 @@ public class AbstractDataBindingTest extends Assert {
testMap.put("urn:high.temperature", "ht");
AbstractDataBinding.checkNamespaceMap(testMap);
}
-
+
@Test
public void testNamespaceMapOK() {
Map<String, String> testMap = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
index 942d2e8..6210a06 100755
--- a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
@@ -34,36 +34,36 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
*/
public class XMLStreamDataReaderTest extends Assert {
private static final byte[] DUMMY_DATA = "<ns:dummy xmlns:ns='http://www.apache.org/cxf'/>".getBytes();
-
+
@Test
public void testCloseOriginalInputStream() throws Exception {
XMLStreamDataReader reader = new XMLStreamDataReader();
Message msg = new MessageImpl();
-
+
TestInputStream in1 = new TestInputStream(DUMMY_DATA);
-
+
msg.setContent(InputStream.class, in1);
-
+
reader.setProperty(Message.class.getName(), msg);
-
- Object obj = reader.read(new QName("http://www.apache.org/cxf", "dummy"),
+
+ Object obj = reader.read(new QName("http://www.apache.org/cxf", "dummy"),
StaxUtils.createXMLStreamReader(in1), XMLStreamReader.class);
assertTrue(obj instanceof XMLStreamReader);
-
+
assertFalse(in1.isClosed());
((XMLStreamReader)obj).close();
-
+
assertTrue(in1.isClosed());
}
-
+
private static class TestInputStream extends ByteArrayInputStream {
private boolean closed;
-
+
TestInputStream(byte[] buf) {
super(buf);
}
@@ -73,7 +73,7 @@ public class XMLStreamDataReaderTest extends Assert {
closed = true;
super.close();
}
-
+
public boolean isClosed() {
return closed;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java b/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java
index 3e4079a..1c44ab8 100644
--- a/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java
+++ b/core/src/test/java/org/apache/cxf/endpoint/DummyServer.java
@@ -24,7 +24,7 @@ import org.apache.cxf.transport.MessageObserver;
public class DummyServer implements Server {
private ServerRegistryImpl serverRegistry;
-
+
public DummyServer(ServerRegistryImpl sri) {
serverRegistry = sri;
}
@@ -40,18 +40,18 @@ public class DummyServer implements Server {
}
public void start() {
- serverRegistry.register(this);
+ serverRegistry.register(this);
}
public void stop() {
serverRegistry.unregister(this);
-
+
}
-
+
public void destroy() {
stop();
}
-
+
public MessageObserver getMessageObserver() {
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
index e68596f..2824457 100755
--- a/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
+++ b/core/src/test/java/org/apache/cxf/endpoint/EndpointImplTest.java
@@ -29,10 +29,10 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
*/
public class EndpointImplTest extends Assert {
-
+
@Test
public void testEqualsAndHashCode() throws Exception {
Bus bus = new ExtensionManagerBus();
@@ -41,26 +41,26 @@ public class EndpointImplTest extends Assert {
ei.setAddress("http://nowhere.com/bar/foo");
EndpointInfo ei2 = new EndpointInfo();
ei2.setAddress("http://nowhere.com/foo/bar");
-
+
Endpoint ep = new EndpointImpl(bus, svc, ei);
Endpoint ep1 = new EndpointImpl(bus, svc, ei);
Endpoint ep2 = new EndpointImpl(bus, svc, ei2);
-
+
int hashcode = ep.hashCode();
int hashcode1 = ep1.hashCode();
int hashcode2 = ep2.hashCode();
-
+
assertTrue("hashcodes must be equal", hashcode == hashcode1);
assertTrue("hashcodes must not be equal", hashcode != hashcode2);
assertTrue("reflexivity violated", ep.equals(ep));
assertFalse("two objects must not be equal", ep.equals(ep1));
assertFalse("two objects must not be equal", ep.equals(ep2));
-
+
ep.put("custom", Boolean.TRUE);
-
+
assertTrue("hashcode must remain equal", hashcode == ep.hashCode());
}
-
+
//TODO add other tests
}
[11/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
index 5fbff73..1f0768c 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestUtil.java
@@ -44,22 +44,22 @@ public final class TestUtil {
public static XopType createXopObject(Class<?> clazz)
throws IOException, URISyntaxException {
-
+
XopType xopObj = new XopType();
- xopObj.setName("hello world");
-
+ xopObj.setName("hello world");
+
URL url1 = clazz.getResource("my.wav");
-
+
xopObj.setAttachinfo(new DataHandler(url1));
-
- return xopObj;
+
+ return xopObj;
}
-
+
public static SoapMessage createSoapMessage(SoapVersion soapVersion,
InterceptorChain chain, Class<?> clazz)
- throws IOException {
-
- SoapMessage soapMessage = createEmptySoapMessage(soapVersion, chain);
+ throws IOException {
+
+ SoapMessage soapMessage = createEmptySoapMessage(soapVersion, chain);
// setup the message result with attachment.class
ByteArrayDataSource bads = new ByteArrayDataSource(clazz.getResourceAsStream("primarySoapPart.xml"),
"Application/xop+xml");
@@ -83,7 +83,7 @@ public final class TestUtil {
return soapMessage;
}
-
+
public static SoapMessage createEmptySoapMessage(SoapVersion soapVersion, InterceptorChain chain) {
Exchange exchange = new ExchangeImpl();
MessageImpl messageImpl = new MessageImpl();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java
index 81be8a1..34fd9bc 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/XopType.java
@@ -28,9 +28,9 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for XopType complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* <complexType name="XopType">
* <complexContent>
@@ -43,8 +43,8 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "XopType", propOrder = {"name", "attachinfo" })
@@ -58,11 +58,11 @@ public class XopType {
/**
* Gets the value of the name property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getName() {
return name;
@@ -70,11 +70,11 @@ public class XopType {
/**
* Sets the value of the name property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setName(String value) {
this.name = value;
@@ -82,11 +82,11 @@ public class XopType {
/**
* Gets the value of the attachinfo property.
- *
+ *
* @return
* possible object is
* {@link DataHandler }
- *
+ *
*/
public DataHandler getAttachinfo() {
return attachinfo;
@@ -94,11 +94,11 @@ public class XopType {
/**
* Sets the value of the attachinfo property.
- *
+ *
* @param value
* allowed object is
* {@link DataHandler }
- *
+ *
*/
public void setAttachinfo(DataHandler value) {
this.attachinfo = value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
index 80f6f41..d5c6d94 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPHandlerTest.java
@@ -23,13 +23,13 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
*/
public class SoapBindingBPHandlerTest extends Assert {
@Test
public void testGetSchemaLocation() {
SoapBindingBPHandler handler = new SoapBindingBPHandler();
-
+
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/blueprint/bindings/soap"));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
index e2fd16c..4544a79 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptorTest.java
@@ -34,10 +34,10 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class ReadHeadersInterceptorTest extends Assert {
- private static final byte[] TEST_SOAP =
+ private static final byte[] TEST_SOAP =
("<soap:Envelope xmlns:soap='http://schemas.xmlsoap.org/soap/envelope/'"
+ " xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'"
+ " xmlns:xs='http://www.w3.org/2001/XMLSchema' xmlns:bar='tmp:bar'>"
@@ -45,9 +45,9 @@ public class ReadHeadersInterceptorTest extends Assert {
+ "<ns2:payload xmlns:ns2='urn:tmp:foo'/>"
+ "</soap:Body>"
+ "</soap:Envelope>").getBytes();
-
+
private ReadHeadersInterceptor interceptor;
-
+
@Before
public void setUp() {
interceptor = new ReadHeadersInterceptor(null);
@@ -57,7 +57,7 @@ public class ReadHeadersInterceptorTest extends Assert {
public void testNotAddNSContext() throws Exception {
SoapMessage message = setUpMessage();
interceptor.handleMessage(message);
- Map<String, String> nsc = CastUtils.cast((Map<?, ?>)message.get("soap.body.ns.context"));
+ Map<String, String> nsc = CastUtils.cast((Map<?, ?>)message.get("soap.body.ns.context"));
assertNull(nsc);
}
@@ -71,7 +71,7 @@ public class ReadHeadersInterceptorTest extends Assert {
assertEquals("http://www.w3.org/2001/XMLSchema-instance", nsc.get("xsi"));
assertEquals("http://www.w3.org/2001/XMLSchema", nsc.get("xs"));
assertEquals("tmp:bar", nsc.get("bar"));
-
+
}
private SoapMessage setUpMessage() throws Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
index 206b752..62068cc 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptorTest.java
@@ -38,7 +38,7 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class SoapActionInInterceptorTest extends Assert {
private IMocksControl control;
@@ -50,7 +50,7 @@ public class SoapActionInInterceptorTest extends Assert {
@Test
public void testGetSoapActionForSOAP11() throws Exception {
- SoapMessage message = setUpMessage("text/xml", Soap11.getInstance(), "urn:cxf");
+ SoapMessage message = setUpMessage("text/xml", Soap11.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -59,7 +59,7 @@ public class SoapActionInInterceptorTest extends Assert {
@Test
public void testGetSoapActionForSOAP11None() throws Exception {
- SoapMessage message = setUpMessage("text/xml", Soap11.getInstance(), null);
+ SoapMessage message = setUpMessage("text/xml", Soap11.getInstance(), null);
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertNull(action);
@@ -86,7 +86,7 @@ public class SoapActionInInterceptorTest extends Assert {
@Test
public void testGetSoapActionForSOAP11SwA() throws Exception {
- SoapMessage message = setUpMessage("multipart/related", Soap11.getInstance(), "urn:cxf");
+ SoapMessage message = setUpMessage("multipart/related", Soap11.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -99,7 +99,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP12SwAWithStartInfo() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related; start-info=\"application/soap+xml; action=\\\"urn:cxf\\\"",
- Soap12.getInstance(), null);
+ Soap12.getInstance(), null);
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -113,7 +113,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP12SwAWithAction() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related; start-info=\"application/soap+xml\"; action=\"urn:cxf\"",
- Soap12.getInstance(), null);
+ Soap12.getInstance(), null);
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -126,7 +126,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP12SwAWithActionInPartHeaders() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related",
- Soap12.getInstance(), "urn:cxf");
+ Soap12.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -138,7 +138,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP12SwANone() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related",
- Soap12.getInstance(), null);
+ Soap12.getInstance(), null);
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertNull(action);
@@ -149,7 +149,7 @@ public class SoapActionInInterceptorTest extends Assert {
public void testGetSoapActionForSOAP11MTOM() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related; type=\"application/xop+xml\"; start-info=\"text/xml\"",
- Soap11.getInstance(), "urn:cxf");
+ Soap11.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -157,14 +157,14 @@ public class SoapActionInInterceptorTest extends Assert {
}
@Test
- // some systems use this form, although this is not spec-conformant as
+ // some systems use this form, although this is not spec-conformant as
// the action property is not part of the multipart/related media type.
// here the action propety is set as in start-info="application/soap+xml"; action="urn:cxf"
public void testGetSoapActionForSOAP12MTOMWithAction() throws Exception {
SoapMessage message = setUpMessage(
"multipart/related; type=\"application/xop+xml\""
+ "; start-info=\"application/soap+xml\"; action=\"urn:cxf\"",
- Soap11.getInstance(), "urn:cxf");
+ Soap11.getInstance(), "urn:cxf");
control.replay();
String action = SoapActionInInterceptor.getSoapAction(message);
assertEquals("urn:cxf", action);
@@ -178,7 +178,7 @@ public class SoapActionInInterceptorTest extends Assert {
if (version instanceof Soap11 && prop != null) {
headers.put("SOAPAction", Collections.singletonList(prop));
} else if (version instanceof Soap12 && prop != null) {
- partHeaders.put(Message.CONTENT_TYPE,
+ partHeaders.put(Message.CONTENT_TYPE,
Collections.singletonList("application/soap+xml; action=\"" + prop + "\""));
}
EasyMock.expect(message.getVersion()).andReturn(version).anyTimes();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
index 4304c1c..98cbc2b 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapFaultSerializerTest.java
@@ -72,7 +72,7 @@ public class SoapFaultSerializerTest extends Assert {
+ " from document:\n" + StaxUtils.toString(doc));
}
}
-
+
@Test
public void testSoap11Out() throws Exception {
String faultString = "Hadrian caused this Fault!";
@@ -112,18 +112,18 @@ public class SoapFaultSerializerTest extends Assert {
assertEquals(fault.getMessage(), fault2.getMessage());
assertEquals(Soap11.getInstance().getSender(), fault2.getFaultCode());
}
-
+
@Test
public void testSoap12Out() throws Exception {
String faultString = "Hadrian caused this Fault!";
SoapFault fault = new SoapFault(faultString, Soap12.getInstance().getSender());
-
+
QName qname = new QName("http://cxf.apache.org/soap/fault", "invalidsoap", "cxffaultcode");
fault.setSubCode(qname);
SoapMessage m = new SoapMessage(new MessageImpl());
m.setVersion(Soap12.getInstance());
-
+
m.setContent(Exception.class, fault);
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -140,15 +140,15 @@ public class SoapFaultSerializerTest extends Assert {
writer.close();
Document faultDoc = StaxUtils.read(new ByteArrayInputStream(out.toByteArray()));
-
- assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
+
+ assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Subcode/"
- + "soap12env:Value[text()='ns2:invalidsoap']",
+ + "soap12env:Value[text()='ns2:invalidsoap']",
faultDoc);
- assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
+ assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
faultDoc);
- assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[text()='" + faultString + "']",
+ assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[text()='" + faultString + "']",
faultDoc);
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(out.toByteArray()));
@@ -162,21 +162,21 @@ public class SoapFaultSerializerTest extends Assert {
SoapFault fault2 = (SoapFault)m.getContent(Exception.class);
assertNotNull(fault2);
assertEquals(Soap12.getInstance().getSender(), fault2.getFaultCode());
- assertEquals(fault.getMessage(), fault2.getMessage());
+ assertEquals(fault.getMessage(), fault2.getMessage());
assertEquals(fault.getSubCode(), fault2.getSubCode());
}
-
+
@Test
public void testSoap12WithMultipleSubCodesOut() throws Exception {
String faultString = "Hadrian caused this Fault!";
SoapFault fault = new SoapFault(faultString, Soap12.getInstance().getSender());
-
+
fault.addSubCode(new QName("http://cxf.apache.org/soap/fault", "invalidsoap", "cxffaultcode"));
fault.addSubCode(new QName("http://cxf.apache.org/soap/fault2", "invalidsoap2", "cxffaultcode2"));
SoapMessage m = new SoapMessage(new MessageImpl());
m.setVersion(Soap12.getInstance());
-
+
m.setContent(Exception.class, fault);
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -193,18 +193,18 @@ public class SoapFaultSerializerTest extends Assert {
writer.close();
Document faultDoc = StaxUtils.read(new ByteArrayInputStream(out.toByteArray()));
-
- assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
+
+ assertValid("//soap12env:Fault/soap12env:Code/soap12env:Value[text()='ns1:Sender']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Subcode/"
- + "soap12env:Value[text()='ns2:invalidsoap']",
+ + "soap12env:Value[text()='ns2:invalidsoap']",
faultDoc);
assertValid("//soap12env:Fault/soap12env:Code/soap12env:Subcode/soap12env:Subcode/"
- + "soap12env:Value[text()='ns2:invalidsoap2']",
+ + "soap12env:Value[text()='ns2:invalidsoap2']",
faultDoc);
- assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
+ assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[@xml:lang='en']",
faultDoc);
- assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[text()='" + faultString + "']",
+ assertValid("//soap12env:Fault/soap12env:Reason/soap12env:Text[text()='" + faultString + "']",
faultDoc);
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(out.toByteArray()));
@@ -218,7 +218,7 @@ public class SoapFaultSerializerTest extends Assert {
SoapFault fault2 = (SoapFault)m.getContent(Exception.class);
assertNotNull(fault2);
assertEquals(Soap12.getInstance().getSender(), fault2.getFaultCode());
- assertEquals(fault.getMessage(), fault2.getMessage());
+ assertEquals(fault.getMessage(), fault2.getMessage());
assertEquals(fault.getSubCodes(), fault2.getSubCodes());
}
@Test
@@ -227,24 +227,24 @@ public class SoapFaultSerializerTest extends Assert {
Fault fault = new Fault(ex, Fault.FAULT_CODE_CLIENT);
verifyFaultToSoapFault(fault, null, true, Soap11.getInstance());
verifyFaultToSoapFault(fault, null, true, Soap12.getInstance());
-
+
fault = new Fault(ex, Fault.FAULT_CODE_SERVER);
verifyFaultToSoapFault(fault, null, false, Soap11.getInstance());
verifyFaultToSoapFault(fault, null, false, Soap12.getInstance());
-
+
fault.setMessage("fault-one");
verifyFaultToSoapFault(fault, "fault-one", false, Soap11.getInstance());
ex = new Exception("fault-two");
fault = new Fault(ex, Fault.FAULT_CODE_CLIENT);
verifyFaultToSoapFault(fault, "fault-two", true, Soap11.getInstance());
-
+
fault = new Fault(ex, new QName("http://cxf.apache.org", "myFaultCode"));
SoapFault f = verifyFaultToSoapFault(fault, "fault-two", false, Soap12.getInstance());
assertEquals("myFaultCode", f.getSubCodes().get(0).getLocalPart());
}
-
+
private SoapFault verifyFaultToSoapFault(Fault fault, String msg, boolean sender, SoapVersion v) {
SoapFault sf = SoapFault.createFault(fault, v);
assertEquals(sender ? v.getSender() : v.getReceiver(), sf.getFaultCode());
@@ -256,7 +256,7 @@ public class SoapFaultSerializerTest extends Assert {
public void testCXF1864() throws Exception {
SoapMessage m = new SoapMessage(new MessageImpl());
- m.setVersion(Soap12.getInstance());
+ m.setVersion(Soap12.getInstance());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(this.getClass()
@@ -278,7 +278,7 @@ public class SoapFaultSerializerTest extends Assert {
//Try WITH SAAJ
SoapMessage m = new SoapMessage(new MessageImpl());
m.put(Message.HTTP_REQUEST_METHOD, "POST");
- m.setVersion(Soap12.getInstance());
+ m.setVersion(Soap12.getInstance());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(this.getClass()
.getResourceAsStream("cxf4181.xml"));
@@ -291,23 +291,23 @@ public class SoapFaultSerializerTest extends Assert {
new Soap12FaultInInterceptor().handleMessage(m);
Node nd = m.getContent(Node.class);
-
+
SOAPPart part = (SOAPPart)nd;
assertEquals("S", part.getEnvelope().getPrefix());
assertEquals("S2", part.getEnvelope().getHeader().getPrefix());
assertEquals("S3", part.getEnvelope().getBody().getPrefix());
SOAPFault fault = part.getEnvelope().getBody().getFault();
assertEquals("S", fault.getPrefix());
-
+
assertEquals("Authentication Failure", fault.getFaultString());
-
+
SoapFault fault2 = (SoapFault)m.getContent(Exception.class);
assertNotNull(fault2);
-
+
assertEquals(Soap12.getInstance().getSender(), fault2.getFaultCode());
- assertEquals(new QName("http://schemas.xmlsoap.org/ws/2005/02/trust", "FailedAuthentication"),
+ assertEquals(new QName("http://schemas.xmlsoap.org/ws/2005/02/trust", "FailedAuthentication"),
fault2.getSubCode());
-
+
Element el = part.getEnvelope().getBody();
nd = el.getFirstChild();
int count = 0;
@@ -318,11 +318,11 @@ public class SoapFaultSerializerTest extends Assert {
nd = nd.getNextSibling();
}
assertEquals(1, count);
-
-
+
+
//Try WITHOUT SAAJ
m = new SoapMessage(new MessageImpl());
- m.setVersion(Soap12.getInstance());
+ m.setVersion(Soap12.getInstance());
reader = StaxUtils.createXMLStreamReader(this.getClass()
.getResourceAsStream("cxf4181.xml"));
@@ -339,16 +339,16 @@ public class SoapFaultSerializerTest extends Assert {
assertNotNull(fault2);
assertEquals(Soap12.getInstance().getSender(), fault2.getFaultCode());
- assertEquals(new QName("http://schemas.xmlsoap.org/ws/2005/02/trust", "FailedAuthentication"),
+ assertEquals(new QName("http://schemas.xmlsoap.org/ws/2005/02/trust", "FailedAuthentication"),
fault2.getSubCode());
}
-
-
+
+
@Test
public void testCXF5493() throws Exception {
SoapMessage m = new SoapMessage(new MessageImpl());
- m.setVersion(Soap11.getInstance());
+ m.setVersion(Soap11.getInstance());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(this.getClass()
@@ -365,12 +365,12 @@ public class SoapFaultSerializerTest extends Assert {
assertNotNull(fault2);
assertEquals(Soap11.getInstance().getReceiver(), fault2.getFaultCode());
assertEquals("some text containing a xml tag <xml-tag>", fault2.getMessage());
-
-
-
+
+
+
m = new SoapMessage(new MessageImpl());
m.put(Message.HTTP_REQUEST_METHOD, "POST");
- m.setVersion(Soap11.getInstance());
+ m.setVersion(Soap11.getInstance());
reader = StaxUtils.createXMLStreamReader(this.getClass().getResourceAsStream("cxf5493.xml"));
m.setContent(XMLStreamReader.class, reader);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
index ce1ff61..77e9762 100755
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptorTest.java
@@ -45,12 +45,12 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class SoapPreProtocolOutInterceptorTest extends Assert {
private IMocksControl control;
private SoapPreProtocolOutInterceptor interceptor;
-
+
@Before
public void setUp() {
control = EasyMock.createNiceControl();
@@ -63,7 +63,7 @@ public class SoapPreProtocolOutInterceptorTest extends Assert {
interceptor.handleMessage(message);
control.verify();
- Map<String, List<String>> reqHeaders
+ Map<String, List<String>> reqHeaders
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
List<String> soapaction = reqHeaders.get("soapaction");
@@ -72,7 +72,7 @@ public class SoapPreProtocolOutInterceptorTest extends Assert {
}
private SoapMessage setUpMessage() throws Exception {
-
+
SoapMessage message = new SoapMessage(new MessageImpl());
Exchange exchange = new ExchangeImpl();
BindingOperationInfo bop = setUpBindingOperationInfo("http://foo/bar",
@@ -85,25 +85,25 @@ public class SoapPreProtocolOutInterceptorTest extends Assert {
exchange.put(BindingOperationInfo.class, bop);
message.setExchange(exchange);
message.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
-
+
control.replay();
return message;
}
-
- private BindingOperationInfo setUpBindingOperationInfo(String nsuri,
+
+ private BindingOperationInfo setUpBindingOperationInfo(String nsuri,
String opreq,
String opresp,
Method method) {
ServiceInfo si = new ServiceInfo();
- InterfaceInfo iinf = new InterfaceInfo(si,
+ InterfaceInfo iinf = new InterfaceInfo(si,
new QName(nsuri, method.getDeclaringClass().getSimpleName()));
OperationInfo opInfo = iinf.addOperation(new QName(nsuri, method.getName()));
opInfo.setProperty(Method.class.getName(), method);
opInfo.setInput(opreq, opInfo.createMessage(new QName(nsuri, opreq), Type.INPUT));
opInfo.setOutput(opresp, opInfo.createMessage(new QName(nsuri, opresp), Type.INPUT));
-
+
BindingOperationInfo bindingOpInfo = new BindingOperationInfo(null, opInfo);
-
+
return bindingOpInfo;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
index 4751f4e..811402c 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactoryTest.java
@@ -33,18 +33,18 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ *
*/
public class SoapFaultFactoryTest extends Assert {
private IMocksControl control;
private JMSFault jmsFault;
-
+
@Before
public void setUp() {
- control = EasyMock.createNiceControl();
+ control = EasyMock.createNiceControl();
}
-
+
JMSFault setupJMSFault(boolean isSender, QName code, Object detail, boolean isSoap12) {
jmsFault = control.createMock(JMSFault.class);
EasyMock.expect(jmsFault.getReason()).andReturn("reason");
@@ -59,28 +59,28 @@ public class SoapFaultFactoryTest extends Assert {
}
return jmsFault;
}
-
- @Test
+
+ @Test
public void createSoap11Fault() {
SoapBinding sb = control.createMock(SoapBinding.class);
- EasyMock.expect(sb.getSoapVersion()).andReturn(Soap11.getInstance());
+ EasyMock.expect(sb.getSoapVersion()).andReturn(Soap11.getInstance());
setupJMSFault(true, SoapJMSConstants.getContentTypeMismatchQName(), null, false);
control.replay();
-
+
SoapFaultFactory factory = new SoapFaultFactory(sb);
SoapFault fault = (SoapFault)factory.createFault(jmsFault);
assertEquals("reason", fault.getReason());
assertEquals(SoapJMSConstants.getContentTypeMismatchQName(), fault.getFaultCode());
assertNull(fault.getDetail());
assertSame(jmsFault, fault.getCause());
- control.verify();
+ control.verify();
}
-
- @Test
+
+ @Test
public void createSoap12Fault() {
SoapBinding sb = control.createMock(SoapBinding.class);
- EasyMock.expect(sb.getSoapVersion()).andReturn(Soap12.getInstance());
- setupJMSFault(true, SoapJMSConstants.getMismatchedSoapActionQName(), null, true);
+ EasyMock.expect(sb.getSoapVersion()).andReturn(Soap12.getInstance());
+ setupJMSFault(true, SoapJMSConstants.getMismatchedSoapActionQName(), null, true);
control.replay();
SoapFaultFactory factory = new SoapFaultFactory(sb);
SoapFault fault = (SoapFault)factory.createFault(jmsFault);
@@ -89,6 +89,6 @@ public class SoapFaultFactoryTest extends Assert {
assertEquals(SoapJMSConstants.getMismatchedSoapActionQName(), fault.getSubCode());
assertNull(fault.getDetail());
assertNull(fault.getCause());
- control.verify();
+ control.verify();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
index afff3b9..a41239e 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/ParseBodyTest.java
@@ -61,11 +61,11 @@ public class ParseBodyTest extends Assert {
//System.out.println("Original[" + n + "]: " + data);
xmlReader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(data.getBytes("utf-8")));
-
- //reader should be on the start element for the
+
+ //reader should be on the start element for the
assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.next());
assertEquals("Body", xmlReader.getLocalName());
-
+
factory = MessageFactory.newInstance();
soapMessage = factory.createMessage();
}
@@ -84,16 +84,16 @@ public class ParseBodyTest extends Assert {
public void testUsingStaxUtilsCopyWithSAAJWriterData2() throws Exception {
testUsingStaxUtilsCopyWithSAAJWriter(2);
}
-
+
@Test
public void testReadSOAPFault() throws Exception {
InputStream inStream = getClass().getResourceAsStream("soap12-fault.xml");
Document doc = StaxUtils.read(inStream);
-
+
SoapMessage msg = new SoapMessage(new MessageImpl());
Exchange ex = new ExchangeImpl();
ex.setInMessage(msg);
-
+
SOAPMessage saajMsg = MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL).createMessage();
SOAPPart part = saajMsg.getSOAPPart();
SAAJStreamWriter writer = new SAAJStreamWriter(part);
@@ -101,14 +101,14 @@ public class ParseBodyTest extends Assert {
//Source s = new StaxSource(StaxUtils.createXMLStreamReader(doc));
//part.setContent(s);
saajMsg.saveChanges();
-
+
msg.setContent(SOAPMessage.class, saajMsg);
doc = part;
-
+
// System.out.println("OUTPUT: " + StaxUtils.toString(doc));
-
+
byte[] docbytes = getMessageBytes(doc);
-
+
// System.out.println("OUTPUT: " + new String(docbytes));
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new ByteArrayInputStream(docbytes));
@@ -139,7 +139,7 @@ public class ParseBodyTest extends Assert {
//System.out.println("UsingStaxUtilsCopyWithSAAJWriter: " + result);
assertEquals(DATA[n], result);
}
-
+
private byte[] getMessageBytes(Document doc) throws Exception {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
index f6d5150..d3d3d72 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptorTest.java
@@ -66,7 +66,7 @@ public class SAAJInInterceptorTest extends TestBase {
saajIntc = new SAAJInInterceptor("phase2");
chain.add(saajIntc);
-
+
chain.add(new CheckFaultInterceptor("phase3"));
}
@@ -91,7 +91,7 @@ public class SAAJInInterceptorTest extends TestBase {
List<Header> eleHeaders = soapMessage.getHeaders();
List<Element> headerChilds = new ArrayList<>();
Iterator<Header> iter = eleHeaders.iterator();
-
+
while (iter.hasNext()) {
Header hdr = iter.next();
@@ -99,10 +99,10 @@ public class SAAJInInterceptorTest extends TestBase {
headerChilds.add((Element) hdr.getObject());
}
}
-
+
assertEquals(2, headerChilds.size());
}
-
+
@Test
public void testFaultDetail() throws Exception {
try {
@@ -120,7 +120,7 @@ public class SAAJInInterceptorTest extends TestBase {
XMLStreamReader xmlReader = soapMessage.getContent(XMLStreamReader.class);
xmlReader.nextTag();
saajIntc.handleMessage(soapMessage);
-
+
SOAPMessage parsedMessage = soapMessage.getContent(SOAPMessage.class);
SOAPFault fault = parsedMessage.getSOAPBody().getFault();
assertEquals("soap:Server", fault.getFaultCode());
@@ -135,7 +135,7 @@ public class SAAJInInterceptorTest extends TestBase {
nd = nd.getNextSibling();
}
assertEquals(2, count);
-
+
Iterator<?> detailEntries = faultDetail.getDetailEntries();
DetailEntry detailEntry = (DetailEntry)detailEntries.next();
assertEquals("errorcode", detailEntry.getLocalName());
@@ -143,9 +143,9 @@ public class SAAJInInterceptorTest extends TestBase {
detailEntry = (DetailEntry)detailEntries.next();
assertEquals("errorstring", detailEntry.getLocalName());
assertEquals("This is a fault detail error string", detailEntry.getTextContent());
-
+
}
-
+
@Test
public void testFaultDetailSOAP12() throws Exception {
try {
@@ -163,14 +163,14 @@ public class SAAJInInterceptorTest extends TestBase {
XMLStreamReader xmlReader = soapMessage.getContent(XMLStreamReader.class);
xmlReader.nextTag();
saajIntc.handleMessage(soapMessage);
-
+
SOAPMessage parsedMessage = soapMessage.getContent(SOAPMessage.class);
SOAPFault fault = parsedMessage.getSOAPBody().getFault();
assertEquals("Simulated failure", fault.getFaultReasonTexts().next());
assertEquals("soap:Receiver", fault.getFaultCode());
-
+
}
-
+
private void prepareSoapMessage(String message) throws IOException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java
index 938c245..3cceb15 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptorTest.java
@@ -59,12 +59,12 @@ public class SAAJOutInterceptorTest extends TestBase {
public void testHandleHeader() throws Exception {
soapMessage = TestUtil.createEmptySoapMessage(Soap11.getInstance(), chain);
soapMessage.setContent(OutputStream.class, new ByteArrayOutputStream());
-
+
SOAPMessage m = SAAJFactoryResolver.createMessageFactory(soapMessage.getVersion()).createMessage();
InputStream ins = getClass().getResourceAsStream("../test-soap-header.xml");
m.getSOAPPart().setContent(new StreamSource(ins));
-
+
Element el = DOMUtils.getFirstElement(m.getSOAPPart().getEnvelope().getHeader());
List<Header> h = soapMessage.getHeaders();
while (el != null) {
@@ -75,6 +75,6 @@ public class SAAJOutInterceptorTest extends TestBase {
W3CDOMStreamWriter writer = new SAAJStreamWriter(m.getSOAPPart());
soapMessage.setContent(XMLStreamWriter.class, writer);
soi.handleMessage(soapMessage);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java
index d72df3c..10f44ec 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBinding.java
@@ -27,9 +27,9 @@ import org.apache.cxf.message.XMLMessage;
import org.apache.cxf.service.model.BindingInfo;
public class XMLBinding extends AbstractBasicInterceptorProvider implements Binding {
-
+
private BindingInfo bindingInfo;
-
+
public XMLBinding(BindingInfo bindingInfo) {
super();
this.bindingInfo = bindingInfo;
@@ -45,10 +45,10 @@ public class XMLBinding extends AbstractBasicInterceptorProvider implements Bind
public Message createMessage(Message m) {
if (!m.containsKey(Message.CONTENT_TYPE)) {
-
+
String ct = null;
-
- // Should this be done in ServiceInvokerInterceptor to support a case where the
+
+ // Should this be done in ServiceInvokerInterceptor to support a case where the
// response content type is detected early on the inbound chain for all the bindings ?
Exchange exchange = m.getExchange();
if (exchange != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
index 99db9c2..4b1f554 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLBindingFactory.java
@@ -46,51 +46,51 @@ import org.apache.cxf.wsdl.interceptors.WrappedOutInterceptor;
@NoJSR250Annotations(unlessNull = { "bus" })
public class XMLBindingFactory extends AbstractBindingFactory {
- public static final Collection<String> DEFAULT_NAMESPACES
+ public static final Collection<String> DEFAULT_NAMESPACES
= Arrays.asList(
"http://cxf.apache.org/bindings/xformat",
"http://www.w3.org/2004/08/wsdl/http",
"http://schemas.xmlsoap.org/wsdl/http/");
-
+
public XMLBindingFactory() {
}
public XMLBindingFactory(Bus b) {
super(b, DEFAULT_NAMESPACES);
}
-
+
public Binding createBinding(BindingInfo binding) {
XMLBinding xb = new XMLBinding(binding);
-
- xb.getInInterceptors().add(new AttachmentInInterceptor());
+
+ xb.getInInterceptors().add(new AttachmentInInterceptor());
xb.getInInterceptors().add(new StaxInInterceptor());
xb.getInInterceptors().add(new DocLiteralInInterceptor());
xb.getInInterceptors().add(new XMLMessageInInterceptor());
-
+
xb.getOutInterceptors().add(new AttachmentOutInterceptor());
xb.getOutInterceptors().add(new StaxOutInterceptor());
xb.getOutInterceptors().add(new WrappedOutInterceptor());
- xb.getOutInterceptors().add(new XMLMessageOutInterceptor());
+ xb.getOutInterceptors().add(new XMLMessageOutInterceptor());
xb.getInFaultInterceptors().add(new XMLFaultInInterceptor());
xb.getOutFaultInterceptors().add(new StaxOutInterceptor());
xb.getOutFaultInterceptors().add(new XMLFaultOutInterceptor());
-
+
return xb;
- }
-
+ }
+
public BindingInfo createBindingInfo(ServiceInfo service, String namespace, Object config) {
- BindingInfo info = new BindingInfo(service, "http://cxf.apache.org/bindings/xformat");
- info.setName(new QName(service.getName().getNamespaceURI(),
+ BindingInfo info = new BindingInfo(service, "http://cxf.apache.org/bindings/xformat");
+ info.setName(new QName(service.getName().getNamespaceURI(),
service.getName().getLocalPart() + "XMLBinding"));
for (OperationInfo op : service.getInterface().getOperations()) {
adjustConcreteNames(op.getInput());
adjustConcreteNames(op.getOutput());
- BindingOperationInfo bop =
+ BindingOperationInfo bop =
info.buildOperation(op.getName(), op.getInputName(), op.getOutputName());
info.addOperation(bop);
}
-
+
return info;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java
index bc87255..76c3dd8 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFault.java
@@ -36,19 +36,19 @@ public class XMLFault extends Fault {
public static final String XML_FAULT_CODE_CLIENT = "CLIENT";
-
+
static final long serialVersionUID = 100000;
public XMLFault(Message message, Throwable throwable) {
- super(message, throwable);
+ super(message, throwable);
}
public XMLFault(Message message) {
- super(message);
+ super(message);
}
public XMLFault(String message) {
- super(new Message(message, (ResourceBundle) null));
+ super(new Message(message, (ResourceBundle) null));
}
public static XMLFault createFault(Fault f) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
index 38ad110..d940787 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
@@ -109,7 +109,7 @@ public class XMLFormatValidator extends ServiceValidator {
return true;
}
- private boolean findXMLFormatRootNode(Iterator<XMLBindingMessageFormat> it,
+ private boolean findXMLFormatRootNode(Iterator<XMLBindingMessageFormat> it,
BindingOperationInfo bo,
String errorPath) {
while (it != null && it.hasNext()) {
@@ -119,7 +119,7 @@ public class XMLFormatValidator extends ServiceValidator {
addErrorMessage(errorPath
+ ": empty value of rootNode attribute, the value should be "
+ rootNodeName);
- return false;
+ return false;
}
}
return true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
index 8fce4c9..f991fb3 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultInInterceptor.java
@@ -48,13 +48,13 @@ public class XMLFaultInInterceptor extends AbstractInDatabindingInterceptor {
super(phase);
addBefore(ClientFaultConverter.class.getName());
}
-
+
public void handleMessage(Message message) throws Fault {
XMLStreamReader xsr = message.getContent(XMLStreamReader.class);
DepthXMLStreamReader reader = new DepthXMLStreamReader(xsr);
- try {
+ try {
reader.nextTag();
if (!StaxUtils.toNextElement(reader)) {
throw new Fault(new org.apache.cxf.common.i18n.Message("ILLEGAL_XMLFAULT_FORMAT", BUNDLE));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
index 4b65569..400ee5b 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptor.java
@@ -48,11 +48,11 @@ public class XMLFaultOutInterceptor extends AbstractOutDatabindingInterceptor {
}
public void handleMessage(Message message) throws Fault {
-
+
if (mustPropogateException(message)) {
throw (Fault) message.getContent(Exception.class);
}
-
+
Fault f = (Fault) message.getContent(Exception.class);
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, f.getStatusCode());
NSStack nsStack = new NSStack();
@@ -63,21 +63,21 @@ public class XMLFaultOutInterceptor extends AbstractOutDatabindingInterceptor {
try {
nsStack.add(XMLConstants.NS_XML_FORMAT);
String prefix = nsStack.getPrefix(XMLConstants.NS_XML_FORMAT);
- StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_ROOT,
+ StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_ROOT,
XMLConstants.NS_XML_FORMAT);
- StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_STRING,
+ StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_STRING,
XMLConstants.NS_XML_FORMAT);
Throwable t = xmlFault.getCause();
writer.writeCharacters(t == null ? xmlFault.getMessage() : t.toString());
// fault string
writer.writeEndElement();
// call StaxUtils to write Fault detail.
-
+
if (xmlFault.getDetail() != null) {
Element detail = xmlFault.getDetail();
StaxUtils.writeStartElement(writer, prefix, XMLFault.XML_FAULT_DETAIL,
XMLConstants.NS_XML_FORMAT);
-
+
Node node = detail.getFirstChild();
while (node != null) {
StaxUtils.writeNode(node, writer, false);
@@ -92,14 +92,14 @@ public class XMLFaultOutInterceptor extends AbstractOutDatabindingInterceptor {
throw new Fault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE), xe);
}
}
-
+
@Override
public void handleFault(Message message) throws Fault {
if (mustPropogateException(message)) {
throw (Fault) message.getContent(Exception.class);
}
}
-
+
protected boolean mustPropogateException(Message m) {
return Boolean.TRUE.equals(m.getExchange().get(Message.PROPOGATE_EXCEPTION));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
index 540640c..85b967f 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptor.java
@@ -45,7 +45,7 @@ import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(XMLMessageInInterceptor.class);
-
+
public XMLMessageInInterceptor() {
this(Phase.UNMARSHAL);
}
@@ -104,9 +104,9 @@ public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
}
}
- private BindingOperationInfo getBindingOperationInfo(boolean isRequestor,
- QName startQName,
- BindingInfo bi,
+ private BindingOperationInfo getBindingOperationInfo(boolean isRequestor,
+ QName startQName,
+ BindingInfo bi,
XMLStreamReader xsr) {
for (BindingOperationInfo boi : bi.getOperations()) {
@@ -116,7 +116,7 @@ public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
} else {
bmi = boi.getOutput();
}
-
+
if (hasRootNode(bmi, startQName)) {
//Consume The rootNode tag
try {
@@ -145,7 +145,7 @@ public class XMLMessageInInterceptor extends AbstractInDatabindingInterceptor {
}
return boi;
}
- }
+ }
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
index 8ad08c7..5352684 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptor.java
@@ -68,7 +68,7 @@ public class XMLMessageOutInterceptor extends AbstractOutDatabindingInterceptor
rootInModel = xmf.getRootNode();
}
final int mpn = mi.getMessagePartsNumber();
- if (boi.isUnwrapped()
+ if (boi.isUnwrapped()
|| mpn == 1) {
// wrapper out interceptor created the wrapper
// or if bare-one-param
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
index 2e4e451..8d30118 100644
--- a/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
+++ b/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/XMLWSDLExtensionLoader.java
@@ -28,11 +28,11 @@ import org.apache.cxf.wsdl.WSDLExtensionLoader;
import org.apache.cxf.wsdl.WSDLManager;
/**
- *
+ *
*/
@NoJSR250Annotations
-public final class XMLWSDLExtensionLoader implements WSDLExtensionLoader {
-
+public final class XMLWSDLExtensionLoader implements WSDLExtensionLoader {
+
public XMLWSDLExtensionLoader(Bus b) {
setupBus(b);
}
@@ -40,22 +40,22 @@ public final class XMLWSDLExtensionLoader implements WSDLExtensionLoader {
WSDLManager manager = b.getExtension(WSDLManager.class);
registerExtensors(manager);
}
-
+
public static void registerExtensors(WSDLManager manager) {
createExtensor(manager, javax.wsdl.BindingInput.class,
org.apache.cxf.bindings.xformat.XMLBindingMessageFormat.class);
- createExtensor(manager, javax.wsdl.BindingOutput.class,
+ createExtensor(manager, javax.wsdl.BindingOutput.class,
org.apache.cxf.bindings.xformat.XMLBindingMessageFormat.class);
createExtensor(manager, javax.wsdl.Binding.class,
org.apache.cxf.bindings.xformat.XMLFormatBinding.class);
}
-
+
public static void createExtensor(WSDLManager manager,
Class<?> parentType,
Class<?> elementType) {
try {
JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
- parentType,
+ parentType,
elementType,
null,
XMLWSDLExtensionLoader.class.getClassLoader());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
index 12000cd..b530e87 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/XMLBindingFactoryTest.java
@@ -28,19 +28,19 @@ import org.junit.Assert;
import org.junit.Test;
public class XMLBindingFactoryTest extends Assert {
-
+
@Test
public void testContainsInAttachmentInterceptor() {
XMLBindingFactory xbf = new XMLBindingFactory();
Binding b = xbf.createBinding(new BindingInfo(null, null));
-
+
boolean found = false;
for (Interceptor<? extends Message> interseptor : b.getInInterceptors()) {
if (interseptor instanceof AttachmentInInterceptor) {
found = true;
}
}
-
+
assertTrue("No in attachment interceptor found", found);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
index 9ef4243..fac8011 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/TestBase.java
@@ -62,13 +62,13 @@ public class TestBase extends Assert {
protected PhaseInterceptorChain chain;
protected Message xmlMessage;
-
+
protected Bus bus;
protected IMocksControl control;
-
+
protected ServiceInfo serviceInfo;
-
+
@Before
public void setUp() throws Exception {
SortedSet<Phase> phases = new TreeSet<Phase>();
@@ -112,26 +112,26 @@ public class TestBase extends Assert {
}
return null;
}
-
+
protected void common(String wsdl, QName portName, Class<?>... jaxbClasses) throws Exception {
control = EasyMock.createNiceControl();
-
+
bus = control.createMock(Bus.class);
-
+
WSDLManagerImpl manager = new WSDLManagerImpl();
XMLWSDLExtensionLoader.registerExtensors(manager);
EasyMock.expect(bus.getExtension(WSDLManager.class)).andStubReturn(manager);
-
+
BindingFactoryManager bindingFactoryManager = control.createMock(BindingFactoryManager.class);
EasyMock.expect(bus.getExtension(BindingFactoryManager.class)).andStubReturn(bindingFactoryManager);
DestinationFactoryManager dfm = control.createMock(DestinationFactoryManager.class);
EasyMock.expect(bus.getExtension(DestinationFactoryManager.class)).andStubReturn(dfm);
-
- control.replay();
-
+
+ control.replay();
+
assertNotNull(bus.getExtension(WSDLManager.class));
-
- WSDLServiceFactory factory =
+
+ WSDLServiceFactory factory =
new WSDLServiceFactory(bus, getClass().getResource(wsdl).toString(),
new QName(portName.getNamespaceURI(), "XMLService"));
@@ -153,13 +153,13 @@ public class TestBase extends Assert {
EasyMock.expect(endpoint.getBinding()).andStubReturn(xmlBinding);
EasyMock.expect(endpoint.getService()).andStubReturn(service);
EasyMock.expect(endpoint.isEmpty()).andReturn(true).anyTimes();
-
+
control.replay();
xmlMessage.getExchange().put(Endpoint.class, endpoint);
xmlMessage.getExchange().put(org.apache.cxf.service.Service.class, service);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
index c1c1808..b54e65f 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLFaultOutInterceptorTest.java
@@ -62,33 +62,33 @@ public class XMLFaultOutInterceptorTest extends TestBase {
JAXBContext ctx = JAXBContext.newInstance(FaultDetail.class);
Marshaller m = ctx.createMarshaller();
m.marshal(detail, el);
-
+
OutputStream outputStream = new ByteArrayOutputStream();
xmlMessage.setContent(OutputStream.class, outputStream);
XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(outputStream);
xmlMessage.setContent(XMLStreamWriter.class, writer);
xmlMessage.setContent(Exception.class, xmlFault);
-
+
out.handleMessage(xmlMessage);
outputStream.flush();
XMLStreamReader reader = getXMLReader();
DepthXMLStreamReader dxr = new DepthXMLStreamReader(reader);
-
+
dxr.nextTag();
StaxUtils.toNextElement(dxr);
assertEquals(XMLConstants.NS_XML_FORMAT, dxr.getNamespaceURI());
assertEquals(XMLFault.XML_FAULT_ROOT, dxr.getLocalName());
-
+
dxr.nextTag();
StaxUtils.toNextElement(dxr);
assertEquals(XMLFault.XML_FAULT_STRING, dxr.getLocalName());
assertEquals(fault.toString(), dxr.getElementText());
-
+
dxr.nextTag();
StaxUtils.toNextElement(dxr);
assertEquals(XMLFault.XML_FAULT_DETAIL, dxr.getLocalName());
-
+
dxr.nextTag();
StaxUtils.toNextElement(dxr);
assertEquals("faultDetail", dxr.getLocalName());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
index c7927a7..11e0941 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageInInterceptorTest.java
@@ -51,11 +51,11 @@ public class XMLMessageInInterceptorTest extends TestBase {
prepareMessage("/message-bare-multi-param.xml");
common("/wsdl/hello_world_xml_bare.wsdl", new QName(ns, "XMLPort"),
MyComplexStructType.class);
-
+
OperationInfo op = serviceInfo.getInterface().getOperation(new QName(ns, "testMultiParamPart"));
op.getInput().getMessagePartByIndex(0).setTypeClass(String.class);
op.getInput().getMessagePartByIndex(1).setTypeClass(MyComplexStructType.class);
-
+
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
List<?> list = xmlMessage.getContent(List.class);
@@ -71,10 +71,10 @@ public class XMLMessageInInterceptorTest extends TestBase {
String ns = "http://apache.org/hello_world_xml_http/bare";
prepareMessage("/message-bare-single-param-element.xml");
common("/wsdl/hello_world_xml_bare.wsdl", new QName(ns, "XMLPort"));
-
+
OperationInfo op = serviceInfo.getInterface().getOperation(new QName(ns, "greetMe"));
op.getInput().getMessagePartByIndex(0).setTypeClass(String.class);
-
+
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
List<?> list = xmlMessage.getContent(List.class);
@@ -89,10 +89,10 @@ public class XMLMessageInInterceptorTest extends TestBase {
prepareMessage("/message-wrap.xml");
common("/wsdl/hello_world_xml_wrapped.wsdl", new QName(ns, "XMLPort"),
GreetMe.class);
-
+
OperationInfo op = serviceInfo.getInterface().getOperation(new QName(ns, "greetMe"));
op.getInput().getMessagePartByIndex(0).setTypeClass(GreetMe.class);
-
+
in.handleMessage(xmlMessage);
docLitIn.handleMessage(xmlMessage);
List<?> list = xmlMessage.getContent(List.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
index 3db2888..90d7e9d 100644
--- a/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
+++ b/rt/bindings/xml/src/test/java/org/apache/cxf/binding/xml/interceptor/XMLMessageOutInterceptorTest.java
@@ -74,7 +74,7 @@ public class XMLMessageOutInterceptorTest extends TestBase {
chain.add(out);
prepareMessage(params);
}
-
+
@Test
public void testBareOutSingle() throws Exception {
@@ -97,7 +97,7 @@ public class XMLMessageOutInterceptorTest extends TestBase {
DepthXMLStreamReader dxr = new DepthXMLStreamReader(reader);
StaxUtils.nextEvent(dxr);
StaxUtils.toNextElement(dxr);
-
+
assertEquals(bareMyComplexStructTypeQName.getLocalPart(), dxr.getLocalName());
StaxUtils.toNextElement(dxr);
StaxUtils.toNextText(dxr);
@@ -113,7 +113,7 @@ public class XMLMessageOutInterceptorTest extends TestBase {
myComplexStruct.setElem3(45);
params.add("tli");
params.add(myComplexStruct);
-
+
common("/wsdl/hello_world_xml_bare.wsdl", new QName(bareNs, "XMLPort"),
MyComplexStructType.class);
@@ -132,13 +132,13 @@ public class XMLMessageOutInterceptorTest extends TestBase {
assertEquals("multiParamRootReq", dxr.getLocalName());
StaxUtils.nextEvent(dxr);
StaxUtils.toNextElement(dxr);
-
+
assertEquals(bareRequestTypeQName, dxr.getName());
StaxUtils.nextEvent(dxr);
if (StaxUtils.toNextText(dxr)) {
assertEquals("tli", dxr.getText());
}
-
+
boolean foundRequest = false;
while (true) {
StaxUtils.nextEvent(dxr);
@@ -189,7 +189,7 @@ public class XMLMessageOutInterceptorTest extends TestBase {
private XMLStreamReader getXMLReader() throws Exception {
ByteArrayOutputStream o = (ByteArrayOutputStream) xmlMessage.getContent(OutputStream.class);
- writer.flush();
+ writer.flush();
InputStream in = new ByteArrayInputStream(o.toByteArray());
return StaxUtils.createXMLStreamReader(in);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java b/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
index 8e10a5e..b883175 100644
--- a/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
+++ b/rt/databinding/aegis/src/main/generated/org/apache/cxf/aegis/util/jdom/StaxBuilder.java
@@ -76,7 +76,7 @@ import org.jdom.UncheckedJDOMFactory;
/**
* Builds a JDOM {@link org.jdom.Document org.jdom.Document} using a
* {@link javax.xml.stream.XMLStreamReader}.
- *
+ *
* @author Tatu Saloranta
* @author Bradley S. Huffman
* @author Benson I. Margulies, mods for CXF to allow reading a portion of a stream.
@@ -162,7 +162,7 @@ public class StaxBuilder {
/**
* Returns the current {@link org.jdom.JDOMFactory} in use, if one has been
* previously set with {@link #setFactory}, otherwise null.
- *
+ *
* @return the factory builder will use
*/
public JDOMFactory getFactory() {
@@ -171,7 +171,7 @@ public class StaxBuilder {
/**
* This will build a JDOM tree given a StAX stream reader.
* This API explicitly supports building mid-stream.
- *
+ *
* @param r Stream reader from which input is read.
* @return <code>Document</code> - JDOM document object.
* @throws XMLStreamException If the reader threw such exception (to
@@ -190,7 +190,7 @@ public class StaxBuilder {
return buildInternal(reader);
} finally {
StaxUtils.close(reader);
- }
+ }
}
public Document build(Reader reader) throws XMLStreamException {
@@ -201,13 +201,13 @@ public class StaxBuilder {
return buildInternal(streamReader);
} finally {
StaxUtils.close(streamReader);
- }
+ }
}
-
+
private Document buildInternal(XMLStreamReader r) throws XMLStreamException {
/*
* Should we do sanity checking to see that r is positioned at
- * beginning in the non-mid-stream case?
+ * beginning in the non-mid-stream case?
*/
JDOMFactory f = factory;
if (f == null) {
@@ -223,7 +223,7 @@ public class StaxBuilder {
* Recursion has been eliminated by using local stack of open elements; this
* improves performance somewhat (classic
* recursion-by-iteration-and-explicit stack transformation)
- *
+ *
* @param node <code>Code</node> to examine.
* @param doc JDOM <code>Document</code> being built.
*/
@@ -284,7 +284,7 @@ public class StaxBuilder {
current = current.getParentElement();
}
noadd = true;
- if(isReadingMidStream && current == null)
+ if(isReadingMidStream && current == null)
return;
break;
@@ -306,7 +306,7 @@ public class StaxBuilder {
child = f.processingInstruction(r.getPITarget(), r.getPIData());
break;
- case XMLStreamConstants.START_ELEMENT:
+ case XMLStreamConstants.START_ELEMENT:
{
// Ok, need to add a new element and simulate recursion
Element newElem = null;
@@ -380,7 +380,7 @@ public class StaxBuilder {
}
// And then 'push' new element...
current = newElem;
-
+
// Already added the element, can continue
noadd = true;
break;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java
index d127731..be01567 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AbstractAegisIoImpl.java
@@ -35,13 +35,13 @@ public abstract class AbstractAegisIoImpl {
protected Schema schema;
protected AegisContext aegisContext;
protected Context context;
-
+
protected AbstractAegisIoImpl(AegisContext globalContext) {
aegisContext = globalContext;
context = new Context(globalContext);
properties = new HashMap<String, Object>();
- }
-
+ }
+
/**
* Due to the fact that the element data reader borrows this class, we need
* a constructor that takes an existing context.
@@ -52,11 +52,11 @@ public abstract class AbstractAegisIoImpl {
aegisContext = globalContext;
this.context = context;
properties = new HashMap<String, Object>();
- }
-
+ }
+
/** {@inheritDoc}*/
public void setProperty(String prop, Object value) {
- if (DataReader.FAULT.equals(prop)) {
+ if (DataReader.FAULT.equals(prop)) {
context.setFault((Fault)value);
}
}
@@ -64,7 +64,7 @@ public abstract class AbstractAegisIoImpl {
/** {@inheritDoc}*/
public void setSchema(Schema s) {
}
-
+
public Context getContext() {
return context;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
index 8d640a7..fb4406b 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisContext.java
@@ -130,7 +130,7 @@ public class AegisContext {
/**
* Initialize the context. The encodingStyleURI allows .aegis.xml files to have multiple mappings for,
* say, SOAP 1.1 versus SOAP 1.2. Passing null uses a default URI.
- *
+ *
* @param mappingNamespaceURI URI to select mappings based on the encoding.
*/
public void initialize() {
@@ -140,8 +140,8 @@ public class AegisContext {
}
if (typeMapping == null) {
boolean defaultNillable = configuration.isDefaultNillable();
- TypeMapping baseTM = DefaultTypeMapping.createDefaultTypeMapping(defaultNillable,
- mtomUseXmime,
+ TypeMapping baseTM = DefaultTypeMapping.createDefaultTypeMapping(defaultNillable,
+ mtomUseXmime,
enableJDOMMappings);
if (mappingNamespaceURI == null) {
mappingNamespaceURI = DefaultTypeMapping.DEFAULT_MAPPING_URI;
@@ -172,7 +172,7 @@ public class AegisContext {
/**
* If a class was provided as part of the 'root' list, retrieve it's AegisType by Class.
- *
+ *
* @param clazz
* @return
*/
@@ -186,7 +186,7 @@ public class AegisContext {
/**
* If a class was provided as part of the root list, retrieve it's AegisType by schema type QName.
- *
+ *
* @param schemaTypeName
* @return
*/
@@ -197,7 +197,7 @@ public class AegisContext {
return null;
}
}
-
+
private Set<Class<?>> rootMappableClasses() {
Set<Class<?>> mappableClasses = new HashSet<Class<?>>();
for (java.lang.reflect.Type jtype : rootClasses) {
@@ -228,7 +228,7 @@ public class AegisContext {
/**
* Examine a list of override classes, and register all of them.
- *
+ *
* @param tm type manager for this binding
* @param classes list of class names
*/
@@ -255,7 +255,7 @@ public class AegisContext {
// This is a list of AegisType rather than Class so that it can set up for generic collections.
// When we see a generic, we process both the generic outer class and each parameter class.
// This is not the same thing as allowing mappings of arbitrary x<q> types.
-
+
Set<Class<?>> rootMappableClassSet = rootMappableClasses();
/*
* First loop: process non-Class roots, creating full types for them
@@ -264,16 +264,16 @@ public class AegisContext {
for (java.lang.reflect.Type reflectType : rootClasses) {
if (!(reflectType instanceof Class)) {
// if it's not a Class, it can't be mapped from Class to type in the mapping.
- // so we create
+ // so we create
AegisType aegisType = typeMapping.getTypeCreator().createType(reflectType);
typeMapping.register(aegisType);
- // note: we don't handle arbitrary generics, so no BeanType
+ // note: we don't handle arbitrary generics, so no BeanType
// check here.
rootTypeQNames.add(aegisType.getSchemaType());
- }
+ }
}
/*
- * Second loop: process Class roots, including those derived from
+ * Second loop: process Class roots, including those derived from
* generic types, creating when not in the default mappings.
*/
for (Class<?> c : rootMappableClassSet) {
@@ -294,23 +294,23 @@ public class AegisContext {
public static boolean schemaImportsUtilityTypes(XmlSchema schema) {
return XmlSchemaUtils.schemaImportsNamespace(schema, UTILITY_TYPES_SCHEMA_NS);
}
-
- private Document getSchemaDocument(String resourcePath) {
+
+ private Document getSchemaDocument(String resourcePath) {
try {
return StaxUtils.read(getClass().getResourceAsStream(resourcePath));
} catch (XMLStreamException e) {
throw new RuntimeException(e);
}
}
-
+
// could we make these documents static? What would we synchronize on?
- private Document getAegisTypesSchemaDocument() {
+ private Document getAegisTypesSchemaDocument() {
if (aegisTypesSchemaDocument == null) {
aegisTypesSchemaDocument = getSchemaDocument("/META-INF/cxf/aegisTypes.xsd");
- }
+ }
return aegisTypesSchemaDocument;
}
-
+
private Document getXmimeSchemaDocument() {
if (xmimeSchemaDocument == null) {
xmimeSchemaDocument = getSchemaDocument("/schemas/wsdl/xmime.xsd");
@@ -321,7 +321,7 @@ public class AegisContext {
public XmlSchema addTypesSchemaDocument(XmlSchemaCollection collection) {
return collection.read(getAegisTypesSchemaDocument(), null);
}
-
+
public XmlSchema addXmimeSchemaDocument(XmlSchemaCollection collection) {
return collection.read(getXmimeSchemaDocument(), null);
}
@@ -333,7 +333,7 @@ public class AegisContext {
/**
* Retrieve the set of root class names. Note that if the application specifies the root classes by Class
* instead of by name, this will return null.
- *
+ *
* @return
*/
public Set<String> getRootClassNames() {
@@ -343,7 +343,7 @@ public class AegisContext {
/**
* Set the root class names. This function is a convenience for Spring configuration. It sets the same
* underlying collection as {@link #setRootClasses(Set)}.
- *
+ *
* @param classNames
*/
public void setRootClassNames(Set<String> classNames) {
@@ -352,7 +352,7 @@ public class AegisContext {
/**
* Return the type mapping configuration associated with this context.
- *
+ *
* @return Returns the configuration.
*/
public TypeCreationOptions getTypeCreationOptions() {
@@ -361,7 +361,7 @@ public class AegisContext {
/**
* Set the configuration object. The configuration specifies default type mapping behaviors.
- *
+ *
* @param configuration The configuration to set.
*/
public void setTypeCreationOptions(TypeCreationOptions newConfiguration) {
@@ -378,7 +378,7 @@ public class AegisContext {
/**
* Controls whether Aegis writes xsi:type attributes on all elements. False by default.
- *
+ *
* @param flag
*/
public void setWriteXsiTypes(boolean flag) {
@@ -388,7 +388,7 @@ public class AegisContext {
/**
* Controls the use of xsi:type attributes when reading objects. By default, xsi:type reading is enabled.
* When disabled, Aegis will only map for objects that the application manually maps in the type mapping.
- *
+ *
* @param flag
*/
public void setReadXsiTypes(boolean flag) {
@@ -397,7 +397,7 @@ public class AegisContext {
/**
* Return the type mapping object used by this context.
- *
+ *
* @return
*/
public TypeMapping getTypeMapping() {
@@ -406,7 +406,7 @@ public class AegisContext {
/**
* Set the type mapping object used by this context.
- *
+ *
* @param typeMapping
*/
public void setTypeMapping(TypeMapping typeMapping) {
@@ -415,7 +415,7 @@ public class AegisContext {
/**
* Retrieve the Aegis type objects for the root classes.
- *
+ *
* @return the set of type objects.
*/
public Set<AegisType> getRootTypes() {
@@ -425,7 +425,7 @@ public class AegisContext {
/**
* This property provides support for interfaces. If there is a mapping from an interface's Class<T> to a
* string containing a class name, Aegis will create proxy objects of that class name.
- *
+ *
* @see org.apache.cxf.aegis.type.basic.BeanType
* @return
*/
@@ -443,7 +443,7 @@ public class AegisContext {
/**
* The list of initial classes.
- *
+ *
* @param rootClasses
*/
public void setRootClasses(Set<java.lang.reflect.Type> rootClasses) {
@@ -452,7 +452,7 @@ public class AegisContext {
/**
* Is MTOM enabled in this context?
- *
+ *
* @return
*/
public boolean isMtomEnabled() {
@@ -465,7 +465,7 @@ public class AegisContext {
/**
* Should this service use schema for MTOM types xmime:base64Binary instead of xsd:base64Binary?
- *
+ *
* @return
*/
public boolean isMtomUseXmime() {
@@ -480,7 +480,7 @@ public class AegisContext {
* What URI identifies the type mapping for this context? When the XMLTypeCreator reads .aegis.xml file,
* it will only read mappings for this URI (or no URI). When the abstract type creator is otherwise at a
* loss for a namespace URI, it will use this URI.
- *
+ *
* @return
*/
public String getMappingNamespaceURI() {
@@ -497,9 +497,9 @@ public class AegisContext {
public boolean isEnableJDOMMappings() {
return enableJDOMMappings;
}
-
+
/**
- * Whether to enable JDOM as a mapping for xsd:anyType if JDOM is in the classpath.
+ * Whether to enable JDOM as a mapping for xsd:anyType if JDOM is in the classpath.
* @param enableJDOMMappings
*/
public void setEnableJDOMMappings(boolean enableJDOMMappings) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java
index a3d991f..84ef4a7 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataReader.java
@@ -24,7 +24,7 @@ import org.w3c.dom.Element;
import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.staxutils.W3CDOMStreamReader;
-public class AegisElementDataReader extends AbstractAegisIoImpl
+public class AegisElementDataReader extends AbstractAegisIoImpl
implements AegisReader<Element> {
protected AegisXMLStreamDataReader reader;
@@ -43,7 +43,7 @@ public class AegisElementDataReader extends AbstractAegisIoImpl
sreader.nextTag(); //advance into the first tag
return reader.read(sreader);
}
-
+
public Object read(Element input, AegisType desiredType) throws Exception {
W3CDOMStreamReader sreader = new W3CDOMStreamReader(input);
sreader.nextTag(); //advance into the first tag
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
index cb4c8bd..7f58f00 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisElementDataWriter.java
@@ -26,11 +26,11 @@ import org.apache.cxf.aegis.type.AegisType;
import org.apache.cxf.staxutils.W3CDOMStreamWriter;
/**
- *
+ *
*/
-public class AegisElementDataWriter extends AbstractAegisIoImpl
+public class AegisElementDataWriter extends AbstractAegisIoImpl
implements AegisWriter<Element> {
-
+
protected AegisXMLStreamDataWriter writer;
public AegisElementDataWriter(AegisContext globalContext) {
@@ -48,6 +48,6 @@ public class AegisElementDataWriter extends AbstractAegisIoImpl
java.lang.reflect.Type objectType) throws Exception {
W3CDOMStreamWriter swriter = new W3CDOMStreamWriter(output);
writer.write(obj, elementName, optional, swriter, objectType);
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java
index e8ca99e..978b44a 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisIo.java
@@ -24,10 +24,10 @@ import javax.xml.validation.Schema;
/**
* Aegis abstraction for reading.
- *
+ *
* Note that this interface does not include the 'read' method. Since the caller of a reader has to know
* the type of the source object, the read method is not specified here in the interface, but is provided
- * in the specific type.
+ * in the specific type.
*/
public interface AegisIo {
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java
index a0f7576..47fe5cd 100644
--- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java
+++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/AegisReader.java
@@ -27,7 +27,7 @@ import org.apache.cxf.aegis.type.AegisType;
public interface AegisReader<ReaderT> extends AegisIo {
/**
- * Read an object.
+ * Read an object.
* @param reader the source.
* @return
* @throws Exception
[12/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
index 5fbfd9e..0281908 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
@@ -66,11 +66,11 @@ import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
public class SoapOutInterceptor extends AbstractSoapInterceptor {
public static final String WROTE_ENVELOPE_START = "wrote.envelope.start";
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SoapOutInterceptor.class);
-
+
private Bus bus;
-
+
public SoapOutInterceptor(Bus b) {
super(Phase.WRITE);
bus = b;
@@ -79,13 +79,13 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
super(phase);
bus = b;
}
-
+
public void handleMessage(SoapMessage message) {
// Yes this is ugly, but it avoids us from having to implement any kind of caching strategy
boolean wroteStart = MessageUtils.isTrue(message.get(WROTE_ENVELOPE_START));
if (!wroteStart) {
writeSoapEnvelopeStart(message);
-
+
OutputStream os = message.getContent(OutputStream.class);
// Unless we're caching the whole message in memory skip the envelope writing
// if there's a fault later.
@@ -97,10 +97,10 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
// Add a final interceptor to write end elements
message.getInterceptorChain().add(new SoapOutEndingInterceptor());
}
-
+
private void writeSoapEnvelopeStart(final SoapMessage message) {
final SoapVersion soapVersion = message.getVersion();
- try {
+ try {
XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
String soapPrefix = xtw.getPrefix(soapVersion.getNamespace());
if (StringUtils.isEmpty(soapPrefix)) {
@@ -114,7 +114,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
}
}
xtw.setPrefix(soapPrefix, soapVersion.getNamespace());
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getEnvelope().getLocalPart(),
soapVersion.getNamespace());
xtw.writeNamespace(soapPrefix, soapVersion.getNamespace());
@@ -122,10 +122,10 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
if (!soapVersion.getNamespace().equals(entry.getValue())) {
xtw.writeNamespace(entry.getKey(), entry.getValue());
}
- }
+ }
} else {
xtw.setPrefix(soapPrefix, soapVersion.getNamespace());
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getEnvelope().getLocalPart(),
soapVersion.getNamespace());
String s2 = xtw.getPrefix(soapVersion.getNamespace());
@@ -138,9 +138,9 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
boolean preexistingHeaders = message.hasHeaders();
if (preexistingHeaders) {
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getHeader().getLocalPart(),
- soapVersion.getNamespace());
+ soapVersion.getNamespace());
List<Header> hdrList = message.getHeaders();
for (Header header : hdrList) {
XMLStreamWriter writer = xtw;
@@ -179,17 +179,17 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
xtw.writeEndElement();
}
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getBody().getLocalPart(),
soapVersion.getNamespace());
-
+
// Interceptors followed such as Wrapped/RPC/Doc Interceptor will write SOAP body
} catch (XMLStreamException e) {
throw new SoapFault(
new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE), e, soapVersion.getSender());
}
}
-
+
private boolean handleHeaderPart(boolean preexistingHeaders, SoapMessage message, String soapPrefix) {
//add MessagePart to soapHeader if necessary
boolean endedHeader = false;
@@ -198,8 +198,8 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
if (bop == null) {
return endedHeader;
}
-
- XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
+
+ XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
boolean startedHeader = false;
BindingOperationInfo unwrappedOp = bop;
if (bop.isUnwrapped()) {
@@ -208,11 +208,11 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
boolean client = isRequestor(message);
BindingMessageInfo bmi = client ? unwrappedOp.getInput() : unwrappedOp.getOutput();
BindingMessageInfo wrappedBmi = client ? bop.getInput() : bop.getOutput();
-
+
if (bmi == null) {
return endedHeader;
}
-
+
if (wrappedBmi.getMessageInfo().getMessagePartsNumber() > 0) {
MessageContentsList objs = MessageContentsList.getContentsList(message);
if (objs == null) {
@@ -222,8 +222,8 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
List<SoapHeaderInfo> headers = bmi.getExtensors(SoapHeaderInfo.class);
if (headers == null) {
return endedHeader;
- }
-
+ }
+
for (SoapHeaderInfo header : headers) {
MessagePartInfo part = header.getPart();
@@ -241,11 +241,11 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
objs.remove(part);
if (!(startedHeader || preexistingHeaders)) {
try {
- xtw.writeStartElement(soapPrefix,
+ xtw.writeStartElement(soapPrefix,
soapVersion.getHeader().getLocalPart(),
soapVersion.getNamespace());
} catch (XMLStreamException e) {
- throw new SoapFault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE),
+ throw new SoapFault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE),
e, soapVersion.getSender());
}
startedHeader = true;
@@ -253,20 +253,20 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
DataWriter<XMLStreamWriter> dataWriter = getDataWriter(message);
dataWriter.write(arg, header.getPart(), xtw);
}
-
+
if (startedHeader || preexistingHeaders) {
try {
xtw.writeEndElement();
endedHeader = true;
} catch (XMLStreamException e) {
- throw new SoapFault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE),
+ throw new SoapFault(new org.apache.cxf.common.i18n.Message("XML_WRITE_EXC", BUNDLE),
e, soapVersion.getSender());
}
}
}
return endedHeader;
- }
-
+ }
+
protected DataWriter<XMLStreamWriter> getDataWriter(Message message) {
Service service = ServiceModelUtil.getService(message.getExchange());
DataWriter<XMLStreamWriter> dataWriter = service.getDataBinding().createWriter(XMLStreamWriter.class);
@@ -285,7 +285,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
writer.setSchema(schema);
}
}
-
+
public class SoapOutEndingInterceptor extends AbstractSoapInterceptor {
public SoapOutEndingInterceptor() {
super(SoapOutEndingInterceptor.class.getName(), Phase.WRITE_ENDING);
@@ -296,16 +296,16 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
XMLStreamWriter xtw = message.getContent(XMLStreamWriter.class);
if (xtw != null) {
// Write body end
- xtw.writeEndElement();
+ xtw.writeEndElement();
// Write Envelope end element
xtw.writeEndElement();
xtw.writeEndDocument();
-
+
xtw.flush();
}
} catch (XMLStreamException e) {
if (e.getCause() instanceof EOFException) {
- //Nothing we can do about this, some clients will close the connection early if
+ //Nothing we can do about this, some clients will close the connection early if
//they fully parse everything they need
} else {
SoapVersion soapVersion = message.getVersion();
@@ -315,14 +315,14 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
}
}
}
-
+
public static class SOAPHeaderWriter extends DelegatingXMLStreamWriter {
final SoapHeader soapHeader;
final SoapVersion soapVersion;
final String soapPrefix;
boolean firstDone;
-
-
+
+
public SOAPHeaderWriter(XMLStreamWriter writer,
SoapHeader header,
SoapVersion version,
@@ -332,7 +332,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
soapVersion = version;
soapPrefix = pfx;
}
-
+
public void writeAttribute(String prefix, String uri, String local, String value)
throws XMLStreamException {
if (soapVersion.getNamespace().equals(uri)
@@ -350,7 +350,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
}
super.writeAttribute(uri, local, value);
}
-
+
private void writeSoapAttributes() throws XMLStreamException {
if (!firstDone) {
firstDone = true;
@@ -362,11 +362,11 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
}
boolean mu = soapHeader.isMustUnderstand();
if (mu) {
- String mul = soapVersion.getAttrValueMustUnderstand(mu);
+ String mul = soapVersion.getAttrValueMustUnderstand(mu);
super.writeAttribute(soapPrefix,
soapVersion.getNamespace(),
soapVersion.getAttrNameMustUnderstand(),
- mul);
+ mul);
}
}
}
@@ -384,7 +384,7 @@ public class SoapOutInterceptor extends AbstractSoapInterceptor {
super.writeStartElement(arg0);
writeSoapAttributes();
}
-
-
+
+
};
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
index 62946ca..a5bb91e 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapPreProtocolOutInterceptor.java
@@ -52,7 +52,7 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
/**
* Mediate a message dispatch.
- *
+ *
* @param message the current message
* @throws Fault
*/
@@ -64,10 +64,10 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
}
}
-
+
/**
* Ensure the SOAP version is set for this message.
- *
+ *
* @param message the current message
*/
private void ensureVersion(SoapMessage message) {
@@ -77,18 +77,18 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
soapVersion = ((SoapMessage)message.getExchange().getInMessage()).getVersion();
message.setVersion(soapVersion);
}
-
+
if (soapVersion == null) {
soapVersion = Soap11.getInstance();
message.setVersion(soapVersion);
}
-
+
message.put(Message.CONTENT_TYPE, soapVersion.getContentType());
}
-
+
/**
* Ensure the SOAP header is set for this message.
- *
+ *
* @param message the current message
*/
private void ensureMimeHeaders(SoapMessage message) {
@@ -96,32 +96,32 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
message.put(MIME_HEADERS, new HashMap<String, List<String>>());
}
}
-
+
private void setSoapAction(SoapMessage message) {
BindingOperationInfo boi = message.getExchange().getBindingOperationInfo();
-
+
// The soap action is set on the wrapped operation.
if (boi != null && boi.isUnwrapped()) {
boi = boi.getWrappedOperation();
}
-
+
String action = getSoapAction(message, boi);
-
+
if (message.getVersion() instanceof Soap11) {
- Map<String, List<String>> reqHeaders
+ Map<String, List<String>> reqHeaders
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (reqHeaders == null) {
reqHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
}
-
+
if (reqHeaders.size() == 0) {
message.put(Message.PROTOCOL_HEADERS, reqHeaders);
}
-
+
reqHeaders.put(SoapBindingConstants.SOAP_ACTION, Collections.singletonList(action));
} else if (message.getVersion() instanceof Soap12 && !"\"\"".equals(action)) {
String ct = (String) message.get(Message.CONTENT_TYPE);
-
+
if (ct.indexOf("action=\"") == -1) {
ct = new StringBuilder().append(ct)
.append("; action=").append(action).toString();
@@ -133,7 +133,7 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
private String getSoapAction(SoapMessage message, BindingOperationInfo boi) {
// allow an interceptor to override the SOAPAction if need be
String action = (String) message.get(SoapBindingConstants.SOAP_ACTION);
-
+
// Fall back on the SOAPAction in the operation info
if (action == null) {
if (boi == null) {
@@ -143,11 +143,11 @@ public class SoapPreProtocolOutInterceptor extends AbstractSoapInterceptor {
action = soi == null ? "\"\"" : soi.getAction() == null ? "\"\"" : soi.getAction();
}
}
-
+
if (!action.startsWith("\"")) {
action = new StringBuilder().append("\"").append(action).append("\"").toString();
}
-
+
return action;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
index 60f0b7b..346c5e7 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/StartBodyInterceptor.java
@@ -32,15 +32,15 @@ import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
public class StartBodyInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(StartBodyInterceptor.class);
-
+
public StartBodyInterceptor() {
super(Phase.READ);
}
-
+
public StartBodyInterceptor(String phase) {
super(phase);
}
@@ -52,8 +52,8 @@ public class StartBodyInterceptor extends AbstractSoapInterceptor {
return;
}
XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
- //advance to just outside the <soap:body> opening tag, but not
- //to the nextTag as that may skip over white space that is
+ //advance to just outside the <soap:body> opening tag, but not
+ //to the nextTag as that may skip over white space that is
//important to keep for ws-security signature digests and stuff
try {
int i = xmlReader.next();
@@ -62,7 +62,7 @@ public class StartBodyInterceptor extends AbstractSoapInterceptor {
i = xmlReader.next();
}
} catch (XMLStreamException e) {
- throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
+ throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
message.getVersion().getSender());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
index 15d1adf..ef4378c 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/TibcoSoapActionInterceptor.java
@@ -29,7 +29,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
/**
- * Tibco Business Works uses SoapAction instead of the standard spelling SOAPAction.
+ * Tibco Business Works uses SoapAction instead of the standard spelling SOAPAction.
* So this interceptor adds a SoapAction header if SOAPAction is set in protocol header
*/
public class TibcoSoapActionInterceptor extends AbstractPhaseInterceptor<SoapMessage> {
@@ -45,7 +45,7 @@ public class TibcoSoapActionInterceptor extends AbstractPhaseInterceptor<SoapMes
Map<String, Object> headers = (Map<String, Object>)soapMessage.get(Message.PROTOCOL_HEADERS);
if (headers != null && headers.containsKey(SoapBindingConstants.SOAP_ACTION)) {
//need to flip to a case sensitive map. The default
- //is a case insensitive map, but in this case, we need
+ //is a case insensitive map, but in this case, we need
//to use a case sensitive map to make sure both versions go out
headers = new TreeMap<String, Object>(headers);
soapMessage.put(Message.PROTOCOL_HEADERS, headers);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java
index 09743f7..fb16c17 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFault.java
@@ -22,7 +22,7 @@ package org.apache.cxf.binding.soap.jms.interceptor;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
public class JMSFault extends Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
index 7bfe163..e5701f3 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultFactory.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
import org.apache.cxf.common.logging.LogUtils;
/**
- *
+ *
*/
public final class JMSFaultFactory {
@@ -50,7 +50,7 @@ public final class JMSFaultFactory {
}).toString();
return createFault(SoapJMSConstants.getContentTypeMismatchQName(), m);
}
-
+
public static JMSFault createMalformedRequestURIFault(String requestURI) {
String m = new org.apache.cxf.common.i18n.Message("MALFORMED_REQUESTURI", LOG,
new Object[] {
@@ -76,7 +76,7 @@ public final class JMSFaultFactory {
String m = new org.apache.cxf.common.i18n.Message("MISSING_SOAPACTION", LOG).toString();
return createFault(SoapJMSConstants.getMissingSoapActionQName(), m);
}
-
+
public static JMSFault createMissingRequestURIFault() {
String m = new org.apache.cxf.common.i18n.Message("MISSING_REQUESTURI", LOG).toString();
return createFault(SoapJMSConstants.getMissingRequestURIQName(), m);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java
index 7b7c7be..0dc92cd 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/JMSFaultType.java
@@ -40,7 +40,7 @@ public class JMSFaultType {
/**
* Gets the value of the faultCode property.
- *
+ *
* @return possible object is {@link QName }
*/
public QName getFaultCode() {
@@ -49,7 +49,7 @@ public class JMSFaultType {
/**
* Sets the value of the faultCode property.
- *
+ *
* @param value allowed object is {@link QName }
*/
public void setFaultCode(QName value) {
@@ -68,7 +68,7 @@ public class JMSFaultType {
* <CODE>set</CODE> method for the any property.
* <p>
* For example, to add a new item, do as follows:
- *
+ *
* <pre>
* getAny().add(newItem);
* </pre>
@@ -96,7 +96,7 @@ public class JMSFaultType {
* the map is keyed by the name of the attribute and the value is the string value of the attribute. the
* map returned by this method is live, and you can add new attribute by updating the map directly.
* Because of this design, there's no setter.
- *
+ *
* @return always non-null
*/
public Map<QName, String> getOtherAttributes() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
index 61046ea..1d8c774 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
@@ -32,34 +32,34 @@ import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.interceptor.Fault;
/**
- *
+ *
*/
public class SoapFaultFactory {
-
+
private SoapVersion version;
-
+
public SoapFaultFactory(Binding binding) {
version = ((SoapBinding)binding).getSoapVersion();
}
-
+
public Fault createFault(JMSFault jmsFault) {
Fault f = null;
if (version == Soap11.getInstance()) {
f = createSoap11Fault(jmsFault);
- // so we can encode the SequenceFault as header
+ // so we can encode the SequenceFault as header
f.initCause(jmsFault);
} else {
f = createSoap12Fault(jmsFault);
}
return f;
}
-
+
Fault createSoap11Fault(JMSFault jmsFault) {
SoapFault fault = new SoapFault(jmsFault.getReason(),
jmsFault.getSubCode());
return fault;
}
-
+
Fault createSoap12Fault(JMSFault jmsFault) {
SoapFault fault = new SoapFault(jmsFault.getReason(),
jmsFault.isSender() ? version.getSender() : version.getReceiver());
@@ -72,7 +72,7 @@ public class SoapFaultFactory {
setDetail(fault, detail);
return fault;
}
-
+
void setDetail(SoapFault fault, Object detail) {
Element el = null;
if (detail instanceof Element) {
@@ -84,10 +84,10 @@ public class SoapFaultFactory {
fault.setDetail(el);
}
}
-
+
public String toString(Fault f) {
return f.toString();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
index aefba15..7d2be87 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSConstants.java
@@ -22,7 +22,7 @@ package org.apache.cxf.binding.soap.jms.interceptor;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
public final class SoapJMSConstants {
@@ -30,7 +30,7 @@ public final class SoapJMSConstants {
public static final String JMS_MESSAGE_TYPE = "JMSMessageType";
public static final String TARGET_SERVICE_IN_REQUESTURI = "target.service.inrequesturi";
public static final String MALFORMED_REQUESTURI = "malformed.requesturi";
-
+
// JMS Message properties' names.
public static final String REQUESTURI_PARAMETER_NAME = "requestURI";
public static final String BINDINGVERSION_PARAMETER_NAME = "bindingVersion";
@@ -39,7 +39,7 @@ public final class SoapJMSConstants {
public static final String CONTENTTYPE_PARAMETER_NAME = "contentType";
public static final String CONTENTENCODING_PARAMETER_NAME = "contentEncoding";
public static final String ISFAULT_PARAMETER_NAME = "isFault";
-
+
// JMS Field name
public static final String REQUESTURI_FIELD = SOAP_JMS_PREFIX + REQUESTURI_PARAMETER_NAME;
public static final String BINDINGVERSION_FIELD = SOAP_JMS_PREFIX
@@ -52,7 +52,7 @@ public final class SoapJMSConstants {
public static final String SOAP_JMS_SPECIFICIATION_TRANSPORTID = "http://www.w3.org/2010/soapjms/";
public static final String SOAP_JMS_NAMESPACE = SOAP_JMS_SPECIFICIATION_TRANSPORTID;
-
+
// fault codes
private static final String JMS_CONTENTTYPEMISMATCH_FAULT_CODE = "contentTypeMismatch";
private static final String JMS_CONTENTENCODINGNOTSUPPORTED_FAULT_CODE = "contentEncodingNotSupported";
@@ -61,18 +61,18 @@ public final class SoapJMSConstants {
private static final String JMS_MISSINGCONTENTTYPE_FAULT_CODE = "missingContentType";
private static final String JMS_MISSINGSOAPACTION_FAULT_CODE = "missingSoapAction";
private static final String JMS_MISSINGREQUESTURI_FAULT_CODE = "missingRequestURI";
- private static final String JMS_TARGETSERVICENOTALLOWEDINREQUESTURI_FAULT_CODE =
+ private static final String JMS_TARGETSERVICENOTALLOWEDINREQUESTURI_FAULT_CODE =
"targetServiceNotAllowedInRequestURI";
private static final String JMS_UNRECOGNIZEDBINDINGVERSION_FAULT_CODE = "unrecognizedBindingVersion";
private static final String JMS_UNSUPPORTEDJMSMESSAGEFORMAT_FAULT_CODE = "unsupportedJMSMessageFormat";
private SoapJMSConstants() {
}
-
+
public static QName getContentTypeMismatchQName() {
return new QName(SOAP_JMS_NAMESPACE, JMS_CONTENTTYPEMISMATCH_FAULT_CODE);
}
-
+
public static QName getContentEncodingNotSupportedQName() {
return new QName(SOAP_JMS_NAMESPACE, JMS_CONTENTENCODINGNOTSUPPORTED_FAULT_CODE);
}
@@ -92,7 +92,7 @@ public final class SoapJMSConstants {
public static QName getMissingSoapActionQName() {
return new QName(SOAP_JMS_NAMESPACE, JMS_MISSINGSOAPACTION_FAULT_CODE);
}
-
+
public static QName getMissingRequestURIQName() {
return new QName(SOAP_JMS_NAMESPACE, JMS_MISSINGREQUESTURI_FAULT_CODE);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
index 33c4d42..840e6ab 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapJMSInInterceptor.java
@@ -33,7 +33,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
@@ -67,7 +67,7 @@ public class SoapJMSInInterceptor extends AbstractSoapInterceptor {
if (!"gzip".equals(contentEncoding)) {
jmsFault = JMSFaultFactory.createContentEncodingNotSupported(contentEncoding);
}
- }
+ }
if (jmsFault != null) {
Fault f = createFault(message, jmsFault);
if (f != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
index d98a5eff..84ce8a7 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBindingInfo.java
@@ -35,7 +35,7 @@ public class SoapBindingInfo extends BindingInfo {
private String style;
private String transportURI;
-
+
public SoapBindingInfo(ServiceInfo serv, String n) {
this(serv, n, null);
resolveSoapVersion(n);
@@ -96,7 +96,7 @@ public class SoapBindingInfo extends BindingInfo {
/**
* Get the soap action for an operation. Will never return null.
- *
+ *
* @param operation
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
index 8a54c0c..a30a412 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapBodyInfo.java
@@ -28,7 +28,7 @@ public class SoapBodyInfo {
private List <MessagePartInfo> parts = new ArrayList<>();
private List <MessagePartInfo> attachments = new ArrayList<>();
private String use;
-
+
public List<MessagePartInfo> getParts() {
return parts;
}
@@ -52,5 +52,5 @@ public class SoapBodyInfo {
public void setAttachments(List<MessagePartInfo> attachments) {
this.attachments = attachments;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java
index 5a9cadd..55701dc 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapHeaderInfo.java
@@ -22,12 +22,12 @@ package org.apache.cxf.binding.soap.model;
import org.apache.cxf.service.model.MessagePartInfo;
public class SoapHeaderInfo {
-
+
private MessagePartInfo part;
private String use;
-
+
public SoapHeaderInfo() {
-
+
}
public MessagePartInfo getPart() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java
index 229b62c..1e22690 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/model/SoapOperationInfo.java
@@ -27,15 +27,15 @@ public class SoapOperationInfo {
public String getAction() {
return action;
}
-
+
public void setAction(String action) {
this.action = action;
}
-
+
public String getStyle() {
return style;
}
-
+
public void setStyle(String style) {
this.style = style;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java
index 21d6f92..0b7d818 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJFactoryResolver.java
@@ -30,13 +30,13 @@ import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.common.util.SystemPropertyAction;
/**
- *
+ *
*/
public final class SAAJFactoryResolver {
- public static final String MESSAGE_FACTORY_KEY
+ public static final String MESSAGE_FACTORY_KEY
= "org.apache.cxf.binding.soap.messageFactoryClassName";
- public static final String SOAP_FACTORY_KEY
+ public static final String SOAP_FACTORY_KEY
= "org.apache.cxf.binding.soap.soapFactoryClassName";
private SAAJFactoryResolver() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
index 516bf89..1747063 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJInInterceptor.java
@@ -81,12 +81,12 @@ import org.apache.cxf.staxutils.W3CDOMStreamWriter;
@NoJSR250Annotations
public class SAAJInInterceptor extends AbstractSoapInterceptor {
public static final SAAJInInterceptor INSTANCE = new SAAJInInterceptor();
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SAAJInInterceptor.class);
private static final String BODY_FILLED_IN = SAAJInInterceptor.class.getName() + ".BODY_DONE";
private SAAJPreInInterceptor preInterceptor = SAAJPreInInterceptor.INSTANCE;
- private List<PhaseInterceptor<? extends Message>> extras
+ private List<PhaseInterceptor<? extends Message>> extras
= new ArrayList<PhaseInterceptor<? extends Message>>(1);
public SAAJInInterceptor() {
super(Phase.PRE_PROTOCOL);
@@ -95,7 +95,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
public SAAJInInterceptor(String phase) {
super(phase);
}
-
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return extras;
}
@@ -107,10 +107,10 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
*/
public static class SAAJPreInInterceptor extends AbstractSoapInterceptor {
public static final SAAJPreInInterceptor INSTANCE = new SAAJPreInInterceptor();
-
+
private MessageFactory factory11;
private MessageFactory factory12;
-
+
public SAAJPreInInterceptor() {
super(Phase.READ);
addBefore(ReadHeadersInterceptor.class.getName());
@@ -134,7 +134,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
MessageFactory factory = getFactory(message);
SOAPMessage soapMessage = factory.createMessage();
message.setContent(SOAPMessage.class, soapMessage);
-
+
SOAPPart part = soapMessage.getSOAPPart();
message.setContent(Node.class, part);
message.put(W3CDOMStreamWriter.class, new SAAJStreamWriter(part));
@@ -148,9 +148,9 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
}
public synchronized MessageFactory getFactory(SoapMessage message) throws SOAPException {
if (message.getVersion() instanceof Soap11) {
- if (factory11 == null) {
+ if (factory11 == null) {
factory11 = SAAJFactoryResolver.createMessageFactory(message.getVersion());
- }
+ }
return factory11;
}
if (message.getVersion() instanceof Soap12) {
@@ -162,9 +162,9 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
return SAAJFactoryResolver.createMessageFactory(null);
}
}
-
-
-
+
+
+
@SuppressWarnings("unchecked")
public void handleMessage(SoapMessage message) throws Fault {
if (isGET(message)) {
@@ -228,7 +228,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
soapMessage.addAttachmentPart(ap);
}
}
-
+
//replace header element if necessary
if (message.hasHeaders()) {
replaceHeaders(soapMessage, message);
@@ -237,21 +237,21 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
if (soapMessage.getSOAPPart().getEnvelope().getHeader() == null) {
soapMessage.getSOAPPart().getEnvelope().addHeader();
}
-
+
//If we have an xmlReader that already is counting the attributes and such
//then we don't want to rely on the system level defaults in StaxUtils.copy
//CXF-6173
boolean secureReader = StaxUtils.isSecureReader(xmlReader, message);
- StaxUtils.copy(xmlReader,
- new SAAJStreamWriter(soapMessage.getSOAPPart(),
+ StaxUtils.copy(xmlReader,
+ new SAAJStreamWriter(soapMessage.getSOAPPart(),
soapMessage.getSOAPPart().getEnvelope().getBody()),
- true,
+ true,
!secureReader);
DOMSource bodySource = new DOMSource(soapMessage.getSOAPPart().getEnvelope().getBody());
xmlReader = StaxUtils.createXMLStreamReader(bodySource);
xmlReader.nextTag();
xmlReader.nextTag(); // move past body tag
- message.setContent(XMLStreamReader.class, xmlReader);
+ message.setContent(XMLStreamReader.class, xmlReader);
} catch (SOAPException soape) {
throw new SoapFault(new org.apache.cxf.common.i18n.Message(
"SOAPHANDLERINTERCEPTOR_EXCEPTION", BUNDLE), soape,
@@ -262,7 +262,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
.getVersion().getSender());
}
}
-
+
private static void adjustPrefixes(SOAPEnvelope env, String envPrefix, String bodyPrefix) throws SOAPException {
SAAJUtils.adjustPrefix(env, envPrefix);
SAAJUtils.adjustPrefix(env.getBody(), bodyPrefix);
@@ -293,7 +293,7 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
if (b != null && b.getExtension(HeaderManager.class) != null) {
p = b.getExtension(HeaderManager.class).getHeaderProcessor(elem.getNamespaceURI());
}
-
+
Object obj;
DataBinding dataBinding = null;
if (p == null || p.getDataBinding() == null) {
@@ -303,27 +303,27 @@ public class SAAJInInterceptor extends AbstractSoapInterceptor {
obj = p.getDataBinding().createReader(Node.class).read(elem);
}
//TODO - add the interceptors
-
+
SoapHeader shead = new SoapHeader(new QName(elem.getNamespaceURI(),
elem.getLocalName()),
obj,
dataBinding);
shead.setDirection(SoapHeader.Direction.DIRECTION_IN);
-
+
String mu = elem.getAttributeNS(message.getVersion().getNamespace(),
message.getVersion().getAttrNameMustUnderstand());
String act = elem.getAttributeNS(message.getVersion().getNamespace(),
message.getVersion().getAttrNameRole());
-
+
shead.setActor(act);
shead.setMustUnderstand(Boolean.valueOf(mu) || "1".equals(mu));
Header oldHdr = message.getHeader(
new QName(elem.getNamespaceURI(), elem.getLocalName()));
if (oldHdr != null) {
message.getHeaders().remove(oldHdr);
- }
- message.getHeaders().add(shead);
-
+ }
+ message.getHeaders().add(shead);
+
elem = DOMUtils.getNextElement(elem);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
index a6c47c6..7328832 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
@@ -70,22 +70,22 @@ import org.apache.cxf.staxutils.W3CDOMStreamWriter;
*/
@NoJSR250Annotations
public class SAAJOutInterceptor extends AbstractSoapInterceptor {
- public static final String ORIGINAL_XML_WRITER
+ public static final String ORIGINAL_XML_WRITER
= SAAJOutInterceptor.class.getName() + ".original.xml.writer";
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(SAAJOutInterceptor.class);
-
+
private MessageFactory factory11;
private MessageFactory factory12;
-
+
public SAAJOutInterceptor() {
super(Phase.PRE_PROTOCOL);
}
public synchronized MessageFactory getFactory(SoapMessage message) throws SOAPException {
if (message.getVersion() instanceof Soap11) {
- if (factory11 == null) {
+ if (factory11 == null) {
factory11 = SAAJFactoryResolver.createMessageFactory(message.getVersion());
- }
+ }
return factory11;
}
if (message.getVersion() instanceof Soap12) {
@@ -99,23 +99,23 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
public void handleMessage(SoapMessage message) throws Fault {
SOAPMessage saaj = message.getContent(SOAPMessage.class);
- try {
+ try {
if (message.hasHeaders()
- && saaj != null
+ && saaj != null
&& saaj.getSOAPPart().getEnvelope().getHeader() == null) {
// creating an empty SOAPHeader at this point in the
- // pre-existing SOAPMessage avoids the <soap:body> and
+ // pre-existing SOAPMessage avoids the <soap:body> and
// <soap:header> appearing in reverse order when the envolope
// is written to the wire
//
saaj.getSOAPPart().getEnvelope().addHeader();
}
} catch (SOAPException e) {
- throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE, e.getMessage()),
+ throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE, e.getMessage()),
e,
message.getVersion().getSender());
- }
+ }
if (saaj == null) {
SoapVersion version = message.getVersion();
@@ -134,26 +134,26 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
message.setContent(XMLStreamWriter.class, writer);
message.setContent(SOAPMessage.class, soapMessage);
message.setContent(Node.class, soapMessage.getSOAPPart());
-
-
+
+
} catch (SOAPException e) {
throw new SoapFault(new Message("SOAPEXCEPTION", BUNDLE, e.getMessage()), e, version.getSender());
}
} else if (!message.containsKey(ORIGINAL_XML_WRITER)) {
//as the SOAPMessage already has everything in place, we do not need XMLStreamWriter to write
- //anything for us, so we just set XMLStreamWriter's output to a dummy output stream.
+ //anything for us, so we just set XMLStreamWriter's output to a dummy output stream.
XMLStreamWriter origWriter = message.getContent(XMLStreamWriter.class);
message.put(ORIGINAL_XML_WRITER, origWriter);
-
+
XMLStreamWriter dummyWriter = StaxUtils.createXMLStreamWriter(new OutputStream() {
public void write(int b) throws IOException {
}
public void write(byte b[], int off, int len) throws IOException {
- }
+ }
});
message.setContent(XMLStreamWriter.class, dummyWriter);
}
-
+
// Add a final interceptor to write the message
message.getInterceptorChain().add(SAAJOutEndingInterceptor.INSTANCE);
}
@@ -170,17 +170,17 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
}
}
-
+
public static class SAAJOutEndingInterceptor extends AbstractSoapInterceptor {
public static final SAAJOutEndingInterceptor INSTANCE = new SAAJOutEndingInterceptor();
-
+
public SAAJOutEndingInterceptor() {
super(SAAJOutEndingInterceptor.class.getName(), Phase.PRE_PROTOCOL_ENDING);
}
public void handleMessage(SoapMessage message) throws Fault {
SOAPMessage soapMessage = message.getContent(SOAPMessage.class);
-
+
if (soapMessage != null) {
if (soapMessage.countAttachments() > 0) {
if (message.getAttachments() == null) {
@@ -205,7 +205,7 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
message.getAttachments().add(att);
}
}
-
+
XMLStreamWriter writer = (XMLStreamWriter)message.get(ORIGINAL_XML_WRITER);
message.remove(ORIGINAL_XML_WRITER);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index 8c13b1e..177653b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -45,8 +45,8 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
private final SOAPPart part;
private final SOAPEnvelope envelope;
private String uri;
-
-
+
+
public SAAJStreamWriter(SOAPPart part) {
super(part);
this.part = part;
@@ -73,7 +73,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
this.envelope = env;
isOverlaid = false;
}
-
+
@Override
public String getPrefix(String nsuri) throws XMLStreamException {
if (isOverlaid && part != null && getCurrentNode() == null) {
@@ -105,11 +105,11 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
return envelope;
}
-
+
protected void adjustOverlaidNode(Node nd2, String pfx) {
String namespace = nd2.getNamespaceURI();
try {
- if (namespace != null
+ if (namespace != null
&& namespace.equals(getEnvelopeURI())) {
adjustPrefix((SOAPElement)nd2, pfx);
if ("Envelope".equals(nd2.getLocalName())) {
@@ -121,14 +121,14 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
super.adjustOverlaidNode(nd2, pfx);
}
-
+
protected void createAndAddElement(String prefix, String local, String namespace) {
if (part == null) {
super.createAndAddElement(prefix, local, namespace);
return;
}
try {
- if (namespace != null
+ if (namespace != null
&& namespace.equals(getEnvelopeURI())) {
if ("Envelope".equals(local)) {
setChild(adjustPrefix(getEnvelope(), prefix), false);
@@ -152,7 +152,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
} else if ("Fault".equals(local)) {
SOAPFault f = getEnvelope().getBody().getFault();
if (f == null) {
- Element el = getDocument().createElementNS(namespace,
+ Element el = getDocument().createElementNS(namespace,
StringUtils.isEmpty(prefix) ? local : prefix + ":" + local);
getEnvelope().getBody().appendChild(el);
f = getEnvelope().getBody().getFault();
@@ -187,7 +187,7 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
super.createAndAddElement(prefix, local, namespace);
}
-
+
@Override
protected Element createElementNS(String ns, String pfx, String local) {
Element cur = getCurrentNode();
@@ -229,5 +229,5 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
}
return super.createElementNS(ns, pfx, local);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
index f1abe19..c29af06 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJUtils.java
@@ -30,14 +30,14 @@ import javax.xml.soap.SOAPMessage;
import org.apache.cxf.common.util.StringUtils;
/**
- *
+ *
*/
public final class SAAJUtils {
-
+
private SAAJUtils() {
//not constructed
}
-
+
public static SOAPHeader getHeader(SOAPMessage m) throws SOAPException {
try {
return m.getSOAPHeader();
@@ -69,9 +69,9 @@ public final class SAAJUtils {
}
f.setFaultCode(pfx + ":" + code.getLocalPart());
}
-
+
}
-
+
public static SOAPElement adjustPrefix(SOAPElement e, String prefix) {
if (prefix == null) {
prefix = "";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java
index 44a2d64..6c3e18f 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/NamespaceHandler.java
@@ -22,6 +22,6 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
public class NamespaceHandler extends NamespaceHandlerSupport {
public void init() {
- registerBeanDefinitionParser("soapBinding", new SoapBindingInfoConfigBeanDefinitionParser());
+ registerBeanDefinitionParser("soapBinding", new SoapBindingInfoConfigBeanDefinitionParser());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
index 93da397..e4fe10b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/spring/SoapVersionRegistrar.java
@@ -25,7 +25,7 @@ import org.springframework.beans.PropertyEditorRegistrar;
import org.springframework.beans.PropertyEditorRegistry;
/**
- *
+ *
*/
public class SoapVersionRegistrar implements PropertyEditorRegistrar {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java
index 52603d6..73677f5 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBinding.java
@@ -23,5 +23,5 @@ import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap12.SOAP12Binding;
public interface SoapBinding extends SOAPBinding, SOAP12Binding {
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java
index cc462ab..2d68977 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl/extensions/SoapBody.java
@@ -23,5 +23,5 @@ import javax.wsdl.extensions.soap.SOAPBody;
import javax.wsdl.extensions.soap12.SOAP12Body;
public interface SoapBody extends SOAPBody, SOAP12Body {
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
index 625c59c..85aeba6 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/wsdl11/SoapAddressPlugin.java
@@ -41,7 +41,7 @@ public final class SoapAddressPlugin extends AbstractWSDLPlugin {
SoapAddress soapAddress = null;
soapAddress = SOAPBindingUtil.createSoapAddress(registry, isSOAP12);
-
+
soapAddress.setLocationURI(address);
return soapAddress;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
index 133c019..73d8393 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MustUnderstandInterceptorTest.java
@@ -60,15 +60,15 @@ public class MustUnderstandInterceptorTest extends TestBase {
public void setUp() throws Exception {
super.setUp();
-
+
Bus bus = BusFactory.getDefaultBus();
rhi = new ReadHeadersInterceptor(bus, "phase1");
chain.add(rhi);
-
+
sbi = new StartBodyInterceptor("phase1.5");
chain.add(sbi);
-
+
mui = new MustUnderstandInterceptor("phase2");
chain.add(mui);
@@ -112,7 +112,7 @@ public class MustUnderstandInterceptorTest extends TestBase {
public void testHandleMessageWithSoapHeader11Param() throws Exception {
prepareSoapMessage("test-soap-header.xml");
dsi.getUnderstoodHeaders().add(RESERVATION);
-
+
ServiceInfo serviceInfo = getMockedServiceModel(getClass().getResource("test-soap-header.wsdl")
.toString());
@@ -146,7 +146,7 @@ public class MustUnderstandInterceptorTest extends TestBase {
assertEquals("DummaySoapInterceptor getUnderstood has been called!", true, dsi
.isCalledGetUnderstood());
}
-
+
private void prepareSoapMessage(String payloadFileName) throws Exception {
soapMessage = TestUtil.createEmptySoapMessage(Soap12.getInstance(), chain);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java
index af143ac..ea22053 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/MyComplexStruct.java
@@ -27,9 +27,9 @@ import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for myComplexStruct complex type.
- *
+ *
* <p>The following schema fragment specifies the expected content contained within this class.
- *
+ *
* <pre>
* <complexType name="myComplexStruct">
* <complexContent>
@@ -43,8 +43,8 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
* </pre>
- *
- *
+ *
+ *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "myComplexStruct", propOrder = {"elem1", "elem2", "elem3" })
@@ -59,11 +59,11 @@ public class MyComplexStruct {
/**
* Gets the value of the elem1 property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getElem1() {
return elem1;
@@ -71,11 +71,11 @@ public class MyComplexStruct {
/**
* Sets the value of the elem1 property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setElem1(String value) {
this.elem1 = value;
@@ -83,11 +83,11 @@ public class MyComplexStruct {
/**
* Gets the value of the elem2 property.
- *
+ *
* @return
* possible object is
* {@link String }
- *
+ *
*/
public String getElem2() {
return elem2;
@@ -95,11 +95,11 @@ public class MyComplexStruct {
/**
* Sets the value of the elem2 property.
- *
+ *
* @param value
* allowed object is
* {@link String }
- *
+ *
*/
public void setElem2(String value) {
this.elem2 = value;
@@ -107,7 +107,7 @@ public class MyComplexStruct {
/**
* Gets the value of the elem3 property.
- *
+ *
*/
public int getElem3() {
return elem3;
@@ -115,7 +115,7 @@ public class MyComplexStruct {
/**
* Sets the value of the elem3 property.
- *
+ *
*/
public void setElem3(int value) {
this.elem3 = value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
index 50add7c..843a300 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCInInterceptorTest.java
@@ -45,7 +45,7 @@ public class RPCInInterceptorTest extends TestBase {
private static final String OPNAME = "sendReceiveData";
private IMocksControl control = EasyMock.createNiceControl();
-
+
@Before
public void setUp() throws Exception {
super.setUp();
@@ -60,7 +60,7 @@ public class RPCInInterceptorTest extends TestBase {
boi.getOperationInfo().getOutput().getMessagePartByIndex(0).setIndex(0);
soapMessage.getExchange().put(BindingOperationInfo.class, boi);
- control.reset();
+ control.reset();
Service service = control.createMock(Service.class);
JAXBDataBinding dataBinding = new JAXBDataBinding(MyComplexStruct.class);
service.getDataBinding();
@@ -69,7 +69,7 @@ public class RPCInInterceptorTest extends TestBase {
List<ServiceInfo> list = Arrays.asList(si);
EasyMock.expectLastCall().andReturn(list).anyTimes();
EasyMock.expect(service.isEmpty()).andReturn(true).anyTimes();
-
+
soapMessage.getExchange().put(Service.class, service);
soapMessage.getExchange().put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.FALSE);
control.replay();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
index fc356d1..03e6646 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/RPCOutInterceptorTest.java
@@ -79,7 +79,7 @@ public class RPCOutInterceptorTest extends TestBase {
soapMessage.getExchange().put(Service.class, service);
soapMessage.getExchange().put(Message.SCHEMA_VALIDATION_ENABLED, Boolean.FALSE);
control.replay();
-
+
MyComplexStruct mcs = new MyComplexStruct();
mcs.setElem1("elem1");
mcs.setElem2("elem2");
@@ -107,7 +107,7 @@ public class RPCOutInterceptorTest extends TestBase {
assertNull(soapMessage.getContent(Exception.class));
soapMessage.getContent(XMLStreamWriter.class).flush();
baos.flush();
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLStreamReader xr = StaxUtils.createXMLStreamReader(bais);
DepthXMLStreamReader reader = new DepthXMLStreamReader(xr);
@@ -132,7 +132,7 @@ public class RPCOutInterceptorTest extends TestBase {
assertNull(soapMessage.getContent(Exception.class));
soapMessage.getContent(XMLStreamWriter.class).flush();
baos.flush();
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLStreamReader xr = StaxUtils.createXMLStreamReader(bais);
DepthXMLStreamReader reader = new DepthXMLStreamReader(xr);
@@ -142,7 +142,7 @@ public class RPCOutInterceptorTest extends TestBase {
StaxUtils.nextEvent(reader);
StaxUtils.toNextElement(reader);
-
+
assertEquals(new QName(null, "out"), reader.getName());
StaxUtils.nextEvent(reader);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
index b8bf11c..e632b74 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ReadHeaderInterceptorTest.java
@@ -118,44 +118,44 @@ public class ReadHeaderInterceptorTest extends TestBase {
public void testNoClosingEnvTage() throws Exception {
assertTrue(testNoClosingEnvTag(Boolean.TRUE));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeBoth() throws Exception {
assertTrue(testNoClosingEnvTag(SchemaValidationType.BOTH));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeIn() throws Exception {
assertTrue(testNoClosingEnvTag(SchemaValidationType.IN));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeOut() throws Exception {
assertFalse(testNoClosingEnvTag(SchemaValidationType.OUT));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeNone() throws Exception {
assertFalse(testNoClosingEnvTag(SchemaValidationType.NONE));
}
-
+
@Test
public void testNoClosingEnvTagValidationTypeFalse() throws Exception {
assertFalse(testNoClosingEnvTag(Boolean.FALSE));
}
-
+
private boolean testNoClosingEnvTag(Object validationType) {
soapMessage = TestUtil.createEmptySoapMessage(Soap12.getInstance(), chain);
InputStream in = getClass().getResourceAsStream("test-no-endenv.xml");
assertNotNull(in);
-
+
soapMessage.put(Message.SCHEMA_VALIDATION_ENABLED, validationType);
soapMessage.setContent(XMLStreamReader.class, StaxUtils.createXMLStreamReader(in));
soapMessage.getInterceptorChain().doIntercept(soapMessage);
return soapMessage.getContent(Exception.class) != null;
}
-
+
@Test
public void testHandleHeader() {
try {
@@ -169,9 +169,9 @@ public class ReadHeaderInterceptorTest extends TestBase {
// check the xmlReader should be placed on the first entry of the body element
XMLStreamReader xmlReader = soapMessage.getContent(XMLStreamReader.class);
assertEquals("check the first entry of body", "itinerary", xmlReader.getLocalName());
-
+
List<Header> eleHeaders = soapMessage.getHeaders();
-
+
List<Element> headerChilds = new ArrayList<>();
Iterator<Header> iter = eleHeaders.iterator();
while (iter.hasNext()) {
@@ -205,7 +205,7 @@ public class ReadHeaderInterceptorTest extends TestBase {
Element passenger = ele;
assertNotNull(passenger);
Element child = DOMUtils.getFirstElement(passenger);
- assertNotNull("passenger should have a child element", child);
+ assertNotNull("passenger should have a child element", child);
assertEquals("name", child.getLocalName());
assertEquals("Bob", child.getTextContent());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
index 7f87165..85ad74f 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/ServiceModelUtilTest.java
@@ -57,7 +57,7 @@ public class ServiceModelUtilTest extends Assert {
private IMocksControl control;
private Bus bus;
private BindingFactoryManager bindingFactoryManager;
-
+
@Before
public void setUp() throws Exception {
String wsdlUrl = getClass().getResource(WSDL_PATH).toString();
@@ -87,12 +87,12 @@ public class ServiceModelUtilTest extends Assert {
control.replay();
serviceInfo = wsdlServiceBuilder.buildServices(def, service).get(0);
}
-
+
@After
public void tearDown() throws Exception {
-
+
}
-
+
@Test
public void testGetSchema() throws Exception {
BindingInfo bindingInfo = null;
@@ -110,18 +110,18 @@ public class ServiceModelUtilTest extends Assert {
input.getMessageInfo().getMessageParts().get(0).getElementQName().getLocalPart(), "inHeader");
assertEquals(input.getMessageInfo().getMessageParts().get(0).getElementQName().getNamespaceURI(),
"http://org.apache.cxf/headers");
-
+
assertTrue(input.getMessageInfo().getMessageParts().get(0).isElement());
assertEquals(
input.getMessageInfo().getMessageParts().get(1).getElementQName().getLocalPart(), "passenger");
assertEquals(input.getMessageInfo().getMessageParts().get(1).getElementQName().getNamespaceURI(),
"http://mycompany.example.com/employees");
assertTrue(input.getMessageInfo().getMessageParts().get(1).isElement());
-
+
MessagePartInfo messagePartInfo = input.getMessageInfo().getMessageParts().get(0);
SchemaInfo schemaInfo = ServiceModelUtil.getSchema(serviceInfo, messagePartInfo);
assertEquals(schemaInfo.getNamespaceURI(), "http://org.apache.cxf/headers");
-
+
messagePartInfo = input.getMessageInfo().getMessageParts().get(1);
schemaInfo = ServiceModelUtil.getSchema(serviceInfo, messagePartInfo);
assertEquals(schemaInfo.getNamespaceURI(), "http://mycompany.example.com/employees");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
index 75f3c21..945bb76 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapActionInterceptorTest.java
@@ -39,11 +39,11 @@ import org.junit.Test;
public class SoapActionInterceptorTest extends Assert {
-
+
@Test
public void testSoapAction() throws Exception {
SoapPreProtocolOutInterceptor i = new SoapPreProtocolOutInterceptor();
-
+
Message message = new MessageImpl();
message.setExchange(new ExchangeImpl());
message.getExchange().setOutMessage(message);
@@ -55,7 +55,7 @@ public class SoapActionInterceptorTest extends Assert {
soapMessage.put(Message.REQUESTOR_ROLE, Boolean.TRUE);
assertEquals(Soap11.getInstance(), soapMessage.getVersion());
(new SoapPreProtocolOutInterceptor()).handleMessage(soapMessage);
- Map<String, List<String>> reqHeaders
+ Map<String, List<String>> reqHeaders
= CastUtils.cast((Map<?, ?>)soapMessage.get(Message.PROTOCOL_HEADERS));
assertNotNull(reqHeaders);
assertEquals("\"\"", reqHeaders.get(SoapBindingConstants.SOAP_ACTION).get(0));
@@ -67,14 +67,14 @@ public class SoapActionInterceptorTest extends Assert {
i.handleMessage(soapMessage);
String ct = (String) soapMessage.get(Message.CONTENT_TYPE);
assertEquals("application/soap+xml", ct);
-
+
BindingOperationInfo bop = createBindingOperation();
-
+
soapMessage.getExchange().put(BindingOperationInfo.class, bop);
SoapOperationInfo soapInfo = new SoapOperationInfo();
soapInfo.setAction("foo");
bop.addExtensor(soapInfo);
-
+
i.handleMessage(soapMessage);
ct = (String) soapMessage.get(Message.CONTENT_TYPE);
assertEquals("application/soap+xml; action=\"foo\"", ct);
@@ -85,7 +85,7 @@ public class SoapActionInterceptorTest extends Assert {
InterfaceInfo ii = s.createInterface(new QName("FooInterface"));
s.setInterface(ii);
ii.addOperation(new QName("fooOp"));
-
+
BindingInfo b = new BindingInfo(s, "foo");
return b.buildOperation(new QName("fooOp"), null, null);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
index 777f06f..bfbe03a 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingFactoryTest.java
@@ -57,23 +57,23 @@ import static org.easymock.EasyMock.expectLastCall;
public class SoapBindingFactoryTest extends Assert {
IMocksControl control;
-
+
@Before
public void setUp() {
control = createNiceControl();
}
-
- private Bus getMockBus() {
- return control.createMock(Bus.class);
+
+ private Bus getMockBus() {
+ return control.createMock(Bus.class);
}
-
+
private BindingFactoryManager getBindingFactoryManager(String ns, Bus bus) throws BusException {
SoapBindingFactory bindingFactory = new SoapBindingFactory();
BindingFactoryManager bfm = new BindingFactoryManagerImpl();
bfm.registerBindingFactory(ns, bindingFactory);
return bfm;
}
-
+
@Test
public void testNoBodyParts() throws Exception {
Definition d = createDefinition("/wsdl_soap/no_body_parts.wsdl");
@@ -83,15 +83,15 @@ public class SoapBindingFactoryTest extends Assert {
bus.getExtension(BindingFactoryManager.class);
expectLastCall().andReturn(bfm).anyTimes();
-
+
DestinationFactoryManager dfm = control.createMock(DestinationFactoryManager.class);
expect(bus.getExtension(DestinationFactoryManager.class)).andStubReturn(dfm);
-
+
control.replay();
WSDLServiceBuilder builder = new WSDLServiceBuilder(bus);
ServiceInfo serviceInfo = builder
- .buildServices(d, new QName("urn:org:apache:cxf:no_body_parts/wsdl",
+ .buildServices(d, new QName("urn:org:apache:cxf:no_body_parts/wsdl",
"NoBodyParts"))
.get(0);
@@ -123,7 +123,7 @@ public class SoapBindingFactoryTest extends Assert {
}
@Test
- public void testFactory() throws Exception {
+ public void testFactory() throws Exception {
Definition d = createDefinition("/wsdl_soap/hello_world.wsdl");
Bus bus = getMockBus();
@@ -132,10 +132,10 @@ public class SoapBindingFactoryTest extends Assert {
bus.getExtension(BindingFactoryManager.class);
expectLastCall().andReturn(bfm).anyTimes();
-
+
DestinationFactoryManager dfm = control.createMock(DestinationFactoryManager.class);
expect(bus.getExtension(DestinationFactoryManager.class)).andStubReturn(dfm);
-
+
control.replay();
WSDLServiceBuilder builder = new WSDLServiceBuilder(bus);
@@ -167,10 +167,10 @@ public class SoapBindingFactoryTest extends Assert {
assertNotNull(parts);
assertEquals(1, parts.size());
}
-
-
+
+
@Test
- public void testSoap12Factory() throws Exception {
+ public void testSoap12Factory() throws Exception {
Definition d = createDefinition("/wsdl_soap/hello_world_soap12.wsdl");
Bus bus = getMockBus();
@@ -178,10 +178,10 @@ public class SoapBindingFactoryTest extends Assert {
BindingFactoryManager bfm = getBindingFactoryManager(WSDLConstants.NS_SOAP12, bus);
expect(bus.getExtension(BindingFactoryManager.class)).andReturn(bfm);
-
+
DestinationFactoryManager dfm = control.createMock(DestinationFactoryManager.class);
expect(bus.getExtension(DestinationFactoryManager.class)).andStubReturn(dfm);
-
+
control.replay();
WSDLServiceBuilder builder = new WSDLServiceBuilder(bus);
@@ -212,7 +212,7 @@ public class SoapBindingFactoryTest extends Assert {
List<MessagePartInfo> parts = bodyInfo.getParts();
assertNotNull(parts);
assertEquals(1, parts.size());
-
+
boi = sbi.getOperation(new QName("http://apache.org/hello_world_soap12_http", "pingMe"));
sboi = boi.getExtensor(SoapOperationInfo.class);
assertNotNull(sboi);
@@ -220,11 +220,11 @@ public class SoapBindingFactoryTest extends Assert {
assertEquals("", sboi.getAction());
Collection<BindingFaultInfo> faults = boi.getFaults();
assertEquals(1, faults.size());
- BindingFaultInfo faultInfo = boi.getFault(new QName("http://apache.org/hello_world_soap12_http",
+ BindingFaultInfo faultInfo = boi.getFault(new QName("http://apache.org/hello_world_soap12_http",
"pingMeFault"));
assertNotNull(faultInfo);
}
-
+
public Definition createDefinition(String wsdlURL) throws Exception {
URL resource = getClass().getResource(wsdlURL);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
index cfc3c35..de975bf 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapBindingTest.java
@@ -26,7 +26,7 @@ import org.junit.Assert;
import org.junit.Test;
public class SoapBindingTest extends Assert {
-
+
@Test
public void testCreateMessage() throws Exception {
Message message = new MessageImpl();
@@ -38,12 +38,12 @@ public class SoapBindingTest extends Assert {
assertEquals(Soap11.getInstance(), soapMessage.getVersion());
assertEquals("text/xml", soapMessage.get(Message.CONTENT_TYPE));
-
+
soapMessage.remove(Message.CONTENT_TYPE);
-
+
sb.setSoapVersion(Soap12.getInstance());
soapMessage = (SoapMessage) sb.createMessage(soapMessage);
- assertEquals(Soap12.getInstance(), soapMessage.getVersion());
+ assertEquals(Soap12.getInstance(), soapMessage.getVersion());
assertEquals("application/soap+xml", soapMessage.get(Message.CONTENT_TYPE));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
index 03973f8..79e43aa 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapDestinationFactoryTest.java
@@ -33,7 +33,7 @@ import org.junit.Assert;
import org.junit.Test;
public class SoapDestinationFactoryTest extends Assert {
-
+
@Test
public void testDestination() throws Exception {
String wsdlSoapNs = "http://schemas.xmlsoap.org/wsdl/soap/";
@@ -43,7 +43,7 @@ public class SoapDestinationFactoryTest extends Assert {
ServiceInfo si = new ServiceInfo();
EndpointInfo ei = new EndpointInfo(si, wsdlSoapNs);
// this code used to call "new SOAPAddressImpl()", but the test
- // is currently not testing anything, and needlessly ties the
+ // is currently not testing anything, and needlessly ties the
// code to a specific implementation of wsdl4j. When the SOAPAddress
// is really needed, it should be mocked.
SOAPAddress add = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
index 16250a6..f56dc0d 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/SoapOutInterceptorTest.java
@@ -40,7 +40,7 @@ import org.junit.Test;
public class SoapOutInterceptorTest extends TestBase {
private ReadHeadersInterceptor rhi;
private SoapOutInterceptor soi;
- private StartBodyInterceptor sbi;
+ private StartBodyInterceptor sbi;
@Before
public void setUp() throws Exception {
@@ -64,9 +64,9 @@ public class SoapOutInterceptorTest extends TestBase {
ByteArrayOutputStream out = new ByteArrayOutputStream();
soapMessage.setContent(OutputStream.class, out);
soapMessage.setContent(XMLStreamWriter.class, StaxUtils.createXMLStreamWriter(out));
-
+
soapMessage.getInterceptorChain().doIntercept(soapMessage);
-
+
assertNotNull(soapMessage.getHeaders());
Exception oe = soapMessage.getContent(Exception.class);
@@ -86,9 +86,9 @@ public class SoapOutInterceptorTest extends TestBase {
ByteArrayOutputStream out = new ByteArrayOutputStream();
soapMessage.setContent(OutputStream.class, out);
soapMessage.setContent(XMLStreamWriter.class, StaxUtils.createXMLStreamWriter(out));
-
+
soapMessage.getInterceptorChain().doIntercept(soapMessage);
-
+
assertNotNull(soapMessage.getHeaders());
Exception oe = soapMessage.getContent(Exception.class);
@@ -110,8 +110,8 @@ public class SoapOutInterceptorTest extends TestBase {
assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.nextTag());
assertEquals("reservation", xmlReader.getLocalName());
- assertEquals(version.getAttrValueMustUnderstand(true),
- xmlReader.getAttributeValue(version.getNamespace(),
+ assertEquals(version.getAttrValueMustUnderstand(true),
+ xmlReader.getAttributeValue(version.getNamespace(),
version.getAttrNameMustUnderstand()));
assertEquals(XMLStreamReader.START_ELEMENT, xmlReader.nextTag());
@@ -122,7 +122,7 @@ public class SoapOutInterceptorTest extends TestBase {
// assertEquals(Soap12.getInstance().getBody(), xmlReader.getName());
}
-
+
private void prepareSoapMessage(String payloadFileName) throws IOException {
soapMessage = TestUtil.createEmptySoapMessage(Soap12.getInstance(), chain);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
index 3d5960c..a53b600 100644
--- a/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
+++ b/rt/bindings/soap/src/test/java/org/apache/cxf/binding/soap/TestBase.java
@@ -55,8 +55,8 @@ public class TestBase extends Assert {
protected PhaseInterceptorChain chain;
protected SoapMessage soapMessage;
-
-
+
+
@Before
public void setUp() throws Exception {
[06/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
index 700a837..2f8ea71 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBDataBindingTest.java
@@ -104,7 +104,7 @@ public class JAXBDataBindingTest extends Assert {
bus = control.createMock(Bus.class);
bindingFactoryManager = control.createMock(BindingFactoryManager.class);
destinationFactoryManager = control.createMock(DestinationFactoryManager.class);
-
+
EasyMock.expect(bus.getExtension(BindingFactoryManager.class)).andStubReturn(bindingFactoryManager);
EasyMock.expect(bus.getExtension(DestinationFactoryManager.class))
.andStubReturn(destinationFactoryManager);
@@ -118,7 +118,7 @@ public class JAXBDataBindingTest extends Assert {
break;
}
}
-
+
wsdlServiceBuilder.buildServices(def, service);
}
@@ -131,7 +131,7 @@ public class JAXBDataBindingTest extends Assert {
public void testCreateReader() {
DataReader<?> reader = jaxbDataBinding.createReader(XMLStreamReader.class);
assertTrue(reader instanceof DataReaderImpl);
-
+
reader = jaxbDataBinding.createReader(XMLEventReader.class);
assertTrue(reader instanceof DataReaderImpl);
@@ -164,17 +164,17 @@ public class JAXBDataBindingTest extends Assert {
public void testCreateWriter() {
DataWriter<?> writer = jaxbDataBinding.createWriter(XMLStreamWriter.class);
assertTrue(writer instanceof DataWriterImpl);
-
+
writer = jaxbDataBinding.createWriter(XMLEventWriter.class);
assertTrue(writer instanceof DataWriterImpl);
-
+
writer = jaxbDataBinding.createWriter(Node.class);
assertTrue(writer instanceof DataWriterImpl);
-
+
writer = jaxbDataBinding.createWriter(null);
assertNull(writer);
}
-
+
@Test
public void testExtraClass() {
Class<?>[] extraClass = new Class[] {GreetMe.class, GreetMeOneWay.class};
@@ -183,8 +183,8 @@ public class JAXBDataBindingTest extends Assert {
assertEquals(jaxbDataBinding.getExtraClass()[0], GreetMe.class);
assertEquals(jaxbDataBinding.getExtraClass()[1], GreetMeOneWay.class);
}
-
- @Test
+
+ @Test
public void testContextProperties() throws Exception {
JAXBDataBinding db = new JAXBDataBinding();
Map<String, String> nsMap = new HashMap<String, String>();
@@ -207,7 +207,7 @@ public class JAXBDataBindingTest extends Assert {
String xml = stringWriter.toString();
assertTrue(xml, xml.contains("uri:ultima:thule"));
}
-
+
JAXBDataBinding createJaxbContext(boolean internal) throws Exception {
JAXBDataBinding db = new JAXBDataBinding();
Map<String, String> nsMap = new HashMap<String, String>();
@@ -220,7 +220,7 @@ public class JAXBDataBindingTest extends Assert {
//have to fastboot to avoid conflicts of generated accessors
System.setProperty("com.sun.xml.bind.v2.runtime.JAXBContextImpl.fastBoot", "true");
- System.setProperty("com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.fastBoot", "true");
+ System.setProperty("com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.fastBoot", "true");
if (internal) {
System.setProperty(JAXBContext.JAXB_CONTEXT_FACTORY, "com.sun.xml.internal.bind.v2.ContextFactory");
db.setContext(db.createJAXBContext(classes));
@@ -232,10 +232,10 @@ public class JAXBDataBindingTest extends Assert {
System.clearProperty("com.sun.xml.internal.bind.v2.runtime.JAXBContextImpl.fastBoot");
return db;
}
-
+
void doNamespaceMappingTest(boolean internal, boolean asm) throws Exception {
if (internal) {
- try {
+ try {
Class.forName("com.sun.xml.internal.bind.v2.ContextFactory");
} catch (Throwable t) {
//on a JVM (likely IBM's) that doesn't rename the ContextFactory package to include "internal"
@@ -247,9 +247,9 @@ public class JAXBDataBindingTest extends Assert {
ReflectionUtil.setAccessible(ReflectionUtil.getDeclaredField(ASMHelper.class, "badASM"))
.set(null, Boolean.TRUE);
}
-
+
JAXBDataBinding db = createJaxbContext(internal);
-
+
DataWriter<XMLStreamWriter> writer = db.createWriter(XMLStreamWriter.class);
XMLOutputFactory writerFactory = XMLOutputFactory.newInstance();
StringWriter stringWriter = new StringWriter();
@@ -267,17 +267,17 @@ public class JAXBDataBindingTest extends Assert {
}
}
}
-
+
@Test
public void testDeclaredNamespaceMappingRI() throws Exception {
doNamespaceMappingTest(false, true);
}
-
+
@Test
public void testDeclaredNamespaceMappingInternal() throws Exception {
doNamespaceMappingTest(true, true);
}
-
+
@Test
public void testDeclaredNamespaceMappingInternalNoAsm() throws Exception {
try {
@@ -287,7 +287,7 @@ public class JAXBDataBindingTest extends Assert {
er.getMessage().contains("Failed to map namespace");
}
}
-
+
@Test
public void testResursiveType() throws Exception {
@@ -298,17 +298,17 @@ public class JAXBDataBindingTest extends Assert {
init.addClass(Type2.class);
assertEquals(2, classes.size());
}
-
+
public abstract static class Type2 extends AddressEntity<Type2> {
}
-
+
public abstract static class AddressEntity<T extends AddressEntity<T>> {
public abstract Addressable<T> getEntity();
}
-
+
public interface Addressable<T extends AddressEntity<T>> {
}
-
+
@Test
public void testConfiguredXmlAdapter() throws Exception {
Language dutch = new Language("nl_NL", "Dutch");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index d4cabb9..d28aad0 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -74,9 +74,9 @@ import org.junit.Test;
* JAXBEncoderDecoderTest
*/
public class JAXBEncoderDecoderTest extends Assert {
- public static final QName SOAP_ENV =
+ public static final QName SOAP_ENV =
new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
- public static final QName SOAP_BODY =
+ public static final QName SOAP_BODY =
new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body");
RequestWrapper wrapperAnnotation;
@@ -85,7 +85,7 @@ public class JAXBEncoderDecoderTest extends Assert {
Map<String, String> mapField;
String arrayField[];
List<String> listField;
-
+
@Before
public void setUp() throws Exception {
context = JAXBContext.newInstance(new Class[] {
@@ -96,7 +96,7 @@ public class JAXBEncoderDecoderTest extends Assert {
});
Method method = getMethod("greetMe");
wrapperAnnotation = method.getAnnotation(RequestWrapper.class);
-
+
InputStream is = getClass().getResourceAsStream("resources/StringStruct.xsd");
StreamSource schemaSource = new StreamSource(is);
assertNotNull(schemaSource);
@@ -113,12 +113,12 @@ public class JAXBEncoderDecoderTest extends Assert {
}
return null;
}
-
- @RequestWrapper(localName = "greetMe",
- targetNamespace = "http://apache.org/hello_world_soap_http/types",
+
+ @RequestWrapper(localName = "greetMe",
+ targetNamespace = "http://apache.org/hello_world_soap_http/types",
className = "org.apache.hello_world_soap_http.types.GreetMe")
- @ResponseWrapper(localName = "greetMeResponse",
- targetNamespace = "http://apache.org/hello_world_soap_http/types",
+ @ResponseWrapper(localName = "greetMeResponse",
+ targetNamespace = "http://apache.org/hello_world_soap_http/types",
className = "org.apache.hello_world_soap_http.types.GreetMeResponse")
public java.lang.String greetMe(
java.lang.String requestType
@@ -126,24 +126,24 @@ public class JAXBEncoderDecoderTest extends Assert {
return "Hello " + requestType;
}
-
+
private Type getFieldType(String name) throws Exception {
return this.getClass()
.getDeclaredField(name)
.getGenericType();
}
-
+
@Test
public void testCXF3611() throws Exception {
Map<String, String> foo = new HashMap<String, String>();
-
+
assertTrue(JAXBSchemaInitializer.isArray(getFieldType("arrayField")));
assertTrue(JAXBSchemaInitializer.isArray(getFieldType("listField")));
assertFalse(JAXBSchemaInitializer.isArray(foo.getClass()));
assertFalse(JAXBSchemaInitializer.isArray(getFieldType("mapField")));
}
-
+
@Test
public void testMarshallIntoDOM() throws Exception {
String str = new String("Hello");
@@ -151,9 +151,9 @@ public class JAXBEncoderDecoderTest extends Assert {
MessagePartInfo part = new MessagePartInfo(inCorrectElName, null);
part.setElement(true);
part.setElementQName(inCorrectElName);
-
+
Document doc = DOMUtils.createDocument();
- Element elNode = doc.createElementNS(inCorrectElName.getNamespaceURI(),
+ Element elNode = doc.createElementNS(inCorrectElName.getNamespaceURI(),
inCorrectElName.getLocalPart());
assertNotNull(elNode);
@@ -198,19 +198,19 @@ public class JAXBEncoderDecoderTest extends Assert {
//expected - not a valid object
}
}
-
+
@Test
public void testMarshallWithFormQualifiedElement() throws Exception {
ObjectWithQualifiedElementElement testObject = new ObjectWithQualifiedElementElement();
testObject.setString1("twine");
testObject.setString2("cord");
-
+
QName elName = new QName(wrapperAnnotation.targetNamespace(),
wrapperAnnotation.localName());
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
part.setElementQName(elName);
-
+
StringWriter stringWriter = new StringWriter();
XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
@@ -223,7 +223,7 @@ public class JAXBEncoderDecoderTest extends Assert {
// so that it could be examined inside the debugger to see how JAXB works.
assertTrue(xmlResult.contains(":string2>cord</ns"));
}
-
+
@Test
public void testCustomNamespaces() throws Exception {
Map<String, String> mapper = new HashMap<String, String>();
@@ -232,13 +232,13 @@ public class JAXBEncoderDecoderTest extends Assert {
ObjectWithQualifiedElementElement testObject = new ObjectWithQualifiedElementElement();
testObject.setString1("twine");
testObject.setString2("cord");
-
+
QName elName = new QName(wrapperAnnotation.targetNamespace(),
wrapperAnnotation.localName());
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
part.setElementQName(elName);
-
+
StringWriter stringWriter = new StringWriter();
XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
@@ -253,7 +253,7 @@ public class JAXBEncoderDecoderTest extends Assert {
// so that it could be examined inside the debugger to see how JAXB works.
assertTrue(xmlResult.contains("Gallia:string2"));
}
-
+
@Test
public void testMarshallIntoStaxStreamWriter() throws Exception {
GreetMe obj = new GreetMe();
@@ -263,33 +263,33 @@ public class JAXBEncoderDecoderTest extends Assert {
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
part.setElementQName(elName);
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
FixNamespacesXMLStreamWriter writer = new FixNamespacesXMLStreamWriter(opFactory.createXMLStreamWriter(baos));
-
+
assertNull(writer.getMarshaller());
-
+
Marshaller m = context.createMarshaller();
JAXBEncoderDecoder.marshall(m, obj, part, writer);
assertEquals(m, writer.getMarshaller());
writer.flush();
writer.close();
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLInputFactory ipFactory = XMLInputFactory.newInstance();
XMLEventReader reader = ipFactory.createXMLEventReader(bais);
-
- Unmarshaller um = context.createUnmarshaller();
+
+ Unmarshaller um = context.createUnmarshaller();
Object val = um.unmarshal(reader, GreetMe.class);
assertTrue(val instanceof JAXBElement);
val = ((JAXBElement<?>)val).getValue();
assertTrue(val instanceof GreetMe);
- assertEquals(obj.getRequestType(),
+ assertEquals(obj.getRequestType(),
((GreetMe)val).getRequestType());
}
-
+
@Test
public void testMarshallIntoStaxEventWriter() throws Exception {
GreetMe obj = new GreetMe();
@@ -299,13 +299,13 @@ public class JAXBEncoderDecoderTest extends Assert {
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
part.setElementQName(elName);
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
FixNamespacesXMLEventWriter writer = new FixNamespacesXMLEventWriter(opFactory.createXMLEventWriter(baos));
assertNull(writer.getMarshaller());
-
+
//STARTDOCUMENT/ENDDOCUMENT is not required
//writer.add(eFactory.createStartDocument("utf-8", "1.0"));
Marshaller m = context.createMarshaller();
@@ -314,19 +314,19 @@ public class JAXBEncoderDecoderTest extends Assert {
//writer.add(eFactory.createEndDocument());
writer.flush();
writer.close();
-
+
//System.out.println(baos.toString());
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLInputFactory ipFactory = XMLInputFactory.newInstance();
XMLEventReader reader = ipFactory.createXMLEventReader(bais);
-
- Unmarshaller um = context.createUnmarshaller();
+
+ Unmarshaller um = context.createUnmarshaller();
Object val = um.unmarshal(reader, GreetMe.class);
assertTrue(val instanceof JAXBElement);
val = ((JAXBElement<?>)val).getValue();
assertTrue(val instanceof GreetMe);
- assertEquals(obj.getRequestType(),
+ assertEquals(obj.getRequestType(),
((GreetMe)val).getRequestType());
}
@@ -339,14 +339,14 @@ public class JAXBEncoderDecoderTest extends Assert {
InputStream is = getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
XMLInputFactory factory = XMLInputFactory.newInstance();
XMLStreamReader reader = factory.createXMLStreamReader(is);
-
+
QName[] tags = {SOAP_ENV, SOAP_BODY};
StaxStreamFilter filter = new StaxStreamFilter(tags);
FixNamespacesXMLStreamReader filteredReader = new FixNamespacesXMLStreamReader(
factory.createFilteredReader(reader, filter));
assertNull(filteredReader.getUnmarshaller());
-
+
//Remove START_DOCUMENT & START_ELEMENT pertaining to Envelope and Body Tags.
part.setTypeClass(GreetMe.class);
@@ -355,12 +355,12 @@ public class JAXBEncoderDecoderTest extends Assert {
assertEquals(um, filteredReader.getUnmarshaller());
assertNotNull(val);
assertTrue(val instanceof GreetMe);
- assertEquals("TestSOAPInputPMessage",
+ assertEquals("TestSOAPInputPMessage",
((GreetMe)val).getRequestType());
is.close();
}
-
+
@Test
public void testUnmarshallFromStaxEventReader() throws Exception {
QName elName = new QName(wrapperAnnotation.targetNamespace(),
@@ -370,7 +370,7 @@ public class JAXBEncoderDecoderTest extends Assert {
InputStream is = getClass().getResourceAsStream("resources/GreetMeDocLiteralReq.xml");
XMLInputFactory factory = XMLInputFactory.newInstance();
FixNamespacesXMLEventReader reader = new FixNamespacesXMLEventReader(factory.createXMLEventReader(is));
-
+
assertNull(reader.getUnmarshaller());
part.setTypeClass(GreetMe.class);
@@ -379,30 +379,30 @@ public class JAXBEncoderDecoderTest extends Assert {
assertEquals(um, reader.getUnmarshaller());
assertNotNull(val);
assertTrue(val instanceof GreetMe);
- assertEquals("TestSOAPInputPMessage",
+ assertEquals("TestSOAPInputPMessage",
((GreetMe)val).getRequestType());
is.close();
}
-
+
@Test
public void testMarshalRPCLit() throws Exception {
QName elName = new QName("http://test_jaxb_marshall", "in");
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
part.setElementQName(elName);
-
+
Document doc = DOMUtils.createDocument();
- Element elNode = doc.createElementNS(elName.getNamespaceURI(),
+ Element elNode = doc.createElementNS(elName.getNamespaceURI(),
elName.getLocalPart());
- JAXBEncoderDecoder.marshall(context.createMarshaller(),
+ JAXBEncoderDecoder.marshall(context.createMarshaller(),
new String("TestSOAPMessage"), part, elNode);
-
+
assertEquals("TestSOAPMessage", elNode.getFirstChild().getFirstChild().getNodeValue());
}
-
+
@Test
public void testUnMarshall() throws Exception {
//Hello World Wsdl generated namespace
@@ -413,10 +413,10 @@ public class JAXBEncoderDecoderTest extends Assert {
part.setElement(true);
part.setElementQName(elName);
part.setTypeClass(Class.forName(wrapperAnnotation.className()));
-
+
Document doc = DOMUtils.createDocument();
- Element elNode = doc.createElementNS(elName.getNamespaceURI(),
+ Element elNode = doc.createElementNS(elName.getNamespaceURI(),
elName.getLocalPart());
Element rtEl = doc.createElementNS(elName.getNamespaceURI(), "requestType");
elNode.appendChild(rtEl);
@@ -429,7 +429,7 @@ public class JAXBEncoderDecoderTest extends Assert {
//Add a Node and then test
assertEquals(GreetMe.class, obj.getClass());
assertEquals("Hello Test", ((GreetMe)obj).getRequestType());
-
+
part.setTypeClass(String.class);
Node n = null;
try {
@@ -440,7 +440,7 @@ public class JAXBEncoderDecoderTest extends Assert {
} catch (Exception ex) {
fail("Should have received a Fault, not: " + ex);
}
-
+
// Now test schema validation during unmarshaling
elName = new QName(wrapperAnnotation.targetNamespace(),
"stringStruct");
@@ -453,20 +453,20 @@ public class JAXBEncoderDecoderTest extends Assert {
part.setElement(true);
part.setElementQName(elName);
part.setTypeClass(Class.forName("org.apache.hello_world_soap_http.types.StringStruct"));
-
+
doc = DOMUtils.createDocument();
- elNode = doc.createElementNS(elName.getNamespaceURI(),
+ elNode = doc.createElementNS(elName.getNamespaceURI(),
elName.getLocalPart());
rtEl = doc.createElementNS(elName.getNamespaceURI(), "arg1");
elNode.appendChild(rtEl);
rtEl.appendChild(doc.createTextNode("World"));
-
+
// Should unmarshal without problems when no schema used.
obj = JAXBEncoderDecoder.unmarshall(context.createUnmarshaller(), elNode, part, true);
assertNotNull(obj);
assertEquals(StringStruct.class, obj.getClass());
assertEquals("World", ((StringStruct)obj).getArg1());
-
+
try {
// unmarshal with schema should raise exception.
Unmarshaller m = context.createUnmarshaller();
@@ -484,13 +484,13 @@ public class JAXBEncoderDecoderTest extends Assert {
wrapperAnnotation.localName());
Document doc = DOMUtils.createDocument();
- Element elNode = doc.createElementNS(elName.getNamespaceURI(),
+ Element elNode = doc.createElementNS(elName.getNamespaceURI(),
elName.getLocalPart());
Element rtEl = doc.createElementNS(elName.getNamespaceURI(), "requestType");
elNode.appendChild(rtEl);
rtEl.appendChild(doc.createTextNode("Hello Test"));
-
- Object obj = JAXBEncoderDecoder.unmarshall(context.createUnmarshaller(),
+
+ Object obj = JAXBEncoderDecoder.unmarshall(context.createUnmarshaller(),
elNode,
null,
true);
@@ -503,30 +503,30 @@ public class JAXBEncoderDecoderTest extends Assert {
public void testMarshallExceptionWithOrder() throws Exception {
Document doc = DOMUtils.createDocument();
Element elNode = doc.createElementNS("http://cxf.apache.org", "ExceptionRoot");
-
+
OrderException exception = new OrderException("Mymessage");
exception.setAValue("avalue");
exception.setDetail("detail");
exception.setInfo1("info1");
exception.setInfo2("info2");
exception.setIntVal(10000);
-
- QName elName = new QName("http://cxf.apache.org", "OrderException");
+
+ QName elName = new QName("http://cxf.apache.org", "OrderException");
ServiceInfo serviceInfo = new ServiceInfo();
InterfaceInfo interfaceInfo = new InterfaceInfo(serviceInfo, null);
- OperationInfo op = interfaceInfo.addOperation(new QName("http://cxf.apache.org", "operation"));
+ OperationInfo op = interfaceInfo.addOperation(new QName("http://cxf.apache.org", "operation"));
MessageInfo message = new MessageInfo(op, null, null);
MessagePartInfo part = new MessagePartInfo(elName, message);
part.setElement(true);
part.setElementQName(elName);
part.setTypeClass(OrderException.class);
-
+
//just need a simple generic context to handle the exceptions internal primitives
JAXBContext exceptionContext = JAXBContext.newInstance(new Class[] {
String.class,
});
JAXBEncoderDecoder.marshallException(exceptionContext.createMarshaller(), exception, part, elNode);
-
+
ByteArrayOutputStream bout = new ByteArrayOutputStream();
StaxUtils.writeTo(elNode, bout);
int a = bout.toString().lastIndexOf("aValue");
@@ -541,56 +541,56 @@ public class JAXBEncoderDecoderTest extends Assert {
assertTrue(bout.toString().indexOf("transientValue") < 0);
assertTrue(bout.toString(), bout.toString().indexOf("mappedField=\"MappedField\"") > 0);
}
-
+
@Test
public void testMarshallWithoutQNameInfo() throws Exception {
GreetMe obj = new GreetMe();
obj.setRequestType("Hello");
-
+
ByteArrayOutputStream baos = new ByteArrayOutputStream();
XMLOutputFactory opFactory = XMLOutputFactory.newInstance();
opFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
XMLEventWriter writer = opFactory.createXMLEventWriter(baos);
//STARTDOCUMENT/ENDDOCUMENT is not required
- //writer.add(eFactory.createStartDocument("utf-8", "1.0"));
+ //writer.add(eFactory.createStartDocument("utf-8", "1.0"));
JAXBEncoderDecoder.marshall(context.createMarshaller(), obj, null, writer);
//writer.add(eFactory.createEndDocument());
writer.flush();
writer.close();
-
+
//System.out.println(baos.toString());
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLInputFactory ipFactory = XMLInputFactory.newInstance();
XMLEventReader reader = ipFactory.createXMLEventReader(bais);
-
- Unmarshaller um = context.createUnmarshaller();
+
+ Unmarshaller um = context.createUnmarshaller();
Object val = um.unmarshal(reader, GreetMe.class);
assertTrue(val instanceof JAXBElement);
val = ((JAXBElement<?>)val).getValue();
assertTrue(val instanceof GreetMe);
- assertEquals(obj.getRequestType(),
+ assertEquals(obj.getRequestType(),
((GreetMe)val).getRequestType());
}
-
+
@Test
public void testGetClassFromType() throws Exception {
Method testByte = getMethod("testByte");
Type[] genericParameterTypes = testByte.getGenericParameterTypes();
Class<?>[] paramTypes = testByte.getParameterTypes();
-
+
int idx = 0;
for (Type t : genericParameterTypes) {
Class<?> cls = JAXBEncoderDecoder.getClassFromType(t);
assertTrue(cls.equals(paramTypes[idx]));
idx++;
}
-
+
Method testBase64Binary = getMethod("testBase64Binary");
genericParameterTypes = testBase64Binary.getGenericParameterTypes();
paramTypes = testBase64Binary.getParameterTypes();
-
+
idx = 0;
for (Type t : genericParameterTypes) {
Class<?> cls = JAXBEncoderDecoder.getClassFromType(t);
@@ -598,20 +598,20 @@ public class JAXBEncoderDecoderTest extends Assert {
idx++;
}
}
-
+
@Test
public void testDefaultValueConverter() throws Exception {
Base64WithDefaultValueType testData = (new ObjectFactory()).createBase64WithDefaultValueType();
byte[] checkValue = testData.getAttributeWithDefaultValue();
assertNotNull(checkValue);
}
-
-
+
+
@RequestWrapper(localName = "testByte",
- targetNamespace = "http://apache.org/type_test/doc",
+ targetNamespace = "http://apache.org/type_test/doc",
className = "org.apache.type_test.doc.TestByte")
- @ResponseWrapper(localName = "testByteResponse",
- targetNamespace = "http://apache.org/type_test/doc",
+ @ResponseWrapper(localName = "testByteResponse",
+ targetNamespace = "http://apache.org/type_test/doc",
className = "org.apache.type_test.doc.TestByteResponse")
public byte testByte(
byte x,
@@ -619,12 +619,12 @@ public class JAXBEncoderDecoderTest extends Assert {
javax.xml.ws.Holder<java.lang.Byte> z) {
return 24;
}
-
- @RequestWrapper(localName = "testBase64Binary",
- targetNamespace = "http://apache.org/type_test/doc",
+
+ @RequestWrapper(localName = "testBase64Binary",
+ targetNamespace = "http://apache.org/type_test/doc",
className = "org.apache.type_test.doc.TestBase64Binary")
- @ResponseWrapper(localName = "testBase64BinaryResponse",
- targetNamespace = "http://apache.org/type_test/doc",
+ @ResponseWrapper(localName = "testBase64BinaryResponse",
+ targetNamespace = "http://apache.org/type_test/doc",
className = "org.apache.type_test.doc.TestBase64BinaryResponse")
public byte[] testBase64Binary(
byte[] x,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
index 62f9070..4759237 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBUtilsTest.java
@@ -36,7 +36,7 @@ import org.junit.Test;
public class JAXBUtilsTest extends Assert {
-
+
@Test
public void testBuiltInTypeToJavaType() {
assertEquals("boolean", JAXBUtils.builtInTypeToJavaType("boolean"));
@@ -70,7 +70,7 @@ public class JAXBUtilsTest extends Assert {
JAXBUtils.namespaceURIToPackage("http://cxf.apache.org/configuration/types.auto"));
assertEquals("org.apache.cxf.configuration.types_mouse",
JAXBUtils.namespaceURIToPackage("http://cxf.apache.org/configuration/types.mouse"));
-
+
// other tests
assertEquals("https.com.mytech.rosette_analysis",
JAXBUtils.namespaceURIToPackage("https://mytech.com/rosette.analysis"));
@@ -85,80 +85,80 @@ public class JAXBUtilsTest extends Assert {
assertEquals("org.apache.cxf.config.types",
JAXBUtils.namespaceURIToPackage("urn:cxf-apache-org:config:types"));
assertEquals("types", JAXBUtils.namespaceURIToPackage("types"));
- }
-
+ }
+
@Test
public void testNameToIdentifier() {
- assertEquals("_return",
+ assertEquals("_return",
JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.VARIABLE));
- assertEquals("getReturn",
+ assertEquals("getReturn",
JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.GETTER));
- assertEquals("setReturn",
+ assertEquals("setReturn",
JAXBUtils.nameToIdentifier("return", JAXBUtils.IdentifierType.SETTER));
-
- assertEquals("_public",
+
+ assertEquals("_public",
JAXBUtils.nameToIdentifier("public", JAXBUtils.IdentifierType.VARIABLE));
- assertEquals("getPublic",
+ assertEquals("getPublic",
JAXBUtils.nameToIdentifier("public", JAXBUtils.IdentifierType.GETTER));
- assertEquals("setPublic",
+ assertEquals("setPublic",
JAXBUtils.nameToIdentifier("public", JAXBUtils.IdentifierType.SETTER));
- assertEquals("arg0",
+ assertEquals("arg0",
JAXBUtils.nameToIdentifier("arg0", JAXBUtils.IdentifierType.VARIABLE));
- assertEquals("getArg0",
+ assertEquals("getArg0",
JAXBUtils.nameToIdentifier("arg0", JAXBUtils.IdentifierType.GETTER));
- assertEquals("setArg0",
+ assertEquals("setArg0",
JAXBUtils.nameToIdentifier("arg0", JAXBUtils.IdentifierType.SETTER));
-
- assertEquals("mixedCaseName",
+
+ assertEquals("mixedCaseName",
JAXBUtils.nameToIdentifier("mixedCaseName", JAXBUtils.IdentifierType.VARIABLE));
- assertEquals("MixedCaseName",
+ assertEquals("MixedCaseName",
JAXBUtils.nameToIdentifier("mixedCaseName", JAXBUtils.IdentifierType.CLASS));
- assertEquals("setMixedCaseName",
+ assertEquals("setMixedCaseName",
JAXBUtils.nameToIdentifier("mixedCaseName", JAXBUtils.IdentifierType.SETTER));
- assertEquals("MIXED_CASE_NAME",
+ assertEquals("MIXED_CASE_NAME",
JAXBUtils.nameToIdentifier("mixedCaseName", JAXBUtils.IdentifierType.CONSTANT));
-
- assertEquals("answer42",
+
+ assertEquals("answer42",
JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.VARIABLE));
- assertEquals("Answer42",
- JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.CLASS));
- assertEquals("getAnswer42",
+ assertEquals("Answer42",
+ JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.CLASS));
+ assertEquals("getAnswer42",
JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.GETTER));
- assertEquals("ANSWER_42",
+ assertEquals("ANSWER_42",
JAXBUtils.nameToIdentifier("Answer42", JAXBUtils.IdentifierType.CONSTANT));
-
- assertEquals("nameWithDashes",
+
+ assertEquals("nameWithDashes",
JAXBUtils.nameToIdentifier("name-with-dashes", JAXBUtils.IdentifierType.VARIABLE));
- assertEquals("NameWithDashes",
+ assertEquals("NameWithDashes",
JAXBUtils.nameToIdentifier("name-with-dashes", JAXBUtils.IdentifierType.CLASS));
- assertEquals("setNameWithDashes",
+ assertEquals("setNameWithDashes",
JAXBUtils.nameToIdentifier("name-with-dashes", JAXBUtils.IdentifierType.SETTER));
- assertEquals("NAME_WITH_DASHES",
+ assertEquals("NAME_WITH_DASHES",
JAXBUtils.nameToIdentifier("name-with-dashes", JAXBUtils.IdentifierType.CONSTANT));
-
- assertEquals("otherPunctChars",
+
+ assertEquals("otherPunctChars",
JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.VARIABLE));
- assertEquals("OtherPunctChars",
+ assertEquals("OtherPunctChars",
JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.CLASS));
- assertEquals("getOtherPunctChars",
+ assertEquals("getOtherPunctChars",
JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.GETTER));
- assertEquals("OTHER_PUNCT_CHARS",
+ assertEquals("OTHER_PUNCT_CHARS",
JAXBUtils.nameToIdentifier("other_punct-chars", JAXBUtils.IdentifierType.CONSTANT));
}
-
+
@Test
public void testNsToPkg() {
- String urn = "urn:cxf.apache.org";
+ String urn = "urn:cxf.apache.org";
String pkg = JAXBUtils.namespaceURIToPackage(urn);
assertEquals("org.apache.cxf", pkg);
-
+
urn = "urn:cxf.apache.org:test.v4.6.4";
pkg = JAXBUtils.namespaceURIToPackage(urn);
- assertEquals("org.apache.cxf.test_v4_6_4", pkg);
+ assertEquals("org.apache.cxf.test_v4_6_4", pkg);
}
-
+
@Test
public void testSetNamespaceMapper() throws Exception {
JAXBContext ctx = JAXBContext.newInstance(GreetMe.class);
@@ -177,12 +177,12 @@ public class JAXBUtilsTest extends Assert {
if (mapperkey != null) {
Object mapper = marshaller.getProperty(mapperkey);
assertNotNull(mapper);
-
+
// also verify this mapper has setContextualNamespaceDecls
- Method m = ReflectionUtil.getDeclaredMethod(mapper.getClass(),
+ Method m = ReflectionUtil.getDeclaredMethod(mapper.getClass(),
"setContextualNamespaceDecls", new Class<?>[]{String[].class});
assertNotNull(m);
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
index 822a217..6a16e09 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBWrapperHelperTest.java
@@ -40,7 +40,7 @@ public class JAXBWrapperHelperTest extends Assert {
SetIsOK ok = new SetIsOK();
ok.setParameter3(new boolean[] {true, false});
ok.setParameter4("hello");
-
+
List<String> partNames = Arrays.asList(new String[] {
"Parameter1",
"Parameter2",
@@ -62,13 +62,13 @@ public class JAXBWrapperHelperTest extends Assert {
String.class,
List.class,
});
-
+
WrapperHelper wh = new JAXBDataBinding().createWrapperHelper(SetIsOK.class,
null,
partNames,
elTypeNames,
partClasses);
-
+
List<Object> lst = wh.getWrapperParts(ok);
assertEquals(5, lst.size());
assertTrue(lst.get(0) instanceof Boolean);
@@ -104,11 +104,11 @@ public class JAXBWrapperHelperTest extends Assert {
protected String parameter4;
@XmlElement(name = "Parameter5")
protected List<String> parameter5 = new ArrayList<>();
-
-
+
+
/**
* Gets the value of the parameter1 property.
- *
+ *
*/
public boolean isParameter1() {
return parameter1;
@@ -116,7 +116,7 @@ public class JAXBWrapperHelperTest extends Assert {
/**
* Sets the value of the parameter1 property.
- *
+ *
*/
public void setParameter1(boolean value) {
this.parameter1 = value;
@@ -124,7 +124,7 @@ public class JAXBWrapperHelperTest extends Assert {
/**
* Gets the value of the parameter2 property.
- *
+ *
*/
public int getParameter2() {
return parameter2;
@@ -132,16 +132,16 @@ public class JAXBWrapperHelperTest extends Assert {
/**
* Sets the value of the parameter2 property.
- *
+ *
*/
public void setParameter2(int value) {
this.parameter2 = value;
}
-
-
+
+
/**
* Gets the value of the parameter2 property.
- *
+ *
*/
public boolean[] getParameter3() {
return parameter3;
@@ -149,12 +149,12 @@ public class JAXBWrapperHelperTest extends Assert {
/**
* Sets the value of the parameter2 property.
- *
+ *
*/
public void setParameter3(boolean value[]) {
this.parameter3 = value;
}
-
+
public String getParameter4() {
return parameter4;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java
index 1aa52f1..f9670cb 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/OrderException.java
@@ -24,12 +24,12 @@ import javax.xml.bind.annotation.XmlAttribute;
@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
public class OrderException extends Exception {
-
+
private static final long serialVersionUID = 1L;
-
+
@XmlAttribute(name = "mappedField")
private static final String MAPPED_FIELD = "MappedField";
-
+
private transient int transientValue;
private String info1;
@@ -41,9 +41,9 @@ public class OrderException extends Exception {
private int intVal;
private String detail;
-
-
-
+
+
+
public OrderException(String message) {
super(message);
}
@@ -99,7 +99,7 @@ public class OrderException extends Exception {
void setTransientValue(int transientValue) {
this.transientValue = transientValue;
}
-
+
public String mappedField() {
return MAPPED_FIELD;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java
index 9e62a6e..3a8f360 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/StaxEventFilter.java
@@ -33,7 +33,7 @@ public class StaxEventFilter implements EventFilter {
}
public boolean accept(XMLEvent event) {
- if (event.isStartDocument()
+ if (event.isStartDocument()
|| event.isEndDocument()) {
return false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
index 35a1b3b..e70e4db 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/TestBase.java
@@ -86,7 +86,7 @@ public class TestBase extends Assert {
.andStubReturn(new ArrayList<Interceptor<? extends Message>>());
expect(binding.getOutFaultInterceptors())
.andStubReturn(new ArrayList<Interceptor<? extends Message>>());
-
+
bfm.registerBindingFactory("http://schemas.xmlsoap.org/wsdl/soap/", bf);
String ns = "http://apache.org/hello_world_soap_http";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
index 4d417a8..7396cbc 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/fortest/QualifiedBean.java
@@ -33,22 +33,22 @@ public class QualifiedBean {
public void setAriadne(String ariadne) {
this.ariadne = ariadne;
}
-
+
@XmlAttribute
public String getDefaultAttribute() {
return "default";
}
-
+
public void setDefaultAttribute(String val) {
//
}
-
-
+
+
@XmlAttribute(namespace = "")
public String getEmptyNamespaceAttribute() {
return "empty";
}
-
+
public void setEmptyNamespaceAttribute() {
}
@@ -56,7 +56,7 @@ public class QualifiedBean {
public String getExplicitNamespaceAttribute() {
return "explicit";
}
-
+
public void setExplicitNamespaceAttribute() {
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java
index 7bfbaa0..79536dd 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomHandler.java
@@ -28,7 +28,7 @@ public class MyCustomHandler implements ValidationEventHandler {
public boolean getUsed() {
return used;
}
-
+
public boolean handleEvent(ValidationEvent event) {
used = true;
return true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java
index c494dfa..369f3c9 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/MyCustomMarshallerHandler.java
@@ -27,16 +27,16 @@ import javax.xml.bind.util.ValidationEventCollector;
import org.apache.cxf.jaxb.MarshallerEventHandler;
import org.apache.cxf.jaxb.UnmarshallerEventHandler;
-public class MyCustomMarshallerHandler extends ValidationEventCollector implements
+public class MyCustomMarshallerHandler extends ValidationEventCollector implements
UnmarshallerEventHandler, MarshallerEventHandler {
private boolean used;
private boolean onMarshalComplete;
private boolean onUnmarshalComplete;
-
+
public boolean getUsed() {
return used;
}
-
+
public boolean isOnMarshalComplete() {
return onMarshalComplete;
}
@@ -47,7 +47,7 @@ public class MyCustomMarshallerHandler extends ValidationEventCollector implemen
public boolean handleEvent(ValidationEvent event) {
super.handleEvent(event);
-
+
used = true;
return true;
}
@@ -55,7 +55,7 @@ public class MyCustomMarshallerHandler extends ValidationEventCollector implemen
@Override
public void onUnmarshalComplete() throws UnmarshalException {
this.onUnmarshalComplete = true;
-
+
if (hasEvents()) {
throw new UnmarshalException("My unmarshalling exception");
}
@@ -64,7 +64,7 @@ public class MyCustomMarshallerHandler extends ValidationEventCollector implemen
@Override
public void onMarshalComplete() throws MarshalException {
this.onMarshalComplete = true;
-
+
if (hasEvents()) {
throw new MarshalException("My marshalling exception");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
index f4d3405..8b2d7a9 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataReaderTest.java
@@ -41,13 +41,13 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-
+
public class XMLStreamDataReaderTest extends Assert {
private XMLInputFactory factory;
private XMLStreamReader reader;
private InputStream is;
-
+
@Before
public void setUp() throws Exception {
factory = XMLInputFactory.newInstance();
@@ -61,9 +61,9 @@ public class XMLStreamDataReaderTest extends Assert {
@Test
public void testSetProperty() throws Exception {
MyCustomHandler handler = new MyCustomHandler();
-
+
DataReaderImpl<XMLStreamReader> dr = newDataReader(handler);
-
+
// Should fail if custom handler doesn't skip formatting error
Object val = dr.read(reader);
assertTrue(val instanceof GreetMe);
@@ -71,11 +71,11 @@ public class XMLStreamDataReaderTest extends Assert {
assertTrue(handler.getUsed());
}
-
+
@Test
public void testSetPropertyWithCustomExceptionHandling() throws Exception {
MyCustomMarshallerHandler handler = new MyCustomMarshallerHandler();
-
+
DataReaderImpl<XMLStreamReader> dr = newDataReader(handler);
// Should fail if custom handler doesn't skip formatting error
@@ -85,39 +85,39 @@ public class XMLStreamDataReaderTest extends Assert {
} catch (Fault f) {
assertTrue(f.getMessage().contains("My unmarshalling exception"));
}
-
+
// Check handler used
assertTrue(handler.getUsed());
assertFalse(handler.isOnMarshalComplete());
assertTrue(handler.isOnUnmarshalComplete());
}
-
+
private DataReaderImpl<XMLStreamReader> newDataReader(ValidationEventHandler handler) throws Exception {
JAXBDataBinding db = getDataBinding(GreetMe.class);
-
+
reader = getTestReader("../resources/SetPropertyValidationFailureReq.xml");
assertNotNull(reader);
-
+
DataReaderImpl<XMLStreamReader> dr = (DataReaderImpl<XMLStreamReader>)db.createReader(XMLStreamReader.class);
assertNotNull(dr);
-
+
// Build message to set custom event handler
org.apache.cxf.message.Message message = new org.apache.cxf.message.MessageImpl();
message.put(JAXBDataBinding.READER_VALIDATION_EVENT_HANDLER, handler);
message.put("unwrap.jaxb.element", true);
-
- dr.setProperty("org.apache.cxf.message.Message", message);
-
+
+ dr.setProperty("org.apache.cxf.message.Message", message);
+
return dr;
}
-
+
@Test
public void testReadWrapper() throws Exception {
JAXBDataBinding db = getDataBinding(GreetMe.class);
-
+
reader = getTestReader("../resources/GreetMeDocLiteralReq.xml");
assertNotNull(reader);
-
+
DataReader<XMLStreamReader> dr = db.createReader(XMLStreamReader.class);
assertNotNull(dr);
Object val = dr.read(reader);
@@ -135,9 +135,9 @@ public class XMLStreamDataReaderTest extends Assert {
DataReader<XMLStreamReader> dr = db.createReader(XMLStreamReader.class);
assertNotNull(dr);
-
+
Object retValue = dr.read(reader);
-
+
assertNotNull(retValue);
assertTrue(retValue instanceof GreetMeResponse);
assertEquals("TestSOAPOutputPMessage", ((GreetMeResponse)retValue).getResponseType());
@@ -151,7 +151,7 @@ public class XMLStreamDataReaderTest extends Assert {
reader = getTestReader("../resources/greetMeRpcLitReq.xml");
assertNotNull(reader);
-
+
XMLStreamReader localReader = getTestFilteredReader(reader, tags);
DataReader<XMLStreamReader> dr = db.createReader(XMLStreamReader.class);
@@ -174,7 +174,7 @@ public class XMLStreamDataReaderTest extends Assert {
reader = getTestReader("../resources/sayHiDocLitBareReq.xml");
assertNotNull(reader);
-
+
DataReader<XMLStreamReader> dr = db.createReader(XMLStreamReader.class);
assertNotNull(dr);
QName elName = new QName("http://apache.org/hello_world_doc_lit_bare/types", "inout");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
index 420c843..afa9af6 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/io/XMLStreamDataWriterTest.java
@@ -67,43 +67,43 @@ public class XMLStreamDataWriterTest extends Assert {
public void tearDown() throws Exception {
baos.close();
}
-
+
@Test
public void testSetProperty() throws Exception {
MyCustomHandler handler = new MyCustomHandler();
-
+
DataWriterImpl<XMLStreamWriter> dw = newDataWriter(handler);
// Write Stuff
TradePriceData val = new TradePriceData();
val.setTickerSymbol("This is a symbol");
val.setTickerPrice(1.0f);
-
+
QName elName = new QName("http://apache.org/hello_world_doc_lit_bare/types", "inout");
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
part.setElementQName(elName);
dw.write(val, part, streamWriter);
streamWriter.flush();
-
+
// Test MyCustomHandler
assertTrue(handler.getUsed());
}
-
+
@Test
public void testSetPropertyWithCustomExceptionHandling() throws Exception {
MyCustomMarshallerHandler handler = new MyCustomMarshallerHandler();
-
+
DataWriterImpl<XMLStreamWriter> dw = newDataWriter(handler);
// Write Stuff
TradePriceData val = new TradePriceData();
val.setTickerSymbol("This is a symbol");
val.setTickerPrice(1.0f);
-
+
QName elName = new QName("http://apache.org/hello_world_doc_lit_bare/types", "inout");
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
part.setElementQName(elName);
-
+
try {
dw.write(val, part, streamWriter);
streamWriter.flush();
@@ -111,7 +111,7 @@ public class XMLStreamDataWriterTest extends Assert {
} catch (Fault f) {
assertTrue(f.getMessage().contains("My marshalling exception"));
}
-
+
// Test MyCustomHandler
assertTrue(handler.getUsed());
assertTrue(handler.isOnMarshalComplete());
@@ -121,28 +121,28 @@ public class XMLStreamDataWriterTest extends Assert {
private DataWriterImpl<XMLStreamWriter> newDataWriter(ValidationEventHandler handler) throws Exception {
JAXBDataBinding db = getTestWriterFactory();
-
+
DataWriterImpl<XMLStreamWriter> dw = (DataWriterImpl<XMLStreamWriter>)db.createWriter(XMLStreamWriter.class);
assertNotNull(dw);
-
+
// Build message to set custom event handler
org.apache.cxf.message.Message message = new org.apache.cxf.message.MessageImpl();
message.put(JAXBDataBinding.WRITER_VALIDATION_EVENT_HANDLER, handler);
-
- dw.setProperty("org.apache.cxf.message.Message", message);
-
+
+ dw.setProperty("org.apache.cxf.message.Message", message);
+
return dw;
}
-
+
@Test
public void testWriteRPCLit1() throws Exception {
JAXBDataBinding db = getTestWriterFactory();
-
+
DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
assertNotNull(dw);
-
+
String val = new String("TESTOUTPUTMESSAGE");
- QName elName = new QName("http://apache.org/hello_world_rpclit/types",
+ QName elName = new QName("http://apache.org/hello_world_rpclit/types",
"in");
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
@@ -165,21 +165,21 @@ public class XMLStreamDataWriterTest extends Assert {
@Test
public void testWriteRPCLit2() throws Exception {
JAXBDataBinding db = getTestWriterFactory(MyComplexStruct.class);
-
+
DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
assertNotNull(dw);
-
+
MyComplexStruct val = new MyComplexStruct();
val.setElem1("This is element 1");
val.setElem2("This is element 2");
val.setElem3(1);
-
- QName elName = new QName("http://apache.org/hello_world_rpclit/types",
+
+ QName elName = new QName("http://apache.org/hello_world_rpclit/types",
"in");
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
part.setElementQName(elName);
-
+
dw.write(val, part, streamWriter);
streamWriter.flush();
@@ -203,14 +203,14 @@ public class XMLStreamDataWriterTest extends Assert {
@Test
public void testWriteBare() throws Exception {
JAXBDataBinding db = getTestWriterFactory(TradePriceData.class);
-
+
DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
assertNotNull(dw);
-
+
TradePriceData val = new TradePriceData();
val.setTickerSymbol("This is a symbol");
val.setTickerPrice(1.0f);
-
+
QName elName = new QName("http://apache.org/hello_world_doc_lit_bare/types", "inout");
MessagePartInfo part = new MessagePartInfo(elName, null);
part.setElement(true);
@@ -234,17 +234,17 @@ public class XMLStreamDataWriterTest extends Assert {
StaxUtils.toNextText(reader);
assertEquals("This is a symbol", reader.getText());
}
-
+
@Test
public void testWriteWrapper() throws Exception {
JAXBDataBinding db = getTestWriterFactory(GreetMe.class);
-
+
DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
assertNotNull(dw);
GreetMe val = new GreetMe();
val.setRequestType("Hello");
-
+
dw.write(val, streamWriter);
streamWriter.flush();
@@ -259,7 +259,7 @@ public class XMLStreamDataWriterTest extends Assert {
StaxUtils.toNextElement(reader);
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "requestType"),
reader.getName());
-
+
StaxUtils.nextEvent(reader);
StaxUtils.toNextText(reader);
assertEquals("Hello", reader.getText());
@@ -268,16 +268,16 @@ public class XMLStreamDataWriterTest extends Assert {
@Test
public void testWriteWrapperReturn() throws Exception {
JAXBDataBinding db = getTestWriterFactory(GreetMeResponse.class);
-
+
DataWriter<XMLStreamWriter> dw = db.createWriter(XMLStreamWriter.class);
assertNotNull(dw);
GreetMeResponse retVal = new GreetMeResponse();
retVal.setResponseType("TESTOUTPUTMESSAGE");
-
+
dw.write(retVal, streamWriter);
streamWriter.flush();
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLStreamReader xr = inFactory.createXMLStreamReader(bais);
DepthXMLStreamReader reader = new DepthXMLStreamReader(xr);
@@ -289,7 +289,7 @@ public class XMLStreamDataWriterTest extends Assert {
StaxUtils.toNextElement(reader);
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "responseType"),
reader.getName());
-
+
StaxUtils.nextEvent(reader);
StaxUtils.toNextText(reader);
assertEquals("TESTOUTPUTMESSAGE", reader.getText());
@@ -301,7 +301,7 @@ public class XMLStreamDataWriterTest extends Assert {
Map<String, String> nspref = new HashMap<String, String>();
nspref.put("http://apache.org/hello_world_soap_http/types", "x");
db.setNamespaceMap(nspref);
-
+
// use the output stream instead of XMLStreamWriter to test
DataWriter<OutputStream> dw = db.createWriter(OutputStream.class);
assertNotNull(dw);
@@ -309,25 +309,25 @@ public class XMLStreamDataWriterTest extends Assert {
GreetMe val = new GreetMe();
val.setRequestType("Hello");
dw.write(val, baos);
-
+
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
XMLStreamReader xr = inFactory.createXMLStreamReader(bais);
DepthXMLStreamReader reader = new DepthXMLStreamReader(xr);
StaxUtils.toNextElement(reader);
- QName qname = reader.getName();
+ QName qname = reader.getName();
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "greetMe"), qname);
assertEquals("x", qname.getPrefix());
-
+
assertEquals(1, reader.getNamespaceCount());
assertEquals("http://apache.org/hello_world_soap_http/types", reader.getNamespaceURI(0));
assertEquals("x", reader.getNamespacePrefix(0));
-
+
StaxUtils.nextEvent(reader);
StaxUtils.toNextElement(reader);
qname = reader.getName();
assertEquals(new QName("http://apache.org/hello_world_soap_http/types", "requestType"), qname);
assertEquals("x", qname.getPrefix());
-
+
StaxUtils.nextEvent(reader);
StaxUtils.toNextText(reader);
assertEquals("Hello", reader.getText());
@@ -340,7 +340,7 @@ public class XMLStreamDataWriterTest extends Assert {
nspref.put("http://apache.org/hello_world_soap_http/types", "x");
db.setNamespaceMap(nspref);
db.setContextualNamespaceMap(nspref);
-
+
// use the output stream instead of XMLStreamWriter to test
DataWriter<OutputStream> dw = db.createWriter(OutputStream.class);
assertNotNull(dw);
@@ -348,14 +348,14 @@ public class XMLStreamDataWriterTest extends Assert {
GreetMe val = new GreetMe();
val.setRequestType("Hello");
dw.write(val, baos);
-
+
String xstr = new String(baos.toByteArray());
-
+
// there should be no namespace decls
if (!db.getContext().getClass().getName().contains("eclipse")) {
//bug in eclipse moxy
//https://bugs.eclipse.org/bugs/show_bug.cgi?id=421463
-
+
assertEquals("<x:greetMe><x:requestType>Hello</x:requestType></x:greetMe>", xstr);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java
index 1c1d7d4..00da309e 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb_misc/TestJAXBClass.java
@@ -29,8 +29,8 @@ import javax.xml.bind.annotation.XmlType;
public class TestJAXBClass {
@XmlElement(name = "EndPart", required = true)
protected String endPart;
-
-
+
+
public String getEndPart() {
return endPart;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
index 49a332c..ebef316 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/AbstractStaticFailoverStrategy.java
@@ -47,18 +47,18 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
public void setDelayBetweenRetries(long delay) {
this.delayBetweenRetries = delay;
}
-
+
public long getDelayBetweenRetries() {
return this.delayBetweenRetries;
}
-
+
public void setAlternateAddresses(List<String> alternateAddresses) {
this.alternateAddresses = alternateAddresses;
}
-
+
/**
* Get the alternate addresses for this invocation.
- *
+ *
* @param exchange the current Exchange
* @return a List of alternate addresses if available
*/
@@ -70,7 +70,7 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
/**
* Select one of the alternate addresses for a retried invocation.
- *
+ *
* @param a List of alternate addresses if available
* @return the selected address
*/
@@ -92,17 +92,17 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
/**
* Get the alternate endpoints for this invocation.
- *
+ *
* @param exchange the current Exchange
* @return a List of alternate endpoints if available
*/
public List<Endpoint> getAlternateEndpoints(Exchange exchange) {
return getEndpoints(exchange, false);
}
-
+
/**
* Select one of the alternate endpoints for a retried invocation.
- *
+ *
* @param a List of alternate endpoints if available
* @return the selected endpoint
*/
@@ -122,10 +122,10 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
}
return selected;
}
-
+
/**
* Get the endpoints for this invocation.
- *
+ *
* @param exchange the current Exchange
* @param acceptCandidatesWithSameAddress true to accept candidates with the same address
* @return a List of alternate endpoints if available
@@ -165,17 +165,17 @@ public abstract class AbstractStaticFailoverStrategy implements FailoverStrategy
/**
* Get next alternate endpoint.
- *
- * @param alternates non-empty List of alternate endpoints
+ *
+ * @param alternates non-empty List of alternate endpoints
* @return
*/
protected abstract <T> T getNextAlternate(List<T> alternates);
-
+
/**
- * Get the log level for reporting the selection of the new alternative address or endpoint
+ * Get the log level for reporting the selection of the new alternative address or endpoint
* @return the log level
*/
protected Level getLogLevel() {
- return Level.WARNING;
+ return Level.WARNING;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
index 9bcc6fc..3010351 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/CircuitBreakerTargetSelector.java
@@ -47,7 +47,7 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
/**
* Static instance of empty (or noop) circuit breaker to handle use cases
- * when alternative addresses or alternative endpoint addresses are nullable
+ * when alternative addresses or alternative endpoint addresses are nullable
* (or non-valid).
*/
private static final CircuitBreaker NOOP_CIRCUIT_BREAKER = new CircuitBreaker() {
@@ -55,41 +55,41 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
public boolean allowRequest() {
return true;
}
-
+
@Override
public void markFailure(Throwable cause) {
}
-
+
@Override
public void markSuccess() {
}
};
-
+
private final int threshold;
- private final long timeout;
+ private final long timeout;
private final Map<String, CircuitBreaker> circuits = new LinkedHashMap<>();
-
+
public CircuitBreakerTargetSelector(final int threshold, final long timeout) {
super();
this.threshold = threshold;
this.timeout = timeout;
}
-
+
public CircuitBreakerTargetSelector(final int threshold, final long timeout,
final String clientBootstrapAddress) {
super(clientBootstrapAddress);
this.threshold = threshold;
this.timeout = timeout;
}
-
+
public CircuitBreakerTargetSelector() {
this(DEFAULT_THESHOLD, DEFAULT_TIMEOUT);
}
-
+
@Override
public synchronized void setStrategy(FailoverStrategy strategy) {
super.setStrategy(strategy);
-
+
// Registering the original endpoint in the list of circuit breakers
if (getEndpoint() != null) {
final String address = getEndpoint().getEndpointInfo().getAddress();
@@ -97,7 +97,7 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
circuits.putIfAbsent(address, new ZestCircuitBreaker(threshold, timeout));
}
}
-
+
if (strategy != null) {
final List<String> alternatives = strategy.getAlternateAddresses(null /* no Exchange at this point */);
if (alternatives != null) {
@@ -120,10 +120,10 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
InvocationContext invocation = inProgress.get(key);
if (invocation != null && !invocation.getContext().containsKey(IS_SELECTED)) {
final String address = (String) message.get(Message.ENDPOINT_ADDRESS);
-
+
if (isFailoverRequired(address)) {
Endpoint target = getFailoverTarget(exchange, invocation);
-
+
if (target == null) {
throw new Fault(new FailoverFailedException(
"None of alternative addresses are available at the moment"));
@@ -140,22 +140,22 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
return getSelectedConduit(message);
}
-
+
@Override
protected Endpoint getFailoverTarget(final Exchange exchange, final InvocationContext invocation) {
if (circuits.isEmpty()) {
LOG.log(Level.SEVERE, "No alternative addresses configured");
return null;
}
-
+
final List<String> alternateAddresses = updateContextAlternatives(exchange, invocation);
if (alternateAddresses != null) {
final Iterator<String> alternateAddressIterator = alternateAddresses.iterator();
-
+
while (alternateAddressIterator.hasNext()) {
final String alternateAddress = alternateAddressIterator.next();
final CircuitBreaker circuitBreaker = getCircuitBreaker(alternateAddress);
-
+
if (!circuitBreaker.allowRequest()) {
alternateAddressIterator.remove();
}
@@ -165,7 +165,7 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
Endpoint failoverTarget = null;
if (alternateAddresses != null && !alternateAddresses.isEmpty()) {
final String alternateAddress = getStrategy().selectAlternateAddress(alternateAddresses);
-
+
// Reuse current endpoint
if (alternateAddress != null) {
failoverTarget = getEndpoint();
@@ -173,10 +173,10 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
}
} else {
final List<Endpoint> alternateEndpoints = invocation.getAlternateEndpoints();
-
+
if (alternateEndpoints != null) {
final Iterator<Endpoint> alternateEndpointIterator = alternateEndpoints.iterator();
-
+
while (alternateEndpointIterator.hasNext()) {
final Endpoint endpoint = alternateEndpointIterator.next();
final CircuitBreaker circuitBreaker = getCircuitBreaker(endpoint);
@@ -185,51 +185,51 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
}
}
}
-
+
failoverTarget = getStrategy().selectAlternateEndpoint(alternateEndpoints);
}
-
+
return failoverTarget;
}
-
+
@Override
public void prepare(Message message) {
super.prepare(message);
}
-
+
@Override
protected void onFailure(InvocationContext context, Exception ex) {
super.onFailure(context, ex);
-
+
final Map<String, Object> requestContext =
CastUtils.cast((Map<?, ?>)context.getContext().get(Client.REQUEST_CONTEXT));
-
+
if (requestContext != null) {
final String address = (String)requestContext.get(Message.ENDPOINT_ADDRESS);
getCircuitBreaker(address).markFailure(ex);
}
}
-
+
@Override
protected void onSuccess(InvocationContext context) {
super.onSuccess(context);
-
+
final Map<String, Object> requestContext =
CastUtils.cast((Map<?, ?>)context.getContext().get(Client.REQUEST_CONTEXT));
-
+
if (requestContext != null) {
final String address = (String)requestContext.get(Message.ENDPOINT_ADDRESS);
getCircuitBreaker(address).markSuccess();
}
}
-
+
private CircuitBreaker getCircuitBreaker(final Endpoint endpoint) {
return getCircuitBreaker(endpoint.getEndpointInfo().getAddress());
}
-
+
private synchronized CircuitBreaker getCircuitBreaker(final String alternateAddress) {
CircuitBreaker circuitBreaker = null;
-
+
if (!StringUtils.isEmpty(alternateAddress)) {
for (Map.Entry<String, CircuitBreaker> entry: circuits.entrySet()) {
if (alternateAddress.startsWith(entry.getKey())) {
@@ -237,33 +237,33 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
break;
}
}
-
+
if (circuitBreaker == null) {
circuitBreaker = new ZestCircuitBreaker(threshold, timeout);
circuits.put(alternateAddress, circuitBreaker);
}
}
-
+
if (circuitBreaker == null) {
circuitBreaker = NOOP_CIRCUIT_BREAKER;
}
-
+
return circuitBreaker;
}
-
+
private boolean isEndpointChanged(final String address, final Endpoint target) {
if (!StringUtils.isEmpty(address)) {
return !address.startsWith(target.getEndpointInfo().getAddress());
- }
-
+ }
+
if (getEndpoint().equals(target)) {
return false;
}
-
+
return !getEndpoint().getEndpointInfo().getAddress().startsWith(
target.getEndpointInfo().getAddress());
}
-
+
private boolean isFailoverRequired(final String address) {
if (!StringUtils.isEmpty(address)) {
for (final Map.Entry<String, CircuitBreaker> entry: circuits.entrySet()) {
@@ -272,7 +272,7 @@ public class CircuitBreakerTargetSelector extends FailoverTargetSelector {
}
}
}
-
+
LOG.log(Level.WARNING, "No circuit breaker present for address: " + address);
return false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java
index d51408b..25d7a0b 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFailedException.java
@@ -22,15 +22,15 @@ package org.apache.cxf.clustering;
public class FailoverFailedException extends RuntimeException {
private static final long serialVersionUID = 6987181998625258047L;
-
+
public FailoverFailedException() {
super();
}
-
+
public FailoverFailedException(String message) {
super(message);
}
-
+
public FailoverFailedException(String message, Throwable cause) {
super(message, cause);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
index a911445..8d95b0f 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverFeature.java
@@ -44,14 +44,14 @@ public class FailoverFeature extends AbstractFeature {
private FailoverStrategy failoverStrategy;
private FailoverTargetSelector targetSelector;
private String clientBootstrapAddress;
-
+
public FailoverFeature() {
-
+
}
public FailoverFeature(String clientBootstrapAddress) {
this.clientBootstrapAddress = clientBootstrapAddress;
}
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
if (provider instanceof ConduitSelectorHolder) {
@@ -76,22 +76,22 @@ public class FailoverFeature extends AbstractFeature {
}
return selector;
}
-
+
public FailoverTargetSelector getTargetSelector() {
if (this.targetSelector == null) {
this.targetSelector = new FailoverTargetSelector(clientBootstrapAddress);
}
return this.targetSelector;
}
-
+
public void setTargetSelector(FailoverTargetSelector selector) {
this.targetSelector = selector;
}
-
+
public void setStrategy(FailoverStrategy strategy) {
failoverStrategy = strategy;
}
-
+
public FailoverStrategy getStrategy() {
return failoverStrategy;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java
index 1eecc74..78d2714 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverStrategy.java
@@ -31,15 +31,15 @@ import org.apache.cxf.message.Exchange;
public interface FailoverStrategy {
/**
* Get the alternate endpoints for this invocation.
- *
- * @param exchange the current Exchange
+ *
+ * @param exchange the current Exchange
* @return a failover endpoint if one is available
*/
List<Endpoint> getAlternateEndpoints(Exchange exchange);
-
+
/**
* Select one of the alternate endpoints for a retried invocation.
- *
+ *
* @param alternates List of alternate endpoints if available
* @return the selected endpoint
*/
@@ -48,15 +48,15 @@ public interface FailoverStrategy {
/**
* Get the alternate addresses for this invocation.
* These addresses over-ride any addresses specified in the WSDL.
- *
- * @param exchange the current Exchange
+ *
+ * @param exchange the current Exchange
* @return a failover endpoint if one is available
*/
List<String> getAlternateAddresses(Exchange exchange);
/**
* Select one of the alternate addresses for a retried invocation.
- *
+ *
* @param addresses List of alternate addresses if available
* @return the selected address
*/
[42/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java
index 006f87c..b723e77 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/DeferredConduitSelector.java
@@ -26,24 +26,24 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.transport.Conduit;
/**
- * Strategy for lazy deferred retreival of a Conduit to mediate an
+ * Strategy for lazy deferred retreival of a Conduit to mediate an
* outbound message.
*/
public class DeferredConduitSelector extends AbstractConduitSelector {
-
+
private static final Logger LOG =
LogUtils.getL7dLogger(DeferredConduitSelector.class);
-
+
/**
* Normal constructor.
*/
public DeferredConduitSelector() {
super();
}
-
+
/**
* Constructor, allowing a specific conduit to override normal selection.
- *
+ *
* @param c specific conduit
*/
public DeferredConduitSelector(Conduit c) {
@@ -52,7 +52,7 @@ public class DeferredConduitSelector extends AbstractConduitSelector {
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
@@ -61,7 +61,7 @@ public class DeferredConduitSelector extends AbstractConduitSelector {
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java b/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java
index d88e51e..ee16b84 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/Endpoint.java
@@ -32,36 +32,36 @@ import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.MessageObserver;
/**
- * Represents an endpoint that receives messages.
+ * Represents an endpoint that receives messages.
*
*/
public interface Endpoint extends Map<String, Object>, InterceptorProvider {
EndpointInfo getEndpointInfo();
-
+
Binding getBinding();
-
+
Service getService();
void setExecutor(Executor executor);
-
+
Executor getExecutor();
-
+
MessageObserver getInFaultObserver();
-
+
MessageObserver getOutFaultObserver();
-
+
void setInFaultObserver(MessageObserver observer);
-
+
void setOutFaultObserver(MessageObserver observer);
List<Feature> getActiveFeatures();
-
+
/**
* Add a hook that will be called when this end point being terminated.
* This will be called prior to the Server/ClientLifecycleListener.*Destroyed()
* method is called. This provides an opportunity to cleanup any resources
- * that are specific to this Endpoint.
+ * that are specific to this Endpoint.
* @param c
*/
void addCleanupHook(Closeable c);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
index 9aec397..b726a2c 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
@@ -70,12 +70,12 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
public EndpointImpl(Bus bus, Service s, QName endpointName) throws EndpointException {
this(bus, s, s.getEndpointInfo(endpointName));
}
-
+
public EndpointImpl(Bus bus, Service s, EndpointInfo ei) throws EndpointException {
if (ei == null) {
throw new NullPointerException("EndpointInfo can not be null!");
}
-
+
if (bus == null) {
this.bus = BusFactory.getThreadDefaultBus();
} else {
@@ -85,7 +85,7 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
endpointInfo = ei;
createBinding(endpointInfo.getBinding());
-
+
inFaultObserver = new InFaultChainInitiatorObserver(bus);
outFaultObserver = new OutFaultChainInitiatorObserver(bus);
@@ -93,12 +93,12 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
getOutInterceptors().add(new MessageSenderInterceptor());
getOutFaultInterceptors().add(new MessageSenderInterceptor());
}
-
+
public String getBeanName() {
return endpointInfo.getName().toString() + ".endpoint";
}
-
-
+
+
public EndpointInfo getEndpointInfo() {
return endpointInfo;
}
@@ -141,9 +141,9 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
} catch (BusException ex) {
throw new EndpointException(ex);
}
- }
+ }
}
-
+
public MessageObserver getInFaultObserver() {
return inFaultObserver;
@@ -154,23 +154,23 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
}
public void setInFaultObserver(MessageObserver observer) {
- inFaultObserver = observer;
+ inFaultObserver = observer;
}
public void setOutFaultObserver(MessageObserver observer) {
outFaultObserver = observer;
-
+
}
-
+
/**
* Utility method to make it easy to set properties from Spring.
- *
+ *
* @param properties
*/
public void setProperties(Map<String, Object> properties) {
this.putAll(properties);
}
-
+
/**
* @return the list of features <b>already</b> activated for this endpoint.
*/
@@ -193,10 +193,10 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
if (!(obj instanceof EndpointImpl)) {
return false;
}
-
+
return super.equals(obj);
}
-
+
/**
* Returns the hashCode based on the EndpointInfo so that this object
* can be used as a map key.
@@ -205,7 +205,7 @@ public class EndpointImpl extends AbstractAttributedInterceptorProvider implemen
public int hashCode() {
return endpointInfo.hashCode();
}
-
+
public synchronized void addCleanupHook(Closeable c) {
if (cleanupHooks == null) {
cleanupHooks = new CopyOnWriteArrayList<Closeable>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
index ac19120..56a23bd 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointImplFactory.java
@@ -25,7 +25,7 @@ import org.apache.cxf.service.model.EndpointInfo;
/**
* This interface defines an object that can create EndpointImpl
- * objects.
+ * objects.
*/
public interface EndpointImplFactory {
/**
@@ -34,6 +34,6 @@ public interface EndpointImplFactory {
* @param service
* @param endpointInfo
*/
- EndpointImpl newEndpointImpl(Bus bus, Service service,
+ EndpointImpl newEndpointImpl(Bus bus, Service service,
EndpointInfo endpointInfo) throws EndpointException;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java
index a505110..826b1f8 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointResolver.java
@@ -54,18 +54,18 @@ public interface EndpointResolver {
*/
EndpointReferenceType renew(EndpointReferenceType logical,
EndpointReferenceType physical);
-
+
/**
* Mint a new abstract EPR for a given service name.
- *
+ *
* @param serviceName
* @return the newly minted EPR if appropriate, null otherwise
*/
EndpointReferenceType mint(QName serviceName);
-
+
/**
* Mint a new abstract EPR for a given concrete EPR
- *
+ *
* @param physical
* @return the newly minted EPR if appropriate, null otherwise
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java b/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java
index 4cdedc3..7989577 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/EndpointResolverRegistry.java
@@ -57,43 +57,43 @@ public interface EndpointResolverRegistry {
* This API is used by any actor that requires a concrete EPR (e.g.
* a transport-level Conduit), and must be called each and every
* time the EPR content is to be accessed (e.g. before each connection
- * establishment attempt).
+ * establishment attempt).
*
* @param logical the abstract EPR to resolve
*/
EndpointReferenceType resolve(EndpointReferenceType logical);
/**
- * Walk the list of registered EndpointResolvers, so as to force a fresh
- * resolution of the given abstract EPR, discarding any previously cached
+ * Walk the list of registered EndpointResolvers, so as to force a fresh
+ * resolution of the given abstract EPR, discarding any previously cached
* reference.
* <p>
* This API may be used by say the transport-level Conduit when it
* detects a non-transient error on the outgoing connection, or
* by any other actor in the dispatch with the ability to infer
* server-side unavailability.
- *
+ *
* @param logical the previously resolved abstract EPR
* @param physical the concrete EPR to refresh
* @return the renewed concrete EPR if appropriate, null otherwise
*/
EndpointReferenceType renew(EndpointReferenceType logical,
EndpointReferenceType physical);
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to mint a new
+ * Walk the list of registered EndpointResolvers, so as to mint a new
* abstract EPR for a given service name.
- *
- * @param serviceName
+ *
+ * @param serviceName
* @return the newly minted EPR if appropriate, null otherwise
*/
EndpointReferenceType mint(QName serviceName);
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to mint a new
+ * Walk the list of registered EndpointResolvers, so as to mint a new
* abstract EPR for a gievn physical EPR.
- *
- * @param physical
+ *
+ * @param physical
* @return the newly minted EPR if appropriate, null otherwise
*/
EndpointReferenceType mint(EndpointReferenceType physical);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java b/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
index 165f3b7..b0d0277 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ManagedEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.cxf.management.annotation.ManagedAttribute;
import org.apache.cxf.management.annotation.ManagedOperation;
import org.apache.cxf.management.annotation.ManagedResource;
-@ManagedResource(componentName = "Endpoint",
+@ManagedResource(componentName = "Endpoint",
description = "Responsible for managing server instances.")
public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListener {
@@ -41,17 +41,17 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
protected final Bus bus;
protected final Endpoint endpoint;
protected final Server server;
-
+
private enum State { CREATED, STARTED, STOPPED };
private State state = State.CREATED;
-
+
public ManagedEndpoint(Bus b, Endpoint ep, Server s) {
bus = b;
endpoint = ep;
server = s;
}
- @ManagedOperation
+ @ManagedOperation
public void start() {
if (state == State.STARTED) {
return;
@@ -62,12 +62,12 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
}
server.start();
}
-
+
@ManagedOperation
public void stop() {
server.stop();
}
-
+
@ManagedOperation
public void destroy() {
server.destroy();
@@ -77,24 +77,24 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
public String getAddress() {
return endpoint.getEndpointInfo().getAddress();
}
-
+
@ManagedAttribute(description = "TransportId Attribute", currencyTimeLimit = 60)
public String getTransportId() {
return endpoint.getEndpointInfo().getTransportId();
}
-
+
@ManagedAttribute(description = "Server State")
public String getState() {
return state.toString();
}
-
+
public ObjectName getObjectName() throws JMException {
String busId = bus.getId();
StringBuilder buffer = new StringBuilder();
buffer.append(ManagementConstants.DEFAULT_DOMAIN_NAME).append(':');
buffer.append(ManagementConstants.BUS_ID_PROP).append('=').append(busId).append(',');
buffer.append(ManagementConstants.TYPE_PROP).append('=').append("Bus.Service.Endpoint,");
-
+
String serviceName = (String)endpoint.get(SERVICE_NAME);
if (StringUtils.isEmpty(serviceName)) {
@@ -102,8 +102,8 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
}
serviceName = ObjectName.quote(serviceName);
buffer.append(ManagementConstants.SERVICE_NAME_PROP).append('=').append(serviceName).append(',');
-
-
+
+
String endpointName = (String)endpoint.get(ENDPOINT_NAME);
if (StringUtils.isEmpty(endpointName)) {
endpointName = endpoint.getEndpointInfo().getName().getLocalPart();
@@ -116,14 +116,14 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
}
// Added the instance id to make the ObjectName unique
buffer.append(ManagementConstants.INSTANCE_ID_PROP).append('=').append(instanceId);
-
+
//Use default domain name of server
return new ObjectName(buffer.toString());
}
public void startServer(Server s) {
if (server.equals(s)) {
- state = State.STARTED;
+ state = State.STARTED;
}
}
@@ -133,7 +133,7 @@ public class ManagedEndpoint implements ManagedComponent, ServerLifeCycleListene
// unregister server to avoid the memory leak
ServerLifeCycleManager mgr = bus.getExtension(ServerLifeCycleManager.class);
if (mgr != null) {
- mgr.unRegisterListener(this);
+ mgr.unRegisterListener(this);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java
index 5fffa9b..f06763a 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/NullConduitSelector.java
@@ -25,19 +25,19 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.transport.Conduit;
/**
- * Strategy for null Conduit retrieval.
+ * Strategy for null Conduit retrieval.
* An instance of this class is set on the Exchange to clear
- * the current ConduitSelector, as a work-around for broken
+ * the current ConduitSelector, as a work-around for broken
* Exchange.remove(ConduitSelector.class) semantics.
*/
@NoJSR250Annotations
public class NullConduitSelector implements ConduitSelector {
private Endpoint endpoint;
-
+
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
@@ -46,7 +46,7 @@ public class NullConduitSelector implements ConduitSelector {
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
@@ -56,13 +56,13 @@ public class NullConduitSelector implements ConduitSelector {
/**
* Called on completion of the MEP for which the Conduit was required.
- *
+ *
* @param exchange represents the completed MEP
*/
public void complete(Exchange exchange) {
// nothing to do
}
-
+
/**
* @return the encapsulated Endpoint
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java
index 1326f7d..e402875 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/PreexistingConduitSelector.java
@@ -29,7 +29,7 @@ import org.apache.cxf.transport.MessageObserver;
/**
- * Strategy for retreival of a pre-existing Conduit to mediate an
+ * Strategy for retreival of a pre-existing Conduit to mediate an
* outbound message.
*/
public class PreexistingConduitSelector implements
@@ -40,16 +40,16 @@ public class PreexistingConduitSelector implements
/**
* Constructor.
- *
+ *
* @param c the pre-existing Conduit.
*/
public PreexistingConduitSelector(Conduit c) {
this(c, null);
}
-
+
/**
* Constructor.
- *
+ *
* @param c the pre-existing Conduit.
* @param e the target Endpoint
*/
@@ -60,11 +60,11 @@ public class PreexistingConduitSelector implements
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
- MessageObserver observer =
+ MessageObserver observer =
message.getExchange().get(MessageObserver.class);
if (observer != null) {
selectedConduit.setMessageObserver(observer);
@@ -73,7 +73,7 @@ public class PreexistingConduitSelector implements
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
@@ -83,7 +83,7 @@ public class PreexistingConduitSelector implements
/**
* Called on completion of the MEP for which the Conduit was required.
- *
+ *
* @param exchange represents the completed MEP
*/
public void complete(Exchange exchange) {
@@ -95,7 +95,7 @@ public class PreexistingConduitSelector implements
//IGNORE
}
}
-
+
/**
* @return the encapsulated Endpoint
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/Retryable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/Retryable.java b/core/src/main/java/org/apache/cxf/endpoint/Retryable.java
index 775394c..519c31d 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/Retryable.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/Retryable.java
@@ -29,7 +29,7 @@ import org.apache.cxf.service.model.BindingOperationInfo;
*/
public interface Retryable {
Object[] invoke(BindingOperationInfo oi,
- Object[] params,
+ Object[] params,
Map<String, Object> context,
Exchange exchange) throws Exception;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/Server.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/Server.java b/core/src/main/java/org/apache/cxf/endpoint/Server.java
index d5d2981..42fc2ec 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/Server.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/Server.java
@@ -24,14 +24,14 @@ import org.apache.cxf.transport.Destination;
public interface Server {
void start();
-
+
void stop();
-
+
void destroy();
-
+
boolean isStarted();
-
+
Destination getDestination();
-
+
Endpoint getEndpoint();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
index 5180594..dea9686 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
@@ -39,7 +39,7 @@ import org.apache.cxf.transport.MessageObserver;
import org.apache.cxf.transport.MultipleEndpointObserver;
public class ServerImpl implements Server {
- private static final Logger LOG = LogUtils.getL7dLogger(ServerImpl.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(ServerImpl.class);
protected final Endpoint endpoint;
protected final Bus bus;
@@ -52,22 +52,22 @@ public class ServerImpl implements Server {
private ManagedEndpoint mep;
private boolean stopped = true;
- public ServerImpl(Bus bus,
- Endpoint endpoint,
- DestinationFactory destinationFactory,
+ public ServerImpl(Bus bus,
+ Endpoint endpoint,
+ DestinationFactory destinationFactory,
BindingFactory bindingFactory) throws BusException, IOException {
this.endpoint = endpoint;
this.bus = bus;
this.bindingFactory = bindingFactory;
-
+
initDestination(destinationFactory);
}
private void initDestination(DestinationFactory destinationFactory) throws BusException, IOException {
EndpointInfo ei = endpoint.getEndpointInfo();
-
+
//Treat local transport as a special case, transports loaded by transportId can be replaced
- //by local transport when the publishing address is a local transport protocol.
+ //by local transport when the publishing address is a local transport protocol.
//Of course its not an ideal situation here to use a hard-coded prefix. To be refactored.
if (destinationFactory == null) {
if (ei.getAddress() != null && ei.getAddress().indexOf("local://") != -1) {
@@ -80,20 +80,20 @@ public class ServerImpl implements Server {
.getDestinationFactory(ei.getTransportId());
}
}
-
+
destination = destinationFactory.getDestination(ei, bus);
LOG.info("Setting the server's publish address to be " + ei.getAddress());
serverRegistry = bus.getExtension(ServerRegistry.class);
-
+
mep = createManagedEndpoint();
-
+
slcMgr = bus.getExtension(ServerLifeCycleManager.class);
if (slcMgr != null) {
slcMgr.registerListener(mep);
}
-
- iMgr = bus.getExtension(InstrumentationManager.class);
- if (iMgr != null) {
+
+ iMgr = bus.getExtension(InstrumentationManager.class);
+ if (iMgr != null) {
try {
iMgr.register(mep);
} catch (JMException jmex) {
@@ -101,7 +101,7 @@ public class ServerImpl implements Server {
}
}
}
-
+
protected ManagedEndpoint createManagedEndpoint() {
return new ManagedEndpoint(bus, endpoint, this);
}
@@ -119,9 +119,9 @@ public class ServerImpl implements Server {
return;
}
LOG.fine("Server is starting.");
-
+
bindingFactory.addListener(destination, endpoint);
-
+
// register the active server to run
if (null != serverRegistry) {
LOG.fine("register the server to serverRegistry ");
@@ -138,7 +138,7 @@ public class ServerImpl implements Server {
}
stopped = false;
}
-
+
public boolean isStopped() {
return stopped;
}
@@ -150,9 +150,9 @@ public class ServerImpl implements Server {
if (stopped) {
return;
}
-
+
LOG.fine("Server is stopping.");
-
+
for (Closeable c : endpoint.getCleanupHooks()) {
try {
c.close();
@@ -163,7 +163,7 @@ public class ServerImpl implements Server {
if (slcMgr != null) {
slcMgr.stopServer(this);
}
-
+
MessageObserver mo = getDestination().getMessageObserver();
if (mo instanceof MultipleEndpointObserver) {
((MultipleEndpointObserver)mo).getEndpoints().remove(endpoint);
@@ -172,10 +172,10 @@ public class ServerImpl implements Server {
}
} else {
getDestination().setMessageObserver(null);
- }
+ }
stopped = true;
}
-
+
public void destroy() {
stop();
// we should shutdown the destination here
@@ -186,7 +186,7 @@ public class ServerImpl implements Server {
serverRegistry.unregister(this);
}
- if (iMgr != null) {
+ if (iMgr != null) {
try {
iMgr.unregister(mep);
} catch (JMException jmex) {
@@ -194,11 +194,11 @@ public class ServerImpl implements Server {
}
iMgr = null;
}
-
+
}
public Endpoint getEndpoint() {
return endpoint;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java b/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java
index 5e3a9bc..5c91911 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleListener.java
@@ -21,5 +21,5 @@ package org.apache.cxf.endpoint;
public interface ServerLifeCycleListener {
void startServer(Server server);
- void stopServer(Server server);
+ void stopServer(Server server);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java b/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java
index 005103b..a107b8b 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServerLifeCycleManager.java
@@ -20,7 +20,7 @@
package org.apache.cxf.endpoint;
-public interface ServerLifeCycleManager {
+public interface ServerLifeCycleManager {
void startServer(Server server);
void stopServer(Server server);
void registerListener(ServerLifeCycleListener listener);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java b/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
index 6ab6fd1..8a76678 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolver.java
@@ -30,9 +30,9 @@ import javax.xml.namespace.QName;
public interface ServiceContractResolver {
/**
- * Resolves a service's QName to a URI representing the location of a WSDL
- * contract. This method is called by the
- * <code>ServiceContractResolverRegistry</code> with which the contract
+ * Resolves a service's QName to a URI representing the location of a WSDL
+ * contract. This method is called by the
+ * <code>ServiceContractResolverRegistry</code> with which the contract
* resolver is registered.
*
* @param qname the QName being mapped to a URI
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java b/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
index 1c5c56c..9bc26b8 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ServiceContractResolverRegistry.java
@@ -29,9 +29,9 @@ import javax.xml.namespace.QName;
public interface ServiceContractResolverRegistry {
/**
- * Resolves a service's QName to a URI representing the location of a
- * WSDL contract. The registry method is called by the bus and should use
- * the <code>getContractLocation</code> methods of the registered contract
+ * Resolves a service's QName to a URI representing the location of a
+ * WSDL contract. The registry method is called by the bus and should use
+ * the <code>getContractLocation</code> methods of the registered contract
* resolvers to do the actual resolution.
*
* @param qname the service qname to resolve into a URI
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java b/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
index f8ce861..46d73d3 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/SimpleEndpointImplFactory.java
@@ -27,13 +27,13 @@ import org.apache.cxf.service.model.EndpointInfo;
* Create ordinary EndpointImpl objects.
*/
public class SimpleEndpointImplFactory implements EndpointImplFactory {
-
- private static EndpointImplFactory singleton
+
+ private static EndpointImplFactory singleton
= new SimpleEndpointImplFactory();
/** {@inheritDoc}
*/
- public EndpointImpl newEndpointImpl(Bus bus,
+ public EndpointImpl newEndpointImpl(Bus bus,
Service service, EndpointInfo endpointInfo) throws EndpointException {
return new EndpointImpl(bus, service, endpointInfo);
}
@@ -46,5 +46,5 @@ public class SimpleEndpointImplFactory implements EndpointImplFactory {
public static EndpointImplFactory getSingleton() {
return singleton;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java
index 84ccce9..5ba76be 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/UpfrontConduitSelector.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
+
package org.apache.cxf.endpoint;
import java.util.logging.Logger;
@@ -28,24 +28,24 @@ import org.apache.cxf.transport.Conduit;
/**
- * Strategy for eager upfront retreival of a Conduit to mediate an
+ * Strategy for eager upfront retreival of a Conduit to mediate an
* outbound message.
*/
public class UpfrontConduitSelector extends AbstractConduitSelector {
private static final Logger LOG =
LogUtils.getL7dLogger(UpfrontConduitSelector.class);
-
+
/**
* Normal constructor.
*/
public UpfrontConduitSelector() {
super();
}
-
+
/**
* Constructor, allowing a specific conduit to override normal selection.
- *
+ *
* @param c specific conduit
*/
public UpfrontConduitSelector(Conduit c) {
@@ -54,7 +54,7 @@ public class UpfrontConduitSelector extends AbstractConduitSelector {
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
@@ -64,10 +64,10 @@ public class UpfrontConduitSelector extends AbstractConduitSelector {
message.put(Conduit.class, c);
}
}
-
+
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
@@ -79,7 +79,7 @@ public class UpfrontConduitSelector extends AbstractConduitSelector {
}
return c;
}
-
+
/**
* @return the logger to use
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/extension/BusExtension.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/extension/BusExtension.java b/core/src/main/java/org/apache/cxf/extension/BusExtension.java
index 23c8b72..63157a6 100644
--- a/core/src/main/java/org/apache/cxf/extension/BusExtension.java
+++ b/core/src/main/java/org/apache/cxf/extension/BusExtension.java
@@ -20,6 +20,6 @@
package org.apache.cxf.extension;
public interface BusExtension {
-
+
Class<?> getRegistrationType();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/extension/Registry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/extension/Registry.java b/core/src/main/java/org/apache/cxf/extension/Registry.java
index 59ab855..1090409 100644
--- a/core/src/main/java/org/apache/cxf/extension/Registry.java
+++ b/core/src/main/java/org/apache/cxf/extension/Registry.java
@@ -20,13 +20,13 @@
package org.apache.cxf.extension;
/**
- *
+ *
*/
public interface Registry<K, T> {
-
+
/**
- * Registers an object of type T with this registry.
- *
+ * Registers an object of type T with this registry.
+ *
* @param k the key under which rto register the object
* @param t the object to register
*/
@@ -34,8 +34,8 @@ public interface Registry<K, T> {
/**
* Unregisters the object stored under the given key from this registry.
- *
- * @param k the key
+ *
+ * @param k the key
*/
void unregister(K k);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java b/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
index 0a79915..a16ac7c 100644
--- a/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/extension/RegistryImpl.java
@@ -23,16 +23,16 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- *
+ *
*/
public class RegistryImpl<K, T> implements Registry<K, T> {
-
+
protected final Map<K, T> entries;
-
+
protected RegistryImpl() {
this(null);
}
-
+
protected RegistryImpl(Map<K, T> e) {
if (null == e) {
e = new ConcurrentHashMap<K, T>(16, 0.75f, 4);
@@ -58,7 +58,7 @@ public class RegistryImpl<K, T> implements Registry<K, T> {
return entries.get(k);
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java b/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
index 9a22a0b..c6ff44d 100644
--- a/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/AbstractFeature.java
@@ -32,7 +32,7 @@ import org.apache.cxf.interceptor.InterceptorProvider;
* adding capabilities. For instance, there may be a LoggingFeature which configures
* one of the above to log each of their messages.
* <p>
- * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
+ * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
* If you're simply adding interceptors to a Server, Client, or Bus, this allows you to add
* them easily.
*/
@@ -40,30 +40,30 @@ public abstract class AbstractFeature extends WebServiceFeature implements Featu
public String getID() {
return getClass().getName();
}
-
+
public void initialize(Server server, Bus bus) {
initializeProvider(server.getEndpoint(), bus);
}
-
+
public void initialize(Client client, Bus bus) {
initializeProvider(client, bus);
}
-
+
public void initialize(InterceptorProvider interceptorProvider, Bus bus) {
initializeProvider(interceptorProvider, bus);
}
-
+
public void initialize(Bus bus) {
initializeProvider(bus, bus);
}
-
+
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-
+
}
/**
* Convenience method to extract a feature by type from an active list.
- *
+ *
* @param features the given feature list
* @param type the feature type required
* @return the feature of the specified type if active
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java b/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java
index 91bdc74..a18841d 100644
--- a/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/FastInfosetFeature.java
@@ -50,11 +50,11 @@ public class FastInfosetFeature extends AbstractFeature {
public FastInfosetFeature() {
//
}
-
-
+
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-
+
FIStaxInInterceptor in = new FIStaxInInterceptor();
FIStaxOutInterceptor out = new FIStaxOutInterceptor(force);
@@ -78,7 +78,7 @@ public class FastInfosetFeature extends AbstractFeature {
if (serializerMaxCharacterContentChunkSize != null && serializerMaxCharacterContentChunkSize.intValue() > 0) {
out.setSerializerMaxCharacterContentChunkSize(serializerMaxCharacterContentChunkSize);
}
-
+
provider.getInInterceptors().add(in);
provider.getInFaultInterceptors().add(in);
provider.getOutInterceptors().add(out);
@@ -86,17 +86,17 @@ public class FastInfosetFeature extends AbstractFeature {
}
/**
- * Set if FastInfoset is always used without negotiation
+ * Set if FastInfoset 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/feature/Feature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/Feature.java b/core/src/main/java/org/apache/cxf/feature/Feature.java
index 1b8962c..5c8a401 100644
--- a/core/src/main/java/org/apache/cxf/feature/Feature.java
+++ b/core/src/main/java/org/apache/cxf/feature/Feature.java
@@ -28,16 +28,16 @@ import org.apache.cxf.interceptor.InterceptorProvider;
* adding capabilities. For instance, there may be a LoggingFeature which configures
* one of the above to log each of their messages.
* <p>
- * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
+ * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
* If you're simply adding interceptors to a Server, Client, or Bus, this allows you to add
* them easily.
*/
public interface Feature {
void initialize(Server server, Bus bus);
-
+
void initialize(Client client, Bus bus);
-
+
void initialize(InterceptorProvider interceptorProvider, Bus bus);
-
+
void initialize(Bus bus);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/Features.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/Features.java b/core/src/main/java/org/apache/cxf/feature/Features.java
index 7e82423..97ad9c8 100644
--- a/core/src/main/java/org/apache/cxf/feature/Features.java
+++ b/core/src/main/java/org/apache/cxf/feature/Features.java
@@ -29,6 +29,6 @@ import java.lang.annotation.Target;
@Inherited
public @interface Features {
String[] features() default { };
-
+
Class<? extends Feature>[] classes() default { };
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
index dbd6638..c85ab6f 100644
--- a/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/LoggingFeature.java
@@ -29,11 +29,11 @@ import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
/**
- * This class is used to control message-on-the-wire logging.
+ * This class is used to control message-on-the-wire logging.
* By attaching this feature to an endpoint, you
* can specify logging. If this feature is present, an endpoint will log input
* and output of ordinary and log messages.
- *
+ *
* <pre>
* <![CDATA[
<jaxws:endpoint ...>
@@ -43,8 +43,8 @@ import org.apache.cxf.interceptor.LoggingOutInterceptor;
</jaxws:endpoint>
]]>
</pre>
- *
- * @deprecated use the logging module rt/features/logging instead
+ *
+ * @deprecated use the logging module rt/features/logging instead
*/
@NoJSR250Annotations
@Deprecated
@@ -53,17 +53,17 @@ public class LoggingFeature extends AbstractFeature {
private static final int DEFAULT_LIMIT = AbstractLoggingInterceptor.DEFAULT_LIMIT;
private static final LoggingInInterceptor IN = new LoggingInInterceptor(DEFAULT_LIMIT);
private static final LoggingOutInterceptor OUT = new LoggingOutInterceptor(DEFAULT_LIMIT);
-
-
+
+
String inLocation;
String outLocation;
boolean prettyLogging;
boolean showBinary;
-
+
int limit = DEFAULT_LIMIT;
public LoggingFeature() {
-
+
}
public LoggingFeature(int lim) {
limit = lim;
@@ -84,7 +84,7 @@ public class LoggingFeature extends AbstractFeature {
limit = lim;
prettyLogging = p;
}
-
+
public LoggingFeature(String in, String out, int lim, boolean p, boolean showBinary) {
this(in, out, lim, p);
this.showBinary = showBinary;
@@ -100,7 +100,7 @@ public class LoggingFeature extends AbstractFeature {
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
- if (limit == DEFAULT_LIMIT && inLocation == null
+ if (limit == DEFAULT_LIMIT && inLocation == null
&& outLocation == null && !prettyLogging) {
provider.getInInterceptors().add(IN);
provider.getInFaultInterceptors().add(IN);
@@ -115,7 +115,7 @@ public class LoggingFeature extends AbstractFeature {
out.setOutputLocation(outLocation);
out.setPrettyLogging(prettyLogging);
out.setShowBinaryContent(showBinary);
-
+
provider.getInInterceptors().add(in);
provider.getInFaultInterceptors().add(in);
provider.getOutInterceptors().add(out);
@@ -130,14 +130,14 @@ public class LoggingFeature extends AbstractFeature {
public void setLimit(int lim) {
limit = lim;
}
-
+
/**
* Retrieve the value set with {@link #setLimit(int)}.
*/
public int getLimit() {
return limit;
}
-
+
/**
*/
public boolean isPrettyLogging() {
@@ -149,5 +149,5 @@ public class LoggingFeature extends AbstractFeature {
*/
public void setPrettyLogging(boolean prettyLogging) {
this.prettyLogging = prettyLogging;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java b/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java
index 2a9bf83..398b6b8 100644
--- a/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/StaxTransformFeature.java
@@ -40,17 +40,17 @@ import org.apache.cxf.interceptor.transform.TransformOutInterceptor;
*/
@NoJSR250Annotations
public class StaxTransformFeature extends AbstractFeature {
-
+
private TransformInInterceptor in = new TransformInInterceptor();
private TransformOutInterceptor out = new TransformOutInterceptor();
-
+
public StaxTransformFeature() {
//
}
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-
+
provider.getInInterceptors().add(in);
provider.getOutInterceptors().add(out);
provider.getOutFaultInterceptors().add(out);
@@ -71,7 +71,7 @@ public class StaxTransformFeature extends AbstractFeature {
public void setSkipOnFault(boolean value) {
out.setSkipOnFault(value);
}
-
+
public void setOutAppendElements(Map<String, String> map) {
out.setOutAppendElements(map);
}
@@ -83,23 +83,23 @@ public class StaxTransformFeature extends AbstractFeature {
public void setInAppendElements(Map<String, String> inElements) {
in.setInAppendElements(inElements);
}
-
+
public void setInDropElements(List<String> dropElementsSet) {
in.setInDropElements(dropElementsSet);
}
-
+
public void setInTransformElements(Map<String, String> inElements) {
in.setInTransformElements(inElements);
}
-
+
public void setInTransformAttributes(Map<String, String> inAttributes) {
in.setInTransformAttributes(inAttributes);
}
-
+
public void setOutDefaultNamespace(String ns) {
out.setDefaultNamespace(ns);
}
-
+
public void setContextPropertyName(String propertyName) {
in.setContextPropertyName(propertyName);
out.setContextPropertyName(propertyName);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java b/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java
index ba8aa78..18ec628 100644
--- a/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/WrappedFeature.java
@@ -28,7 +28,7 @@ import org.apache.cxf.interceptor.InterceptorProvider;
* adding capabilities. For instance, there may be a LoggingFeature which configures
* one of the above to log each of their messages.
* <p>
- * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
+ * By default the initialize methods all delegate to initializeProvider(InterceptorProvider).
* If you're simply adding interceptors to a Server, Client, or Bus, this allows you to add
* them easily.
*/
@@ -37,21 +37,21 @@ public class WrappedFeature extends AbstractFeature {
public WrappedFeature(Feature f) {
wrapped = f;
}
-
+
public void initialize(Server server, Bus bus) {
wrapped.initialize(server, bus);
}
-
+
public void initialize(Client client, Bus bus) {
wrapped.initialize(client, bus);
}
-
+
public void initialize(InterceptorProvider interceptorProvider, Bus bus) {
wrapped.initialize(interceptorProvider, bus);
}
-
+
public void initialize(Bus bus) {
wrapped.initialize(bus);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
index 562e7b1..a1045b6 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/AbstractXSLTInterceptor.java
@@ -53,7 +53,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor<M
private String contextPropertyName;
private final Templates xsltTemplate;
-
+
public AbstractXSLTInterceptor(String phase, Class<?> before, Class<?> after, String xsltPath) {
super(phase);
if (before != null) {
@@ -62,7 +62,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor<M
if (after != null) {
addAfter(after.getName());
}
-
+
try {
InputStream xsltStream = ClassLoaderUtils.getResourceAsStream(xsltPath, this.getClass());
if (xsltStream == null) {
@@ -78,7 +78,7 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor<M
throw new IllegalArgumentException(
String.format("Cannot create XSLT template from path: %s",
xsltPath), e);
- }
+ }
}
public void setContextPropertyName(String propertyName) {
@@ -86,10 +86,10 @@ public abstract class AbstractXSLTInterceptor extends AbstractPhaseInterceptor<M
}
protected boolean checkContextProperty(Message message) {
- return contextPropertyName != null
+ return contextPropertyName != null
&& !MessageUtils.getContextualBoolean(message, contextPropertyName, false);
}
-
+
protected Templates getXSLTTemplate() {
return xsltTemplate;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java
index 511a61c..f09d47b 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTFeature.java
@@ -24,28 +24,28 @@ import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
/**
- * This class defines a feature is used to transform message using XSLT script.
+ * This class defines a feature is used to transform message using XSLT script.
* If this feature is present and inXSLTPath/outXLSTPath are initialised,
- * client and endpoint will transform incoming and outgoing messages correspondingly.
- * Attention: actually the feature breaks streaming
- * (can be fixed in further versions when XSLT engine supports XML stream).
+ * client and endpoint will transform incoming and outgoing messages correspondingly.
+ * Attention: actually the feature breaks streaming
+ * (can be fixed in further versions when XSLT engine supports XML stream).
*/
@NoJSR250Annotations
public class XSLTFeature extends AbstractFeature {
private String inXSLTPath;
private String outXSLTPath;
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
if (inXSLTPath != null) {
XSLTInInterceptor in = new XSLTInInterceptor(inXSLTPath);
- provider.getInInterceptors().add(in);
+ provider.getInInterceptors().add(in);
}
-
+
if (outXSLTPath != null) {
XSLTOutInterceptor out = new XSLTOutInterceptor(outXSLTPath);
- provider.getOutInterceptors().add(out);
- provider.getOutFaultInterceptors().add(out);
+ provider.getOutInterceptors().add(out);
+ provider.getOutFaultInterceptors().add(out);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
index 5430055..7e23d31 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTInInterceptor.java
@@ -41,7 +41,7 @@ import org.apache.cxf.staxutils.StaxUtils;
* Actually it breaks streaming (can be fixed in further versions when XSLT engine supports XML stream)
*/
public class XSLTInInterceptor extends AbstractXSLTInterceptor {
- private static final Logger LOG = LogUtils.getL7dLogger(XSLTInInterceptor.class);
+ private static final Logger LOG = LogUtils.getL7dLogger(XSLTInInterceptor.class);
public XSLTInInterceptor(String xsltPath) {
super(Phase.POST_STREAM, StaxInInterceptor.class, null, xsltPath);
@@ -100,7 +100,7 @@ public class XSLTInInterceptor extends AbstractXSLTInterceptor {
}
}
}
-
+
protected void transformIS(Message message, InputStream is) {
try {
InputStream transformedIS = XSLTUtils.transform(getXSLTTemplate(), is);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
index 6044498..1562008 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
@@ -154,7 +154,7 @@ public class XSLTOutInterceptor extends AbstractXSLTInterceptor {
}
@Override
- public void onFlush(CachedOutputStream wrapper) {
+ public void onFlush(CachedOutputStream wrapper) {
}
@Override
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java b/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
index 0f495ef..ac37c97 100644
--- a/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
+++ b/core/src/main/java/org/apache/cxf/feature/transform/XSLTUtils.java
@@ -109,7 +109,7 @@ public final class XSLTUtils {
public static Document transform(Templates xsltTemplate, Document in) {
try {
DOMSource beforeSource = new DOMSource(in);
-
+
Document out = DOMUtils.createDocument();
Transformer trans = xsltTemplate.newTransformer();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java b/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
index 1c00d86..8490c56 100644
--- a/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
+++ b/core/src/main/java/org/apache/cxf/feature/validation/DefaultSchemaValidationTypeProvider.java
@@ -30,9 +30,9 @@ import org.apache.cxf.service.model.OperationInfo;
* names ignore any namespaces
*/
public class DefaultSchemaValidationTypeProvider implements SchemaValidationTypeProvider {
- private final Map<String, SchemaValidationType> operationMap =
+ private final Map<String, SchemaValidationType> operationMap =
new HashMap<String, SchemaValidationType>();
-
+
public DefaultSchemaValidationTypeProvider(Map<String, SchemaValidationType> operationMap) {
this.operationMap.putAll(operationMap);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java b/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java
index c314eaf..12ec4d5 100644
--- a/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java
+++ b/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationFeature.java
@@ -34,19 +34,19 @@ import org.apache.cxf.service.model.BindingOperationInfo;
*/
public class SchemaValidationFeature extends AbstractFeature {
private final SchemaValidationTypeProvider provider;
-
+
public SchemaValidationFeature(final SchemaValidationTypeProvider provider) {
this.provider = provider;
}
-
+
public void initialize(Server server, Bus bus) {
initialise(server.getEndpoint());
}
-
+
public void initialize(Client client, Bus bus) {
initialise(client.getEndpoint());
}
-
+
private void initialise(Endpoint endpoint) {
for (BindingOperationInfo bop : endpoint.getEndpointInfo().getBinding().getOperations()) {
SchemaValidationType type = provider.getSchemaValidationType(bop.getOperationInfo());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java b/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java
index 1e40825..4688c8d 100644
--- a/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java
+++ b/core/src/main/java/org/apache/cxf/feature/validation/SchemaValidationTypeProvider.java
@@ -23,7 +23,7 @@ import org.apache.cxf.service.model.OperationInfo;
/**
* Returning null from the getSchemaValidationType will be ignored. This generally
- * will mean, it falls back to the service endpoint default, whether configured
+ * will mean, it falls back to the service endpoint default, whether configured
* by @SchemaValidation or a endpoint property.
*/
public interface SchemaValidationTypeProvider {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/headers/Header.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/headers/Header.java b/core/src/main/java/org/apache/cxf/headers/Header.java
index 96edf05..00763ed 100644
--- a/core/src/main/java/org/apache/cxf/headers/Header.java
+++ b/core/src/main/java/org/apache/cxf/headers/Header.java
@@ -23,31 +23,31 @@ import javax.xml.namespace.QName;
import org.apache.cxf.databinding.DataBinding;
public class Header {
- public enum Direction {
- DIRECTION_IN,
- DIRECTION_OUT,
- DIRECTION_INOUT
+ public enum Direction {
+ DIRECTION_IN,
+ DIRECTION_OUT,
+ DIRECTION_INOUT
};
-
+
public static final String HEADER_LIST = Header.class.getName() + ".list";
-
-
+
+
private DataBinding dataBinding;
private QName name;
private Object object;
-
+
private Direction direction = Header.Direction.DIRECTION_OUT;
public Header(QName q, Object o) {
this(q, o, null);
}
-
+
public Header(QName q, Object o, DataBinding b) {
object = o;
name = q;
dataBinding = b;
}
-
+
public DataBinding getDataBinding() {
return dataBinding;
}
@@ -66,13 +66,13 @@ public class Header {
public void setObject(Object object) {
this.object = object;
}
-
+
public void setDirection(Direction hdrDirection) {
this.direction = hdrDirection;
}
-
+
public Direction getDirection() {
return direction;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/headers/HeaderManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/headers/HeaderManager.java b/core/src/main/java/org/apache/cxf/headers/HeaderManager.java
index ac641f1..5d723de 100644
--- a/core/src/main/java/org/apache/cxf/headers/HeaderManager.java
+++ b/core/src/main/java/org/apache/cxf/headers/HeaderManager.java
@@ -19,8 +19,8 @@
package org.apache.cxf.headers;
public interface HeaderManager {
-
+
void registerHeaderProcessor(HeaderProcessor processor);
-
+
HeaderProcessor getHeaderProcessor(String namespace);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java b/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java
index f93a039..e910d09 100644
--- a/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java
+++ b/core/src/main/java/org/apache/cxf/headers/HeaderProcessor.java
@@ -22,11 +22,11 @@ import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.interceptor.InterceptorProvider;
public interface HeaderProcessor {
-
+
String getNamespace();
-
+
DataBinding getDataBinding();
-
+
InterceptorProvider getInterceptorProvider();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/CastUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/CastUtils.java b/core/src/main/java/org/apache/cxf/helpers/CastUtils.java
index 411b42a..958ef5f 100644
--- a/core/src/main/java/org/apache/cxf/helpers/CastUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/CastUtils.java
@@ -29,11 +29,11 @@ import java.util.Set;
@SuppressWarnings("unchecked")
public final class CastUtils {
-
+
private CastUtils() {
//utility class, never constructed
}
-
+
public static <T, U> Map<T, U> cast(Map<?, ?> p) {
return (Map<T, U>)p;
}
@@ -47,7 +47,7 @@ public final class CastUtils {
public static <T, U> Dictionary<T, U> cast(Dictionary<?, ?> p, Class<T> t, Class<U> u) {
return (Dictionary<T, U>)p;
}
-
+
public static <T> Collection<T> cast(Collection<?> p) {
return (Collection<T>)p;
}
@@ -57,7 +57,7 @@ public final class CastUtils {
public static <T> List<T> cast(List<?> p) {
return (List<T>)p;
}
-
+
public static <T> List<T> cast(List<?> p, Class<T> cls) {
return (List<T>)p;
}
@@ -65,7 +65,7 @@ public final class CastUtils {
public static <T> Iterator<T> cast(Iterator<?> p) {
return (Iterator<T>)p;
}
-
+
public static <T> Iterator<T> cast(Iterator<?> p, Class<T> cls) {
return (Iterator<T>)p;
}
@@ -73,7 +73,7 @@ public final class CastUtils {
public static <T> Enumeration<T> cast(Enumeration<?> p) {
return (Enumeration<T>)p;
}
-
+
public static <T> Enumeration<T> cast(Enumeration<?> p, Class<T> cls) {
return (Enumeration<T>)p;
}
@@ -92,5 +92,5 @@ public final class CastUtils {
return (Map.Entry<T, U>)p;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
index 0853716..0c48392 100644
--- a/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/DOMUtils.java
@@ -78,7 +78,7 @@ public final class DOMUtils {
}
return factory;
}
-
+
/**
* Creates a new Document object
* @throws ParserConfigurationException
@@ -94,10 +94,10 @@ public final class DOMUtils {
}
}
-
+
/**
* This function is much like getAttribute, but returns null, not "", for a nonexistent attribute.
- *
+ *
* @param e
* @param attributeName
*/
@@ -159,7 +159,7 @@ public final class DOMUtils {
b = new StringBuilder(s).append(((Text)n1).getNodeValue());
s = null;
}
- }
+ }
n1 = n1.getNextSibling();
}
if (b != null) {
@@ -170,7 +170,7 @@ public final class DOMUtils {
/**
* Get the first element child.
- *
+ *
* @param parent lookup direct childs
* @param name name of the element. If null return the first element.
*/
@@ -200,7 +200,7 @@ public final class DOMUtils {
return null;
}
-
+
public static boolean hasAttribute(Element element, String value) {
NamedNodeMap attributes = element.getAttributes();
for (int i = 0; i < attributes.getLength(); i++) {
@@ -210,7 +210,7 @@ public final class DOMUtils {
}
}
return false;
- }
+ }
public static String getAttribute(Node element, String attName) {
NamedNodeMap attrs = element.getAttributes();
if (attrs == null) {
@@ -261,7 +261,7 @@ public final class DOMUtils {
/**
* Find the first direct child with a given attribute.
- *
+ *
* @param parent
* @param elemName name of the element, or null for any
* @param attName attribute we're looking for
@@ -305,7 +305,7 @@ public final class DOMUtils {
public static QName getElementQName(Element el) {
return new QName(el.getNamespaceURI(), el.getLocalName());
}
-
+
/**
* Creates a QName object based on the qualified name
* and using the Node as a base to lookup the namespace
@@ -334,17 +334,17 @@ public final class DOMUtils {
return new QName(ns, localName, prefix);
}
-
+
public static QName convertStringToQName(String expandedQName) {
return convertStringToQName(expandedQName, "");
}
-
+
public static QName convertStringToQName(String expandedQName, String prefix) {
int ind1 = expandedQName.indexOf('{');
if (ind1 != 0) {
return new QName(expandedQName);
}
-
+
int ind2 = expandedQName.indexOf('}');
if (ind2 <= ind1 + 1 || ind2 >= expandedQName.length() - 1) {
return null;
@@ -362,8 +362,8 @@ public final class DOMUtils {
}
}
return dropElements;
- }
-
+ }
+
/**
* Get the first direct child with a given type
@@ -392,7 +392,7 @@ public final class DOMUtils {
/**
* Return the first element child with the specified qualified name.
- *
+ *
* @param parent
* @param q
*/
@@ -404,7 +404,7 @@ public final class DOMUtils {
/**
* Return the first element child with the specified qualified name.
- *
+ *
* @param parent
* @param ns
* @param lp
@@ -424,7 +424,7 @@ public final class DOMUtils {
/**
* Return child elements with specified name.
- *
+ *
* @param parent
* @param ns
* @param localName
@@ -442,10 +442,10 @@ public final class DOMUtils {
}
return r;
}
-
+
/**
* Returns all child elements with specified namespace.
- *
+ *
* @param parent the element to search under
* @param ns the namespace to find elements in
* @return all child elements with specified namespace
@@ -466,7 +466,7 @@ public final class DOMUtils {
/**
* Get the first child of the specified type.
- *
+ *
* @param parent
* @param type
*/
@@ -520,7 +520,7 @@ public final class DOMUtils {
return new InputSource(new StringReader(""));
}
}
-
+
public static String getPrefixRecursive(Element el, String ns) {
String prefix = getPrefix(el, ns);
if (prefix == null && el.getParentNode() instanceof Element) {
@@ -544,7 +544,7 @@ public final class DOMUtils {
/**
* Get all prefixes defined, up to the root, for a namespace URI.
- *
+ *
* @param element
* @param namespaceUri
* @param prefixes
@@ -559,7 +559,7 @@ public final class DOMUtils {
/**
* Get all prefixes defined on this element for the specified namespace.
- *
+ *
* @param element
* @param namespaceUri
* @param prefixes
@@ -590,7 +590,7 @@ public final class DOMUtils {
/**
* Starting from a node, find the namespace declaration for a prefix. for a matching namespace
* declaration.
- *
+ *
* @param node search up from here to search for namespace definitions
* @param searchPrefix the prefix we are searching for
* @return the namespace if found.
@@ -623,7 +623,7 @@ public final class DOMUtils {
return null;
}
-
+
public static List<Element> findAllElementsByTagNameNS(Element elem, String nameSpaceURI,
String localName) {
List<Element> ret = new LinkedList<Element>();
@@ -694,7 +694,7 @@ public final class DOMUtils {
* Set a namespace/prefix on an element if it is not set already. First off, it searches for the element
* for the prefix associated with the specified namespace. If the prefix isn't null, then this is
* returned. Otherwise, it creates a new attribute using the namespace/prefix passed as parameters.
- *
+ *
* @param element
* @param namespace
* @param prefix
@@ -711,7 +711,7 @@ public final class DOMUtils {
/**
* Add a namespace prefix definition to an element.
- *
+ *
* @param element
* @param namespaceUri
* @param prefix
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
index 6d9f388..df5c5ed 100644
--- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
@@ -41,13 +41,13 @@ public final class FileUtils {
private static final int RETRY_SLEEP_MILLIS = 10;
private static File defaultTempDir;
private static Thread shutdownHook;
- private static final char[] ILLEGAL_CHARACTERS
- = {'/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':'};
-
+ private static final char[] ILLEGAL_CHARACTERS
+ = {'/', '\n', '\r', '\t', '\0', '\f', '`', '?', '*', '\\', '<', '>', '|', '\"', ':'};
+
private FileUtils() {
-
+
}
-
+
public boolean isValidFileName(String name) {
for (int i = name.length(); i > 0; i--) {
char c = name.charAt(i - 1);
@@ -77,19 +77,19 @@ public final class FileUtils {
&& defaultTempDir.exists()) {
return defaultTempDir;
}
-
+
String s = SystemPropertyAction.getPropertyOrNull(FileUtils.class.getName() + ".TempDirectory");
if (s != null) {
//assume someone outside of us will manage the directory
File f = new File(s);
if (f.mkdirs()) {
- defaultTempDir = f;
+ defaultTempDir = f;
}
}
if (defaultTempDir == null) {
defaultTempDir = createTmpDir(false);
if (shutdownHook != null) {
- Runtime.getRuntime().removeShutdownHook(shutdownHook);
+ Runtime.getRuntime().removeShutdownHook(shutdownHook);
}
shutdownHook = new Thread() {
@Override
@@ -97,24 +97,24 @@ public final class FileUtils {
removeDir(defaultTempDir, true);
}
};
- Runtime.getRuntime().addShutdownHook(shutdownHook);
+ Runtime.getRuntime().addShutdownHook(shutdownHook);
}
return defaultTempDir;
}
-
+
public static synchronized void maybeDeleteDefaultTempDir() {
if (defaultTempDir != null) {
Runtime.getRuntime().gc(); // attempt a garbage collect to close any files
String files[] = defaultTempDir.list();
if (files != null && files.length > 0) {
//there are files in there, we need to attempt some more cleanup
-
+
//HOWEVER, we don't want to just wipe out every file as something may be holding onto
- //the files for a reason. We'll re-run the gc and run the finalizers to see if
+ //the files for a reason. We'll re-run the gc and run the finalizers to see if
//anything gets cleaned up.
Runtime.getRuntime().gc(); // attempt a garbage collect to close any files
- Runtime.getRuntime().runFinalization();
+ Runtime.getRuntime().runFinalization();
Runtime.getRuntime().gc();
files = defaultTempDir.list();
}
@@ -127,7 +127,7 @@ public final class FileUtils {
}
}
}
-
+
public static File createTmpDir() {
return createTmpDir(true);
}
@@ -135,14 +135,14 @@ public final class FileUtils {
String s = SystemPropertyAction.getProperty("java.io.tmpdir");
File checkExists = new File(s);
if (!checkExists.exists() || !checkExists.isDirectory()) {
- throw new RuntimeException("The directory "
- + checkExists.getAbsolutePath()
+ throw new RuntimeException("The directory "
+ + checkExists.getAbsolutePath()
+ " does not exist, please set java.io.tempdir"
+ " to an existing directory");
}
if (!checkExists.canWrite()) {
- throw new RuntimeException("The directory "
- + checkExists.getAbsolutePath()
+ throw new RuntimeException("The directory "
+ + checkExists.getAbsolutePath()
+ " is not writable, please set java.io.tempdir"
+ " to a writable directory");
}
@@ -163,7 +163,7 @@ public final class FileUtils {
File f = new File(checkExists, "cxf-tmp-" + x);
int count = 0;
while (!f.mkdir()) {
-
+
if (count > 10000) {
throw new RuntimeException("Could not create a temporary directory in "
+ s + ", please set java.io.tempdir"
@@ -183,7 +183,7 @@ public final class FileUtils {
removeDir(f2, true);
}
};
- Runtime.getRuntime().addShutdownHook(hook);
+ Runtime.getRuntime().addShutdownHook(hook);
}
return newTmpDir;
}
@@ -272,14 +272,14 @@ public final class FileUtils {
public static File createTempFile(String prefix, String suffix) throws IOException {
return createTempFile(prefix, suffix, null, false);
}
-
+
public static File createTempFile(String prefix, String suffix, File parentDir,
boolean deleteOnExit) throws IOException {
File result = null;
File parent = (parentDir == null)
? getDefaultTempDir()
: parentDir;
-
+
if (suffix == null) {
suffix = ".tmp";
}
@@ -298,7 +298,7 @@ public final class FileUtils {
}
return result;
}
-
+
public static String getStringFromFile(File location) {
InputStream is = null;
String result = null;
@@ -347,8 +347,8 @@ public final class FileUtils {
rtn = ignoreTokens(rtn, "/*", "*/");
return rtn;
}
-
- private static String ignoreTokens(final String contents,
+
+ private static String ignoreTokens(final String contents,
final String startToken, final String endToken) {
String rtn = contents;
int headerIndexStart = rtn.indexOf(startToken);
@@ -371,9 +371,9 @@ public final class FileUtils {
return getFilesRecurse(dir, Pattern.compile(pattern), exclude, false, new ArrayList<>());
}
public static List<File> getFilesRecurse(File dir, final String pattern, File exclude) {
- return getFilesRecurse(dir, Pattern.compile(pattern), exclude, true, new ArrayList<>());
+ return getFilesRecurse(dir, Pattern.compile(pattern), exclude, true, new ArrayList<>());
}
- private static List<File> getFilesRecurse(File dir,
+ private static List<File> getFilesRecurse(File dir,
Pattern pattern,
File exclude, boolean rec,
List<File> fileList) {
@@ -388,7 +388,7 @@ public final class FileUtils {
} else {
Matcher m = pattern.matcher(file.getName());
if (m.matches()) {
- fileList.add(file);
+ fileList.add(file);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
index 796e2fc..94a96ec 100644
--- a/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
+++ b/core/src/main/java/org/apache/cxf/helpers/HttpHeaderHelper.java
@@ -42,17 +42,17 @@ public final class HttpHeaderHelper {
public static final String CLOSE = "close";
public static final String AUTHORIZATION = "Authorization";
private static final String ISO88591 = Charset.forName("ISO-8859-1").name();
-
+
private static Map<String, String> internalHeaders = new HashMap<String, String>();
private static ConcurrentHashMap<String, String> encodings = new ConcurrentHashMap<String, String>();
private static Pattern charsetPattern = Pattern.compile("\"|'");
-
+
static {
internalHeaders.put("Accept-Encoding", "accept-encoding");
internalHeaders.put("Content-Encoding", "content-encoding");
internalHeaders.put("Content-Type", "content-type");
internalHeaders.put("Content-ID", "content-id");
- internalHeaders.put("Content-Transfer-Encoding", "content-transfer-encoding");
+ internalHeaders.put("Content-Transfer-Encoding", "content-transfer-encoding");
internalHeaders.put("Transfer-Encoding", "transfer-encoding");
internalHeaders.put("Connection", "connection");
internalHeaders.put("authorization", "Authorization");
@@ -60,20 +60,20 @@ public final class HttpHeaderHelper {
internalHeaders.put("accept", "Accept");
internalHeaders.put("content-length", "Content-Length");
}
-
+
private HttpHeaderHelper() {
-
+
}
-
+
public static List<String> getHeader(Map<String, List<String>> headerMap, String key) {
return headerMap.get(getHeaderKey(key));
}
-
+
public static String getHeaderKey(final String key) {
String headerKey = internalHeaders.get(key);
return headerKey == null ? key : headerKey;
}
-
+
public static String findCharset(String contentType) {
if (contentType == null) {
return null;
@@ -96,9 +96,9 @@ public final class HttpHeaderHelper {
}
public static String mapCharset(String enc) {
return mapCharset(enc, ISO88591);
- }
-
- //helper to map the charsets that various things send in the http Content-Type header
+ }
+
+ //helper to map the charsets that various things send in the http Content-Type header
//into something that is actually supported by Java and the Stax parsers and such.
public static String mapCharset(String enc, String deflt) {
if (enc == null) {
[48/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index fe80e42..008a57c 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -84,17 +84,17 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
FORCE_PRETTY = pretty;
}
private static final String BUS_ID_PROPERTY_NAME = "org.apache.cxf.bus.id";
-
+
protected final Map<Class<?>, Object> extensions;
protected final Set<Class<?>> missingExtensions;
protected String id;
- private BusState state;
+ private BusState state;
private final Collection<Feature> features = new CopyOnWriteArrayList<Feature>();
private final Map<String, Object> properties = new ConcurrentHashMap<String, Object>(16, 0.75f, 4);
-
-
+
+
private final ExtensionManagerImpl extensionManager;
-
+
public ExtensionManagerBus(Map<Class<?>, Object> extensions, Map<String, Object> props,
ClassLoader extensionClassLoader) {
if (extensions == null) {
@@ -104,41 +104,41 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
this.extensions = extensions;
this.missingExtensions = new CopyOnWriteArraySet<Class<?>>();
-
-
+
+
state = BusState.INITIAL;
-
+
CXFBusFactory.possiblySetDefaultBus(this);
if (FORCE_LOGGING) {
LoggingFeature feature = new LoggingFeature();
feature.setPrettyLogging(FORCE_PRETTY);
features.add(feature);
- }
+ }
if (null != props) {
properties.putAll(props);
}
-
+
Configurer configurer = (Configurer)extensions.get(Configurer.class);
if (null == configurer) {
configurer = new NullConfigurer();
extensions.put(Configurer.class, configurer);
}
-
+
id = getBusId(properties);
-
+
ResourceManager resourceManager = new DefaultResourceManager();
-
+
properties.put(BUS_ID_PROPERTY_NAME, BUS_PROPERTY_NAME);
properties.put(BUS_PROPERTY_NAME, this);
properties.put(DEFAULT_BUS_ID, this);
-
+
ResourceResolver propertiesResolver = new PropertiesResolver(properties);
resourceManager.addResourceResolver(propertiesResolver);
-
+
ResourceResolver busResolver = new SinglePropertyResolver(BUS_PROPERTY_NAME, this);
resourceManager.addResourceResolver(busResolver);
resourceManager.addResourceResolver(new ObjectTypeResolver(this));
-
+
busResolver = new SinglePropertyResolver(DEFAULT_BUS_ID, this);
resourceManager.addResourceResolver(busResolver);
resourceManager.addResourceResolver(new ObjectTypeResolver(this));
@@ -153,17 +153,17 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
return null;
}
});
-
+
extensions.put(ResourceManager.class, resourceManager);
extensionManager = new ExtensionManagerImpl(new String[0],
extensionClassLoader,
extensions,
- resourceManager,
+ resourceManager,
this);
-
+
setState(BusState.INITIAL);
-
+
if (null == this.getExtension(DestinationFactoryManager.class)) {
new DestinationFactoryManagerImpl(this);
}
@@ -171,16 +171,16 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
if (null == this.getExtension(ConduitInitiatorManager.class)) {
new ConduitInitiatorManagerImpl(this);
}
-
+
if (null == this.getExtension(BindingFactoryManager.class)) {
new BindingFactoryManagerImpl(this);
}
extensionManager.load(new String[] {ExtensionManagerImpl.BUS_EXTENSION_RESOURCE});
extensionManager.activateAllByType(ResourceResolver.class);
-
- extensions.put(ExtensionManager.class, extensionManager);
+
+ extensions.put(ExtensionManager.class, extensionManager);
}
-
+
public ExtensionManagerBus(Map<Class<?>, Object> e, Map<String, Object> properties) {
this(e, properties, Thread.currentThread().getContextClassLoader());
}
@@ -190,12 +190,12 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
public ExtensionManagerBus() {
this(null, null, Thread.currentThread().getContextClassLoader());
}
-
-
+
+
protected final void setState(BusState state) {
this.state = state;
}
-
+
public void setId(String i) {
id = i;
}
@@ -233,7 +233,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
return null;
}
-
+
public boolean hasExtensionByName(String name) {
for (Class<?> c : extensions.keySet()) {
if (name.equals(c.getName())) {
@@ -249,11 +249,11 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
return false;
}
-
+
protected final synchronized ConfiguredBeanLocator createConfiguredBeanLocator() {
ConfiguredBeanLocator loc = (ConfiguredBeanLocator)extensions.get(ConfiguredBeanLocator.class);
if (loc == null) {
- loc = extensionManager;
+ loc = extensionManager;
this.setExtension(loc, ConfiguredBeanLocator.class);
}
return loc;
@@ -269,25 +269,25 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
}
- public String getId() {
+ public String getId() {
return null == id ? DEFAULT_BUS_ID + Integer.toString(Math.abs(this.hashCode())) : id;
}
public void initialize() {
setState(BusState.INITIALIZING);
-
+
Collection<? extends BusCreationListener> ls = getExtension(ConfiguredBeanLocator.class)
.getBeansOfType(BusCreationListener.class);
for (BusCreationListener l : ls) {
l.busCreated(this);
}
-
+
doInitializeInternal();
-
+
BusLifeCycleManager lifeCycleManager = this.getExtension(BusLifeCycleManager.class);
if (null != lifeCycleManager) {
lifeCycleManager.initComplete();
- }
+ }
setState(BusState.RUNNING);
}
@@ -297,9 +297,9 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
}
protected void loadAdditionalFeatures() {
-
+
}
-
+
protected void initializeFeatures() {
loadAdditionalFeatures();
if (features != null) {
@@ -316,7 +316,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
protected void destroyBeans() {
extensionManager.destroyBeans();
}
-
+
public void shutdown(boolean wait) {
if (state == BusState.SHUTTING_DOWN) {
return;
@@ -363,7 +363,7 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
initializeFeatures();
}
}
-
+
public interface ExtensionFinder {
<T> T findExtension(Class<T> cls);
}
@@ -388,8 +388,8 @@ public class ExtensionManagerBus extends AbstractBasicInterceptorProvider implem
properties.put(s, o);
}
}
-
-
+
+
private static String getBusId(Map<String, Object> properties) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index 62d1944..fbf268b 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -47,13 +47,13 @@ import org.apache.cxf.resource.SinglePropertyResolver;
public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLocator {
public static final Logger LOG = LogUtils.getL7dLogger(ExtensionManagerImpl.class);
-
-
+
+
public static final String EXTENSIONMANAGER_PROPERTY_NAME = "extensionManager";
public static final String ACTIVATION_NAMESPACES_PROPERTY_NAME = "activationNamespaces";
public static final String ACTIVATION_NAMESPACES_SETTER_METHOD_NAME = "setActivationNamespaces";
public static final String BUS_EXTENSION_RESOURCE = "META-INF/cxf/bus-extensions.txt";
-
+
private final ClassLoader loader;
private ResourceManager resourceManager;
private Map<String, Extension> all = new ConcurrentHashMap<String, Extension>();
@@ -61,21 +61,21 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
private final Map<Class<?>, Object> activated;
private final Bus bus;
- public ExtensionManagerImpl(ClassLoader cl, Map<Class<?>, Object> initialExtensions,
+ public ExtensionManagerImpl(ClassLoader cl, Map<Class<?>, Object> initialExtensions,
ResourceManager rm, Bus b) {
this(new String[] {BUS_EXTENSION_RESOURCE},
cl, initialExtensions, rm, b);
}
- public ExtensionManagerImpl(String resource,
- ClassLoader cl,
- Map<Class<?>, Object> initialExtensions,
+ public ExtensionManagerImpl(String resource,
+ ClassLoader cl,
+ Map<Class<?>, Object> initialExtensions,
ResourceManager rm,
Bus b) {
this(new String[] {resource}, cl, initialExtensions, rm, b);
- }
- public ExtensionManagerImpl(String resources[],
- ClassLoader cl,
- Map<Class<?>, Object> initialExtensions,
+ }
+ public ExtensionManagerImpl(String resources[],
+ ClassLoader cl,
+ Map<Class<?>, Object> initialExtensions,
ResourceManager rm,
Bus b) {
@@ -97,7 +97,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
}
}
-
+
final void load(String resources[]) {
if (resources == null) {
return;
@@ -108,19 +108,19 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
} catch (IOException ex) {
throw new ExtensionException(ex);
- }
+ }
}
public void add(Extension ex) {
all.put(ex.getName(), ex);
ordered.add(ex);
}
-
+
public void initialize() {
for (Extension e : ordered) {
if (!e.isDeferred() && e.getLoadedObject() == null) {
loadAndRegister(e);
}
- }
+ }
}
public void removeBeansOfNames(List<String> names) {
@@ -136,7 +136,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (e.getLoadedObject() == null) {
loadAndRegister(e);
}
- }
+ }
}
public <T> void activateAllByType(Class<T> type) {
for (Extension e : ordered) {
@@ -148,9 +148,9 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
}
}
- }
+ }
}
-
+
public boolean hasBeanOfName(String name) {
return all.containsKey(name);
}
@@ -162,9 +162,9 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
load(resource, loader);
}
final synchronized void load(String resource, ClassLoader l) throws IOException {
-
+
Enumeration<URL> urls = l.getResources(resource);
-
+
while (urls.hasMoreElements()) {
final URL url = urls.nextElement();
InputStream is;
@@ -208,37 +208,37 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (null != activated && null != cls && null != activated.get(cls)) {
return;
}
-
+
synchronized (e) {
Object obj = e.load(loader, bus);
if (obj == null) {
return;
}
-
+
if (null != activated) {
Configurer configurer = (Configurer)(activated.get(Configurer.class));
if (null != configurer) {
configurer.configureBean(obj);
}
}
-
+
// let the object know for which namespaces it has been activated
ResourceResolver namespacesResolver = null;
- if (null != e.getNamespaces()) {
- namespacesResolver = new SinglePropertyResolver(ACTIVATION_NAMESPACES_PROPERTY_NAME,
+ if (null != e.getNamespaces()) {
+ namespacesResolver = new SinglePropertyResolver(ACTIVATION_NAMESPACES_PROPERTY_NAME,
e.getNamespaces());
resourceManager.addResourceResolver(namespacesResolver);
}
-
+
// Since we need to support spring2.5 by removing @Resource("activationNamespaces")
// Now we call the setActivationNamespaces method directly here
if (e.getNamespaces() != null && !e.getNamespaces().isEmpty()) {
invokeSetterActivationNSMethod(obj, e.getNamespaces());
}
-
+
ResourceInjector injector = new ResourceInjector(resourceManager);
-
- try {
+
+ try {
injector.inject(obj);
injector.construct(obj);
} finally {
@@ -246,11 +246,11 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
resourceManager.removeResourceResolver(namespacesResolver);
}
}
-
+
if (null != activated) {
if (cls == null) {
cls = obj.getClass();
- }
+ }
activated.put(cls, obj);
}
}
@@ -274,7 +274,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
return null;
}
-
+
private void invokeSetterActivationNSMethod(Object target, Object value) {
Class<?> clazz = target.getClass();
String methodName = ACTIVATION_NAMESPACES_SETTER_METHOD_NAME;
@@ -296,7 +296,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
}
}
clazz = clazz.getSuperclass();
- }
+ }
}
public List<String> getBeanNamesOfType(Class<?> type) {
List<String> ret = new LinkedList<String>();
@@ -306,7 +306,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
synchronized (ex) {
ret.add(ex.getName());
}
- }
+ }
}
return ret;
}
@@ -314,7 +314,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (name == null) {
return null;
}
- Extension ex = all.get(name);
+ Extension ex = all.get(name);
if (ex != null) {
if (ex.getLoadedObject() == null) {
loadAndRegister(ex);
@@ -336,7 +336,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (ext.getLoadedObject() != null) {
ret.add(type.cast(ext.getLoadedObject()));
}
- }
+ }
}
}
for (Extension ex : ordered) {
@@ -350,7 +350,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
if (ex.getLoadedObject() != null) {
ret.add(type.cast(ex.getLoadedObject()));
}
- }
+ }
}
}
}
@@ -360,7 +360,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
boolean loaded = false;
for (Extension ex : ordered) {
Class<?> cls = ex.getClassObject(loader);
- if (cls != null
+ if (cls != null
&& type.isAssignableFrom(cls)) {
synchronized (ex) {
if (listener.loadBean(ex.getName(), cls.asSubclass(type))) {
@@ -391,6 +391,6 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
ResourceInjector injector = new ResourceInjector(resourceManager);
injector.destroy(ex.getLoadedObject());
}
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
index 3c658d3..7b0f800 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionRegistry.java
@@ -26,19 +26,19 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
- * Static registry of extensions that are loaded in addition to the
- * extensions the Bus will automatically detect. Mostly used by
+ * Static registry of extensions that are loaded in addition to the
+ * extensions the Bus will automatically detect. Mostly used by
* the OSGi bundle activator to detect extensions in bundles outside
- * the CXF bundle.
+ * the CXF bundle.
*/
public final class ExtensionRegistry {
- private static ConcurrentMap<String, Extension> extensions
+ private static ConcurrentMap<String, Extension> extensions
= new ConcurrentHashMap<String, Extension>(16, 0.75f, 4);
private ExtensionRegistry() {
//singleton
}
-
+
public static Map<String, Extension> getRegisteredExtensions() {
Map<String, Extension> exts = new HashMap<String, Extension>(extensions.size());
for (Map.Entry<String, Extension> ext : extensions.entrySet()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java b/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
index 0cd5e9d..dea7058 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/TextExtensionFragmentParser.java
@@ -36,12 +36,12 @@ import org.apache.cxf.common.logging.LogUtils;
public class TextExtensionFragmentParser {
private static final Logger LOG = LogUtils.getL7dLogger(TextExtensionFragmentParser.class);
private static Pattern colonPattern = Pattern.compile(":");
-
+
final ClassLoader loader;
public TextExtensionFragmentParser(ClassLoader loader) {
this.loader = loader;
}
-
+
public List<Extension> getExtensions(final URL url) {
InputStream is = null;
try {
@@ -65,7 +65,7 @@ public class TextExtensionFragmentParser {
* Reads extension definitions from a Text file and instantiates them
* The text file has the following syntax
* classname:interfacename:deferred(true|false):optional(true|false)
- *
+ *
* @param is stream to read the extension from
* @return list of Extensions
* @throws IOException
@@ -110,5 +110,5 @@ public class TextExtensionFragmentParser {
}
return ext;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
index 663d9e0..d05398d 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/BindingFactoryManagerImpl.java
@@ -43,14 +43,14 @@ import org.apache.cxf.helpers.CastUtils;
@NoJSR250Annotations(unlessNull = "bus")
public final class BindingFactoryManagerImpl implements BindingFactoryManager {
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(BindingFactoryManagerImpl.class);
-
+
Map<String, BindingFactory> bindingFactories;
Set<String> failed = new CopyOnWriteArraySet<String>();
Set<String> loaded = new CopyOnWriteArraySet<String>();
Bus bus;
-
+
public BindingFactoryManagerImpl() {
bindingFactories = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
}
@@ -58,7 +58,7 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
bindingFactories = new ConcurrentHashMap<String, BindingFactory>(8, 0.75f, 4);
setBus(b);
}
-
+
@Resource
public void setBus(Bus b) {
bus = b;
@@ -66,16 +66,16 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
bus.setExtension(this, BindingFactoryManager.class);
}
}
-
+
public void registerBindingFactory(String name,
BindingFactory factory) {
bindingFactories.put(name, factory);
}
-
+
public void unregisterBindingFactory(String name) {
bindingFactories.remove(name);
}
-
+
public BindingFactory getBindingFactory(final String namespace) throws BusException {
BindingFactory factory = bindingFactories.get(namespace);
if (null == factory) {
@@ -95,18 +95,18 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
}
return factory;
}
-
+
private BindingFactory loadAll(final String namespace) {
- //Try old method of having activationNamespaces configured in.
+ //Try old method of having activationNamespaces configured in.
//It activates all the factories in the list until one matches, thus
//it activates stuff that really aren't needed.
- ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
+ ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
= new ConfiguredBeanLocator.BeanLoaderListener<BindingFactory>() {
public boolean beanLoaded(String name, BindingFactory bean) {
loaded.add(name);
if (!bindingFactories.containsKey(namespace)) {
if (bean instanceof AbstractBindingFactory) {
- for (String ns
+ for (String ns
: ((AbstractBindingFactory)bean).getActivationNamespaces()) {
registerBindingFactory(ns, bean);
}
@@ -121,7 +121,7 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
//ignore
}
}
- }
+ }
return bindingFactories.containsKey(namespace);
}
@@ -137,7 +137,7 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
private BindingFactory loadDefaultNamespace(final String namespace) {
//First attempt will be to examine the factory class
//for a DEFAULT_NAMESPACES field and use it
- ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
+ ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
= new ConfiguredBeanLocator.BeanLoaderListener<BindingFactory>() {
public boolean beanLoaded(String name, BindingFactory bean) {
loaded.add(name);
@@ -159,21 +159,21 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
}
return false;
}
- };
+ };
bus.getExtension(ConfiguredBeanLocator.class)
.loadBeansOfType(BindingFactory.class,
listener);
-
+
return bindingFactories.get(namespace);
}
private BindingFactory loadActivationNamespace(final String namespace) {
final ConfiguredBeanLocator locator = bus.getExtension(ConfiguredBeanLocator.class);
-
+
//Second attempt will be to examine the factory class
- //for a DEFAULT_NAMESPACES field and if it doesn't exist, try
- //using the older activation ns things. This will then load most
+ //for a DEFAULT_NAMESPACES field and if it doesn't exist, try
+ //using the older activation ns things. This will then load most
//of the "older" things
- ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
+ ConfiguredBeanLocator.BeanLoaderListener<BindingFactory> listener
= new ConfiguredBeanLocator.BeanLoaderListener<BindingFactory>() {
public boolean beanLoaded(String name, BindingFactory bean) {
loaded.add(name);
@@ -192,10 +192,10 @@ public final class BindingFactoryManagerImpl implements BindingFactoryManager {
}
return locator.hasConfiguredPropertyValue(name, "activationNamespaces", namespace);
}
- };
+ };
locator.loadBeansOfType(BindingFactory.class,
listener);
-
+
return bindingFactories.get(namespace);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java b/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
index 50c0be0..1be4039 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/CXFBusLifeCycleManager.java
@@ -38,7 +38,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
private boolean initCalled;
private boolean preShutdownCalled;
private boolean postShutdownCalled;
-
+
public CXFBusLifeCycleManager() {
listeners = new CopyOnWriteArrayList<BusLifeCycleListener>();
}
@@ -46,7 +46,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
listeners = new CopyOnWriteArrayList<BusLifeCycleListener>();
setBus(b);
}
-
+
@Resource
public final void setBus(Bus b) {
bus = b;
@@ -54,7 +54,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
bus.setExtension(this, BusLifeCycleManager.class);
}
}
-
+
/* (non-Javadoc)
* @see org.apache.cxf.buslifecycle.BusLifeCycleManager#registerLifeCycleListener(
* org.apache.cxf.buslifecycle.BusLifeCycleListener)
@@ -64,7 +64,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
if (initCalled) {
listener.initComplete();
}
-
+
}
/* (non-Javadoc)
@@ -72,10 +72,10 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
* org.apache.cxf.buslifecycle.BusLifeCycleListener)
*/
public void unregisterLifeCycleListener(BusLifeCycleListener listener) {
- listeners.remove(listener);
+ listeners.remove(listener);
}
-
-
+
+
public void initComplete() {
if (bus != null) {
bus.getExtension(ConfiguredBeanLocator.class)
@@ -88,9 +88,9 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
listener.initComplete();
}
}
-
+
public void preShutdown() {
- if (!preShutdownCalled) {
+ if (!preShutdownCalled) {
preShutdownCalled = true;
ListIterator<BusLifeCycleListener> li = listeners.listIterator(listeners.size());
while (li.hasPrevious()) {
@@ -98,7 +98,7 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
}
}
}
-
+
public void postShutdown() {
if (!preShutdownCalled) {
preShutdown();
@@ -112,5 +112,5 @@ public class CXFBusLifeCycleManager implements BusLifeCycleManager {
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
index b609ffd..c766b2a 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ClientLifeCycleManagerImpl.java
@@ -33,14 +33,14 @@ import org.apache.cxf.extension.BusExtension;
@NoJSR250Annotations
public class ClientLifeCycleManagerImpl implements ClientLifeCycleManager, BusExtension {
-
- private CopyOnWriteArrayList<ClientLifeCycleListener> listeners
- = new CopyOnWriteArrayList<ClientLifeCycleListener>();
+
+ private CopyOnWriteArrayList<ClientLifeCycleListener> listeners
+ = new CopyOnWriteArrayList<ClientLifeCycleListener>();
public ClientLifeCycleManagerImpl() {
-
+
}
-
+
public ClientLifeCycleManagerImpl(Bus b) {
Collection<? extends ClientLifeCycleListener> l = b.getExtension(ConfiguredBeanLocator.class)
.getBeansOfType(ClientLifeCycleListener.class);
@@ -48,7 +48,7 @@ public class ClientLifeCycleManagerImpl implements ClientLifeCycleManager, BusEx
listeners.addAll(l);
}
}
-
+
public Class<?> getRegistrationType() {
return ClientLifeCycleManager.class;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
index 073d4bf..0ccfbb3 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ConduitInitiatorManagerImpl.java
@@ -41,7 +41,7 @@ import org.apache.cxf.transport.TransportFinder;
@NoJSR250Annotations(unlessNull = "bus")
public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManager {
- private static final ResourceBundle BUNDLE
+ private static final ResourceBundle BUNDLE
= BundleUtils.getBundle(ConduitInitiatorManagerImpl.class);
Map<String, ConduitInitiator> conduitInitiators;
@@ -56,7 +56,7 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
conduitInitiators = new ConcurrentHashMap<String, ConduitInitiator>(8, 0.75f, 4);
setBus(b);
}
-
+
@Resource
public void setBus(Bus b) {
bus = b;
@@ -67,7 +67,7 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.cxf.bus.ConduitInitiatorManager#registerConduitInitiator(java.lang.String,
* org.apache.cxf.transports.ConduitInitiator)
*/
@@ -77,7 +77,7 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.cxf.bus.ConduitInitiatorManager#deregisterConduitInitiator(java.lang.String)
*/
public void deregisterConduitInitiator(String namespace) {
@@ -86,14 +86,14 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.cxf.bus.ConduitInitiatorManager#ConduitInitiator(java.lang.String)
*/
/**
* Returns the conduit initiator for the given namespace, constructing it
* (and storing in the cache for future reference) if necessary, using its
* list of factory classname to namespace mappings.
- *
+ *
* @param namespace the namespace.
*/
public ConduitInitiator getConduitInitiator(String namespace) throws BusException {
@@ -122,7 +122,7 @@ public final class ConduitInitiatorManagerImpl implements ConduitInitiatorManage
conduitInitiators,
loaded,
ConduitInitiator.class).findTransportForURI(uri);
-
+
return factory;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
index 57d9165..c348253 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/DestinationFactoryManagerImpl.java
@@ -40,7 +40,7 @@ import org.apache.cxf.transport.TransportFinder;
@NoJSR250Annotations(unlessNull = "bus")
public final class DestinationFactoryManagerImpl implements DestinationFactoryManager {
- private static final ResourceBundle BUNDLE
+ private static final ResourceBundle BUNDLE
= BundleUtils.getBundle(DestinationFactoryManagerImpl.class);
Map<String, DestinationFactory> destinationFactories;
@@ -66,7 +66,7 @@ public final class DestinationFactoryManagerImpl implements DestinationFactoryMa
this.destinationFactories = destinationFactories;
setBus(b);
}
-
+
@Resource
public void setBus(Bus b) {
bus = b;
@@ -124,13 +124,13 @@ public final class DestinationFactoryManagerImpl implements DestinationFactoryMa
return factory;
}
- public DestinationFactory getDestinationFactoryForUri(String uri) {
+ public DestinationFactory getDestinationFactoryForUri(String uri) {
DestinationFactory factory = new TransportFinder<DestinationFactory>(bus,
destinationFactories,
loaded,
DestinationFactory.class).findTransportForURI(uri);
-
+
return factory;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
index 204dae0..1e0c83a 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImpl.java
@@ -45,26 +45,26 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
private Bus bus;
- private List<EndpointResolver> resolvers
+ private List<EndpointResolver> resolvers
= new CopyOnWriteArrayList<EndpointResolver>();
-
+
public EndpointResolverRegistryImpl() {
-
+
}
public EndpointResolverRegistryImpl(Bus b) {
setBus(b);
}
-
+
/**
* @param b Bus to encapsulate
- */
+ */
public final void setBus(Bus b) {
bus = b;
if (bus != null) {
bus.setExtension(this, EndpointResolverRegistry.class);
}
}
-
+
/**
* Register an endpoint resolver.
*
@@ -73,7 +73,7 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
public synchronized void register(EndpointResolver resolver) {
resolvers.add(resolver);
}
-
+
/**
* Unregister an endpoint resolver.
*
@@ -91,7 +91,7 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
* This API is used by any actor that requires a concrete EPR (e.g.
* a transport-level Conduit), and must be called each and every
* time the EPR content is to be accessed (e.g. before each connection
- * establishment attempt).
+ * establishment attempt).
*
* @param logical the abstract EPR to resolve
* @return the resolved concrete EPR if appropriate, null otherwise
@@ -106,17 +106,17 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
}
return physical;
}
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to force a fresh
- * resolution of the given abstract EPR, discarding any previously cached
+ * Walk the list of registered EndpointResolvers, so as to force a fresh
+ * resolution of the given abstract EPR, discarding any previously cached
* reference.
* <p>
* This API may be used by say the transport-level Conduit when it
* detects a non-transient error on the outgoing connection, or
* by any other actor in the dispatch with the ability to infer
* server-side unavailability.
- *
+ *
* @param logical the previously resolved abstract EPR
* @param physical the concrete EPR to refresh
* @return the renewed concrete EPR if appropriate, null otherwise
@@ -132,11 +132,11 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
}
return fresh;
}
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to mint a new
+ * Walk the list of registered EndpointResolvers, so as to mint a new
* abstract EPR for a given service name.
- *
+ *
* @param serviceName
* @return the newly minted EPR if appropriate, null otherwise
*/
@@ -150,11 +150,11 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
}
return logical;
}
-
+
/**
- * Walk the list of registered EndpointResolvers, so as to mint a new
+ * Walk the list of registered EndpointResolvers, so as to mint a new
* abstract EPR for a given physical EPR.
- *
+ *
* @param physical
* @return the newly minted EPR if appropriate, null otherwise
*/
@@ -166,15 +166,15 @@ public class EndpointResolverRegistryImpl implements EndpointResolverRegistry {
break;
}
}
- return logical;
+ return logical;
}
-
+
/**
* @return the encapsulated list of registered resolvers
*/
protected List<EndpointResolver> getResolvers() {
return resolvers;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
index 98be695..ccb0fab 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/HeaderManagerImpl.java
@@ -31,26 +31,26 @@ import org.apache.cxf.headers.HeaderProcessor;
@NoJSR250Annotations(unlessNull = "bus")
public class HeaderManagerImpl implements HeaderManager {
Map<String, HeaderProcessor> processors = new ConcurrentHashMap<String, HeaderProcessor>(4, 0.75f, 2);
- Bus bus;
-
+ Bus bus;
+
public HeaderManagerImpl() {
}
public HeaderManagerImpl(Bus b) {
setBus(b);
}
-
+
public Bus getBus() {
return bus;
}
-
+
@Resource
- public final void setBus(Bus bus) {
+ public final void setBus(Bus bus) {
this.bus = bus;
if (null != bus) {
bus.setExtension(this, HeaderManager.class);
}
}
-
+
public HeaderProcessor getHeaderProcessor(String namespace) {
if (namespace == null) {
namespace = "";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java
index eb467f2..78e60a9 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/PhaseManagerImpl.java
@@ -112,7 +112,7 @@ public class PhaseManagerImpl implements PhaseManager, BusExtension {
//Make sure ending interceptors are put in positions symmetric
// to their starting interceptors
outPhases.add(new Phase(Phase.SEND_ENDING, ++i * 1000));
-
+
outPhases.add(new Phase(Phase.POST_STREAM_ENDING, ++i * 1000));
outPhases.add(new Phase(Phase.USER_STREAM_ENDING, ++i * 1000));
@@ -123,7 +123,7 @@ public class PhaseManagerImpl implements PhaseManager, BusExtension {
outPhases.add(new Phase(Phase.WRITE_ENDING, ++i * 1000));
outPhases.add(new Phase(Phase.PRE_PROTOCOL_ENDING, ++i * 1000));
-
+
outPhases.add(new Phase(Phase.PRE_STREAM_ENDING, ++i * 1000));
outPhases.add(new Phase(Phase.PREPARE_SEND_ENDING, ++i * 1000));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
index efdd1a5..8180956 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ServerLifeCycleManagerImpl.java
@@ -33,12 +33,12 @@ import org.apache.cxf.extension.BusExtension;
@NoJSR250Annotations
public class ServerLifeCycleManagerImpl implements ServerLifeCycleManager, BusExtension {
-
- private CopyOnWriteArrayList<ServerLifeCycleListener> listeners =
+
+ private CopyOnWriteArrayList<ServerLifeCycleListener> listeners =
new CopyOnWriteArrayList<ServerLifeCycleListener>();
public ServerLifeCycleManagerImpl() {
-
+
}
public ServerLifeCycleManagerImpl(Bus b) {
Collection<? extends ServerLifeCycleListener> l = b.getExtension(ConfiguredBeanLocator.class)
@@ -51,7 +51,7 @@ public class ServerLifeCycleManagerImpl implements ServerLifeCycleManager, BusEx
return ServerLifeCycleManager.class;
}
-
+
public synchronized void registerListener(ServerLifeCycleListener listener) {
listeners.addIfAbsent(listener);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
index ca6c3aa..7cffcbc 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ServerRegistryImpl.java
@@ -34,11 +34,11 @@ import org.apache.cxf.endpoint.ServerRegistry;
@NoJSR250Annotations(unlessNull = "bus")
public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener {
-
+
CopyOnWriteArrayList<Server> serversList;
Bus bus;
BusLifeCycleManager lifeCycleManager;
-
+
public ServerRegistryImpl() {
serversList = new CopyOnWriteArrayList<Server>();
}
@@ -50,10 +50,10 @@ public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener
public Bus getBus() {
return bus;
}
-
+
@Resource
- public final void setBus(Bus bus) {
- this.bus = bus;
+ public final void setBus(Bus bus) {
+ this.bus = bus;
if (null != bus) {
bus.setExtension(this, ServerRegistry.class);
lifeCycleManager = bus.getExtension(BusLifeCycleManager.class);
@@ -62,9 +62,9 @@ public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener
}
}
}
-
+
public void register(Server server) {
- serversList.addIfAbsent(server);
+ serversList.addIfAbsent(server);
}
public void unregister(Server server) {
@@ -77,18 +77,18 @@ public class ServerRegistryImpl implements ServerRegistry, BusLifeCycleListener
public void initComplete() {
// TODO Auto-generated method stub
-
+
}
@PreDestroy
public void preShutdown() {
// Shutdown the service.
- // To avoid the CurrentModificationException, do not use serversList directly
+ // To avoid the CurrentModificationException, do not use serversList directly
Object[] servers = serversList.toArray();
for (int i = 0; i < servers.length; i++) {
Server server = (Server) servers[i];
server.destroy();
- }
+ }
}
public void postShutdown() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
index f6bab6c..860d708 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
@@ -38,16 +38,16 @@ import org.apache.cxf.endpoint.ServiceContractResolverRegistry;
public class ServiceContractResolverRegistryImpl implements ServiceContractResolverRegistry {
private Bus bus;
- private List<ServiceContractResolver> resolvers
+ private List<ServiceContractResolver> resolvers
= new CopyOnWriteArrayList<ServiceContractResolver>();
public ServiceContractResolverRegistryImpl() {
-
+
}
public ServiceContractResolverRegistryImpl(Bus b) {
setBus(b);
}
-
+
/**
* Sets the bus with which the registry is associated.
@@ -63,7 +63,7 @@ public class ServiceContractResolverRegistryImpl implements ServiceContractResol
/**
* Calls each of the registered <code>ServiceContractResolver</code> instances
- * to resolve the location of the service's contract. It returns the location
+ * to resolve the location of the service's contract. It returns the location
* from the first resolver that matches the QName to a location.
*
* @param qname QName to be resolved into a contract location
@@ -95,7 +95,7 @@ public class ServiceContractResolverRegistryImpl implements ServiceContractResol
* @param resolver the contract resolver to register
*/
public synchronized void register(ServiceContractResolver resolver) {
- resolvers.add(resolver);
+ resolvers.add(resolver);
}
/**
@@ -104,10 +104,10 @@ public class ServiceContractResolverRegistryImpl implements ServiceContractResol
* @param resolver the contract resolver to remove
*/
public synchronized void unregister(ServiceContractResolver resolver) {
- resolvers.remove(resolver);
+ resolvers.remove(resolver);
}
-
+
protected List<ServiceContractResolver> getResolvers() {
return resolvers;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
index f16f626..1e0e3e8 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueImplMBeanWrapper.java
@@ -30,28 +30,28 @@ import org.apache.cxf.management.annotation.ManagedResource;
import org.apache.cxf.workqueue.AutomaticWorkQueueImpl;
import org.apache.cxf.workqueue.WorkQueueManager;
-@ManagedResource(componentName = "WorkQueue",
- description = "The CXF work queue",
+@ManagedResource(componentName = "WorkQueue",
+ description = "The CXF work queue",
currencyTimeLimit = 15, persistPolicy = "OnUpdate", persistPeriod = 200)
-
-public class WorkQueueImplMBeanWrapper implements ManagedComponent {
+
+public class WorkQueueImplMBeanWrapper implements ManagedComponent {
private static final String TYPE_VALUE = "WorkQueues";
-
+
private AutomaticWorkQueueImpl aWorkQueue;
private WorkQueueManager manager;
-
+
public WorkQueueImplMBeanWrapper(AutomaticWorkQueueImpl wq,
WorkQueueManager mgr) {
aWorkQueue = wq;
manager = mgr;
}
-
+
@ManagedAttribute(description = "The WorkQueueMaxSize",
persistPolicy = "OnUpdate")
public long getWorkQueueMaxSize() {
return aWorkQueue.getMaxSize();
}
-
+
@ManagedAttribute(description = "The WorkQueue Current size",
persistPolicy = "OnUpdate")
public long getWorkQueueSize() {
@@ -59,20 +59,20 @@ public class WorkQueueImplMBeanWrapper implements ManagedComponent {
}
@ManagedAttribute(description = "The largest number of threads")
- public int getLargestPoolSize() {
- return aWorkQueue.getLargestPoolSize();
+ public int getLargestPoolSize() {
+ return aWorkQueue.getLargestPoolSize();
}
@ManagedAttribute(description = "The current number of threads")
- public int getPoolSize() {
- return aWorkQueue.getPoolSize();
+ public int getPoolSize() {
+ return aWorkQueue.getPoolSize();
}
@ManagedAttribute(description = "The number of threads currently busy")
- public int getActiveCount() {
- return aWorkQueue.getActiveCount();
+ public int getActiveCount() {
+ return aWorkQueue.getActiveCount();
}
-
+
@ManagedAttribute(description = "The WorkQueue has nothing to do",
persistPolicy = "OnUpdate")
public boolean isEmpty() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
index 10420be..ec3df12 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImpl.java
@@ -48,26 +48,26 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
private static final Logger LOG =
LogUtils.getL7dLogger(WorkQueueManagerImpl.class);
- Map<String, AutomaticWorkQueue> namedQueues
+ Map<String, AutomaticWorkQueue> namedQueues
= new ConcurrentHashMap<String, AutomaticWorkQueue>(4, 0.75f, 2);
-
+
boolean inShutdown;
InstrumentationManager imanager;
- Bus bus;
-
+ Bus bus;
+
public WorkQueueManagerImpl() {
-
+
}
public WorkQueueManagerImpl(Bus b) {
setBus(b);
}
-
+
public Bus getBus() {
return bus;
}
-
+
@Resource
- public final void setBus(Bus bus) {
+ public final void setBus(Bus bus) {
this.bus = bus;
if (null != bus) {
bus.setExtension(this, WorkQueueManager.class);
@@ -87,15 +87,15 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
addNamedWorkQueue(awq.getName(), awq);
}
}
-
+
if (!namedQueues.containsKey(DEFAULT_QUEUE_NAME)) {
- AutomaticWorkQueue defaultQueue
+ AutomaticWorkQueue defaultQueue
= locator.getBeanOfType(DEFAULT_WORKQUEUE_BEAN_NAME, AutomaticWorkQueue.class);
if (defaultQueue != null) {
addNamedWorkQueue(DEFAULT_QUEUE_NAME, defaultQueue);
}
}
-
+
bus.getExtension(BusLifeCycleManager.class)
.registerLifeCycleListener(new WQLifecycleListener());
}
@@ -117,9 +117,9 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
if (impl.isShared()) {
synchronized (impl) {
impl.removeSharedUser();
-
- if (impl.getShareCount() == 0
- && imanager != null
+
+ if (impl.getShareCount() == 0
+ && imanager != null
&& imanager.getMBeanServer() != null) {
try {
imanager.unregister(new WorkQueueImplMBeanWrapper(impl, this));
@@ -144,7 +144,7 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
public void run() {
synchronized (this) {
while (!inShutdown) {
- try {
+ try {
wait();
} catch (InterruptedException ex) {
// ignore
@@ -152,7 +152,7 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
}
for (AutomaticWorkQueue q : namedQueues.values()) {
while (!q.isShutdown()) {
- try {
+ try {
wait(100);
} catch (InterruptedException ex) {
// ignore
@@ -163,7 +163,7 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
for (java.util.logging.Handler h : LOG.getHandlers()) {
h.flush();
}
-
+
}
public AutomaticWorkQueue getNamedWorkQueue(String name) {
@@ -175,8 +175,8 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
AutomaticWorkQueueImpl impl = (AutomaticWorkQueueImpl)q;
if (impl.isShared()) {
synchronized (impl) {
- if (impl.getShareCount() == 0
- && imanager != null
+ if (impl.getShareCount() == 0
+ && imanager != null
&& imanager.getMBeanServer() != null) {
try {
imanager.register(new WorkQueueImplMBeanWrapper((AutomaticWorkQueueImpl)q, this));
@@ -195,17 +195,17 @@ public class WorkQueueManagerImpl implements WorkQueueManager {
}
}
}
-
- private AutomaticWorkQueue createAutomaticWorkQueue() {
+
+ private AutomaticWorkQueue createAutomaticWorkQueue() {
AutomaticWorkQueue q = new AutomaticWorkQueueImpl(DEFAULT_QUEUE_NAME);
addNamedWorkQueue(DEFAULT_QUEUE_NAME, q);
return q;
}
-
-
+
+
class WQLifecycleListener implements BusLifeCycleListener {
public void initComplete() {
-
+
}
public void preShutdown() {
shutdown(true);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
index 6230040..a9d3c9b 100644
--- a/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
+++ b/core/src/main/java/org/apache/cxf/bus/managers/WorkQueueManagerImplMBeanWrapper.java
@@ -28,27 +28,27 @@ import org.apache.cxf.management.ManagementConstants;
import org.apache.cxf.management.annotation.ManagedOperation;
import org.apache.cxf.management.annotation.ManagedResource;
-@ManagedResource(componentName = "WorkQueueManager",
- description = "The CXF manangement of work queues ",
+@ManagedResource(componentName = "WorkQueueManager",
+ description = "The CXF manangement of work queues ",
currencyTimeLimit = 15, persistPolicy = "OnUpdate", persistPeriod = 200)
-
-public class WorkQueueManagerImplMBeanWrapper implements ManagedComponent {
+
+public class WorkQueueManagerImplMBeanWrapper implements ManagedComponent {
static final String NAME_VALUE = "Bus.WorkQueueManager";
static final String TYPE_VALUE = "WorkQueueManager";
-
+
private WorkQueueManagerImpl wqManager;
private Bus bus;
-
+
public WorkQueueManagerImplMBeanWrapper(WorkQueueManagerImpl wq) {
- wqManager = wq;
+ wqManager = wq;
bus = wq.getBus();
}
-
+
@ManagedOperation(currencyTimeLimit = 30)
public void shutdown(boolean processRemainingWorkItems) {
- wqManager.shutdown(processRemainingWorkItems);
+ wqManager.shutdown(processRemainingWorkItems);
}
-
+
public ObjectName getObjectName() throws JMException {
StringBuilder buffer = new StringBuilder();
@@ -61,5 +61,5 @@ public class WorkQueueManagerImplMBeanWrapper implements ManagedComponent {
//Use default domain name of server
return new ObjectName(buffer.toString());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
index d929f55..a5d23d0 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFActivator.java
@@ -38,21 +38,21 @@ import org.osgi.util.tracker.ServiceTracker;
/**
* Is called in OSGi on start and stop of the cxf bundle.
- * Manages
+ * Manages
* - CXFBundleListener
* - Attaching ManagedWorkqueues to config admin service
* - OsgiBusListener
* - Blueprint namespaces
*/
public class CXFActivator implements BundleActivator {
-
+
private List<Extension> extensions;
private ManagedWorkQueueList workQueues;
private ServiceTracker configAdminTracker;
private CXFExtensionBundleListener cxfBundleListener;
private ServiceRegistration workQueueServiceRegistration;
-
-
+
+
/** {@inheritDoc}*/
public void start(BundleContext context) throws Exception {
@@ -64,17 +64,17 @@ public class CXFActivator implements BundleActivator {
configAdminTracker = new ServiceTracker(context, ConfigurationAdmin.class.getName(), null);
configAdminTracker.open();
workQueues.setConfigAdminTracker(configAdminTracker);
- workQueueServiceRegistration = registerManagedServiceFactory(context, ManagedServiceFactory.class,
+ workQueueServiceRegistration = registerManagedServiceFactory(context, ManagedServiceFactory.class,
workQueues,
ManagedWorkQueueList.FACTORY_PID);
-
+
extensions = new ArrayList<>();
extensions.add(createOsgiBusListenerExtension(context));
extensions.add(createManagedWorkQueueListExtension(workQueues));
ExtensionRegistry.addExtensions(extensions);
BlueprintNameSpaceHandlerFactory factory = new BlueprintNameSpaceHandlerFactory() {
-
+
@Override
public Object createNamespaceHandler() {
return new CXFAPINamespaceHandler();
@@ -93,10 +93,10 @@ public class CXFActivator implements BundleActivator {
private ServiceRegistration registerManagedServiceFactory(BundleContext context,
Class<?> serviceClass,
- Object service,
+ Object service,
String servicePid) {
Properties props = new Properties();
- props.put(Constants.SERVICE_PID, servicePid);
+ props.put(Constants.SERVICE_PID, servicePid);
return context.registerService(serviceClass.getName(), service, props);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
index 9385d46..05ceabf 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
@@ -44,18 +44,18 @@ import org.osgi.framework.SynchronousBundleListener;
public class CXFExtensionBundleListener implements SynchronousBundleListener {
private static final Logger LOG = LogUtils.getL7dLogger(CXFActivator.class);
private long id;
- private ConcurrentMap<Long, List<OSGiExtension>> extensions
+ private ConcurrentMap<Long, List<OSGiExtension>> extensions
= new ConcurrentHashMap<Long, List<OSGiExtension>>(16, 0.75f, 4);
-
+
public CXFExtensionBundleListener(long bundleId) {
this.id = bundleId;
}
-
+
public void registerExistingBundles(BundleContext context) throws IOException {
for (Bundle bundle : context.getBundles()) {
- if ((bundle.getState() == Bundle.RESOLVED
- || bundle.getState() == Bundle.STARTING
- || bundle.getState() == Bundle.ACTIVE
+ if ((bundle.getState() == Bundle.RESOLVED
+ || bundle.getState() == Bundle.STARTING
+ || bundle.getState() == Bundle.ACTIVE
|| bundle.getState() == Bundle.STOPPING)
&& bundle.getBundleId() != context.getBundle().getBundleId()) {
register(bundle);
@@ -71,7 +71,7 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener {
unregister(event.getBundle().getBundleId());
}
}
-
+
protected void register(final Bundle bundle) {
Enumeration<?> e = bundle.findEntries("META-INF/cxf/", "bus-extensions.txt", false);
while (e != null && e.hasMoreElements()) {
@@ -84,13 +84,13 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener {
if (orig.isEmpty()) {
return false;
}
-
+
List<String> names = new ArrayList<>(orig.size());
for (Extension ext : orig) {
names.add(ext.getName());
}
- LOG.info("Adding the extensions from bundle " + bundle.getSymbolicName()
- + " (" + bundle.getBundleId() + ") " + names);
+ LOG.info("Adding the extensions from bundle " + bundle.getSymbolicName()
+ + " (" + bundle.getBundleId() + ") " + names);
List<OSGiExtension> list = extensions.get(bundle.getBundleId());
if (list == null) {
list = new CopyOnWriteArrayList<OSGiExtension>();
@@ -119,7 +119,7 @@ public class CXFExtensionBundleListener implements SynchronousBundleListener {
unregister(extensions.keySet().iterator().next());
}
}
-
+
public class OSGiExtension extends Extension {
final Bundle bundle;
Object serviceObject;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java b/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
index 6021f31..99ba3c7 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/ManagedWorkQueueList.java
@@ -40,18 +40,18 @@ import org.osgi.util.tracker.ServiceTracker;
* List of work queues that can be managed using the OSGi configuration admin service
*/
public class ManagedWorkQueueList implements ManagedServiceFactory, PropertyChangeListener {
- public static final String FACTORY_PID = "org.apache.cxf.workqueues";
+ public static final String FACTORY_PID = "org.apache.cxf.workqueues";
private static final Logger LOG = LogUtils.getL7dLogger(ManagedWorkQueueList.class);
-
- private Map<String, AutomaticWorkQueueImpl> queues =
+
+ private Map<String, AutomaticWorkQueueImpl> queues =
new ConcurrentHashMap<String, AutomaticWorkQueueImpl>(4, 0.75f, 2);
private ServiceTracker configAdminTracker;
-
+
public String getName() {
return FACTORY_PID;
}
- public void updated(String pid, @SuppressWarnings("rawtypes") Dictionary props)
+ public void updated(String pid, @SuppressWarnings("rawtypes") Dictionary props)
throws ConfigurationException {
if (pid == null) {
return;
@@ -107,7 +107,7 @@ public class ManagedWorkQueueList implements ManagedServiceFactory, PropertyChan
}
return selectedConfig;
}
-
+
public void addAllToWorkQueueManager(WorkQueueManager manager) {
if (manager != null) {
for (AutomaticWorkQueueImpl wq : queues.values()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
index ed4d284..23de3d0 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
@@ -47,7 +47,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
public static final String CONTEXT_SYMBOLIC_NAME_PROPERTY = "cxf.context.symbolicname";
public static final String CONTEXT_VERSION_PROPERTY = "cxf.context.version";
public static final String CONTEXT_NAME_PROPERTY = "cxf.bus.id";
-
+
private static final String SERVICE_PROPERTY_PRIVATE = "org.apache.cxf.bus.private.extension";
private static final String SERVICE_PROPERTY_RESTRICTED = "org.apache.cxf.bus.restricted.extension";
private static final String BUS_EXTENSION_BUNDLES_EXCLUDES = "bus.extension.bundles.excludes";
@@ -61,7 +61,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
public OSGIBusListener(Bus b, Object args[]) {
bus = b;
- if (args != null && args.length > 0
+ if (args != null && args.length > 0
&& args[0] instanceof BundleContext) {
defaultContext = (BundleContext)args[0];
}
@@ -86,11 +86,11 @@ public class OSGIBusListener implements BusLifeCycleListener {
final ConfiguredBeanLocator cbl = bus.getExtension(ConfiguredBeanLocator.class);
if (cbl instanceof ExtensionManagerImpl) {
// wire in the OSGi things
- bus.setExtension(new OSGiBeanLocator(cbl, defaultContext),
+ bus.setExtension(new OSGiBeanLocator(cbl, defaultContext),
ConfiguredBeanLocator.class);
}
}
-
+
public void initComplete() {
ManagedWorkQueueList wqList = bus.getExtension(ManagedWorkQueueList.class);
if (wqList != null) {
@@ -99,7 +99,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
registerBusAsService();
}
-
+
public void preShutdown() {
}
@@ -110,7 +110,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
service = null;
}
}
-
+
private static ServiceReference[] getServiceReferences(BundleContext context, Class<?> serviceClass) {
ServiceReference[] refs = null;
try {
@@ -154,7 +154,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
}
}
-
+
private void registerBusFeatures() {
ServiceReference refs[] = getServiceReferences(defaultContext, Feature.class);
for (ServiceReference ref : refs) {
@@ -192,7 +192,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
}
}
// if the excludes-regex is set, the service is excluded when matching that regex.
- return extensionBundlesExcludesPattern != null
+ return extensionBundlesExcludesPattern != null
&& extensionBundlesExcludesPattern.matcher(ref.getBundle().getSymbolicName()).matches();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java b/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
index fda6f80..5fec856 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/OSGiBeanLocator.java
@@ -33,17 +33,17 @@ public class OSGiBeanLocator implements ConfiguredBeanLocator {
private static final Logger LOG = LogUtils.getL7dLogger(OSGiBeanLocator.class);
private static final String COMPATIBLE_LOCATOR_PROP = "org.apache.cxf.bus.osgi.locator";
private static final String COMPATIBLE_LOCATOR_PROP_CHECK = COMPATIBLE_LOCATOR_PROP + ".check";
-
+
final ConfiguredBeanLocator cbl;
final BundleContext context;
- private boolean checkCompatibleLocators;
-
+ private boolean checkCompatibleLocators;
+
public OSGiBeanLocator(ConfiguredBeanLocator c, BundleContext ctx) {
cbl = c;
context = ctx;
-
+
Object checkProp = context.getProperty(COMPATIBLE_LOCATOR_PROP_CHECK);
- checkCompatibleLocators = checkProp == null || PropertyUtils.isTrue(checkProp);
+ checkCompatibleLocators = checkProp == null || PropertyUtils.isTrue(checkProp);
}
public <T> T getBeanOfType(String name, Class<T> type) {
return cbl.getBeanOfType(name, type);
@@ -64,8 +64,8 @@ public class OSGiBeanLocator implements ConfiguredBeanLocator {
ServiceReference refs[] = context.getServiceReferences(type.getName(), null);
if (refs != null) {
for (ServiceReference r : refs) {
- if (type == ClassLoader.class
- && checkCompatibleLocators
+ if (type == ClassLoader.class
+ && checkCompatibleLocators
&& !PropertyUtils.isTrue(r.getProperty(COMPATIBLE_LOCATOR_PROP))) {
continue;
}
@@ -74,19 +74,19 @@ public class OSGiBeanLocator implements ConfiguredBeanLocator {
}
} catch (Exception ex) {
//ignore, just don't support the OSGi services
- LOG.info("Tried to find the Bean with type:" + type
- + " from OSGi services and get error: " + ex);
+ LOG.info("Tried to find the Bean with type:" + type
+ + " from OSGi services and get error: " + ex);
}
return list;
}
public <T> boolean loadBeansOfType(Class<T> type, BeanLoaderListener<T> listener) {
return cbl.loadBeansOfType(type, listener);
-
+
}
public boolean hasConfiguredPropertyValue(String beanName, String propertyName, String value) {
return cbl.hasConfiguredPropertyValue(beanName, propertyName, value);
}
-
+
public List<String> getBeanNamesOfType(Class<?> type) {
return cbl.getBeanNamesOfType(type);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
index 8c721c9..4edcfc1 100644
--- a/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
@@ -43,7 +43,7 @@ public class ResourceManagerImpl extends DefaultResourceManager implements BusEx
public ResourceManagerImpl(Bus b) {
super();
setBus(b);
- }
+ }
protected void onFirstResolve() {
super.onFirstResolve();
if (bus != null) {
@@ -62,7 +62,7 @@ public class ResourceManagerImpl extends DefaultResourceManager implements BusEx
registeredResolvers.clear();
registeredResolvers.addAll(resolvers);
}
-
+
@Resource
public final void setBus(Bus b) {
if (bus != b) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
index c3de2a3..591760e 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContext.java
@@ -60,24 +60,24 @@ import org.springframework.core.io.UrlResource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
public class BusApplicationContext extends ClassPathXmlApplicationContext {
-
+
private static final String DEFAULT_CXF_CFG_FILE = "META-INF/cxf/cxf.xml";
private static final String DEFAULT_CXF_EXT_CFG_FILE = "classpath*:META-INF/cxf/cxf.extension";
private static final Logger LOG = LogUtils.getL7dLogger(BusApplicationContext.class);
-
+
private NamespaceHandlerResolver nsHandlerResolver;
private boolean includeDefaults;
private String[] cfgFiles;
private URL[] cfgFileURLs;
-
+
public BusApplicationContext(String cf, boolean include) {
this(cf, include, null);
}
public BusApplicationContext(String[] cfs, boolean include) {
this(cfs, include, null);
}
-
+
public BusApplicationContext(URL url, boolean include) {
this(url, include, null);
}
@@ -88,14 +88,14 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
public BusApplicationContext(String cf, boolean include, ApplicationContext parent) {
this(new String[] {cf}, include, parent);
}
-
+
public BusApplicationContext(URL url, boolean include, ApplicationContext parent) {
this(new URL[] {url}, include, parent, null);
- }
+ }
public BusApplicationContext(String[] cf, boolean include, ApplicationContext parent) {
this(cf, include, parent, null);
}
- public BusApplicationContext(String[] cf, boolean include,
+ public BusApplicationContext(String[] cf, boolean include,
ApplicationContext parent, NamespaceHandlerResolver res) {
super(new String[0], false, parent);
cfgFiles = cf;
@@ -107,7 +107,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
refresh();
return Boolean.TRUE;
}
-
+
});
} catch (PrivilegedActionException e) {
if (e.getException() instanceof RuntimeException) {
@@ -133,7 +133,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
refresh();
return Boolean.TRUE;
}
-
+
});
} catch (PrivilegedActionException e) {
if (e.getException() instanceof RuntimeException) {
@@ -141,17 +141,17 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
}
throw new Fault(e);
}
- }
-
+ }
+
@Override
protected Resource[] getConfigResources() {
List<Resource> resources = new ArrayList<>();
-
+
if (includeDefaults) {
try {
PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(Thread
.currentThread().getContextClassLoader());
-
+
Collections.addAll(resources, resolver.getResources(DEFAULT_CXF_CFG_FILE));
Resource[] exts = resolver.getResources(DEFAULT_CXF_EXT_CFG_FILE);
@@ -169,17 +169,17 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
}
} catch (IOException ex) {
- // ignore
- }
+ // ignore
+ }
}
-
+
boolean usingDefault = false;
if (null == cfgFiles) {
String cfgFile = SystemPropertyAction.getPropertyOrNull(Configurer.USER_CFG_FILE_PROPERTY_NAME);
if (cfgFile != null) {
cfgFiles = new String[] {cfgFile};
}
- }
+ }
if (null == cfgFiles) {
cfgFiles = new String[] {Configurer.DEFAULT_USER_CFG_FILE};
usingDefault = true;
@@ -190,7 +190,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
public Boolean run() {
return cpr != null && cpr.exists();
}
-
+
});
if (exists) {
resources.add(cpr);
@@ -200,10 +200,10 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_NOT_LOADED", cfgFile);
String message = (new Message("USER_CFG_FILE_NOT_LOADED", LOG, cfgFile)).toString();
throw new ApplicationContextException(message);
- }
+ }
}
}
-
+
if (null != cfgFileURLs) {
for (URL cfgFileURL : cfgFileURLs) {
UrlResource ur = new UrlResource(cfgFileURL);
@@ -213,8 +213,8 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_URL_NOT_FOUND_MSG", cfgFileURL);
}
}
- }
-
+ }
+
String sysCfgFileUrl = SystemPropertyAction.getPropertyOrNull(Configurer.USER_CFG_FILE_PROPERTY_URL);
if (null != sysCfgFileUrl) {
try {
@@ -223,16 +223,16 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
resources.add(ur);
} else {
LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_URL_NOT_FOUND_MSG", sysCfgFileUrl);
- }
- } catch (MalformedURLException e) {
+ }
+ } catch (MalformedURLException e) {
LogUtils.log(LOG, Level.WARNING, "USER_CFG_FILE_URL_ERROR_MSG", sysCfgFileUrl);
}
}
-
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Creating application context with resources: " + resources);
}
-
+
if (0 == resources.size()) {
return null;
}
@@ -240,7 +240,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
res = resources.toArray(res);
return res;
}
-
+
public static Resource findResource(final String cfgFile) {
try {
return AccessController.doPrivileged(new PrivilegedAction<Resource>() {
@@ -279,7 +279,7 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
return null;
}
}
-
+
@Override
protected void initBeanDefinitionReader(XmlBeanDefinitionReader reader) {
// Spring always creates a new one of these, which takes a fair amount
@@ -289,16 +289,16 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
nsHandlerResolver = new DefaultNamespaceHandlerResolver();
}
reader.setNamespaceHandlerResolver(nsHandlerResolver);
-
+
String mode = getSpringValidationMode();
if (null != mode) {
reader.setValidationModeName(mode);
}
- reader.setNamespaceAware(true);
-
- setEntityResolvers(reader);
+ reader.setNamespaceAware(true);
+
+ setEntityResolvers(reader);
}
-
+
static String getSpringValidationMode() {
return AccessController.doPrivileged(new PrivilegedAction<String>() {
public String run() {
@@ -310,8 +310,8 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
}
});
}
-
-
+
+
void setEntityResolvers(XmlBeanDefinitionReader reader) {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
reader.setEntityResolver(new BusEntityResolver(cl, new BeansDtdResolver(),
@@ -320,10 +320,10 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
@Override
protected void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) throws IOException {
// Create a new XmlBeanDefinitionReader for the given BeanFactory.
- XmlBeanDefinitionReader beanDefinitionReader =
+ XmlBeanDefinitionReader beanDefinitionReader =
new ControlledValidationXmlBeanDefinitionReader(beanFactory);
beanDefinitionReader.setNamespaceHandlerResolver(nsHandlerResolver);
-
+
// Configure the bean definition reader with this context's
// resource loading environment.
beanDefinitionReader.setResourceLoader(this);
@@ -334,5 +334,5 @@ public class BusApplicationContext extends ClassPathXmlApplicationContext {
initBeanDefinitionReader(beanDefinitionReader);
loadBeanDefinitions(beanDefinitionReader);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
index 434a851..3f56a8c 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
@@ -32,17 +32,17 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.core.io.Resource;
@NoJSR250Annotations
-public class BusApplicationContextResourceResolver
+public class BusApplicationContextResourceResolver
implements ResourceResolver, ApplicationContextAware {
-
+
ApplicationContext context;
-
+
public BusApplicationContextResourceResolver() {
}
public BusApplicationContextResourceResolver(ApplicationContext c) {
context = c;
}
-
+
public InputStream getAsStream(String name) {
Resource r = context.getResource(name);
@@ -52,7 +52,7 @@ public class BusApplicationContextResourceResolver
} catch (IOException e) {
//ignore and return null
}
- }
+ }
r = context.getResource("/" + name);
if (r != null && r.exists()) {
try {
@@ -60,12 +60,12 @@ public class BusApplicationContextResourceResolver
} catch (IOException e) {
//ignore and return null
}
- }
+ }
return null;
}
public <T> T resolve(String resourceName, Class<T> resourceType) {
-
+
try {
T resource = null;
if (resourceName == null) {
@@ -98,7 +98,7 @@ public class BusApplicationContextResourceResolver
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- context = applicationContext;
+ context = applicationContext;
}
}
[36/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java b/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
index 6dda7f9..2554e39 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/CachingXmlEventWriter.java
@@ -39,17 +39,17 @@ import org.apache.cxf.common.util.StringUtils;
/**
- *
+ *
*/
public class CachingXmlEventWriter implements XMLStreamWriter {
protected XMLEventFactory factory;
-
+
List<XMLEvent> events = new ArrayList<>(1000);
Stack<NSContext> contexts = new Stack<NSContext>();
Stack<QName> elNames = new Stack<QName>();
QName lastStart;
NSContext curContext = new NSContext(null);
-
+
public CachingXmlEventWriter() {
factory = XMLEventFactory.newInstance();
}
@@ -57,7 +57,7 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
protected void addEvent(XMLEvent event) {
events.add(event);
}
-
+
public List<XMLEvent> getEvents() {
return events;
}
@@ -109,11 +109,11 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
}
public void writeCharacters(String arg0) throws XMLStreamException {
- addEvent(factory.createCharacters(arg0));
+ addEvent(factory.createCharacters(arg0));
}
public void writeCharacters(char[] arg0, int arg1, int arg2) throws XMLStreamException {
- addEvent(factory.createCharacters(new String(arg0, arg1, arg2)));
+ addEvent(factory.createCharacters(new String(arg0, arg1, arg2)));
}
public void writeComment(String arg0) throws XMLStreamException {
@@ -121,7 +121,7 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
}
public void writeDTD(String arg0) throws XMLStreamException {
- addEvent(factory.createDTD(arg0));
+ addEvent(factory.createDTD(arg0));
}
public void writeEndDocument() throws XMLStreamException {
@@ -130,16 +130,16 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
public void writeEntityRef(String arg0) throws XMLStreamException {
- addEvent(factory.createEntityReference(arg0, null));
+ addEvent(factory.createEntityReference(arg0, null));
}
public void writeProcessingInstruction(String arg0) throws XMLStreamException {
- addEvent(factory.createProcessingInstruction(arg0, null));
+ addEvent(factory.createProcessingInstruction(arg0, null));
}
public void writeProcessingInstruction(String arg0, String arg1) throws XMLStreamException {
- addEvent(factory.createProcessingInstruction(arg0, arg1));
+ addEvent(factory.createProcessingInstruction(arg0, arg1));
}
public void writeStartDocument() throws XMLStreamException {
@@ -147,33 +147,33 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
}
public void writeStartDocument(String version) throws XMLStreamException {
- addEvent(factory.createStartDocument(null, version));
+ addEvent(factory.createStartDocument(null, version));
}
public void writeStartDocument(String arg0, String arg1) throws XMLStreamException {
- addEvent(factory.createStartDocument(arg0, arg1));
+ addEvent(factory.createStartDocument(arg0, arg1));
}
-
+
public void setDefaultNamespace(String ns) throws XMLStreamException {
curContext.addNs("", ns);
}
-
+
public void writeNamespace(String pfx, String ns) throws XMLStreamException {
curContext.addNs(pfx, ns);
if (StringUtils.isEmpty(pfx)) {
- addEvent(factory.createNamespace(ns));
+ addEvent(factory.createNamespace(ns));
} else {
addEvent(factory.createNamespace(pfx, ns));
- }
+ }
}
-
+
public void writeAttribute(String uri, String name, String value) throws XMLStreamException {
if (!StringUtils.isEmpty(uri)) {
String pfx = StaxUtils.getUniquePrefix(this, uri, false);
- addEvent(factory.createAttribute(pfx, uri, name, value));
- } else {
- addEvent(factory.createAttribute(name, value));
+ addEvent(factory.createAttribute(pfx, uri, name, value));
+ } else {
+ addEvent(factory.createAttribute(name, value));
}
}
public void setPrefix(String pfx, String uri) throws XMLStreamException {
@@ -182,17 +182,17 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
public void writeEndElement() throws XMLStreamException {
- addEvent(factory.createEndElement(lastStart,
+ addEvent(factory.createEndElement(lastStart,
Collections.<javax.xml.stream.events.Namespace>emptyList().iterator()));
curContext = contexts.pop();
lastStart = elNames.pop();
}
-
-
+
+
public void writeDefaultNamespace(String ns) throws XMLStreamException {
writeNamespace("", ns);
}
-
+
public void writeEmptyElement(String name) throws XMLStreamException {
writeStartElement(name);
writeEndElement();
@@ -205,7 +205,7 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
writeStartElement(pfx, name, ns);
writeEndElement();
}
-
+
public void writeStartElement(String name) throws XMLStreamException {
elNames.push(lastStart);
contexts.push(curContext);
@@ -233,18 +233,18 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
Collections.EMPTY_SET.iterator(),
Collections.EMPTY_SET.iterator()));
}
-
+
public static class NSContext implements NamespaceContext {
NamespaceContext parent;
Map<String, String> map = new HashMap<String, String>();
-
+
public NSContext(NamespaceContext p) {
parent = p;
}
public void addNs(String pfx, String ns) {
map.put(pfx, ns);
}
-
+
public String getNamespaceURI(String prefix) {
String ret = map.get(prefix);
if (ret == null && parent != null) {
@@ -282,6 +282,6 @@ public class CachingXmlEventWriter implements XMLStreamWriter {
}
return l.iterator();
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java
index 25918ac..35b0496 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DelegatingXMLStreamWriter.java
@@ -26,11 +26,11 @@ import javax.xml.stream.XMLStreamWriter;
public class DelegatingXMLStreamWriter implements XMLStreamWriter {
protected final XMLStreamWriter delegate;
-
+
public DelegatingXMLStreamWriter(XMLStreamWriter del) {
delegate = del;
}
-
+
public void close() throws XMLStreamException {
delegate.close();
}
@@ -43,9 +43,9 @@ public class DelegatingXMLStreamWriter implements XMLStreamWriter {
return delegate.getNamespaceContext();
}
-
-
-
+
+
+
public String getPrefix(String uri) throws XMLStreamException {
return delegate.getPrefix(uri);
}
@@ -66,7 +66,7 @@ public class DelegatingXMLStreamWriter implements XMLStreamWriter {
delegate.setPrefix(pfx, uri);
}
- public void writeAttribute(String prefix, String uri,
+ public void writeAttribute(String prefix, String uri,
String local, String value) throws XMLStreamException {
delegate.writeAttribute(prefix, uri, local, value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/DepthExceededStaxException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/DepthExceededStaxException.java b/core/src/main/java/org/apache/cxf/staxutils/DepthExceededStaxException.java
index e396b63..ffaed7a 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DepthExceededStaxException.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DepthExceededStaxException.java
@@ -21,11 +21,11 @@ package org.apache.cxf.staxutils;
public class DepthExceededStaxException extends RuntimeException {
private static final long serialVersionUID = 4750070687283463619L;
-
+
public DepthExceededStaxException() {
-
+
}
-
+
public DepthExceededStaxException(String message) {
super(message);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java
index 69c1269..7b011a4 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DepthRestrictingStreamReader.java
@@ -29,39 +29,39 @@ import javax.xml.stream.XMLStreamReader;
* - total number of elements in the document
* - the maximum depth of the given element; the root element will be checked by default
* - the maximum number of immediate child nodes for individual elements
- *
- * More sophisticated policies can be supported in the future.
+ *
+ * More sophisticated policies can be supported in the future.
*/
public class DepthRestrictingStreamReader extends DepthXMLStreamReader {
-
+
private DocumentDepthProperties props;
private int totalElementCount;
private Stack<Integer> stack = new Stack<Integer>();
-
+
public DepthRestrictingStreamReader(XMLStreamReader reader,
int elementCountThreshold,
int innerElementLevelThreshold,
int innerElementCountThreshold) {
- this(reader, new DocumentDepthProperties(elementCountThreshold,
+ this(reader, new DocumentDepthProperties(elementCountThreshold,
innerElementLevelThreshold,
innerElementCountThreshold));
}
-
+
public DepthRestrictingStreamReader(XMLStreamReader reader,
DocumentDepthProperties props) {
super(reader);
this.props = props;
}
-
+
@Override
public int next() throws XMLStreamException {
int next = super.next();
if (next == START_ELEMENT) {
- if (props.getInnerElementLevelThreshold() != -1
+ if (props.getInnerElementLevelThreshold() != -1
&& getDepth() >= props.getInnerElementLevelThreshold()) {
throw new DepthExceededStaxException();
}
- if (props.getElementCountThreshold() != -1
+ if (props.getElementCountThreshold() != -1
&& ++totalElementCount >= props.getElementCountThreshold()) {
throw new DepthExceededStaxException();
}
@@ -73,10 +73,10 @@ public class DepthRestrictingStreamReader extends DepthXMLStreamReader {
} else {
stack.push(currentCount);
}
- }
+ }
stack.push(0);
}
-
+
} else if (next == END_ELEMENT && props.getInnerElementCountThreshold() != -1) {
stack.pop();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
index 4f4bf8a..21db10b 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DepthXMLStreamReader.java
@@ -85,7 +85,7 @@ public class DepthXMLStreamReader implements XMLStreamReader {
public String getElementText() throws XMLStreamException {
String ret = reader.getElementText();
- //workaround bugs in some readers that aren't properly advancing to
+ //workaround bugs in some readers that aren't properly advancing to
//the END_ELEMENT (*cough*jettison*cough*)
while (reader.getEventType() != XMLStreamReader.END_ELEMENT) {
reader.next();
@@ -218,13 +218,13 @@ public class DepthXMLStreamReader implements XMLStreamReader {
public int next() throws XMLStreamException {
int next = reader.next();
-
+
if (next == START_ELEMENT) {
depth++;
} else if (next == END_ELEMENT) {
depth--;
}
-
+
return next;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/DocumentDepthProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/DocumentDepthProperties.java b/core/src/main/java/org/apache/cxf/staxutils/DocumentDepthProperties.java
index d1c2000..a904e63 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/DocumentDepthProperties.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/DocumentDepthProperties.java
@@ -19,30 +19,30 @@
package org.apache.cxf.staxutils;
public class DocumentDepthProperties {
-
+
public static final String TOTAL_ELEMENT_COUNT = "depthTotalElementCountThreshold";
public static final String INNER_ELEMENT_COUNT = "depthInnerElementCountThreshold";
public static final String INNER_ELEMENT_LEVEL = "depthInnerElementLevelThreshold";
-
+
private int elementCountThreshold = -1;
private int innerElementLevelThreshold = -1;
private int innerElementCountThreshold = -1;
public DocumentDepthProperties() {
-
+
}
public DocumentDepthProperties(int elementCountThreshold,
int innerElementLevelThreshold,
int innerElementCountThreshold) {
this.elementCountThreshold = elementCountThreshold;
this.innerElementLevelThreshold = innerElementLevelThreshold;
- this.innerElementCountThreshold = innerElementCountThreshold;
+ this.innerElementCountThreshold = innerElementCountThreshold;
}
-
+
public boolean isEffective() {
return elementCountThreshold != -1 || innerElementLevelThreshold != -1
|| innerElementCountThreshold != -1;
}
-
+
public void setElementCountThreshold(int elementCountThreshold) {
this.elementCountThreshold = elementCountThreshold;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java
index d3982c7..b309a3f 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/FragmentStreamReader.java
@@ -35,10 +35,10 @@ public class FragmentStreamReader extends DepthXMLStreamReader {
private int current = XMLStreamReader.START_DOCUMENT;
private boolean filter = true;
private boolean advanceAtEnd = true;
-
+
public FragmentStreamReader(XMLStreamReader reader) {
super(reader);
- }
+ }
public FragmentStreamReader(XMLStreamReader reader, boolean doDocEvents) {
super(reader);
this.doDocEvents = doDocEvents;
@@ -49,12 +49,12 @@ public class FragmentStreamReader extends DepthXMLStreamReader {
startElement = true;
}
}
- }
-
+ }
+
public int getEventType() {
return current;
}
-
+
public boolean isCharacters() {
return current == XMLStreamReader.CHARACTERS;
}
@@ -69,31 +69,31 @@ public class FragmentStreamReader extends DepthXMLStreamReader {
public boolean isWhiteSpace() {
return current == XMLStreamReader.CHARACTERS && reader.isWhiteSpace();
- }
+ }
public boolean hasNext() throws XMLStreamException {
-
+
if (endDoc) {
return false;
}
-
+
return reader.hasNext();
}
-
+
public final int next() throws XMLStreamException {
if (!startElement) {
depth = getDepth();
-
+
current = reader.getEventType();
-
+
if (filter) {
while (current != START_ELEMENT && depth >= getDepth() && super.hasNext()) {
current = super.next();
}
-
+
filter = false;
}
-
+
startElement = true;
current = START_ELEMENT;
} else if (middle) {
@@ -110,7 +110,7 @@ public class FragmentStreamReader extends DepthXMLStreamReader {
if (advanceAtEnd) {
super.next();
}
-
+
endDoc = true;
current = END_DOCUMENT;
} else {
@@ -131,6 +131,6 @@ public class FragmentStreamReader extends DepthXMLStreamReader {
*/
public void setAdvanceAtEnd(boolean a) {
this.advanceAtEnd = a;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
index 475973a..3eef44b 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/OverlayW3CDOMStreamWriter.java
@@ -43,7 +43,7 @@ public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
List<Boolean> isOverlaidStack = new LinkedList<Boolean>();
Boolean textOverlay;
-
+
public OverlayW3CDOMStreamWriter(Document document) {
super(document);
}
@@ -107,7 +107,7 @@ public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
} catch (Throwable t) {
//ignore - non DOM level 3
}
- if (nd2.getNodeType() == Node.ELEMENT_NODE
+ if (nd2.getNodeType() == Node.ELEMENT_NODE
&& local.equals(nd2.getLocalName())
&& StringUtils.isEmpty(nd2.getNamespaceURI())
&& userData != null) {
@@ -148,7 +148,7 @@ public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
} catch (Throwable t) {
//ignore - non DOM level 3
}
- if (nd2.getNodeType() == Node.ELEMENT_NODE
+ if (nd2.getNodeType() == Node.ELEMENT_NODE
&& local.equals(nd2.getLocalName())
&& namespace.equals(nd2.getNamespaceURI())
&& userData == null) {
@@ -182,7 +182,7 @@ public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
} else {
nd2 = nd.getFirstChild();
}
-
+
while (nd2 != null) {
Object userData = null;
try {
@@ -191,7 +191,7 @@ public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
//ignore - non DOM level 3
}
- if (nd2.getNodeType() == Node.ELEMENT_NODE
+ if (nd2.getNodeType() == Node.ELEMENT_NODE
&& local.equals(nd2.getLocalName())
&& namespace.equals(nd2.getNamespaceURI())
&& userData == null) {
@@ -212,7 +212,7 @@ public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
textOverlay = false;
}
}
-
+
public void writeCharacters(String text) throws XMLStreamException {
if (!isOverlaid || textOverlay == null) {
super.writeCharacters(text);
@@ -226,8 +226,8 @@ public class OverlayW3CDOMStreamWriter extends W3CDOMStreamWriter {
}
super.writeCharacters(text);
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/PartialXMLStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/PartialXMLStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/PartialXMLStreamReader.java
index fb4f2b0..5e3f564 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/PartialXMLStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/PartialXMLStreamReader.java
@@ -33,7 +33,7 @@ public class PartialXMLStreamReader extends DepthXMLStreamReader {
private boolean foundEnd;
private int endDepth;
private int currentEvent;
-
+
public PartialXMLStreamReader(XMLStreamReader r, QName endTag) {
super(r);
this.endTag = endTag;
@@ -42,7 +42,7 @@ public class PartialXMLStreamReader extends DepthXMLStreamReader {
@Override
public int next() throws XMLStreamException {
- if (!foundEnd) {
+ if (!foundEnd) {
currentEvent = super.next();
if (currentEvent == START_ELEMENT && getName().equals(endTag)) {
@@ -50,7 +50,7 @@ public class PartialXMLStreamReader extends DepthXMLStreamReader {
endDepth = getDepth();
return START_ELEMENT;
}
-
+
return currentEvent;
} else if (endDepth > 0) {
endDepth--;
@@ -58,7 +58,7 @@ public class PartialXMLStreamReader extends DepthXMLStreamReader {
} else {
currentEvent = END_DOCUMENT;
}
-
+
return currentEvent;
}
@@ -71,6 +71,6 @@ public class PartialXMLStreamReader extends DepthXMLStreamReader {
public boolean hasNext() {
return currentEvent != END_DOCUMENT;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java
index 73b5d0c..8de6158 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/PrettyPrintXMLStreamWriter.java
@@ -62,7 +62,7 @@ public class PrettyPrintXMLStreamWriter implements XMLStreamWriter {
public void indent() {
curIndent += indentAmount;
}
-
+
public void unindent() {
curIndent -= indentAmount;
}
@@ -206,16 +206,16 @@ public class PrettyPrintXMLStreamWriter implements XMLStreamWriter {
throws XMLStreamException {
baseWriter.writeStartDocument(encoding, version);
}
-
+
public void writeStartElement(java.lang.String localName) throws XMLStreamException {
writeStartElement(null, localName, null);
}
-
+
public void writeStartElement(java.lang.String namespaceURI, java.lang.String localName)
throws XMLStreamException {
writeStartElement(null, localName, namespaceURI);
}
-
+
public void writeStartElement(java.lang.String prefix,
java.lang.String localName,
java.lang.String namespaceURI) throws XMLStreamException {
@@ -232,7 +232,7 @@ public class PrettyPrintXMLStreamWriter implements XMLStreamWriter {
if (prefix == null && namespaceURI == null) {
baseWriter.writeStartElement(localName);
} else if (prefix == null) {
- baseWriter.writeStartElement(namespaceURI, localName);
+ baseWriter.writeStartElement(namespaceURI, localName);
} else {
baseWriter.writeStartElement(prefix, localName, namespaceURI);
}
@@ -260,5 +260,5 @@ public class PrettyPrintXMLStreamWriter implements XMLStreamWriter {
hasChildElements = childElements;
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReader.java
index 0e89237..8cfc89c 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReader.java
@@ -26,14 +26,14 @@ import javax.xml.stream.util.StreamReaderDelegate;
/**
* A StreamReaderDelegate that expands property references in element and attribute values.
- *
+ *
*/
public class PropertiesExpandingStreamReader extends StreamReaderDelegate {
public static final String DELIMITER = "@";
-
+
private final Map<String, String> props;
-
+
public PropertiesExpandingStreamReader(XMLStreamReader reader, Map<String, String> props) {
super(reader);
this.props = props;
@@ -43,7 +43,7 @@ public class PropertiesExpandingStreamReader extends StreamReaderDelegate {
if (isEmpty(value)) {
return value;
}
-
+
final int startIndx = value.indexOf(DELIMITER);
if (startIndx > -1) {
final int endIndx = value.lastIndexOf(DELIMITER);
@@ -61,7 +61,7 @@ public class PropertiesExpandingStreamReader extends StreamReaderDelegate {
}
}
}
-
+
return value;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java
index 6b85345..a06944e 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxSource.java
@@ -43,7 +43,7 @@ public class StaxSource extends SAXSource implements XMLReader {
private XMLStreamReader streamReader;
private ContentHandler contentHandler;
-
+
private LexicalHandler lexicalHandler;
public StaxSource(XMLStreamReader streamReader) {
@@ -102,7 +102,7 @@ public class StaxSource extends SAXSource implements XMLReader {
int start = streamReader.getTextStart();
char[] chars = streamReader.getTextCharacters();
lexicalHandler.comment(chars, start, length);
- }
+ }
break;
case XMLStreamConstants.DTD:
break;
@@ -113,7 +113,7 @@ public class StaxSource extends SAXSource implements XMLReader {
String uri = streamReader.getNamespaceURI();
String localName = streamReader.getLocalName();
String prefix = streamReader.getPrefix();
- String qname = prefix != null && prefix.length() > 0
+ String qname = prefix != null && prefix.length() > 0
? prefix + ":" + localName : localName;
contentHandler.endElement(uri, localName, qname);
// namespaces
@@ -141,7 +141,7 @@ public class StaxSource extends SAXSource implements XMLReader {
String uri = streamReader.getNamespaceURI();
String localName = streamReader.getLocalName();
String prefix = streamReader.getPrefix();
- String qname = prefix != null && prefix.length() > 0
+ String qname = prefix != null && prefix.length() > 0
? prefix + ":" + localName : localName;
// namespaces
for (int i = 0; i < streamReader.getNamespaceCount(); i++) {
@@ -214,7 +214,7 @@ public class StaxSource extends SAXSource implements XMLReader {
return false;
}
- public void setFeature(String name, boolean value)
+ public void setFeature(String name, boolean value)
throws SAXNotRecognizedException, SAXNotSupportedException {
}
@@ -222,7 +222,7 @@ public class StaxSource extends SAXSource implements XMLReader {
return null;
}
- public void setProperty(String name, Object value)
+ public void setProperty(String name, Object value)
throws SAXNotRecognizedException, SAXNotSupportedException {
if ("http://xml.org/sax/properties/lexical-handler".equals(name)) {
lexicalHandler = (LexicalHandler) value;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index 49796b6..4cc7088 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -97,80 +97,80 @@ import org.apache.cxf.message.Message;
public final class StaxUtils {
// System properties for defaults, but also contextual properties usable
// for StaxInInterceptor
- public static final String MAX_CHILD_ELEMENTS =
+ public static final String MAX_CHILD_ELEMENTS =
"org.apache.cxf.stax.maxChildElements";
- public static final String MAX_ELEMENT_DEPTH =
+ public static final String MAX_ELEMENT_DEPTH =
"org.apache.cxf.stax.maxElementDepth";
- public static final String MAX_ATTRIBUTE_COUNT =
+ public static final String MAX_ATTRIBUTE_COUNT =
"org.apache.cxf.stax.maxAttributeCount";
- public static final String MAX_ATTRIBUTE_SIZE =
+ public static final String MAX_ATTRIBUTE_SIZE =
"org.apache.cxf.stax.maxAttributeSize";
- public static final String MAX_TEXT_LENGTH =
+ public static final String MAX_TEXT_LENGTH =
"org.apache.cxf.stax.maxTextLength";
public static final String MIN_TEXT_SEGMENT =
"org.apache.cxf.stax.minTextSegment";
- public static final String MAX_ELEMENT_COUNT =
+ public static final String MAX_ELEMENT_COUNT =
"org.apache.cxf.stax.maxElementCount";
- public static final String MAX_XML_CHARACTERS =
+ public static final String MAX_XML_CHARACTERS =
"org.apache.cxf.stax.maxXMLCharacters";
- public static final String ALLOW_INSECURE_PARSER =
+ public static final String ALLOW_INSECURE_PARSER =
"org.apache.cxf.stax.allowInsecureParser";
-
- private static final String INNER_ELEMENT_COUNT_SYSTEM_PROP =
+
+ private static final String INNER_ELEMENT_COUNT_SYSTEM_PROP =
"org.apache.cxf.staxutils.innerElementCountThreshold";
- private static final String INNER_ELEMENT_LEVEL_SYSTEM_PROP =
+ private static final String INNER_ELEMENT_LEVEL_SYSTEM_PROP =
"org.apache.cxf.staxutils.innerElementLevelThreshold";
-
+
private static final Logger LOG = LogUtils.getL7dLogger(StaxUtils.class);
-
+
private static final BlockingQueue<XMLInputFactory> NS_AWARE_INPUT_FACTORY_POOL;
private static final XMLInputFactory SAFE_INPUT_FACTORY;
private static final BlockingQueue<XMLOutputFactory> OUTPUT_FACTORY_POOL;
private static final XMLOutputFactory SAFE_OUTPUT_FACTORY;
-
+
private static final String XML_NS = "http://www.w3.org/2000/xmlns/";
private static final String DEF_PREFIXES[] = new String[] {
"ns1".intern(), "ns2".intern(), "ns3".intern(),
"ns4".intern(), "ns5".intern(), "ns6".intern(),
"ns7".intern(), "ns8".intern(), "ns9".intern()
};
-
+
private static int innerElementLevelThreshold = 100;
private static int innerElementCountThreshold = 50000;
- private static int maxAttributeCount = 500;
+ private static int maxAttributeCount = 500;
private static int maxAttributeSize = 64 * 1024; //64K per attribute, likely just "list" will hit
- private static int maxTextLength = 128 * 1024 * 1024; //128M - more than this should DEFINITLEY use MTOM
+ private static int maxTextLength = 128 * 1024 * 1024; //128M - more than this should DEFINITLEY use MTOM
private static int minTextSegment = 64; // Same default as woodstox
private static long maxElementCount = Long.MAX_VALUE;
private static long maxXMLCharacters = Long.MAX_VALUE;
-
+
private static boolean allowInsecureParser;
-
+
static {
int i = getInteger("org.apache.cxf.staxutils.pool-size", 20);
-
+
NS_AWARE_INPUT_FACTORY_POOL = new ArrayBlockingQueue<XMLInputFactory>(i);
OUTPUT_FACTORY_POOL = new ArrayBlockingQueue<XMLOutputFactory>(i);
-
+
//old names
innerElementCountThreshold = getInteger(INNER_ELEMENT_COUNT_SYSTEM_PROP, innerElementCountThreshold);
innerElementLevelThreshold = getInteger(INNER_ELEMENT_LEVEL_SYSTEM_PROP, innerElementLevelThreshold);
//new names
innerElementCountThreshold = getInteger(MAX_CHILD_ELEMENTS, innerElementCountThreshold);
innerElementLevelThreshold = getInteger(MAX_ELEMENT_DEPTH, innerElementLevelThreshold);
- maxAttributeCount = getInteger(MAX_ATTRIBUTE_COUNT, maxAttributeCount);
+ maxAttributeCount = getInteger(MAX_ATTRIBUTE_COUNT, maxAttributeCount);
maxAttributeSize = getInteger(MAX_ATTRIBUTE_SIZE, maxAttributeSize);
- maxTextLength = getInteger(MAX_TEXT_LENGTH, maxTextLength);
+ maxTextLength = getInteger(MAX_TEXT_LENGTH, maxTextLength);
minTextSegment = getInteger(MIN_TEXT_SEGMENT, minTextSegment);
maxElementCount = getLong(MAX_ELEMENT_COUNT, maxElementCount);
maxXMLCharacters = getLong(MAX_XML_CHARACTERS, maxXMLCharacters);
-
+
String s = SystemPropertyAction.getPropertyOrNull(ALLOW_INSECURE_PARSER);
if (!StringUtils.isEmpty(s)) {
allowInsecureParser = "1".equals(s) || Boolean.parseBoolean(s);
}
-
+
XMLInputFactory xif = null;
try {
xif = createXMLInputFactory(true);
@@ -184,7 +184,7 @@ public final class StaxUtils {
xif = null;
}
SAFE_INPUT_FACTORY = xif;
-
+
XMLOutputFactory xof = null;
try {
xof = XMLOutputFactory.newInstance();
@@ -197,9 +197,9 @@ public final class StaxUtils {
//ignore, can always drop down to the pooled factories
}
SAFE_OUTPUT_FACTORY = xof;
-
+
}
-
+
private StaxUtils() {
}
private static int getInteger(String prop, int def) {
@@ -234,7 +234,7 @@ public final class StaxUtils {
}
return def;
}
-
+
public static void setInnerElementLevelThreshold(int i) {
if (i == -1) {
i = 500;
@@ -251,11 +251,11 @@ public final class StaxUtils {
}
/**
- * CXF works with multiple STaX parsers. When we can't find any other way to work
+ * CXF works with multiple STaX parsers. When we can't find any other way to work
* against the different parsers, this can be used to condition code. Note: if you've got
* Woodstox in the class path without being the default provider, this will return
* the wrong answer.
- * @return true if Woodstox is in the classpath.
+ * @return true if Woodstox is in the classpath.
*/
public static boolean isWoodstox() {
try {
@@ -265,7 +265,7 @@ public final class StaxUtils {
}
return true;
}
-
+
/**
* Return a cached, namespace-aware, factory.
*/
@@ -279,13 +279,13 @@ public final class StaxUtils {
}
return f;
}
-
+
private static void returnXMLInputFactory(XMLInputFactory factory) {
if (SAFE_INPUT_FACTORY != factory) {
NS_AWARE_INPUT_FACTORY_POOL.offer(factory);
}
}
-
+
private static XMLOutputFactory getXMLOutputFactory() {
if (SAFE_OUTPUT_FACTORY != null) {
return SAFE_OUTPUT_FACTORY;
@@ -296,17 +296,17 @@ public final class StaxUtils {
}
return f;
}
-
+
private static void returnXMLOutputFactory(XMLOutputFactory factory) {
if (SAFE_OUTPUT_FACTORY != factory) {
OUTPUT_FACTORY_POOL.offer(factory);
}
}
-
+
/**
* Return a new factory so that the caller can set sticky parameters.
* @param nsAware
- * @throws XMLStreamException
+ * @throws XMLStreamException
*/
public static XMLInputFactory createXMLInputFactory(boolean nsAware) {
XMLInputFactory factory = null;
@@ -326,11 +326,11 @@ public final class StaxUtils {
LOG.log(Level.FINE, "Cannot create Woodstox XMLInputFactory: ", t);
}
}
-
+
if (factory == null) {
throw new RuntimeException("Failed to create XMLInputFactory.");
}
-
+
if (!setRestrictionProperties(factory)) {
if (allowInsecureParser) {
LOG.log(Level.WARNING, "INSECURE_PARSER_DETECTED", factory.getClass().getName());
@@ -350,18 +350,18 @@ public final class StaxUtils {
throw new XMLStreamException("Reading external entities is disabled");
}
});
-
+
return factory;
}
-
+
private static XMLInputFactory createWoodstoxFactory() {
return WoodstoxHelper.createInputFactory();
}
-
+
public static XMLEventFactory createWoodstoxEventFactory() {
return WoodstoxHelper.createEventFactory();
}
-
+
private static boolean setRestrictionProperties(XMLInputFactory factory) {
//For now, we can only support Woodstox 4.2.x and newer as none of the other
//stax parsers support these settings
@@ -386,7 +386,7 @@ public final class StaxUtils {
return false;
}
-
+
public static XMLStreamWriter createXMLStreamWriter(Writer out) {
XMLOutputFactory factory = getXMLOutputFactory();
@@ -397,8 +397,8 @@ public final class StaxUtils {
} finally {
returnXMLOutputFactory(factory);
}
- }
-
+ }
+
public static XMLStreamWriter createXMLStreamWriter(OutputStream out) {
return createXMLStreamWriter(out, null);
}
@@ -416,10 +416,10 @@ public final class StaxUtils {
returnXMLOutputFactory(factory);
}
}
-
+
public static XMLStreamWriter createXMLStreamWriter(Result r) {
if (r instanceof DOMResult) {
- //use our own DOM writer to avoid issues with Sun's
+ //use our own DOM writer to avoid issues with Sun's
//version that doesn't support getNamespaceContext
DOMResult dr = (DOMResult)r;
Node nd = dr.getNode();
@@ -452,7 +452,7 @@ public final class StaxUtils {
}
}
-
+
public static void nextEvent(XMLStreamReader dr) {
try {
dr.next();
@@ -500,7 +500,7 @@ public final class StaxUtils {
int depth = reader.getDepth();
int event = reader.getEventType();
while (reader.getDepth() >= depth && reader.hasNext()) {
- if (event == XMLStreamReader.START_ELEMENT && reader.getName().equals(endTag)
+ if (event == XMLStreamReader.START_ELEMENT && reader.getName().equals(endTag)
&& reader.getDepth() == depth + 1) {
return true;
}
@@ -510,8 +510,8 @@ public final class StaxUtils {
} catch (XMLStreamException e) {
throw new RuntimeException("Couldn't parse stream.", e);
}
- }
-
+ }
+
public static void writeStartElement(XMLStreamWriter writer, String prefix, String name, String namespace)
throws XMLStreamException {
if (prefix == null) {
@@ -634,7 +634,7 @@ public final class StaxUtils {
return;
}
}
-
+
} else if (source instanceof StreamSource) {
StreamSource ss = (StreamSource)source;
if (ss.getInputStream() == null
@@ -649,9 +649,9 @@ public final class StaxUtils {
reader.close();
}
- public static Document copy(Document doc)
+ public static Document copy(Document doc)
throws XMLStreamException, ParserConfigurationException {
-
+
XMLStreamReader reader = createXMLStreamReader(doc);
W3CDOMStreamWriter writer = new W3CDOMStreamWriter();
copy(reader, writer);
@@ -671,14 +671,14 @@ public final class StaxUtils {
XMLStreamReader reader = createXMLStreamReader(node);
copy(reader, writer);
}
-
+
public static void copy(XMLStreamReader reader, OutputStream os)
throws XMLStreamException {
XMLStreamWriter xsw = StaxUtils.createXMLStreamWriter(os);
StaxUtils.copy(reader, xsw);
xsw.close();
}
-
+
public static void writeTo(Node node, OutputStream os) throws XMLStreamException {
copy(new DOMSource(node), os);
}
@@ -707,15 +707,15 @@ public final class StaxUtils {
} finally {
writer.close();
}
- }
-
-
+ }
+
+
/**
* Copies the reader to the writer. The start and end document methods must
* be handled on the writer manually. TODO: if the namespace on the reader
* has been declared previously to where we are in the stream, this probably
* won't work.
- *
+ *
* @param reader
* @param writer
* @throws XMLStreamException
@@ -723,7 +723,7 @@ public final class StaxUtils {
public static void copy(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
copy(reader, writer, false, false);
}
- public static void copy(XMLStreamReader reader, XMLStreamWriter writer, boolean fragment)
+ public static void copy(XMLStreamReader reader, XMLStreamWriter writer, boolean fragment)
throws XMLStreamException {
copy(reader, writer, fragment, false);
}
@@ -743,17 +743,17 @@ public final class StaxUtils {
read++;
if (isThreshold) {
elementCount++;
-
- if (innerElementLevelThreshold != -1
+
+ if (innerElementLevelThreshold != -1
&& read >= innerElementLevelThreshold) {
- throw new DepthExceededStaxException("reach the innerElementLevelThreshold:"
+ throw new DepthExceededStaxException("reach the innerElementLevelThreshold:"
+ innerElementLevelThreshold);
}
- if (innerElementCountThreshold != -1
+ if (innerElementCountThreshold != -1
&& elementCount >= innerElementCountThreshold) {
- throw new DepthExceededStaxException("reach the innerElementCountThreshold:"
+ throw new DepthExceededStaxException("reach the innerElementCountThreshold:"
+ innerElementCountThreshold);
- }
+ }
countStack.push(elementCount);
elementCount = 0;
}
@@ -801,13 +801,13 @@ public final class StaxUtils {
String uri = reader.getNamespaceURI();
String prefix = reader.getPrefix();
String local = reader.getLocalName();
-
+
if (prefix == null) {
prefix = "";
}
boolean writeElementNS = false;
-
+
if (uri != null) {
writeElementNS = true;
Iterator<String> it = CastUtils.cast(writer.getNamespaceContext().getPrefixes(uri));
@@ -825,7 +825,7 @@ public final class StaxUtils {
}
}
}
-
+
// Write out the element name
if (uri != null) {
if (prefix.length() == 0 && StringUtils.isEmpty(uri)) {
@@ -854,7 +854,7 @@ public final class StaxUtils {
writer.writeNamespace(nsPrefix, nsURI);
writer.setPrefix(nsPrefix, nsURI);
}
-
+
if (nsURI.equals(uri) && nsPrefix.equals(prefix)) {
writeElementNS = false;
}
@@ -871,8 +871,8 @@ public final class StaxUtils {
writer.writeNamespace(prefix, uri);
writer.setPrefix(prefix, uri);
}
- }
-
+ }
+
// Write out attributes
for (int i = 0; i < reader.getAttributeCount(); i++) {
String ns = reader.getAttributeNamespace(i);
@@ -915,7 +915,7 @@ public final class StaxUtils {
if (writeProlog) {
writer.writeStartDocument();
}
-
+
Node node = d.getFirstChild();
while (node != null) {
if (writeProlog || node.getNodeType() == Node.ELEMENT_NODE) {
@@ -923,7 +923,7 @@ public final class StaxUtils {
}
node = node.getNextSibling();
}
-
+
if (writeProlog) {
writer.writeEndDocument();
}
@@ -934,12 +934,12 @@ public final class StaxUtils {
* started the document (via writeStartDocument()). Also, this probably
* won't work with just a fragment of a document. The Element should be the
* root element of the document.
- *
+ *
* @param e
* @param writer
* @throws XMLStreamException
*/
- public static void writeElement(Element e, XMLStreamWriter writer, boolean repairing)
+ public static void writeElement(Element e, XMLStreamWriter writer, boolean repairing)
throws XMLStreamException {
writeElement(e, writer, repairing, true);
}
@@ -949,7 +949,7 @@ public final class StaxUtils {
* started the document (via writeStartDocument()). Also, this probably
* won't work with just a fragment of a document. The Element should be the
* root element of the document.
- *
+ *
* @param e
* @param writer
* @param endElement true if the element should be ended
@@ -986,8 +986,8 @@ public final class StaxUtils {
} else {
writer.writeStartElement(prefix, localName, ns);
}
-
- for (Node attr : sortElementAttributes(e.getAttributes())) {
+
+ for (Node attr : sortElementAttributes(e.getAttributes())) {
String name = attr.getLocalName();
String attrPrefix = attr.getPrefix();
@@ -997,7 +997,7 @@ public final class StaxUtils {
if (name == null) {
name = attr.getNodeName();
}
-
+
if ("xmlns".equals(attrPrefix)) {
writer.writeNamespace(name, attr.getNodeValue());
writer.setPrefix(name, attr.getNodeValue());
@@ -1026,7 +1026,7 @@ public final class StaxUtils {
writer.writeNamespace(attrPrefix, attns);
}
writer.writeAttribute(attrPrefix, attns, name, value);
- }
+ }
}
}
}
@@ -1045,7 +1045,7 @@ public final class StaxUtils {
while (nd != null) {
writeNode(nd, writer, repairing);
nd = nd.getNextSibling();
- }
+ }
if (endElement) {
writer.writeEndElement();
@@ -1059,7 +1059,7 @@ public final class StaxUtils {
List<Node> sortedAttrs = new LinkedList<Node>();
for (int i = 0; i < attrs.getLength(); i++) {
Node attr = attrs.item(i);
- String name = attr.getLocalName();
+ String name = attr.getLocalName();
if (name == null) {
name = attr.getNodeName();
}
@@ -1073,9 +1073,9 @@ public final class StaxUtils {
return sortedAttrs;
}
- public static void writeNode(Node n, XMLStreamWriter writer, boolean repairing)
+ public static void writeNode(Node n, XMLStreamWriter writer, boolean repairing)
throws XMLStreamException {
-
+
switch (n.getNodeType()) {
case Node.ELEMENT_NODE:
writeElement((Element)n, writer, repairing);
@@ -1120,7 +1120,7 @@ public final class StaxUtils {
break;
default:
throw new IllegalStateException("Found type: " + n.getClass().getName());
- }
+ }
}
public static Document read(Source s) throws XMLStreamException {
@@ -1191,10 +1191,10 @@ public final class StaxUtils {
readDocElements(doc, doc, reader, true, recordLoc);
return doc;
}
-
- public static Document read(DocumentBuilder builder, XMLStreamReader reader, boolean repairing)
+
+ public static Document read(DocumentBuilder builder, XMLStreamReader reader, boolean repairing)
throws XMLStreamException {
-
+
Document doc = builder == null ? DOMUtils.createDocument() : builder.newDocument();
if (reader.getLocation().getSystemId() != null) {
try {
@@ -1222,11 +1222,11 @@ public final class StaxUtils {
} else {
att = e.getAttributeNode("xmlns");
}
-
+
if (att != null && att.getNodeValue().equals(namespaceURI)) {
return true;
}
-
+
if (e.getParentNode() instanceof Element) {
e = (Element)e.getParentNode();
} else if (StringUtils.isEmpty(prefix) && StringUtils.isEmpty(namespaceURI)) {
@@ -1238,20 +1238,20 @@ public final class StaxUtils {
}
return false;
}
-
- public static void readDocElements(Node parent, XMLStreamReader reader, boolean repairing)
+
+ public static void readDocElements(Node parent, XMLStreamReader reader, boolean repairing)
throws XMLStreamException {
Document doc = getDocument(parent);
readDocElements(doc, parent, reader, repairing, false);
}
- public static void readDocElements(Node parent, XMLStreamReader reader, boolean repairing,
- boolean isThreshold)
+ public static void readDocElements(Node parent, XMLStreamReader reader, boolean repairing,
+ boolean isThreshold)
throws XMLStreamException {
Document doc = getDocument(parent);
readDocElements(doc, parent, reader, repairing, false, isThreshold);
}
-
+
/**
* @param parent
* @param reader
@@ -1262,14 +1262,14 @@ public final class StaxUtils {
throws XMLStreamException {
readDocElements(doc, parent, reader, repairing, recordLoc, false);
}
-
+
/**
* @param parent
* @param reader
* @throws XMLStreamException
*/
public static void readDocElements(Document doc, Node parent,
- XMLStreamReader reader, boolean repairing, boolean recordLoc,
+ XMLStreamReader reader, boolean repairing, boolean recordLoc,
boolean isThreshold)
throws XMLStreamException {
Stack<Node> stack = new Stack<Node>();
@@ -1281,7 +1281,7 @@ public final class StaxUtils {
elementCount++;
Element e;
if (!StringUtils.isEmpty(reader.getPrefix())) {
- e = doc.createElementNS(reader.getNamespaceURI(),
+ e = doc.createElementNS(reader.getNamespaceURI(),
reader.getPrefix() + ":" + reader.getLocalName());
} else {
e = doc.createElementNS(reader.getNamespaceURI(), reader.getLocalName());
@@ -1312,14 +1312,14 @@ public final class StaxUtils {
declare(e, reader.getNamespaceURI(), reader.getPrefix());
}
stack.push(parent);
- if (isThreshold && innerElementLevelThreshold != -1
+ if (isThreshold && innerElementLevelThreshold != -1
&& stack.size() >= innerElementLevelThreshold) {
- throw new DepthExceededStaxException("reach the innerElementLevelThreshold:"
+ throw new DepthExceededStaxException("reach the innerElementLevelThreshold:"
+ innerElementLevelThreshold);
}
- if (isThreshold && innerElementCountThreshold != -1
+ if (isThreshold && innerElementCountThreshold != -1
&& elementCount >= innerElementCountThreshold) {
- throw new DepthExceededStaxException("reach the innerElementCountThreshold:"
+ throw new DepthExceededStaxException("reach the innerElementCountThreshold:"
+ innerElementCountThreshold);
}
parent = e;
@@ -1340,7 +1340,7 @@ public final class StaxUtils {
break;
case XMLStreamConstants.CHARACTERS:
if (parent != null) {
- recordLoc = addLocation(doc,
+ recordLoc = addLocation(doc,
parent.appendChild(doc.createTextNode(reader.getText())),
reader, recordLoc);
}
@@ -1351,7 +1351,7 @@ public final class StaxUtils {
}
break;
case XMLStreamConstants.CDATA:
- recordLoc = addLocation(doc,
+ recordLoc = addLocation(doc,
parent.appendChild(doc.createCDATASection(reader.getText())),
reader, recordLoc);
break;
@@ -1370,28 +1370,28 @@ public final class StaxUtils {
}
}
}
-
+
public static class StreamToDOMContext {
private Stack<Node> stack = new Stack<Node>();
private int elementCount;
private boolean repairing;
private boolean recordLoc;
private boolean threshold;
-
+
public StreamToDOMContext(boolean repairing, boolean recordLoc, boolean threshold) {
this.repairing = repairing;
this.recordLoc = recordLoc;
this.threshold = threshold;
}
-
+
public void setRecordLoc(boolean recordLoc) {
this.recordLoc = recordLoc;
}
-
+
public boolean isRecordLoc() {
return this.recordLoc;
}
-
+
public boolean isRepairing() {
return this.repairing;
}
@@ -1399,36 +1399,36 @@ public final class StaxUtils {
public boolean isThreshold() {
return this.threshold;
}
-
+
public int incrementCount() {
return ++elementCount;
}
-
+
public int decreaseCount() {
return --elementCount;
}
-
+
public int getCount() {
return elementCount;
}
-
+
public Node pushToStack(Node node) {
return stack.push(node);
}
-
+
public Node popFromStack() {
return stack.pop();
}
-
+
public int getStackSize() {
return stack.size();
}
-
+
public boolean isStackEmpty() {
return stack.isEmpty();
}
}
-
+
public static void readDocElements(Document doc, Node parent, XMLStreamReader reader, StreamToDOMContext context)
throws XMLStreamException {
int event = reader.getEventType();
@@ -1438,7 +1438,7 @@ public final class StaxUtils {
context.incrementCount();
Element e;
if (!StringUtils.isEmpty(reader.getPrefix())) {
- e = doc.createElementNS(reader.getNamespaceURI(),
+ e = doc.createElementNS(reader.getNamespaceURI(),
reader.getPrefix() + ":" + reader.getLocalName());
} else {
e = doc.createElementNS(reader.getNamespaceURI(), reader.getLocalName());
@@ -1471,14 +1471,14 @@ public final class StaxUtils {
declare(e, reader.getNamespaceURI(), reader.getPrefix());
}
context.pushToStack(parent);
- if (context.isThreshold() && innerElementLevelThreshold != -1
+ if (context.isThreshold() && innerElementLevelThreshold != -1
&& context.getStackSize() >= innerElementLevelThreshold) {
- throw new DepthExceededStaxException("reach the innerElementLevelThreshold:"
+ throw new DepthExceededStaxException("reach the innerElementLevelThreshold:"
+ innerElementLevelThreshold);
}
- if (context.isThreshold() && innerElementCountThreshold != -1
+ if (context.isThreshold() && innerElementCountThreshold != -1
&& context.getCount() >= innerElementCountThreshold) {
- throw new DepthExceededStaxException("reach the innerElementCountThreshold:"
+ throw new DepthExceededStaxException("reach the innerElementCountThreshold:"
+ innerElementCountThreshold);
}
parent = e;
@@ -1499,7 +1499,7 @@ public final class StaxUtils {
break;
case XMLStreamConstants.CHARACTERS:
if (parent != null) {
- context.setRecordLoc(addLocation(doc,
+ context.setRecordLoc(addLocation(doc,
parent.appendChild(doc.createTextNode(reader.getText())),
reader.getLocation(), context.isRecordLoc()));
}
@@ -1510,7 +1510,7 @@ public final class StaxUtils {
}
break;
case XMLStreamConstants.CDATA:
- context.setRecordLoc(addLocation(doc,
+ context.setRecordLoc(addLocation(doc,
parent.appendChild(doc.createCDATASection(reader.getText())),
reader.getLocation(), context.isRecordLoc()));
break;
@@ -1529,7 +1529,7 @@ public final class StaxUtils {
}
}
}
-
+
public static Node readDocElement(Document doc, Node parent, XMLEvent ev, StreamToDOMContext context)
throws XMLStreamException {
switch (ev.getEventType()) {
@@ -1539,7 +1539,7 @@ public final class StaxUtils {
StartElement startElem = ev.asStartElement();
QName name = startElem.getName();
if (!StringUtils.isEmpty(name.getPrefix())) {
- e = doc.createElementNS(name.getNamespaceURI(),
+ e = doc.createElementNS(name.getNamespaceURI(),
name.getPrefix() + ":" + name.getLocalPart());
} else {
e = doc.createElementNS(name.getNamespaceURI(), name.getLocalPart());
@@ -1553,14 +1553,14 @@ public final class StaxUtils {
declare(e, name.getNamespaceURI(), name.getPrefix());
}
context.pushToStack(parent);
- if (context.isThreshold() && innerElementLevelThreshold != -1
+ if (context.isThreshold() && innerElementLevelThreshold != -1
&& context.getStackSize() >= innerElementLevelThreshold) {
- throw new DepthExceededStaxException("reach the innerElementLevelThreshold:"
+ throw new DepthExceededStaxException("reach the innerElementLevelThreshold:"
+ innerElementLevelThreshold);
}
- if (context.isThreshold() && innerElementCountThreshold != -1
+ if (context.isThreshold() && innerElementCountThreshold != -1
&& context.getCount() >= innerElementCountThreshold) {
- throw new DepthExceededStaxException("reach the innerElementCountThreshold:"
+ throw new DepthExceededStaxException("reach the innerElementCountThreshold:"
+ innerElementCountThreshold);
}
parent = e;
@@ -1594,7 +1594,7 @@ public final class StaxUtils {
case XMLStreamConstants.CHARACTERS:
if (parent != null) {
Characters characters = ev.asCharacters();
- context.setRecordLoc(addLocation(doc,
+ context.setRecordLoc(addLocation(doc,
parent.appendChild(doc.createTextNode(characters.getData())),
characters.getLocation(), context.isRecordLoc()));
}
@@ -1606,7 +1606,7 @@ public final class StaxUtils {
break;
case XMLStreamConstants.CDATA:
Characters characters = ev.asCharacters();
- context.setRecordLoc(addLocation(doc,
+ context.setRecordLoc(addLocation(doc,
parent.appendChild(doc.createCDATASection(characters.getData())),
characters.getLocation(), context.isRecordLoc()));
break;
@@ -1623,8 +1623,8 @@ public final class StaxUtils {
}
return parent;
}
-
- private static boolean addLocation(Document doc, Node node,
+
+ private static boolean addLocation(Document doc, Node node,
Location loc,
boolean recordLoc) {
if (recordLoc && loc != null && (loc.getColumnNumber() != 0 || loc.getLineNumber() != 0)) {
@@ -1659,16 +1659,16 @@ public final class StaxUtils {
}
return recordLoc;
}
-
- private static boolean addLocation(Document doc, Node node,
+
+ private static boolean addLocation(Document doc, Node node,
XMLStreamReader reader,
boolean recordLoc) {
return addLocation(doc, node, reader.getLocation(), recordLoc);
}
-
+
private static class LocationUserDataHandler implements UserDataHandler {
public static final LocationUserDataHandler INSTANCE = new LocationUserDataHandler();
-
+
public void handle(short operation, String key, Object data, Node src, Node dst) {
if (operation == NODE_CLONED) {
dst.setUserData(key, data, this);
@@ -1755,7 +1755,7 @@ public final class StaxUtils {
returnXMLInputFactory(factory);
}
}
-
+
public static XMLStreamReader createXMLStreamReader(Element el) {
return new W3CDOMStreamReader(el);
}
@@ -1768,7 +1768,7 @@ public final class StaxUtils {
public static XMLStreamReader createXMLStreamReader(Document doc, String sysId) {
return new W3CDOMStreamReader(doc.getDocumentElement(), sysId);
}
-
+
public static XMLStreamReader createXMLStreamReader(Source source) {
try {
if (source instanceof DOMSource) {
@@ -1780,7 +1780,7 @@ public final class StaxUtils {
} else if (nd instanceof Element) {
el = (Element)nd;
}
-
+
if (null != el) {
return new W3CDOMStreamReader(el, source.getSystemId());
}
@@ -1794,11 +1794,11 @@ public final class StaxUtils {
return createXMLStreamReader(((SAXSource)source).getInputSource());
}
}
-
+
XMLInputFactory factory = getXMLInputFactory();
try {
XMLStreamReader reader = null;
-
+
try {
reader = factory.createXMLStreamReader(source);
} catch (UnsupportedOperationException e) {
@@ -1848,7 +1848,7 @@ public final class StaxUtils {
return null;
}
value = value.trim();
-
+
int index = value.indexOf(":");
if (index == -1) {
@@ -1866,13 +1866,13 @@ public final class StaxUtils {
if (ns == null) {
return new QName(localName);
}
-
+
return new QName(ns, localName, prefix);
}
-
+
/**
* Create a unique namespace uri/prefix combination.
- *
+ *
* @return The namespace with the specified URI. If one doesn't exist, one
* is created.
* @throws XMLStreamException
@@ -1916,7 +1916,7 @@ public final class StaxUtils {
n++;
}
}
-
+
public static void printXmlFragment(XMLStreamReader reader) {
try {
@@ -1928,22 +1928,22 @@ public final class StaxUtils {
writer.flush();
} finally {
StaxUtils.close(writer);
- }
+ }
LOG.info(sw.toString());
} catch (XMLStreamException e) {
LOG.severe(e.getMessage());
}
}
-
-
- private static void writeStartElementEvent(XMLEvent event, XMLStreamWriter writer)
+
+
+ private static void writeStartElementEvent(XMLEvent event, XMLStreamWriter writer)
throws XMLStreamException {
StartElement start = event.asStartElement();
QName name = start.getName();
String nsURI = name.getNamespaceURI();
String localName = name.getLocalPart();
String prefix = name.getPrefix();
-
+
if (prefix != null) {
writer.writeStartElement(prefix, localName, nsURI);
} else if (nsURI != null) {
@@ -1955,15 +1955,15 @@ public final class StaxUtils {
while (it != null && it.hasNext()) {
writeEvent(it.next(), writer);
}
-
+
it = CastUtils.cast(start.getAttributes());
while (it != null && it.hasNext()) {
- writeAttributeEvent(it.next(), writer);
+ writeAttributeEvent(it.next(), writer);
}
}
- private static void writeAttributeEvent(XMLEvent event, XMLStreamWriter writer)
+ private static void writeAttributeEvent(XMLEvent event, XMLStreamWriter writer)
throws XMLStreamException {
-
+
Attribute attr = (Attribute)event;
QName name = attr.getName();
String nsURI = name.getNamespaceURI();
@@ -1990,7 +1990,7 @@ public final class StaxUtils {
case XMLEvent.END_ELEMENT:
writer.writeEndElement();
break;
- case XMLEvent.ATTRIBUTE:
+ case XMLEvent.ATTRIBUTE:
writeAttributeEvent(event, writer);
break;
case XMLEvent.ENTITY_REFERENCE:
@@ -2002,7 +2002,7 @@ public final class StaxUtils {
case XMLEvent.PROCESSING_INSTRUCTION:
if (((javax.xml.stream.events.ProcessingInstruction)event).getData() != null) {
writer.writeProcessingInstruction(
- ((javax.xml.stream.events.ProcessingInstruction)event).getTarget(),
+ ((javax.xml.stream.events.ProcessingInstruction)event).getTarget(),
((javax.xml.stream.events.ProcessingInstruction)event).getData());
} else {
writer.writeProcessingInstruction(
@@ -2017,7 +2017,7 @@ public final class StaxUtils {
writer.writeNamespace(((Namespace)event).getPrefix(),
((Namespace)event).getNamespaceURI());
writer.setPrefix(((Namespace)event).getPrefix(),
- ((Namespace)event).getNamespaceURI());
+ ((Namespace)event).getNamespaceURI());
}
break;
case XMLEvent.COMMENT:
@@ -2107,15 +2107,15 @@ public final class StaxUtils {
throw new RuntimeException(e);
} finally {
StaxUtils.close(writer);
- }
- return sw.toString();
+ }
+ return sw.toString();
}
public static void close(XMLStreamReader reader) throws XMLStreamException {
if (reader != null) {
reader.close();
}
}
-
+
public static void close(XMLStreamWriter writer) {
if (writer != null) {
try {
@@ -2125,7 +2125,7 @@ public final class StaxUtils {
}
}
}
-
+
public static boolean isSecureReader(XMLStreamReader reader, Message message) {
if (reader instanceof DocumentDepthProperties) {
return true;
@@ -2139,29 +2139,29 @@ public final class StaxUtils {
}
return false;
}
-
+
public static XMLStreamReader configureReader(XMLStreamReader xreader, Message message) throws XMLStreamException {
Integer messageMaxChildElements = PropertyUtils.getInteger(message, MAX_CHILD_ELEMENTS);
Integer messageMaxElementDepth = PropertyUtils.getInteger(message, MAX_ELEMENT_DEPTH);
- Integer messageMaxAttributeCount = PropertyUtils.getInteger(message, MAX_ATTRIBUTE_COUNT);
+ Integer messageMaxAttributeCount = PropertyUtils.getInteger(message, MAX_ATTRIBUTE_COUNT);
Integer messageMaxAttributeSize = PropertyUtils.getInteger(message, MAX_ATTRIBUTE_SIZE);
- Integer messageMaxTextLength = PropertyUtils.getInteger(message, MAX_TEXT_LENGTH);
+ Integer messageMaxTextLength = PropertyUtils.getInteger(message, MAX_TEXT_LENGTH);
Long messageMaxElementCount = PropertyUtils.getLong(message, MAX_ELEMENT_COUNT);
Long messageMaxXMLCharacters = PropertyUtils.getLong(message, MAX_XML_CHARACTERS);
return configureReader(xreader, messageMaxChildElements, messageMaxElementDepth,
messageMaxAttributeCount, messageMaxAttributeSize, messageMaxTextLength,
messageMaxElementCount, messageMaxXMLCharacters);
}
-
+
//CHECKSTYLE:OFF - lots of params to configure
public static XMLStreamReader configureReader(XMLStreamReader reader, Integer maxChildElements,
Integer maxElementDepth, Integer maxAttributeCount,
Integer maxAttributeSize, Integer maxTextLength,
- Long maxElementCount, Long maxXMLCharacters)
+ Long maxElementCount, Long maxXMLCharacters)
throws XMLStreamException {
//CHECKSTYLE:ON
-
- // We currently ONLY support Woodstox 4.2.x for most of this other than a few things
+
+ // We currently ONLY support Woodstox 4.2.x for most of this other than a few things
// that we can handle via a wrapper.
try {
DocumentDepthProperties p = null;
@@ -2181,7 +2181,7 @@ public final class StaxUtils {
//we can handle this via a wrapper
if (p == null) {
p = new DocumentDepthProperties();
- }
+ }
p.setInnerElementLevelThreshold(maxElementDepth);
}
}
@@ -2201,7 +2201,7 @@ public final class StaxUtils {
//we can handle this via a wrapper
if (p == null) {
p = new DocumentDepthProperties();
- }
+ }
p.setElementCountThreshold(maxElementCount.intValue());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
index 22266b3..667d4d2 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
@@ -34,14 +34,14 @@ import org.xml.sax.ext.LexicalHandler;
import org.apache.cxf.common.util.StringUtils;
/**
- *
+ *
*/
public class StreamWriterContentHandler implements ContentHandler, LexicalHandler {
-
+
XMLStreamWriter writer;
Map<String, String> mapping = new LinkedHashMap<String, String>();
boolean inCDATA;
-
+
public StreamWriterContentHandler(XMLStreamWriter w) {
writer = w;
}
@@ -61,7 +61,7 @@ public class StreamWriterContentHandler implements ContentHandler, LexicalHandle
* @throws SAXException
*/
public void startDocument() throws SAXException {
- //
+ //
}
/**
@@ -174,7 +174,7 @@ public class StreamWriterContentHandler implements ContentHandler, LexicalHandle
/**
* Method getPrefix.
- * @param namespaceURI
+ * @param namespaceURI
*
* @param qname
* @return Returns String.
@@ -207,7 +207,7 @@ public class StreamWriterContentHandler implements ContentHandler, LexicalHandle
Attributes atts) throws SAXException {
try {
String prefix = getPrefix(qName, namespaceURI);
-
+
// it is only the prefix we want to learn from the QName! so we can get rid of the
// spliting QName
if (prefix == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
index f3eb87c..49d8c01 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamReader.java
@@ -44,7 +44,7 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
private Document document;
private W3CNamespaceContext context;
-
+
private String sysId;
/**
@@ -54,7 +54,7 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
super(new ElementFrame<Node, Node>(element, null));
content = element;
newFrame(getCurrentFrame());
-
+
this.document = element.getOwnerDocument();
}
public W3CDOMStreamReader(Element element, String systemId) {
@@ -155,14 +155,14 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
@Override
protected ElementFrame<Node, Node> getChildFrame() {
- return new ElementFrame<Node, Node>(getCurrentFrame().currentChild,
+ return new ElementFrame<Node, Node>(getCurrentFrame().currentChild,
getCurrentFrame());
}
@Override
protected boolean hasMoreChildren() {
if (getCurrentFrame().currentChild == null) {
- return getCurrentNode().getFirstChild() != null;
+ return getCurrentNode().getFirstChild() != null;
}
return getCurrentFrame().currentChild.getNextSibling() != null;
}
@@ -171,11 +171,11 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
protected int nextChild() {
ElementFrame<Node, Node> frame = getCurrentFrame();
if (frame.currentChild == null) {
- content = getCurrentNode().getFirstChild();
+ content = getCurrentNode().getFirstChild();
} else {
content = frame.currentChild.getNextSibling();
}
-
+
frame.currentChild = content;
switch (content.getNodeType()) {
case Node.ELEMENT_NODE:
@@ -296,7 +296,7 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
//DOM level 2?
schemaType = null;
}
- return (schemaType == null) ? "CDATA"
+ return (schemaType == null) ? "CDATA"
: schemaType.getTypeName() == null ? "CDATA" : schemaType.getTypeName();
}
@@ -403,11 +403,11 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
public String getPIData() {
throw new UnsupportedOperationException();
- }
+ }
public Location getLocation() {
try {
Object o = getCurrentNode().getUserData("location");
- if (o instanceof Location) {
+ if (o instanceof Location) {
return (Location)o;
}
} catch (Throwable ex) {
@@ -415,7 +415,7 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
}
return super.getLocation();
}
-
+
public String toString() {
if (document == null) {
return "<null>";
@@ -431,5 +431,5 @@ public class W3CDOMStreamReader extends AbstractDOMStreamReader<Node, Node> {
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
index 353da70..ae40f6e 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CDOMStreamWriter.java
@@ -67,7 +67,7 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
public W3CDOMStreamWriter(Element e) {
this.document = e.getOwnerDocument();
-
+
currentNode = e;
((W3CNamespaceContext)context).setElement(e);
}
@@ -76,7 +76,7 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
currentNode = e;
((W3CNamespaceContext)context).setElement(e);
}
-
+
public Element getCurrentNode() {
if (currentNode instanceof Element) {
return (Element)currentNode;
@@ -89,7 +89,7 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
}
return null;
}
-
+
public void setNsRepairing(boolean b) {
nsRepairing = b;
}
@@ -147,14 +147,14 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
}
}
}
-
+
protected Element createElementNS(String ns, String pfx, String local) {
if (pfx != null) {
local = pfx + ":" + local;
}
return document.createElementNS(ns, local);
}
-
+
protected void createAndAddElement(String prefix, String local, String namespace) {
if (prefix == null) {
if (namespace == null) {
@@ -214,7 +214,7 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
if (prefix.length() > 0) {
local = prefix + ":" + local;
}
-
+
Attr a = document.createAttributeNS(namespace, local);
a.setValue(value);
((Element)currentNode).setAttributeNodeNS(a);
@@ -340,7 +340,7 @@ public class W3CDOMStreamWriter implements XMLStreamWriter {
public void flush() throws XMLStreamException {
}
-
+
public String toString() {
if (document == null) {
return "<null>";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java b/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java
index fe52c8f..634f409 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/W3CNamespaceContext.java
@@ -33,17 +33,17 @@ import org.w3c.dom.Node;
public class W3CNamespaceContext implements NamespaceContext {
private Element currentNode;
private NamespaceContext outNamespaceContext;
-
+
public W3CNamespaceContext() {
}
public W3CNamespaceContext(Element el) {
currentNode = el;
}
-
+
public void setOutNamespaceContext(NamespaceContext context) {
outNamespaceContext = context;
}
-
+
public String getNamespaceURI(String prefix) {
String name = prefix;
if (name.length() == 0) {
@@ -51,7 +51,7 @@ public class W3CNamespaceContext implements NamespaceContext {
} else {
name = "xmlns:" + prefix;
}
-
+
return getNamespaceURI(currentNode, name);
}
@@ -66,7 +66,7 @@ public class W3CNamespaceContext implements NamespaceContext {
return result;
}
}
-
+
Attr attr = e.getAttributeNode(name);
if (attr == null) {
Node n = e.getParentNode();
@@ -95,7 +95,7 @@ public class W3CNamespaceContext implements NamespaceContext {
return result;
}
}
-
+
NamedNodeMap attributes = e.getAttributes();
if (attributes != null) {
for (int i = 0; i < attributes.getLength(); i++) {
@@ -128,7 +128,7 @@ public class W3CNamespaceContext implements NamespaceContext {
if (prefix != null) {
prefixes.add(prefix);
}
-
+
return prefixes.iterator();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java b/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
index 8b901bc..b389589 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/WoodstoxHelper.java
@@ -28,17 +28,17 @@ import com.ctc.wstx.stax.WstxInputFactory;
import org.codehaus.stax2.XMLStreamReader2;
/**
- *
+ *
*/
final class WoodstoxHelper {
private WoodstoxHelper() {
}
-
+
public static XMLInputFactory createInputFactory() {
return new WstxInputFactory();
}
-
+
public static XMLEventFactory createEventFactory() {
return new WstxEventFactory();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/XMLStreamReaderWrapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/XMLStreamReaderWrapper.java b/core/src/main/java/org/apache/cxf/staxutils/XMLStreamReaderWrapper.java
index ea0f307..50e34e7 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/XMLStreamReaderWrapper.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/XMLStreamReaderWrapper.java
@@ -22,9 +22,9 @@ import javax.xml.stream.XMLStreamReader;
/**
* Interface for XMLStreamReader wrappers
- *
+ *
*/
public interface XMLStreamReaderWrapper {
-
+
XMLStreamReader wrap(XMLStreamReader reader);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java b/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
index c97a619..2ef9d12 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContext.java
@@ -40,7 +40,7 @@ public class DelegatingNamespaceContext implements NamespaceContext {
namespaces = new LinkedList<Map<String, String>>();
prefixes = new LinkedList<Map<String, String>>();
}
-
+
public void down() {
namespaces.addFirst(new HashMap<String, String>(8));
prefixes.addFirst(new HashMap<String, String>(8));
@@ -50,14 +50,14 @@ public class DelegatingNamespaceContext implements NamespaceContext {
namespaces.removeFirst();
prefixes.removeFirst();
}
-
+
public void addPrefix(String prefix, String ns) {
if (!namespaces.isEmpty()) {
namespaces.getFirst().put(prefix, ns);
prefixes.getFirst().put(ns, prefix);
}
}
-
+
public String findUniquePrefix(String ns) {
if (ns.length() == 0) {
return null;
@@ -66,7 +66,7 @@ public class DelegatingNamespaceContext implements NamespaceContext {
if (existingPrefix != null) {
return existingPrefix;
}
-
+
int i = 0;
while (true) {
String prefix = "ps" + ++i;
@@ -76,7 +76,7 @@ public class DelegatingNamespaceContext implements NamespaceContext {
}
}
}
-
+
public String getNamespaceURI(String prefix) {
if (!namespaces.isEmpty()) {
Map<String, String> cache = namespaces.getFirst();
@@ -113,7 +113,7 @@ public class DelegatingNamespaceContext implements NamespaceContext {
if (value != null) {
ns = value;
}
-
+
if (!prefixes.isEmpty()) {
Map<String, String> cache = prefixes.getFirst();
for (Map<String, String> pfs : prefixes) {
@@ -131,7 +131,7 @@ public class DelegatingNamespaceContext implements NamespaceContext {
} else if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(ns)) {
return XMLConstants.XMLNS_ATTRIBUTE;
}
-
+
String prefix = nc.getPrefix(ns);
if (prefix != null) {
addPrefix(prefix, ns);
@@ -150,5 +150,5 @@ public class DelegatingNamespaceContext implements NamespaceContext {
}
return pl.iterator();
}
-
+
}
[21/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
index c8846d8..5ecd26f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ConnectionFactoryImplTest.java
@@ -36,7 +36,7 @@ import org.junit.Before;
import org.junit.Test;
public class ConnectionFactoryImplTest extends Assert {
-
+
ManagedConnectionFactory mockConnectionFactory;
ConnectionManager mockConnectionManager;
CXFConnectionRequestInfo param;
@@ -46,10 +46,10 @@ public class ConnectionFactoryImplTest extends Assert {
public void setUp() throws Exception {
mockConnectionFactory = EasyMock.createMock(ManagedConnectionFactory.class);
mockConnectionManager = EasyMock.createMock(ConnectionManager.class);
-
+
param = new CXFConnectionRequestInfo();
param.setInterface(Runnable.class);
-
+
cf = new ConnectionFactoryImpl(mockConnectionFactory, mockConnectionManager);
}
@@ -71,66 +71,66 @@ public class ConnectionFactoryImplTest extends Assert {
@Test
public void testGetConnectionReturnsConnectionWithRightManager() throws Exception {
EasyMock.reset(mockConnectionManager);
-
- CXFConnectionRequestInfo reqInfo =
- new CXFConnectionRequestInfo(Runnable.class,
- new URL("file:/tmp/foo"),
- new QName(""),
+
+ CXFConnectionRequestInfo reqInfo =
+ new CXFConnectionRequestInfo(Runnable.class,
+ new URL("file:/tmp/foo"),
+ new QName(""),
new QName(""));
-
+
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
EasyMock.eq(reqInfo));
EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(mockConnectionManager);
-
+
param.setWsdlLocation(new URL("file:/tmp/foo"));
param.setServiceName(new QName(""));
param.setPortName(new QName(""));
Object o = cf.getConnection(param);
assertNull("Got the result (the passed in ConnectionRequestInfo) from out mock manager",
o);
- EasyMock.verify(mockConnectionManager);
+ EasyMock.verify(mockConnectionManager);
}
@Test
public void testGetConnectionWithNoPortReturnsConnectionWithRightManager() throws Exception {
-
+
EasyMock.reset(mockConnectionManager);
-
- CXFConnectionRequestInfo reqInfo =
- new CXFConnectionRequestInfo(Runnable.class,
- new URL("file:/tmp/foo"),
- new QName(""),
+
+ CXFConnectionRequestInfo reqInfo =
+ new CXFConnectionRequestInfo(Runnable.class,
+ new URL("file:/tmp/foo"),
+ new QName(""),
null);
-
+
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
EasyMock.eq(reqInfo));
EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(mockConnectionManager);
-
+
param.setWsdlLocation(new URL("file:/tmp/foo"));
param.setServiceName(new QName(""));
Object o = cf.getConnection(param);
-
+
EasyMock.verify(mockConnectionManager);
-
+
assertNull("Got the result (the passed in ConnectionRequestInfo) from out mock manager",
o);
-
-
+
+
}
@Test
public void testGetConnectionWithNoWsdlLocationReturnsConnectionWithRightManager() throws Exception {
-
+
EasyMock.reset(mockConnectionManager);
-
- CXFConnectionRequestInfo reqInfo =
- new CXFConnectionRequestInfo(Runnable.class,
- null,
- new QName(""),
+
+ CXFConnectionRequestInfo reqInfo =
+ new CXFConnectionRequestInfo(Runnable.class,
+ null,
+ new QName(""),
new QName(""));
-
+
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
EasyMock.eq(reqInfo));
EasyMock.expectLastCall().andReturn(null);
@@ -140,34 +140,34 @@ public class ConnectionFactoryImplTest extends Assert {
param.setPortName(new QName(""));
Object o = cf.getConnection(param);
EasyMock.verify(mockConnectionManager);
-
+
assertNull("Got the result (the passed in ConnectionRequestInfo) from out mock manager",
o);
-
+
}
@Test
public void testGetConnectionWithNoWsdlLocationAndNoPortReturnsConnectionWithRightManager()
throws Exception {
EasyMock.reset(mockConnectionManager);
-
- CXFConnectionRequestInfo reqInfo =
- new CXFConnectionRequestInfo(Runnable.class,
- null,
- new QName(""),
+
+ CXFConnectionRequestInfo reqInfo =
+ new CXFConnectionRequestInfo(Runnable.class,
+ null,
+ new QName(""),
null);
-
+
mockConnectionManager.allocateConnection(EasyMock.eq(mockConnectionFactory),
EasyMock.eq(reqInfo));
EasyMock.expectLastCall().andReturn(null);
EasyMock.replay(mockConnectionManager);
-
+
cf = new ConnectionFactoryImpl(mockConnectionFactory, mockConnectionManager);
param.setServiceName(new QName(""));
Object o = cf.getConnection(param);
assertNull("Got the result (the passed in ConnectionRequestInfo) from out mock manager",
o);
-
+
}
@@ -195,5 +195,5 @@ public class ConnectionFactoryImplTest extends Assert {
assertTrue(true);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java
index 67f7a00..e8c6706 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/Imple.java
@@ -25,8 +25,8 @@ import javax.jws.WebService;
@WebService
public class Imple implements HelloInterface {
-
-
+
+
public String sayHi(String s) {
return "hello world ." + s;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
index 5b5100c..1793b42 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/JCABusFactoryTest.java
@@ -33,15 +33,15 @@ import org.junit.Ignore;
import org.junit.Test;
public class JCABusFactoryTest extends AbstractCXFTest {
-
-
+
+
@Test
public void testSetAppserverClassLoader() {
ClassLoader loader = new DummyClassLoader();
JCABusFactory bf = new JCABusFactory(new ManagedConnectionFactoryImpl());
bf.setAppserverClassLoader(loader);
assertSame("Checking appserverClassLoader.", loader, bf.getAppserverClassLoader());
- }
+ }
@Test
public void testLoadNonexistentProperties() throws Exception {
@@ -55,7 +55,7 @@ public class JCABusFactoryTest extends AbstractCXFTest {
re.getCause() instanceof FileNotFoundException);
}
}
-
+
@Test
public void testInvalidMonitorConfigNoPropsURL() throws Exception {
ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl();
@@ -71,12 +71,12 @@ public class JCABusFactoryTest extends AbstractCXFTest {
.indexOf("EJBServicePropertiesURL is not set") != -1);
}
}
-
+
@Ignore
@Test
public void testInitServants() throws Exception {
ManagedConnectionFactoryImpl mcf = new ManagedConnectionFactoryImpl();
- //get resource
+ //get resource
URL propFile = getClass().getResource("resources/ejb_servants.properties");
mcf.setEJBServicePropertiesURL(propFile.toString());
JCABusFactory jcaBusFactory = new JCABusFactory(mcf);
@@ -84,10 +84,10 @@ public class JCABusFactoryTest extends AbstractCXFTest {
jcaBusFactory.setBus(mockBus);
jcaBusFactory.initializeServants();
-
+
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
index 6a7c681..1a3cafb 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImplTest.java
@@ -55,18 +55,18 @@ public class ManagedConnectionFactoryImplTest extends Assert {
@Before
public void setUp() throws Exception {
-
+
mci = createManagedConnectionFactoryImpl();
-
+
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
-
- QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
-
+
+ QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
+
QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapPort");
-
+
cri = new CXFConnectionRequestInfo(Greeter.class, wsdl, serviceName,
portName);
-
+
cri2 = new CXFConnectionRequestInfo(Greeter.class, wsdl, new QName("service2"),
new QName("fooPort2"));
cri3 = new CXFConnectionRequestInfo(Greeter.class, wsdl, new QName("service3"),
@@ -116,7 +116,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
propsmcf.setLogLevel(logLevel);
assertTrue("prop is set", props.containsValue(logLevel));
}
-
+
@Test
public void testGetPropsURLFromBadURL() throws Exception {
@@ -161,9 +161,9 @@ public class ManagedConnectionFactoryImplTest extends Assert {
@Test
public void testMatchManagedConnectionsWithBoundConnections() throws Exception {
-
+
Subject subj = new Subject();
- BusFactory bf = BusFactory.newInstance();
+ BusFactory bf = BusFactory.newInstance();
Bus bus = bf.createBus();
BusFactory.setDefaultBus(bus);
ManagedConnectionFactoryImpl factory = EasyMock.createMock(ManagedConnectionFactoryImpl.class);
@@ -171,9 +171,9 @@ public class ManagedConnectionFactoryImplTest extends Assert {
// In ManagedConnectionImpl:
// one for getCXFServiceFromBus , another for createInvocationHandler
EasyMock.expectLastCall().andReturn(bus).times(4);
-
+
EasyMock.replay(factory);
-
+
ManagedConnectionImpl mc1 = new ManagedConnectionImpl(factory, cri, subj);
Object connection = mc1.getConnection(subj, cri);
@@ -185,7 +185,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
assertNotNull("connection must not be null.", connection);
*/
// EasyMock.verify(factory);
-
+
Set<ManagedConnection> mcSet = new HashSet<>();
mcSet.add(mc1);
//mcSet.add(mc2);
@@ -208,7 +208,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
mci.createConnectionFactory();
fail("expect non managed not supported on null MC");
} catch (ResourceException expectd) {
- // do nothing here
+ // do nothing here
}
}
@@ -305,7 +305,7 @@ public class ManagedConnectionFactoryImplTest extends Assert {
return new ManagedConnectionFactoryImpl();
}
-
+
}
class ManagedConnectionFactoryImplTester extends ManagedConnectionFactoryImpl {
@@ -321,5 +321,5 @@ class ManagedConnectionFactoryImplTester extends ManagedConnectionFactoryImpl {
//busFactory = new BusFactory(this);
initCalledCount++;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
index d0e9e1e..e42cfda 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
@@ -58,15 +58,15 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
assertTrue(o instanceof Foo);
}
-
+
@Ignore("Need to check the classloader")
public void testThreadContextClassLoaderIsSet() throws Exception {
- //set the threadContextClassLoader for Bus
+ //set the threadContextClassLoader for Bus
//TODO njiang classloader things
- //check the threadContextClassLoader
+ //check the threadContextClassLoader
mci.getConnection(subj, cri);
}
-
+
@Test
public void testGetConnectionWithNoWSDLInvokesCreateClientWithTwoParameters() throws Exception {
cri = new CXFConnectionRequestInfo(Greeter.class, null, serviceName, portName);
@@ -76,7 +76,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
assertTrue("Checking implementation of Connection interface", o instanceof Connection);
assertTrue("Checking implementation of passed interface", o instanceof Greeter);
}
-
+
@Test
public void testGetConnectionWithNoWSDLInvokesCreateClientWithTwoArgs()
@@ -90,11 +90,11 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
@Ignore
public void testGetConnectionWithNoPortReturnsConnection() throws Exception {
- cri = new CXFConnectionRequestInfo(Greeter.class,
+ cri = new CXFConnectionRequestInfo(Greeter.class,
wsdl,
serviceName,
null);
-
+
Object o = mci.getConnection(subj, cri);
assertTrue("Returned connection does not implement Connection interface", o instanceof Connection);
@@ -111,7 +111,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
private void verifyProxyInterceptors(Object o) {
assertTrue(o instanceof Proxy);
- assertEquals("First handler must be a ProxyInvocation Handler", ProxyInvocationHandler.class,
+ assertEquals("First handler must be a ProxyInvocation Handler", ProxyInvocationHandler.class,
Proxy.getInvocationHandler(o).getClass());
}
@@ -130,7 +130,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
PasswordCredential creds = new PasswordCredential(user, password);
subj.getPrivateCredentials().add(creds);
Object o = mci.getConnection(subj, cri);
-
+
verifyProxyInterceptors(o);
}
@@ -146,10 +146,10 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
verifyProxyInterceptors(o);
}
-
+
@Test
- public void testCloseConnection() throws Exception {
+ public void testCloseConnection() throws Exception {
Connection conn = (Connection)mci.getConnection(subj, cri);
EasyMock.reset(mockListener);
mockListener.connectionClosed(EasyMock.isA(ConnectionEvent.class));
@@ -161,7 +161,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
@Test
public void testAssociateConnection() throws Exception {
-
+
CXFConnectionRequestInfo cri2 = new CXFConnectionRequestInfo(Greeter.class,
new URL("file:/tmp/foo2"),
new QName("service2"),
@@ -199,7 +199,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
public void testAssociateConnectionThrowsException() throws Throwable {
InvocationHandler ih = EasyMock.createMock(InvocationHandler.class);
-
+
Object dodgyHandle = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {Foo.class}, ih);
try {
@@ -218,5 +218,5 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
assertEquals("Checking the EISProductionVersion", "1.1", data.getEISProductVersion());
assertEquals("Checking the EISProductName", "WS-based-EIS", data.getEISProductName());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
index 8ab1f2e..80a23f7 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionTestBase.java
@@ -49,47 +49,47 @@ public abstract class ManagedConnectionTestBase extends Assert {
protected ManagedConnectionFactoryImpl factory = EasyMock.createMock(ManagedConnectionFactoryImpl.class);
protected Bus bus;
-
+
protected ConnectionEventListener mockListener = EasyMock.createMock(ConnectionEventListener.class);
-
+
public ManagedConnectionTestBase() {
-
+
}
-
+
@Before
public void setUp() throws ResourceException, MalformedURLException, BusException {
-
+
subj = new Subject();
-
+
URL wsdl = getClass().getResource("/wsdl/hello_world.wsdl");
-
+
QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService");
-
+
QName serviceName2 = new QName("http://apache.org/hello_world_soap_http", "SOAPService2");
-
+
QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapPort");
-
+
QName portName2 = new QName("http://apache.org/hello_world_soap_http", "SoapPort2");
cri = new CXFConnectionRequestInfo(Greeter.class, wsdl, serviceName, portName);
cri2 = new CXFConnectionRequestInfo(Greeter.class, wsdl, serviceName2, portName2);
-
+
BusFactory bf = BusFactory.newInstance();
bus = bf.createBus();
BusFactory.setDefaultBus(bus);
-
-
- EasyMock.reset(factory);
-
+
+
+ EasyMock.reset(factory);
+
factory.getBus();
-
+
EasyMock.expectLastCall().andReturn(bus).anyTimes();
EasyMock.replay(factory);
-
- mci = new ManagedConnectionImpl(factory, cri, subj);
-
+
+ mci = new ManagedConnectionImpl(factory, cri, subj);
+
mci.addConnectionEventListener(mockListener);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
index f4a03c0..3929e55 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ResourceAdapterImplTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
public class ResourceAdapterImplTest extends Assert {
public ResourceAdapterImplTest() {
-
+
}
@Test
@@ -152,11 +152,11 @@ public class ResourceAdapterImplTest extends Assert {
Bus bus = EasyMock.createMock(Bus.class);
bus.shutdown(true);
EasyMock.expectLastCall();
- EasyMock.replay(bus);
+ EasyMock.replay(bus);
rai.registerBus(bus);
rai.stop();
EasyMock.verify(bus);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
index b0759e6..276a8ee 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/AbstractInvocationHandlerTest.java
@@ -23,23 +23,23 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFManagedConnectionFactory;
import org.junit.Test;
-public abstract class AbstractInvocationHandlerTest
+public abstract class AbstractInvocationHandlerTest
extends HandlerTestBase {
-
+
public AbstractInvocationHandlerTest() {
-
+
}
// seach for the setNext method
@Test
public void testHandlerInvokesNext() throws Throwable {
Object[] args = new Object[0];
-
+
CXFInvocationHandler handler = getHandler();
- handler.setNext(mockHandler);
-
- handler.invoke(target, testMethod, args);
-
+ handler.setNext(mockHandler);
+
+ handler.invoke(target, testMethod, args);
+
assertTrue("target object must not be called", !target.methodInvoked);
}
@@ -80,5 +80,5 @@ public abstract class AbstractInvocationHandlerTest
return mcf;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java
index 8d437c8..f8bfea1 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/DummyHandler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.jca.cxf.handlers;
+package org.apache.cxf.jca.cxf.handlers;
import java.lang.reflect.Method;
@@ -24,31 +24,31 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandler;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
-public class DummyHandler implements CXFInvocationHandler {
+public class DummyHandler implements CXFInvocationHandler {
- boolean invokeCalled;
+ boolean invokeCalled;
public CXFInvocationHandlerData getData() {
return new CXFInvocationHandlerDataImpl();
}
-
+
// Implementation of java.lang.reflect.InvocationHandler
- public final Object invoke(final Object object,
- final Method method,
+ public final Object invoke(final Object object,
+ final Method method,
final Object[] objectArray) throws Throwable {
- invokeCalled = true;
+ invokeCalled = true;
return null;
}
public void setNext(CXFInvocationHandler next) {
-
+
}
public CXFInvocationHandler getNext() {
return null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
index e62efcb..f5acf2f 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/HandlerTestBase.java
@@ -32,19 +32,19 @@ import org.junit.Test;
public class HandlerTestBase extends Assert {
protected Bus mockBus = EasyMock.createMock(Bus.class);
- protected CXFManagedConnection mockManagedConnection =
+ protected CXFManagedConnection mockManagedConnection =
EasyMock.createMock(CXFManagedConnection.class);
- protected CXFInvocationHandler mockHandler =
+ protected CXFInvocationHandler mockHandler =
EasyMock.createMock(CXFInvocationHandler.class);
- protected ManagedConnectionFactoryImpl mcf =
+ protected ManagedConnectionFactoryImpl mcf =
EasyMock.createMock(ManagedConnectionFactoryImpl.class);
protected ManagedConnectionImpl mci =
EasyMock.createMock(ManagedConnectionImpl.class);
protected Method testMethod;
protected TestTarget target = new TestTarget();
-
+
public HandlerTestBase() {
}
@@ -53,11 +53,11 @@ public class HandlerTestBase extends Assert {
public void setUp() {
EasyMock.reset(mcf);
EasyMock.reset(mci);
-
+
mcf.getBus();
EasyMock.expectLastCall().andReturn(mockBus);
EasyMock.replay(mcf);
-
+
mci.getManagedConnectionFactory();
EasyMock.expectLastCall().andReturn(mcf);
EasyMock.replay(mci);
@@ -66,12 +66,12 @@ public class HandlerTestBase extends Assert {
} catch (NoSuchMethodException ex) {
fail(ex.toString());
}
-
+
}
@Test
public void testNullTestTarget() {
// do nothing here ,just for avoid the junit test warning
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
index 6b18e1f..5df1b5e 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactoryTest.java
@@ -32,16 +32,16 @@ import org.junit.Before;
import org.junit.Test;
public class InvocationHandlerFactoryTest extends HandlerTestBase {
-
+
private CXFInvocationHandler handler;
-
+
private Subject testSubject;
-
+
public InvocationHandlerFactoryTest() {
super();
}
-
-
+
+
@Before
public void setUp() {
super.setUp();
@@ -53,10 +53,10 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
fail();
}
}
-
+
@Test
public void testCreateHandlerChain() throws ResourceAdapterInternalException {
-
+
CXFInvocationHandler first = handler;
CXFInvocationHandler last = null;
@@ -85,8 +85,8 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
assertTrue("last handler must be an InvokingInvocationHandler",
last instanceof InvokingInvocationHandler);
- Class<?>[] types
- = {ProxyInvocationHandler.class,
+ Class<?>[] types
+ = {ProxyInvocationHandler.class,
ObjectMethodInvocationHandler.class,
InvokingInvocationHandler.class,
SecurityTestHandler.class};
@@ -102,8 +102,8 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
assertEquals(ObjectMethodInvocationHandler.class, handler.getNext().getClass());
assertEquals(SecurityTestHandler.class, handler.getNext().getNext().getClass());
}
-
-
+
+
public static class SecurityTestHandler extends CXFInvocationHandlerBase {
public SecurityTestHandler(CXFInvocationHandlerData data) {
@@ -111,10 +111,10 @@ public class InvocationHandlerFactoryTest extends HandlerTestBase {
}
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-
+
return invokeNext(proxy, method, args);
}
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
index 008b500..992f2c7 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandlerTest.java
@@ -26,7 +26,7 @@ import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
import org.junit.Before;
import org.junit.Test;
-public class InvokingInvocationHandlerTest
+public class InvokingInvocationHandlerTest
extends AbstractInvocationHandlerTest {
TestInterface test;
@@ -82,5 +82,5 @@ public class InvokingInvocationHandlerTest
return handler;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
index b134f66..af7c8a0 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ObjectMethodInvocationHandlerTest.java
@@ -30,109 +30,109 @@ import org.junit.Test;
public class ObjectMethodInvocationHandlerTest extends AbstractInvocationHandlerTest {
- ObjectMethodInvocationHandler handler;
+ ObjectMethodInvocationHandler handler;
CXFInvocationHandlerData data;
- TestTarget testTarget = new TestTarget();
+ TestTarget testTarget = new TestTarget();
DummyHandler dummyHandler = new DummyHandler();
-
+
public ObjectMethodInvocationHandlerTest() {
super();
}
@Before
- public void setUp() {
- super.setUp();
- target.lastMethod = null;
- dummyHandler.invokeCalled = false;
+ public void setUp() {
+ super.setUp();
+ target.lastMethod = null;
+ dummyHandler.invokeCalled = false;
data = new CXFInvocationHandlerDataImpl();
data.setTarget(target);
handler = new ObjectMethodInvocationHandler(data);
- handler.setNext(dummyHandler);
- }
+ handler.setNext(dummyHandler);
+ }
@Test
- public void testToString() throws Throwable {
+ public void testToString() throws Throwable {
Method toString = Object.class.getMethod("toString", new Class[0]);
-
- Object result = handler.invoke(testTarget, toString, null);
- assertTrue("object method must not be passed to next handler in chain",
- !dummyHandler.invokeCalled);
+
+ Object result = handler.invoke(testTarget, toString, null);
+ assertTrue("object method must not be passed to next handler in chain",
+ !dummyHandler.invokeCalled);
assertTrue("object must be a String", result instanceof String);
assertTrue("checking toString method ", ((String)result).startsWith("ConnectionHandle"));
- }
+ }
@Test
- public void testHashCode() throws Throwable {
+ public void testHashCode() throws Throwable {
- Method hashCode = Object.class.getMethod("hashCode", new Class[0]);
- doObjectMethodTest(hashCode);
- }
+ Method hashCode = Object.class.getMethod("hashCode", new Class[0]);
+ doObjectMethodTest(hashCode);
+ }
@Test
- public void testEqualsDoesNotCallNext() throws Throwable {
-
- Method equals = Object.class.getMethod("equals", new Class[] {Object.class});
- handler.invoke(testTarget, equals, new Object[] {this});
- assertTrue("object method must not be passed to next handler in chain",
- !dummyHandler.invokeCalled);
- }
-
+ public void testEqualsDoesNotCallNext() throws Throwable {
+
+ Method equals = Object.class.getMethod("equals", new Class[] {Object.class});
+ handler.invoke(testTarget, equals, new Object[] {this});
+ assertTrue("object method must not be passed to next handler in chain",
+ !dummyHandler.invokeCalled);
+ }
+
@Test
- public void testNonObjecMethod() throws Throwable {
+ public void testNonObjecMethod() throws Throwable {
- DummyHandler dummyHandler1 = new DummyHandler();
- handler.setNext(dummyHandler1);
+ DummyHandler dummyHandler1 = new DummyHandler();
+ handler.setNext(dummyHandler1);
- final Method method = TestTarget.class.getMethod("testMethod", new Class[0]);
-
- handler.invoke(testTarget, method, new Object[0]);
+ final Method method = TestTarget.class.getMethod("testMethod", new Class[0]);
- assertTrue("non object method must be passed to next handler in chain", dummyHandler1.invokeCalled);
+ handler.invoke(testTarget, method, new Object[0]);
+
+ assertTrue("non object method must be passed to next handler in chain", dummyHandler1.invokeCalled);
}
@Test
- public void testEqualsThroughProxies() {
+ public void testEqualsThroughProxies() {
Class<?>[] interfaces = {TestInterface.class};
CXFInvocationHandlerData data1 = new CXFInvocationHandlerDataImpl();
CXFInvocationHandlerData data2 = new CXFInvocationHandlerDataImpl();
data1.setTarget(new TestTarget());
data2.setTarget(new TestTarget());
- ObjectMethodInvocationHandler handler1 = new ObjectMethodInvocationHandler(data1);
- handler1.setNext(mockHandler);
- ObjectMethodInvocationHandler handler2 = new ObjectMethodInvocationHandler(data2);
- handler2.setNext(mockHandler);
+ ObjectMethodInvocationHandler handler1 = new ObjectMethodInvocationHandler(data1);
+ handler1.setNext(mockHandler);
+ ObjectMethodInvocationHandler handler2 = new ObjectMethodInvocationHandler(data2);
+ handler2.setNext(mockHandler);
- TestInterface proxy1 =
+ TestInterface proxy1 =
(TestInterface)Proxy.newProxyInstance(TestInterface.class.getClassLoader(), interfaces, handler1);
- TestInterface proxy2 =
+ TestInterface proxy2 =
(TestInterface)Proxy.newProxyInstance(TestInterface.class.getClassLoader(), interfaces, handler2);
- assertEquals(proxy1, proxy1);
- assertTrue(!proxy1.equals(proxy2));
- }
+ assertEquals(proxy1, proxy1);
+ assertTrue(!proxy1.equals(proxy2));
+ }
- protected void doObjectMethodTest(Method method) throws Throwable {
- doObjectMethodTest(method, null);
- }
+ protected void doObjectMethodTest(Method method) throws Throwable {
+ doObjectMethodTest(method, null);
+ }
- protected void doObjectMethodTest(Method method, Object[] args) throws Throwable {
+ protected void doObjectMethodTest(Method method, Object[] args) throws Throwable {
- handler.invoke(testTarget, method, args);
+ handler.invoke(testTarget, method, args);
assertTrue("object method must not be passed to next handler in chain",
- !dummyHandler.invokeCalled);
+ !dummyHandler.invokeCalled);
assertEquals(method + " must be invoked directly on target object",
- method.getName(), target.lastMethod.getName());
- }
+ method.getName(), target.lastMethod.getName());
+ }
- public CXFInvocationHandler getHandler() {
+ public CXFInvocationHandler getHandler() {
return handler;
- }
+ }
+
-
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
index 2934f2d..e16cbd5 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandlerTest.java
@@ -37,29 +37,29 @@ public class ProxyInvocationHandlerTest extends AbstractInvocationHandlerTest {
@Before
- public void setUp() {
- super.setUp();
+ public void setUp() {
+ super.setUp();
data = new CXFInvocationHandlerDataImpl();
testObject = new ProxyInvocationHandler(data);
testObject.getData().setManagedConnection(mci);
- }
+ }
- public CXFInvocationHandler getHandler() {
+ public CXFInvocationHandler getHandler() {
return testObject;
}
-
+
@Test
public void testInvokeSetsBusCurrent() throws Throwable {
Bus oldBus = BusFactory.getDefaultBus();
-
+
testObject.invoke(target, testMethod, new Object[] {});
Bus newBus = BusFactory.getDefaultBus();
-
+
assertSame("Current Bus has been set and is as expected, val=" + newBus, newBus, mockBus);
- // set back the JVM current local variable
+ // set back the JVM current local variable
BusFactory.setDefaultBus(oldBus);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java
index bee7d82..79ea798 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/handlers/TestTarget.java
@@ -21,54 +21,54 @@ package org.apache.cxf.jca.cxf.handlers;
import java.lang.reflect.Method;
-public class TestTarget implements TestInterface {
- boolean methodInvoked;
+public class TestTarget implements TestInterface {
+ boolean methodInvoked;
- Method lastMethod;
+ Method lastMethod;
- public void testMethod() {
- try {
- methodInvoked = true;
- lastMethod = getClass().getMethod("testMethod", new Class[0]);
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- }
- }
+ public void testMethod() {
+ try {
+ methodInvoked = true;
+ lastMethod = getClass().getMethod("testMethod", new Class[0]);
+ } catch (NoSuchMethodException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
- public String toString() {
- try {
- methodInvoked = true;
- lastMethod = getClass().getMethod("toString", new Class[0]);
- return "TestTarget";
+ public String toString() {
+ try {
+ methodInvoked = true;
+ lastMethod = getClass().getMethod("toString", new Class[0]);
+ return "TestTarget";
// don't delegate to super as this
// calls hashCode which messes up the
- // test
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- }
- }
+ // test
+ } catch (NoSuchMethodException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
- public int hashCode() {
- try {
- methodInvoked = true;
- lastMethod = getClass().getMethod("hashCode", new Class[0]);
- return super.hashCode();
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- }
+ public int hashCode() {
+ try {
+ methodInvoked = true;
+ lastMethod = getClass().getMethod("hashCode", new Class[0]);
+ return super.hashCode();
+ } catch (NoSuchMethodException ex) {
+ throw new RuntimeException(ex);
+ }
- }
+ }
- public boolean equals(Object obj) {
- try {
- methodInvoked = true;
- lastMethod = getClass().getMethod("equals", new Class[] {Object.class});
- return super.equals(obj);
- } catch (NoSuchMethodException ex) {
- throw new RuntimeException(ex);
- }
+ public boolean equals(Object obj) {
+ try {
+ methodInvoked = true;
+ lastMethod = getClass().getMethod("equals", new Class[] {Object.class});
+ return super.equals(obj);
+ } catch (NoSuchMethodException ex) {
+ throw new RuntimeException(ex);
+ }
- }
+ }
-}
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
index 09034ea..b7e1f7c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/test/DummyBus.java
@@ -32,48 +32,48 @@ import org.apache.cxf.feature.Feature;
import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider;
import org.apache.cxf.service.model.AbstractPropertiesHolder;
-public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
+public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
// for initialise behaviours
static int initializeCount;
static int shutdownCount;
static boolean correctThreadContextClassLoader;
static boolean throwException;
static Bus bus = new DummyBus();
-
-
+
+
static String[] invokeArgs;
static String cxfHome = "File:/local/temp";
-
-
+
+
public static void reset() {
initializeCount = 0;
- shutdownCount = 0;
+ shutdownCount = 0;
correctThreadContextClassLoader = false;
throwException = false;
}
-
+
public boolean hasExtensionByName(String name) {
return false;
}
public static Bus init(String[] args) throws BusException {
-
+
initializeCount++;
- correctThreadContextClassLoader =
- Thread.currentThread().getContextClassLoader()
+ correctThreadContextClassLoader =
+ Thread.currentThread().getContextClassLoader()
== org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl.class.getClassLoader();
if (throwException) {
- throw new BusException(new Message("tested bus exception!",
+ throw new BusException(new Message("tested bus exception!",
(ResourceBundle)null, new Object[]{}));
}
return bus;
-
+
}
-
+
public void shutdown(boolean wait) {
- shutdownCount++;
-
+ shutdownCount++;
+
}
@@ -87,7 +87,7 @@ public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
public <T> void setExtension(T extension, Class<T> extensionType) {
}
-
+
// @Override
public String getId() {
// TODO Auto-generated method stub
@@ -104,7 +104,7 @@ public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
// @Override
public void run() {
// TODO Auto-generated method stub
-
+
}
public static boolean isCorrectThreadContextClassLoader() {
@@ -152,17 +152,17 @@ public class DummyBus extends AbstractBasicInterceptorProvider implements Bus {
public void setId(String i) {
// TODO Auto-generated method stub
-
+
}
public void setProperties(Map<String, Object> properties) {
// TODO Auto-generated method stub
-
+
}
public void setFeatures(Collection<? extends Feature> features) {
// TODO Auto-generated method stub
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
index f154cd3..027117a 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/jarloader/JarLoaderTest.java
@@ -38,8 +38,8 @@ public class JarLoaderTest extends Assert {
@Before
public void setUp() throws Exception {
exampleRarURL = getClass().getClassLoader().getResource("blackbox-notx.rar");
- }
-
+ }
+
@Test
public void testGetBytesFromImputStream() throws Exception {
byte[] bytes = JarLoader.getBytesFromInputStream(exampleRarURL
@@ -52,7 +52,7 @@ public class JarLoaderTest extends Assert {
@Test
public void testGetJarContents() throws Exception {
String urlPath = exampleRarURL.toString();
-
+
LOG.info("URLPath: " + urlPath);
Map<?, ?> map = JarLoader.getJarContents(urlPath + "!/blackbox-notx.jar!/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
index 320e687..959274c 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/outbound/ManagedConnectionImplTest.java
@@ -41,7 +41,7 @@ public class ManagedConnectionImplTest {
@Test
public void testHandleEqualsMethod() throws Exception {
BusFactory.setDefaultBus(null);
-
+
IMocksControl control = EasyMock.createNiceControl();
ManagedConnectionFactoryImpl mcf = control.createMock(ManagedConnectionFactoryImpl.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
index 0ec3b8f..8bc1a50 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBEndpointTest.java
@@ -28,33 +28,33 @@ import org.junit.Test;
/**
- *
+ *
*/
public class EJBEndpointTest extends Assert {
-
+
private EJBEndpoint endpoint;
-
+
@Before
public void setUp() throws Exception {
endpoint = new EJBEndpoint(null);
}
-
+
@Test
public void testGetAddressPort() throws Exception {
int port = endpoint.getAddressPort("http://localhost:8080/services");
assertEquals(8080, port);
}
-
- @Test
+
+ @Test
public void testGetAddress80Port() throws Exception {
int port = endpoint.getAddressPort("http://localhost/services");
assertEquals(80, port);
}
-
+
@Test
public void testGetAddressEndPort() throws Exception {
int port = endpoint.getAddressPort("http://localhost:9999");
assertEquals(9999, port);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
index 3061114..74bf5f9 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/EJBServantConfigTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
public class EJBServantConfigTest extends Assert {
-
+
@Test
public void testNoWsdl() throws Exception {
String value = "{http://apache.org/hello_world_soap_http}Greeter";
@@ -35,7 +35,7 @@ public class EJBServantConfigTest extends Assert {
assertEquals(result, config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testNoWsdlNoLocalPart() throws Exception {
String value = "{http://apache.org/hello_world_soap_http}";
@@ -44,7 +44,7 @@ public class EJBServantConfigTest extends Assert {
assertEquals(result, config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testNoWsdlNoNamespace() throws Exception {
String value = "Greeter";
@@ -53,7 +53,7 @@ public class EJBServantConfigTest extends Assert {
assertEquals(result, config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testAllNull() throws Exception {
String value = "";
@@ -61,7 +61,7 @@ public class EJBServantConfigTest extends Assert {
assertNull(config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testWithNullWsdl() throws Exception {
String value = "@";
@@ -69,15 +69,15 @@ public class EJBServantConfigTest extends Assert {
assertNull(config.getServiceName());
assertNull(config.getWsdlURL());
}
-
+
@Test
public void testWithNullServiceName() throws Exception {
String value = "@wsdl/hello_world.wsdl";
EJBServantConfig config = new EJBServantConfig(null, value);
assertNull(config.getServiceName());
- assertEquals("wsdl/hello_world.wsdl", config.getWsdlURL());
+ assertEquals("wsdl/hello_world.wsdl", config.getWsdlURL());
}
-
+
@Test
public void testFullValue() throws Exception {
String value = "{http://apache.org/hello_world_soap_http}SOAPService@file:/wsdl/hello_world.wsdl";
@@ -86,7 +86,7 @@ public class EJBServantConfigTest extends Assert {
assertEquals("file:/wsdl/hello_world.wsdl", config.getWsdlURL());
assertEquals(result, config.getServiceName());
}
-
+
@Test
public void testGetServiceClassName() throws Exception {
String value = "{http://apache.org/hello_world_soap_http}Greeter@file:";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java
index 47cd9f8..d87eaff 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/Greeter.java
@@ -20,4 +20,4 @@ package org.apache.cxf.jca.servant;
public interface Greeter extends java.rmi.Remote {
String sayHi() throws java.rmi.RemoteException;
-}
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java
index 931f2a5..0d2b127 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/GreeterImpl.java
@@ -21,7 +21,7 @@ package org.apache.cxf.jca.servant;
import java.rmi.RemoteException;
-public class GreeterImpl implements Greeter {
+public class GreeterImpl implements Greeter {
private boolean sayHiCalled;
public GreeterImpl() {
@@ -37,5 +37,5 @@ public class GreeterImpl implements Greeter {
public String sayHi() throws RemoteException {
sayHiCalled = true;
return "hi";
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java b/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java
index 974d9d2..7a8e828 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/servant/ThreadContextCheckerHome.java
@@ -47,16 +47,16 @@ public class ThreadContextCheckerHome implements EJBHome {
current, cl);
return ejb;
}
-
+
// default impemenations
public void remove(Handle handle) throws RemoteException, RemoveException {
// do nothing here
}
-
+
public void remove(Object primaryKey) throws RemoteException, RemoveException {
// do nothing here
}
-
+
public EJBMetaData getEJBMetaData() throws RemoteException {
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
----------------------------------------------------------------------
diff --git a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
index 22d0b74..d6eda2e 100644
--- a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
+++ b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfiguration.java
@@ -75,21 +75,21 @@ public class CxfAutoConfiguration {
protected static class SpringBusConfiguration {
}
-
+
@Configuration
@ConditionalOnClass(JAXRSServerFactoryBean.class)
@ConditionalOnExpression("'${cxf.jaxrs.component-scan}'=='true' && '${cxf.jaxrs.classes-scan}'!='true'")
@Import(SpringComponentScanServer.class)
protected static class JaxRsComponentConfiguration {
-
+
}
-
+
@Configuration
@ConditionalOnClass(JAXRSServerFactoryBean.class)
@ConditionalOnExpression("'${cxf.jaxrs.classes-scan}'=='true' && '${cxf.jaxrs.component-scan}'!='true'")
@Import(SpringJaxrsClassesScanServer.class)
protected static class JaxRsClassesConfiguration {
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
index 1780f56..dc1ec08 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientInterceptor.java
@@ -27,16 +27,16 @@ import com.github.kristofa.brave.Brave;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptor;
-public abstract class AbstractBraveClientInterceptor extends AbstractBraveClientProvider
+public abstract class AbstractBraveClientInterceptor extends AbstractBraveClientProvider
implements PhaseInterceptor<Message> {
-
+
private String phase;
protected AbstractBraveClientInterceptor(final String phase, final Brave brave) {
super(brave);
this.phase = phase;
}
-
+
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return null;
}
@@ -56,7 +56,7 @@ public abstract class AbstractBraveClientInterceptor extends AbstractBraveClient
public String getPhase() {
return phase;
}
-
+
public void handleFault(Message message) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
index e396cda..22ddc60 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveClientProvider.java
@@ -36,50 +36,50 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.tracing.AbstractTracingProvider;
-public abstract class AbstractBraveClientProvider extends AbstractTracingProvider {
+public abstract class AbstractBraveClientProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractBraveClientProvider.class);
protected static final String TRACE_SPAN = "org.apache.cxf.tracing.client.brave.span";
-
+
private final Brave brave;
private final SpanNameProvider spanNameProvider;
-
+
public AbstractBraveClientProvider(final Brave brave) {
this.brave = brave;
this.spanNameProvider = new ClientSpanNameProvider();
}
- protected TraceScopeHolder<Span> startTraceSpan(final Map<String, List<String>> requestHeaders,
+ protected TraceScopeHolder<Span> startTraceSpan(final Map<String, List<String>> requestHeaders,
URI uri, String method) {
final HttpClientRequest request = new HttpClientRequest() {
@Override
public URI getUri() {
return uri;
}
-
+
@Override
public String getHttpMethod() {
return method;
}
-
+
@Override
public void addHeader(String header, String value) {
requestHeaders.put(header, Collections.singletonList(value));
}
};
-
+
brave.clientRequestInterceptor().handle(new HttpClientRequestAdapter(request, spanNameProvider));
final Span span = brave.clientSpanThreadBinder().getCurrentClientSpan();
- // In case of asynchronous client invocation, the span should be detached as JAX-RS
+ // In case of asynchronous client invocation, the span should be detached as JAX-RS
// client request / response filters are going to be executed in different threads.
boolean detached = false;
if (isAsyncInvocation() && span != null) {
brave.clientSpanThreadBinder().setCurrentSpan(null);
detached = true;
}
-
+
return new TraceScopeHolder<Span>(span, detached);
}
-
+
private boolean isAsyncInvocation() {
return !JAXRSUtils.getCurrentMessage().getExchange().isSynchronous();
}
@@ -88,15 +88,15 @@ public abstract class AbstractBraveClientProvider extends AbstractTracingProvide
if (holder == null) {
return;
}
-
+
final Span span = holder.getScope();
if (span != null) {
- // If the client invocation was asynchronous , the trace span has been created
+ // If the client invocation was asynchronous , the trace span has been created
// in another thread and should be re-attached to the current one.
if (holder.isDetached()) {
brave.clientSpanThreadBinder().setCurrentSpan(span);
}
-
+
final HttpResponse response = () -> responseStatus;
brave.clientResponseInterceptor().handle(new HttpClientResponseAdapter(response));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
index 001fc8e..79184d9 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveInterceptor.java
@@ -38,14 +38,14 @@ import org.apache.cxf.phase.PhaseInterceptor;
public abstract class AbstractBraveInterceptor extends AbstractBraveProvider implements PhaseInterceptor<Message> {
private final String phase;
-
+
protected static class ParsedMessage {
private Message message;
ParsedMessage(Message message) {
this.message = message;
}
-
+
String safeGet(String key) {
if (!message.containsKey(key)) {
return null;
@@ -53,7 +53,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
Object value = message.get(key);
return (value instanceof String) ? value.toString() : null;
}
-
+
private String getUriSt() {
String uri = safeGet(Message.REQUEST_URL);
if (uri == null) {
@@ -77,7 +77,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
return uri;
}
}
-
+
URI getUri() {
try {
String uriSt = getUriSt();
@@ -86,7 +86,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
throw new RuntimeException(e.getMessage(), e);
}
}
-
+
Message getEffectiveMessage() {
boolean isRequestor = MessageUtils.isRequestor(message);
boolean isOutbound = MessageUtils.isOutbound(message);
@@ -96,7 +96,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
return isOutbound ? message.getExchange().getInMessage() : message;
}
}
-
+
Map<String, List<String>> getHeaders() {
Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
@@ -106,7 +106,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
return headers;
}
-
+
void addHeader(String key, String value) {
Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers == null) {
@@ -126,7 +126,7 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
super(brave, spanNameProvider);
this.phase = phase;
}
-
+
@Override
public Set<String> getAfter() {
return Collections.emptySet();
@@ -146,12 +146,12 @@ public abstract class AbstractBraveInterceptor extends AbstractBraveProvider imp
public String getPhase() {
return phase;
}
-
+
@Override
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return null;
}
-
+
@Override
public void handleFault(Message message) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
index 3a656eb..c9e4029 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/AbstractBraveProvider.java
@@ -37,17 +37,17 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.tracing.AbstractTracingProvider;
-public abstract class AbstractBraveProvider extends AbstractTracingProvider {
+public abstract class AbstractBraveProvider extends AbstractTracingProvider {
protected static final Logger LOG = LogUtils.getL7dLogger(AbstractBraveProvider.class);
protected static final String TRACE_SPAN = "org.apache.cxf.tracing.brave.span";
-
+
protected final Brave brave;
protected final SpanNameProvider spanNameProvider;
-
+
protected AbstractBraveProvider(final Brave brave) {
this(brave, new ServerSpanNameProvider());
}
-
+
protected AbstractBraveProvider(final Brave brave, final SpanNameProvider spanNameProvider) {
this.brave = brave;
this.spanNameProvider = spanNameProvider;
@@ -61,27 +61,27 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
public URI getUri() {
return uri;
}
-
+
@Override
public String getHttpMethod() {
return method;
}
-
+
@Override
public String getHttpHeaderValue(String headerName) {
List<String> value = requestHeaders.get(headerName);
-
+
if (value != null && !value.isEmpty()) {
return value.get(0);
}
-
+
return null;
}
};
-
+
brave.serverRequestInterceptor().handle(new HttpServerRequestAdapter(request, spanNameProvider));
final ServerSpan serverSpan = brave.serverSpanThreadBinder().getCurrentServerSpan();
-
+
// If the service resource is using asynchronous processing mode, the trace
// scope will be closed in another thread and as such should be detached.
boolean detached = false;
@@ -90,10 +90,10 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
propagateContinuationSpan(serverSpan);
detached = true;
}
-
+
return new TraceScopeHolder<ServerSpan>(serverSpan, detached);
}
-
+
private void transferRequestHeader(final Map<String, List<String>> requestHeaders,
final Map<String, List<Object>> responseHeaders, final BraveHttpHeaders header) {
if (requestHeaders.containsKey(header.getName())) {
@@ -111,29 +111,29 @@ public abstract class AbstractBraveProvider extends AbstractTracingProvider {
transferRequestHeader(requestHeaders, responseHeaders, BraveHttpHeaders.Sampled);
transferRequestHeader(requestHeaders, responseHeaders, BraveHttpHeaders.ParentSpanId);
transferRequestHeader(requestHeaders, responseHeaders, BraveHttpHeaders.TraceId);
-
+
if (holder == null) {
return;
}
-
+
final ServerSpan span = holder.getScope();
if (span != null) {
// If the service resource is using asynchronous processing mode, the trace
- // scope has been created in another thread and should be re-attached to the current
+ // scope has been created in another thread and should be re-attached to the current
// one.
if (holder.isDetached()) {
brave.serverSpanThreadBinder().setCurrentSpan(span);
- }
-
+ }
+
final HttpResponse response = () -> responseStatus;
brave.serverResponseInterceptor().handle(new HttpServerResponseAdapter(response));
}
}
-
+
private void propagateContinuationSpan(final ServerSpan continuationScope) {
PhaseInterceptorChain.getCurrentMessage().put(ServerSpan.class, continuationScope);
}
-
+
protected boolean isAsyncResponse() {
return !PhaseInterceptorChain.getCurrentMessage().getExchange().isSynchronous();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
index d6775e9..0eb23ad 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStartInterceptor.java
@@ -38,13 +38,13 @@ public class BraveClientStartInterceptor extends AbstractBraveClientInterceptor
@Override
public void handleMessage(Message message) throws Fault {
final ParsedMessage parsed = new ParsedMessage(message);
-
- final TraceScopeHolder<Span> holder = super.startTraceSpan(parsed.getHeaders(),
+
+ final TraceScopeHolder<Span> holder = super.startTraceSpan(parsed.getHeaders(),
parsed.getUri(), parsed.getHttpMethod());
-
+
if (holder != null) {
message.getExchange().put(TRACE_SPAN, holder);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
index 583227c..dd6162d 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveClientStopInterceptor.java
@@ -29,7 +29,7 @@ public class BraveClientStopInterceptor extends AbstractBraveClientInterceptor {
public BraveClientStopInterceptor(final Brave brave) {
this(Phase.RECEIVE, brave);
}
-
+
public BraveClientStopInterceptor(final String phase, final Brave brave) {
super(phase, brave);
}
@@ -37,14 +37,14 @@ public class BraveClientStopInterceptor extends AbstractBraveClientInterceptor {
@Override
public void handleMessage(Message message) throws Fault {
@SuppressWarnings("unchecked")
- final TraceScopeHolder<Span> holder =
+ final TraceScopeHolder<Span> holder =
(TraceScopeHolder<Span>)message.getExchange().get(TRACE_SPAN);
-
+
Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
if (responseCode == null) {
responseCode = 200;
}
-
+
super.stopTraceSpan(holder, responseCode);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
index 08702b5..8489ef9 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveFeature.java
@@ -39,7 +39,7 @@ public class BraveFeature extends AbstractFeature {
public BraveFeature() {
this("cxf-svc-" + UUID.randomUUID().toString());
}
-
+
public BraveFeature(final String name) {
this(new Brave.Builder(name).build());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
index 466482e..be58bb8 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStartInterceptor.java
@@ -33,12 +33,12 @@ public class BraveStartInterceptor extends AbstractBraveInterceptor {
}
@Override
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) throws Fault {
final ParsedMessage parsed = new ParsedMessage(message);
-
- final TraceScopeHolder<ServerSpan> holder = super.startTraceSpan(parsed.getHeaders(),
+
+ final TraceScopeHolder<ServerSpan> holder = super.startTraceSpan(parsed.getHeaders(),
parsed.getUri(), parsed.getHttpMethod());
-
+
if (holder != null) {
message.getExchange().put(TRACE_SPAN, holder);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
index 616af9f..bd89f09 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveStopInterceptor.java
@@ -33,7 +33,7 @@ import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
@NoJSR250Annotations
public class BraveStopInterceptor extends AbstractBraveInterceptor {
@@ -44,27 +44,27 @@ public class BraveStopInterceptor extends AbstractBraveInterceptor {
@Override
public void handleMessage(Message message) throws Fault {
Map<String, List<Object>> responseHeaders = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
-
+
if (responseHeaders == null) {
responseHeaders = new HashMap<String, List<Object>>();
message.put(Message.PROTOCOL_HEADERS, responseHeaders);
}
-
+
boolean isRequestor = MessageUtils.isRequestor(message);
- Message requestMessage = isRequestor ? message.getExchange().getOutMessage()
+ Message requestMessage = isRequestor ? message.getExchange().getOutMessage()
: message.getExchange().getInMessage();
- Map<String, List<String>> requestHeaders =
+ Map<String, List<String>> requestHeaders =
CastUtils.cast((Map<?, ?>)requestMessage.get(Message.PROTOCOL_HEADERS));
-
+
@SuppressWarnings("unchecked")
- final TraceScopeHolder<ServerSpan> holder =
+ final TraceScopeHolder<ServerSpan> holder =
(TraceScopeHolder<ServerSpan>)message.getExchange().get(TRACE_SPAN);
-
+
Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
if (responseCode == null) {
- responseCode = 200;
+ responseCode = 200;
}
-
+
super.stopTraceSpan(requestHeaders, responseHeaders, responseCode, holder);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
index 044495f..79a167c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
@@ -33,26 +33,26 @@ public class BraveTracerContext implements TracerContext {
private final Brave brave;
private final ServerSpan continuationSpan;
private final ServerSpanThreadBinder serverSpanThreadBinder;
-
+
public BraveTracerContext(final Brave brave) {
this(brave, null);
}
-
+
public BraveTracerContext(final Brave brave, final ServerSpan continuationSpan) {
this.brave = brave;
this.continuationSpan = continuationSpan;
this.serverSpanThreadBinder = brave.serverSpanThreadBinder();
}
-
+
@Override
@SuppressWarnings("unchecked")
public TraceScope startSpan(final String description) {
- return new TraceScope(brave,
+ return new TraceScope(brave,
brave
.localTracer()
.startNewSpan(Constants.LOCAL_COMPONENT, description));
}
-
+
@Override
public <T> T continueSpan(final Traceable<T> traceable) throws Exception {
boolean attached = false;
@@ -60,7 +60,7 @@ public class BraveTracerContext implements TracerContext {
serverSpanThreadBinder.setCurrentSpan(continuationSpan);
attached = true;
}
-
+
try {
return traceable.call(new BraveTracerContext(brave));
} finally {
@@ -69,7 +69,7 @@ public class BraveTracerContext implements TracerContext {
}
}
}
-
+
@Override
public <T> Callable<T> wrap(final String description, final Traceable<T> traceable) {
final Callable<T> callable = new Callable<T>() {
@@ -78,7 +78,7 @@ public class BraveTracerContext implements TracerContext {
return traceable.call(new BraveTracerContext(brave));
}
};
-
+
return () -> {
try {
startSpan(description);
@@ -88,7 +88,7 @@ public class BraveTracerContext implements TracerContext {
}
};
}
-
+
@Override
public void annotate(String key, String value) {
if (brave.localSpanThreadBinder().getCurrentLocalSpan() != null) {
@@ -97,7 +97,7 @@ public class BraveTracerContext implements TracerContext {
brave.serverTracer().submitBinaryAnnotation(key, value);
}
}
-
+
@Override
public void timeline(String message) {
if (brave.localSpanThreadBinder().getCurrentLocalSpan() != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java
index f0927f2..ade423c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ClientSpanNameProvider.java
@@ -28,7 +28,7 @@ public class ClientSpanNameProvider implements SpanNameProvider {
public String spanName(HttpRequest request) {
return buildSpanDescription(request.getUri().toString(), request.getHttpMethod());
}
-
+
private String buildSpanDescription(final String path, final String method) {
if (StringUtils.isEmpty(method)) {
return path;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java
index 73a665e..5be81c1 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/ServerSpanNameProvider.java
@@ -28,7 +28,7 @@ public class ServerSpanNameProvider implements SpanNameProvider {
public String spanName(HttpRequest request) {
return buildSpanDescription(request.getUri().getPath(), request.getHttpMethod());
}
-
+
private String buildSpanDescription(final String path, final String method) {
if (StringUtils.isEmpty(method)) {
return path;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java
index 32f0f59..144824f 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/TraceScope.java
@@ -27,15 +27,15 @@ import com.twitter.zipkin.gen.Span;
public class TraceScope implements Closeable {
final Brave brave;
final SpanId spanId;
-
+
TraceScope(final Brave brave, final SpanId spanId) {
this.brave = brave;
this.spanId = spanId;
}
-
+
@Override
public void close() {
- final Span span = brave.localSpanThreadBinder().getCurrentLocalSpan();
+ final Span span = brave.localSpanThreadBinder().getCurrentLocalSpan();
if (span != null && span.getTrace_id() == spanId.traceId && span.getId() == spanId.spanId) {
brave.localTracer().finishSpan();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
----------------------------------------------------------------------
diff --git a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
index 1d384ec..23b149c 100644
--- a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
+++ b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/jaxrs/BraveClientProvider.java
@@ -32,28 +32,28 @@ import com.twitter.zipkin.gen.Span;
import org.apache.cxf.tracing.brave.AbstractBraveClientProvider;
@Provider
-public class BraveClientProvider extends AbstractBraveClientProvider
+public class BraveClientProvider extends AbstractBraveClientProvider
implements ClientRequestFilter, ClientResponseFilter {
-
+
public BraveClientProvider(final Brave brave) {
super(brave);
}
@Override
public void filter(final ClientRequestContext requestContext) throws IOException {
- final TraceScopeHolder<Span> holder = super.startTraceSpan(requestContext.getStringHeaders(),
+ final TraceScopeHolder<Span> holder = super.startTraceSpan(requestContext.getStringHeaders(),
requestContext.getUri(), requestContext.getMethod());
if (holder != null) {
requestContext.setProperty(TRACE_SPAN, holder);
}
}
-
+
@SuppressWarnings("unchecked")
@Override
public void filter(final ClientRequestContext requestContext,
final ClientResponseContext responseContext) throws IOException {
- final TraceScopeHolder<Span> holder =
+ final TraceScopeHolder<Span> holder =
(TraceScopeHolder<Span>)requestContext.getProperty(TRACE_SPAN);
super.stopTraceSpan(holder, responseContext.getStatus());
}
[16/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java
index e51476a..a9344fc 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java
@@ -22,7 +22,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.omg.CORBA.ORB;
public class CorbaPrimitiveArrayEventProducer extends AbstractNoStartEndEventProducer {
-
+
// No start and end elements for the array
public CorbaPrimitiveArrayEventProducer(CorbaObjectHandler h,
ServiceInfo service,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
index 99a299d..37dad36 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
@@ -27,23 +27,23 @@ import org.omg.CORBA.TypeCode;
public class CorbaPrimitiveHandler extends CorbaObjectHandler {
- private static final int UNSIGNED_MAX = 256;
+ private static final int UNSIGNED_MAX = 256;
private Object value;
private String valueAsString;
private boolean objectSet;
private Any any;
-
+
public CorbaPrimitiveHandler(QName primName, QName primIdlType, TypeCode primTC, Object primType) {
super(primName, primIdlType, primTC, primType);
}
-
+
public Object getValue() {
return value;
}
public Any getAny() {
return any;
}
-
+
public void setIntoAny(Any val, CorbaStreamable stream, boolean output) {
any = val;
if (stream != null) {
@@ -94,7 +94,7 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
any.insert_wstring((String)value);
break;
default:
- // Default: assume that whatever stored the data will also know how to convert it into what
+ // Default: assume that whatever stored the data will also know how to convert it into what
// it needs.
}
}
@@ -125,8 +125,8 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
case TCKind._tk_char:
char charValue = ((Character)value).charValue();
// outside the normal range it will -256
- data = Byte.toString((byte)(charValue > Byte.MAX_VALUE
- ? charValue - UNSIGNED_MAX
+ data = Byte.toString((byte)(charValue > Byte.MAX_VALUE
+ ? charValue - UNSIGNED_MAX
: charValue));
break;
case TCKind._tk_wchar:
@@ -176,14 +176,14 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
data = (String)value;
break;
default:
- // Default: assume that whatever stored the data will also know how to convert it into what
+ // Default: assume that whatever stored the data will also know how to convert it into what
// it needs.
data = value.toString();
}
valueAsString = data;
return data;
}
-
+
public void setValueFromData(String data) {
Object obj = null;
switch (typeCode.kind().value()) {
@@ -193,10 +193,10 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
case TCKind._tk_char:
// A char is mapped to a byte, we need it as a character
Byte byteValue = Byte.valueOf(data);
- // for values < 0 + 256
+ // for values < 0 + 256
// This means that we can directly write out the chars in the normal
// range 0-127 even when using UTF-8
- obj = Character.valueOf((char)(byteValue.byteValue() < 0
+ obj = Character.valueOf((char)(byteValue.byteValue() < 0
? byteValue.byteValue() + UNSIGNED_MAX
: byteValue.byteValue()));
break;
@@ -267,8 +267,8 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
case TCKind._tk_char:
char charValue = any.extract_char();
// outside the normal range it will -256
- data = Byte.toString((byte)(charValue > Byte.MAX_VALUE
- ? charValue - UNSIGNED_MAX
+ data = Byte.toString((byte)(charValue > Byte.MAX_VALUE
+ ? charValue - UNSIGNED_MAX
: charValue));
break;
case TCKind._tk_wchar:
@@ -330,7 +330,7 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
valueAsString = data;
return data;
}
-
+
public void clear() {
value = null;
objectSet = false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java
index d91f219..1e01321 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java
@@ -22,8 +22,8 @@ public class CorbaPrimitiveListener extends AbstractCorbaTypeListener {
public CorbaPrimitiveListener(CorbaObjectHandler handler) {
super(handler);
- }
-
+ }
+
public void processCharacters(String text) {
((CorbaPrimitiveHandler) handler).setValueFromData(text);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
index ea5f091..0753437 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
@@ -23,7 +23,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.omg.CORBA.ORB;
public class CorbaPrimitiveSequenceEventProducer extends AbstractNoStartEndEventProducer {
-
+
// No start and end elements for the sequence
public CorbaPrimitiveSequenceEventProducer(CorbaObjectHandler h,
ServiceInfo service,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
index f8c55c4..7cb0d46 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
@@ -37,7 +37,7 @@ public class CorbaPrimitiveTypeEventProducer implements CorbaTypeEventProducer {
name = handler.getName();
}
- public String getLocalName() {
+ public String getLocalName() {
return handler.getSimpleName();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java
index 2d0ad23..e1e9ae0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java
@@ -30,29 +30,29 @@ public class CorbaSequenceHandler extends CorbaObjectHandler {
private List<CorbaObjectHandler> elements = new ArrayList<>();
private CorbaObjectHandler templateElement;
private boolean hasRecursiveTypeElement;
-
+
public CorbaSequenceHandler(QName seqName, QName seqIdlType, TypeCode seqTC, Object seqType) {
super(seqName, seqIdlType, seqTC, seqType);
hasRecursiveTypeElement = false;
}
-
+
public void addElement(CorbaObjectHandler el) {
elements.add(el);
}
-
+
public int getNumberOfElements() {
return elements.size();
}
-
+
public List<CorbaObjectHandler> getElements() {
return elements;
}
-
+
public CorbaObjectHandler getElement(int index) {
return elements.get(index);
}
-
- // These handle the case where we have an unbounded sequence and we need to
+
+ // These handle the case where we have an unbounded sequence and we need to
// construct Corba objects during the reading of an object.
public CorbaObjectHandler getTemplateElement() {
return templateElement;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
index a84a80b..0433e1a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
@@ -39,7 +39,7 @@ public class CorbaSequenceListener extends AbstractCorbaTypeListener {
public CorbaSequenceListener(CorbaObjectHandler handler,
CorbaTypeMap map,
- ORB orbRef,
+ ORB orbRef,
ServiceInfo sInfo) {
super(handler);
value = (CorbaSequenceHandler) handler;
@@ -61,7 +61,7 @@ public class CorbaSequenceListener extends AbstractCorbaTypeListener {
elementName,
seqElementType,
typeMap,
- serviceInfo);
+ serviceInfo);
value.setTemplateElement(template);
}
@@ -95,7 +95,7 @@ public class CorbaSequenceListener extends AbstractCorbaTypeListener {
public void processCharacters(String text) {
if (currentTypeListener == null) {
// primitive sequence
- CorbaTypeListener primitiveListener =
+ CorbaTypeListener primitiveListener =
CorbaHandlerUtils.getTypeListener(value.getName(),
seqElementType,
typeMap,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
index e5c0462..d0dca8e 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
@@ -33,14 +33,14 @@ public class CorbaStructEventProducer extends AbstractStartEndEventProducer {
iterator = handler.members.iterator();
serviceInfo = service;
orb = orbRef;
- if (handler.members.isEmpty()
+ if (handler.members.isEmpty()
&& handler.getSimpleName().equals(handler.getIdlType().getLocalPart() + "_f")) {
state = states.length;
}
}
- public int next() {
+ public int next() {
int event = states[state];
if (event != 0) {
state++;
@@ -73,12 +73,12 @@ public class CorbaStructEventProducer extends AbstractStartEndEventProducer {
currentEventProducer = new CorbaPrimitiveArrayEventProducer(obj, serviceInfo, orb);
}
}
- } else if (obj.getSimpleName().equals(obj.getIdlType().getLocalPart() + "_f")) {
+ } else if (obj.getSimpleName().equals(obj.getIdlType().getLocalPart() + "_f")) {
//some "special cases" we need to make sure are mapped correctly
currentEventProducer =
CorbaHandlerUtils.getTypeEventProducer(obj, serviceInfo, orb);
-
+
} else {
currentEventProducer =
CorbaHandlerUtils.getTypeEventProducer(obj, serviceInfo, orb);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java
index 0f65fe1..a0151b8 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java
@@ -29,26 +29,26 @@ import org.omg.CORBA.TypeCode;
public class CorbaStructHandler extends CorbaObjectHandler {
List<CorbaObjectHandler> members = new ArrayList<>();
-
+
public CorbaStructHandler(QName structName, QName structIdlType, TypeCode structTC, Object structType) {
super(structName, structIdlType, structTC, structType);
}
-
+
public void addMember(CorbaObjectHandler member) {
members.add(member);
}
-
+
public List<CorbaObjectHandler> getMembers() {
return members;
}
-
+
public CorbaObjectHandler getMember(int index) {
return members.get(index);
}
-
+
public CorbaObjectHandler getMemberByName(String name) {
CorbaObjectHandler member = null;
-
+
for (Iterator<CorbaObjectHandler> iterator = members.iterator(); iterator.hasNext();) {
CorbaObjectHandler current = iterator.next();
if (current.getName().getLocalPart().equals(name)) {
@@ -56,7 +56,7 @@ public class CorbaStructHandler extends CorbaObjectHandler {
break;
}
}
-
+
return member;
}
@@ -64,5 +64,5 @@ public class CorbaStructHandler extends CorbaObjectHandler {
for (int i = 0; i < members.size(); i++) {
members.get(i).clear();
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
index b498817..28cd7a0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
@@ -153,10 +153,10 @@ public class CorbaStructListener extends AbstractCorbaTypeListener {
} else {
if ("type".equals(localName)
&& "http://www.w3.org/2001/XMLSchema-instance".equals(namespaceURI)) {
-
+
String pfx = value.substring(0, value.indexOf(":"));
String ns = ctx.getNamespaceURI(pfx);
- QName qn = new QName(ns,
+ QName qn = new QName(ns,
value.substring(value.indexOf(":") + 1));
CorbaTypeListener l = CorbaHandlerUtils.getTypeListener(qn,
qn,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
index 41845c7..fd6a8fb 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
@@ -26,24 +26,24 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
public interface CorbaTypeEventProducer {
-
+
boolean hasNext();
-
- /*
+
+ /*
* return the current event
- */
+ */
int next();
-
+
/*
* qname of current content
*/
QName getName();
-
+
/*
* local name of current content
*/
- String getLocalName();
-
+ String getLocalName();
+
/*
* text of current content
*/
@@ -57,6 +57,6 @@ public interface CorbaTypeEventProducer {
/*
* return any namespace for the current type
*/
- List<Namespace> getNamespaces();
+ List<Namespace> getNamespaces();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java
index f78ad55..db5ce49 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
public interface CorbaTypeListener {
void setNamespaceContext(NamespaceContext ctx);
-
+
void processStartElement(QName name);
void processEndElement(QName name);
void processCharacters(String text);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java
index 268eada..f46ac23 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java
@@ -43,14 +43,14 @@ public class CorbaUnionEventProducer extends AbstractStartEndEventProducer {
CorbaUnionHandler handler = (CorbaUnionHandler) h;
serviceInfo = sInfo;
orb = o;
- name = handler.getName();
+ name = handler.getName();
isNil = checkIsNil(handler);
if (!isNil) {
CorbaObjectHandler contents = handler.getValue();
- if (contents != null) {
+ if (contents != null) {
Union unionType = (Union)handler.getType();
if (unionType.isSetNillable() && unionType.isNillable()) {
- CorbaTypeEventProducer contentEventProducer =
+ CorbaTypeEventProducer contentEventProducer =
CorbaHandlerUtils.getTypeEventProducer(contents, serviceInfo, orb);
currentEventProducer = new SkipStartEndEventProducer(contentEventProducer, name);
} else {
@@ -77,7 +77,7 @@ public class CorbaUnionEventProducer extends AbstractStartEndEventProducer {
}
return isItNil;
}
-
+
public List<Attribute> getAttributes() {
List<Attribute> attributes = IS_NIL_ATTRIBUTE_LIST;
if (!isNil) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
index c51105c..f7de2e1 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
@@ -43,8 +43,8 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
public CorbaUnionHandler(QName unionName, QName unionIdlType, TypeCode unionTC, Object unionType) {
super(unionName, unionIdlType, unionTC, unionType);
-
- // Build a list of labels. This will be used to generate a discriminator value for the
+
+ // Build a list of labels. This will be used to generate a discriminator value for the
// default case (since we are not provided with one from the Stax stream of the Celtix object)
Union union = (Union)unionType;
List<Unionbranch> branches = union.getUnionbranch();
@@ -60,15 +60,15 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
labels.add(ct.getLabel());
}
}
-
+
index++;
}
}
-
+
public CorbaObjectHandler getDiscriminator() {
return discriminator;
}
-
+
public String getDisciminatorValueData() {
String result = null;
// The discriminator is handled by either the enum handler or the primitive handler.
@@ -79,13 +79,13 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
CorbaPrimitiveHandler primitiveHandler = (CorbaPrimitiveHandler)discriminator;
result = primitiveHandler.getDataFromValue();
}
- return result;
+ return result;
}
-
+
public void setDiscriminator(CorbaObjectHandler disc) {
discriminator = disc;
}
-
+
public void setDiscriminatorValueFromData(String data) {
// The discriminator is handled by either the enum handler or the primitive handler.
if (discriminator.getTypeCodeKind().value() == TCKind._tk_enum) {
@@ -96,11 +96,11 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
primitiveHandler.setValueFromData(data);
}
}
-
+
public List<CorbaObjectHandler> getCases() {
return cases;
}
-
+
public CorbaObjectHandler getBranchByName(String caseName) {
for (Iterator<CorbaObjectHandler> caseIter = cases.iterator(); caseIter.hasNext();) {
CorbaObjectHandler obj = caseIter.next();
@@ -108,35 +108,35 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
return obj;
}
}
-
+
return null;
}
-
+
public void addCase(CorbaObjectHandler unionCase) {
cases.add(unionCase);
}
-
+
public CorbaObjectHandler getValue() {
return value;
}
-
+
public void setValue(String caseName, CorbaObjectHandler val) {
value = val;
}
-
+
public int getDefaultIndex() {
return defaultIndex;
}
-
+
public String createDefaultDiscriminatorLabel() {
String label = null;
- // According to the CORBA specification, an enumeration discriminator can be one of the
+ // According to the CORBA specification, an enumeration discriminator can be one of the
// following types:
// - *integer* (short, long, ulong, either signed or unsigned)
// - boolean
// - character
// - enumeration
- // So when we need to create a default discriminator to accomodate for the lack of a
+ // So when we need to create a default discriminator to accomodate for the lack of a
// discriminator from, these are the four cases we must check for.
if (discriminator.getTypeCodeKind().value() == TCKind._tk_boolean) {
// We can only have a default case with a boolean discriminator if we have
@@ -160,14 +160,14 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
}
} else if (discriminator.getTypeCodeKind().value() == TCKind._tk_enum) {
// Get the list of possible enumerations in the enumerator and compare these to the
- // labels we obtained from the Union definition. In order for the union/enum
+ // labels we obtained from the Union definition. In order for the union/enum
// combination to be syntactically correct, there must be one enumeration not included
// as a case for the default case to be valid.
Enum enumType = (Enum)discriminator.getType();
List<Enumerator> enumerators = enumType.getEnumerator();
if (labels.isEmpty()) {
// Any value will do since we only have a default case.
- label = enumerators.get(0).getValue();
+ label = enumerators.get(0).getValue();
} else {
String enumLabel = null;
for (Iterator<Enumerator> enumIter = enumerators.iterator(); enumIter.hasNext();) {
@@ -187,7 +187,7 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
if (!labels.contains(String.valueOf(i))) {
label = String.valueOf(i);
break;
- }
+ }
}
} else if ((discriminator.getTypeCodeKind().value() == TCKind._tk_long)
|| (discriminator.getTypeCodeKind().value() == TCKind._tk_ulong)) {
@@ -198,7 +198,7 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
if (!labels.contains(String.valueOf(i))) {
label = String.valueOf(i);
break;
- }
+ }
}
}
return label;
@@ -206,10 +206,10 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
public void clear() {
if (discriminator != null) {
- discriminator.clear();
+ discriminator.clear();
}
if (value != null) {
value.clear();
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java
index 504c8c8..0a48805 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java
@@ -48,12 +48,12 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
serviceInfo = sInfo;
orb = oorb;
unionType = (Union) handler.getType();
- branches = unionType.getUnionbranch();
+ branches = unionType.getUnionbranch();
}
public void processStartElement(QName name) {
if (currentTypeListener == null) {
- for (Unionbranch branch : branches) {
+ for (Unionbranch branch : branches) {
CorbaObjectHandler content;
QName unionName = null;
String branchName = branch.getName();
@@ -85,14 +85,14 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
currentTypeListener.processStartElement(name);
}
} else {
- QName emptyBranchContentQName =
+ QName emptyBranchContentQName =
new QName(name.getNamespaceURI(), branchName);
content = CorbaHandlerUtils.initializeObjectHandler(orb,
emptyBranchContentQName,
branch.getIdltype(),
typeMap,
serviceInfo);
- }
+ }
((CorbaUnionHandler)handler).addCase(content);
}
} else {
@@ -104,14 +104,14 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
if (currentTypeListener != null) {
currentTypeListener.processCharacters(text);
} else {
- //Nillable primitive cases, you do not get the start element
+ //Nillable primitive cases, you do not get the start element
CorbaPrimitiveHandler discObj =
new CorbaPrimitiveHandler(new QName("discriminator"),
unionType.getDiscriminator(),
orb.get_primitive_tc(TCKind.from_int(TCKind._tk_boolean)),
null);
discObj.setValue(Boolean.TRUE);
- ((CorbaUnionHandler)handler).setDiscriminator(discObj);
+ ((CorbaUnionHandler)handler).setDiscriminator(discObj);
CorbaTypeListener typeListener =
CorbaHandlerUtils.getTypeListener(handler.getName(),
branches.get(0).getIdltype(),
@@ -132,7 +132,7 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
private String determineDescriminatorValue(Unionbranch branch) {
String descriminatorValue;
- // Determine the value of the discriminator.
+ // Determine the value of the discriminator.
List<CaseType> branchCases = branch.getCase();
if (branchCases.size() != 0) {
CaseType caseLabel = branchCases.get(0);
@@ -157,7 +157,7 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
discObj.setValue(Boolean.FALSE);
((CorbaUnionHandler)handler).setDiscriminator(discObj);
Unionbranch branch = branches.get(0);
- QName emptyBranchContentQName =
+ QName emptyBranchContentQName =
new QName(handler.getName().getNamespaceURI(), branch.getName());
CorbaObjectHandler content = CorbaHandlerUtils.initializeObjectHandler(orb,
emptyBranchContentQName,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java
index 419be94..06800a5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java
@@ -28,7 +28,7 @@ public class HandlerIterator implements Iterator<CorbaObjectHandler> {
int count;
CorbaObjectHandler next;
boolean isServer;
-
+
public HandlerIterator(CorbaMessage msg, boolean server) {
params = msg.getStreamableArguments();
isServer = server;
@@ -36,7 +36,7 @@ public class HandlerIterator implements Iterator<CorbaObjectHandler> {
next = msg.getStreamableReturn().getObject();
}
}
-
+
public boolean hasNext() {
while (next == null && count < params.length) {
int mode = params[count].getMode();
@@ -48,7 +48,7 @@ public class HandlerIterator implements Iterator<CorbaObjectHandler> {
|| mode == org.omg.CORBA.ARG_INOUT.value) {
next = params[count].getObject();
}
- if (!isServer
+ if (!isServer
&& mode == org.omg.CORBA.ARG_INOUT.value
&& next instanceof CorbaPrimitiveHandler) {
CorbaPrimitiveHandler prim = (CorbaPrimitiveHandler)next;
@@ -58,13 +58,13 @@ public class HandlerIterator implements Iterator<CorbaObjectHandler> {
}
return next != null;
}
-
+
public CorbaObjectHandler next() {
CorbaObjectHandler current = next;
next = null;
return current;
}
-
+
public void remove() {
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
index a83fced..0ff98f7 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
@@ -59,7 +59,7 @@ public class ParameterEventProducer implements CorbaTypeEventProducer {
public boolean hasNext() {
return (currentEventProducer != null
? currentEventProducer.hasNext() : false)
- || (iterator != null ? iterator.hasNext() : false);
+ || (iterator != null ? iterator.hasNext() : false);
}
public int next() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
index 514d94f..9f71e04 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
@@ -28,7 +28,7 @@ import javax.xml.stream.events.Namespace;
public class SkipStartEndEventProducer implements CorbaTypeEventProducer {
private final CorbaTypeEventProducer eventProducer;
- private QName name;
+ private QName name;
private int peekedEvent;
private boolean hasNext = true;
@@ -48,7 +48,7 @@ public class SkipStartEndEventProducer implements CorbaTypeEventProducer {
return name;
}
- public String getText() {
+ public String getText() {
return eventProducer.getText();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java
index b3df49c..cd144e6 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java
@@ -39,7 +39,7 @@ public final class ContextUtils {
private ContextUtils() {
//utility class
}
-
+
public static boolean isRequestor(Message message) {
return Boolean.TRUE.equals(message.containsKey(Message.REQUESTOR_ROLE));
}
@@ -55,7 +55,7 @@ public final class ContextUtils {
return exchange != null
&& message == exchange.getOutMessage();
}
-
+
public static DataWriter<XMLEventWriter> getDataWriter(CorbaMessage message) {
Service service = ServiceModelUtil.getService(message.getExchange());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
index f912f9a..0a53299 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
@@ -42,16 +42,16 @@ import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
public final class CorbaAnyHelper {
-
+
private static final Map<QName, QName> SCHEMA_TO_IDL_TYPES = new HashMap<QName, QName>();
private static final Map<QName, QName> IDL_TO_SCHEMA_TYPES = new HashMap<QName, QName>();
-
+
private static Constructor<?> fixedAnyConstructor;
-
+
private CorbaAnyHelper() {
//utility class
}
-
+
public static Any createAny(ORB orb) {
Any value = orb.create_any();
if ("com.sun.corba.se.impl.corba.AnyImpl".equals(value.getClass().getName())) {
@@ -67,7 +67,7 @@ public final class CorbaAnyHelper {
public static boolean isPrimitiveIdlType(QName idlType) {
return IDL_TO_SCHEMA_TYPES.get(idlType) != null;
}
-
+
public static QName convertPrimitiveSchemaToIdlType(QName schemaType) {
return SCHEMA_TO_IDL_TYPES.get(schemaType);
}
@@ -177,7 +177,7 @@ public final class CorbaAnyHelper {
a.insert_wstring((String)primitive.getValue());
break;
default:
- throw new CorbaBindingException("Unable to insert type into any. Kind = "
+ throw new CorbaBindingException("Unable to insert type into any. Kind = "
+ primitive.getTypeCode().kind().value());
}
}
@@ -228,7 +228,7 @@ public final class CorbaAnyHelper {
primitive.setValue(a.extract_wstring());
break;
default:
- throw new CorbaBindingException("Unable to extract type from any. Kind = "
+ throw new CorbaBindingException("Unable to extract type from any. Kind = "
+ primitive.getTypeCode().kind().value());
}
}
@@ -271,7 +271,7 @@ public final class CorbaAnyHelper {
IDL_TO_SCHEMA_TYPES.put(CorbaConstants.NT_CORBA_WSTRING, W3CConstants.NT_SCHEMA_STRING);
IDL_TO_SCHEMA_TYPES.put(CorbaConstants.NT_CORBA_ANY, W3CConstants.NT_SCHEMA_ANYTYPE);
}
-
+
private static Any createFixedAny(ORB orb, Any any) {
createFixedAnyConstructor();
try {
@@ -284,13 +284,13 @@ public final class CorbaAnyHelper {
if (fixedAnyConstructor != null) {
return;
}
-
+
ASMHelper helper = new ASMHelper();
ClassWriter cw = helper.createClassWriter();
FieldVisitor fv;
cw.visit(Opcodes.V1_6, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER,
- "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
+ "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
null, "com/sun/corba/se/impl/corba/AnyImpl", null);
cw.visitSource("FixedAnyImpl.java", null);
@@ -302,11 +302,11 @@ public final class CorbaAnyHelper {
addExtractOverride(helper, cw);
addWriteOverride(helper, cw);
addReadOverride(helper, cw);
-
+
cw.visitEnd();
byte[] b = cw.toByteArray();
- Class<?> c = helper.loadClass("org.apache.cxf.binding.corba.utils.FixedAnyImpl",
+ Class<?> c = helper.loadClass("org.apache.cxf.binding.corba.utils.FixedAnyImpl",
CorbaAnyHelper.class, b);
try {
fixedAnyConstructor = c.getConstructor(ORB.class, Any.class);
@@ -316,8 +316,8 @@ public final class CorbaAnyHelper {
}
private static void addReadOverride(ASMHelper helper, ClassWriter cw) {
- MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "read_value",
- "(Lorg/omg/CORBA/portable/InputStream;Lorg/omg/CORBA/TypeCode;)V",
+ MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "read_value",
+ "(Lorg/omg/CORBA/portable/InputStream;Lorg/omg/CORBA/TypeCode;)V",
null, null);
mv.visitCode();
Label l0 = helper.createLabel();
@@ -332,10 +332,10 @@ public final class CorbaAnyHelper {
mv.visitLabel(l2);
mv.visitLineNumber(55, l2);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
+ mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
"obj", "Lorg/omg/CORBA/portable/Streamable;");
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable",
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable",
"_read", "(Lorg/omg/CORBA/portable/InputStream;)V", true);
Label l3 = helper.createLabel();
mv.visitJumpInsn(Opcodes.GOTO, l3);
@@ -344,8 +344,8 @@ public final class CorbaAnyHelper {
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitVarInsn(Opcodes.ALOAD, 2);
- mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "com/sun/corba/se/impl/corba/AnyImpl",
- "read_value",
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "com/sun/corba/se/impl/corba/AnyImpl",
+ "read_value",
"(Lorg/omg/CORBA/portable/InputStream;Lorg/omg/CORBA/TypeCode;)V", false);
mv.visitLabel(l3);
mv.visitLineNumber(59, l3);
@@ -359,9 +359,9 @@ public final class CorbaAnyHelper {
mv.visitMaxs(3, 3);
mv.visitEnd();
}
-
+
private static void addWriteOverride(ASMHelper helper, ClassWriter cw) {
- MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "write_value",
+ MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "write_value",
"(Lorg/omg/CORBA/portable/OutputStream;)V", null, null);
mv.visitCode();
Label l0 = helper.createLabel();
@@ -378,7 +378,7 @@ public final class CorbaAnyHelper {
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
"obj", "Lorg/omg/CORBA/portable/Streamable;");
-
+
Label l3 = helper.createLabel();
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable",
@@ -400,7 +400,7 @@ public final class CorbaAnyHelper {
mv.visitLocalVariable("os", "Lorg/omg/CORBA/portable/OutputStream;", null, l0, l4, 1);
mv.visitMaxs(2, 2);
mv.visitEnd();
-
+
}
private static void addExtractOverride(ASMHelper helper, ClassWriter cw) {
@@ -412,7 +412,7 @@ public final class CorbaAnyHelper {
mv.visitLabel(l0);
mv.visitLineNumber(47, l0);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
+ mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
"obj", "Lorg/omg/CORBA/portable/Streamable;");
Label l1 = helper.createLabel();
mv.visitJumpInsn(Opcodes.IFNULL, l1);
@@ -434,12 +434,12 @@ public final class CorbaAnyHelper {
mv.visitLocalVariable("this", "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;", null, l0, l3, 0);
mv.visitMaxs(1, 1);
mv.visitEnd();
-
+
}
private static void addInsertOverride(ASMHelper helper, ClassWriter cw) {
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
- "insert_Streamable",
+ "insert_Streamable",
"(Lorg/omg/CORBA/portable/Streamable;)V", null, null);
mv.visitCode();
Label l0 = helper.createLabel();
@@ -447,17 +447,17 @@ public final class CorbaAnyHelper {
mv.visitLineNumber(43, l0);
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
- "com/sun/corba/se/impl/corba/AnyImpl",
- "insert_Streamable",
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
+ "com/sun/corba/se/impl/corba/AnyImpl",
+ "insert_Streamable",
"(Lorg/omg/CORBA/portable/Streamable;)V", false);
Label l1 = helper.createLabel();
mv.visitLabel(l1);
mv.visitLineNumber(44, l1);
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitFieldInsn(Opcodes.PUTFIELD,
- "org/apache/cxf/binding/corba/utils/FixedAnyImpl", "obj",
+ mv.visitFieldInsn(Opcodes.PUTFIELD,
+ "org/apache/cxf/binding/corba/utils/FixedAnyImpl", "obj",
"Lorg/omg/CORBA/portable/Streamable;");
Label l2 = helper.createLabel();
mv.visitLabel(l2);
@@ -491,13 +491,13 @@ public final class CorbaAnyHelper {
Label l2 = helper.createLabel();
mv.visitLabel(l2);
mv.visitLocalVariable("this",
- "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;",
+ "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;",
null, l0, l2, 0);
mv.visitLocalVariable("orb", "Lorg/omg/CORBA/ORB;", null, l0, l2, 1);
mv.visitMaxs(2, 2);
mv.visitEnd();
-
+
mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>",
"(Lorg/omg/CORBA/ORB;Lorg/omg/CORBA/Any;)V",
null, null);
@@ -525,6 +525,6 @@ public final class CorbaAnyHelper {
mv.visitLocalVariable("any", "Lorg/omg/CORBA/Any;", null, l0, l2, 2);
mv.visitMaxs(3, 3);
mv.visitEnd();
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
index 8947bbd..c23aed0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
@@ -37,12 +37,12 @@ public final class CorbaBindingHelper {
private static Map<String, ORB> orbList = new HashMap<String, ORB>();
private static Map<String, Integer> orbUseCount = new HashMap<String, Integer>();
private static ORB defaultORB;
-
+
private CorbaBindingHelper() {
//utility class
}
-
- public static synchronized ORB getDefaultORB(OrbConfig config) {
+
+ public static synchronized ORB getDefaultORB(OrbConfig config) {
if (defaultORB == null) {
Properties props = System.getProperties();
Properties configSpecifiedOrbProperties = config.getOrbProperties();
@@ -62,9 +62,9 @@ public final class CorbaBindingHelper {
}
return defaultORB;
}
-
- public static synchronized ORB getAddressSpecificORB(String address,
- Properties props,
+
+ public static synchronized ORB getAddressSpecificORB(String address,
+ Properties props,
List<String> orbArgs) {
ORB orb = orbList.get(getORBNameFromAddress(address));
if (orb == null) {
@@ -73,11 +73,11 @@ public final class CorbaBindingHelper {
return orb;
}
- private static ORB createAddressSpecificORB(String address,
- Properties props,
+ private static ORB createAddressSpecificORB(String address,
+ Properties props,
List<String> orbArgs) {
ORB orb = null;
-
+
URI addressURI = null;
try {
addressURI = new URI(address);
@@ -87,7 +87,7 @@ public final class CorbaBindingHelper {
String scheme = addressURI.getScheme();
// A corbaloc address gives us host and port information to use when setting up the
- // endpoint for the ORB. Other types of references will just create ORBs on the
+ // endpoint for the ORB. Other types of references will just create ORBs on the
// host and port used when no preference has been specified.
if ("corbaloc".equals(scheme)) {
String schemeSpecificPart = addressURI.getSchemeSpecificPart();
@@ -103,16 +103,16 @@ public final class CorbaBindingHelper {
index = corbaAddr.indexOf(':', oldIndex + 1);
String host = corbaAddr.substring(oldIndex + 1, index);
String port = corbaAddr.substring(index + 1);
-
+
props.put("yoko.orb.oa.endpoint", new String(protocol + " --host " + host + " --port " + port));
- // WHAT to do for non-yoko orb?
+ // WHAT to do for non-yoko orb?
} else if ("corbaname".equals(scheme)) {
String schemeSpecificPart = addressURI.getSchemeSpecificPart();
if (schemeSpecificPart.startsWith(":")) {
schemeSpecificPart = schemeSpecificPart.substring(1);
}
int idx = schemeSpecificPart.indexOf(':');
-
+
props.put("org.omg.CORBA.ORBInitialHost", schemeSpecificPart.substring(0, idx));
props.put("org.omg.CORBA.ORBInitialPort", schemeSpecificPart.substring(idx + 1));
} else if ("file".equals(scheme)
@@ -128,19 +128,19 @@ public final class CorbaBindingHelper {
return orb;
}
-
-
+
+
private static String getORBNameFromAddress(String address) {
String name = null;
-
+
URI addressURI = null;
try {
addressURI = new URI(address);
} catch (URISyntaxException ex) {
throw new CorbaBindingException("Unable to locate ORB with address " + address);
}
-
+
String scheme = addressURI.getScheme();
if ("corbaloc".equals(scheme) || "corbaname".equals(scheme)) {
String schemeSpecificPart = addressURI.getSchemeSpecificPart();
@@ -149,14 +149,14 @@ public final class CorbaBindingHelper {
}
int keyIndex = schemeSpecificPart.indexOf('/');
if (keyIndex != -1) {
- name = schemeSpecificPart.substring(0, keyIndex);
+ name = schemeSpecificPart.substring(0, keyIndex);
} else {
name = schemeSpecificPart;
}
if (addressURI.getRawQuery() != null) {
name += addressURI.getRawQuery();
}
- } else if ("IOR".equals(scheme) || "ior".equals(scheme)) {
+ } else if ("IOR".equals(scheme) || "ior".equals(scheme)) {
name = addressURI.toString();
} else if ("file".equals(scheme) || "relfile".equals(scheme)) {
name = addressURI.getPath();
@@ -207,5 +207,5 @@ public final class CorbaBindingHelper {
orbUseCount.put(getORBNameFromAddress(address), count);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
index 7d99204..fc1cbd5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
@@ -43,9 +43,9 @@ public final class CorbaObjectReferenceHelper {
public static final String WSDLI_NAMESPACE_URI = "http://www.w3.org/2006/01/wsdl-instance";
public static final String ADDRESSING_NAMESPACE_URI = "http://www.w3.org/2005/08/addressing";
public static final String ADDRESSING_WSDL_NAMESPACE_URI = "http://www.w3.org/2006/05/addressing/wsdl";
-
+
private static final Logger LOG = LogUtils.getL7dLogger(CorbaObjectReferenceHelper.class);
-
+
private CorbaObjectReferenceHelper() {
//utility class
}
@@ -53,7 +53,7 @@ public final class CorbaObjectReferenceHelper {
public static String getWSDLLocation(Definition wsdlDef) {
return wsdlDef.getDocumentBaseURI();
}
-
+
public static QName getServiceName(Binding binding, Definition wsdlDef) {
LOG.log(Level.FINE, "Getting service name for an object reference");
Collection<Service> services = CastUtils.cast(wsdlDef.getServices().values());
@@ -67,7 +67,7 @@ public final class CorbaObjectReferenceHelper {
}
return null;
}
-
+
public static String getEndpointName(Binding binding, Definition wsdlDef) {
LOG.log(Level.FINE, "Getting endpoint name for an object reference");
Collection<Service> services = CastUtils.cast(wsdlDef.getServices().values());
@@ -81,7 +81,7 @@ public final class CorbaObjectReferenceHelper {
}
return null;
}
-
+
public static Binding getDefaultBinding(Object obj, Definition wsdlDef) {
LOG.log(Level.FINEST, "Getting binding for a default object reference");
Collection<Binding> bindings = CastUtils.cast(wsdlDef.getBindings().values());
@@ -104,13 +104,13 @@ public final class CorbaObjectReferenceHelper {
}
public static EprMetaData getBindingForTypeId(String repId, Definition wsdlDef) {
- LOG.log(Level.FINE, "RepositoryId " + repId
+ LOG.log(Level.FINE, "RepositoryId " + repId
+ ", wsdl namespace " + wsdlDef.getTargetNamespace());
EprMetaData ret = new EprMetaData();
Collection<Binding> bindings = CastUtils.cast(wsdlDef.getBindings().values());
for (Binding b : bindings) {
List<?> extElements = b.getExtensibilityElements();
-
+
// Get the list of all extensibility elements
for (Iterator<?> extIter = extElements.iterator(); extIter.hasNext();) {
java.lang.Object element = extIter.next();
@@ -126,7 +126,7 @@ public final class CorbaObjectReferenceHelper {
}
}
}
-
+
if (!ret.isValid()) {
// recursivly check imports
Iterator<?> importLists = wsdlDef.getImports().values().iterator();
@@ -135,7 +135,7 @@ public final class CorbaObjectReferenceHelper {
for (java.lang.Object imp : imports) {
if (imp instanceof Import) {
Definition importDef = ((Import)imp).getDefinition();
- LOG.log(Level.INFO, "Following import " + importDef.getDocumentBaseURI());
+ LOG.log(Level.INFO, "Following import " + importDef.getDocumentBaseURI());
ret = getBindingForTypeId(repId, importDef);
if (ret.isValid()) {
return ret;
@@ -147,7 +147,7 @@ public final class CorbaObjectReferenceHelper {
return ret;
}
- public static String extractTypeIdFromIOR(String url) {
+ public static String extractTypeIdFromIOR(String url) {
String ret = "";
byte data[] = DatatypeConverter.parseHexBinary(url.substring(4));
if (data.length > 0) {
@@ -173,12 +173,12 @@ public final class CorbaObjectReferenceHelper {
if (bigEndian) {
int partial = ((data[index] << 24) & 0xff000000)
| ((data[index + 1] << 16) & 0x00ff0000);
- return partial | ((data[index + 2] << 8) & 0x0000ff00)
+ return partial | ((data[index + 2] << 8) & 0x0000ff00)
| ((data[index + 3]) & 0x000000ff);
} else {
int partial = ((data[index]) & 0x000000ff)
| ((data[index + 1] << 8) & 0x0000ff00);
- return partial | ((data[index + 2] << 16) & 0x00ff0000)
+ return partial | ((data[index + 2] << 16) & 0x00ff0000)
| ((data[index + 3] << 24) & 0xff000000);
}
}
@@ -200,7 +200,7 @@ public final class CorbaObjectReferenceHelper {
}
}
}
-
+
if (info.getServiceQName() == null) {
Iterator<?> importLists = wsdlDef.getImports().values().iterator();
while (info.getServiceQName() == null && importLists.hasNext()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java
index 2d3e035..a785762 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java
@@ -23,48 +23,48 @@ import javax.wsdl.Definition;
import javax.xml.namespace.QName;
public class EprMetaData {
-
+
private Definition candidateWsdlDef;
private Binding binding;
private QName serviceQName;
private String portName;
-
+
public Binding getBinding() {
return binding;
}
-
+
public void setBinding(Binding b) {
binding = b;
}
-
+
public Definition getCandidateWsdlDef() {
return candidateWsdlDef;
}
-
+
public void setCandidateWsdlDef(Definition def) {
candidateWsdlDef = def;
}
-
+
public String getPortName() {
return portName;
}
-
+
public void setPortName(String name) {
portName = name;
}
-
+
public QName getServiceQName() {
return serviceQName;
}
-
+
public void setServiceQName(QName name) {
serviceQName = name;
}
-
+
public boolean isValid() {
return binding != null && candidateWsdlDef != null;
}
-
+
public String toString() {
String ret = null;
if (isValid()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
index 6a4bc83..e96bbb7 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
@@ -49,7 +49,7 @@ public class OrbConfig {
protected String orbSingletonClass;
protected List<String> orbArgs = new ArrayList<>();
protected Properties orbProperties = new Properties();
-
+
public OrbConfig() {
//nothing
}
@@ -57,56 +57,56 @@ public class OrbConfig {
public void setOrbClass(String cls) {
orbClass = cls;
}
-
+
public String getOrbClass() {
return orbClass;
}
-
+
public void setOrbSingletonClass(String cls) {
orbSingletonClass = cls;
}
-
+
public String getOrbSingletonClass() {
return orbSingletonClass;
}
-
+
public void setOrbArgs(List<String> args) {
orbArgs = args;
}
-
+
public List<String> getOrbArgs() {
return orbArgs;
}
-
+
public void setOrbProperties(Properties props) {
orbProperties = props;
}
-
+
public Properties getOrbProperties() {
return orbProperties;
}
-
- public void addPOAPolicies(ORB orb,
+
+ public void addPOAPolicies(ORB orb,
String poaName,
POA parentPOA,
POAManager poaManager,
List<Policy> policies) {
//nothing
}
-
-
+
+
public Any createSystemExceptionAny(ORB orb, SystemException sysEx) {
Any exAny = orb.create_any();
SystemExceptionHelper.insert(exAny, sysEx);
return exAny;
}
-
+
public void exportObjectReference(ORB orb,
org.omg.CORBA.Object ref,
String url,
- AddressType address)
+ AddressType address)
throws URISyntaxException, IOException {
-
+
if ((url.startsWith("ior:")) || (url.startsWith("IOR:"))) {
// make use of Thread cache of last exported IOR
String ior = CorbaUtils.exportObjectReference(ref, orb);
@@ -135,7 +135,7 @@ public class OrbConfig {
String location) {
int idx = location.indexOf("#");
String name = location.substring(idx + 1);
-
+
//Register in NameService
try {
org.omg.CORBA.Object nsObj = orb.resolve_initial_references("NameService");
@@ -158,7 +158,7 @@ public class OrbConfig {
bootMgrHelperClass.getMethod("narrow", org.omg.CORBA.Object.class);
java.lang.Object bootMgr = narrowMethod.invoke(null,
orb.resolve_initial_references("BootManager"));
- Method addBindingMethod =
+ Method addBindingMethod =
bootMgrClass.getMethod("add_binding", byte[].class, org.omg.CORBA.Object.class);
addBindingMethod.invoke(bootMgr, key.getBytes(), object);
} catch (ClassNotFoundException ex) {
@@ -173,7 +173,7 @@ public class OrbConfig {
public void exportObjectReferenceToFile(ORB orb,
org.omg.CORBA.Object obj,
- URI iorFile)
+ URI iorFile)
throws IOException {
String ref = orb.object_to_string(obj);
File f = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java
index c8fd8fc..2df964a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java
@@ -33,7 +33,7 @@ public interface CorbaConstants {
String NU_TM_CORBA = "http://cxf.apache.org/bindings/corba/typemap/corba/";
String SCHEMA_NS_URI = "http://cxf.apache.org/bindings/corba/idltypes/";
String WSDL_NS_URI = "http://cxf.apache.org/bindings/corba/idl/";
-
+
// CORBA Binding Extensibility Elements
QName NE_CORBA_ADDRESS = new QName(NU_WSDL_CORBA, "address", NP_WSDL_CORBA);
QName NE_CORBA_POLICY = new QName(NU_WSDL_CORBA, "policy", NP_WSDL_CORBA);
@@ -98,7 +98,7 @@ public interface CorbaConstants {
String IDLTYPE = "idltype";
String MODE = "mode";
String EXCEPTION = "exception";
- String SERVICE_ID = "serviceid";
+ String SERVICE_ID = "serviceid";
String BASES = "bases";
String CORBA_ENDPOINT_OBJECT = "endpoint";
String ORB = "orb";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
index 8daf9c6..457bfe6 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
@@ -24,14 +24,14 @@ import javax.xml.namespace.QName;
public class CorbaTypeImpl {
protected QName qname;
-
+
/**
* Gets the value of the qname property.
- *
+ *
* @return
* possible object is
* {@link QName }
- *
+ *
*/
public QName getQName() {
return qname;
@@ -39,11 +39,11 @@ public class CorbaTypeImpl {
/**
* Sets the value of the name property.
- *
+ *
* @param value
* allowed object is
* {@link QName }
- *
+ *
*/
public void setQName(QName value) {
this.qname = value;
@@ -52,7 +52,7 @@ public class CorbaTypeImpl {
public boolean isSetQName() {
return this.qname != null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java
index 9940be4..716f9f5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java
@@ -25,7 +25,7 @@ public interface W3CConstants {
// XML Namespaces
String NP_XMLNS = "xmlns";
- String NU_XMLNS = "http://www.w3.org/2000/xmlns/";
+ String NU_XMLNS = "http://www.w3.org/2000/xmlns/";
// XML Schema(CR) datatypes + structures
String NP_SCHEMA_XSD = "xsd";
@@ -78,7 +78,7 @@ public interface W3CConstants {
QName NE_SCHEMA_ATTRIBUTEGROUP = new QName(NU_SCHEMA_XSD, "attributeGroup", NP_SCHEMA_XSD);
QName NE_SCHEMA_GROUP = new QName(NU_SCHEMA_XSD, "group", NP_SCHEMA_XSD);
-
+
// XML Schema primitive and derived built-in types
// Primitives
QName NT_SCHEMA_STRING = new QName(NU_SCHEMA_XSD, "string", NP_SCHEMA_XSD);
@@ -130,7 +130,7 @@ public interface W3CConstants {
QName NT_SCHEMA_ANYTYPE = new QName(NU_SCHEMA_XSD, "anyType", NP_SCHEMA_XSD);
QName NT_SCHEMA_ANYSIMPLETYPE = new QName(NU_SCHEMA_XSD, "anySimpleType", NP_SCHEMA_XSD);
- QName NT_SCHEMA_ANY = new QName(NU_SCHEMA_XSD, "any", NP_SCHEMA_XSD);
+ QName NT_SCHEMA_ANY = new QName(NU_SCHEMA_XSD, "any", NP_SCHEMA_XSD);
String getValue(String value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
index f50f780..2365d1c 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
@@ -28,18 +28,18 @@ import org.apache.cxf.wsdl.WSDLExtensionLoader;
import org.apache.cxf.wsdl.WSDLManager;
/**
- *
+ *
*/
@NoJSR250Annotations
-public final class WSDLExtensionRegister implements WSDLExtensionLoader {
+public final class WSDLExtensionRegister implements WSDLExtensionLoader {
private static final String YOKO_NAMESPACE = "http://schemas.apache.org/yoko/bindings/corba";
-
+
public WSDLExtensionRegister(Bus b) {
WSDLManager manager = b.getExtension(WSDLManager.class);
registerCXFExtensors(manager);
registerYokoCompatibleExtensors(manager);
}
-
+
void registerCXFExtensors(WSDLManager manager) {
createExtensor(manager, javax.wsdl.Binding.class,
org.apache.cxf.binding.corba.wsdl.BindingType.class);
@@ -69,14 +69,14 @@ public final class WSDLExtensionRegister implements WSDLExtensionLoader {
Class<?> elementType) {
try {
JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
- parentType,
+ parentType,
elementType,
null,
this.getClass().getClassLoader());
} catch (JAXBException e) {
//ignore, won't support CORBA
}
-
+
}
private void createCompatExtensor(WSDLManager manager,
@@ -84,13 +84,13 @@ public final class WSDLExtensionRegister implements WSDLExtensionLoader {
Class<?> elementType) {
try {
JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
- parentType,
+ parentType,
elementType,
YOKO_NAMESPACE);
} catch (JAXBException e) {
//ignore, just won't support the yoko extensors
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index 084f63b..d906115 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -50,37 +50,37 @@ import org.junit.Test;
public class CorbaBindingFactoryTest extends Assert {
-
+
protected Bus bus;
protected EndpointInfo endpointInfo;
- protected EndpointReferenceType target;
+ protected EndpointReferenceType target;
protected MessageObserver observer;
protected Message inMessage;
CorbaBindingFactory factory;
-
+
@Before
public void setUp() throws Exception {
- bus = BusFactory.getDefaultBus();
- BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+ bus = BusFactory.getDefaultBus();
+ BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
factory = (CorbaBindingFactory)bfm.getBindingFactory("http://cxf.apache.org/bindings/corba");
- bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
+ bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
}
-
+
@After
public void tearDown() {
- bus.shutdown(true);
+ bus.shutdown(true);
}
-
- protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
+
+ protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
URL wsdlUrl = getClass().getResource(wsdl);
assertNotNull(wsdlUrl);
WSDLServiceFactory f = new WSDLServiceFactory(bus, wsdlUrl.toString(), new QName(ns, serviceName));
- Service service = f.create();
+ Service service = f.create();
endpointInfo = service.getEndpointInfo(new QName(ns, portName));
-
+
}
-
+
@Test
public void testCreateBinding() throws Exception {
IMocksControl control = EasyMock.createNiceControl();
@@ -88,55 +88,55 @@ public class CorbaBindingFactoryTest extends Assert {
CorbaBinding binding = (CorbaBinding)factory.createBinding(bindingInfo);
assertNotNull(binding);
- assertTrue(CorbaBinding.class.isInstance(binding));
+ assertTrue(CorbaBinding.class.isInstance(binding));
List<Interceptor<? extends Message>> inInterceptors = binding.getInInterceptors();
assertNotNull(inInterceptors);
List<Interceptor<? extends Message>> outInterceptors = binding.getOutInterceptors();
assertNotNull(outInterceptors);
assertEquals(2, inInterceptors.size());
- assertEquals(2, outInterceptors.size());
+ assertEquals(2, outInterceptors.size());
}
@Test
public void testGetCorbaConduit() throws Exception {
- setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
- "/wsdl_corbabinding/simpleIdl.wsdl",
- "SimpleCORBAService",
+ setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
+ "/wsdl_corbabinding/simpleIdl.wsdl",
+ "SimpleCORBAService",
"SimpleCORBAPort");
-
+
Conduit conduit = factory.getConduit(endpointInfo, bus);
- assertNotNull(conduit);
+ assertNotNull(conduit);
conduit = factory.getConduit(endpointInfo, null, bus);
assertNotNull(conduit);
target = EasyMock.createMock(EndpointReferenceType.class);
conduit = factory.getConduit(endpointInfo, target, bus);
assertNotNull(conduit);
}
-
+
@Test
- public void testGetDestination() throws Exception {
- setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
- "/wsdl_corbabinding/simpleIdl.wsdl",
- "SimpleCORBAService",
+ public void testGetDestination() throws Exception {
+ setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
+ "/wsdl_corbabinding/simpleIdl.wsdl",
+ "SimpleCORBAService",
"SimpleCORBAPort");
-
+
Destination destination = factory.getDestination(endpointInfo, bus);
assertNotNull(destination);
target = destination.getAddress();
assertNotNull(target);
}
-
+
@Test
public void testTransportIds() throws Exception {
- setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
- "/wsdl_corbabinding/simpleIdl.wsdl",
- "SimpleCORBAService",
+ setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
+ "/wsdl_corbabinding/simpleIdl.wsdl",
+ "SimpleCORBAService",
"SimpleCORBAPort");
-
+
List<String> strs = new ArrayList<>();
strs.add("one");
strs.add("two");
- factory.setTransportIds(strs);
+ factory.setTransportIds(strs);
List<String> retStrs = factory.getTransportIds();
assertNotNull(retStrs);
String str = retStrs.get(0);
@@ -144,17 +144,17 @@ public class CorbaBindingFactoryTest extends Assert {
str = retStrs.get(1);
assertEquals("two", str.toString());
}
-
+
@Test
public void testGetUriPrefixes() throws Exception {
Set<String> prefixes = factory.getUriPrefixes();
assertNotNull("Prefixes should not be null", prefixes != null);
}
-
+
// check this
@Test
public void testSetBus() throws Exception {
- factory.setBus(bus);
+ factory.setBus(bus);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
index 0bfa213..4861591 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
@@ -32,28 +32,28 @@ import org.omg.CORBA.ORB;
public class CorbaBindingTest extends Assert {
-
+
private ORB orb;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
- public void tearDown() {
+
+ public void tearDown() {
if (orb != null) {
try {
orb.destroy();
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
@Test
public void testCorbaBinding() {
CorbaBinding binding = new CorbaBinding();
@@ -69,17 +69,17 @@ public class CorbaBindingTest extends Assert {
message.put(ORB.class, orb);
assertNotNull(message);
ORB corbaORB = message.get(ORB.class);
- assertNotNull(corbaORB);
+ assertNotNull(corbaORB);
MessageImpl mesage = new MessageImpl();
mesage.put(ORB.class, orb);
- Message msg = binding.createMessage(mesage);
- assertNotNull(msg);
+ Message msg = binding.createMessage(mesage);
+ assertNotNull(msg);
ORB corbaOrb = msg.get(ORB.class);
assertNotNull(corbaOrb);
/*List<Interceptor> infault = binding.getInFaultInterceptors();
assertEquals(1, infault.size());
List<Interceptor> outfault = binding.getOutFaultInterceptors();
- assertEquals(1, fault.size());*/
- }
-
+ assertEquals(1, fault.size());*/
+ }
+
}
[34/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
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) {
}
};
- }
+ }
}
[13/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
index da73ba5..26db8dc 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java
@@ -120,10 +120,10 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
"http://schemas.xmlsoap.org/wsdl/soap12/",
"http://schemas.xmlsoap.org/wsdl/soap/http",
"http://www.w3.org/2003/05/soap/bindings/HTTP/",
- "http://www.w3.org/2010/soapjms/"
+ "http://www.w3.org/2010/soapjms/"
);
-
-
+
+
public static final String SOAP_11_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/";
public static final String SOAP_12_BINDING = "http://schemas.xmlsoap.org/wsdl/soap12/";
@@ -132,11 +132,11 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
public SoapBindingFactory() {
}
-
+
public SoapBindingFactory(Bus b) {
super(b, DEFAULT_NAMESPACES);
}
-
+
public BindingInfo createBindingInfo(ServiceInfo si, String bindingid, Object conf) {
SoapBindingConfiguration config;
if (conf instanceof SoapBindingConfiguration) {
@@ -155,9 +155,9 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
info.setName(config.getBindingName(si));
info.setStyle(config.getStyle());
-
+
info.setTransportURI(config.getTransportURI());
-
+
if (config.isMtomEnabled()) {
info.setProperty(Message.MTOM_ENABLED, Boolean.TRUE);
}
@@ -249,7 +249,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
bodyParts.add(part.getName().getLocalPart());
}
- for (SoapHeaderInfo headerInfo : headerInfos) {
+ for (SoapHeaderInfo headerInfo : headerInfos) {
SoapHeader soapHeader = SOAPBindingUtil.createSoapHeader(extensionRegistry,
BindingInput.class,
isSoap12);
@@ -284,7 +284,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
for (MessagePartInfo part : b.getOutput().getMessageParts()) {
bodyParts.add(part.getName().getLocalPart());
}
- for (SoapHeaderInfo headerInfo : headerInfos) {
+ for (SoapHeaderInfo headerInfo : headerInfos) {
SoapHeader soapHeader = SOAPBindingUtil.createSoapHeader(extensionRegistry,
BindingOutput.class,
isSoap12);
@@ -342,7 +342,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
String bindingStyle = SoapBindingConstants.BINDING_STYLE_DOC;
boolean hasWrapped = false;
-
+
org.apache.cxf.binding.soap.SoapBinding sb = null;
SoapVersion version = null;
if (binding instanceof SoapBindingInfo) {
@@ -356,7 +356,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
boolean hasRPC = false;
boolean hasDoc = false;
-
+
// Operation wide style, what to do with the mixed style/use?
for (BindingOperationInfo boi : sbi.getOperations()) {
String st = sbi.getStyle(boi.getOperationInfo());
@@ -374,7 +374,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
hasWrapped = true;
}
}
-
+
if (Boolean.TRUE.equals(binding.getService().getProperty("soap.force.doclit.bare"))) {
hasDoc = true;
hasRPC = false;
@@ -385,7 +385,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
throw new RuntimeException("WSI-BP prohibits RPC and Document style "
+ "operations in same service.");
}
-
+
//jms
if (sbi.getTransportURI().equals(SoapJMSConstants.SOAP_JMS_SPECIFICIATION_TRANSPORTID)) {
sb.getInInterceptors().add(new SoapJMSInInterceptor());
@@ -401,7 +401,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
sb.getInInterceptors().add(new AttachmentInInterceptor());
sb.getInInterceptors().add(new StaxInInterceptor());
sb.getInInterceptors().add(new SoapActionInInterceptor());
-
+
sb.getOutInterceptors().add(new AttachmentOutInterceptor());
sb.getOutInterceptors().add(new StaxOutInterceptor());
sb.getOutInterceptors().add(SoapHeaderOutFilterInterceptor.INSTANCE);
@@ -414,7 +414,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
//sb.getInInterceptors().add(new BareInInterceptor());
sb.getInInterceptors().add(new DocLiteralInInterceptor());
if (hasWrapped) {
- sb.getOutInterceptors().add(new WrappedOutInterceptor());
+ sb.getOutInterceptors().add(new WrappedOutInterceptor());
}
sb.getOutInterceptors().add(new BareOutInterceptor());
} else {
@@ -441,7 +441,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
sb.getInFaultInterceptors().add(new Soap12FaultInInterceptor());
sb.getOutFaultInterceptors().add(new Soap12FaultOutInterceptor());
}
-
+
if (binding.getService() != null) {
for (EndpointInfo ei : binding.getService().getEndpoints()) {
if (ei.getAddress() != null && ei.getAddress().startsWith("soap.udp")) {
@@ -458,10 +458,10 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
WSAddressingFeature add = new WSAddressingFeature();
add.setAddressingRequired(true);
add.initialize(p, bus);
-
+
// UDP has a strict size limit on messages (<64K) so we'll try to shrink the
// message a little by putting the WSA namespace into the
- // the soap:env which allows it to not be written on every header
+ // the soap:env which allows it to not be written on every header
// element as well as disable the output stream optimizations (doesn't really
// matter on such small messages anyway) to make sure we pickup those
// namespaces that are declared there.
@@ -489,7 +489,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
// don't send the optional ReplyTo headers if we don't need to either
ei.setProperty("ws-addressing.write.optional.replyto", Boolean.FALSE);
}
-
+
protected void addMessageFromBinding(ExtensibilityElement ext, BindingOperationInfo bop,
boolean isInput) {
SoapHeader header = SOAPBindingUtil.getSoapHeader(ext);
@@ -497,24 +497,24 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
ServiceInfo serviceInfo = bop.getBinding().getService();
if (header != null && header.getMessage() == null) {
- throw new RuntimeException("Problem with WSDL: soap:header element"
+ throw new RuntimeException("Problem with WSDL: soap:header element"
+ " for operation " + bop.getName() + " under binding " + bop.getBinding().getName()
+ " does not contain a valid message attribute.");
}
-
+
if (header != null && serviceInfo.getMessage(header.getMessage()) == null) {
Definition def = (Definition)serviceInfo.getProperty(WSDLServiceBuilder.WSDL_DEFINITION);
SchemaCollection schemas = serviceInfo.getXmlSchemaCollection();
if (def != null && schemas != null) {
QName qn = header.getMessage();
-
+
javax.wsdl.Message msg = findMessage(qn, def);
if (msg != null) {
addOutOfBandParts(bop, msg, schemas, isInput, header.getPart());
serviceInfo.refresh();
} else {
- throw new RuntimeException("Problem with WSDL: soap:header element"
+ throw new RuntimeException("Problem with WSDL: soap:header element"
+ " for operation " + bop.getName()
+ " is referring to an undefined wsdl:message element: " + qn);
}
@@ -578,7 +578,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
}
}
}
-
+
if (isInput) {
type = MessageInfo.Type.INPUT;
minfo = bop.getOperationInfo().getInput();
@@ -597,7 +597,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
if (unwrapped == null) {
return;
}
-
+
nextId = 0;
if (isInput) {
minfo = unwrapped.getInput();
@@ -633,15 +633,15 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
int nextId,
String partNameFilter) {
for (Part part : cast(msg.getParts().values(), Part.class)) {
-
+
if (StringUtils.isEmpty(partNameFilter)
|| part.getName().equals(partNameFilter)) {
-
+
if (StringUtils.isEmpty(part.getName())) {
throw new RuntimeException("Problem with WSDL: part element in message "
- + msg.getQName().getLocalPart()
+ + msg.getQName().getLocalPart()
+ " does not specify a name.");
- }
+ }
QName pqname = new QName(minfo.getName().getNamespaceURI(), part.getName());
MessagePartInfo pi = minfo.getMessagePart(pqname);
if (pi != null
@@ -649,11 +649,11 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
continue;
}
pi = minfo.addOutOfBandMessagePart(pqname);
-
+
if (!minfo.getName().equals(msg.getQName())) {
pi.setMessageContainer(new MessageInfo(minfo.getOperation(), null, msg.getQName()));
}
-
+
if (part.getTypeName() != null) {
pi.setTypeQName(part.getTypeName());
pi.setElement(false);
@@ -730,10 +730,10 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
headerInfo.setUse(header.getUse());
if (StringUtils.isEmpty(header.getPart())) {
throw new RuntimeException("Problem with WSDL: soap:header element in operation "
- + boi.getName().getLocalPart()
+ + boi.getName().getLocalPart()
+ " does not specify a part.");
}
- MessagePartInfo part = msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
+ MessagePartInfo part = msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
header.getPart()));
if (part != null && header.getMessage() != null
&& !part.getMessageInfo().getName().equals(header.getMessage())) {
@@ -759,7 +759,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
SoapBodyInfo bodyInfo = new SoapBodyInfo();
SoapBody soapBody = SOAPBindingUtil.getSoapBody(bmsg.getExtensors(ExtensibilityElement.class));
-
+
List<?> parts = null;
if (soapBody == null) {
MIMEMultipartRelated mmr = bmsg.getExtensor(MIMEMultipartRelated.class);
@@ -793,8 +793,8 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
bmsg.addExtensor(bodyInfo);
}
-
- private List<MessagePartInfo> handleMimePart(MIMEPart mpart,
+
+ private List<MessagePartInfo> handleMimePart(MIMEPart mpart,
List<MessagePartInfo> attParts,
MessageInfo msg,
BindingMessageInfo bmsg,
@@ -815,7 +815,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
if (StringUtils.isEmpty(partName)) {
throw new RuntimeException("Problem with WSDL: mime content element in operation "
- + bmsg.getBindingOperation().getName().getLocalPart()
+ + bmsg.getBindingOperation().getName().getLocalPart()
+ " does not specify a part.");
}
@@ -841,17 +841,17 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
SoapHeaderInfo headerInfo = new SoapHeaderInfo();
headerInfo.setUse(header.getUse());
-
+
if (StringUtils.isEmpty(header.getPart())) {
throw new RuntimeException("Problem with WSDL: soap:header element in operation "
- + bmsg.getBindingOperation().getName().getLocalPart()
+ + bmsg.getBindingOperation().getName().getLocalPart()
+ " does not specify a part.");
}
-
+
MessagePartInfo mpi =
- msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
+ msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
header.getPart()));
-
+
if (mpi != null && header.getMessage() != null
&& !mpi.getMessageInfo().getName().equals(header.getMessage())) {
mpi = null;
@@ -874,7 +874,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
}
return attParts;
}
-
+
private void addSoapBodyPart(MessageInfo msg, List<MessagePartInfo> bodyParts, String partName) {
MessagePartInfo mpi = msg.getMessagePart(new QName(msg.getName().getNamespaceURI(),
partName));
@@ -885,9 +885,9 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
public synchronized void addListener(Destination d, Endpoint e) {
synchronized (d) {
MessageObserver mo = d.getMessageObserver();
- if (d.getAddress() != null
- && d.getAddress().getAddress() != null
- && d.getAddress().getAddress().getValue() != null
+ if (d.getAddress() != null
+ && d.getAddress().getAddress() != null
+ && d.getAddress().getAddress().getValue() != null
&& d.getAddress().getAddress().getValue().startsWith("soap.udp")) {
//soap.udp REQUIRES usage of WS-Addressing... we need to turn this on
setupUDP(e, e.getEndpointInfo());
@@ -899,7 +899,7 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
if (mo instanceof ChainInitiationObserver) {
ChainInitiationObserver cio = (ChainInitiationObserver) mo;
-
+
Binding b = e.getBinding();
Binding b2 = cio.getEndpoint().getBinding();
if (b == b2) {
@@ -912,50 +912,50 @@ public class SoapBindingFactory extends AbstractWSDLBindingFactory {
} else if (o == null) {
o = Boolean.FALSE;
}
- if (b instanceof org.apache.cxf.binding.soap.SoapBinding
+ if (b instanceof org.apache.cxf.binding.soap.SoapBinding
&& b2 instanceof org.apache.cxf.binding.soap.SoapBinding
&& ((org.apache.cxf.binding.soap.SoapBinding)b).getSoapVersion()
.equals(((org.apache.cxf.binding.soap.SoapBinding)b2).getSoapVersion())
&& Boolean.FALSE.equals(o)) {
-
- throw new RuntimeException("Soap "
+
+ throw new RuntimeException("Soap "
+ ((org.apache.cxf.binding.soap.SoapBinding)b)
.getSoapVersion().getVersion()
+ " endpoint already registered on address "
+ e.getEndpointInfo().getAddress());
}
-
+
MultipleEndpointObserver newMO = new MultipleEndpointObserver(getBus()) {
@Override
protected Message createMessage(Message message) {
return new SoapMessage(message);
}
};
-
+
newMO.getBindingInterceptors().add(new AttachmentInInterceptor());
newMO.getBindingInterceptors().add(new StaxInInterceptor());
-
+
// This will not work if one of the endpoints disables message
// processing. But, if you've disabled message processing, you
// probably aren't going to use this feature.
-
+
newMO.getBindingInterceptors().add(new ReadHeadersInterceptor(getBus(), (SoapVersion)null));
newMO.getBindingInterceptors().add(new StartBodyInterceptor());
newMO.getBindingInterceptors().add(new CheckFaultInterceptor());
-
+
// Add in a default selection interceptor
newMO.getRoutingInterceptors().add(new EndpointSelectionInterceptor());
-
+
newMO.getEndpoints().add(cio.getEndpoint());
-
+
mo = newMO;
}
-
+
if (mo instanceof MultipleEndpointObserver) {
MultipleEndpointObserver meo = (MultipleEndpointObserver) mo;
meo.getEndpoints().add(e);
}
-
+
d.setMessageObserver(mo);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
index bd1fdda..6e74c22 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapFault.java
@@ -40,7 +40,7 @@ public class SoapFault extends Fault {
/**
* "The message was incorrectly formed or did not contain the appropriate
* information in order to succeed." -- SOAP 1.2 Spec
- */
+ */
/**
* A SOAP 1.2 only fault code. <p/> "The message could not be processed for
@@ -48,7 +48,7 @@ public class SoapFault extends Fault {
* contents of the message itself." -- SOAP 1.2 Spec <p/> If this message is
* used in a SOAP 1.1 Fault it will most likely (depending on the
* FaultHandler) be mapped to "Sender" instead.
- */
+ */
private List<QName> subCodes;
private String role;
@@ -80,15 +80,15 @@ public class SoapFault extends Fault {
super(new Message(message, (ResourceBundle)null), t, faultCode);
}
-
+
public String getCodeString(String prefix, String defaultPrefix) {
return getFaultCodeString(prefix, defaultPrefix, getFaultCode());
}
-
+
public String getSubCodeString(String prefix, String defaultPrefix) {
return getFaultCodeString(prefix, defaultPrefix, getRootSubCode());
}
-
+
private String getFaultCodeString(String prefix, String defaultPrefix, QName fCode) {
String codePrefix = null;
if (StringUtils.isEmpty(prefix)) {
@@ -99,10 +99,10 @@ public class SoapFault extends Fault {
} else {
codePrefix = prefix;
}
-
- return codePrefix + ":" + fCode.getLocalPart();
+
+ return codePrefix + ":" + fCode.getLocalPart();
}
-
+
private QName getRootSubCode() {
return subCodes != null && subCodes.size() > 0 ? subCodes.get(0) : null;
}
@@ -122,7 +122,7 @@ public class SoapFault extends Fault {
/**
* Returns the fault actor.
- *
+ *
* @return the fault actor.
*/
public String getRole() {
@@ -131,25 +131,25 @@ public class SoapFault extends Fault {
/**
* Sets the fault actor.
- *
+ *
* @param actor the actor.
*/
public void setRole(String actor) {
this.role = actor;
}
-
+
public String getNode() {
return node;
}
public void setNode(String n) {
this.node = n;
- }
+ }
/**
- * Returns the SubCode for the Fault Code. If there are more than one Subcode entries
+ * Returns the SubCode for the Fault Code. If there are more than one Subcode entries
* in this fault, the first Subcode is returned.
- *
+ *
* @return The SubCode element as detailed by the SOAP 1.2 spec.
*/
public QName getSubCode() {
@@ -158,7 +158,7 @@ public class SoapFault extends Fault {
/**
* Returns the SubCode list for the Fault Code.
- *
+ *
* @return The SubCode element list as detailed by the SOAP 1.2 spec.
*/
public List<QName> getSubCodes() {
@@ -166,9 +166,9 @@ public class SoapFault extends Fault {
}
/**
- * Sets the SubCode for the Fault Code. If there are more than one Subcode entries
+ * Sets the SubCode for the Fault Code. If there are more than one Subcode entries
* in this fault, the first Subcode is set while the other entries are removed.
- *
+ *
* @param subCode The SubCode element as detailed by the SOAP 1.2 spec.
*/
public void setSubCode(QName subCode) {
@@ -177,7 +177,7 @@ public class SoapFault extends Fault {
/**
* Sets the SubCode list for the Fault Code.
- *
+ *
* @param subCode The SubCode element list as detailed by the SOAP 1.2 spec.
*/
public void setSubCodes(List<QName> subCodes) {
@@ -186,8 +186,8 @@ public class SoapFault extends Fault {
/**
* Appends the SubCode to the SubCode list.
- *
- * @param subCode The SubCode element as detailed by the SOAP 1.2 spec.
+ *
+ * @param subCode The SubCode element as detailed by the SOAP 1.2 spec.
*/
public void addSubCode(QName subCode) {
if (subCodes == null) {
@@ -222,7 +222,7 @@ public class SoapFault extends Fault {
return;
}
f.setFaultCode(Soap12.getInstance().getReceiver());
-
+
if (f.getSubCodes() == null) {
f.setRootSubCode(fc);
} else if (!f.getSubCodes().contains(fc)) {
@@ -237,7 +237,7 @@ public class SoapFault extends Fault {
QName fc = f.getFaultCode();
if (Fault.FAULT_CODE_CLIENT.equals(fc)) {
fc = v.getSender();
- } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
+ } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
fc = v.getReceiver();
}
f.setFaultCode(fc);
@@ -251,7 +251,7 @@ public class SoapFault extends Fault {
QName fc = f.getFaultCode();
if (Fault.FAULT_CODE_CLIENT.equals(fc)) {
fc = v.getSender();
- } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
+ } else if (Fault.FAULT_CODE_SERVER.equals(fc)) {
fc = v.getReceiver();
}
SoapFault soapFault = new SoapFault(new Message(f.getMessage(), (ResourceBundle)null),
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java
index 39ff6bc..ecf88fb 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapHeader.java
@@ -33,20 +33,20 @@ public class SoapHeader extends Header {
public SoapHeader(QName q, Object o, DataBinding b) {
super(q, o, b);
}
-
+
public String getActor() {
return actor;
}
public void setActor(String actor) {
this.actor = actor;
}
-
+
public boolean isMustUnderstand() {
return mustUnderstand;
}
public void setMustUnderstand(boolean mustUnderstand) {
this.mustUnderstand = mustUnderstand;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
index 00f1c29..d6dbf0f 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapMessage.java
@@ -51,7 +51,7 @@ public class SoapMessage extends MessageImpl {
super.put(SoapVersion.class, v);
this.version = v;
}
-
+
public List<Header> getHeaders() {
List<Header> heads = CastUtils.cast((List<?>)get(Header.HEADER_LIST));
if (heads == null) {
@@ -60,7 +60,7 @@ public class SoapMessage extends MessageImpl {
}
return heads;
}
-
+
public boolean hasHeader(QName qn) {
for (Header head : getHeaders()) {
if (head.getName().equals(qn)) {
@@ -77,18 +77,18 @@ public class SoapMessage extends MessageImpl {
}
return null;
}
-
+
public boolean hasHeaders() {
return containsKey(Header.HEADER_LIST) && getHeaders().size() > 0;
}
-
+
public Map<String, String> getEnvelopeNs() {
return CastUtils.cast((Map<?, ?>)getContextualProperty("soap.env.ns.map"));
}
-
+
public boolean hasAdditionalEnvNs() {
Map<String, String> ns = getEnvelopeNs();
return ns != null && !ns.isEmpty();
- }
-
+ }
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
index 4c0a82a..e4d2d3e 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapTransportFactory.java
@@ -57,14 +57,14 @@ import org.apache.cxf.wsdl11.WSDLEndpointFactory;
@NoJSR250Annotations
public class SoapTransportFactory extends AbstractTransportFactory implements DestinationFactory,
WSDLEndpointFactory, ConduitInitiator {
-
- public static final String CANNOT_GET_CONDUIT_ERROR
+
+ public static final String CANNOT_GET_CONDUIT_ERROR
= "Could not find conduit initiator for address: %s and transport: %s";
public static final String SOAP_11_HTTP_BINDING = "http://schemas.xmlsoap.org/soap/http";
public static final String SOAP_12_HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/";
-
+
public static final String TRANSPORT_ID = "http://schemas.xmlsoap.org/soap/";
-
+
public static final List<String> DEFAULT_NAMESPACES = Arrays.asList(
"http://schemas.xmlsoap.org/soap/",
"http://schemas.xmlsoap.org/wsdl/soap/",
@@ -73,15 +73,15 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
"http://schemas.xmlsoap.org/wsdl/soap/http",
"http://www.w3.org/2010/soapjms/",
"http://www.w3.org/2003/05/soap/bindings/HTTP/");
- public static final Set<String> DEFAULT_PREFIXES
+ public static final Set<String> DEFAULT_PREFIXES
= Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
"soap.udp"
)));
-
+
public SoapTransportFactory() {
super(DEFAULT_NAMESPACES);
}
-
+
public Set<String> getUriPrefixes() {
return DEFAULT_PREFIXES;
}
@@ -119,8 +119,8 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
DestinationFactory destinationFactory;
try {
DestinationFactoryManager mgr = bus.getExtension(DestinationFactoryManager.class);
- if (StringUtils.isEmpty(address)
- || address.startsWith("http")
+ if (StringUtils.isEmpty(address)
+ || address.startsWith("http")
|| address.startsWith("jms")
|| address.startsWith("soap.udp")
|| address.startsWith("/")) {
@@ -149,7 +149,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
private void createSoapExtensors(Bus bus, EndpointInfo ei, SoapBindingInfo bi, boolean isSoap12) {
try {
-
+
String address = ei.getAddress();
if (address == null) {
address = "http://localhost:9090";
@@ -158,9 +158,9 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
ExtensionRegistry registry = bus.getExtension(WSDLManager.class).getExtensionRegistry();
SoapAddress soapAddress = SOAPBindingUtil.createSoapAddress(registry, isSoap12);
soapAddress.setLocationURI(address);
-
+
ei.addExtensor(soapAddress);
-
+
} catch (WSDLException e) {
e.printStackTrace();
}
@@ -168,7 +168,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
public EndpointInfo createEndpointInfo(Bus bus,
ServiceInfo serviceInfo,
- BindingInfo b,
+ BindingInfo b,
List<?> ees) {
String transportURI = "http://schemas.xmlsoap.org/wsdl/soap/";
if (b instanceof SoapBindingInfo) {
@@ -176,14 +176,14 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
transportURI = sbi.getTransportURI();
}
EndpointInfo info = new SoapEndpointInfo(serviceInfo, transportURI);
-
+
if (ees != null) {
for (Iterator<?> itr = ees.iterator(); itr.hasNext();) {
Object extensor = itr.next();
-
+
if (SOAPBindingUtil.isSOAPAddress(extensor)) {
final SoapAddress sa = SOAPBindingUtil.getSoapAddress(extensor);
-
+
info.addExtensor(sa);
info.setAddress(sa.getLocationURI());
if (isJMSSpecAddress(sa.getLocationURI())) {
@@ -194,7 +194,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
}
}
}
-
+
return info;
}
@@ -212,7 +212,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
ConduitInitiator conduitInit;
try {
ConduitInitiatorManager mgr = bus.getExtension(ConduitInitiatorManager.class);
- if (StringUtils.isEmpty(address)
+ if (StringUtils.isEmpty(address)
|| address.startsWith("http")
|| address.startsWith("jms")
|| address.startsWith("soap.udp")) {
@@ -232,7 +232,7 @@ public class SoapTransportFactory extends AbstractTransportFactory implements De
public Conduit getConduit(EndpointInfo ei, Bus b) throws IOException {
return getConduit(ei, ei.getTarget(), b);
}
-
+
public void setActivationNamespaces(Collection<String> ans) {
super.setTransportIds(new ArrayList<>(ans));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
index 944b87d..c796241 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersion.java
@@ -23,7 +23,7 @@ import javax.xml.namespace.QName;
public interface SoapVersion {
String getBindingId();
-
+
double getVersion();
String getNamespace();
@@ -33,34 +33,34 @@ public interface SoapVersion {
QName getHeader();
QName getBody();
-
+
QName getFault();
-
+
QName getReceiver();
-
+
QName getSender();
-
+
QName getMustUnderstand();
-
+
QName getVersionMismatch();
-
+
QName getDateEncodingUnknown();
String getSoapEncodingStyle();
String getAttrNameMustUnderstand();
-
+
String getAttrValueMustUnderstand(boolean value);
-
+
// Role related properties
//-------------------------------------------------------------------------
String getAttrNameRole();
-
+
String getNoneRole();
String getUltimateReceiverRole();
String getNextRole();
-
+
String getContentType();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java
index 31e1a6a..9113204 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapVersionFactory.java
@@ -30,17 +30,17 @@ public class SoapVersionFactory {
getInstance().register(Soap11.getInstance());
getInstance().register(Soap12.getInstance());
}
-
+
private Map<String, SoapVersion> versions = new HashMap<String, SoapVersion>();
-
+
public static SoapVersionFactory getInstance() {
return factory;
}
-
+
public SoapVersion getSoapVersion(String namespace) {
return versions.get(namespace);
}
-
+
public void register(SoapVersion version) {
versions.put(version.getNamespace(), version);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java
index b7fd6ac..f7307bc 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/blueprint/SoapBindingBPInfoConfigDefinitionParser.java
@@ -49,9 +49,9 @@ public class SoapBindingBPInfoConfigDefinitionParser extends AbstractBPBeanDefin
@Override
protected void mapElement(ParserContext ctx, MutableBeanMetadata bean, Element el, String name) {
- if ("version".equals(name)
- || "mtomEnabled".equals(name)
- || "style".equals(name)
+ if ("version".equals(name)
+ || "mtomEnabled".equals(name)
+ || "style".equals(name)
|| "use".equals(name)) {
bean.addProperty(name, parseMapData(ctx, bean, el));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
index 096ca02..ac96d72 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/AbstractSoapInterceptor.java
@@ -39,9 +39,9 @@ import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.staxutils.StaxUtils;
-public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<SoapMessage>
+public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<SoapMessage>
implements SoapInterceptor {
-
+
public AbstractSoapInterceptor(String p) {
super(p);
}
@@ -49,7 +49,7 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
super(i, p);
}
-
+
public Set<URI> getRoles() {
return Collections.emptySet();
}
@@ -57,16 +57,16 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
public Set<QName> getUnderstoodHeaders() {
return Collections.emptySet();
}
-
+
protected String getFaultCodePrefix(XMLStreamWriter writer, QName faultCode) throws XMLStreamException {
String codeNs = faultCode.getNamespaceURI();
String prefix = null;
if (codeNs.length() > 0) {
prefix = StaxUtils.getUniquePrefix(writer, codeNs, true);
- }
+ }
return prefix;
}
-
+
protected void prepareStackTrace(SoapMessage message, SoapFault fault) throws Exception {
boolean config = MessageUtils.getContextualBoolean(message, Message.FAULT_STACKTRACE_ENABLED, false);
if (config && fault.getCause() != null) {
@@ -81,7 +81,7 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
}
throwable = throwable.getCause();
if (throwable != null) {
- sb.append("Caused by: " + throwable.getClass().getCanonicalName()
+ sb.append("Caused by: " + throwable.getClass().getCanonicalName()
+ " : " + throwable.getMessage() + Message.EXCEPTION_CAUSE_SUFFIX);
}
}
@@ -97,7 +97,7 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
fault.setDetail(detail);
detail.appendChild(stackTrace);
} else {
- Element stackTrace =
+ Element stackTrace =
detail.getOwnerDocument().createElementNS(Fault.STACKTRACE_NAMESPACE,
Fault.STACKTRACE);
stackTrace.setTextContent(sb.toString());
@@ -112,7 +112,7 @@ public abstract class AbstractSoapInterceptor extends AbstractPhaseInterceptor<S
}
boolean config = MessageUtils.getContextualBoolean(message, Message.EXCEPTION_MESSAGE_CAUSE_ENABLED, false);
if (fault.getMessage() != null) {
- if (config && fault.getCause() != null
+ if (config && fault.getCause() != null
&& fault.getCause().getMessage() != null && !fault.getMessage().equals(fault.getCause().getMessage())) {
return fault.getMessage() + " Caused by: " + fault.getCause().getMessage();
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
index 47c6df6..75f57c2 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
@@ -33,7 +33,7 @@ import org.apache.cxf.phase.Phase;
public class CheckFaultInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(CheckFaultInterceptor.class);
-
+
public CheckFaultInterceptor() {
this(Phase.POST_PROTOCOL);
}
@@ -59,7 +59,7 @@ public class CheckFaultInterceptor extends AbstractSoapInterceptor {
return;
}
} catch (XMLStreamException e) {
- throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
+ throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
message.getVersion().getSender());
}
if (message.getVersion().getFault().equals(xmlReader.getName()) && isRequestor(message)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
index 529b7d3..cdb9dc9 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/EndpointSelectionInterceptor.java
@@ -32,13 +32,13 @@ import org.apache.cxf.wsdl.interceptors.AbstractEndpointSelectionInterceptor;
/**
* Selects the most appropriate endpoint based on the SOAP version used.
- *
+ *
* @param message
* @param eps
* @return
*/
public class EndpointSelectionInterceptor extends AbstractEndpointSelectionInterceptor {
-
+
public EndpointSelectionInterceptor() {
super(Phase.READ);
getAfter().add(ReadHeadersInterceptor.class.getName());
@@ -51,7 +51,7 @@ public class EndpointSelectionInterceptor extends AbstractEndpointSelectionInter
EndpointInfo ei = e.getEndpointInfo();
BindingInfo binding = ei.getBinding();
- if (binding instanceof SoapBindingInfo
+ if (binding instanceof SoapBindingInfo
&& ((SoapBindingInfo)binding).getSoapVersion().equals(sv)) {
return e;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
index 20d54b3..75de8ac 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/MustUnderstandInterceptor.java
@@ -52,9 +52,9 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(MustUnderstandInterceptor.class);
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
-
+
private MustUnderstandEndingInterceptor ending = new MustUnderstandEndingInterceptor();
-
+
public MustUnderstandInterceptor() {
super(Phase.PRE_PROTOCOL);
}
@@ -68,8 +68,8 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
if (soapMessage.getHeaders().isEmpty() && paramHeaders.isEmpty()) {
return;
}
-
- SoapVersion soapVersion = soapMessage.getVersion();
+
+ SoapVersion soapVersion = soapMessage.getVersion();
Set<Header> mustUnderstandHeaders = new HashSet<>();
Set<URI> serviceRoles = new HashSet<>();
Set<QName> notUnderstandHeaders = new HashSet<>();
@@ -79,9 +79,9 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
initServiceSideInfo(mustUnderstandQNames, soapMessage, serviceRoles, paramHeaders);
buildMustUnderstandHeaders(mustUnderstandHeaders, soapMessage,
serviceRoles, ultimateReceiverHeaders);
-
+
checkUnderstand(mustUnderstandHeaders, mustUnderstandQNames, notUnderstandHeaders);
-
+
if (!notUnderstandHeaders.isEmpty()) {
if (!isRequestor(soapMessage)) {
soapMessage.put(MustUnderstandInterceptor.UNKNOWNS, notUnderstandHeaders);
@@ -98,7 +98,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
@Override
public void handleFault(SoapMessage msg) {
Set<QName> unknowns = CastUtils.cast((Set<?>)msg.get(MustUnderstandInterceptor.UNKNOWNS));
- if (msg.getExchange().getBindingOperationInfo() == null
+ if (msg.getExchange().getBindingOperationInfo() == null
&& unknowns != null && !unknowns.isEmpty()) {
//per jaxws spec, if there are must understands that we didn't understand, but couldn't map
//to an operation either, we need to throw the mustunderstand fault, not the one related to
@@ -109,7 +109,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
}
private void checkUltimateReceiverHeaders(Set<Header> ultimateReceiverHeaders,
- Set<QName> mustUnderstandQNames,
+ Set<QName> mustUnderstandQNames,
SoapMessage soapMessage) {
soapMessage.getInterceptorChain()
.add(new UltimateReceiverMustUnderstandInterceptor(mustUnderstandQNames));
@@ -160,7 +160,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
if (paramHeaders != null) {
mustUnderstandQNames.addAll(paramHeaders);
}
- for (Interceptor<? extends org.apache.cxf.message.Message> interceptorInstance
+ for (Interceptor<? extends org.apache.cxf.message.Message> interceptorInstance
: soapMessage.getInterceptorChain()) {
if (interceptorInstance instanceof SoapInterceptor) {
SoapInterceptor si = (SoapInterceptor) interceptorInstance;
@@ -188,7 +188,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
if (role.equals(soapMessage.getVersion().getNextRole())) {
mustUnderstandHeaders.add(header);
} else if (role.equals(soapMessage.getVersion().getUltimateReceiverRole())) {
- ultimateReceiverHeaders.add(header);
+ ultimateReceiverHeaders.add(header);
} else {
for (URI roleFromBinding : serviceRoles) {
if (role.equals(roleFromBinding.toString())) {
@@ -216,11 +216,11 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
}
}
}
-
-
-
+
+
+
/**
- *
+ *
*/
private static class UltimateReceiverMustUnderstandInterceptor extends AbstractSoapInterceptor {
Set<QName> knownHeaders;
@@ -232,7 +232,7 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
SoapVersion soapVersion = soapMessage.getVersion();
Set<QName> notFound = new HashSet<>();
List<Header> heads = soapMessage.getHeaders();
-
+
for (Header header : heads) {
if (header instanceof SoapHeader
&& ((SoapHeader)header).isMustUnderstand()
@@ -241,21 +241,21 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
&& (StringUtils.isEmpty(((SoapHeader)header).getActor())
|| soapVersion.getUltimateReceiverRole()
.equals(((SoapHeader)header).getActor()))) {
-
+
notFound.add(header.getName());
}
}
-
-
+
+
if (!notFound.isEmpty()) {
soapMessage.remove(UNKNOWNS);
throw new SoapFault(new Message("MUST_UNDERSTAND", BUNDLE, notFound),
soapVersion.getMustUnderstand());
- }
+ }
}
}
-
+
public static class MustUnderstandEndingInterceptor extends AbstractSoapInterceptor {
public MustUnderstandEndingInterceptor() {
super(Phase.PRE_LOGICAL);
@@ -265,17 +265,17 @@ public class MustUnderstandInterceptor extends AbstractSoapInterceptor {
public MustUnderstandEndingInterceptor(String phase) {
super(phase);
}
-
+
public void handleMessage(SoapMessage message) throws Fault {
// throws soapFault after the response code 202 is set in OneWayProcessorInterceptor
if (message.get(MustUnderstandInterceptor.UNKNOWNS) != null) {
- //we may not have known the Operation in the main interceptor and thus may not
+ //we may not have known the Operation in the main interceptor and thus may not
//have been able to get the parameter based headers. We now know the
//operation and thus can remove those.
Set<QName> unknowns = CastUtils.cast((Set<?>)message.get(MustUnderstandInterceptor.UNKNOWNS));
Set<QName> paramHeaders = HeaderUtil.getHeaderQNameInOperationParam(message);
unknowns.removeAll(paramHeaders);
-
+
message.remove(MustUnderstandInterceptor.UNKNOWNS);
if (!unknowns.isEmpty()) {
throw new SoapFault(new Message("MUST_UNDERSTAND", BUNDLE, unknowns),
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
index 6607e1b..d36f196 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCInInterceptor.java
@@ -54,7 +54,7 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
private static final QName SOAP12_RESULT = new QName("http://www.w3.org/2003/05/soap-rpc",
"result");
private static final Logger LOG = LogUtils.getL7dLogger(RPCInInterceptor.class);
-
+
public RPCInInterceptor() {
super(Phase.UNMARSHAL);
}
@@ -75,8 +75,8 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
body = info.getOutput().getExtensor(SoapBody.class);
} else {
body = info.getInput().getExtensor(SoapBody.class);
- }
- if (body != null
+ }
+ if (body != null
&& opName.getNamespaceURI().equals(body.getNamespaceURI())) {
return info;
}
@@ -122,11 +122,11 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
msg = operation.getOperationInfo().getOutput();
}
message.put(MessageInfo.class, msg);
-
+
MessageContentsList parameters = new MessageContentsList();
StaxUtils.nextEvent(xmlReader);
-
+
boolean hasNext = true;
Iterator<MessagePartInfo> itr = msg.getMessageParts().iterator();
while (itr.hasNext()) {
@@ -150,8 +150,8 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
StaxUtils.toNextElement(xmlReader);
qn = xmlReader.getName();
}
-
-
+
+
// WSI-BP states that RPC/Lit part accessors should be completely unqualified
// However, older toolkits (Axis 1.x) are qualifying them. We'll go
// ahead and just match on the localpart. The RPCOutInterceptor
@@ -186,9 +186,9 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
message.setContent(List.class, parameters);
}
-
-
- private void setMessage(Message message,
+
+
+ private void setMessage(Message message,
BindingOperationInfo operation) {
Exchange ex = message.getExchange();
ex.put(BindingOperationInfo.class, operation);
@@ -208,7 +208,7 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
QName portQName = endpointInfo.getName();
message.put(Message.WSDL_PORT, portQName);
-
+
URI wsdlDescription = endpointInfo.getProperty("URI", URI.class);
if (wsdlDescription == null) {
String address = endpointInfo.getAddress();
@@ -220,8 +220,8 @@ public class RPCInInterceptor extends AbstractInDatabindingInterceptor {
endpointInfo.setProperty("URI", wsdlDescription);
}
message.put(Message.WSDL_DESCRIPTION, wsdlDescription);
-
+
// configure endpoint and operation level schema validation
- setOperationSchemaValidation(message);
- }
+ setOperationSchemaValidation(message);
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
index 4c6912d..703d1ed 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/RPCOutInterceptor.java
@@ -112,8 +112,8 @@ public class RPCOutInterceptor extends AbstractOutDatabindingInterceptor {
// Finishing the writing.
xmlWriter.writeEndElement();
-
-
+
+
if (cache != null) {
try {
for (XMLEvent event : cache.getEvents()) {
@@ -132,10 +132,10 @@ public class RPCOutInterceptor extends AbstractOutDatabindingInterceptor {
}
}
- protected String addOperationNode(NSStack nsStack, Message message,
- XMLStreamWriter xmlWriter,
+ protected String addOperationNode(NSStack nsStack, Message message,
+ XMLStreamWriter xmlWriter,
boolean output,
- BindingOperationInfo boi)
+ BindingOperationInfo boi)
throws XMLStreamException {
String ns = boi.getName().getNamespaceURI();
SoapBody body = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
index c0b72c9..d016ee9 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/ReadHeadersInterceptor.java
@@ -67,19 +67,19 @@ import org.apache.cxf.staxutils.W3CDOMStreamWriter;
public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
-
+
public static final String ENVELOPE_EVENTS = "envelope.events";
public static final String BODY_EVENTS = "body.events";
public static final String ENVELOPE_PREFIX = "envelope.prefix";
public static final String BODY_PREFIX = "body.prefix";
/**
- *
+ *
*/
public static class CheckClosingTagsInterceptor extends AbstractSoapInterceptor {
public CheckClosingTagsInterceptor() {
super(Phase.POST_LOGICAL);
}
-
+
/** {@inheritDoc}*/
public void handleMessage(SoapMessage message) throws Fault {
XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
@@ -91,7 +91,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
}
}
} catch (XMLStreamException e) {
- throw new SoapFault(e.getMessage(), e,
+ throw new SoapFault(e.getMessage(), e,
message.getVersion().getSender());
}
}
@@ -168,15 +168,15 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
}
try {
- if (xmlReader.getEventType() == XMLStreamConstants.START_ELEMENT
+ if (xmlReader.getEventType() == XMLStreamConstants.START_ELEMENT
|| xmlReader.nextTag() == XMLStreamConstants.START_ELEMENT) {
-
+
SoapVersion soapVersion = readVersion(xmlReader, message);
if (soapVersion == Soap12.getInstance()
&& version == Soap11.getInstance()) {
message.setVersion(version);
throw new SoapFault(new Message("INVALID_11_VERSION", LOG),
- version.getVersionMismatch());
+ version.getVersionMismatch());
}
XMLStreamReader filteredReader = new PartialXMLStreamReader(xmlReader, message.getVersion()
@@ -192,7 +192,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
doc = (Document)nd;
StaxUtils.readDocElements(doc, doc, filteredReader, false, false);
} else {
- final boolean addNC =
+ final boolean addNC =
MessageUtils.getContextualBoolean(
message, "org.apache.cxf.binding.soap.addNamespaceContext", false);
Map<String, String> bodyNC = addNC ? new HashMap<String, String>() : null;
@@ -284,14 +284,14 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
}
}
} catch (XMLStreamException e) {
- throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
+ throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
message.getVersion().getSender());
} finally {
if (closeNeeded) {
try {
StaxUtils.close(xmlReader);
} catch (XMLStreamException e) {
- throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
+ throw new SoapFault(new Message("XML_STREAM_EXC", LOG, e.getMessage()), e,
message.getVersion().getSender());
}
}
@@ -332,7 +332,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
private QName lastStartElementQName;
private String envelopePrefix;
private String bodyPrefix;
-
+
static {
try {
eventFactory = XMLEventFactory.newInstance();
@@ -451,7 +451,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
events.add(event);
}
}
-
+
public List<XMLEvent> getBodyAttributeAndNamespaceEvents() {
if (bodyEvents == null) {
return Collections.emptyList();
@@ -459,7 +459,7 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
return Collections.unmodifiableList(bodyEvents);
}
}
-
+
public List<XMLEvent> getEnvAttributeAndNamespaceEvents() {
if (envEvents == null) {
return Collections.emptyList();
@@ -467,11 +467,11 @@ public class ReadHeadersInterceptor extends AbstractSoapInterceptor {
return Collections.unmodifiableList(envEvents);
}
}
-
+
public String getEnvelopePrefix() {
return envelopePrefix;
}
-
+
public String getBodyPrefix() {
return bodyPrefix;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
index 2943f77..164e065 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultInInterceptor.java
@@ -40,7 +40,7 @@ import org.apache.cxf.staxutils.StaxUtils;
public class Soap11FaultInInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(Soap11FaultInInterceptor.class);
-
+
public Soap11FaultInInterceptor() {
super(Phase.UNMARSHAL);
addBefore(ClientFaultConverter.class.getName());
@@ -52,7 +52,7 @@ public class Soap11FaultInInterceptor extends AbstractSoapInterceptor {
message.setContent(Exception.class, unmarshalFault(message, reader));
}
- public static SoapFault unmarshalFault(SoapMessage message,
+ public static SoapFault unmarshalFault(SoapMessage message,
XMLStreamReader reader) {
String exMessage = "";
QName faultCode = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
index 8d6d24b..690e1a1 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
@@ -50,29 +50,29 @@ public class Soap11FaultOutInterceptor extends AbstractSoapInterceptor {
if (message.getVersion() == Soap11.getInstance()) {
message.getInterceptorChain().add(Soap11FaultOutInterceptorInternal.INSTANCE);
} else {
- message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
+ message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
}
}
-
+
static class Soap11FaultOutInterceptorInternal extends AbstractSoapInterceptor {
static final Soap11FaultOutInterceptorInternal INSTANCE = new Soap11FaultOutInterceptorInternal();
-
+
Soap11FaultOutInterceptorInternal() {
super(Phase.MARSHAL);
}
- public void handleMessage(SoapMessage message) throws Fault {
+ public void handleMessage(SoapMessage message) throws Fault {
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
Fault f = (Fault) message.getContent(Exception.class);
-
+
SoapFault fault = SoapFault.createFault(f, message.getVersion());
-
+
try {
Map<String, String> namespaces = fault.getNamespaces();
for (Map.Entry<String, String> e : namespaces.entrySet()) {
writer.writeNamespace(e.getKey(), e.getValue());
}
-
- String ns = message.getVersion().getNamespace();
+
+ String ns = message.getVersion().getNamespace();
String defaultPrefix = writer.getPrefix(ns);
if (defaultPrefix == null) {
defaultPrefix = StaxUtils.getUniquePrefix(writer, ns, false);
@@ -81,12 +81,12 @@ public class Soap11FaultOutInterceptor extends AbstractSoapInterceptor {
} else {
writer.writeStartElement(defaultPrefix, "Fault", ns);
}
-
+
writer.writeStartElement("faultcode");
-
+
String codeString = fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
defaultPrefix);
-
+
writer.writeCharacters(codeString);
writer.writeEndElement();
@@ -98,27 +98,27 @@ public class Soap11FaultOutInterceptor extends AbstractSoapInterceptor {
writer.writeCharacters(getFaultMessage(message, fault));
writer.writeEndElement();
prepareStackTrace(message, fault);
-
+
if (fault.getRole() != null) {
writer.writeStartElement("faultactor");
writer.writeCharacters(fault.getRole());
writer.writeEndElement();
}
-
+
if (fault.hasDetails()) {
Element detail = fault.getDetail();
writer.writeStartElement("detail");
-
+
Node node = detail.getFirstChild();
while (node != null) {
StaxUtils.writeNode(node, writer, true);
node = node.getNextSibling();
}
-
+
// Details
writer.writeEndElement();
}
-
+
// Fault
writer.writeEndElement();
} catch (Exception xe) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
index 5a3ada6..fdecf8b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultInInterceptor.java
@@ -51,7 +51,7 @@ import org.apache.cxf.staxutils.W3CDOMStreamReader;
public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(Soap12FaultInInterceptor.class);
-
+
public Soap12FaultInInterceptor() {
super(Phase.UNMARSHAL);
addBefore(ClientFaultConverter.class.getName());
@@ -66,7 +66,7 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
message.setContent(Exception.class, unmarshalFault(message, reader));
}
- public static SoapFault unmarshalFault(SoapMessage message,
+ public static SoapFault unmarshalFault(SoapMessage message,
XMLStreamReader reader) {
String exMessage = null;
QName faultCode = null;
@@ -78,11 +78,11 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
Map<String, String> ns = new HashMap<String, String>();
ns.put("s", Soap12.SOAP_NAMESPACE);
- XPathUtils xu = new XPathUtils(ns);
+ XPathUtils xu = new XPathUtils(ns);
try {
Node mainNode = message.getContent(Node.class);
Node fault = null;
-
+
if (reader instanceof W3CDOMStreamReader) {
W3CDOMStreamReader dr = (W3CDOMStreamReader)reader;
fault = dr.getCurrentElement();
@@ -100,15 +100,15 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
} else {
fault = StaxUtils.read(new FragmentStreamReader(reader));
}
- Element el = (Element)xu.getValue("//s:Fault/s:Code/s:Value",
- fault,
+ Element el = (Element)xu.getValue("//s:Fault/s:Code/s:Value",
+ fault,
XPathConstants.NODE);
if (el != null) {
faultCode = DOMUtils.createQName(el.getTextContent(), el);
}
-
- el = (Element)xu.getValue("//s:Fault/s:Code/s:Subcode",
- fault,
+
+ el = (Element)xu.getValue("//s:Fault/s:Code/s:Subcode",
+ fault,
XPathConstants.NODE);
if (el != null) {
subCodes = new LinkedList<QName>();
@@ -118,29 +118,29 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
subCodes.add(DOMUtils.createQName(v.getTextContent(), v));
}
}
-
- exMessage = (String) xu.getValue("//s:Fault/s:Reason/s:Text/text()",
+
+ exMessage = (String) xu.getValue("//s:Fault/s:Reason/s:Text/text()",
fault,
XPathConstants.STRING);
-
- lang = (String) xu.getValue("//s:Fault/s:Reason/s:Text/@xml:lang",
+
+ lang = (String) xu.getValue("//s:Fault/s:Reason/s:Text/@xml:lang",
fault,
XPathConstants.STRING);
-
+
Node detailNode = (Node) xu.getValue("//s:Fault/s:Detail",
fault,
XPathConstants.NODE);
if (detailNode != null) {
detail = (Element) detailNode;
}
-
- role = (String) xu.getValue("//s:Fault/s:Role/text()",
+
+ role = (String) xu.getValue("//s:Fault/s:Role/text()",
fault,
XPathConstants.STRING);
- node = (String) xu.getValue("//s:Fault/s:Node/text()",
+ node = (String) xu.getValue("//s:Fault/s:Node/text()",
fault,
- XPathConstants.STRING);
+ XPathConstants.STRING);
} catch (XMLStreamException e) {
throw new SoapFault("Could not parse message.",
e,
@@ -151,7 +151,7 @@ public class Soap12FaultInInterceptor extends AbstractSoapInterceptor {
faultCode = Soap12.getInstance().getReceiver();
exMessage = new Message("INVALID_FAULT", LOG).toString();
}
-
+
SoapFault fault = new SoapFault(exMessage, faultCode);
fault.setSubCodes(subCodes);
fault.setDetail(detail);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
index 9b54970..b68a27c 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap12FaultOutInterceptor.java
@@ -54,21 +54,21 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
message.getInterceptorChain().add(Soap12FaultOutInterceptorInternal.INSTANCE);
}
}
-
+
static class Soap12FaultOutInterceptorInternal extends AbstractSoapInterceptor {
static final Soap12FaultOutInterceptorInternal INSTANCE = new Soap12FaultOutInterceptorInternal();
-
+
Soap12FaultOutInterceptorInternal() {
super(Phase.MARSHAL);
}
public void handleMessage(SoapMessage message) throws Fault {
LOG.info(getClass() + (String) message.get(SoapMessage.CONTENT_TYPE));
-
+
XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
Fault f = (Fault)message.getContent(Exception.class);
message.put(org.apache.cxf.message.Message.RESPONSE_CODE, f.getStatusCode());
-
- SoapFault fault = SoapFault.createFault(f, message.getVersion());
+
+ SoapFault fault = SoapFault.createFault(f, message.getVersion());
try {
Map<String, String> namespaces = fault.getNamespaces();
@@ -88,8 +88,8 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
writer.writeStartElement(defaultPrefix, "Code", ns);
writer.writeStartElement(defaultPrefix, "Value", ns);
-
- writer.writeCharacters(fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
+
+ writer.writeCharacters(fault.getCodeString(getFaultCodePrefix(writer, fault.getFaultCode()),
defaultPrefix));
writer.writeEndElement();
@@ -98,7 +98,7 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
for (QName fsc : fault.getSubCodes()) {
writer.writeStartElement(defaultPrefix, "Subcode", ns);
writer.writeStartElement(defaultPrefix, "Value", ns);
- writer.writeCharacters(getCodeString(getFaultCodePrefix(writer, fsc),
+ writer.writeCharacters(getCodeString(getFaultCodePrefix(writer, fsc),
defaultPrefix, fsc));
writer.writeEndElement();
fscCount++;
@@ -127,7 +127,7 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
}
prepareStackTrace(message, fault);
-
+
if (fault.hasDetails()) {
Element detail = fault.getDetail();
writer.writeStartElement(defaultPrefix, "Detail", ns);
@@ -150,7 +150,7 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
}
}
- private String getLangCode() {
+ private String getLangCode() {
String code = LOG.getResourceBundle().getLocale().getLanguage();
if (StringUtils.isEmpty(code)) {
return "en";
@@ -169,8 +169,8 @@ public class Soap12FaultOutInterceptor extends AbstractSoapInterceptor {
} else {
codePrefix = prefix;
}
-
- return codePrefix + ":" + code.getLocalPart();
+
+ return codePrefix + ":" + code.getLocalPart();
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
index ca4af42..94e899b 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
@@ -44,24 +44,24 @@ import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.ws.addressing.JAXWSAConstants;
public class SoapActionInInterceptor extends AbstractSoapInterceptor {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(SoapActionInInterceptor.class);
private static final String ALLOW_NON_MATCHING_TO_DEFAULT = "allowNonMatchingToDefaultSoapAction";
private static final String CALCULATED_WSA_ACTION = SoapActionInInterceptor.class.getName() + ".ACTION";
-
+
public SoapActionInInterceptor() {
super(Phase.READ);
addAfter(ReadHeadersInterceptor.class.getName());
addAfter(EndpointSelectionInterceptor.class.getName());
}
-
+
public static String getSoapAction(Message m) {
if (!(m instanceof SoapMessage)) {
return null;
}
SoapMessage message = (SoapMessage)m;
if (message.getVersion() instanceof Soap11) {
- Map<String, List<String>> headers
+ Map<String, List<String>> headers
= CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers != null) {
List<String> sa = headers.get(SoapBindingConstants.SOAP_ACTION);
@@ -75,11 +75,11 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
} else if (message.getVersion() instanceof Soap12) {
String ct = (String) message.get(Message.CONTENT_TYPE);
-
+
if (ct == null) {
return null;
}
-
+
int start = ct.indexOf("action=");
if (start == -1 && ct.indexOf("multipart/related") == 0 && ct.indexOf("start-info") == -1) {
// the action property may not be found at the package's content-type for non-mtom multipart message
@@ -113,19 +113,19 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
return null;
}
-
+
public void handleMessage(SoapMessage message) throws Fault {
if (isRequestor(message)) {
return;
}
-
+
String action = getSoapAction(message);
if (!StringUtils.isEmpty(action)) {
getAndSetOperation(message, action);
message.put(SoapBindingConstants.SOAP_ACTION, action);
}
}
-
+
public static void getAndSetOperation(SoapMessage message, String action) {
getAndSetOperation(message, action, true);
}
@@ -133,15 +133,15 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
if (StringUtils.isEmpty(action)) {
return;
}
-
+
Exchange ex = message.getExchange();
Endpoint ep = ex.getEndpoint();
if (ep == null) {
return;
}
-
+
BindingOperationInfo bindingOp = null;
-
+
Collection<BindingOperationInfo> bops = ep.getEndpointInfo()
.getBinding().getOperations();
if (bops != null) {
@@ -162,7 +162,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
}
}
-
+
if (bindingOp == null) {
if (strict) {
//we didn't match the an operation, we'll try again later to make
@@ -173,7 +173,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
return;
}
-
+
ex.put(BindingOperationInfo.class, bindingOp);
}
private static boolean matchWSAAction(BindingOperationInfo boi, String action) {
@@ -188,7 +188,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
}
return false;
}
-
+
private static String getWSAAction(BindingOperationInfo boi) {
Object o = boi.getOperationInfo().getInput().getProperty(CALCULATED_WSA_ACTION);
if (o == null) {
@@ -232,7 +232,7 @@ public class SoapActionInInterceptor extends AbstractSoapInterceptor {
return buffer.toString();
}
-
+
public static class SoapActionInAttemptTwoInterceptor extends AbstractSoapInterceptor {
final String action;
public SoapActionInAttemptTwoInterceptor(String action) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
index 1a70d16..6cba304 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderInterceptor.java
@@ -65,7 +65,7 @@ import org.apache.cxf.wsdl.interceptors.DocLiteralInInterceptor;
public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(SoapHeaderInterceptor.class);
-
+
public SoapHeaderInterceptor() {
super(Phase.UNMARSHAL);
addAfter(BareInInterceptor.class.getName());
@@ -92,19 +92,19 @@ public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
if (bop.isUnwrapped()) {
bop = bop.getWrappedOperation();
}
-
+
boolean client = isRequestor(message);
BindingMessageInfo bmi = client ? bop.getOutput() : bop.getInput();
if (bmi == null) {
// one way operation.
return;
}
-
+
List<SoapHeaderInfo> headers = bmi.getExtensors(SoapHeaderInfo.class);
if (headers == null || headers.size() == 0) {
return;
}
-
+
boolean supportsNode = this.supportsDataReader(message, Node.class);
Service service = ServiceModelUtil.getService(message.getExchange());
for (SoapHeaderInfo header : headers) {
@@ -124,18 +124,18 @@ public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
if (mpi.getTypeClass() != null) {
Header param = findHeader(message, mpi);
-
+
Object object = null;
if (param != null) {
message.getHeaders().remove(param);
-
+
if (param.getDataBinding() == null) {
Node source = (Node)param.getObject();
if (source instanceof Element) {
//need to remove these attributes as they
//would cause validation failures
Element el = (Element)source;
-
+
el.removeAttributeNS(soapVersion.getNamespace(),
soapVersion.getAttrNameMustUnderstand());
el.removeAttributeNS(soapVersion.getNamespace(),
@@ -149,13 +149,13 @@ public class SoapHeaderInterceptor extends AbstractInDatabindingInterceptor {
reader.nextTag(); //advance into the first tag
} catch (XMLStreamException e) {
//ignore
- }
+ }
object = getDataReader(message, XMLStreamReader.class).read(mpi, reader);
}
} else {
object = param.getObject();
}
-
+
}
parameters.put(mpi, object);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
index 48e47a6..130a88e 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapHeaderOutFilterInterceptor.java
@@ -28,19 +28,19 @@ import org.apache.cxf.phase.Phase;
public class SoapHeaderOutFilterInterceptor extends AbstractSoapInterceptor {
public static final SoapHeaderOutFilterInterceptor INSTANCE = new SoapHeaderOutFilterInterceptor();
-
+
public SoapHeaderOutFilterInterceptor() {
super(Phase.PRE_LOGICAL);
}
public void handleMessage(SoapMessage message) throws Fault {
Iterator<Header> iter = message.getHeaders().iterator();
-
+
while (iter.hasNext()) {
Header hdr = iter.next();
//Only remove inbound marked headers..
if (hdr == null || hdr.getDirection() == Header.Direction.DIRECTION_IN) {
- iter.remove();
+ iter.remove();
}
}
}
[40/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java
index 9b25298..a81bdfb 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingMessage.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
public final class LoggingMessage {
public static final String ID_KEY = LoggingMessage.class.getName() + ".ID";
private static final AtomicInteger ID = new AtomicInteger();
-
+
private final String heading;
private final StringBuilder address;
private final StringBuilder contentType;
@@ -34,7 +34,7 @@ public final class LoggingMessage {
private final StringBuilder payload;
private final StringBuilder responseCode;
private final String id;
-
+
public LoggingMessage(String h, String i) {
heading = h;
@@ -49,16 +49,16 @@ public final class LoggingMessage {
payload = new StringBuilder();
responseCode = new StringBuilder();
}
-
+
public String getId() {
return id;
}
-
+
public static String nextId() {
return Integer.toString(ID.incrementAndGet());
}
-
-
+
+
public StringBuilder getAddress() {
return address;
}
@@ -70,7 +70,7 @@ public final class LoggingMessage {
public StringBuilder getHeader() {
return header;
}
-
+
public StringBuilder getHttpMethod() {
return httpMethod;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
index 043aa37..fb31ea0 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
@@ -43,14 +43,14 @@ import org.apache.cxf.phase.Phase;
public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
private static final Logger LOG = LogUtils.getLogger(LoggingOutInterceptor.class);
private static final String LOG_SETUP = LoggingOutInterceptor.class.getName() + ".log-setup";
-
+
public LoggingOutInterceptor(String phase) {
super(phase);
addBefore(StaxOutInterceptor.class.getName());
}
public LoggingOutInterceptor() {
this(Phase.PRE_STREAM);
- }
+ }
public LoggingOutInterceptor(int lim) {
this();
limit = lim;
@@ -60,7 +60,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
this();
this.writer = w;
}
-
+
public void handleMessage(Message message) throws Fault {
final OutputStream os = message.getContent(OutputStream.class);
@@ -90,26 +90,26 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
}
}
}
-
+
private LoggingMessage setupBuffer(Message message) {
String id = (String)message.getExchange().get(LoggingMessage.ID_KEY);
if (id == null) {
id = LoggingMessage.nextId();
message.getExchange().put(LoggingMessage.ID_KEY, id);
}
- final LoggingMessage buffer
+ final LoggingMessage buffer
= new LoggingMessage("Outbound Message\n---------------------------",
id);
-
+
Integer responseCode = (Integer)message.get(Message.RESPONSE_CODE);
if (responseCode != null) {
buffer.getResponseCode().append(responseCode);
}
-
+
String encoding = (String)message.get(Message.ENCODING);
if (encoding != null) {
buffer.getEncoding().append(encoding);
- }
+ }
String httpMethod = (String)message.get(Message.HTTP_REQUEST_METHOD);
if (httpMethod != null) {
buffer.getHttpMethod().append(httpMethod);
@@ -135,14 +135,14 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
}
return buffer;
}
-
+
private class LogWriter extends FilterWriter {
StringWriter out2;
int count;
Logger logger; //NOPMD
Message message;
final int lim;
-
+
LogWriter(Logger logger, Message message, Writer writer) {
super(writer);
this.logger = logger;
@@ -184,7 +184,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
}
String ct = (String)message.get(Message.CONTENT_TYPE);
try {
- writePayload(buffer.getPayload(), w2, ct);
+ writePayload(buffer.getPayload(), w2, ct);
} catch (Exception ex) {
//ignore
}
@@ -199,12 +199,12 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
}
class LoggingCallback implements CachedOutputStreamCallback {
-
+
private final Message message;
private final OutputStream origStream;
private final Logger logger; //NOPMD
private final int lim;
-
+
LoggingCallback(final Logger logger, final Message msg, final OutputStream os) {
this.logger = logger;
this.message = msg;
@@ -212,10 +212,10 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
this.lim = limit == -1 ? Integer.MAX_VALUE : limit;
}
- public void onFlush(CachedOutputStream cos) {
-
+ public void onFlush(CachedOutputStream cos) {
+
}
-
+
public void onClose(CachedOutputStream cos) {
LoggingMessage buffer = setupBuffer(message);
@@ -230,7 +230,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
log(logger, formatLoggingMessage(buffer));
return;
}
-
+
if (cos.getTempFile() == null) {
//buffer.append("Outbound Message:\n");
if (cos.size() >= lim) {
@@ -245,7 +245,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
}
try {
String encoding = (String)message.get(Message.ENCODING);
- writePayload(buffer.getPayload(), cos, encoding, ct);
+ writePayload(buffer.getPayload(), cos, encoding, ct);
} catch (Exception ex) {
//ignore
}
@@ -265,7 +265,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
@Override
protected Logger getLogger() {
return LOG;
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
index e7278ea..d2558cd 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/MessageSenderInterceptor.java
@@ -35,8 +35,8 @@ import org.apache.cxf.transport.Conduit;
public class MessageSenderInterceptor extends AbstractPhaseInterceptor<Message> {
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(MessageSenderInterceptor.class);
private MessageSenderEndingInterceptor ending = new MessageSenderEndingInterceptor();
-
-
+
+
public MessageSenderInterceptor() {
super(Phase.PREPARE_SEND);
}
@@ -46,12 +46,12 @@ public class MessageSenderInterceptor extends AbstractPhaseInterceptor<Message>
getConduit(message).prepare(message);
} catch (IOException ex) {
throw new Fault(new org.apache.cxf.common.i18n.Message("COULD_NOT_SEND", BUNDLE), ex);
- }
-
+ }
+
// Add a final interceptor to close the conduit
message.getInterceptorChain().add(ending);
}
-
+
public static class MessageSenderEndingInterceptor extends AbstractPhaseInterceptor<Message> {
public MessageSenderEndingInterceptor() {
super(Phase.PREPARE_SEND_ENDING);
@@ -65,7 +65,7 @@ public class MessageSenderInterceptor extends AbstractPhaseInterceptor<Message>
}
}
}
-
+
public static Conduit getConduit(Message message) {
Exchange exchange = message.getExchange();
Conduit conduit = exchange.getConduit(message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
index 1ae2e94..7764f94 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
@@ -39,13 +39,13 @@ import org.apache.cxf.workqueue.WorkQueueManager;
/**
- *
+ *
*/
public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message> {
- public static final String USE_ORIGINAL_THREAD
- = OneWayProcessorInterceptor.class.getName() + ".USE_ORIGINAL_THREAD";
+ public static final String USE_ORIGINAL_THREAD
+ = OneWayProcessorInterceptor.class.getName() + ".USE_ORIGINAL_THREAD";
private static final Logger LOG = LogUtils.getL7dLogger(OneWayProcessorInterceptor.class);
-
+
public OneWayProcessorInterceptor() {
super(Phase.PRE_LOGICAL);
}
@@ -53,7 +53,7 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message
super(phase);
}
public void handleFault(Message message) {
- if (message.getExchange().isOneWay()
+ if (message.getExchange().isOneWay()
&& !isRequestor(message)) {
//in a one way, if an exception is thrown, the stream needs to be closed
InputStream in = message.getContent(InputStream.class);
@@ -64,37 +64,37 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message
//ignore
}
}
-
+
}
}
public void handleMessage(Message message) throws Fault {
-
- if (message.getExchange().isOneWay()
+
+ if (message.getExchange().isOneWay()
&& !isRequestor(message)
&& message.get(OneWayProcessorInterceptor.class) == null
- && message.getExchange().get(Executor.class) == null) {
+ && message.getExchange().get(Executor.class) == null) {
//one way on server side, fork the rest of this chain onto the
//workqueue, call the Outgoing chain directly.
-
+
message.put(OneWayProcessorInterceptor.class, this);
final InterceptorChain chain = message.getInterceptorChain();
- boolean robust =
+ boolean robust =
MessageUtils.isTrue(message.getContextualProperty(Message.ROBUST_ONEWAY));
- boolean useOriginalThread =
+ boolean useOriginalThread =
MessageUtils.isTrue(message.getContextualProperty(USE_ORIGINAL_THREAD));
-
+
if (!useOriginalThread && !robust) {
//need to suck in all the data from the input stream as
- //the transport might discard any data on the stream when this
+ //the transport might discard any data on the stream when this
//thread unwinds or when the empty response is sent back
DelegatingInputStream in = message.getContent(DelegatingInputStream.class);
if (in != null) {
in.cacheInput();
}
}
-
+
if (robust) {
// continue to invoke the chain
chain.pause();
@@ -104,7 +104,7 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message
return;
}
}
-
+
try {
Message partial = createMessage(message.getExchange());
partial.remove(Message.CONTENT_TYPE);
@@ -122,7 +122,7 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message
} catch (IOException e) {
//IGNORE
}
-
+
if (!useOriginalThread && !robust) {
chain.pause();
try {
@@ -138,13 +138,13 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message
}
});
//wait a few milliseconds for the background thread to start processing
- //Mostly just to make an attempt at keeping the ordering of the
+ //Mostly just to make an attempt at keeping the ordering of the
//messages coming in from a client. Not guaranteed though.
lock.wait(20);
}
} catch (RejectedExecutionException e) {
LOG.warning(
- "Executor queue is full, run the oneway invocation task in caller thread."
+ "Executor queue is full, run the oneway invocation task in caller thread."
+ " Users can specify a larger executor queue to avoid this.");
// only block the thread if the prop is unset or set to false, otherwise let it go
if (!MessageUtils.isTrue(
@@ -153,14 +153,14 @@ public class OneWayProcessorInterceptor extends AbstractPhaseInterceptor<Message
//the executor queue is full, so run the task in the caller thread
chain.unpause();
}
-
+
} catch (InterruptedException e) {
//ignore - likely a busy work queue so we'll just let the one-way go
}
}
}
}
-
+
private static Message createMessage(Exchange exchange) {
Endpoint ep = exchange.getEndpoint();
Message msg = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java b/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
index 60fadc8..022a356 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
@@ -51,19 +51,19 @@ public class OutFaultChainInitiatorObserver extends AbstractFaultChainInitiatorO
if (e.getService().getDataBinding() instanceof InterceptorProvider) {
chain.add(((InterceptorProvider)e.getService().getDataBinding()).getOutFaultInterceptors());
}
-
+
addToChain(chain, ex.getInMessage());
addToChain(chain, ex.getOutFaultMessage());
}
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.getOutFaultInterceptors());
}
}
- Collection<Interceptor<? extends Message>> is
+ Collection<Interceptor<? extends Message>> is
= CastUtils.cast((Collection<?>)m.get(Message.FAULT_OUT_INTERCEPTORS));
if (is != null) {
chain.add(is);
@@ -72,7 +72,7 @@ public class OutFaultChainInitiatorObserver extends AbstractFaultChainInitiatorO
chain.add(((InterceptorProvider)m.getDestination()).getOutFaultInterceptors());
}
}
-
+
protected SortedSet<Phase> getPhases() {
return getBus().getExtension(PhaseManager.class).getOutPhases();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/OutFaultInterceptors.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/OutFaultInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/OutFaultInterceptors.java
index 408f88a..7e5493a 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/OutFaultInterceptors.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/OutFaultInterceptors.java
@@ -27,16 +27,16 @@ import java.lang.annotation.Target;
import org.apache.cxf.message.Message;
/**
- * Specifies a list of classes that are added to the outbound fault
- * interceptor chain. This annotation effects SEI classes and service
+ * Specifies a list of classes that are added to the outbound fault
+ * interceptor chain. This annotation effects SEI classes and service
* implementation classes.
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface OutFaultInterceptors {
-
+
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/OutInterceptors.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/OutInterceptors.java b/core/src/main/java/org/apache/cxf/interceptor/OutInterceptors.java
index 63d7310..4885da2 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/OutInterceptors.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/OutInterceptors.java
@@ -28,16 +28,16 @@ import org.apache.cxf.message.Message;
/**
- * Specifies a list of classes that are added to the outbound
- * interceptor chain. This annotation effects SEI classes and service
+ * Specifies a list of classes that are added to the outbound
+ * interceptor chain. This annotation effects SEI classes and service
* implementation classes.
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface OutInterceptors {
-
+
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/OutgoingChainInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
index 2382a25..715291e 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java
@@ -49,7 +49,7 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
private static final Logger LOG = LogUtils.getL7dLogger(OutgoingChainInterceptor.class);
private static final String CACHE_INPUT_PROPERTY = "cxf.io.cacheinput";
private PhaseChainCache chainCache = new PhaseChainCache();
-
+
public OutgoingChainInterceptor() {
super(Phase.POST_INVOKE);
}
@@ -58,8 +58,8 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
Exchange ex = message.getExchange();
BindingOperationInfo binding = ex.getBindingOperationInfo();
//if we get this far, we're going to be outputting some valid content, but we COULD
- //also be "echoing" some of the content from the input. Thus, we need to
- //mark it as requiring the input to be cached.
+ //also be "echoing" some of the content from the input. Thus, we need to
+ //mark it as requiring the input to be cached.
if (message.getExchange().get(CACHE_INPUT_PROPERTY) == null) {
message.put(CACHE_INPUT_PROPERTY, Boolean.TRUE);
}
@@ -74,7 +74,7 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
out.put(MessageInfo.class, binding.getOperationInfo().getOutput());
out.put(BindingMessageInfo.class, binding.getOutput());
}
-
+
InterceptorChain outChain = out.getInterceptorChain();
if (outChain == null) {
outChain = OutgoingChainInterceptor.getChain(ex, chainCache);
@@ -84,10 +84,10 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
return;
}
outChain.doIntercept(out);
-
+
}
}
-
+
private void closeInput(Message message) {
InputStream is = message.getContent(InputStream.class);
if (is != null) {
@@ -107,7 +107,7 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
&& ex.getDestination() != null) {
try {
conduit = ex.getDestination().getBackChannel(ex.getInMessage());
- ex.put(ConduitSelector.class,
+ ex.put(ConduitSelector.class,
new PreexistingConduitSelector(conduit, ex.getEndpoint()));
} catch (IOException e) {
// TODO Auto-generated catch block
@@ -116,13 +116,13 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
}
return conduit;
}
-
+
public static InterceptorChain getOutInterceptorChain(Exchange ex) {
Bus bus = ex.getBus();
Binding binding = ex.getBinding();
PhaseManager pm = bus.getExtension(PhaseManager.class);
PhaseInterceptorChain chain = new PhaseInterceptorChain(pm.getOutPhases());
-
+
Endpoint ep = ex.getEndpoint();
List<Interceptor<? extends Message>> il = ep.getOutInterceptors();
if (LOG.isLoggable(Level.FINE)) {
@@ -138,7 +138,7 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Interceptors contributed by bus: " + il);
}
- chain.add(il);
+ chain.add(il);
if (binding != null) {
il = binding.getOutInterceptors();
if (LOG.isLoggable(Level.FINE)) {
@@ -158,14 +158,14 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
if (m == null) {
return;
}
- Collection<InterceptorProvider> providers
+ Collection<InterceptorProvider> providers
= CastUtils.cast((Collection<?>)m.get(Message.INTERCEPTOR_PROVIDERS));
if (providers != null) {
for (InterceptorProvider p : providers) {
chain.add(p.getOutInterceptors());
}
}
- Collection<Interceptor<? extends Message>> is
+ Collection<Interceptor<? extends Message>> is
= CastUtils.cast((Collection<?>)m.get(Message.OUT_INTERCEPTORS));
if (is != null) {
chain.add(is);
@@ -174,13 +174,13 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
chain.add(((InterceptorProvider)m.getDestination()).getOutInterceptors());
}
}
-
+
private static PhaseInterceptorChain getChain(Exchange ex, PhaseChainCache chainCache) {
Bus bus = ex.getBus();
Binding binding = ex.getBinding();
-
+
Endpoint ep = ex.getEndpoint();
-
+
List<Interceptor<? extends Message>> i1 = bus.getOutInterceptors();
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Interceptors contributed by bus: " + i1);
@@ -222,12 +222,12 @@ public class OutgoingChainInterceptor extends AbstractPhaseInterceptor<Message>
chain = chainCache.get(bus.getExtension(PhaseManager.class).getOutPhases(),
i1, i2, i3);
}
-
+
modifyChain(chain, ex);
chain.setFaultObserver(ep.getOutFaultObserver());
return chain;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
index 7057a31..5fee966 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/ServiceInvokerInterceptor.java
@@ -41,7 +41,7 @@ import org.apache.cxf.service.invoker.Invoker;
* the Exchange.
*/
public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message> {
-
+
public ServiceInvokerInterceptor() {
super(Phase.INVOKE);
}
@@ -50,7 +50,7 @@ public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message>
final Exchange exchange = message.getExchange();
final Endpoint endpoint = exchange.getEndpoint();
final Service service = endpoint.getService();
- final Invoker invoker = service.getInvoker();
+ final Invoker invoker = service.getInvoker();
Runnable invocation = new Runnable() {
@@ -59,7 +59,7 @@ public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message>
Object result = invoker.invoke(runableEx, getInvokee(message));
if (!exchange.isOneWay()) {
Endpoint ep = exchange.getEndpoint();
-
+
Message outMessage = runableEx.getOutMessage();
if (outMessage == null) {
outMessage = new MessageImpl();
@@ -77,17 +77,17 @@ public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message>
} else if (result.getClass().isArray()) {
resList = new MessageContentsList((Object[])result);
} else {
- outMessage.setContent(Object.class, result);
+ outMessage.setContent(Object.class, result);
}
if (resList != null) {
outMessage.setContent(List.class, resList);
}
- }
+ }
}
}
};
-
+
Executor executor = getExecutor(endpoint);
Executor executor2 = exchange.get(Executor.class);
if (executor2 == executor || executor == null
@@ -101,9 +101,9 @@ public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message>
// synchronized PhaseInterceptorChain methods the current thread
// needs to release the chain lock and re-acquire it after the
// executor thread is done
-
+
final PhaseInterceptorChain chain = (PhaseInterceptorChain)message.getInterceptorChain();
- final AtomicBoolean contextSwitched = new AtomicBoolean();
+ final AtomicBoolean contextSwitched = new AtomicBoolean();
final FutureTask<Object> o = new FutureTask<Object>(invocation, null) {
@Override
protected void done() {
@@ -114,14 +114,14 @@ public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message>
}
chain.releaseChain();
}
-
+
@Override
public void run() {
if (PhaseInterceptorChain.setCurrentMessage(chain, message)) {
contextSwitched.set(true);
message.put(Message.THREAD_CONTEXT_SWITCHED, true);
}
-
+
synchronized (chain) {
super.run();
}
@@ -146,7 +146,7 @@ public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message>
}
}
}
-
+
private Object getInvokee(Message message) {
Object invokee = message.getContent(List.class);
if (invokee == null) {
@@ -162,12 +162,12 @@ public class ServiceInvokerInterceptor extends AbstractPhaseInterceptor<Message>
private Executor getExecutor(final Endpoint endpoint) {
return endpoint.getService().getExecutor();
}
-
- private void copyJaxwsProperties(Message inMsg, Message outMsg) {
+
+ private void copyJaxwsProperties(Message inMsg, Message outMsg) {
outMsg.put(Message.WSDL_OPERATION, inMsg.get(Message.WSDL_OPERATION));
outMsg.put(Message.WSDL_SERVICE, inMsg.get(Message.WSDL_SERVICE));
outMsg.put(Message.WSDL_INTERFACE, inMsg.get(Message.WSDL_INTERFACE));
outMsg.put(Message.WSDL_PORT, inMsg.get(Message.WSDL_PORT));
outMsg.put(Message.WSDL_DESCRIPTION, inMsg.get(Message.WSDL_DESCRIPTION));
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java
index 87006cf..14818f8 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxInEndingInterceptor.java
@@ -32,9 +32,9 @@ public class StaxInEndingInterceptor extends AbstractPhaseInterceptor<Message> {
//certain usages of CXF may require the Stax stream to remain open (example: streaming the stax stuff
//directly to the client applications). Provide a flag to turn off.
public static final String STAX_IN_NOCLOSE = StaxInEndingInterceptor.class.getName() + ".dontClose";
-
+
public static final StaxInEndingInterceptor INSTANCE = new StaxInEndingInterceptor();
-
+
public StaxInEndingInterceptor() {
super(Phase.PRE_INVOKE);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
index 2893212..8c1e035 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
@@ -47,10 +47,10 @@ import org.apache.cxf.staxutils.StaxUtils;
* Creates an XMLStreamReader from the InputStream on the Message.
*/
public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
-
- private static final Logger LOG = LogUtils.getL7dLogger(StaxInInterceptor.class);
- private static Map<Object, XMLInputFactory> factories = new HashMap<Object, XMLInputFactory>();
+ private static final Logger LOG = LogUtils.getL7dLogger(StaxInInterceptor.class);
+
+ private static Map<Object, XMLInputFactory> factories = new HashMap<Object, XMLInputFactory>();
public StaxInInterceptor() {
super(Phase.POST_STREAM);
@@ -73,8 +73,8 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
}
}
String contentType = (String)message.get(Message.CONTENT_TYPE);
-
- if (contentType != null
+
+ if (contentType != null
&& contentType.contains("text/html")
&& MessageUtils.isRequestor(message)) {
StringBuilder htmlMessage = new StringBuilder(1024);
@@ -108,7 +108,7 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
.getHeader(m, HttpHeaderHelper.TRANSFER_ENCODING);
if ((StringUtils.isEmpty(contentLen) || "0".equals(contentLen.get(0)))
&& StringUtils.isEmpty(contentTE)
- && (StringUtils.isEmpty(transferEncoding)
+ && (StringUtils.isEmpty(transferEncoding)
|| !"chunked".equalsIgnoreCase(transferEncoding.get(0)))) {
return;
}
@@ -133,7 +133,7 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
} else {
xreader = factory.createXMLStreamReader(is, encoding);
}
- }
+ }
}
xreader = StaxUtils.configureReader(xreader, message);
} catch (XMLStreamException e) {
@@ -145,7 +145,7 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
message.getInterceptorChain().add(StaxInEndingInterceptor.INSTANCE);
}
-
+
public static XMLInputFactory getXMLInputFactory(Message m) throws Fault {
Object o = m.getContextualProperty(XMLInputFactory.class.getName());
if (o instanceof XMLInputFactory) {
@@ -164,7 +164,7 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
}
} else {
throw new Fault(
- new org.apache.cxf.common.i18n.Message("INVALID_INPUT_FACTORY",
+ new org.apache.cxf.common.i18n.Message("INVALID_INPUT_FACTORY",
LOG, o));
}
@@ -178,7 +178,7 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
}
}
return xif;
- }
+ }
return null;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java
index 889ee86..ed6bfa6 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxOutEndingInterceptor.java
@@ -34,10 +34,10 @@ import org.apache.cxf.staxutils.StaxUtils;
public class StaxOutEndingInterceptor extends AbstractPhaseInterceptor<Message> {
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(StaxOutEndingInterceptor.class);
-
+
private String outStreamHolder;
private String writerHolder;
-
+
public StaxOutEndingInterceptor(String outStreamHolder) {
this(outStreamHolder, null);
}
@@ -57,9 +57,9 @@ public class StaxOutEndingInterceptor extends AbstractPhaseInterceptor<Message>
xtw.flush();
} finally {
StaxUtils.close(xtw);
- }
+ }
}
-
+
OutputStream os = (OutputStream)message.get(outStreamHolder);
if (os != null) {
message.setContent(OutputStream.class, os);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
index e90f2b52..a4505bc 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
@@ -48,13 +48,13 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
public static final String OUTPUT_STREAM_HOLDER = StaxOutInterceptor.class.getName() + ".outputstream";
public static final String WRITER_HOLDER = StaxOutInterceptor.class.getName() + ".writer";
public static final String FORCE_START_DOCUMENT = "org.apache.cxf.stax.force-start-document";
- public static final StaxOutEndingInterceptor ENDING
+ public static final StaxOutEndingInterceptor ENDING
= new StaxOutEndingInterceptor(OUTPUT_STREAM_HOLDER, WRITER_HOLDER);
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(StaxOutInterceptor.class);
private static Map<Object, XMLOutputFactory> factories = new HashMap<Object, XMLOutputFactory>();
-
+
public StaxOutInterceptor() {
super(Phase.PRE_STREAM);
addAfter(AttachmentOutInterceptor.class.getName());
@@ -73,7 +73,7 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
String encoding = getEncoding(message);
-
+
try {
XMLOutputFactory factory = getXMLOutputFactory(message);
if (factory == null) {
@@ -108,7 +108,7 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
// Add a final interceptor to write end elements
message.getInterceptorChain().add(ENDING);
}
-
+
private OutputStream setupOutputStream(OutputStream os) {
if (!(os instanceof AbstractWrappedOutputStream)) {
os = new AbstractWrappedOutputStream(os) { };
@@ -137,7 +137,7 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
encoding = (String) ex.getInMessage().get(Message.ENCODING);
message.put(Message.ENCODING, encoding);
}
-
+
if (encoding == null) {
encoding = StandardCharsets.UTF_8.name();
message.put(Message.ENCODING, encoding);
@@ -165,7 +165,7 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
throw new Fault(e);
}
} else {
- throw new Fault(new org.apache.cxf.common.i18n.Message("INVALID_INPUT_FACTORY",
+ throw new Fault(new org.apache.cxf.common.i18n.Message("INVALID_INPUT_FACTORY",
BUNDLE, o));
}
@@ -185,5 +185,5 @@ public class StaxOutInterceptor extends AbstractPhaseInterceptor<Message> {
}
return null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
index e1b323e..7528763 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractAuthorizingInInterceptor.java
@@ -38,7 +38,7 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte
private static final Logger LOG = LogUtils.getL7dLogger(AbstractAuthorizingInInterceptor.class);
private static final String ALL_ROLES = "*";
private boolean allowAnonymousUsers = true;
-
+
public AbstractAuthorizingInInterceptor() {
this(true);
}
@@ -55,18 +55,18 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte
} else if (!isMethodProtected(method) && isAllowAnonymousUsers()) {
return;
}
-
-
+
+
throw new AccessDeniedException("Unauthorized");
}
-
+
protected Method getTargetMethod(Message m) {
BindingOperationInfo bop = m.getExchange().getBindingOperationInfo();
if (bop != null) {
- MethodDispatcher md = (MethodDispatcher)
+ MethodDispatcher md = (MethodDispatcher)
m.getExchange().getService().get(MethodDispatcher.class.getName());
return md.getMethod(bop);
- }
+ }
Method method = (Method)m.get("org.apache.cxf.resource.method");
if (method != null) {
return method;
@@ -77,12 +77,12 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte
protected boolean authorize(SecurityContext sc, Method method) {
List<String> expectedRoles = getExpectedRoles(method);
if (expectedRoles.isEmpty()) {
-
+
List<String> denyRoles = getDenyRoles(method);
-
+
return denyRoles.isEmpty() ? true : isUserInRole(sc, denyRoles, true);
}
-
+
if (isUserInRole(sc, expectedRoles, false)) {
return true;
}
@@ -94,13 +94,13 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte
protected boolean isMethodProtected(Method method) {
return !getExpectedRoles(method).isEmpty() || !getDenyRoles(method).isEmpty();
}
-
+
protected boolean isUserInRole(SecurityContext sc, List<String> roles, boolean deny) {
-
+
if (roles.size() == 1 && ALL_ROLES.equals(roles.get(0))) {
return !deny;
}
-
+
for (String role : roles) {
if (sc.isUserInRole(role)) {
return !deny;
@@ -108,17 +108,17 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte
}
return deny;
}
-
+
/**
- * Returns a list of expected roles for a given method.
+ * Returns a list of expected roles for a given method.
* @param method Method
* @return list, empty if no roles are available
*/
protected abstract List<String> getExpectedRoles(Method method);
-
-
+
+
/**
- * Returns a list of roles to be denied for a given method.
+ * Returns a list of roles to be denied for a given method.
* @param method Method
* @return list, empty if no roles are available
*/
@@ -133,5 +133,5 @@ public abstract class AbstractAuthorizingInInterceptor extends AbstractPhaseInte
public void setAllowAnonymousUsers(boolean allowAnonymousUsers) {
this.allowAnonymousUsers = allowAnonymousUsers;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java
index 4dbc474..76fd924 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractSecurityContextInInterceptor.java
@@ -34,40 +34,40 @@ import org.apache.cxf.security.SecurityContext;
public abstract class AbstractSecurityContextInInterceptor extends AbstractPhaseInterceptor<Message> {
- private static final Logger LOG =
+ private static final Logger LOG =
LogUtils.getL7dLogger(AbstractSecurityContextInInterceptor.class);
-
+
public AbstractSecurityContextInInterceptor() {
super(Phase.PRE_INVOKE);
}
-
+
public void handleMessage(Message message) throws Fault {
SecurityToken token = message.get(SecurityToken.class);
if (token == null) {
reportSecurityException("Security Token is not available on the current message");
}
-
+
SecurityContext context = message.get(SecurityContext.class);
if (context == null || context.getUserPrincipal() == null) {
reportSecurityException("User Principal is not available on the current message");
}
-
+
Subject subject = null;
try {
subject = createSubject(token);
} catch (Exception ex) {
- reportSecurityException("Failed Authentication : Subject has not been created, "
- + ex.getMessage());
+ reportSecurityException("Failed Authentication : Subject has not been created, "
+ + ex.getMessage());
}
if (subject == null || subject.getPrincipals().size() == 0) {
reportSecurityException("Failed Authentication : Invalid Subject");
}
-
- Principal principal = getPrincipal(context.getUserPrincipal(), subject);
+
+ Principal principal = getPrincipal(context.getUserPrincipal(), subject);
SecurityContext sc = createSecurityContext(principal, subject);
message.put(SecurityContext.class, sc);
}
-
+
protected Principal getPrincipal(Principal originalPrincipal, Subject subject) {
Principal[] ps = subject.getPrincipals().toArray(new Principal[subject.getPrincipals().size()]);
if (ps != null && ps.length > 0 && !(ps[0] instanceof Group)) {
@@ -76,13 +76,13 @@ public abstract class AbstractSecurityContextInInterceptor extends AbstractPhase
return originalPrincipal;
}
}
-
+
protected SecurityContext createSecurityContext(Principal p, Subject subject) {
return new DefaultSecurityContext(p, subject);
}
-
+
protected abstract Subject createSubject(SecurityToken token);
-
+
protected void reportSecurityException(String errorMessage) {
LOG.severe(errorMessage);
throw new SecurityException(errorMessage);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/AbstractUsernameTokenInInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractUsernameTokenInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractUsernameTokenInInterceptor.java
index 1c30cc0..e908579 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/AbstractUsernameTokenInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/AbstractUsernameTokenInInterceptor.java
@@ -25,7 +25,7 @@ import org.apache.cxf.common.security.TokenType;
import org.apache.cxf.common.security.UsernameToken;
public abstract class AbstractUsernameTokenInInterceptor extends AbstractSecurityContextInInterceptor {
-
+
protected Subject createSubject(SecurityToken token) {
if (token.getTokenType() != TokenType.UsernameToken) {
reportSecurityException("Unsupported token type " + token.getTokenType().toString());
@@ -33,8 +33,8 @@ public abstract class AbstractUsernameTokenInInterceptor extends AbstractSecurit
UsernameToken ut = (UsernameToken)token;
return createSubject(ut);
}
-
+
protected abstract Subject createSubject(UsernameToken token);
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/AuthenticationException.java b/core/src/main/java/org/apache/cxf/interceptor/security/AuthenticationException.java
index 809344a..b6a9d17 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/AuthenticationException.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/AuthenticationException.java
@@ -23,7 +23,7 @@ public class AuthenticationException extends SecurityException {
public AuthenticationException() {
}
-
+
public AuthenticationException(String reason) {
super(reason);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java b/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java
index 1a3b3ad..225298e 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java
@@ -32,24 +32,24 @@ import org.apache.cxf.security.LoginSecurityContext;
* SecurityContext which implements isUserInRole using the
* following approach : skip the first Subject principal, and then checks
* Groups the principal is a member of
- *
+ *
* TODO : consider moving this class into a rt-core-security module
*/
public class DefaultSecurityContext implements LoginSecurityContext {
private Principal p;
- private Subject subject;
-
+ private Subject subject;
+
public DefaultSecurityContext(Subject subject) {
this.p = findPrincipal(null, subject);
this.subject = subject;
}
-
+
public DefaultSecurityContext(String principalName, Subject subject) {
this.p = findPrincipal(principalName, subject);
this.subject = subject;
}
-
+
public DefaultSecurityContext(Principal p, Subject subject) {
this.p = p;
this.subject = subject;
@@ -57,35 +57,35 @@ public class DefaultSecurityContext implements LoginSecurityContext {
this.p = findPrincipal(null, subject);
}
}
-
+
private static Principal findPrincipal(String principalName, Subject subject) {
if (subject == null) {
return null;
}
-
+
for (Principal principal : subject.getPrincipals()) {
- if (!(principal instanceof Group)
+ if (!(principal instanceof Group)
&& (principalName == null || principal.getName().equals(principalName))) {
return principal;
}
}
-
+
// No match for the principalName. Just return first non-Group Principal
if (principalName != null) {
for (Principal principal : subject.getPrincipals()) {
- if (!(principal instanceof Group)) {
+ if (!(principal instanceof Group)) {
return principal;
}
}
}
-
+
return null;
}
-
+
public Principal getUserPrincipal() {
return p;
}
-
+
public boolean isUserInRole(String role) {
if (subject != null) {
for (Principal principal : subject.getPrincipals()) {
@@ -104,19 +104,19 @@ public class DefaultSecurityContext implements LoginSecurityContext {
if (group.getName().equals(role)) {
return true;
}
-
+
for (Enumeration<? extends Principal> members = group.members(); members.hasMoreElements();) {
// this might be a plain role but could represent a group consisting of other groups/roles
Principal member = members.nextElement();
- if (member.getName().equals(role)
+ if (member.getName().equals(role)
|| member instanceof Group && checkGroup((Group)member, role)) {
return true;
}
}
- return false;
+ return false;
}
-
+
public Subject getSubject() {
return subject;
}
@@ -125,7 +125,7 @@ public class DefaultSecurityContext implements LoginSecurityContext {
Set<Principal> roles = new HashSet<>();
if (subject != null) {
for (Principal principal : subject.getPrincipals()) {
- if (principal != p) {
+ if (principal != p) {
roles.add(principal);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java
index 3a9b5ae..fe42b1f 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/DelegatingAuthenticationInterceptor.java
@@ -29,33 +29,33 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
public class DelegatingAuthenticationInterceptor extends AbstractPhaseInterceptor<Message> {
-
+
private static final String AUTHORIZATION_HEADER = "Authorization";
-
- private Map<String, Interceptor<Message>> authenticationHandlers = Collections.emptyMap();
-
+
+ private Map<String, Interceptor<Message>> authenticationHandlers = Collections.emptyMap();
+
public DelegatingAuthenticationInterceptor() {
super(Phase.UNMARSHAL);
}
-
+
public DelegatingAuthenticationInterceptor(String phase) {
super(phase);
}
-
+
public void handleMessage(Message message) throws Fault {
-
+
String scheme = getAuthenticationScheme(message);
Interceptor<Message> handler = authenticationHandlers.get(scheme);
if (handler == null) {
throw new AuthenticationException();
- }
+ }
handler.handleMessage(message);
}
public void setSchemeHandlers(Map<String, Interceptor<Message>> handlers) {
this.authenticationHandlers = handlers;
}
-
+
protected String getAuthenticationScheme(Message message) {
Map<String, String> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
if (headers == null || !headers.containsKey(AUTHORIZATION_HEADER)) {
@@ -63,5 +63,5 @@ public class DelegatingAuthenticationInterceptor extends AbstractPhaseIntercepto
}
return headers.get(AUTHORIZATION_HEADER).split(" ")[0].trim();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/DepthRestrictingStreamInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/DepthRestrictingStreamInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/DepthRestrictingStreamInterceptor.java
index 8dcb3cf..c3b9383 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/DepthRestrictingStreamInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/DepthRestrictingStreamInterceptor.java
@@ -41,36 +41,36 @@ public class DepthRestrictingStreamInterceptor extends AbstractPhaseInterceptor<
private int elementCountThreshold = 2000;
private int innerElementLevelThreshold = 20;
private int innerElementCountThreshold = 50;
-
+
public DepthRestrictingStreamInterceptor() {
this(Phase.POST_STREAM);
addAfter(StaxInInterceptor.class.getName());
}
-
+
public DepthRestrictingStreamInterceptor(String phase) {
super(phase);
}
-
+
public DepthRestrictingStreamInterceptor(String phase, List<String> after) {
super(phase);
if (after != null) {
addAfter(after);
}
}
-
+
public DepthRestrictingStreamInterceptor(String phase, List<String> before, List<String> after) {
this(phase, after);
if (before != null) {
addBefore(before);
}
}
-
+
public void handleMessage(Message message) {
-
+
if (canBeIgnored(message)) {
return;
}
-
+
XMLStreamReader reader = message.getContent(XMLStreamReader.class);
if (reader == null) {
InputStream is = message.getContent(InputStream.class);
@@ -82,9 +82,9 @@ public class DepthRestrictingStreamInterceptor extends AbstractPhaseInterceptor<
return;
}
}
- DepthRestrictingStreamReader dr =
+ DepthRestrictingStreamReader dr =
new DepthRestrictingStreamReader(reader,
- elementCountThreshold,
+ elementCountThreshold,
innerElementLevelThreshold,
innerElementCountThreshold);
message.setContent(XMLStreamReader.class, dr);
@@ -95,9 +95,9 @@ public class DepthRestrictingStreamInterceptor extends AbstractPhaseInterceptor<
String ct = (String)message.get(Message.CONTENT_TYPE);
return ct != null && !ct.contains(XML_SUB_TYPE);
}
-
+
/**
- * Sets the acceptable total number of elements in the XML payload
+ * Sets the acceptable total number of elements in the XML payload
* @param elementCountThreshold
*/
public void setElementCountThreshold(int elementCountThreshold) {
@@ -109,7 +109,7 @@ public class DepthRestrictingStreamInterceptor extends AbstractPhaseInterceptor<
}
/**
- * Sets the acceptable total stack depth in the XML payload
+ * Sets the acceptable total stack depth in the XML payload
* @param elementLevelThreshold
*/
public void setInnerElementLevelThreshold(int elementLevelThreshold) {
@@ -121,7 +121,7 @@ public class DepthRestrictingStreamInterceptor extends AbstractPhaseInterceptor<
}
/**
- * Sets the acceptable total number of child elements for the current XML element
+ * Sets the acceptable total number of child elements for the current XML element
* @param innerElementCountThreshold
*/
public void setInnerElementCountThreshold(int innerElementCountThreshold) {
@@ -131,5 +131,5 @@ public class DepthRestrictingStreamInterceptor extends AbstractPhaseInterceptor<
public int getInnerElementCountThreshold() {
return innerElementCountThreshold;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/JAASAuthenticationFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/JAASAuthenticationFeature.java b/core/src/main/java/org/apache/cxf/interceptor/security/JAASAuthenticationFeature.java
index 2a2d985..1b8aa91 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/JAASAuthenticationFeature.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/JAASAuthenticationFeature.java
@@ -1,58 +1,58 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.cxf.interceptor.security;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.feature.AbstractFeature;
-import org.apache.cxf.interceptor.InterceptorProvider;
-
-/**
- * Feature to do JAAS authentication with defaults for karaf integration
- */
-public class JAASAuthenticationFeature extends AbstractFeature {
- public static final String ID = "jaas";
-
- private String contextName = "karaf";
- private boolean reportFault;
-
- @Override
- public String getID() {
- return ID;
- }
-
- @Override
- protected void initializeProvider(InterceptorProvider provider, Bus bus) {
- JAASLoginInterceptor jaasLoginInterceptor = new JAASLoginInterceptor();
- jaasLoginInterceptor.setRoleClassifierType(JAASLoginInterceptor.ROLE_CLASSIFIER_CLASS_NAME);
- jaasLoginInterceptor.setRoleClassifier("org.apache.karaf.jaas.boot.principal.RolePrincipal");
- jaasLoginInterceptor.setContextName(contextName);
- jaasLoginInterceptor.setReportFault(reportFault);
- provider.getInInterceptors().add(jaasLoginInterceptor);
- super.initializeProvider(provider, bus);
- }
-
- public void setContextName(String contextName) {
- this.contextName = contextName;
- }
-
- public void setReportFault(boolean reportFault) {
- this.reportFault = reportFault;
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.interceptor.security;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.interceptor.InterceptorProvider;
+
+/**
+ * Feature to do JAAS authentication with defaults for karaf integration
+ */
+public class JAASAuthenticationFeature extends AbstractFeature {
+ public static final String ID = "jaas";
+
+ private String contextName = "karaf";
+ private boolean reportFault;
+
+ @Override
+ public String getID() {
+ return ID;
+ }
+
+ @Override
+ protected void initializeProvider(InterceptorProvider provider, Bus bus) {
+ JAASLoginInterceptor jaasLoginInterceptor = new JAASLoginInterceptor();
+ jaasLoginInterceptor.setRoleClassifierType(JAASLoginInterceptor.ROLE_CLASSIFIER_CLASS_NAME);
+ jaasLoginInterceptor.setRoleClassifier("org.apache.karaf.jaas.boot.principal.RolePrincipal");
+ jaasLoginInterceptor.setContextName(contextName);
+ jaasLoginInterceptor.setReportFault(reportFault);
+ provider.getInInterceptors().add(jaasLoginInterceptor);
+ super.initializeProvider(provider, bus);
+ }
+
+ public void setContextName(String contextName) {
+ this.contextName = contextName;
+ }
+
+ public void setReportFault(boolean reportFault) {
+ this.reportFault = reportFault;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
index b3fa291..f91f96e 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
@@ -48,7 +48,7 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
public static final String ROLE_CLASSIFIER_CLASS_NAME = "classname";
private static final Logger LOG = LogUtils.getL7dLogger(JAASLoginInterceptor.class);
-
+
private String contextName = "";
private Configuration loginConfig;
private String roleClassifier;
@@ -58,39 +58,39 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
private List<CallbackHandlerProvider> callbackHandlerProviders;
private boolean allowAnonymous = true;
private boolean allowNamedPrincipals;
-
+
public JAASLoginInterceptor() {
this(Phase.UNMARSHAL);
}
-
+
public JAASLoginInterceptor(String phase) {
super(phase);
this.callbackHandlerProviders = new ArrayList<>();
this.callbackHandlerProviders.add(new CallbackHandlerProviderAuthPol());
this.callbackHandlerProviders.add(new CallbackHandlerProviderUsernameToken());
}
-
+
public void setContextName(String name) {
contextName = name;
}
-
+
public String getContextName() {
return contextName;
}
-
+
@Deprecated
public void setRolePrefix(String name) {
setRoleClassifier(name);
}
-
+
public void setRoleClassifier(String value) {
roleClassifier = value;
}
-
+
public String getRoleClassifier() {
return roleClassifier;
}
-
+
public void setRoleClassifierType(String value) {
if (!ROLE_CLASSIFIER_PREFIX.equals(value)
&& !ROLE_CLASSIFIER_CLASS_NAME.equals(value)) {
@@ -98,19 +98,19 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
}
roleClassifierType = value;
}
-
+
public String getRoleClassifierType() {
return roleClassifierType;
}
-
+
public void setReportFault(boolean reportFault) {
this.reportFault = reportFault;
}
-
+
public void setUseDoAs(boolean useDoAs) {
this.useDoAs = useDoAs;
}
-
+
private CallbackHandler getFirstCallbackHandler(Message message) {
for (CallbackHandlerProvider cbp : callbackHandlerProviders) {
CallbackHandler cbh = cbp.create(message);
@@ -124,12 +124,12 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
public void handleMessage(final Message message) throws Fault {
if (allowNamedPrincipals) {
SecurityContext sc = message.get(SecurityContext.class);
- if (sc != null && sc.getUserPrincipal() != null
+ if (sc != null && sc.getUserPrincipal() != null
&& sc.getUserPrincipal().getName() != null) {
return;
}
}
-
+
CallbackHandler handler = getFirstCallbackHandler(message);
if (handler == null && !allowAnonymous) {
@@ -137,12 +137,12 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
}
try {
- LoginContext ctx = new LoginContext(getContextName(), null, handler, loginConfig);
+ LoginContext ctx = new LoginContext(getContextName(), null, handler, loginConfig);
ctx.login();
Subject subject = ctx.getSubject();
String name = getUsername(handler);
message.put(SecurityContext.class, createSecurityContext(name, subject));
-
+
// Run the further chain in the context of this subject.
// This allows other code to retrieve the subject using pure JAAS
if (useDoAs) {
@@ -166,7 +166,7 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
AuthenticationException aex = new AuthenticationException(errorMessage);
aex.initCause(ex);
throw aex;
-
+
} else {
throw new AuthenticationException("Authentication failed (details can be found in server log)");
}
@@ -189,7 +189,7 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
protected CallbackHandler getCallbackHandler(String name, String password) {
return new NamePasswordCallbackHandler(name, password);
}
-
+
protected SecurityContext createSecurityContext(String name, Subject subject) {
if (getRoleClassifier() != null) {
return new RolePrefixSecurityContextImpl(subject, getRoleClassifier(),
@@ -215,7 +215,7 @@ public class JAASLoginInterceptor extends AbstractPhaseInterceptor<Message> {
this.callbackHandlerProviders.clear();
this.callbackHandlerProviders.addAll(callbackHandlerProviders);
}
-
+
public void addCallbackHandlerProviders(List<CallbackHandlerProvider> callbackHandlerProviders2) {
this.callbackHandlerProviders.addAll(callbackHandlerProviders2);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
index 8b61574..5380b56 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
@@ -32,67 +32,67 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
-public class NameDigestPasswordCallbackHandler implements CallbackHandler {
-
+public class NameDigestPasswordCallbackHandler implements CallbackHandler {
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(NameDigestPasswordCallbackHandler.class);
private static final Logger LOG = LogUtils.getL7dLogger(NameDigestPasswordCallbackHandler.class);
private static final String PASSWORD_CALLBACK_NAME = "setObject";
- private static final Class<?>[] PASSWORD_CALLBACK_TYPES =
+ private static final Class<?>[] PASSWORD_CALLBACK_TYPES =
new Class[]{Object.class, char[].class, String.class};
-
- private String username;
- private String password;
+
+ private String username;
+ private String password;
private String nonce;
private String createdTime;
-
+
private String passwordCallbackName;
-
- public NameDigestPasswordCallbackHandler(String username, String password, String nonce, String createdTime) {
- this(username, password, nonce, createdTime, null);
- }
-
- public NameDigestPasswordCallbackHandler(String username,
- String password,
- String nonce,
- String createdTime,
- String passwordCallbackName) {
- this.username = username;
+
+ public NameDigestPasswordCallbackHandler(String username, String password, String nonce, String createdTime) {
+ this(username, password, nonce, createdTime, null);
+ }
+
+ public NameDigestPasswordCallbackHandler(String username,
+ String password,
+ String nonce,
+ String createdTime,
+ String passwordCallbackName) {
+ this.username = username;
this.password = password;
this.nonce = nonce;
this.createdTime = createdTime;
this.passwordCallbackName = passwordCallbackName;
- }
+ }
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
Callback callback = callbacks[i];
if (handleCallback(callback)) {
continue;
- } else if (callback instanceof NameCallback) {
- ((NameCallback) callback).setName(username);
- } else if (callback instanceof PasswordCallback) {
- PasswordCallback pwCallback = (PasswordCallback) callback;
+ } else if (callback instanceof NameCallback) {
+ ((NameCallback) callback).setName(username);
+ } else if (callback instanceof PasswordCallback) {
+ PasswordCallback pwCallback = (PasswordCallback) callback;
pwCallback.setPassword(password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
- org.apache.cxf.common.i18n.Message errorMsg =
- new org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
- BUNDLE,
+ org.apache.cxf.common.i18n.Message errorMsg =
+ new org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
+ BUNDLE,
callbacks[i].getClass().getName());
LOG.info(errorMsg.toString());
- throw new UnsupportedCallbackException(callbacks[i], errorMsg.toString());
- }
- }
- }
-
+ throw new UnsupportedCallbackException(callbacks[i], errorMsg.toString());
+ }
+ }
+ }
+
protected boolean handleCallback(Callback callback) {
return false;
}
-
+
/*
- * This method is called from the handle(Callback[]) method when the specified callback
- * did not match any of the known callback classes. It looks for the callback method
+ * This method is called from the handle(Callback[]) method when the specified callback
+ * did not match any of the known callback classes. It looks for the callback method
* having the specified method name with one of the suppported parameter types.
- * If found, it invokes the callback method on the object and returns true.
+ * If found, it invokes the callback method on the object and returns true.
* If not, it returns false.
*/
private boolean invokePasswordCallback(Callback callback) {
@@ -110,13 +110,13 @@ public class NameDigestPasswordCallbackHandler implements CallbackHandler {
}
return false;
}
-
+
public String getNonce() {
return this.nonce;
}
-
+
public String getCreatedTime() {
return this.createdTime;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
index 0aa999a..f03dd0f 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
@@ -32,59 +32,59 @@ import javax.security.auth.callback.UnsupportedCallbackException;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
-public class NamePasswordCallbackHandler implements CallbackHandler {
-
+public class NamePasswordCallbackHandler implements CallbackHandler {
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(NamePasswordCallbackHandler.class);
private static final Logger LOG = LogUtils.getL7dLogger(NamePasswordCallbackHandler.class);
private static final String PASSWORD_CALLBACK_NAME = "setObject";
- private static final Class<?>[] PASSWORD_CALLBACK_TYPES =
+ private static final Class<?>[] PASSWORD_CALLBACK_TYPES =
new Class[]{Object.class, char[].class, String.class};
-
- private String username;
- private String password;
-
+
+ private String username;
+ private String password;
+
private String passwordCallbackName;
-
- public NamePasswordCallbackHandler(String username, String password) {
- this(username, password, null);
- }
-
- public NamePasswordCallbackHandler(String username, String password, String passwordCallbackName) {
- this.username = username;
+
+ public NamePasswordCallbackHandler(String username, String password) {
+ this(username, password, null);
+ }
+
+ public NamePasswordCallbackHandler(String username, String password, String passwordCallbackName) {
+ this.username = username;
this.password = password;
this.passwordCallbackName = passwordCallbackName;
- }
+ }
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
+ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ for (int i = 0; i < callbacks.length; i++) {
Callback callback = callbacks[i];
if (handleCallback(callback)) {
continue;
- } else if (callback instanceof NameCallback) {
- ((NameCallback) callback).setName(username);
- } else if (callback instanceof PasswordCallback) {
- PasswordCallback pwCallback = (PasswordCallback) callback;
+ } else if (callback instanceof NameCallback) {
+ ((NameCallback) callback).setName(username);
+ } else if (callback instanceof PasswordCallback) {
+ PasswordCallback pwCallback = (PasswordCallback) callback;
pwCallback.setPassword(password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
- org.apache.cxf.common.i18n.Message errorMsg =
- new org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
- BUNDLE,
+ org.apache.cxf.common.i18n.Message errorMsg =
+ new org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
+ BUNDLE,
callbacks[i].getClass().getName());
LOG.info(errorMsg.toString());
- throw new UnsupportedCallbackException(callbacks[i], errorMsg.toString());
- }
- }
- }
-
+ throw new UnsupportedCallbackException(callbacks[i], errorMsg.toString());
+ }
+ }
+ }
+
protected boolean handleCallback(Callback callback) {
return false;
}
-
+
/*
- * This method is called from the handle(Callback[]) method when the specified callback
- * did not match any of the known callback classes. It looks for the callback method
+ * This method is called from the handle(Callback[]) method when the specified callback
+ * did not match any of the known callback classes. It looks for the callback method
* having the specified method name with one of the suppported parameter types.
- * If found, it invokes the callback method on the object and returns true.
+ * If found, it invokes the callback method on the object and returns true.
* If not, it returns false.
*/
private boolean invokePasswordCallback(Callback callback) {
@@ -102,5 +102,5 @@ public class NamePasswordCallbackHandler implements CallbackHandler {
}
return false;
}
-
+
}
[19/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java
index 7d7dfcf..d90226c 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/Option.java
@@ -63,7 +63,7 @@ public class Option {
public void setPrefix(String prefix) {
this.prefix = prefix;
}
-
+
}
/**
@@ -71,7 +71,7 @@ public class Option {
*/
UriPrefixPair[] packagePrefixes;
/**
- * OASIS catalog file for use when reading the WSDL.
+ * OASIS catalog file for use when reading the WSDL.
*/
File catalog;
/**
@@ -79,7 +79,7 @@ public class Option {
*/
File output;
/**
- * Whether to validate the WSDL.
+ * Whether to validate the WSDL.
*/
String validate;
/**
@@ -87,14 +87,14 @@ public class Option {
*/
String wsdlVersion;
/**
- * A set of dependent files used to detect that the generator must process WSDL, even
+ * A set of dependent files used to detect that the generator must process WSDL, even
* if generator marker files are up to date.
*/
File dependencies[];
public Option() {
}
-
+
public void merge(Option other) {
if (catalog == null) {
catalog = other.getCatalog();
@@ -141,7 +141,7 @@ public class Option {
}
/**
- * @return output directory. Default is set
+ * @return output directory. Default is set
* at the plugin level.
*/
public File getOutput() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
index 6ce9798..458aa09 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WSDL2JavaScriptMojo.java
@@ -64,17 +64,17 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
*/
@Parameter
Option defaultOptions = new Option();
-
+
/**
- * Options that specify WSDLs to process and/or control the processing of wsdls.
+ * Options that specify WSDLs to process and/or control the processing of wsdls.
* If you have enabled wsdl scanning, these elements attach options to particular wsdls.
- * If you have not enabled wsdl scanning, these options call out the wsdls to process.
+ * If you have not enabled wsdl scanning, these options call out the wsdls to process.
*/
@Parameter
WsdlOption wsdlOptions[];
@Override
- protected Bus generate(GenericWsdlOption genericWsdlOption,
+ protected Bus generate(GenericWsdlOption genericWsdlOption,
Bus bus, Set<URI> classPath)
throws MojoExecutionException {
@@ -188,7 +188,7 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
}
protected void mergeOptions(List<GenericWsdlOption> effectiveWsdlOptions) {
- File outputDirFile = getGeneratedTestRoot() == null
+ File outputDirFile = getGeneratedTestRoot() == null
? getGeneratedSourceRoot() : getGeneratedTestRoot();
for (GenericWsdlOption wo : effectiveWsdlOptions) {
WsdlOption option = (WsdlOption)wo;
@@ -204,13 +204,13 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
throws MojoExecutionException {
List<GenericWsdlOption> effectiveWsdlOptions = new ArrayList<>();
List<GenericWsdlOption> temp;
-
+
if (wsdlOptions != null) {
for (WsdlOption wo : wsdlOptions) {
effectiveWsdlOptions.add(wo);
}
}
-
+
if (wsdlRoot != null && wsdlRoot.exists() && !disableDirectoryScan) {
temp = loadWsdlOptionsFromFiles(wsdlRoot, getGeneratedSourceRoot());
effectiveWsdlOptions.addAll(temp);
@@ -253,7 +253,7 @@ public class WSDL2JavaScriptMojo extends AbstractCodegenMoho {
public static List<GenericWsdlOption> loadWsdlOptionsFromDependencies(MavenProject project,
Option defaultOptions,
File outputDir) {
- List<GenericWsdlOption> options
+ List<GenericWsdlOption> options
= new ArrayList<>();
Set<Artifact> dependencies = CastUtils.cast(project.getDependencyArtifacts());
for (Artifact artifact : dependencies) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java
index cd11f8c..9ab6fb7 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/WsdlOption.java
@@ -30,17 +30,17 @@ import org.apache.cxf.maven_plugin.WsdlArtifact;
* An option for javascript generation.
*/
public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.GenericWsdlOption {
-
+
private String wsdl;
private WsdlArtifact artifact;
-
+
/**
* @return Pathname or URI to wsdl.
*/
public String getWsdl() {
return wsdl;
}
-
+
/**
* Set pathname or URI to WSDL.
* @param wsdl path.
@@ -48,9 +48,9 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
public void setWsdl(String wsdl) {
this.wsdl = wsdl;
}
-
+
/**
- * Maven coordinates
+ * Maven coordinates
* @return
*/
public WsdlArtifact getArtifact() {
@@ -91,7 +91,7 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
options.add("-catalog");
options.add(catalog.getAbsolutePath());
}
-
+
options.add("-d");
if (output != null) {
options.add(output.getAbsolutePath());
@@ -117,5 +117,5 @@ public class WsdlOption extends Option implements org.apache.cxf.maven_plugin.Ge
public String toString() {
return String.format("WsdlOption [wsdl=%s, artifact=%s, %s]", wsdl, artifact,
super.toString());
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
index 9fa6fe8..9cd29db 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IDLToWSDLPlugin.java
@@ -41,7 +41,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
* @required
*/
String outputDir;
-
+
/**
* @parameter
*/
@@ -51,7 +51,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
public void execute() throws MojoExecutionException {
File outputDirFile = new File(outputDir);
outputDirFile.mkdirs();
-
+
if (idltowsdlOptions == null) {
throw new MojoExecutionException("Please specify the idl2wsdl options");
}
@@ -72,7 +72,7 @@ public class IDLToWSDLPlugin extends AbstractMojo {
list.add("-o");
list.add(outputDir);
list.addAll(idltowsdlOptions[x].getExtraargs());
- list.add(idltowsdlOptions[x].getIDL());
+ list.add(idltowsdlOptions[x].getIDL());
try {
IDLToWSDL.run(list.toArray(new String[list.size()]));
doneFile.delete();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
index 96f5996..af9f47e 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/IdltowsdlOption.java
@@ -25,7 +25,7 @@ public class IdltowsdlOption {
String idl;
List<String> extraargs;
-
+
public String getIDL() {
return idl;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
index cab9898..49cc277 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WSDLToIDLPlugin.java
@@ -50,18 +50,18 @@ public class WSDLToIDLPlugin extends AbstractMojo {
* @required
*/
File outputDir;
-
+
/**
* @parameter
*/
WsdltoidlOption wsdltoidlOptions[];
-
+
/**
* @parameter expression="${project}"
* @required
*/
MavenProject project;
-
+
/**
* Use the compile classpath rather than the test classpath for execution
* useful if the test dependencies clash with those of wsdl2java
@@ -81,7 +81,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
}
outputDir.mkdirs();
-
+
List<URL> urlList = new ArrayList<>();
StringBuilder buf = new StringBuilder();
@@ -110,34 +110,34 @@ public class WSDLToIDLPlugin extends AbstractMojo {
//ignore
}
}
-
+
ClassLoader origContext = Thread.currentThread().getContextClassLoader();
ClassLoader loader = ClassLoaderUtils.getURLClassLoader(urlList, origContext);
String newCp = buf.toString();
//with some VM's, creating an XML parser (which we will do to parse wsdls)
- //will set some system properties that then interferes with mavens
+ //will set some system properties that then interferes with mavens
//dependency resolution. (OSX is the major culprit here)
//We'll save the props and then set them back later.
Map<Object, Object> origProps = new HashMap<Object, Object>(System.getProperties());
-
+
String cp = System.getProperty("java.class.path");
-
+
try {
Thread.currentThread().setContextClassLoader(loader);
System.setProperty("java.class.path", newCp);
-
+
for (int x = 0; x < wsdltoidlOptions.length; x++) {
File file = new File(wsdltoidlOptions[x].getWSDL());
File doneFile = new File(outputDir, "." + file.getName() + ".DONE");
-
+
boolean doWork = file.lastModified() > doneFile.lastModified();
if (!doneFile.exists()) {
doWork = true;
} else if (file.lastModified() > doneFile.lastModified()) {
doWork = true;
}
-
+
if (doWork) {
List<String> list = new ArrayList<>();
list.add("-d");
@@ -151,7 +151,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
if (wsdltoidlOptions[x].getExtraargs() != null) {
list.addAll(wsdltoidlOptions[x].getExtraargs());
}
- list.add(wsdltoidlOptions[x].getWSDL());
+ list.add(wsdltoidlOptions[x].getWSDL());
try {
WSDLToIDL.run(list.toArray(new String[list.size()]));
doneFile.delete();
@@ -172,7 +172,7 @@ public class WSDLToIDLPlugin extends AbstractMojo {
if (cp != null) {
System.setProperty("java.class.path", cp);
}
-
+
Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties());
for (Object o : newProps.keySet()) {
if (!origProps.containsKey(o)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
index 6c52bea..4355b64 100644
--- a/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
+++ b/maven-plugins/corba/src/main/java/org/apache/cxf/maven_plugin/corba/maven/plugins/WsdltoidlOption.java
@@ -28,7 +28,7 @@ public class WsdltoidlOption {
boolean idl;
List<String> extraargs;
-
+
public String getWSDL() {
return wsdl;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
index 23c40b5..f37a06a 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
@@ -31,11 +31,11 @@ import com.sun.javadoc.RootDoc;
import com.sun.javadoc.Tag;
public final class DumpJavaDoc {
-
+
private DumpJavaDoc() {
-
+
}
-
+
public static boolean start(RootDoc root) throws IOException {
String dumpFileName = readOptions(root.options());
FileOutputStream fos = new FileOutputStream(dumpFileName);
@@ -48,7 +48,7 @@ public final class DumpJavaDoc {
Parameter[] parameters = method.parameters();
for (int i = 0; i < parameters.length; ++i) {
if (parameters[i].name().equals(paramTag.parameterName())) {
- javaDocMap.put(method.qualifiedName() + ".paramCommentTag." + i,
+ javaDocMap.put(method.qualifiedName() + ".paramCommentTag." + i,
paramTag.parameterComment());
}
}
@@ -56,18 +56,18 @@ public final class DumpJavaDoc {
Tag retTags[] = method.tags("return");
if (retTags != null && retTags.length == 1) {
Tag retTag = method.tags("return")[0];
- javaDocMap.put(method.qualifiedName() + "." + "returnCommentTag",
+ javaDocMap.put(method.qualifiedName() + "." + "returnCommentTag",
retTag.text());
}
}
-
+
}
javaDocMap.store(fos, "");
fos.flush();
fos.close();
return true;
}
-
+
private static String readOptions(String[][] options) {
String tagName = null;
for (int i = 0; i < options.length; i++) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
index b1b14e9..9aa858e 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/Java2WADLMojo.java
@@ -54,32 +54,32 @@ import org.apache.maven.project.MavenProjectHelper;
* @threadSafe
*/
public class Java2WADLMojo extends AbstractMojo {
-
+
public static final String WADL_NS = "http://wadl.dev.java.net/2009/02";
-
-
-
+
+
+
private List<ClassResourceInfo> classResourceInfos = new ArrayList<>();
-
-
+
+
/**
* @parameter
*/
private String outputFile;
-
-
+
+
/**
* @parameter
*/
private String address;
-
+
/**
* @parameter
*/
private String docProvider;
-
-
+
+
/**
* Attach the generated wadl file to the list of files to be deployed
* on install. This means the wadl file will be copied to the repository
@@ -90,8 +90,8 @@ public class Java2WADLMojo extends AbstractMojo {
* @parameter default-value="true"
*/
private Boolean attachWadl;
-
-
+
+
/**
* @parameter
*/
@@ -102,19 +102,19 @@ public class Java2WADLMojo extends AbstractMojo {
* @required
*/
private List<String> classResourceNames;
-
+
/**
* @parameter
*/
private String basePackages;
-
+
/**
* @parameter expression="${project}"
* @required
*/
private MavenProject project;
-
-
+
+
/**
* Maven ProjectHelper.
*
@@ -133,42 +133,42 @@ public class Java2WADLMojo extends AbstractMojo {
* @parameter default-value="true"
*/
private boolean incrementNamespacePrefix;
-
+
/**
* @parameter default-value="true"
*/
private boolean singleResourceMultipleMethods;
-
+
/**
* @parameter default-value="false"
*/
private boolean useSingleSlashResource;
-
+
/**
* @parameter default-value="false"
*/
private boolean includeDefaultWadlSchemaLocation;
-
+
/**
* @parameter default-value="false"
*/
private boolean ignoreForwardSlash;
-
+
/**
* @parameter default-value="false"
*/
private boolean addResourceAndMethodIds;
-
+
/**
* @parameter default-value="false"
*/
private boolean linkAnyMediaTypeToXmlSchema;
-
+
/**
* @parameter default-value="false"
*/
private boolean checkAbsolutePathSlash;
-
+
/**
* @parameter default-value="false"
*/
@@ -179,12 +179,12 @@ public class Java2WADLMojo extends AbstractMojo {
*/
private boolean useJaxbContextForQnames;
-
+
/**
* @parameter default-value="true"
*/
private boolean usePathParamsToCompareOperations;
-
+
/**
* @parameter default-value="true"
*/
@@ -199,34 +199,34 @@ public class Java2WADLMojo extends AbstractMojo {
* @parameter default-value="true"
*/
private boolean supportJaxbSubstitutions;
-
+
/**
* @parameter
*/
private String applicationTitle;
-
+
/**
* @parameter
*/
private String namespacePrefix;
-
+
/**
- * @parameter
+ * @parameter
*/
private String outputFileName;
-
+
/**
* @parameter default-value="wadl"
*/
private String outputFileExtension;
-
+
/**
* @parameter
*/
private String stylesheetReference;
-
+
private ClassLoader resourceClassLoader;
-
+
public void execute() throws MojoExecutionException {
List<Class<?>> resourceClasses = loadResourceClasses();
initClassResourceInfoList(resourceClasses);
@@ -243,12 +243,12 @@ public class Java2WADLMojo extends AbstractMojo {
}
}
setExtraProperties(wadlGenerator);
-
+
StringBuilder sbMain = wadlGenerator.generateWADL(getBaseURI(), classResourceInfos, useJson, null, null);
getLog().debug("the wadl is =====> \n" + sbMain.toString());
generateWadl(resourceClasses, sbMain.toString());
}
-
+
private void setExtraProperties(WadlGenerator wg) {
wg.setSingleResourceMultipleMethods(singleResourceMultipleMethods);
wg.setIncrementNamespacePrefix(incrementNamespacePrefix);
@@ -266,18 +266,18 @@ public class Java2WADLMojo extends AbstractMojo {
wg.setSupportJaxbSubstitutions(supportJaxbSubstitutions);
if (applicationTitle != null) {
wg.setApplicationTitle(applicationTitle);
- }
+ }
if (namespacePrefix != null) {
wg.setNamespacePrefix(namespacePrefix);
}
wg.setStylesheetReference(stylesheetReference);
}
-
+
private void generateWadl(List<Class<?>> resourceClasses, String wadl) throws MojoExecutionException {
-
+
if (outputFile == null && project != null) {
// Put the wadl in target/generated/wadl
-
+
String name = null;
if (outputFileName != null) {
name = outputFileName;
@@ -286,10 +286,10 @@ public class Java2WADLMojo extends AbstractMojo {
} else {
name = "application";
}
- outputFile = (project.getBuild().getDirectory() + "/generated/wadl/" + name + "."
+ outputFile = (project.getBuild().getDirectory() + "/generated/wadl/" + name + "."
+ outputFileExtension).replace("/", File.separator);
}
-
+
BufferedWriter writer = null;
try {
FileUtils.mkDir(new File(outputFile).getParentFile());
@@ -321,7 +321,7 @@ public class Java2WADLMojo extends AbstractMojo {
} else {
projectHelper.attachArtifact(project, "wadl", wadlFile);
}
-
+
}
}
}
@@ -330,13 +330,13 @@ public class Java2WADLMojo extends AbstractMojo {
if (address != null) {
return address;
} else {
- // the consumer may use the original target URI to figure out absolute URI
+ // the consumer may use the original target URI to figure out absolute URI
return "/";
}
}
-
-
+
+
private ClassLoader getClassLoader() throws MojoExecutionException {
if (resourceClassLoader == null) {
try {
@@ -361,14 +361,14 @@ public class Java2WADLMojo extends AbstractMojo {
resourceClasses.add(getClassLoader().loadClass(className));
} catch (Exception e) {
throw new MojoExecutionException(e.getMessage(), e);
- }
+ }
}
if (resourceClasses.isEmpty() && basePackages != null) {
try {
List<Class<? extends Annotation>> anns = new ArrayList<Class<? extends Annotation>>();
anns.add(Path.class);
- final Map< Class< ? extends Annotation >, Collection< Class< ? > > > discoveredClasses =
- ClasspathScanner.findClasses(ClasspathScanner.parsePackages(basePackages),
+ final Map< Class< ? extends Annotation >, Collection< Class< ? > > > discoveredClasses =
+ ClasspathScanner.findClasses(ClasspathScanner.parsePackages(basePackages),
anns,
getClassLoader());
if (discoveredClasses.containsKey(Path.class)) {
@@ -380,7 +380,7 @@ public class Java2WADLMojo extends AbstractMojo {
}
return resourceClasses;
}
-
+
private void initClassResourceInfoList(List<Class<?>> resourceClasses) throws MojoExecutionException {
for (Class<?> beanClass : resourceClasses) {
ClassResourceInfo cri = getCreatedFromModel(beanClass);
@@ -392,7 +392,7 @@ public class Java2WADLMojo extends AbstractMojo {
cri.setResourceClass(beanClass);
continue;
}
-
+
cri = ResourceUtils.createClassResourceInfo(beanClass, beanClass, true, true,
getBus());
if (cri != null) {
@@ -400,15 +400,15 @@ public class Java2WADLMojo extends AbstractMojo {
}
}
}
-
+
private Bus getBus() {
return BusFactory.getDefaultBus();
}
private ClassResourceInfo getCreatedFromModel(Class<?> realClass) {
-
+
for (ClassResourceInfo cri : classResourceInfos) {
- if (cri.isCreatedFromModel()
+ if (cri.isCreatedFromModel()
&& cri.isRoot() && cri.getServiceClass().isAssignableFrom(realClass)) {
return cri;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
index c7e1ef1..26435f2 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ParseJavaDocMojo.java
@@ -47,11 +47,11 @@ public class ParseJavaDocMojo extends AbstractMojo {
/**
* The source encoding.
- *
+ *
* @parameter defaultValue = "${project.build.sourceEncoding}"
*/
private String encoding;
-
+
/**
* @parameter expression="${project}"
* @required
@@ -99,7 +99,7 @@ public class ParseJavaDocMojo extends AbstractMojo {
/**
* The local maven repository.
- *
+ *
* @parameter expression="${localRepository}"
* @required
* @readonly
@@ -108,14 +108,14 @@ public class ParseJavaDocMojo extends AbstractMojo {
/**
* The remote repositories where artifacts are located.
- *
+ *
* @parameter expression="${project.remoteArtifactRepositories}"
* @required
* @readonly
*/
private List<ArtifactRepository> remoteRepositories;
-
-
+
+
/**
* Directory into which assembled {@link JavadocOptions} instances will be written before they
* are added to javadoc resources bundles.
@@ -137,11 +137,11 @@ public class ParseJavaDocMojo extends AbstractMojo {
f = AbstractJavadocMojo.class.getDeclaredField("encoding");
f.setAccessible(true);
f.set(mojo, encoding);
-
+
f = AbstractJavadocMojo.class.getDeclaredField("stylesheet");
f.setAccessible(true);
f.set(mojo, "stylesheet");
-
+
f = AbstractJavadocMojo.class.getDeclaredField("javadocOptionsDir");
f.setAccessible(true);
f.set(mojo, javadocOptionsDir);
@@ -196,26 +196,26 @@ public class ParseJavaDocMojo extends AbstractMojo {
f = AbstractJavadocMojo.class.getDeclaredField("applyJavadocSecurityFix");
f.setAccessible(true);
f.set(mojo, false);
-
+
f = AbstractJavadocMojo.class.getDeclaredField("additionalparam");
f.setAccessible(true);
- f.set(mojo, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
+ f.set(mojo, "-dumpJavaDocFile " + this.dumpFileOutputDirectory.getAbsolutePath()
+ File.separator + "dumpFile.properties");
f = AbstractJavadocMojo.class.getDeclaredField("useStandardDocletOptions");
f.setAccessible(true);
f.set(mojo, false);
-
+
f = AbstractJavadocMojo.class.getDeclaredField("project");
f.setAccessible(true);
f.set(mojo, mavenProject);
-
+
if (dumpFileOutputDirectory != null) {
f = AbstractJavadocMojo.class.getDeclaredField("outputDirectory");
f.setAccessible(true);
f.set(mojo, dumpFileOutputDirectory);
}
-
+
Method m = AbstractJavadocMojo.class.getDeclaredMethod("executeReport", Locale.class);
m.setAccessible(true);
m.invoke(mojo, locale);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java
index f5fcb12..abe5c90 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/ResourceMapJavaDocProvider.java
@@ -31,11 +31,11 @@ import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.jaxrs.model.doc.DocumentationProvider;
public class ResourceMapJavaDocProvider implements DocumentationProvider {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(ResourceMapJavaDocProvider.class);
-
+
private Properties dumpedDocFile;
-
+
public ResourceMapJavaDocProvider(String targetFolder) {
dumpedDocFile = new Properties();
try (FileInputStream fis = new FileInputStream(targetFolder + "/site/apidocs/dumpFile.properties")) {
@@ -53,34 +53,34 @@ public class ResourceMapJavaDocProvider implements DocumentationProvider {
@Override
public String getMethodDoc(OperationResourceInfo ori) {
- Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
- : ori.getAnnotatedMethod();
- String methodKey = method.getDeclaringClass().getName()
+ Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
+ : ori.getAnnotatedMethod();
+ String methodKey = method.getDeclaringClass().getName()
+ "." + method.getName();
return dumpedDocFile.getProperty(methodKey);
}
@Override
public String getMethodResponseDoc(OperationResourceInfo ori) {
- Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
- : ori.getAnnotatedMethod();
- String methodResponseKey = method.getDeclaringClass().getName()
+ Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
+ : ori.getAnnotatedMethod();
+ String methodResponseKey = method.getDeclaringClass().getName()
+ "." + method.getName() + "." + "returnCommentTag";
return dumpedDocFile.getProperty(methodResponseKey);
}
@Override
public String getMethodParameterDoc(OperationResourceInfo ori, int paramIndex) {
- Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
- : ori.getAnnotatedMethod();
- String methodParamKey = method.getDeclaringClass().getName()
+ Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
+ : ori.getAnnotatedMethod();
+ String methodParamKey = method.getDeclaringClass().getName()
+ "." + method.getName()
+ ".paramCommentTag." + paramIndex;
return dumpedDocFile.getProperty(methodParamKey);
}
-
+
private Class<?> getPathAnnotatedClass(Class<?> cls) {
- if (cls.getAnnotation(Path.class) != null) {
+ if (cls.getAnnotation(Path.class) != null) {
return cls;
}
if (cls.getSuperclass().getAnnotation(Path.class) != null) {
@@ -88,7 +88,7 @@ public class ResourceMapJavaDocProvider implements DocumentationProvider {
}
for (Class<?> i : cls.getInterfaces()) {
if (i.getAnnotation(Path.class) != null) {
- return i;
+ return i;
}
}
return cls;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index aeda298..8f4a3cb 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -50,7 +50,7 @@ public class ClassLoaderSwitcher {
/**
* Create and set the classloader that is needed for creating the java sources from wsdl
- *
+ *
* @param project
* @param useCompileClasspath
* @param classesDir
@@ -62,7 +62,7 @@ public class ClassLoaderSwitcher {
List<URL> urlList = new ArrayList<>();
StringBuilder buf = new StringBuilder();
-
+
try {
buf.append(classpath);
buf.append(File.pathSeparatorChar);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
index 21fd51f..3eafad2 100644
--- a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
+++ b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
@@ -92,8 +92,8 @@ public class Java2WSMojo extends AbstractMojo {
* @parameter
*/
private String address;
-
-
+
+
/**
* @parameter
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
index bd1b8c1..615613f 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
@@ -55,7 +55,7 @@ public class ClassLoaderSwitcher {
/**
* Create and set the classloader that is needed for creating the java sources from wsdl
- *
+ *
* @param project
* @param useCompileClasspath
* @param classesDir
@@ -66,7 +66,7 @@ public class ClassLoaderSwitcher {
List<URL> urlList = new ArrayList<>();
StringBuilder buf = new StringBuilder();
Set<URI> ret = new LinkedHashSet<URI>();
-
+
try {
urlList.add(classesDir.toURI().toURL());
if (!useCompileClasspath) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java
index d40c2f3..1b4620f 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/DocumentArtifact.java
@@ -28,11 +28,11 @@ public class DocumentArtifact {
private String artifactId;
private String version;
private String type;
-
+
public DocumentArtifact() {
type = "wadl";
}
-
+
public String getGroupId() {
return groupId;
}
@@ -57,10 +57,10 @@ public class DocumentArtifact {
public void setType(String type) {
this.type = type;
}
-
+
public boolean doesMatch(DocumentArtifact artifact) {
return type.equals(artifact.getType()) && groupId.equals(artifact.getGroupId())
- && artifactId.equals(artifact.getArtifactId())
+ && artifactId.equals(artifact.getArtifactId())
&& (version == null || version.equals(artifact.getVersion()));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
index c62ab8f..b7a68b8 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
@@ -45,9 +45,9 @@ public final class ForkOnceCodeGenerator {
for (int x = 0; x < i; x++) {
wargs[x] = reader.readLine();
}
-
+
new WADLToJava(wargs).run(new ToolContext());
-
+
line = reader.readLine();
}
reader.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
index 9f5aed5..352a9d2 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
@@ -99,8 +99,8 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
@Parameter(property = "cxf.useCompileClasspath", defaultValue = "false")
boolean useCompileClasspath;
-
-
+
+
/**
* Disables the scanning of the wadlRoot/testWadlRoot directories configured above.
* By default, we scan for *.wadl (see include/exclude params as well) in the wadlRoot
@@ -137,7 +137,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
@Parameter(defaultValue = "false")
String fork;
-
+
/**
* The Maven session.
*/
@@ -149,7 +149,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
@Parameter(readonly = true, required = true, property = "plugin.artifacts")
private List<Artifact> pluginArtifacts;
-
+
/**
* Sets the Java executable to use when fork parameter is <code>true</code>.
@@ -162,17 +162,17 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
*/
@Parameter
private String additionalJvmArgs;
-
+
@Component
private RepositorySystem repositorySystem;
-
-
+
+
private ClassLoader resourceClassLoader;
-
+
private Artifact resolveRemoteWadlArtifact(Artifact artifact)
throws MojoExecutionException {
-
+
/**
* First try to find the artifact in the reactor projects of the maven session.
* So an artifact that is not yet built can be resolved
@@ -180,7 +180,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
List<MavenProject> rProjects = mavenSession.getProjects();
for (MavenProject rProject : rProjects) {
if (artifact.getGroupId().equals(rProject.getGroupId())
- && artifact.getArtifactId().equals(rProject.getArtifactId())
+ && artifact.getArtifactId().equals(rProject.getArtifactId())
&& artifact.getVersion().equals(rProject.getVersion())) {
Set<Artifact> artifacts = rProject.getArtifacts();
for (Artifact pArtifact : artifacts) {
@@ -190,7 +190,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
}
}
-
+
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
request.setArtifact(artifact);
request.setResolveRoot(true).setResolveTransitively(false);
@@ -198,14 +198,14 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
request.setMirrors(mavenSession.getRequest().getMirrors());
request.setProxies(mavenSession.getRequest().getProxies());
request.setLocalRepository(mavenSession.getLocalRepository());
- request.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
+ request.setRemoteRepositories(mavenSession.getRequest().getRemoteRepositories());
ArtifactResolutionResult result = repositorySystem.resolve(request);
-
+
return result.getOriginatingArtifact();
}
protected void downloadRemoteDocs(List<WadlOption> effectiveOptions) throws MojoExecutionException {
-
+
for (WadlOption option : effectiveOptions) {
DocumentArtifact wadlA = option.getWadlArtifact();
if (wadlA == null) {
@@ -213,7 +213,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
Artifact wadlArtifact = repositorySystem.createArtifact(wadlA.getGroupId(),
wadlA.getArtifactId(),
- wadlA.getVersion(),
+ wadlA.getVersion(),
wadlA.getType());
wadlArtifact = resolveRemoteWadlArtifact(wadlArtifact);
@@ -225,12 +225,12 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
}
-
-
+
+
private void addPluginArtifact(Set<URI> artifactsPath) {
//for Maven 2.x, the actual artifact isn't in the list.... need to try and find it
URL url = getClass().getResource(getClass().getSimpleName() + ".class");
-
+
try {
if ("jar".equals(url.getProtocol())) {
String s = url.getPath();
@@ -255,7 +255,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
- protected void forkOnce(Set<URI> classPath, List<WadlOption> effectiveOptions)
+ protected void forkOnce(Set<URI> classPath, List<WadlOption> effectiveOptions)
throws MojoExecutionException {
List<WadlOption> toDo = new LinkedList<WadlOption>();
List<List<String>> wargs = new LinkedList<List<String>>();
@@ -265,14 +265,14 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
URI basedir = project.getBasedir().toURI();
for (URI wadlURI : option.getWadlURIs(basedir, getResourceLoader())) {
File doneFile = getDoneFile(basedir, wadlURI);
-
+
if (!shouldRun(option, doneFile, wadlURI)) {
continue;
}
doneFile.delete();
-
+
toDo.add(option);
-
+
wargs.add(option.generateCommandLine(outputDirFile, basedir, wadlURI, getLog()
.isDebugEnabled()));
}
@@ -280,7 +280,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
if (wargs.isEmpty()) {
return;
}
-
+
Set<URI> artifactsPath = new LinkedHashSet<URI>();
for (Artifact a : pluginArtifacts) {
File file = a.getFile();
@@ -293,10 +293,10 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
addPluginArtifact(artifactsPath);
artifactsPath.addAll(classPath);
-
+
String args[] = createForkOnceArgs(wargs);
runForked(artifactsPath, ForkOnceCodeGenerator.class, args);
-
+
for (WadlOption option : toDo) {
File dirs[] = option.getDeleteDirs();
if (dirs != null) {
@@ -363,27 +363,27 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
return resourceClassLoader;
}
-
- protected Bus callCodeGenerator(WadlOption option,
+
+ protected Bus callCodeGenerator(WadlOption option,
Bus bus,
Set<URI> classPath) throws MojoExecutionException {
File outputDirFile = option.getOutputDir();
outputDirFile.mkdirs();
URI basedir = project.getBasedir().toURI();
-
+
for (URI wadlURI : option.getWadlURIs(basedir, getResourceLoader())) {
File doneFile = getDoneFile(basedir, wadlURI);
-
+
if (!shouldRun(option, doneFile, wadlURI)) {
return bus;
}
doneFile.delete();
-
+
List<String> list = option.generateCommandLine(outputDirFile, basedir, wadlURI, getLog()
.isDebugEnabled());
String[] args = list.toArray(new String[list.size()]);
getLog().debug("Calling wadl2java with args: " + Arrays.toString(args));
-
+
if (!"false".equals(fork)) {
Set<URI> artifactsPath = new LinkedHashSet<URI>();
for (Artifact a : pluginArtifacts) {
@@ -397,9 +397,9 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
addPluginArtifact(artifactsPath);
artifactsPath.addAll(classPath);
-
+
runForked(artifactsPath, WADLToJava.class, args);
-
+
} else {
if (bus == null) {
bus = BusFactory.newInstance().createBus();
@@ -410,10 +410,10 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
} catch (Throwable e) {
getLog().debug(e);
throw new MojoExecutionException(e.getMessage(), e);
- }
+ }
}
-
-
+
+
try {
doneFile.createNewFile();
} catch (Throwable e) {
@@ -449,15 +449,15 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
cmd.createArg().setLine(additionalJvmArgs);
-
+
File file = null;
try {
- //file = new File("/tmp/test.jar");
+ //file = new File("/tmp/test.jar");
file = FileUtils.createTempFile("cxf-codegen", ".jar");
JarArchiver jar = new JarArchiver();
jar.setDestFile(file.getAbsoluteFile());
-
+
Manifest manifest = new Manifest();
Attribute attr = new Attribute();
attr.setName("Class-Path");
@@ -467,7 +467,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
}
attr.setValue(b.toString());
manifest.getMainSection().addConfiguredAttribute(attr);
-
+
attr = new Attribute();
attr.setName("Main-Class");
attr.setValue(cls.getName());
@@ -475,16 +475,16 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
jar.addConfiguredManifest(manifest);
jar.createArchive();
-
+
cmd.createArg().setValue("-jar");
cmd.createArg().setValue(file.getAbsolutePath());
-
+
} catch (Exception e1) {
throw new MojoExecutionException("Could not create runtime jar", e1);
}
cmd.addArguments(args);
-
+
CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer();
@@ -532,7 +532,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
private File getDoneFile(URI basedir, URI wadlURI) {
String doneFileName = wadlURI.toString();
-
+
// Strip the basedir from the doneFileName
if (doneFileName.startsWith(basedir.toString())) {
doneFileName = doneFileName.substring(basedir.toString().length());
@@ -548,7 +548,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
/**
* Determine if code should be generated from the given wadl
- *
+ *
* @param wadlOption
* @param doneFile
* @param wadlURI
@@ -585,7 +585,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
/**
* Recursively delete the given directory
- *
+ *
* @param f
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
index 946038f..785c7ce 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
@@ -33,7 +33,7 @@ public class Option {
protected File outputDir;
/**
- * A set of dependent files used to detect the generator must process WSDL, even
+ * A set of dependent files used to detect the generator must process WSDL, even
* if generator marker files are up to date.
*/
File dependencies[];
@@ -42,7 +42,7 @@ public class Option {
* Redundant directories to be deleted after code generation
*/
File redundantDirs[];
-
+
/**
* Extra arguments to pass to the command-line code generator. For compatibility as well as to
* specify any extra flags not addressed by other parameters
@@ -58,35 +58,35 @@ public class Option {
* Specifies catalog file to map the imported wadl/schema
*/
String catalog;
-
+
/**
* Specifies resource id
*/
private String resourcename;
-
+
/**
- * Specifies package name of WADL resource elements
+ * Specifies package name of WADL resource elements
*/
private String packagename;
-
+
/**
* Enables or disables generation of the impl classes. Default value is false.
* If set then only implementation classes will be generated
*/
private Boolean generateImpl;
-
+
/**
* Enables or disables generation of the interface classes. Setting this property
* only makes sense when generateImpl is also set. In other cases it is ignored and
* interfaces are always generated.
- *
- *
- *
+ *
+ *
+ *
*/
private Boolean generateInterface;
-
+
/**
- *
+ *
*/
private List<String> schemaPackagenames = new ArrayList<>();
@@ -117,7 +117,7 @@ public class Option {
public void setOutputDir(File f) {
outputDir = f;
}
-
+
public void setBindingFiles(String files[]) {
bindingFiles = files;
}
@@ -130,7 +130,7 @@ public class Option {
bindingFiles = tmp;
bindingFiles[bindingFiles.length - 1] = file.getAbsolutePath();
}
-
+
public List<String> getSchemaPackagenames() {
return schemaPackagenames;
}
@@ -138,7 +138,7 @@ public class Option {
public void setSchemaPackagenames(List<String> pn) {
this.schemaPackagenames = pn;
}
-
+
public String getCatalog() {
return catalog;
}
@@ -146,7 +146,7 @@ public class Option {
public void setCatalog(String catalog) {
this.catalog = catalog;
}
-
+
public String getPackagename() {
return packagename;
}
@@ -166,15 +166,15 @@ public class Option {
public boolean isImpl() {
return generateImpl == null ? false : generateImpl;
}
-
+
public void setImpl(boolean impl) {
this.generateImpl = impl;
}
-
+
public boolean isInterface() {
return generateInterface == null ? false : generateInterface;
}
-
+
public void setInterface(boolean interf) {
this.generateInterface = interf;
}
@@ -187,7 +187,7 @@ public class Option {
this.extraargs.clear();
this.extraargs.addAll(ea);
}
-
+
public void copyOptions(Option destination) {
destination.setBindingFiles(getBindingFiles());
destination.setCatalog(getCatalog());
@@ -198,16 +198,16 @@ public class Option {
destination.setOutputDir(getOutputDir());
destination.setExtraargs(getExtraargs());
}
-
-
-
+
+
+
private <T> T setIfNull(T dest, T source) {
if (dest == null) {
dest = source;
}
return dest;
}
-
+
public void merge(Option defaultOptions) {
catalog = setIfNull(catalog, defaultOptions.catalog);
generateImpl = setIfNull(generateImpl, defaultOptions.generateImpl);
@@ -220,7 +220,7 @@ public class Option {
schemaPackagenames.addAll(defaultOptions.schemaPackagenames);
extraargs.addAll(defaultOptions.extraargs);
}
-
+
@SuppressWarnings("unchecked")
private <T> T[] mergeList(T[] l1, T[] l2, Class<T> cls) {
if (l1 == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
index 3c8abc0..d0c728f 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
@@ -37,11 +37,11 @@ public final class OptionLoader {
private static final String WADL_TYPE = "wadl";
private static final String WADL_OPTIONS = "-options$";
private static final String WADL_BINDINGS = "-binding-?\\d*.xml$";
-
+
private OptionLoader() {
}
-
- public static List<WadlOption> loadWsdlOptionsFromDependencies(MavenProject project,
+
+ public static List<WadlOption> loadWsdlOptionsFromDependencies(MavenProject project,
Option defaultOptions, File outputDir) {
List<WadlOption> options = new ArrayList<>();
Set<Artifact> dependencies = project.getDependencyArtifacts();
@@ -76,7 +76,7 @@ public final class OptionLoader {
* Scan files in a directory and generate one wadlOption per file found. Extra args for code generation
* can be defined in a file that is named like the wadl file and ends in -options. Binding files can be
* defined in files named like the wadl file and end in -binding-*.xml
- *
+ *
* @param wadlBasedir
* @param includes file name patterns to include
* @param excludes file name patterns to exclude
@@ -84,9 +84,9 @@ public final class OptionLoader {
* @return list of one WadlOption object for each wadl found
* @throws MojoExecutionException
*/
- public static List<WadlOption> loadWadlOptionsFromFile(File wadlBasedir,
+ public static List<WadlOption> loadWadlOptionsFromFile(File wadlBasedir,
String includes[],
- String excludes[],
+ String excludes[],
Option defaultOptions,
File defaultOutputDir)
throws MojoExecutionException {
@@ -146,7 +146,7 @@ public final class OptionLoader {
}
- protected static WadlOption generateWadlOptionFromFile(final File wadl,
+ protected static WadlOption generateWadlOptionFromFile(final File wadl,
final Option defaultOptions,
File defaultOutputDir)
throws MojoExecutionException {
@@ -168,15 +168,15 @@ public final class OptionLoader {
if (defaultOptions != null) {
wadlOption.merge(defaultOptions);
}
-
-
+
+
final String wadlName = wadlFileName.substring(0, idx);
final String[] options = readOptionsFromFile(wadl.getParentFile(), wadlName);
if (options.length > 0) {
wadlOption.getExtraargs().addAll(Arrays.asList(options));
}
-
+
List<File> bindingFiles = FileUtils.getFiles(wadl.getParentFile(), wadlName + WADL_BINDINGS);
if (bindingFiles != null) {
for (File binding : bindingFiles) {
@@ -184,17 +184,17 @@ public final class OptionLoader {
}
}
wadlOption.setWadl(wadl.toURI().toString());
-
+
if (wadlOption.getOutputDir() == null) {
wadlOption.setOutputDir(defaultOutputDir);
}
return wadlOption;
}
-
+
private static String[] readOptionsFromFile(File dir, String wsdlName) throws MojoExecutionException {
String[] noOptions = new String[] {};
- List<File> files = FileUtils.getFiles(dir, wsdlName + WADL_OPTIONS);
+ List<File> files = FileUtils.getFiles(dir, wsdlName + WADL_OPTIONS);
if (files.size() <= 0) {
return noOptions;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
index 3ce347d..25b8fbd 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WADL2JavaMojo.java
@@ -50,11 +50,11 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
@Parameter(property = "cxf.testWadlRoot", defaultValue = "${basedir}/src/test/resources/wadl")
File testWadlRoot;
-
-
+
+
@Component
BuildContext buildContext;
-
+
private void mergeOptions(List<WadlOption> effectiveOptions) {
if (wadlOptions == null) {
return;
@@ -76,7 +76,7 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
File classesDir = new File(classesDirectory);
classesDir.mkdirs();
markerDirectory.mkdirs();
-
+
// add the generated source into compile source
// do this step first to ensure the source folder will be added to the Eclipse classpath
if (project != null && sourceRoot != null) {
@@ -85,7 +85,7 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
if (project != null && testSourceRoot != null) {
project.addTestCompileSourceRoot(testSourceRoot.getAbsolutePath());
}
-
+
// if this is an m2e configuration build then return immediately without doing any work
if (project != null && buildContext.isIncremental() && !buildContext.hasDelta(project.getBasedir())) {
return;
@@ -110,7 +110,7 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
} else {
for (WadlOption o : effectiveWsdlOptions) {
bus = callCodeGenerator(o, bus, cp);
-
+
File dirs[] = o.getDeleteDirs();
if (dirs != null) {
for (int idx = 0; idx < dirs.length; ++idx) {
@@ -129,12 +129,12 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
System.gc();
}
-
+
/**
* @return effective WsdlOptions
* @throws MojoExecutionException
*/
- private List<WadlOption> createWadlOptionsFromScansAndExplicitWadlOptions(File classesDir)
+ private List<WadlOption> createWadlOptionsFromScansAndExplicitWadlOptions(File classesDir)
throws MojoExecutionException {
List<WadlOption> effectiveOptions = new ArrayList<>();
mergeOptions(effectiveOptions);
@@ -147,13 +147,13 @@ public class WADL2JavaMojo extends AbstractCodeGeneratorMojo {
}
File defaultRoot = wadlRoot != null && wadlRoot.exists() ? wadlRoot : testWadlRoot;
effectiveOptions.addAll(
- OptionLoader.loadWadlOptionsFromFile(defaultRoot,
- includes,
- excludes,
- defaultOptions,
+ OptionLoader.loadWadlOptionsFromFile(defaultRoot,
+ includes,
+ excludes,
+ defaultOptions,
classesDir));
}
return effectiveOptions;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java
index 0d19d71..8e6a008 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/WadlOption.java
@@ -39,7 +39,7 @@ public class WadlOption extends Option {
String wadl;
String wadlFileExtension = "wadl";
-
+
/**
* Alternatively to the wadl string an artifact can be specified
*/
@@ -48,7 +48,7 @@ public class WadlOption extends Option {
public WadlOption() {
super();
}
-
+
public String getWadl() {
return wadl;
}
@@ -64,11 +64,11 @@ public class WadlOption extends Option {
public void setWadlArtifact(DocumentArtifact wadlArtifact) {
this.wadlArtifact = wadlArtifact;
}
-
+
/**
* Try to find a file matching the wadl path (either absolutely, relatively to the current dir or to
* the project base dir)
- *
+ *
* @return wadl file
*/
public File getDocumentFile(File baseDir) {
@@ -92,7 +92,7 @@ public class WadlOption extends Option {
}
return file;
}
-
+
public List<URI> getWadlURIs(URI baseURI, ClassLoader resourceLoader) {
String wadlLocation = getWadl();
if (wadlLocation.contains(".") && !wadlLocation.contains("*")) {
@@ -108,10 +108,10 @@ public class WadlOption extends Option {
}
return uris;
}
-
+
private URI getWadlURI(URI baseURI, String wadlLocation) {
File wadlFile = new File(wadlLocation);
- return wadlFile.exists() ? wadlFile.toURI()
+ return wadlFile.exists() ? wadlFile.toURI()
: baseURI.resolve(URIParserUtil.escapeChars(wadlLocation));
}
@@ -160,9 +160,9 @@ public class WadlOption extends Option {
return list;
}
-
+
// TODO: the following 3 helpers can go to a superclass or common utility class
- // to be used by WADL and WSDL Pptions
+ // to be used by WADL and WSDL Pptions
private static void addIfNotNull(List<String> list, Object value, String key) {
if (value != null) {
list.add(key);
@@ -186,7 +186,7 @@ public class WadlOption extends Option {
}
}
}
-
+
private static void addIfTrue(List<String> list, boolean expression, String key) {
if (expression) {
list.add(key);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
index a47f4a4..c5079ca 100644
--- a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
+++ b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
@@ -53,28 +53,28 @@ public class WSDLValidatorMojo extends AbstractMojo {
* @parameter expression="${cxf.wsdlRoot}" default-value="${basedir}/src/main/resources/wsdl"
*/
private File wsdlRoot;
-
+
/**
* @parameter expression="${cxf.testWsdlRoot}" default-value="${basedir}/src/test/resources/wsdl"
*/
private File testWsdlRoot;
-
+
/**
- * Directory in which the "DONE" markers are saved that
- * @parameter expression="${cxf.markerDirectory}"
+ * Directory in which the "DONE" markers are saved that
+ * @parameter expression="${cxf.markerDirectory}"
* default-value="${project.build.directory}/cxf-wsdl-validator-markers"
*/
private File markerDirectory;
/**
* A list of wsdl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
* *.wsdl
- *
+ *
* @parameter
*/
private String includes[];
/**
* A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
- *
+ *
* @parameter
*/
private String excludes[];
@@ -93,7 +93,7 @@ public class WSDLValidatorMojo extends AbstractMojo {
}
return str.toString();
}
-
+
private List<File> getWsdlFiles(File dir)
throws MojoExecutionException {
@@ -113,9 +113,9 @@ public class WSDLValidatorMojo extends AbstractMojo {
throw new MojoExecutionException(exc.getMessage(), exc);
}
}
-
+
private void processWsdl(File file) throws MojoExecutionException {
-
+
// If URL to WSDL, replace ? and & since they're invalid chars for file names
File doneFile =
new File(markerDirectory, "." + file.getName().replace('?', '_').replace('&', '_') + ".DONE");
@@ -124,11 +124,11 @@ public class WSDLValidatorMojo extends AbstractMojo {
doWork = true;
} else if (file.lastModified() > doneFile.lastModified()) {
doWork = true;
- }
+ }
if (doWork) {
doneFile.delete();
-
+
List<String> list = new ArrayList<>();
// verbose arg
@@ -145,7 +145,7 @@ public class WSDLValidatorMojo extends AbstractMojo {
try {
list.add(file.getCanonicalPath());
String[] pargs = list.toArray(new String[list.size()]);
-
+
ToolSpec spec = null;
try (InputStream toolspecStream = WSDLValidator.class .getResourceAsStream("wsdlvalidator.xml")) {
spec = new ToolSpec(toolspecStream, false);
@@ -159,7 +159,7 @@ public class WSDLValidatorMojo extends AbstractMojo {
doneFile.createNewFile();
} catch (Throwable e) {
- throw new MojoExecutionException(file.getName() + ": "
+ throw new MojoExecutionException(file.getName() + ": "
+ e.getMessage(), e);
}
}
@@ -171,9 +171,9 @@ public class WSDLValidatorMojo extends AbstractMojo {
"*.wsdl"
};
}
-
+
markerDirectory.mkdirs();
-
+
List<File> wsdls = new ArrayList<>();
if (wsdlRoot != null && wsdlRoot.exists()) {
wsdls.addAll(getWsdlFiles(wsdlRoot));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
index 8f0360a..57ba7fc 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/NoAriesBlueprintTest.java
@@ -37,7 +37,7 @@ import static org.ops4j.pax.exam.CoreOptions.when;
public class NoAriesBlueprintTest extends OSGiTestSupport {
/**
* Make sure cxf bundles start up without aries blueprint
- *
+ *
* @throws Exception
*/
@Test
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
index 5d842ff..9523faf 100644
--- a/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
+++ b/osgi/itests-felix/src/test/java/org/apache/cxf/osgi/itests/OSGiTestSupport.java
@@ -29,19 +29,19 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
/**
- *
+ *
*/
public class OSGiTestSupport {
@Inject
protected BundleContext bundleContext;
-
+
protected void assertBundleStarted(String name) {
Bundle bundle = findBundleByName(name);
Assert.assertNotNull("Bundle " + name + " should be installed", bundle);
Assert.assertEquals("Bundle " + name + " should be started", Bundle.ACTIVE, bundle.getState());
}
-
+
protected Bundle findBundleByName(String symbolicName) {
for (Bundle bundle : bundleContext.getBundles()) {
if (bundle.getSymbolicName().equals(symbolicName)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
index 6917b28..74d7d33 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/BundlesAndNamespacesTest.java
@@ -44,7 +44,7 @@ public class BundlesAndNamespacesTest extends CXFOSGiTestSupport {
assertBlueprintNamespacePublished("http://cxf.apache.org/configuration/parameterized-types", 1000);
assertBlueprintNamespacePublished("http://cxf.apache.org/configuration/security", 1000);
assertBlueprintNamespacePublished("http://schemas.xmlsoap.org/wsdl/", 1000);
-
+
assertBundleStarted("org.apache.cxf.cxf-rt-frontend-jaxws");
assertBlueprintNamespacePublished("http://cxf.apache.org/blueprint/jaxws", 1000);
assertBlueprintNamespacePublished("http://cxf.apache.org/blueprint/simple", 1000);
@@ -54,7 +54,7 @@ public class BundlesAndNamespacesTest extends CXFOSGiTestSupport {
public Option[] config() {
return new Option[]{
cxfBaseConfig(),
- replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
+ replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg",
getConfigFile("/etc/org.ops4j.pax.logging.cfg")),
features(cxfUrl, "cxf-core", "cxf-jaxws"),
logLevel(LogLevel.INFO)};
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index cd6e41c..3ca758a 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -68,7 +68,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfi
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
/**
- *
+ *
*/
public class CXFOSGiTestSupport {
private static final String MAVEN_DEPENDENCIES_PROPERTIES = "/META-INF/maven/dependencies.properties";
@@ -128,10 +128,10 @@ public class CXFOSGiTestSupport {
} catch (Throwable t) {
throw new IllegalStateException(MAVEN_DEPENDENCIES_PROPERTIES + " can not be found", t);
}
- }
+ }
/**
* Create an {@link org.ops4j.pax.exam.Option} for using a .
- *
+ *
* @return
*/
protected Option cxfBaseConfig() {
@@ -160,10 +160,10 @@ public class CXFOSGiTestSupport {
protected Option testUtils() {
return mavenBundle().groupId("org.apache.cxf").artifactId("cxf-testutils").versionAsInProject();
}
-
+
/**
* Executes a shell command and returns output as a String. Commands have a default timeout of 10 seconds.
- *
+ *
* @param command
* @return
*/
@@ -173,7 +173,7 @@ public class CXFOSGiTestSupport {
/**
* Executes a shell command and returns output as a String. Commands have a default timeout of 10 seconds.
- *
+ *
* @param command The command to execute.
* @param timeout The amount of time in millis to wait for the command to execute.
* @param silent Specifies if the command should be displayed in the screen.
@@ -214,7 +214,7 @@ public class CXFOSGiTestSupport {
/**
* Executes multiple commands inside a Single Session. Commands have a default timeout of 10 seconds.
- *
+ *
* @param commands
* @return
*/
@@ -329,7 +329,7 @@ public class CXFOSGiTestSupport {
/**
* Finds a free port starting from the give port numner.
- *
+ *
* @return
*/
protected int getFreePort(int port) {
@@ -341,7 +341,7 @@ public class CXFOSGiTestSupport {
/**
* Returns true if port is available for use.
- *
+ *
* @param port
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java
index 10bab48..6428261 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/Book.java
@@ -29,15 +29,15 @@ public class Book {
private String name;
@Min(0)
private long id;
-
+
public Book() {
}
-
+
public Book(String name, long id) {
this.name = name;
this.id = id;
}
-
+
public void setName(String n) {
name = n;
}
@@ -45,12 +45,12 @@ public class Book {
public String getName() {
return name;
}
-
+
public void setId(long i) {
id = i;
}
public long getId() {
return id;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
index 07a55bb..a8961ba 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/BookStore.java
@@ -55,12 +55,12 @@ import org.hibernate.validator.HibernateValidatorConfiguration;
public class BookStore {
private Map<Long, Book> books = new HashMap<Long, Book>();
- @Context
+ @Context
private UriInfo ui;
- @Context
+ @Context
private ResourceInfo rcInfo;
-
+
@Context
private ResourceContext resourceContext;
@@ -70,7 +70,7 @@ public class BookStore {
public BookStore() {
init();
}
-
+
@GET
@Path("/books/{id}")
public Response getBookRoot(@PathParam("id") Long id) {
@@ -85,7 +85,7 @@ public class BookStore {
@PUT
@Path("/books/{id}")
public Response updateBook(@PathParam("id") Long id, Book book) {
- assertInjections();
+ assertInjections();
Book b = books.get(id);
if (b == null) {
return Response.status(Status.NOT_FOUND).build();
@@ -124,7 +124,7 @@ public class BookStore {
return createBook(book);
}
-
+
@POST
@Path("/books")
public Response createBook(Book book) {
@@ -154,13 +154,13 @@ public class BookStore {
private void init() {
books.clear();
-
+
Book book = new Book();
book.setId(123);
book.setName("CXF in Action");
books.put(book.getId(), book);
}
-
+
private void assertInjections() {
if (ui.getAbsolutePath() == null) {
throw new IllegalArgumentException("UriInfo absolute path is null");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
index ccccdcc..4e01a17 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/jaxrs/JaxRsServiceTest.java
@@ -56,13 +56,13 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
Client client = ClientBuilder.newClient();
wt = client.target(BASE_URL);
}
-
+
@Test
public void testJaxRsGet() throws Exception {
Book book = wt.path("/books/123").request("application/xml").get(Book.class);
Assert.assertNotNull(book);
}
-
+
@Test
public void testJaxRsPost() throws Exception {
Book book = new Book();
@@ -104,7 +104,7 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
Assert.assertEquals(Status.OK.getStatusCode(), response.getStatus());
}
-
+
@Configuration
public Option[] config() {
return new Option[] {
@@ -127,5 +127,5 @@ public class JaxRsServiceTest extends CXFOSGiTestSupport {
.set(Constants.BUNDLE_ACTIVATOR, JaxRsTestActivator.class.getName())
.build(TinyBundles.withBnd());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
index 3aa9c1a..9b007a4 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -56,14 +56,14 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
String res = greeter.greetMe("Chris");
Assert.assertEquals("Hi Chris", res);
}
-
+
private Greeter greeterHttpProxy(String port) {
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
factory.setServiceClass(Greeter.class);
factory.setAddress("http://localhost:" + port + "/cxf/greeter");
return factory.create(Greeter.class);
}
-
+
@Configuration
public Option[] config() {
return new Option[] {
@@ -83,5 +83,5 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
.set(Constants.BUNDLE_ACTIVATOR, HttpTestActivator.class.getName())
.build(TinyBundles.withBnd());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
index 6fa7226..06ae938 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
@@ -36,7 +36,7 @@ public class HttpTestActivator implements BundleActivator {
factory.setAddress("/greeter");
factory.setServiceBean(new GreeterImpl());
server = factory.create();
-
+
factory = new JaxWsServerFactoryBean();
factory.setServiceClass(Greeter.class);
factory.setAddress("http://localhost:" + PORT + "/cxf/greeter");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
index 7a797e8..6363b28 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsServiceTest.java
@@ -66,7 +66,7 @@ public class JmsServiceTest extends CXFOSGiTestSupport {
}
private ActiveMQConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory connectionFactory
+ ActiveMQConnectionFactory connectionFactory
= new ActiveMQConnectionFactory("vm://JmsServiceTest");
connectionFactory.setUserName("karaf");
connectionFactory.setPassword("karaf");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java
index 213b623..44fc44f 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/JmsTestActivator.java
@@ -50,7 +50,7 @@ public class JmsTestActivator implements BundleActivator {
}
private ActiveMQConnectionFactory createConnectionFactory() {
- ActiveMQConnectionFactory connectionFactory
+ ActiveMQConnectionFactory connectionFactory
= new ActiveMQConnectionFactory("vm://JmsServiceTest");
connectionFactory.setUserName("karaf");
connectionFactory.setPassword("karaf");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
index 5ea70a8..c6ca7d9 100644
--- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
+++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java
@@ -32,7 +32,7 @@ import org.apache.karaf.shell.api.console.Terminal;
import org.apache.karaf.shell.support.table.ShellTable;
/**
- *
+ *
*/
@Command(scope = "cxf", name = "list-busses", description = "Lists all CXF Busses.")
@Service
[17/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java
index 39f972c..bf66254 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java
@@ -38,7 +38,7 @@ public class CorbaMessage extends AbstractWrappedMessage {
private CorbaStreamable except;
private SystemException systemExcept;
private CorbaTypeMap corbaTypeMap;
-
+
private NVList list;
public CorbaMessage(Message m) {
@@ -46,26 +46,26 @@ public class CorbaMessage extends AbstractWrappedMessage {
if (m instanceof CorbaMessage) {
CorbaMessage msg = (CorbaMessage)m;
CorbaStreamable[] data = msg.getStreamableArguments();
- setStreamableArguments(data);
+ setStreamableArguments(data);
returnParam = msg.getStreamableReturn();
except = msg.getStreamableException();
systemExcept = msg.getSystemException();
list = msg.getList();
corbaTypeMap = msg.getCorbaTypeMap();
} else {
- this.arguments = new ArrayList<>();
- }
+ this.arguments = new ArrayList<>();
+ }
}
-
+
public void setList(NVList lst) {
this.list = lst;
}
-
+
public NVList getList() {
return this.list;
}
-
+
public CorbaStreamable getStreamableException() {
return this.except;
}
@@ -73,11 +73,11 @@ public class CorbaMessage extends AbstractWrappedMessage {
public CorbaStreamable getStreamableReturn() {
return this.returnParam;
}
-
+
public SystemException getSystemException() {
return this.systemExcept;
}
-
+
public void setSystemException(SystemException sysEx) {
systemExcept = sysEx;
}
@@ -89,7 +89,7 @@ public class CorbaMessage extends AbstractWrappedMessage {
this.arguments.add(arg);
}
-
+
public CorbaStreamable[] getStreamableArguments() {
return this.arguments.toArray(new CorbaStreamable[this.arguments.size()]);
}
@@ -100,9 +100,9 @@ public class CorbaMessage extends AbstractWrappedMessage {
this.arguments = new ArrayList<>(data.length);
}
- for (CorbaStreamable streamable : data) {
+ for (CorbaStreamable streamable : data) {
addStreamableArgument(streamable);
- }
+ }
}
public void setStreamableArgumentValue(CorbaObjectHandler data, int idx) {
@@ -127,11 +127,11 @@ public class CorbaMessage extends AbstractWrappedMessage {
// TODO: Handle case of the return parameter has not yet been initialized.
returnParam.setObject(data);
}
-
+
public void setStreamableException(CorbaStreamable ex) {
except = ex;
}
-
+
public void setStreamableExceptionValue(CorbaObjectHandler exData) {
// TODO: Handle case of the return parameter has not yet been initialized.
except.setObject(exData);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
index 7f9a968..69308e8 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
@@ -73,7 +73,7 @@ public class CorbaServerConduit implements Conduit {
}
}
- public void close(Message message) throws IOException {
+ public void close(Message message) throws IOException {
if (message instanceof CorbaMessage) {
buildRequestResult((CorbaMessage)message);
}
@@ -109,17 +109,17 @@ public class CorbaServerConduit implements Conduit {
public final String getAddress() {
return endpointInfo.getAddress();
}
-
-
- public void buildRequestResult(CorbaMessage msg) {
- Exchange exg = msg.getExchange();
+
+
+ public void buildRequestResult(CorbaMessage msg) {
+ Exchange exg = msg.getExchange();
ServerRequest request = exg.get(ServerRequest.class);
try {
- if (!exg.isOneWay()) {
+ if (!exg.isOneWay()) {
CorbaMessage inMsg = (CorbaMessage)msg.getExchange().getInMessage();
NVList list = inMsg.getList();
- if (msg.getStreamableException() != null) {
+ if (msg.getStreamableException() != null) {
Any exAny = CorbaAnyHelper.createAny(orb);
CorbaStreamable exception = msg.getStreamableException();
exAny.insert_Streamable(exception);
@@ -134,7 +134,7 @@ public class CorbaServerConduit implements Conduit {
if (list.item(i).flags() != org.omg.CORBA.ARG_IN.value) {
arguments[i].getObject().setIntoAny(list.item(i).value(),
arguments[i], true);
- }
+ }
}
}
@@ -150,10 +150,10 @@ public class CorbaServerConduit implements Conduit {
} catch (java.lang.Exception ex) {
throw new CorbaBindingException("Exception during buildRequestResult", ex);
}
- }
-
+ }
+
private class CorbaOutputStream extends CachedOutputStream {
-
+
CorbaOutputStream(Message m) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
index 857ec73..2d1dbba 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
@@ -64,7 +64,7 @@ public class CorbaTypeMap {
return typeCodeMap.get(name);
}
- // This is used by the Any type when trying to re-construct the type stored inside a
+ // This is used by the Any type when trying to re-construct the type stored inside a
// CORBA Any.
public QName getIdlType(TypeCode tc) {
String repId = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
index 8295427..92b81be 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
@@ -31,7 +31,7 @@ public final class TypeMapCache {
private TypeMapCache() {
//utility class
}
-
+
public static CorbaTypeMap get(ServiceInfo service) {
if (service != null) {
synchronized (service) {
@@ -44,7 +44,7 @@ public final class TypeMapCache {
service.setProperty(KEY, map);
}
}
- return map;
+ return map;
}
}
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java
index 80a64a1..8217503 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java
@@ -56,21 +56,21 @@ import org.apache.cxf.service.model.ServiceModelUtil;
import org.omg.CORBA.SystemException;
public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Message> {
-
- private static final Logger LOG = LogUtils.getL7dLogger(CorbaStreamFaultInInterceptor.class);
-
+
+ private static final Logger LOG = LogUtils.getL7dLogger(CorbaStreamFaultInInterceptor.class);
+
public CorbaStreamFaultInInterceptor() {
super(Phase.UNMARSHAL);
addAfter(ClientFaultConverter.class.getName());
- }
+ }
public void handleMessage(Message msg) {
CorbaMessage message = (CorbaMessage)msg;
-
-
+
+
try {
-
+
SystemException sysEx = message.getSystemException();
if (sysEx != null) {
// TODO: Do we need anything else to handle system exceptions here...i.e. do
@@ -85,16 +85,16 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
BindingOperationInfo bopInfo = message.getExchange().getBindingOperationInfo();
OperationInfo opInfo = bopInfo.getOperationInfo();
-
+
ServiceInfo service = message.getExchange().getEndpoint().getEndpointInfo().getService();
-
+
org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) message.get(CorbaConstants.ORB);
if (orb == null) {
- orb = message.getExchange().get(org.omg.CORBA.ORB.class);
+ orb = message.getExchange().get(org.omg.CORBA.ORB.class);
}
QName elName = new QName("", exStreamable.getName());
FaultInfo fault = getFaultInfo(opInfo, elName);
-
+
CorbaTypeEventProducer faultEventProducer =
CorbaHandlerUtils.getTypeEventProducer(exStreamable.getObject(),
service,
@@ -108,13 +108,13 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
Class<?> beanClass = e.getClass();
Constructor<?> constructor =
exClass.getConstructor(new Class[]{String.class, beanClass});
-
- String repId = (message.getStreamableException()._type().id() != null)
+
+ String repId = (message.getStreamableException()._type().id() != null)
? message.getStreamableException()._type().id()
: "";
e = constructor.newInstance(new Object[]{repId, e});
} else {
- // Get the Fault
+ // Get the Fault
Fault faultEx = (Fault) message.getContent(Exception.class);
if (e instanceof Document) {
createFaultDetail((Document)e, fault, faultEx);
@@ -137,9 +137,9 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
Document faultDoc = DOMUtils.createDocument();
Element faultElement = faultDoc.createElement("detail");
faultDoc.appendChild(faultElement);
- Element partElement =
+ Element partElement =
faultDoc.createElementNS(partInfoName.getNamespaceURI(), partInfoName.getLocalPart());
-
+
Element faultDataElement = (Element) faultData.getFirstChild();
Node node = faultDataElement.getFirstChild();
while (node != null) {
@@ -151,7 +151,7 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
faultEx.setDetail(faultElement);
}
-
+
protected FaultInfo getFaultInfo(OperationInfo opInfo, QName faultName) {
Iterator<FaultInfo> faults = opInfo.getFaults().iterator();
while (faults.hasNext()) {
@@ -169,7 +169,7 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
protected DataReader<XMLStreamReader> getDataReader(CorbaMessage message) {
Service serviceModel = ServiceModelUtil.getService(message.getExchange());
- DataReader<XMLStreamReader> dataReader =
+ DataReader<XMLStreamReader> dataReader =
serviceModel.getDataBinding().createReader(XMLStreamReader.class);
if (dataReader == null) {
throw new CorbaBindingException("Couldn't create data reader for incoming fault message");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
index 4bfcef5..451d35e 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
@@ -88,13 +88,13 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
orb = (ORB) message.get(CorbaConstants.ORB);
if (orb == null) {
- orb = exchange.get(ORB.class);
+ orb = exchange.get(ORB.class);
}
-
+
DataWriter<XMLStreamWriter> writer = getDataWriter(message);
Throwable ex = message.getContent(Exception.class);
- // JCGS. If the cause is not available I can only continue if the exception
+ // JCGS. If the cause is not available I can only continue if the exception
// is a Fault instance and contains a detail object.
if (ex.getCause() == null) {
if ((ex instanceof Fault) && (((Fault)ex).getDetail() != null)) {
@@ -105,7 +105,7 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
} else {
ex = ex.getCause();
}
-
+
if (ex instanceof InvocationTargetException) {
ex = ex.getCause();
}
@@ -114,7 +114,7 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
setSystemException(message, ex, destination);
return;
}
-
+
String exClassName = null;
if (faultEx == null) {
//REVISIT, we should not have to depend on WebFault annotation
@@ -134,14 +134,14 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
// definition.
// We need this to marshal data correctly
- BindingInfo bInfo = destination.getBindingInfo();
-
+ BindingInfo bInfo = destination.getBindingInfo();
+
String opName = message.getExchange().get(String.class);
-
+
Iterator<BindingOperationInfo> iter = bInfo.getOperations().iterator();
BindingOperationInfo bopInfo = null;
- OperationType opType = null;
+ OperationType opType = null;
while (iter.hasNext()) {
bopInfo = iter.next();
if (bopInfo.getName().getLocalPart().equals(opName)) {
@@ -154,13 +154,13 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
}
OperationInfo opInfo = bopInfo.getOperationInfo();
-
+
if (faultEx != null) {
MessagePartInfo partInfo = getFaultMessagePartInfo(opInfo, new QName("", exClassName));
if (partInfo != null) {
exClassName = partInfo.getTypeQName().getLocalPart();
}
-
+
}
RaisesType exType = getRaisesType(opType, exClassName, ex);
@@ -168,8 +168,8 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
try {
if (exType != null) {
if (faultEx != null) {
- setUserExceptionFromFaultDetail(message,
- faultEx.getDetail(),
+ setUserExceptionFromFaultDetail(message,
+ faultEx.getDetail(),
exType, opInfo, writer,
exchange.getEndpoint().getEndpointInfo().getService());
} else {
@@ -255,12 +255,12 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
Class<?> faultClass = faultMethod.getReturnType();
fault = faultClass.newInstance();
}
-
- CorbaFaultStreamWriter faultWriter = new CorbaFaultStreamWriter(orb, exType,
+
+ CorbaFaultStreamWriter faultWriter = new CorbaFaultStreamWriter(orb, exType,
message.getCorbaTypeMap(), service);
writer.write(fault, faultPart, faultWriter);
- CorbaObjectHandler[] objs = faultWriter.getCorbaObjects();
+ CorbaObjectHandler[] objs = faultWriter.getCorbaObjects();
CorbaStreamable streamable = message.createStreamableObject(objs[0], elName);
message.setStreamableException(streamable);
}
@@ -275,42 +275,42 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
QName exIdlType = exType.getException();
QName elName = new QName("", exIdlType.getLocalPart());
MessagePartInfo faultPart = getFaultMessagePartInfo(opInfo, elName);
-
+
// faultDetailt.getFirstChild() skips the "detail" element
Object fault = extractPartsInfoFromDetail((Element) faultDetail.getFirstChild(), exType);
-
- CorbaFaultStreamWriter faultWriter = new CorbaFaultStreamWriter(orb, exType,
+
+ CorbaFaultStreamWriter faultWriter = new CorbaFaultStreamWriter(orb, exType,
message.getCorbaTypeMap(), service);
writer.write(fault, faultPart, faultWriter);
- CorbaObjectHandler[] objs = faultWriter.getCorbaObjects();
+ CorbaObjectHandler[] objs = faultWriter.getCorbaObjects();
CorbaStreamable streamable = message.createStreamableObject(objs[0], elName);
message.setStreamableException(streamable);
}
-
+
private Object extractPartsInfoFromDetail(Element faultDetail, RaisesType exType) {
Document faultDoc = DOMUtils.createDocument();
Element faultElement = faultDoc.createElement(exType.getException().getLocalPart());
faultDoc.appendChild(faultElement);
-
+
Node node = faultDetail.getFirstChild();
while (node != null) {
Node importedFaultData = faultDoc.importNode(node, true);
faultElement.appendChild(importedFaultData);
- node = node.getNextSibling();
+ node = node.getNextSibling();
}
-
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Exception DOM: " + StaxUtils.toString(faultElement));
}
return faultDoc;
}
-
+
protected DataWriter<XMLStreamWriter> getDataWriter(CorbaMessage message) {
Service serviceModel = ServiceModelUtil.getService(message.getExchange());
- DataWriter<XMLStreamWriter> dataWriter =
+ DataWriter<XMLStreamWriter> dataWriter =
serviceModel.getDataBinding().createWriter(XMLStreamWriter.class);
if (dataWriter == null) {
throw new CorbaBindingException("Couldn't create data writer for outgoing fault message");
@@ -332,6 +332,6 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
}
return null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
index 606d9fc..96532cd 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
@@ -68,7 +68,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
public CorbaStreamInInterceptor() {
super(Phase.PRE_STREAM);
- }
+ }
public void handleMessage(Message message) throws Fault {
if (ContextUtils.isRequestor(message)) {
@@ -91,7 +91,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
CorbaMessage message = (CorbaMessage)msg;
if (message.getStreamableException() != null || message.getSystemException() != null) {
- message.setContent(Exception.class,
+ message.setContent(Exception.class,
message.getExchange().getOutMessage().getContent(Exception.class));
Endpoint ep = message.getExchange().getEndpoint();
@@ -108,7 +108,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
CorbaTypeEventProducer eventProducer = null;
Exchange exchange = message.getExchange();
- BindingOperationInfo bindingOpInfo = exchange.getBindingOperationInfo();
+ BindingOperationInfo bindingOpInfo = exchange.getBindingOperationInfo();
BindingMessageInfo msgInfo = bindingOpInfo.getOutput();
boolean wrap = false;
@@ -150,7 +150,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
CorbaTypeMap typeMap = message.getCorbaTypeMap();
- BindingInfo bInfo = destination.getBindingInfo();
+ BindingInfo bInfo = destination.getBindingInfo();
InterfaceInfo info = bInfo.getInterface();
String opName = exchange.get(String.class);
Iterator<BindingOperationInfo> i = bInfo.getOperations().iterator();
@@ -173,7 +173,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
orb = exchange.get(ORB.class);
ServerRequest request = exchange.get(ServerRequest.class);
- NVList list = prepareArguments(message, info, opType,
+ NVList list = prepareArguments(message, info, opType,
opQName, typeMap,
destination, service);
request.arguments(list);
@@ -210,51 +210,51 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
QName opQName,
CorbaTypeMap typeMap,
CorbaDestination destination,
- ServiceInfo service) {
- BindingInfo bInfo = destination.getBindingInfo();
+ ServiceInfo service) {
+ BindingInfo bInfo = destination.getBindingInfo();
EndpointInfo eptInfo = destination.getEndPointInfo();
BindingOperationInfo bOpInfo = bInfo.getOperation(opQName);
- OperationInfo opInfo = bOpInfo.getOperationInfo();
+ OperationInfo opInfo = bOpInfo.getOperationInfo();
Exchange exg = corbaMsg.getExchange();
exg.put(BindingInfo.class, bInfo);
exg.put(InterfaceInfo.class, info);
exg.put(EndpointInfo.class, eptInfo);
exg.put(EndpointReferenceType.class, destination.getAddress());
exg.put(ServiceInfo.class, service);
- exg.put(BindingOperationInfo.class, bOpInfo);
+ exg.put(BindingOperationInfo.class, bOpInfo);
exg.put(OperationInfo.class, opInfo);
exg.put(MessageInfo.class, opInfo.getInput());
- exg.put(String.class, opQName.getLocalPart());
+ exg.put(String.class, opQName.getLocalPart());
exg.setInMessage(corbaMsg);
corbaMsg.put(MessageInfo.class, opInfo.getInput());
-
- List<ParamType> paramTypes = opType.getParam();
- CorbaStreamable[] arguments = new CorbaStreamable[paramTypes.size()];
- NVList list = prepareDIIArgsList(corbaMsg, bOpInfo,
- arguments, paramTypes,
+
+ List<ParamType> paramTypes = opType.getParam();
+ CorbaStreamable[] arguments = new CorbaStreamable[paramTypes.size()];
+ NVList list = prepareDIIArgsList(corbaMsg, bOpInfo,
+ arguments, paramTypes,
typeMap,
- exg.get(ORB.class), service);
-
+ exg.get(ORB.class), service);
+
return list;
-
+
}
-
+
protected NVList prepareDIIArgsList(CorbaMessage corbaMsg,
BindingOperationInfo boi,
- CorbaStreamable[] streamables,
+ CorbaStreamable[] streamables,
List<ParamType> paramTypes,
CorbaTypeMap map,
ORB orb,
ServiceInfo service) {
try {
- // Build the list of DII arguments, returns, and exceptions
- NVList list = orb.create_list(streamables.length);
+ // Build the list of DII arguments, returns, and exceptions
+ NVList list = orb.create_list(streamables.length);
OperationInfo opInfo = boi.getOperationInfo();
- MessageInfo input = opInfo.getInput();
+ MessageInfo input = opInfo.getInput();
MessageInfo output = opInfo.getOutput();
-
+
String inWrapNSUri = null;
String outWrapNSUri = null;
@@ -297,7 +297,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
outMsgIndex++;
}
}
- CorbaObjectHandler obj =
+ CorbaObjectHandler obj =
CorbaHandlerUtils.initializeObjectHandler(orb, paramName, paramIdlType, map, service);
streamables[i] = corbaMsg.createStreamableObject(obj, paramName);
@@ -313,7 +313,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
streamables[i].getObject().setIntoAny(value, streamables[i], false);
}
- list.add_value(streamables[i].getName(), value, streamables[i].getMode());
+ list.add_value(streamables[i].getName(), value, streamables[i].getMode());
corbaMsg.addStreamableArgument(streamables[i]);
}
return list;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
index 407fad1..0de7dc0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
@@ -117,7 +117,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
for (Iterator<ParamType> iter = paramTypes.iterator(); iter.hasNext();) {
ParamType param = iter.next();
QName idlType = param.getIdltype();
-
+
QName paramName;
CorbaObjectHandler obj = null;
if (param.getMode().equals(ModeType.OUT)) {
@@ -207,7 +207,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
}
message.addStreamableArgument(streamable);
}
-
+
}
protected QName getMessageParamQName(MessageInfo msgInfo,
@@ -223,7 +223,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
return paramQName;
}
- protected String getWrappedParamNamespace(MessageInfo msgInfo) {
+ protected String getWrappedParamNamespace(MessageInfo msgInfo) {
MessagePartInfo part = msgInfo.getMessageParts().get(0);
if (part.isElement()) {
return part.getElementQName().getNamespaceURI();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
index c544ef4..7ec3265 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
@@ -105,9 +105,9 @@ public class CorbaStreamOutInterceptor extends AbstractPhaseInterceptor<Message>
}
}
CorbaStreamWriter writer = new CorbaStreamWriter(orb, params, typeMap, service, wrap);
- message.setContent(XMLStreamWriter.class, writer);
+ message.setContent(XMLStreamWriter.class, writer);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
index 35b4e8f..c3e04d9 100755
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
@@ -27,9 +27,9 @@ import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
-public final class SystemExceptionHelper
+public final class SystemExceptionHelper
implements org.omg.CORBA.portable.Streamable {
-
+
private static final int BAD_CONTEXT = 0;
private static final int BAD_INV_ORDER = 1;
private static final int BAD_OPERATION = 2;
@@ -66,7 +66,7 @@ public final class SystemExceptionHelper
private static final int TRANSACTION_UNAVAILABLE = 33;
private static final int TRANSIENT = 34;
private static final int UNKNOWN = 35;
-
+
private static final String[] IDS = {
"IDL:omg.org/CORBA/BAD_CONTEXT:1.0",
"IDL:omg.org/CORBA/BAD_INV_ORDER:1.0",
@@ -98,14 +98,14 @@ public final class SystemExceptionHelper
SystemException value;
TypeCode typeCode;
-
+
private SystemExceptionHelper() {
}
private SystemExceptionHelper(SystemException ex) {
value = ex;
}
-
-
+
+
private static int binarySearch(String[] arr, String value) {
int left = 0;
@@ -133,9 +133,9 @@ public final class SystemExceptionHelper
any.insert_Streamable(new SystemExceptionHelper(val));
}
-
-
- //CHECKSTYLE:OFF
+
+
+ //CHECKSTYLE:OFF
//NCSS is to high for this due to the massive switch statement
public static SystemException read(org.omg.CORBA.portable.InputStream in) {
@@ -258,13 +258,13 @@ public final class SystemExceptionHelper
return ex;
}
//CHECKSTYLE:ON
-
-
-
+
+
+
public void _read(InputStream instream) {
value = read(instream);
}
-
+
public TypeCode _type() {
if (typeCode == null) {
ORB orb = ORB.init();
@@ -288,7 +288,7 @@ public final class SystemExceptionHelper
name = className.substring(className.lastIndexOf('.') + 1);
id = "IDL:omg.org/CORBA/" + name + ":1.0";
}
-
+
typeCode = orb.create_exception_tc(id, name, smBuf);
}
return typeCode;
@@ -300,7 +300,7 @@ public final class SystemExceptionHelper
id = "IDL:omg.org/CORBA/UNKNOWN";
} else {
String className = value.getClass().getName();
- id = "IDL:omg.org/CORBA/"
+ id = "IDL:omg.org/CORBA/"
+ className.substring(className.lastIndexOf('.') + 1) + ":1.0";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
index 663d41b..93a08a7 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
@@ -51,17 +51,17 @@ public class CorbaDSIServant extends DynamicImplementation {
private static final Logger LOG = LogUtils.getL7dLogger(CorbaDSIServant.class);
private ORB orb;
- private POA servantPOA;
+ private POA servantPOA;
private List<String> interfaces;
private MessageObserver incomingObserver;
private CorbaDestination destination;
private Map<String, QName> operationMap;
private CorbaTypeMap typeMap;
-
+
public CorbaDSIServant() {
//Complete
}
-
+
public void init(ORB theOrb,
POA poa,
CorbaDestination dest,
@@ -79,10 +79,10 @@ public class CorbaDSIServant extends DynamicImplementation {
destination = dest;
incomingObserver = observer;
typeMap = map;
-
+
// Get the list of interfaces that this servant will support
- try {
- BindingType bindType = destination.getBindingInfo().getExtensor(BindingType.class);
+ try {
+ BindingType bindType = destination.getBindingInfo().getExtensor(BindingType.class);
if (bindType == null) {
throw new CorbaBindingException("Unable to determine corba binding information");
}
@@ -102,7 +102,7 @@ public class CorbaDSIServant extends DynamicImplementation {
// the WSDL operation name may not always match the CORBA operation name.
BindingInfo bInfo = destination.getBindingInfo();
Iterator<BindingOperationInfo> i = bInfo.getOperations().iterator();
-
+
operationMap = new HashMap<String, QName>(bInfo.getOperations().size());
while (i.hasNext()) {
@@ -117,11 +117,11 @@ public class CorbaDSIServant extends DynamicImplementation {
public MessageObserver getObserver() {
return incomingObserver;
}
-
+
public void setObserver(MessageObserver observer) {
incomingObserver = observer;
}
-
+
public ORB getOrb() {
return orb;
}
@@ -141,11 +141,11 @@ public class CorbaDSIServant extends DynamicImplementation {
public void setCorbaTypeMap(CorbaTypeMap map) {
typeMap = map;
}
-
+
public void invoke(ServerRequest request) throws CorbaBindingException {
String opName = request.operation();
QName requestOperation = operationMap.get(opName);
-
+
MessageImpl msgImpl = new MessageImpl();
msgImpl.setDestination(getDestination());
Exchange exg = new ExchangeImpl();
@@ -155,7 +155,7 @@ public class CorbaDSIServant extends DynamicImplementation {
msgImpl.setExchange(exg);
CorbaMessage msg = new CorbaMessage(msgImpl);
msg.setCorbaTypeMap(typeMap);
-
+
// If there's no output message part in our operation then it's a oneway op
BindingMessageInfo bindingMsgOutputInfo = null;
BindingOperationInfo bindingOpInfo = null;
@@ -168,13 +168,13 @@ public class CorbaDSIServant extends DynamicImplementation {
bindingMsgOutputInfo = bindingOpInfo.getOutput();
if (bindingMsgOutputInfo == null) {
exg.setOneWay(true);
- }
+ }
}
-
+
// invokes the interceptors
getObserver().onMessage(msg);
}
-
+
public String[] _all_interfaces(POA poa, byte[] objectId) {
return interfaces.toArray(new String[interfaces.size()]);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
index 182024f..328de06 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
@@ -116,7 +116,7 @@ public class CorbaObjectReader {
case TCKind._tk_any:
((CorbaAnyHandler)obj).setValue(this.readAny());
break;
-
+
// Now for the complex types
case TCKind._tk_array:
this.readArray((CorbaArrayHandler)obj);
@@ -141,7 +141,7 @@ public class CorbaObjectReader {
break;
case TCKind._tk_objref:
this.readObjectReference((CorbaObjectReferenceHandler)obj);
- break;
+ break;
default:
// TODO: Provide Implementation. Do we throw an exception.
}
@@ -372,7 +372,7 @@ public class CorbaObjectReader {
discLabel = disc.getValue();
} else {
read(discriminator);
- discLabel = ((CorbaPrimitiveHandler)discriminator).getDataFromValue();
+ discLabel = ((CorbaPrimitiveHandler)discriminator).getDataFromValue();
}
// Now find the label in the union to get the right case
Unionbranch defaultBranch = null;
@@ -397,7 +397,7 @@ public class CorbaObjectReader {
break;
}
}
-
+
// If we never find a case that matches the value of the discriminiator, then we must have
// found the default case.
if (!caseFound && defaultBranch != null) {
@@ -418,7 +418,7 @@ public class CorbaObjectReader {
switch(arrayElements.get(0).getTypeCodeKind().value()) {
case TCKind._tk_boolean: {
boolean[] values = new boolean[arraySize];
- stream.read_boolean_array(values, 0, arraySize);
+ stream.read_boolean_array(values, 0, arraySize);
val = values;
break;
}
@@ -523,7 +523,7 @@ public class CorbaObjectReader {
List<CorbaObjectHandler> seqElements = sequenceObj.getElements();
int length = stream.read_ulong();
List<CorbaObjectHandler> elements = new ArrayList<>(length);
-
+
// Simply checking the bound won't handle our recursive types. We need to check for the
// existance of template, which will be present for all unbounded sequences and for bound
// sequences with recursive type elements. Use the template element to construct each
@@ -560,7 +560,7 @@ public class CorbaObjectReader {
private CorbaObjectHandler initializeCorbaObjectHandler(CorbaObjectHandler template) {
Constructor<?> templateConstructor = template.getClass().getDeclaredConstructors()[0];
Object[] params = new Object[4];
-
+
// Check to see if the template type is a recursive type. If so, it means that it is part
// of a sequence and needs to have the name "item" in order
if (template.isRecursive()) {
@@ -572,7 +572,7 @@ public class CorbaObjectReader {
params[1] = template.getIdlType();
params[2] = template.getTypeCode();
params[3] = template.getType();
-
+
CorbaObjectHandler handler = null;
try {
handler = (CorbaObjectHandler) templateConstructor.newInstance(params);
@@ -598,7 +598,7 @@ public class CorbaObjectReader {
for (int i = 0; i < members.size(); i++) {
CorbaObjectHandler member = initializeCorbaObjectHandler(members.get(i));
struct.addMember(member);
- }
+ }
} else if (template instanceof CorbaArrayHandler) {
CorbaArrayHandler templateArray = (CorbaArrayHandler) template;
CorbaArrayHandler array = (CorbaArrayHandler) handler;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
index fdc99f0..a6af129 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
@@ -126,7 +126,7 @@ public class CorbaObjectWriter {
break;
case TCKind._tk_objref:
this.writeObjectReference((CorbaObjectReferenceHandler)obj);
- break;
+ break;
default:
// TODO: Provide Implementation. Do we throw an exception.
}
@@ -265,14 +265,14 @@ public class CorbaObjectWriter {
Enum enumType = (Enum)enumHandler.getType();
String enumLabel = enumHandler.getValue();
List<Enumerator> enumerators = enumType.getEnumerator();
-
+
for (int i = 0; i < enumerators.size(); ++i) {
if (enumerators.get(i).getValue().equals(enumLabel)) {
stream.write_long(i);
return;
}
}
-
+
throw new CorbaBindingException("CorbaObjectWriter: unable to find enumeration label");
}
@@ -309,9 +309,9 @@ public class CorbaObjectWriter {
}
public void writeUnion(CorbaObjectHandler obj) throws CorbaBindingException {
- Union unionType = (Union) obj.getType();
+ Union unionType = (Union) obj.getType();
List<Unionbranch> branches = unionType.getUnionbranch();
- if (branches.size() > 0) {
+ if (branches.size() > 0) {
CorbaObjectHandler discriminator = ((CorbaUnionHandler)obj).getDiscriminator();
this.write(discriminator);
CorbaObjectHandler unionValue = ((CorbaUnionHandler)obj).getValue();
@@ -344,8 +344,8 @@ public class CorbaObjectWriter {
}
}
}
-
+
public void writeObjectReference(CorbaObjectReferenceHandler objHandler) throws CorbaBindingException {
stream.write_Object(objHandler.getReference());
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
index 6825d89..de0a1a9 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
@@ -32,10 +32,10 @@ import javax.xml.stream.events.Namespace;
import org.apache.cxf.binding.corba.types.CorbaTypeEventProducer;
public class CorbaStreamReader implements XMLStreamReader {
-
+
private CorbaTypeEventProducer eventProducer;
private int currentState;
-
+
public CorbaStreamReader(CorbaTypeEventProducer evProducer) {
eventProducer = evProducer;
currentState = XMLStreamReader.START_DOCUMENT;
@@ -138,7 +138,7 @@ public class CorbaStreamReader implements XMLStreamReader {
return ret;
}
-
+
public String getAttributeNamespace(int arg0) {
String ret = null;
List<Attribute> currentAttributes = eventProducer.getAttributes();
@@ -217,7 +217,7 @@ public class CorbaStreamReader implements XMLStreamReader {
// TODO Auto-generated method stub
return null;
}
-
+
};
}
@@ -333,7 +333,7 @@ public class CorbaStreamReader implements XMLStreamReader {
}
public void require(int arg0, String arg1, String arg2) throws XMLStreamException {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
}
public boolean standaloneSet() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
index ede89cd..24703f5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
@@ -57,10 +57,10 @@ public class CorbaStreamWriter implements XMLStreamWriter {
private Stack<QName> elements = new Stack<QName>();
private QName paramElement;
- private QName wrapElementName;
+ private QName wrapElementName;
private boolean skipWrap;
-
+
public CorbaStreamWriter(ORB orbRef,
CorbaTypeMap map,
@@ -180,7 +180,7 @@ public class CorbaStreamWriter implements XMLStreamWriter {
writeStartElement(localName);
writeEndElement();
}
-
+
public void writeEndDocument()
throws XMLStreamException {
}
@@ -309,9 +309,9 @@ public class CorbaStreamWriter implements XMLStreamWriter {
throws java.lang.IllegalArgumentException {
return null;
}
-
-
-
+
+
+
public class CorbaNamespaceContext implements NamespaceContext {
private Map<String, String> map;
@@ -325,7 +325,7 @@ public class CorbaStreamWriter implements XMLStreamWriter {
this.map = map;
this.parent = p;
}
-
+
public void push() {
parent = new CorbaNamespaceContext(map, parent);
map = new HashMap<String, String>();
@@ -336,7 +336,7 @@ public class CorbaStreamWriter implements XMLStreamWriter {
parent = parent.parent;
}
}
-
+
public void setPrefix(String pfx, String ns) {
map.put(pfx, ns);
}
@@ -377,5 +377,5 @@ public class CorbaStreamWriter implements XMLStreamWriter {
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
index cd860ce..c9a21bc 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
@@ -40,7 +40,7 @@ public class OrbConfigurer {
public void setOrbArgs(List<String> args) {
orbArgs = args;
}
-
+
public List<String> getOrbArgs() {
return orbArgs;
}
@@ -48,7 +48,7 @@ public class OrbConfigurer {
public Properties getOrbProperties() {
return orbProperties;
}
-
+
public void setOrbProperties(Properties props) {
orbProperties = props;
}
@@ -67,7 +67,7 @@ public class OrbConfigurer {
factory = b.getExtension(CorbaBindingFactory.class);
}
}
-
+
@PostConstruct
public void register() {
if (factory != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java
index 56bfc09..e8bd3a4 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java
@@ -27,7 +27,7 @@ public abstract class AbstractCorbaTypeListener implements CorbaTypeListener {
protected QName currentElement;
protected CorbaObjectHandler handler;
protected NamespaceContext ctx;
-
+
public AbstractCorbaTypeListener(CorbaObjectHandler h) {
handler = h;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
index 3c4e4a4..8d6ed4f 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
@@ -30,7 +30,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.omg.CORBA.ORB;
public abstract class AbstractNoStartEndEventProducer implements CorbaTypeEventProducer {
-
+
protected CorbaTypeEventProducer currentEventProducer;
protected Iterator<CorbaObjectHandler> iterator;
protected ServiceInfo serviceInfo;
@@ -51,7 +51,7 @@ public abstract class AbstractNoStartEndEventProducer implements CorbaTypeEventP
public boolean hasNext() {
return (currentEventProducer != null
? currentEventProducer.hasNext() : false)
- || (iterator != null ? iterator.hasNext() : false);
+ || (iterator != null ? iterator.hasNext() : false);
}
public int next() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
index 4dd3829..686f954 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
@@ -35,7 +35,7 @@ public abstract class AbstractStartEndEventProducer implements
protected int state;
protected final int[] states = {XMLStreamReader.START_ELEMENT, 0, XMLStreamReader.END_ELEMENT};
-
+
protected CorbaTypeEventProducer currentEventProducer;
protected QName name;
protected Iterator<CorbaObjectHandler> iterator;
@@ -63,9 +63,9 @@ public abstract class AbstractStartEndEventProducer implements
return state < states.length;
}
- public int next() {
+ public int next() {
int event = states[state];
- if (event != 0) {
+ if (event != 0) {
state++;
} else if (currentEventProducer != null && currentEventProducer.hasNext()) {
event = currentEventProducer.next();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
index 8032fb6..5a021db 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
@@ -23,7 +23,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.omg.CORBA.ORB;
public class CorbaAnonStructEventProducer extends AbstractNoStartEndEventProducer {
-
+
// No start and end elements for the sequence
public CorbaAnonStructEventProducer(CorbaObjectHandler h,
ServiceInfo service,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
index f6c57fe..b947ea3 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
@@ -67,21 +67,21 @@ public class CorbaAnyEventProducer extends AbstractStartEndEventProducer {
XMLEventFactory factory = XMLEventFactory.newInstance();
attributes = new ArrayList<>();
- attributes.add(factory.createAttribute(new QName(W3CConstants.NU_SCHEMA_XSI, "type"),
- ANY_TYPE_PREFIX + ":"
- + containedSchemaType.getLocalPart()));
+ attributes.add(factory.createAttribute(new QName(W3CConstants.NU_SCHEMA_XSI, "type"),
+ ANY_TYPE_PREFIX + ":"
+ + containedSchemaType.getLocalPart()));
namespaces = new ArrayList<>();
namespaces.add(factory.createNamespace(ANY_TYPE_PREFIX,
containedSchemaType.getNamespaceURI()));
}
- CorbaTypeEventProducer containedProducer =
+ CorbaTypeEventProducer containedProducer =
CorbaHandlerUtils.getTypeEventProducer(containedType, serviceInfo, orb);
if (containedProducer instanceof AbstractStartEndEventProducer) {
iterator = ((AbstractStartEndEventProducer)containedProducer).getNestedTypes();
} else {
List<CorbaTypeEventProducer> prods = new ArrayList<>();
- CorbaSimpleAnyContainedTypeEventProducer simpleProducer =
+ CorbaSimpleAnyContainedTypeEventProducer simpleProducer =
new CorbaSimpleAnyContainedTypeEventProducer(containedProducer.getText());
prods.add(simpleProducer);
producers = prods.iterator();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
index bf2cc59..42f90be 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
@@ -32,16 +32,16 @@ public class CorbaAnyHandler extends CorbaObjectHandler {
private Any value;
private CorbaObjectHandler containedType;
private CorbaTypeMap typeMap;
-
- public CorbaAnyHandler(QName anyName,
- QName anyIdlType,
- TypeCode anyTC,
+
+ public CorbaAnyHandler(QName anyName,
+ QName anyIdlType,
+ TypeCode anyTC,
Object anyType) {
super(anyName, anyIdlType, anyTC, anyType);
-
+
value = null;
}
-
+
public Any getValue() {
return value;
}
@@ -65,7 +65,7 @@ public class CorbaAnyHandler extends CorbaObjectHandler {
public CorbaTypeMap getTypeMap() {
return typeMap;
}
-
+
public void setValue(Any v) throws CorbaBindingException {
value = v;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java
index 9c7cce0..b7824d1 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java
@@ -93,7 +93,7 @@ public class CorbaAnyListener extends AbstractCorbaTypeListener {
CorbaObjectHandler obj = primitiveListener.getCorbaObject();
Any a = orb.create_any();
-
+
CorbaAnyHandler anyHandler = (CorbaAnyHandler)handler;
anyHandler.setValue(a);
anyHandler.setAnyContainedType(obj);
@@ -125,7 +125,7 @@ public class CorbaAnyListener extends AbstractCorbaTypeListener {
// typemap.
idlType = new QName(typeMap.getTargetNamespace(), schemaType.getLocalPart());
}
-
+
return idlType;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java
index 1e856c1..0a67141 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java
@@ -28,23 +28,23 @@ import org.omg.CORBA.TypeCode;
public class CorbaArrayHandler extends CorbaObjectHandler {
private List<CorbaObjectHandler> elements = new ArrayList<>();
-
+
public CorbaArrayHandler(QName arrayName, QName arrayIdlType, TypeCode arrayTC, Object arrayType) {
super(arrayName, arrayIdlType, arrayTC, arrayType);
}
-
+
public void addElement(CorbaObjectHandler el) {
elements.add(el);
}
-
+
public int getNumberOfElements() {
return elements.size();
}
-
+
public List<CorbaObjectHandler> getElements() {
return elements;
}
-
+
public CorbaObjectHandler getElement(int index) {
return elements.get(index);
}
@@ -53,5 +53,5 @@ public class CorbaArrayHandler extends CorbaObjectHandler {
for (int i = 0; i < elements.size(); i++) {
elements.get(i).clear();
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java
index d9fa878..121a943 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java
@@ -35,7 +35,7 @@ public class CorbaArrayListener extends AbstractCorbaTypeListener {
private QName currentElName;
private CorbaTypeListener currentTypeListener;
private ServiceInfo serviceInfo;
-
+
public CorbaArrayListener(CorbaObjectHandler handler,
CorbaTypeMap map,
ORB orbRef, ServiceInfo sInfo) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
index e9b4332..1a5c5c1 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
@@ -37,7 +37,7 @@ public class CorbaEnumEventProducer implements CorbaTypeEventProducer {
name = handler.getName();
}
- public String getLocalName() {
+ public String getLocalName() {
return handler.getSimpleName();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java
index d0ae4d5..d8298fb 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java
@@ -30,18 +30,18 @@ public class CorbaEnumHandler extends CorbaObjectHandler {
private String value;
private long index;
-
+
public CorbaEnumHandler(QName enumName, QName enumIdlType, TypeCode enumTC, Object enumType) {
super(enumName, enumIdlType, enumTC, enumType);
}
-
+
public String getValue() {
return value;
}
-
+
public void setValue(String val) {
value = val;
-
+
Enum enumType = (Enum)this.type;
List<Enumerator> enumerators = enumType.getEnumerator();
index = -1;
@@ -53,7 +53,7 @@ public class CorbaEnumHandler extends CorbaObjectHandler {
}
}
}
-
+
public long getIndex() {
return index;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java
index 6b81a1c..6550d9a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java
@@ -26,5 +26,5 @@ public class CorbaEnumListener extends AbstractCorbaTypeListener {
public void processCharacters(String text) {
((CorbaEnumHandler) handler).setValue(text);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java
index 7220b9b..f3922f5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java
@@ -31,29 +31,29 @@ public class CorbaExceptionHandler extends CorbaObjectHandler {
List<CorbaObjectHandler> members = new ArrayList<>();
String id;
-
+
public CorbaExceptionHandler(QName exName, QName exIdlType, TypeCode exTC, Object exType) {
name = exName;
idlType = exIdlType;
typeCode = exTC;
type = (NamedType)exType;
}
-
+
public void addMember(CorbaObjectHandler member) {
members.add(member);
}
-
+
public List<CorbaObjectHandler> getMembers() {
return members;
}
-
+
public CorbaObjectHandler getMember(int index) {
return members.get(index);
}
-
+
public CorbaObjectHandler getMemberByName(String name) {
CorbaObjectHandler member = null;
-
+
for (Iterator<CorbaObjectHandler> iterator = members.iterator(); iterator.hasNext();) {
CorbaObjectHandler current = iterator.next();
if (current.getName().getLocalPart().equals(name)) {
@@ -61,14 +61,14 @@ public class CorbaExceptionHandler extends CorbaObjectHandler {
break;
}
}
-
+
return member;
}
-
+
public String getId() {
return id;
}
-
+
public void setId(String eid) {
id = eid;
}
@@ -77,7 +77,7 @@ public class CorbaExceptionHandler extends CorbaObjectHandler {
for (int i = 0; i < members.size(); i++) {
members.get(i).clear();
}
- }
-
+ }
+
// TODO: Can we add the features that exist in the main package here?
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java
index 4e13aa8..aaec46a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java
@@ -41,7 +41,7 @@ public class CorbaExceptionListener extends AbstractCorbaTypeListener {
public CorbaExceptionListener(CorbaObjectHandler handler,
CorbaTypeMap map,
- ORB orbRef,
+ ORB orbRef,
ServiceInfo serviceInfo) {
super(handler);
orb = orbRef;
@@ -58,7 +58,7 @@ public class CorbaExceptionListener extends AbstractCorbaTypeListener {
CorbaHandlerUtils.getTypeListener(name,
exMembers.get(memberCount).getIdltype(),
typeMap,
- orb,
+ orb,
sInfo);
currentTypeListener.setNamespaceContext(ctx);
((CorbaExceptionHandler)handler).addMember(currentTypeListener.getCorbaObject());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
index bd0b652..f0d8810 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
@@ -38,7 +38,7 @@ public class CorbaFixedEventProducer implements CorbaTypeEventProducer {
name = handler.getName();
}
- public String getLocalName() {
+ public String getLocalName() {
return handler.getSimpleName();
}
@@ -57,7 +57,7 @@ public class CorbaFixedEventProducer implements CorbaTypeEventProducer {
public boolean hasNext() {
return state < states.length;
}
-
+
public List<Attribute> getAttributes() {
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
index 2d3e0b5..c628e6c 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
@@ -32,10 +32,10 @@ public final class CorbaFixedHandler extends CorbaObjectHandler {
private final long digits;
private final long scale;
private BigDecimal value;
-
+
public CorbaFixedHandler(QName fixedName, QName fixedIdlType, TypeCode fixedTC, Object fixedType) {
super(fixedName, fixedIdlType, fixedTC, fixedType);
-
+
if (fixedType instanceof Fixed) {
digits = ((Fixed)fixedType).getDigits();
scale = ((Fixed)fixedType).getScale();
@@ -48,32 +48,32 @@ public final class CorbaFixedHandler extends CorbaObjectHandler {
scale = 0;
}
}
-
+
public long getDigits() {
return digits;
}
-
+
public long getScale() {
return scale;
}
-
+
public BigDecimal getValue() {
return value;
}
-
+
public String getValueData() {
return value.toString();
}
-
+
public void setValue(BigDecimal val) {
value = val;
}
-
+
public void setValueFromData(String data) {
value = new BigDecimal(data);
}
public void clear() {
value = null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java
index 4728d95..ca940a2 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java
@@ -26,5 +26,5 @@ public class CorbaFixedListener extends AbstractCorbaTypeListener {
public void processCharacters(String text) {
((CorbaFixedHandler) handler).setValueFromData(text);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
index 3c348bb..0e79543 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
@@ -27,7 +27,7 @@ import org.omg.CORBA.Any;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
-// This class serves as a base for all other specific object type handlers and
+// This class serves as a base for all other specific object type handlers and
// provides basic functionality that is common for all objects.
public class CorbaObjectHandler {
@@ -40,34 +40,34 @@ public class CorbaObjectHandler {
public CorbaObjectHandler() {
}
-
+
public CorbaObjectHandler(QName objName, QName objIdlType, TypeCode objTC, Object objType) {
name = objName;
idlType = objIdlType;
typeCode = objTC;
type = (CorbaType)objType;
}
-
+
public QName getName() {
return name;
}
-
+
public String getSimpleName() {
return name.getLocalPart();
}
-
+
public QName getIdlType() {
return idlType;
}
-
+
public TypeCode getTypeCode() {
return typeCode;
}
-
+
public TCKind getTypeCodeKind() {
return typeCode.kind();
}
-
+
public CorbaType getType() {
return type;
}
@@ -88,9 +88,9 @@ public class CorbaObjectHandler {
return isRecursive;
}
- public void clear() {
+ public void clear() {
}
-
+
public void setIntoAny(Any value, CorbaStreamable stream, boolean output) {
value.insert_Streamable(stream);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
index 840bd0f..8b042aa 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
@@ -57,8 +57,8 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
private static final String INFER_FROM_TYPE_ID = "InferFromTypeId";
private static final Logger LOG = LogUtils.getL7dLogger(CorbaObjectReferenceEventProducer.class);
- List<Attribute> refAttrs;
-
+ List<Attribute> refAttrs;
+
public CorbaObjectReferenceEventProducer(CorbaObjectHandler h, ServiceInfo service, ORB orbRef) {
CorbaObjectReferenceHandler handler = (CorbaObjectReferenceHandler) h;
name = CorbaUtils.processQName(handler.getName(), service);
@@ -72,12 +72,12 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
}
List<CorbaTypeEventProducer> objRefProducers = new ArrayList<>();
-
+
String address = orb.object_to_string(handler.getReference());
objRefProducers.add(new CorbaAddressEventProducer(address));
Definition wsdlDef = (Definition)serviceInfo.getProperty(WSDLServiceBuilder.WSDL_DEFINITION);
-
+
// Get the TypeImpl of the object reference so that we can determine the binding
// needed for this object reference
org.apache.cxf.binding.corba.wsdl.Object objType =
@@ -85,7 +85,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
QName bindingName = objType.getBinding();
if (bindingName != null) {
EprMetaData eprInfo = null;
- if (INFER_FROM_TYPE_ID.equalsIgnoreCase(bindingName.getLocalPart())) {
+ if (INFER_FROM_TYPE_ID.equalsIgnoreCase(bindingName.getLocalPart())) {
String typeId = CorbaObjectReferenceHelper.extractTypeIdFromIOR(address);
if (!StringUtils.isEmpty(typeId)) {
eprInfo = getEprMetadataForTypeId(wsdlDef, typeId);
@@ -93,12 +93,12 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
LOG.log(Level.SEVERE, "For binding with value \"" + INFER_FROM_TYPE_ID
+ "\" the type_id of the object reference IOR must be set to its most"
+ " derived type. It is currently null indicating CORBA:Object."
- + " Address Url=" + address);
+ + " Address Url=" + address);
}
- } else {
+ } else {
eprInfo = getEprMetadataForBindingName(wsdlDef, bindingName);
}
-
+
if (eprInfo.isValid()) {
LOG.log(Level.FINE, "Epr metadata " + eprInfo);
// Create the meta data producer and add its child producers.
@@ -109,20 +109,20 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
CorbaInterfaceNameEventProducer interfaceProducer =
new CorbaInterfaceNameEventProducer(interfaceName);
CorbaMetaDataEventProducer metaProducer =
- new CorbaMetaDataEventProducer(wsdlLoc, nameProducer, interfaceProducer);
+ new CorbaMetaDataEventProducer(wsdlLoc, nameProducer, interfaceProducer);
objRefProducers.add(metaProducer);
}
}
producers = objRefProducers.iterator();
}
-
+
private EprMetaData getEprMetadataForBindingName(Definition wsdlDef, QName bindingName) {
- EprMetaData info = getObjectReferenceBinding(wsdlDef, bindingName);
+ EprMetaData info = getObjectReferenceBinding(wsdlDef, bindingName);
CorbaObjectReferenceHelper.populateEprInfo(info);
return info;
}
- private EprMetaData getEprMetadataForTypeId(Definition wsdlDef, String typeId) {
+ private EprMetaData getEprMetadataForTypeId(Definition wsdlDef, String typeId) {
EprMetaData info = CorbaObjectReferenceHelper.getBindingForTypeId(typeId, wsdlDef);
CorbaObjectReferenceHelper.populateEprInfo(info);
return info;
@@ -134,12 +134,12 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
}
return refAttrs;
}
-
+
protected EprMetaData getObjectReferenceBinding(Definition wsdlDef, QName bindingName) {
EprMetaData info = new EprMetaData();
Binding wsdlBinding = wsdlDef.getBinding(bindingName);
-
- // If the binding name does not have a namespace associated with it, then we'll need to
+
+ // If the binding name does not have a namespace associated with it, then we'll need to
// get the list of all bindings and compare their local parts against our name.
if (wsdlBinding == null && bindingName.getNamespaceURI().equals("")
&& !bindingName.getLocalPart().equals("")) {
@@ -151,12 +151,12 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
}
}
}
-
+
if (wsdlBinding != null) {
info.setBinding(wsdlBinding);
info.setCandidateWsdlDef(wsdlDef);
}
-
+
return info;
}
@@ -164,8 +164,8 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
class CorbaAddressEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.START_ELEMENT,
- XMLStreamReader.CHARACTERS,
+ int[] states = {XMLStreamReader.START_ELEMENT,
+ XMLStreamReader.CHARACTERS,
XMLStreamReader.END_ELEMENT};
final String address;
@@ -213,7 +213,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
CorbaMetaDataEventProducer(CorbaServiceNameEventProducer svc) {
this(null, svc, null);
}
-
+
CorbaMetaDataEventProducer(String location,
CorbaServiceNameEventProducer svc,
CorbaInterfaceNameEventProducer intf) {
@@ -227,7 +227,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
}
producers = metaDataProducers.iterator();
-
+
if (location != null) {
XMLEventFactory factory = XMLEventFactory.newInstance();
metaAttrs = new ArrayList<>();
@@ -244,7 +244,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
return metaAttrs;
}
}
-
+
}
// An event producer to handle the production of the ServiceName XML data.
@@ -264,7 +264,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
name = new QName(CorbaObjectReferenceHelper.ADDRESSING_WSDL_NAMESPACE_URI,
"ServiceName");
-
+
XMLEventFactory factory = XMLEventFactory.newInstance();
attributes = new ArrayList<>();
@@ -318,7 +318,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
name = new QName(CorbaObjectReferenceHelper.ADDRESSING_WSDL_NAMESPACE_URI,
"InterfaceName");
-
+
XMLEventFactory factory = XMLEventFactory.newInstance();
namespaces = new ArrayList<>();
namespaces.add(factory.createNamespace("objrefns2", intf.getNamespaceURI()));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java
index 3500a22..b85c49f 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java
@@ -42,5 +42,5 @@ public class CorbaObjectReferenceHandler extends CorbaObjectHandler {
public void clear() {
value = null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
index 6d34f1d..501ff49 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
@@ -30,7 +30,7 @@ public class CorbaOctetSequenceEventProducer implements CorbaTypeEventProducer {
int state;
final int[] states = {XMLStreamReader.START_ELEMENT,
XMLStreamReader.CHARACTERS,
- XMLStreamReader.END_ELEMENT};
+ XMLStreamReader.END_ELEMENT};
final CorbaOctetSequenceHandler seqHandler;
final QName name;
@@ -39,7 +39,7 @@ public class CorbaOctetSequenceEventProducer implements CorbaTypeEventProducer {
name = seqHandler.getName();
}
- public String getLocalName() {
+ public String getLocalName() {
return seqHandler.getSimpleName();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
index 009ed7d..3251ec9 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
@@ -29,7 +29,7 @@ public class CorbaOctetSequenceHandler extends CorbaObjectHandler {
private byte[] value;
private boolean isBase64Octets;
-
+
public CorbaOctetSequenceHandler(QName primName,
QName primIdlType,
TypeCode primTC,
@@ -37,11 +37,11 @@ public class CorbaOctetSequenceHandler extends CorbaObjectHandler {
super(primName, primIdlType, primTC, primType);
isBase64Octets = getType().getType().equals(W3CConstants.NT_SCHEMA_BASE64);
}
-
+
public byte[] getValue() {
return value;
- }
-
+ }
+
public void setValue(byte[] obj) {
value = obj;
}
@@ -55,7 +55,7 @@ public class CorbaOctetSequenceHandler extends CorbaObjectHandler {
}
return result;
}
-
+
public void setValueFromData(String data) {
try {
if (isBase64Octets) {
@@ -67,7 +67,7 @@ public class CorbaOctetSequenceHandler extends CorbaObjectHandler {
throw new CorbaBindingException("Not able to parse the octet sequence", ex);
}
}
-
+
public void clear() {
value = null;
}
[27/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
index 1729a3f..6c22154 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
@@ -31,14 +31,14 @@ import demo.hw.server.UserImpl;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://server.hw.demo/", "HelloWorld");
- private static final QName PORT_NAME
+ private static final QName PORT_NAME
= new QName("http://server.hw.demo/", "HelloWorldPort");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
Service service = Service.create(SERVICE_NAME);
@@ -50,7 +50,7 @@ public final class Client {
// Add a port to the Service
service.addPort(PORT_NAME, SOAPBinding.SOAP11HTTP_BINDING, endpointAddress);
-
+
HelloWorld hw = service.getPort(HelloWorld.class);
System.out.println(hw.sayHi("World"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
index 70cf990..67c8af1 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/HelloWorld.java
@@ -41,7 +41,7 @@ public interface HelloWorld {
/* Map passing
* JAXB also does not support Maps. It handles Lists great, but Maps are
* not supported directly. They also require use of a XmlAdapter to map
- * the maps into beans that JAXB can use.
+ * the maps into beans that JAXB can use.
*/
@XmlJavaTypeAdapter(IntegerUserMapAdapter.class)
Map<Integer, User> getUsers();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
index d4d0626..9f02674 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/IntegerUserMapAdapter.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
public class IntegerUserMapAdapter extends XmlAdapter<IntegerUserMap, Map<Integer, User>> {
public IntegerUserMap marshal(Map<Integer, User> v) throws Exception {
IntegerUserMap map = new IntegerUserMap();
- for (Map.Entry<Integer, User> e : v.entrySet()) {
+ for (Map.Entry<Integer, User> e : v.entrySet()) {
IntegerUserMap.IntegerUserEntry iue = new IntegerUserMap.IntegerUserEntry();
iue.setUser(e.getValue());
iue.setId(e.getKey());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
index dbcbe53..11a751f 100644
--- a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
@@ -29,7 +29,7 @@ import demo.hw.server.HelloWorld;
public final class Client {
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
index 8da3b9f..6cc3ce1 100644
--- a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
+++ b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
@@ -50,10 +50,10 @@ public final class ServerJMS {
for (String arg : args) {
if ("-activemqbroker".equals(arg)) {
launchAmqBroker = true;
- }
+ }
if ("-jaxws".equals(arg)) {
jaxws = true;
- }
+ }
}
if (launchAmqBroker) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
index 4190e6d..f763908 100644
--- a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
@@ -25,7 +25,7 @@ import demo.hw.server.HelloWorld;
public final class Client {
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java
index 7c1e679..bed4b13 100644
--- a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/HelloWorld.java
@@ -19,7 +19,7 @@
package demo.hw.server;
public interface HelloWorld {
-
+
String sayHi(String text);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
index 758a268..65abf4b 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
@@ -30,7 +30,7 @@ public final class Client {
public static void main(String args[]) throws Exception {
// START SNIPPET: client
- ClassPathXmlApplicationContext context
+ ClassPathXmlApplicationContext context
= new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
HelloWorld client = (HelloWorld)context.getBean("client");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
index a2ce015..5e410f5 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
@@ -27,7 +27,7 @@ public class Server {
protected Server() throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CustomerService.class);
- sf.setResourceProvider(CustomerService.class,
+ sf.setResourceProvider(CustomerService.class,
new SingletonResourceProvider(new CustomerService()));
sf.setAddress("http://localhost:9000/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
index 7147e2d..aa9f835 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
@@ -38,23 +38,23 @@ import httpsdemo.common.CustomerService;
public final class Client {
private static final String CLIENT_CONFIG_FILE = "ClientConfig.xml";
- private static final String BASE_SERVICE_URL =
+ private static final String BASE_SERVICE_URL =
"https://localhost:9000/customerservice/customers";
-
+
private Client() {
}
- public static void main(String args[]) throws Exception {
+ public static void main(String args[]) throws Exception {
String keyStoreLoc = "src/main/config/clientKeystore.jks";
KeyStore keyStore = KeyStore.getInstance("JKS");
keyStore.load(new FileInputStream(keyStoreLoc), "cspass".toCharArray());
- /*
+ /*
* Send HTTP GET request to query customer info using portable HttpClient
* object from Apache HttpComponents
*/
- SSLSocketFactory sf = new SSLSocketFactory(keyStore, "ckpass", keyStore);
+ SSLSocketFactory sf = new SSLSocketFactory(keyStore, "ckpass", keyStore);
Scheme httpsScheme = new Scheme("https", 9000, sf);
System.out.println("Sending HTTPS GET request to query customer info");
@@ -67,7 +67,7 @@ public final class Client {
HttpEntity entity = response.getEntity();
entity.writeTo(System.out);
httpclient.getConnectionManager().shutdown();
-
+
/*
* Send HTTP PUT request to update customer info, using CXF WebClient method
* Note: if need to use basic authentication, use the WebClient.create(baseAddress,
@@ -93,7 +93,7 @@ public final class Client {
customer = new Customer();
customer.setName("Jack");
resp = wc.post(customer);
-
+
System.out.println("\n");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
index c1af8f5..03cf4e1 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/common/CustomerService.java
@@ -36,11 +36,11 @@ public interface CustomerService {
@GET
@Path("/customers/{id}/")
Customer getCustomer(@PathParam("id") String id);
-
+
@PUT
@Path("/customers/")
Response updateCustomer(Customer customer);
-
+
@POST
@Path("/customers/")
Response addCustomer(Customer customer);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
index 7d4a0c1..333d323 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
@@ -33,11 +33,11 @@ public class Server {
Bus bus = factory.createBus("ServerConfig.xml");
BusFactory.setDefaultBus(bus);
}
-
+
protected Server() throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CustomerServiceImpl.class);
- sf.setResourceProvider(CustomerServiceImpl.class,
+ sf.setResourceProvider(CustomerServiceImpl.class,
new SingletonResourceProvider(new CustomerServiceImpl()));
sf.setAddress("https://localhost:9000/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
index 785689d..ebb4f5d 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_oidc/src/main/java/demo/jaxrs/server/IdTokenService.java
@@ -35,7 +35,7 @@ public class IdTokenService {
public Response getIdTokenFromForm(@Context IdTokenContext idTokenContext) {
return getIdToken(idTokenContext);
}
-
+
@GET
@Path("/token")
@Produces("text/html")
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java
index 238ecb9..fc6db1b 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryResponse.java
@@ -25,15 +25,15 @@ public class BigQueryResponse {
private String userName;
private String searchWord;
private List<ShakespeareText> texts = new LinkedList<ShakespeareText>();
-
+
public BigQueryResponse() {
-
+
}
public BigQueryResponse(String userName, String searchWord) {
this.userName = userName;
this.searchWord = searchWord;
}
-
+
public String getUserName() {
return userName;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
index aba941e..e625d03 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryServer.java
@@ -47,25 +47,25 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
public final class BigQueryServer {
private BigQueryServer() {
}
-
+
public static void main(String[] args) throws Exception {
final String pc12File = args[0];
final String keySecret = args[1];
final String issuer = args[2];
final String projectId = args[3];
-
+
PrivateKey privateKey = loadPrivateKey(pc12File, keySecret);
-
-
+
+
ClientAccessToken accessToken = getAccessToken(privateKey, issuer);
-
- WebClient bigQueryClient = WebClient.create("https://www.googleapis.com/bigquery/v2/projects/"
+
+ WebClient bigQueryClient = WebClient.create("https://www.googleapis.com/bigquery/v2/projects/"
+ projectId + "/queries",
Collections.singletonList(new JsonMapObjectProvider()));
bigQueryClient.type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON);
-
+
List<ShakespeareText> texts = BigQueryService.getMatchingTexts(bigQueryClient, accessToken, "brave", "10");
-
+
System.out.println("Matching texts:");
for (ShakespeareText text : texts) {
System.out.println(text.getText() + ":" + text.getDate());
@@ -77,25 +77,25 @@ public final class BigQueryServer {
JwtClaims claims = new JwtClaims();
claims.setIssuer(issuer);
claims.setAudience("https://www.googleapis.com/oauth2/v3/token");
-
+
long issuedAt = OAuthUtils.getIssuedAt();
claims.setIssuedAt(issuedAt);
claims.setExpiryTime(issuedAt + 60 * 60);
claims.setProperty("scope", "https://www.googleapis.com/auth/bigquery.readonly");
-
+
JwtToken token = new JwtToken(headers, claims);
JwsJwtCompactProducer p = new JwsJwtCompactProducer(token);
String base64UrlAssertion = p.signWith(privateKey);
-
+
JwtBearerGrant grant = new JwtBearerGrant(base64UrlAssertion);
-
+
WebClient accessTokenService = WebClient.create("https://www.googleapis.com/oauth2/v3/token",
Arrays.asList(new OAuthJSONProvider(),
new AccessTokenGrantWriter()));
WebClient.getConfig(accessTokenService).getInInterceptors().add(new LoggingInInterceptor());
-
+
accessTokenService.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.APPLICATION_JSON);
-
+
return accessTokenService.post(grant, ClientAccessToken.class);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
index 72cc78f..01f2254 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryService.java
@@ -39,34 +39,34 @@ import org.apache.cxf.rs.security.oidc.rp.OidcClientTokenContext;
@Path("/")
public class BigQueryService {
- private static final String BQ_SELECT =
+ private static final String BQ_SELECT =
"SELECT corpus,corpus_date FROM publicdata:samples.shakespeare WHERE word=\\\"%s\\\"";
private static final String BQ_REQUEST = "{"
- + "\"kind\": \"bigquery#queryRequest\","
+ + "\"kind\": \"bigquery#queryRequest\","
+ "\"query\": \"%s\","
- + "\"maxResults\": %d"
+ + "\"maxResults\": %d"
+ "}";
-
+
@Context
private OidcClientTokenContext oidcContext;
private WebClient bigQueryClient;
-
+
@GET
@Path("/start")
@Produces("text/html")
public BigQueryStart startBigQuerySearch() {
return new BigQueryStart(getUserInfo());
}
-
+
@POST
@Path("/complete")
@Consumes("application/x-www-form-urlencoded")
@Produces("text/html")
- public BigQueryResponse completeBigQuerySearch(@FormParam("word") String searchWord,
+ public BigQueryResponse completeBigQuerySearch(@FormParam("word") String searchWord,
@FormParam("maxResults") String maxResults) {
-
+
ClientAccessToken accessToken = oidcContext.getToken();
-
+
BigQueryResponse bigQueryResponse = new BigQueryResponse(getUserInfo(), searchWord);
bigQueryResponse.setTexts(getMatchingTexts(bigQueryClient, accessToken, searchWord, maxResults));
return bigQueryResponse;
@@ -78,22 +78,22 @@ public class BigQueryService {
} else {
return oidcContext.getIdToken().getSubject();
}
-
+
}
public void setBigQueryClient(WebClient bigQueryClient) {
this.bigQueryClient = bigQueryClient;
}
-
- static List<ShakespeareText> getMatchingTexts(WebClient bqClient, ClientAccessToken accessToken,
+
+ static List<ShakespeareText> getMatchingTexts(WebClient bqClient, ClientAccessToken accessToken,
String searchWord, String maxResults) {
bqClient.authorization(accessToken);
String bigQuerySelect = String.format(BQ_SELECT, searchWord);
String bigQueryRequest = String.format(BQ_REQUEST, bigQuerySelect, Integer.parseInt(maxResults));
-
+
JsonMapObject jsonMap = bqClient.post(bigQueryRequest, JsonMapObject.class);
-
- List<ShakespeareText> texts = new LinkedList<ShakespeareText>();
+
+ List<ShakespeareText> texts = new LinkedList<ShakespeareText>();
List<Map<String, Object>> rows = CastUtils.cast((List<?>)jsonMap.getProperty("rows"));
if (rows != null) {
for (Map<String, Object> row : rows) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java
index b49fef2..06b62d8 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/BigQueryStart.java
@@ -24,7 +24,7 @@ public class BigQueryStart {
public BigQueryStart(String userName) {
this.userName = userName;
}
-
+
public String getUserName() {
return userName;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
index 95baa17..f887af5 100644
--- a/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
+++ b/distribution/src/main/release/samples/jax_rs/big_query/src/main/java/demo/jaxrs/server/ShakespeareText.java
@@ -22,7 +22,7 @@ public class ShakespeareText {
private String text;
private String date;
public ShakespeareText() {
-
+
}
public ShakespeareText(String text, String date) {
this.text = text;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
index 3ebbc31..25a0287 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
@@ -27,7 +27,7 @@ public class Server {
protected Server() throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CustomerService.class);
- sf.setResourceProvider(CustomerService.class,
+ sf.setResourceProvider(CustomerService.class,
new SingletonResourceProvider(new CustomerService()));
sf.setAddress("http://localhost:9000/");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
index 557cb1d..c58fb0e 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import com.wordnik.swagger.annotations.ApiImplicitParams;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -61,21 +61,21 @@ public class Sample {
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@ApiParam(value = "Page to fetch", required = true) @QueryParam("page") @DefaultValue("1") int page) {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -84,51 +84,51 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
public Response createItem(
@Context final UriInfo uriInfo,
@ApiParam(value = "item", required = true) final Item item) {
- items.put(item.getName(), item);
+ items.put(item.getName(), item);
return Response
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
public Item updateItem(
@ApiParam(value = "name", required = true) @PathParam("name") String name,
- @ApiParam(value = "value", required = true) @FormParam("value") String value) {
+ @ApiParam(value = "value", required = true) @FormParam("value") String value) {
Item item = new Item(name, value);
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
index 491fd43..b254839 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -38,14 +38,14 @@ public class Server {
final ServletHolder staticHolder = new ServletHolder(new DefaultServlet());
// Register and map the dispatcher servlet
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
- context.addServlet(servletHolder, "/*");
+ context.addServlet(servletHolder, "/*");
context.setResourceBase(
getClass().getResource("/META-INF/resources/webjars/swagger-ui/2.0.24").toURI().toString());
-
- servletHolder.setInitParameter("redirects-list",
+
+ servletHolder.setInitParameter("redirects-list",
"/ /index.html /.*[.]js /css/.* /images/.* lib/.* .*ico");
servletHolder.setInitParameter("redirect-servlet-name", staticHolder.getName());
servletHolder.setInitParameter("redirect-attributes", "javax.servlet.include.request_uri");
@@ -55,9 +55,9 @@ public class Server {
new String[] {
MultipartProvider.class.getName(),
JacksonJsonProvider.class.getName()
- }, ",")
- );
-
+ }, ",")
+ );
+
server.setHandler(context);
server.start();
server.join();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index 43dd95d..b7eda12 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -28,14 +28,14 @@ import javax.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
- * from other origins. You may omit using this filter or use CXF's advanced CORS filter
- * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
+ * from other origins. You may omit using this filter or use CXF's advanced CORS filter
+ * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
* included in cxf-rt-rs-security-cors if you need a more comprehensive accessibility rules.
*/
public class ApiOriginFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
MultivaluedMap<String, Object> headers = responseContext.getHeaders();
headers.add("Access-Control-Allow-Origin", "*");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f3c1765..d68a2bd 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
index 22576af..a5131d6 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -34,18 +34,18 @@ public class Server {
org.eclipse.jetty.server.Server server = new org.eclipse.jetty.server.Server(9000);
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
- context.addServlet(servletHolder, "/*");
+ context.addServlet(servletHolder, "/*");
servletHolder.setInitParameter("jaxrs.serviceClasses", Sample.class.getName());
- servletHolder.setInitParameter("jaxrs.features",
+ servletHolder.setInitParameter("jaxrs.features",
Swagger2Feature.class.getName());
servletHolder.setInitParameter("jaxrs.providers", StringUtils.join(
new String[] {
MultipartProvider.class.getName(),
JacksonJsonProvider.class.getName(),
ApiOriginFilter.class.getName()
- }, ",")
+ }, ",")
);
server.setHandler(context);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index 43dd95d..b7eda12 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -28,14 +28,14 @@ import javax.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
- * from other origins. You may omit using this filter or use CXF's advanced CORS filter
- * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
+ * from other origins. You may omit using this filter or use CXF's advanced CORS filter
+ * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
* included in cxf-rt-rs-security-cors if you need a more comprehensive accessibility rules.
*/
public class ApiOriginFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
MultivaluedMap<String, Object> headers = responseContext.getHeaders();
headers.add("Access-Control-Allow-Origin", "*");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f3c1765..d68a2bd 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index 43dd95d..b7eda12 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -28,14 +28,14 @@ import javax.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
- * from other origins. You may omit using this filter or use CXF's advanced CORS filter
- * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
+ * from other origins. You may omit using this filter or use CXF's advanced CORS filter
+ * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
* included in cxf-rt-rs-security-cors if you need a more comprehensive accessibility rules.
*/
public class ApiOriginFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
MultivaluedMap<String, Object> headers = responseContext.getHeaders();
headers.add("Access-Control-Allow-Origin", "*");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f3c1765..d68a2bd 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
index 985bac2..7b74a71 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -27,7 +27,7 @@ public final class Server {
}
public static void main(String args[]) throws Exception {
- ApplicationContext appctxt =
+ ApplicationContext appctxt =
new ClassPathXmlApplicationContext(Server.class.getResource("/context.xml").toString());
System.out.println("Server ready...");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
index 43dd95d..b7eda12 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java
@@ -28,14 +28,14 @@ import javax.ws.rs.core.MultivaluedMap;
/**
* This is a simple optional CORS filter used for this demo to make the resources accessible
- * from other origins. You may omit using this filter or use CXF's advanced CORS filter
- * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
+ * from other origins. You may omit using this filter or use CXF's advanced CORS filter
+ * org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter
* included in cxf-rt-rs-security-cors if you need a more comprehensive accessibility rules.
*/
public class ApiOriginFilter implements ContainerResponseFilter {
@Override
- public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+ public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
throws IOException {
MultivaluedMap<String, Object> headers = responseContext.getHeaders();
headers.add("Access-Control-Allow-Origin", "*");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java
index 1b5be9b..51b3cab 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Item.java
@@ -22,7 +22,7 @@ package demo.jaxrs.swagger.server;
public class Item {
private String name;
private String value;
-
+
public Item() {
}
@@ -34,7 +34,7 @@ public class Item {
public String getName() {
return name;
}
-
+
public void setName(String name) {
this.name = name;
}
@@ -45,5 +45,5 @@ public class Item {
public void setValue(String value) {
this.value = value;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
index f3c1765..d68a2bd 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample")
+@Path("/sample")
@Api(value = "/sample", description = "Sample JAX-RS service with Swagger documentation")
public class Sample {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
index 5c08d53..4473624 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/java/demo/jaxrs/swagger/server/Sample2.java
@@ -46,7 +46,7 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-@Path("/sample2")
+@Path("/sample2")
@Api(value = "/sample2", description = "Sample2 JAX-RS service with Swagger documentation")
public class Sample2 {
private Map<String, Item> items;
@@ -56,14 +56,14 @@ public class Sample2 {
items.put("Item 1", new Item("Item 1", "Value 1"));
items.put("Item 2", new Item("Item 2", "Value 2"));
}
-
-
+
+
@Produces({ MediaType.APPLICATION_JSON })
@GET
@ApiOperation(
- value = "Get operation with Response and @Default value",
- notes = "Get operation with Response and @Default value",
- response = Item.class,
+ value = "Get operation with Response and @Default value",
+ notes = "Get operation with Response and @Default value",
+ response = Item.class,
responseContainer = "List"
)
public Response getItems(
@@ -71,12 +71,12 @@ public class Sample2 {
return Response.ok(items.values()).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@GET
@ApiOperation(
- value = "Get operation with type and headers",
+ value = "Get operation with type and headers",
notes = "Get operation with type and headers",
response = Item.class
)
@@ -85,11 +85,11 @@ public class Sample2 {
@ApiParam(value = "name", required = true) @PathParam("name") String name) {
return items.get(name);
}
-
+
@Consumes({ MediaType.APPLICATION_JSON })
@POST
@ApiOperation(
- value = "Post operation with entity in a body",
+ value = "Post operation with entity in a body",
notes = "Post operation with entity in a body",
response = Item.class
)
@@ -101,12 +101,12 @@ public class Sample2 {
.created(uriInfo.getBaseUriBuilder().path(item.getName()).build())
.entity(item).build();
}
-
+
@Produces({ MediaType.APPLICATION_JSON })
@Path("/{name}")
@PUT
@ApiOperation(
- value = "Put operation with form parameter",
+ value = "Put operation with form parameter",
notes = "Put operation with form parameter",
response = Item.class
)
@@ -117,19 +117,19 @@ public class Sample2 {
items.put(name, item);
return item;
}
-
+
@Path("/{name}")
@DELETE
@ApiOperation(
- value = "Delete operation with implicit header",
+ value = "Delete operation with implicit header",
notes = "Delete operation with implicit header"
)
@ApiImplicitParams(
@ApiImplicitParam(
- name = "Accept-Language",
- value = "language",
- required = true,
- dataType = "String",
+ name = "Accept-Language",
+ value = "language",
+ required = true,
+ dataType = "String",
paramType = "header"
)
)
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
index a75274c..87a593c 100644
--- a/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
+++ b/distribution/src/main/release/samples/jax_rs/minimal_osgi/src/main/java/minimalosgi/SampleServlet.java
@@ -29,7 +29,7 @@ public class SampleServlet extends CXFNonSpringJaxrsServlet {
private static final long serialVersionUID = -1531317723099896635L;
@Override
- protected Application createApplicationInstance(String appClassName, ServletConfig servletConfig)
+ protected Application createApplicationInstance(String appClassName, ServletConfig servletConfig)
throws ServletException {
return new SampleApplication();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
index 72ff45f..ba584a5 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
@@ -36,84 +36,84 @@ public final class Client {
private Client() {
}
- public static void main(String args[]) throws Exception {
+ public static void main(String args[]) throws Exception {
final String url = "http://localhost:9000/catalog";
final HttpClient httpClient = new HttpClient();
-
+
uploadToCatalog(url, httpClient, "jsr339-jaxrs-2.0-final-spec.pdf");
uploadToCatalog(url, httpClient, "JavaWebSocketAPI_1.0_Final.pdf");
uploadToCatalog(url, httpClient, "apache-cxf-tika-lucene.odt");
-
- list(url, httpClient);
-
+
+ list(url, httpClient);
+
search(url, httpClient, "ct==java");
search(url, httpClient, "ct==websockets");
-
- search(url, httpClient, "ct==Java");
+
+ search(url, httpClient, "ct==Java");
search(url, httpClient, "ct==WebSockets");
-
+
search(url, httpClient, "ct==jaxrs,source==*jaxrs*");
search(url, httpClient, "ct==tika");
-
+
delete(url, httpClient);
}
- private static void list(final String url, final HttpClient httpClient)
+ private static void list(final String url, final HttpClient httpClient)
throws IOException, HttpException {
-
+
System.out.println("Sent HTTP GET request to query all books in catalog");
-
+
final GetMethod get = new GetMethod(url);
try {
int status = httpClient.executeMethod(get);
- if (status == 200) {
+ if (status == 200) {
System.out.println(get.getResponseBodyAsString());
}
} finally {
get.releaseConnection();
}
}
-
- private static void search(final String url, final HttpClient httpClient, final String expression)
+
+ private static void search(final String url, final HttpClient httpClient, final String expression)
throws IOException, HttpException {
-
+
System.out.println("Sent HTTP GET request to search the books in catalog: " + expression);
-
+
final GetMethod get = new GetMethod(url + "/search");
get.setQueryString("$filter=" + expression);
-
+
try {
int status = httpClient.executeMethod(get);
- if (status == 200) {
+ if (status == 200) {
System.out.println(get.getResponseBodyAsString());
}
} finally {
get.releaseConnection();
}
}
-
+
private static void uploadToCatalog(final String url, final HttpClient httpClient,
final String filename) throws IOException, HttpException {
-
+
System.out.println("Sent HTTP POST request to upload the file into catalog: " + filename);
-
+
final PostMethod post = new PostMethod(url);
final Part[] parts = {
new FilePart(filename,
- new ByteArrayPartSource(filename,
- IOUtils.readBytesFromStream(Client.class.getResourceAsStream("/" + filename))
- )
+ new ByteArrayPartSource(filename,
+ IOUtils.readBytesFromStream(Client.class.getResourceAsStream("/" + filename))
+ )
)
};
-
+
post.setRequestEntity(new MultipartRequestEntity(parts, post.getParams()));
-
+
try {
int status = httpClient.executeMethod(post);
- if (status == 201) {
+ if (status == 201) {
System.out.println(post.getResponseHeader("Location"));
- } else if (status == 409) {
+ } else if (status == 409) {
System.out.println("Document already exists: " + filename);
}
@@ -121,16 +121,16 @@ public final class Client {
post.releaseConnection();
}
}
-
- private static void delete(final String url, final HttpClient httpClient)
+
+ private static void delete(final String url, final HttpClient httpClient)
throws IOException, HttpException {
-
+
System.out.println("Sent HTTP DELETE request to remove all books from catalog");
-
- final DeleteMethod delete = new DeleteMethod(url);
+
+ final DeleteMethod delete = new DeleteMethod(url);
try {
int status = httpClient.executeMethod(delete);
- if (status == 200) {
+ if (status == 200) {
System.out.println(delete.getResponseBodyAsString());
}
} finally {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
index 87bd2c4..7c74882 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
@@ -90,47 +90,47 @@ import org.apache.tika.parser.pdf.PDFParser;
@Path("/catalog")
public class Catalog {
private final TikaLuceneContentExtractor extractor = new TikaLuceneContentExtractor(
- Arrays.< Parser >asList(new PDFParser(), new OpenDocumentParser()),
- new LuceneDocumentMetadata());
+ Arrays.< Parser >asList(new PDFParser(), new OpenDocumentParser()),
+ new LuceneDocumentMetadata());
private final Directory directory = new RAMDirectory();
- private final Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
- private final Storage storage;
+ private final Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_4_9);
+ private final Storage storage;
private final LuceneQueryVisitor<SearchBean> visitor;
private final ExecutorService executor = Executors.newFixedThreadPool(
Runtime.getRuntime().availableProcessors());
-
+
public Catalog() throws IOException {
this(new Storage());
}
-
+
public Catalog(final Storage storage) throws IOException {
this.storage = storage;
this.visitor = createVisitor();
initIndex();
}
-
+
@POST
@CrossOriginResourceSharing(allowAllOrigins = true)
@Consumes("multipart/form-data")
- public void addBook(@Suspended final AsyncResponse response, @Context final UriInfo uri,
+ public void addBook(@Suspended final AsyncResponse response, @Context final UriInfo uri,
final MultipartBody body) {
-
+
executor.submit(new Runnable() {
public void run() {
for (final Attachment attachment: body.getAllAttachments()) {
final DataHandler handler = attachment.getDataHandler();
-
+
if (handler != null) {
final String source = handler.getName();
if (StringUtils.isEmpty(source)) {
response.resume(Response.status(Status.BAD_REQUEST).build());
return;
}
-
+
final LuceneDocumentMetadata metadata = new LuceneDocumentMetadata()
.withSource(source)
.withField("modified", Date.class);
-
+
try {
if (exists(source)) {
response.resume(Response.status(Status.CONFLICT).build());
@@ -140,66 +140,66 @@ public class Catalog {
final byte[] content = IOUtils.readBytesFromStream(handler.getInputStream());
storeAndIndex(metadata, content);
} catch (final Exception ex) {
- response.resume(Response.serverError().build());
- }
-
+ response.resume(Response.serverError().build());
+ }
+
if (response.isSuspended()) {
response.resume(Response.created(uri.getRequestUriBuilder().path(source).build())
.build());
}
- }
- }
-
+ }
+ }
+
if (response.isSuspended()) {
response.resume(Response.status(Status.BAD_REQUEST).build());
}
}
});
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
public JsonArray getBooks() throws IOException {
final IndexReader reader = DirectoryReader.open(directory);
final IndexSearcher searcher = new IndexSearcher(reader);
final JsonArrayBuilder builder = Json.createArrayBuilder();
-
+
try {
final Query query = new MatchAllDocsQuery();
-
+
for (final ScoreDoc scoreDoc: searcher.search(query, 1000).scoreDocs) {
- final DocumentStoredFieldVisitor fieldVisitor =
- new DocumentStoredFieldVisitor(LuceneDocumentMetadata.SOURCE_FIELD);
-
+ final DocumentStoredFieldVisitor fieldVisitor =
+ new DocumentStoredFieldVisitor(LuceneDocumentMetadata.SOURCE_FIELD);
+
reader.document(scoreDoc.doc, fieldVisitor);
builder.add(fieldVisitor
.getDocument()
.getField(LuceneDocumentMetadata.SOURCE_FIELD)
.stringValue());
}
-
+
return builder.build();
} finally {
reader.close();
}
}
-
+
@GET
@Produces(MediaType.APPLICATION_JSON)
@CrossOriginResourceSharing(allowAllOrigins = true)
@Path("/search")
- public Response findBook(@Context SearchContext searchContext,
+ public Response findBook(@Context SearchContext searchContext,
@Context final UriInfo uri) throws IOException {
-
+
final IndexReader reader = DirectoryReader.open(directory);
final IndexSearcher searcher = new IndexSearcher(reader);
final JsonArrayBuilder builder = Json.createArrayBuilder();
- try {
+ try {
visitor.reset();
visitor.visit(searchContext.getCondition(SearchBean.class));
-
- final Query query = visitor.getQuery();
+
+ final Query query = visitor.getQuery();
if (query != null) {
final TopDocs topDocs = searcher.search(query, 1000);
for (final ScoreDoc scoreDoc: topDocs.scoreDocs) {
@@ -207,7 +207,7 @@ public class Catalog {
final String source = document
.getField(LuceneDocumentMetadata.SOURCE_FIELD)
.stringValue();
-
+
builder.add(
Json.createObjectBuilder()
.add("source", source)
@@ -219,18 +219,18 @@ public class Catalog {
);
}
}
-
+
return Response.ok(builder.build()).build();
} finally {
reader.close();
}
}
-
+
@GET
@Path("/{source}")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
- public StreamingOutput getBook(@PathParam("source") final String source) throws IOException {
- return new StreamingOutput() {
+ public StreamingOutput getBook(@PathParam("source") final String source) throws IOException {
+ return new StreamingOutput() {
@Override
public void write(final OutputStream out) throws IOException, WebApplicationException {
try (InputStream in = storage.getDocument(source)) {
@@ -241,25 +241,25 @@ public class Catalog {
}
};
}
-
+
@DELETE
public Response delete() throws IOException {
final IndexWriter writer = getIndexWriter();
-
+
try {
storage.deleteAll();
writer.deleteAll();
writer.commit();
} finally {
writer.close();
- }
-
+ }
+
return Response.ok().build();
}
-
+
private void initIndex() throws IOException {
final IndexWriter writer = getIndexWriter();
-
+
try {
writer.commit();
} finally {
@@ -270,40 +270,40 @@ public class Catalog {
private IndexWriter getIndexWriter() throws IOException {
return new IndexWriter(directory, new IndexWriterConfig(Version.LUCENE_4_9, analyzer));
}
-
+
private LuceneQueryVisitor< SearchBean > createVisitor() {
final Map< String, Class< ? > > fieldTypes = new HashMap< String, Class< ? > >();
fieldTypes.put("modified", Date.class);
-
+
LuceneQueryVisitor<SearchBean> newVisitor = new LuceneQueryVisitor<SearchBean>(
"ct", "contents", analyzer);
newVisitor.setPrimitiveFieldTypeMap(fieldTypes);
-
+
return newVisitor;
}
-
+
private boolean exists(final String source) throws IOException {
final IndexReader reader = DirectoryReader.open(directory);
final IndexSearcher searcher = new IndexSearcher(reader);
- try {
+ try {
return searcher.search(new TermQuery(
new Term(LuceneDocumentMetadata.SOURCE_FIELD, source)), 1).totalHits > 0;
} finally {
reader.close();
}
}
-
+
private void storeAndIndex(final LuceneDocumentMetadata metadata, final byte[] content)
throws IOException {
-
+
try (BufferedInputStream in = new BufferedInputStream(new ByteArrayInputStream(content))) {
-
+
final Document document = extractor.extract(in, metadata);
- if (document != null) {
+ if (document != null) {
final IndexWriter writer = getIndexWriter();
-
- try {
+
+ try {
storage.addDocument(metadata.getSource(), content);
writer.addDocument(document);
writer.commit();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
index cdab6db..f14b7b4 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
@@ -39,13 +39,13 @@ public class Server {
final ServletHolder staticHolder = new ServletHolder(new DefaultServlet());
// Register and map the dispatcher servlet
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(staticHolder, "/static/*");
- context.addServlet(servletHolder, "/*");
+ context.addServlet(servletHolder, "/*");
context.setResourceBase(getClass().getResource("/browser").toURI().toString());
-
- servletHolder.setInitParameter("redirects-list",
+
+ servletHolder.setInitParameter("redirects-list",
"/ /index.html /js/fileinput.min.js /css/fileinput.min.css");
servletHolder.setInitParameter("redirect-servlet-name", staticHolder.getName());
servletHolder.setInitParameter("redirect-attributes", "javax.servlet.include.request_uri");
@@ -54,7 +54,7 @@ public class Server {
new String[] {
"search.query.parameter.name=$filter",
SearchUtils.DATE_FORMAT_PROPERTY + "=yyyy/MM/dd"
- }, " ")
+ }, " ")
);
servletHolder.setInitParameter("jaxrs.providers", StringUtils.join(
new String[] {
@@ -62,9 +62,9 @@ public class Server {
SearchContextProvider.class.getName(),
JsrJsonpProvider.class.getName(),
CrossOriginResourceSharingFilter.class.getName()
- }, ",")
- );
-
+ }, ",")
+ );
+
server.setHandler(context);
server.start();
server.join();
[43/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
index c993624..dce13d1 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
@@ -52,16 +52,16 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
@NoJSR250Annotations
-public class ConfigurerImpl extends BeanConfigurerSupport
+public class ConfigurerImpl extends BeanConfigurerSupport
implements Configurer, ApplicationContextAware, BusExtension {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(ConfigurerImpl.class);
private Set<ApplicationContext> appContexts;
private final Map<String, List<MatcherHolder>> wildCardBeanDefinitions
= new TreeMap<String, List<MatcherHolder>>();
private BeanFactory beanFactory;
-
+
static class MatcherHolder implements Comparable<MatcherHolder> {
Matcher matcher;
String wildCardId;
@@ -77,20 +77,20 @@ public class ConfigurerImpl extends BeanConfigurerSupport
return literalCharsLen1.compareTo(literalCharsLen2) * -1;
}
}
-
+
public ConfigurerImpl() {
// complete
}
-
+
public ConfigurerImpl(ApplicationContext ac) {
setApplicationContext(ac);
}
-
+
public void setBeanFactory(BeanFactory beanFactory) {
this.beanFactory = beanFactory;
super.setBeanFactory(beanFactory);
}
-
+
private void initWildcardDefinitionMap() {
if (null != appContexts) {
for (ApplicationContext appContext : appContexts) {
@@ -104,7 +104,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport
String orig = n;
if (n.charAt(0) == '*') {
//old wildcard
- n = "." + n.replaceAll("\\.", "\\.");
+ n = "." + n.replaceAll("\\.", "\\.");
}
try {
Matcher matcher = Pattern.compile(n).matcher("");
@@ -115,11 +115,11 @@ public class ConfigurerImpl extends BeanConfigurerSupport
}
MatcherHolder holder = new MatcherHolder(orig, matcher);
m.add(holder);
- } catch (PatternSyntaxException npe) {
+ } catch (PatternSyntaxException npe) {
//not a valid patter, we'll ignore
}
} else {
- LogUtils.log(LOG, Level.WARNING, "WILDCARD_BEAN_ID_WITH_NO_CLASS_MSG", n);
+ LogUtils.log(LOG, Level.WARNING, "WILDCARD_BEAN_ID_WITH_NO_CLASS_MSG", n);
}
}
}
@@ -130,7 +130,7 @@ public class ConfigurerImpl extends BeanConfigurerSupport
public void configureBean(Object beanInstance) {
configureBean(null, beanInstance, true);
}
-
+
public void configureBean(String bn, Object beanInstance) {
configureBean(bn, beanInstance, true);
}
@@ -139,18 +139,18 @@ public class ConfigurerImpl extends BeanConfigurerSupport
if (null == appContexts) {
return;
}
-
+
if (null == bn) {
bn = getBeanName(beanInstance);
}
-
+
if (null == bn) {
return;
}
if (checkWildcards) {
configureWithWildCard(bn, beanInstance);
}
-
+
final String beanName = bn;
setBeanWiringInfoResolver(new BeanWiringInfoResolver() {
public BeanWiringInfo resolveWiringInfo(Object instance) {
@@ -160,13 +160,13 @@ public class ConfigurerImpl extends BeanConfigurerSupport
return null;
}
});
-
+
for (ApplicationContext appContext : appContexts) {
if (appContext.containsBean(bn)) {
this.setBeanFactory(appContext.getAutowireCapableBeanFactory());
}
}
-
+
try {
//this will prevent a call into the AbstractBeanFactory.markBeanAsCreated(...)
//which saves ALL the names into a HashSet. For URL based configuration,
@@ -187,10 +187,10 @@ public class ConfigurerImpl extends BeanConfigurerSupport
}
}
}
-
+
private void configureWithWildCard(String bn, Object beanInstance) {
if (!wildCardBeanDefinitions.isEmpty()) {
- Class<?> clazz = beanInstance.getClass();
+ Class<?> clazz = beanInstance.getClass();
while (!Object.class.equals(clazz)) {
String className = clazz.getName();
List<MatcherHolder> matchers = wildCardBeanDefinitions.get(className);
@@ -237,22 +237,22 @@ public class ConfigurerImpl extends BeanConfigurerSupport
LogUtils.log(LOG, Level.WARNING, "ERROR_DETERMINING_BEAN_NAME_EXC", ex);
}
}
-
+
if (null == beanName) {
LogUtils.log(LOG, Level.FINE, "COULD_NOT_DETERMINE_BEAN_NAME_MSG",
beanInstance.getClass().getName());
}
-
+
return beanName;
}
-
+
public final void setApplicationContext(ApplicationContext ac) {
appContexts = new CopyOnWriteArraySet<ApplicationContext>();
addApplicationContext(ac);
this.beanFactory = ac.getAutowireCapableBeanFactory();
super.setBeanFactory(this.beanFactory);
}
-
+
public final void addApplicationContext(ApplicationContext ac) {
if (!appContexts.contains(ac)) {
appContexts.add(ac);
@@ -272,18 +272,18 @@ public class ConfigurerImpl extends BeanConfigurerSupport
initWildcardDefinitionMap();
}
}
-
+
public void destroy() {
- super.destroy();
+ super.destroy();
appContexts.clear();
}
public Class<?> getRegistrationType() {
return Configurer.class;
}
-
+
protected Set<ApplicationContext> getAppContexts() {
return appContexts;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java b/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
index 9c606df..7c0801b 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/JAXBBeanFactory.java
@@ -31,21 +31,21 @@ import org.apache.cxf.common.jaxb.JAXBUtils;
import org.apache.cxf.staxutils.StaxUtils;
/**
- *
+ *
*/
public final class JAXBBeanFactory {
private JAXBBeanFactory() {
//nothing
}
-
- public static <T> T createJAXBBean(JAXBContext context,
+
+ public static <T> T createJAXBBean(JAXBContext context,
String s,
Class<T> c) {
-
+
StringReader reader = new StringReader(s);
XMLStreamReader data = StaxUtils.createXMLStreamReader(reader);
try {
-
+
T obj = null;
if (c != null) {
obj = JAXBUtils.unmarshall(context, data, c).getValue();
@@ -56,7 +56,7 @@ public final class JAXBBeanFactory {
@SuppressWarnings("unchecked")
T ot = (T)el.getValue();
obj = ot;
- }
+ }
}
return obj;
} catch (JAXBException e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/configuration/spring/MappingBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/configuration/spring/MappingBeanDefinitionParser.java b/core/src/main/java/org/apache/cxf/configuration/spring/MappingBeanDefinitionParser.java
index 776edc5..a2bea7c 100644
--- a/core/src/main/java/org/apache/cxf/configuration/spring/MappingBeanDefinitionParser.java
+++ b/core/src/main/java/org/apache/cxf/configuration/spring/MappingBeanDefinitionParser.java
@@ -31,21 +31,21 @@ import org.apache.cxf.staxutils.transform.OutTransformWriter;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.xml.ParserContext;
-public class MappingBeanDefinitionParser
+public class MappingBeanDefinitionParser
extends org.springframework.beans.factory.xml.AbstractBeanDefinitionParser {
-
+
private final Map<String, String> transformMap;
public MappingBeanDefinitionParser(String oldns, String newns) {
transformMap = Collections.singletonMap("{" + oldns + "}*", "{" + newns + "}*");
}
-
+
@Override
protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
element = transformElement(element);
return (AbstractBeanDefinition)parserContext.getDelegate().parseCustomElement(element);
}
private Element transformElement(Element element) {
-
+
W3CDOMStreamWriter domWriter = new W3CDOMStreamWriter();
OutTransformWriter transformWriter = new OutTransformWriter(domWriter, transformMap);
try {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/continuations/Continuation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/continuations/Continuation.java b/core/src/main/java/org/apache/cxf/continuations/Continuation.java
index b3be6fd..687d3b6 100644
--- a/core/src/main/java/org/apache/cxf/continuations/Continuation.java
+++ b/core/src/main/java/org/apache/cxf/continuations/Continuation.java
@@ -20,62 +20,62 @@
package org.apache.cxf.continuations;
/**
- * Represents transport-neutral suspended invocation instances
+ * Represents transport-neutral suspended invocation instances
* or continuations
*/
public interface Continuation {
-
- /**
+
+ /**
* This method will suspend the request for the timeout or until resume is
* called
- *
+ *
* @param timeout A timeout of < 0 will cause an immediate return.
* A timeout of 0 will wait indefinitely.
* @return True if resume called or false if timeout.
*/
boolean suspend(long timeout);
-
- /**
- * Resume a suspended request
+
+ /**
+ * Resume a suspended request
*/
void resume();
-
- /**
+
+ /**
* Reset the continuation
*/
void reset();
-
- /**
+
+ /**
* Is this a newly created Continuation.
* @return True if the continuation has just been created and has not yet suspended the request.
*/
boolean isNew();
-
- /**
+
+ /**
* Get the pending status
* @return True if the continuation has been suspended.
*/
boolean isPending();
-
- /**
+
+ /**
* Get the resumed status
* @return True if the continuation is has been resumed.
*/
boolean isResumed();
-
- /**
+
+ /**
* Get arbitrary object associated with the continuation for context
- *
+ *
* @return An arbitrary object associated with the continuation
*/
Object getObject();
-
- /**
+
+ /**
* Sets arbitrary object associated with the continuation for context
- *
+ *
* @param o An arbitrary object to associate with the continuation
*/
void setObject(Object o);
-
+
boolean isReadyForWrite();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/continuations/ContinuationCallback.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/continuations/ContinuationCallback.java b/core/src/main/java/org/apache/cxf/continuations/ContinuationCallback.java
index 810e14f..dacc332 100644
--- a/core/src/main/java/org/apache/cxf/continuations/ContinuationCallback.java
+++ b/core/src/main/java/org/apache/cxf/continuations/ContinuationCallback.java
@@ -23,18 +23,18 @@ package org.apache.cxf.continuations;
* Callback that receives continuation status updates.
*/
public interface ContinuationCallback {
-
+
/**
- * This method is called when the container completes writing the response to the client
+ * This method is called when the container completes writing the response to the client
*/
void onComplete();
-
+
/**
- * This method is called when the exception gets propagated to the container
+ * This method is called when the exception gets propagated to the container
* @param error the propagated exception instance
*/
void onError(Throwable error);
-
+
/**
* This method may be called if the container detects that the client has disconnected
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/continuations/ContinuationProvider.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/continuations/ContinuationProvider.java b/core/src/main/java/org/apache/cxf/continuations/ContinuationProvider.java
index 5285336b..471f48f 100644
--- a/core/src/main/java/org/apache/cxf/continuations/ContinuationProvider.java
+++ b/core/src/main/java/org/apache/cxf/continuations/ContinuationProvider.java
@@ -21,16 +21,16 @@ package org.apache.cxf.continuations;
/**
* Provides transport-neutral support for creating suspended invocation primitives
- * or continuations
+ * or continuations
*/
public interface ContinuationProvider {
-
+
/**
* Creates a new continuation or retrieves the existing one
* @return transport-neutral ContinuationWrapper
*/
Continuation getContinuation();
-
+
/**
* Let the provider know that the exchange is complete
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/continuations/SuspendedInvocationException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/continuations/SuspendedInvocationException.java b/core/src/main/java/org/apache/cxf/continuations/SuspendedInvocationException.java
index 20977df..cbe5507 100644
--- a/core/src/main/java/org/apache/cxf/continuations/SuspendedInvocationException.java
+++ b/core/src/main/java/org/apache/cxf/continuations/SuspendedInvocationException.java
@@ -24,21 +24,21 @@ package org.apache.cxf.continuations;
* a given invocation was suspended
*/
public class SuspendedInvocationException extends RuntimeException {
-
+
private static final long serialVersionUID = 6889545463301144757L;
public SuspendedInvocationException(Throwable cause) {
super(cause);
}
-
+
public SuspendedInvocationException() {
}
-
-
+
+
/**
* Returns a transport-specific runtime exception
- * @return RuntimeException the transport-specific runtime exception,
+ * @return RuntimeException the transport-specific runtime exception,
* can be null for asynchronous transports
*/
public RuntimeException getRuntimeException() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
index ab375fd..c2ba64e 100644
--- a/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
@@ -95,8 +95,8 @@ public abstract class AbstractDataBinding implements DataBinding {
String systemId) {
return addSchemaDocument(serviceInfo, col, d, systemId, null);
}
- public XmlSchema addSchemaDocument(ServiceInfo serviceInfo,
- SchemaCollection col,
+ public XmlSchema addSchemaDocument(ServiceInfo serviceInfo,
+ SchemaCollection col,
Document d,
String systemId,
Collection<String> ids) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java
index 8af4df2..5d38e2d 100644
--- a/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/AbstractInterceptorProvidingDataBinding.java
@@ -27,11 +27,11 @@ import org.apache.cxf.interceptor.InterceptorProvider;
import org.apache.cxf.message.Message;
/**
- *
+ *
*/
-public abstract class AbstractInterceptorProvidingDataBinding
+public abstract class AbstractInterceptorProvidingDataBinding
extends AbstractDataBinding implements InterceptorProvider {
-
+
protected ModCountCopyOnWriteArrayList<Interceptor<? extends Message>> inInterceptors
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
protected ModCountCopyOnWriteArrayList<Interceptor<? extends Message>> outInterceptors
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java b/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
index 30dcd7d..566f20a 100644
--- a/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
+++ b/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
@@ -31,31 +31,31 @@ import org.apache.cxf.interceptor.Fault;
* This wrapper helper will use reflection to handle the wrapped message
*/
public abstract class AbstractWrapperHelper implements WrapperHelper {
-
+
public static final Class<?> NO_CLASSES[] = new Class[0];
public static final Object NO_PARAMS[] = new Object[0];
-
+
protected final Class<?> wrapperType;
protected final Method setMethods[];
- protected final Method getMethods[];
- protected final Field fields[];
+ protected final Method getMethods[];
+ protected final Field fields[];
protected boolean validate;
-
-
+
+
protected AbstractWrapperHelper(Class<?> wt,
Method sets[],
- Method gets[],
+ Method gets[],
Field f[]) {
setMethods = sets;
getMethods = gets;
- fields = f;
- wrapperType = wt;
+ fields = f;
+ wrapperType = wt;
}
-
+
/**
* WrapperClassOutInterceptor may call this if the wrapper class needs to be validated.
* Implementations may choose to ignore this as the SchemaValidation that occurs later
- * may catch the errors, but this allows quicker failures if the databinding
+ * may catch the errors, but this allows quicker failures if the databinding
* can support it.
*/
public void setValidate(boolean v) {
@@ -64,39 +64,39 @@ public abstract class AbstractWrapperHelper implements WrapperHelper {
public boolean getValidate() {
return validate;
}
-
+
public String getSignature() {
return "" + System.identityHashCode(this);
}
-
+
protected abstract Object createWrapperObject(Class<?> typeClass) throws Exception;
-
+
protected abstract Object getWrapperObject(Object object) throws Exception;
-
+
protected Object getPartObject(int index, Object object) throws Exception {
return object;
}
-
+
protected Object getValue(Method method, Object in) throws IllegalAccessException,
- InvocationTargetException {
- return method.invoke(in);
+ InvocationTargetException {
+ return method.invoke(in);
}
-
- public Object createWrapperObject(List<?> lst)
+
+ public Object createWrapperObject(List<?> lst)
throws Fault {
try {
Object wrapperObject = createWrapperObject(wrapperType);
-
+
for (int x = 0; x < setMethods.length; x++) {
if (getMethods[x] == null
- && setMethods[x] == null
+ && setMethods[x] == null
&& fields[x] == null) {
//this part is a header or something
//that is not part of the wrapper.
continue;
}
Object o = lst.get(x);
- o = getPartObject(x, o);
+ o = getPartObject(x, o);
if (o instanceof List && getMethods[x] != null) {
List<Object> col = CastUtils.cast((List<?>)getMethods[x].invoke(wrapperObject));
if (col == null) {
@@ -110,7 +110,7 @@ public abstract class AbstractWrapperHelper implements WrapperHelper {
List<Object> olst = CastUtils.cast((List<?>)o);
col.addAll(olst);
}
- } else if (setMethods[x] != null) {
+ } else if (setMethods[x] != null) {
setMethods[x].invoke(wrapperObject, o);
} else if (fields[x] != null) {
fields[x].set(wrapperObject, lst.get(x));
@@ -122,14 +122,14 @@ public abstract class AbstractWrapperHelper implements WrapperHelper {
throw new Fault(ex.getCause());
}
}
-
+
public List<Object> getWrapperParts(Object o) throws Fault {
try {
- Object wrapperObject = getWrapperObject(o);
+ Object wrapperObject = getWrapperObject(o);
List<Object> ret = new ArrayList<>(getMethods.length);
for (int x = 0; x < getMethods.length; x++) {
if (getMethods[x] != null) {
- ret.add(getValue(getMethods[x], wrapperObject));
+ ret.add(getValue(getMethods[x], wrapperObject));
} else if (fields[x] != null) {
ret.add(fields[x].get(wrapperObject));
} else {
@@ -137,7 +137,7 @@ public abstract class AbstractWrapperHelper implements WrapperHelper {
ret.add(null);
}
}
-
+
return ret;
} catch (Exception ex) {
if (ex.getCause() == null) {
@@ -146,8 +146,8 @@ public abstract class AbstractWrapperHelper implements WrapperHelper {
throw new Fault(ex.getCause());
}
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/DataReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/DataReader.java b/core/src/main/java/org/apache/cxf/databinding/DataReader.java
index 6865a1d..37a1acd 100644
--- a/core/src/main/java/org/apache/cxf/databinding/DataReader.java
+++ b/core/src/main/java/org/apache/cxf/databinding/DataReader.java
@@ -28,12 +28,12 @@ import org.apache.cxf.message.Attachment;
import org.apache.cxf.service.model.MessagePartInfo;
/**
- * The 'read' side of the data binding abstraction of CXF. A DataReader<T> reads objects
+ * The 'read' side of the data binding abstraction of CXF. A DataReader<T> reads objects
* from a source of type T.
* @param <T> The type of the source. Each data binding defines the set of source types that it supports.
*/
public interface DataReader<T> {
-
+
String FAULT = DataReader.class.getName() + "Fault";
String ENDPOINT = DataReader.class.getName() + "Endpoint";
/**
@@ -43,14 +43,14 @@ public interface DataReader<T> {
* @param s
*/
void setSchema(Schema s);
-
+
/**
* Attach a collection of attachments to a binding. This permits a binding to process the contents
* of one or more attachments as part of reading from this reader.
* @param attachments attachments.
- */
+ */
void setAttachments(Collection<Attachment> attachments);
-
+
/**
* Set an arbitrary property on the reader.
* {@link #FAULT} and {@link #ENDPOINT} specify two common properties: the Fault object being read
@@ -58,8 +58,8 @@ public interface DataReader<T> {
* @param prop Name of the property.
* @param value Value of the property.
*/
- void setProperty(String prop, Object value);
-
+ void setProperty(String prop, Object value);
+
/**
* Read an object from the input.
* @param input input source object.
@@ -80,7 +80,7 @@ public interface DataReader<T> {
* this API, and those that do ignore the element QName parameter.
* @param elementQName expected element. Generally ignored.
* @param input input source object.
- * @param type the type of object required/requested. This is generally used
+ * @param type the type of object required/requested. This is generally used
* when the caller wants to receive a raw source object and avoid any binding processing.
* For example, passing javax.xml.transform.Source. The bindings do not necessarily throw
* if they cannot provide an object of the requested type, and will apply their normal
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/DataWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/DataWriter.java b/core/src/main/java/org/apache/cxf/databinding/DataWriter.java
index 3f57705..8cec948 100644
--- a/core/src/main/java/org/apache/cxf/databinding/DataWriter.java
+++ b/core/src/main/java/org/apache/cxf/databinding/DataWriter.java
@@ -33,10 +33,10 @@ import org.apache.cxf.service.model.MessagePartInfo;
*/
public interface DataWriter<T> {
String ENDPOINT = DataWriter.class.getName() + "Endpoint";
-
+
/**
* Attach a schema to the writer. If the binding supports validation, it will
- * validate the XML that it produces (assuming that it produces XML).
+ * validate the XML that it produces (assuming that it produces XML).
* @param s the schema.
*/
void setSchema(Schema s);
@@ -47,11 +47,11 @@ public interface DataWriter<T> {
void setAttachments(Collection<Attachment> attachments);
/**
* Set a property for the writer.
- * @param key property key
+ * @param key property key
* @param value property value.
*/
void setProperty(String key, Object value);
-
+
/**
* Write an object to an output sink.
* @param obj the object to write.
@@ -59,10 +59,10 @@ public interface DataWriter<T> {
*/
void write(Object obj, T output);
/**
- * Write an object to an output sink, including extra processing based on the WSDL
+ * Write an object to an output sink, including extra processing based on the WSDL
* service model for a particular message part.
* @param obj The object to write.
- * @param part the message part.
+ * @param part the message part.
* @param output the output sink.
*/
void write(Object obj, MessagePartInfo part, T output);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java b/core/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java
index 0696d0d..cc01147 100644
--- a/core/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/WrapperCapableDatabinding.java
@@ -26,7 +26,7 @@ import javax.xml.namespace.QName;
* To create the WrapperHelper instance for the wrapper capable data binding
*/
public interface WrapperCapableDatabinding {
-
+
WrapperHelper createWrapperHelper(Class<?> wrapperType,
QName typeName,
List<String> partNames,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/WrapperHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/WrapperHelper.java b/core/src/main/java/org/apache/cxf/databinding/WrapperHelper.java
index 7321ff0..01c87e3 100644
--- a/core/src/main/java/org/apache/cxf/databinding/WrapperHelper.java
+++ b/core/src/main/java/org/apache/cxf/databinding/WrapperHelper.java
@@ -24,16 +24,16 @@ import java.util.List;
import org.apache.cxf.interceptor.Fault;
/**
- * This wrapper helper will help to create a wrapper object with part elements or
+ * This wrapper helper will help to create a wrapper object with part elements or
* get a list of part elements from a wrapper object.
*/
-public interface WrapperHelper {
-
+public interface WrapperHelper {
+
Object createWrapperObject(List<?> lst) throws Fault;
-
+
List<Object> getWrapperParts(Object o) throws Fault;
String getSignature();
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java b/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
index bd5969d..04a3acc 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/NodeDataReader.java
@@ -66,15 +66,15 @@ public class NodeDataReader implements DataReader<Node> {
} catch (XMLStreamException e) {
throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e,
e.getClass().getCanonicalName(), e.getMessage());
- }
- }
+ }
+ }
return read(input);
}
public Object read(Node n) {
return new DOMSource(n);
}
-
+
public void setSchema(Schema s) {
// TODO Auto-generated method stub
@@ -82,12 +82,12 @@ public class NodeDataReader implements DataReader<Node> {
public void setAttachments(Collection<Attachment> attachments) {
// TODO Auto-generated method stub
-
+
}
public void setProperty(String prop, Object value) {
// TODO Auto-generated method stub
-
+
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java b/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
index 662aa68..f999311 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/NodeDataWriter.java
@@ -52,7 +52,7 @@ public class NodeDataWriter implements DataWriter<Node> {
&& ((DOMSource) s).getNode() == null) {
return;
}
-
+
XMLStreamWriter writer = new W3CDOMStreamWriter((Element)n);
StaxUtils.copy(s, writer);
} catch (XMLStreamException e) {
@@ -65,10 +65,10 @@ public class NodeDataWriter implements DataWriter<Node> {
}
public void setAttachments(Collection<Attachment> attachments) {
-
+
}
public void setProperty(String key, Object value) {
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java
index 4d83e38..4e71968 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/SourceDataBinding.java
@@ -38,11 +38,11 @@ import org.apache.ws.commons.schema.constants.Constants;
* A simple databinding implementation which reads and writes Source objects.
*/
public class SourceDataBinding extends org.apache.cxf.databinding.AbstractDataBinding {
-
+
public static final String PREFERRED_FORMAT = "source-preferred-format";
final Class<?> preferred;
-
+
public SourceDataBinding() {
super();
preferred = null;
@@ -69,7 +69,7 @@ public class SourceDataBinding extends org.apache.cxf.databinding.AbstractDataBi
} .walk();
}
}
-
+
@SuppressWarnings("unchecked")
public <T> DataReader<T> createReader(Class<T> cls) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
index 5e1a056..7d7248b 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataReader.java
@@ -71,14 +71,14 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
private final Class<?> preferred;
private Schema schema;
private Message message;
-
+
public XMLStreamDataReader() {
preferred = null;
}
public XMLStreamDataReader(Class<?> cls) {
preferred = cls;
}
-
+
public Object read(MessagePartInfo part, XMLStreamReader input) {
return read(null, input, part.getTypeClass());
}
@@ -161,9 +161,9 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
} catch (XMLStreamException e) {
throw new Fault("COULD_NOT_READ_XML_STREAM_CAUSED_BY", LOG, e,
e.getClass().getCanonicalName(), e.getMessage());
- }
+ }
}
-
+
private Object createStaxSource(XMLStreamReader input, Class<?> type) {
try {
return type.getConstructor(XMLStreamReader.class).newInstance(input);
@@ -180,11 +180,11 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
message.getInterceptorChain().remove(StaxInEndingInterceptor.INSTANCE);
message.getInterceptorChain().add(new StaxInEndingInterceptor(Phase.POST_INVOKE));
}
-
+
message.removeContent(XMLStreamReader.class);
final InputStream ins = message.getContent(InputStream.class);
message.removeContent(InputStream.class);
-
+
input = new FragmentStreamReader(input, true) {
boolean closed;
public boolean hasNext() throws XMLStreamException {
@@ -233,14 +233,14 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
}
//check if the impl can still validate after the setup, possible issue loading schemas or similar
if (impl.canValidate()) {
- //Can use the MSV libs and woodstox to handle the schema validation during
+ //Can use the MSV libs and woodstox to handle the schema validation during
//parsing and processing. Much faster and single traversal
//filter xop node
XMLStreamReader reader = StaxUtils.createXMLStreamReader(ds);
- XMLStreamReader filteredReader =
- StaxUtils.createFilteredReader(reader,
+ XMLStreamReader filteredReader =
+ StaxUtils.createFilteredReader(reader,
new StaxStreamFilter(new QName[] {XOP}));
-
+
StaxUtils.copy(filteredReader, nullWriter);
} else {
//MSV not available, use a slower method of cloning the data, replace the xop's, validate
@@ -248,7 +248,7 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
Element newElement = rootElement;
if (DOMUtils.hasElementWithName(rootElement, "http://www.w3.org/2004/08/xop/include", "Include")) {
newElement = (Element)rootElement.cloneNode(true);
- List<Element> elems = DOMUtils.findAllElementsByTagNameNS(newElement,
+ List<Element> elems = DOMUtils.findAllElementsByTagNameNS(newElement,
"http://www.w3.org/2004/08/xop/include",
"Include");
for (Element include : elems) {
@@ -265,19 +265,19 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
throw new XMLStreamException(e.getMessage(), e);
}
}
- return rootElement;
+ return rootElement;
}
- private InputStream getInputStream(XMLStreamReader input)
+ private InputStream getInputStream(XMLStreamReader input)
throws XMLStreamException, IOException {
-
+
try (CachedOutputStream out = new CachedOutputStream()) {
StaxUtils.copy(input, out);
return out.getInputStream();
}
}
public DOMSource read(XMLStreamReader reader) {
- // Use a DOMSource for now, we should really use a StaxSource/SAXSource though for
+ // Use a DOMSource for now, we should really use a StaxSource/SAXSource though for
// performance reasons
try {
XMLStreamReader reader2 = reader;
@@ -302,7 +302,7 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
e.getClass().getCanonicalName(), e.getMessage());
}
}
-
+
public void setSchema(Schema s) {
schema = s;
}
@@ -315,7 +315,7 @@ public class XMLStreamDataReader implements DataReader<XMLStreamReader> {
message = (Message)value;
}
}
-
+
static class NUllOutputStream extends OutputStream {
public void write(byte[] b, int off, int len) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
index c0938d5..8bd9b71 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
@@ -49,7 +49,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
private static final Logger LOG = LogUtils.getL7dLogger(XMLStreamDataWriter.class);
private Schema schema;
-
+
public void write(Object obj, MessagePartInfo part, XMLStreamWriter output) {
write(obj, output);
}
@@ -68,7 +68,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
StaxUtils.copy(reader, writer);
reader.close();
}
-
+
} else if (obj instanceof Node) {
if (schema != null) {
schema.newValidator().validate(new DOMSource((Node)obj));
@@ -104,7 +104,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
private void writeNode(Node nd, XMLStreamWriter writer) throws XMLStreamException {
if (writer instanceof W3CDOMStreamWriter) {
W3CDOMStreamWriter dw = (W3CDOMStreamWriter)writer;
-
+
if (dw.getCurrentNode() != null) {
if (nd instanceof DocumentFragment
&& nd.getOwnerDocument() == dw.getCurrentNode().getOwnerDocument()) {
@@ -137,7 +137,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
StaxUtils.writeDocument((Document)nd,
writer, false, true);
} else {
- StaxUtils.writeNode(nd, writer, true);
+ StaxUtils.writeNode(nd, writer, true);
}
}
@@ -148,9 +148,9 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
public void setAttachments(Collection<Attachment> attachments) {
- }
+ }
public void setProperty(String key, Object value) {
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java b/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java
index a824a0d..822f6cc 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeAttribute.java
@@ -21,15 +21,15 @@ package org.apache.cxf.databinding.source.mime;
import javax.xml.namespace.QName;
public final class MimeAttribute {
- public static final QName MIME_QNAME = new QName("http://www.w3.org/2005/05/xmlmime",
+ public static final QName MIME_QNAME = new QName("http://www.w3.org/2005/05/xmlmime",
"expectedContentTypes");
private String value;
-
+
public void setValue(String v) {
this.value = v;
}
-
+
public String getValue() {
return this.value;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java b/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
index 719680e..7356fe9 100644
--- a/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
+++ b/core/src/main/java/org/apache/cxf/databinding/source/mime/MimeSerializer.java
@@ -29,8 +29,8 @@ import org.apache.ws.commons.schema.XmlSchemaObject;
import org.apache.ws.commons.schema.extensions.ExtensionSerializer;
public class MimeSerializer implements ExtensionSerializer {
-
- public void serialize(XmlSchemaObject schemaObject,
+
+ public void serialize(XmlSchemaObject schemaObject,
@SuppressWarnings("rawtypes") Class classOfType, Node domNode) {
Map<Object, Object> metaInfoMap = schemaObject.getMetaInfoMap();
MimeAttribute mimeType = (MimeAttribute)metaInfoMap.get(MimeAttribute.MIME_QNAME);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
index a6f0c3a..f2a65a8 100644
--- a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
+++ b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
@@ -67,10 +67,10 @@ public class StaxDataBinding extends AbstractInterceptorProvidingDataBinding {
inInterceptors.add(RemoveStaxInEndingInterceptor.INSTANCE);
inFaultInterceptors.add(RemoveStaxInEndingInterceptor.INSTANCE);
}
-
+
static class RemoveStaxInEndingInterceptor extends AbstractPhaseInterceptor<Message> {
static final RemoveStaxInEndingInterceptor INSTANCE = new RemoveStaxInEndingInterceptor();
-
+
RemoveStaxInEndingInterceptor() {
super(Phase.PRE_INVOKE);
addBefore(StaxInEndingInterceptor.class.getName());
@@ -80,7 +80,7 @@ public class StaxDataBinding extends AbstractInterceptorProvidingDataBinding {
message.getInterceptorChain().remove(StaxInEndingInterceptor.INSTANCE);
}
}
-
+
public void initialize(Service service) {
for (ServiceInfo serviceInfo : service.getServiceInfos()) {
@@ -139,14 +139,14 @@ public class StaxDataBinding extends AbstractInterceptorProvidingDataBinding {
public Object read(XMLStreamReader reader) {
return reader;
}
-
+
public void setSchema(Schema s) {
}
public void setAttachments(Collection<Attachment> attachments) {
}
- public void setProperty(String prop, Object value) {
+ public void setProperty(String prop, Object value) {
}
}
@@ -166,7 +166,7 @@ public class StaxDataBinding extends AbstractInterceptorProvidingDataBinding {
} else if (obj instanceof XMLStreamWriterCallback) {
((XMLStreamWriterCallback) obj).write(writer);
} else {
- throw new UnsupportedOperationException("Data types of "
+ throw new UnsupportedOperationException("Data types of "
+ obj.getClass() + " are not supported.");
}
} catch (XMLStreamException e) {
@@ -182,6 +182,6 @@ public class StaxDataBinding extends AbstractInterceptorProvidingDataBinding {
public void setProperty(String key, Object value) {
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
index d70e2ea..aef966f 100644
--- a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
+++ b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingFeature.java
@@ -31,7 +31,7 @@ import org.apache.cxf.message.Message;
public class StaxDataBindingFeature extends AbstractFeature {
-
+
@Override
public void initialize(Client client, Bus bus) {
removeDatabindingInterceptor(client.getEndpoint().getBinding().getInInterceptors());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
index 2f36557..580afac 100644
--- a/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/databinding/stax/StaxDataBindingInterceptor.java
@@ -48,7 +48,7 @@ public class StaxDataBindingInterceptor extends AbstractInDatabindingInterceptor
LOG.fine("StaxDataBindingInterceptor skipped in HTTP GET method");
return;
}
-
+
DepthXMLStreamReader xmlReader = getXMLStreamReader(message);
DataReader<XMLStreamReader> dr = getDataReader(message);
MessageContentsList parameters = new MessageContentsList();
@@ -56,27 +56,27 @@ public class StaxDataBindingInterceptor extends AbstractInDatabindingInterceptor
Exchange exchange = message.getExchange();
BindingOperationInfo bop = exchange.getBindingOperationInfo();
- //if body is empty and we have BindingOperationInfo, we do not need to match
+ //if body is empty and we have BindingOperationInfo, we do not need to match
//operation anymore, just return
if (!StaxUtils.toNextElement(xmlReader) && bop != null) {
// body may be empty for partial response to decoupled request
return;
}
-
+
if (bop == null) {
Endpoint ep = exchange.getEndpoint();
bop = ep.getBinding().getBindingInfo().getOperations().iterator().next();
}
-
+
message.getExchange().put(BindingOperationInfo.class, bop);
-
+
if (isRequestor(message)) {
- parameters.put(bop.getOutput().getMessageParts().get(0), dr.read(xmlReader));
+ parameters.put(bop.getOutput().getMessageParts().get(0), dr.read(xmlReader));
} else {
- parameters.put(bop.getInput().getMessageParts().get(0), dr.read(xmlReader));
+ parameters.put(bop.getInput().getMessageParts().get(0), dr.read(xmlReader));
}
-
+
if (parameters.size() > 0) {
message.setContent(List.class, parameters);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
index 1a9ed0f..47c6687 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
@@ -45,24 +45,24 @@ import org.apache.cxf.ws.addressing.EndpointReferenceType;
* that retrieves a Conduit from the ConduitInitiator.
*/
public abstract class AbstractConduitSelector implements ConduitSelector, Closeable {
- public static final String CONDUIT_COMPARE_FULL_URL
+ public static final String CONDUIT_COMPARE_FULL_URL
= "org.apache.cxf.ConduitSelector.compareFullUrl";
protected static final String KEEP_CONDUIT_ALIVE = "KeepConduitAlive";
-
-
+
+
//collection of conduits that were created so we can close them all at the end
protected List<Conduit> conduits = new CopyOnWriteArrayList<Conduit>();
-
+
//protected Conduit selectedConduit;
protected Endpoint endpoint;
-
+
public AbstractConduitSelector() {
}
-
+
/**
* Constructor, allowing a specific conduit to override normal selection.
- *
+ *
* @param c specific conduit
*/
public AbstractConduitSelector(Conduit c) {
@@ -70,25 +70,25 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
conduits.add(c);
}
}
-
+
public void close() {
for (Conduit c : conduits) {
c.close();
}
conduits.clear();
}
-
+
protected void removeConduit(Conduit conduit) {
if (conduit != null) {
conduit.close();
conduits.remove(conduit);
}
}
-
+
/**
* Mechanics to actually get the Conduit from the ConduitInitiator
* if necessary.
- *
+ *
* @param message the current Message
*/
protected Conduit getSelectedConduit(Message message) {
@@ -117,17 +117,17 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
} catch (IOException ex) {
throw new Fault(ex);
}
- }
+ }
if (c != null && c.getTarget() != null && c.getTarget().getAddress() != null) {
replaceEndpointAddressPropertyIfNeeded(message, c.getTarget().getAddress().getValue(), c);
}
- //the search for the conduit could cause extra properties to be reset/loaded.
+ //the search for the conduit could cause extra properties to be reset/loaded.
message.resetContextCache();
message.put(Conduit.class, c);
return c;
}
-
- protected Conduit createConduit(Message message, Exchange exchange, ConduitInitiator conduitInitiator)
+
+ protected Conduit createConduit(Message message, Exchange exchange, ConduitInitiator conduitInitiator)
throws IOException {
Conduit c = null;
synchronized (endpoint) {
@@ -151,7 +151,7 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
epr.setAddress(ad);
c = conduitInitiator.getConduit(ei, epr, exchange.getBus());
}
- MessageObserver observer =
+ MessageObserver observer =
exchange.get(MessageObserver.class);
if (observer != null) {
c.setMessageObserver(observer);
@@ -165,14 +165,14 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
// Some conduits may replace the endpoint address after it has already been prepared
// but before the invocation has been done (ex, org.apache.cxf.clustering.LoadDistributorTargetSelector)
- // which may affect JAX-RS clients where actual endpoint address property may include additional path
- // segments.
- protected boolean replaceEndpointAddressPropertyIfNeeded(Message message,
+ // which may affect JAX-RS clients where actual endpoint address property may include additional path
+ // segments.
+ protected boolean replaceEndpointAddressPropertyIfNeeded(Message message,
String endpointAddress,
Conduit cond) {
return false;
}
-
+
/**
* @return the encapsulated Endpoint
*/
@@ -186,17 +186,17 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
public void setEndpoint(Endpoint ep) {
endpoint = ep;
}
-
+
/**
* Called on completion of the MEP for which the Conduit was required.
- *
+ *
* @param exchange represents the completed MEP
*/
public void complete(Exchange exchange) {
// Clients expecting explicit InputStream responses
// will need to keep low level conduits operating on InputStreams open
// and will be responsible for closing the streams
-
+
if (MessageUtils.isTrue(exchange.get(KEEP_CONDUIT_ALIVE))) {
return;
}
@@ -212,7 +212,7 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
} catch (IOException e) {
//IGNORE
}
- }
+ }
/**
* @return the logger to use
*/
@@ -220,12 +220,12 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
/**
* If address protocol was changed, conduit should be re-initialised
- *
+ *
* @param message the current Message
*/
protected Conduit findCompatibleConduit(Message message) {
Conduit c = message.get(Conduit.class);
- if (c == null
+ if (c == null
&& message.getExchange() != null
&& message.getExchange().getOutMessage() != null
&& message.getExchange().getOutMessage() != message) {
@@ -236,7 +236,7 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
}
ContextualBooleanGetter cbg = new ContextualBooleanGetter(message);
for (Conduit c2 : conduits) {
- if (c2.getTarget() == null
+ if (c2.getTarget() == null
|| c2.getTarget().getAddress() == null
|| c2.getTarget().getAddress().getValue() == null) {
continue;
@@ -256,7 +256,7 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
}
}
for (Conduit c2 : conduits) {
- if (c2.getTarget() == null
+ if (c2.getTarget() == null
|| c2.getTarget().getAddress() == null
|| c2.getTarget().getAddress().getValue() == null) {
return c2;
@@ -264,7 +264,7 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
}
return null;
}
-
+
private boolean matchAddresses(String conduitAddress, String actualAddress, ContextualBooleanGetter cbg) {
if (conduitAddress.length() == actualAddress.length()) {
//let's be optimistic and try full comparison first, regardless of CONDUIT_COMPARE_FULL_URL value,
@@ -280,7 +280,7 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
}
}
- //smart address substring comparison that tries to avoid building and comparing substrings unless strictly required
+ //smart address substring comparison that tries to avoid building and comparing substrings unless strictly required
private boolean matchAddressSubstrings(String conduitAddress, String actualAddress) {
int idx = conduitAddress.indexOf(':');
if (idx == actualAddress.indexOf(':')) {
@@ -291,19 +291,19 @@ public abstract class AbstractConduitSelector implements ConduitSelector, Closea
actualAddress = actualAddress.substring(0, idx);
return conduitAddress.equalsIgnoreCase(actualAddress);
} else {
- //no possible match as for sure the substrings before idx will be different
+ //no possible match as for sure the substrings before idx will be different
return false;
}
}
-
+
private static final class ContextualBooleanGetter {
private Boolean value;
private final Message message;
-
+
ContextualBooleanGetter(Message message) {
this.message = message;
}
-
+
public boolean isFullComparison() {
if (value == null) {
value = MessageUtils.getContextualBoolean(message, CONDUIT_COMPARE_FULL_URL, false);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java b/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
index 17745e3..8be3bfa 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/AbstractEndpointFactory.java
@@ -48,7 +48,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
private static final Logger LOG = LogUtils.getL7dLogger(AbstractEndpointFactory.class);
private static final String PRIVATE_ENDPOINT = "org.apache.cxf.endpoint.private";
private static final String PRIVATE_ENDPOINTS = "org.apache.cxf.private.endpoints";
-
+
protected Bus bus;
protected String address;
protected String transportId;
@@ -80,14 +80,14 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
public Bus getBus() {
return getBus(true);
}
-
+
public Bus getBus(boolean createIfNeeded) {
if (bus == null && createIfNeeded) {
bus = BusFactory.getThreadDefaultBus();
}
return bus;
}
-
+
public void setBus(Bus bus) {
this.bus = bus;
}
@@ -139,15 +139,15 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
public void setEndpointName(QName endpointName) {
this.endpointName = endpointName;
}
-
+
public void setServiceName(QName name) {
serviceName = name;
}
-
+
public QName getServiceName() {
return serviceName;
}
-
+
public void setEndpointReference(EndpointReferenceType epr) {
endpointReference = epr;
}
@@ -180,7 +180,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
public BindingFactory getBindingFactory() {
return bindingFactory;
}
-
+
public void setBindingFactory(BindingFactory bf) {
this.bindingFactory = bf;
}
@@ -204,7 +204,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
/**
* Checks if a given endpoint has been marked as private.
* If yes then its address will be added to a bus list property
- * Note that client factories might also check the endpoint, ex,
+ * Note that client factories might also check the endpoint, ex,
* if the endpoint if private then it is likely no service contract
* will be available if requested from the remote address hence it has to
* be availbale locally or generated from the local source
@@ -213,7 +213,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
@SuppressWarnings("unchecked")
protected boolean checkPrivateEndpoint(Endpoint ep) {
if (MessageUtils.isTrue(ep.get(PRIVATE_ENDPOINT))) {
- List<String> addresses =
+ List<String> addresses =
(List<String>)getBus().getProperty(PRIVATE_ENDPOINTS);
if (addresses == null) {
addresses = new LinkedList<String>();
@@ -240,8 +240,8 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
if (initializeAnnotationInterceptors(provider, ep)) {
LOG.fine("Added annotation based interceptors and features");
}
- }
-
+ }
+
protected static void addToBeans(Collection<Object> beans, Object o) {
if (o instanceof Collection) {
for (Object o2: (Collection<?>)o) {
@@ -251,7 +251,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
beans.add(o);
}
}
-
+
protected boolean initializeAnnotationInterceptors(AnnotationInterceptors provider, Endpoint ep) {
boolean hasAnnotation = false;
if (provider.getInFaultInterceptors() != null) {
@@ -274,7 +274,7 @@ public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorPr
getFeatures().addAll(provider.getFeatures());
hasAnnotation = true;
}
-
+
return hasAnnotation;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/Client.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/Client.java b/core/src/main/java/org/apache/cxf/endpoint/Client.java
index 8a2a06f..6ff2940 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/Client.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/Client.java
@@ -40,19 +40,19 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
* Invokes an operation synchronously
* @param operationName The name of the operation to be invoked. The service namespace will be used
* when looking up the BindingOperationInfo.
- * @param params The params that matches the parts of the input message of the operation. If the
- * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form. If
+ * @param params The params that matches the parts of the input message of the operation. If the
+ * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form. If
* params are in the wrapped form, use invokeWrapped
* @return The return values that matche the parts of the output message of the operation
*/
Object[] invoke(String operationName,
Object... params) throws Exception;
-
+
/**
* Invokes an operation synchronously
* @param operationName The name of the operation to be invoked
- * @param params The params that matches the parts of the input message of the operation. If the
- * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form. If
+ * @param params The params that matches the parts of the input message of the operation. If the
+ * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form. If
* params are in the wrapped form, use invokeWrapped
* @return The return values that matche the parts of the output message of the operation
*/
@@ -69,7 +69,7 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
*/
Object[] invokeWrapped(String operationName,
Object... params) throws Exception;
-
+
/**
* Invokes an operation synchronously
* @param operationName The name of the operation to be invoked
@@ -78,7 +78,7 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
*/
Object[] invokeWrapped(QName operationName,
Object... params) throws Exception;
-
+
/**
* Invokes an operation synchronously
* @param oi The operation to be invoked
@@ -92,48 +92,48 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
* Invokes an operation synchronously
* @param oi The operation to be invoked
* @param params The params that matches the parts of the input message of the operation
- * @param context Optional (can be null) contextual information for the invocation
+ * @param context Optional (can be null) contextual information for the invocation
* @return The return values that matche the parts of the output message of the operation
*/
Object[] invoke(BindingOperationInfo oi,
Object[] params,
Map<String, Object> context) throws Exception;
-
+
/**
* Invokes an operation synchronously
* @param oi The operation to be invoked
* @param params The params that matches the parts of the input message of the operation
* @param context Optional (can be null) contextual information for the invocation
- * @param exchange The Exchange to be used for the invocation
+ * @param exchange The Exchange to be used for the invocation
* @return The return values that matche the parts of the output message of the operation
*/
Object[] invoke(BindingOperationInfo oi,
- Object[] params,
+ Object[] params,
Map<String, Object> context,
Exchange exchange) throws Exception;
-
+
/**
* Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param operationName The name of the operation to be invoked. The service namespace will be used
* when looking up the BindingOperationInfo.
- * @param params The params that matches the parts of the input message of the operation. If the
- * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form. If
+ * @param params The params that matches the parts of the input message of the operation. If the
+ * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form. If
* params are in the wrapped form, use invokeWrapped
- *
+ *
*/
void invoke(ClientCallback callback,
String operationName,
Object... params) throws Exception;
-
+
/**
* Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param operationName The name of the operation to be invoked
- * @param params The params that matches the parts of the input message of the operation. If the
- * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form. If
+ * @param params The params that matches the parts of the input message of the operation. If the
+ * BindingOperationInfo supports unwrapping, it assumes the params are in the "unwrapped" form. If
* params are in the wrapped form, use invokeWrapped
- *
+ *
*/
void invoke(ClientCallback callback,
QName operationName,
@@ -151,18 +151,18 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
void invokeWrapped(ClientCallback callback,
String operationName,
Object... params) throws Exception;
-
+
/**
* Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param operationName The name of the operation to be invoked
* @param params The params that matches the parts of the input message of the operation
- *
+ *
*/
void invokeWrapped(ClientCallback callback,
QName operationName,
- Object... params) throws Exception;
-
+ Object... params) throws Exception;
+
/**
* Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
@@ -173,7 +173,7 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
void invoke(ClientCallback callback,
BindingOperationInfo oi,
Object... params) throws Exception;
-
+
/**
* Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
@@ -184,8 +184,8 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
void invoke(ClientCallback callback,
BindingOperationInfo oi,
Object[] params,
- Map<String, Object> context) throws Exception;
-
+ Map<String, Object> context) throws Exception;
+
/**
* Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
@@ -197,23 +197,23 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
void invoke(ClientCallback callback,
BindingOperationInfo oi,
Object[] params,
- Exchange exchange) throws Exception;
-
+ Exchange exchange) throws Exception;
+
/**
* Invokes an operation asynchronously
* @param callback The callback that is called when the response is ready
* @param oi The operation to be invoked
* @param params The params that matches the parts of the input message of the operation
* @param context Optional (can be null) contextual information for the invocation
- * @param exchange Optional (can be null) The Exchange to be used for the invocation
+ * @param exchange Optional (can be null) The Exchange to be used for the invocation
*/
void invoke(ClientCallback callback,
BindingOperationInfo oi,
Object[] params,
Map<String, Object> context,
- Exchange exchange) throws Exception;
-
-
+ Exchange exchange) throws Exception;
+
+
/**
* Gets the request context used for future invocations
* @return context The context
@@ -224,16 +224,16 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
* @return context The context
*/
Map<String, Object> getResponseContext();
-
+
/**
- * Sets whether the request context is thread local or global to this client. By
+ * Sets whether the request context is thread local or global to this client. By
* default, the request context is "global" in that any values set in the context
- * are seen by all threads using this client. If set to true, the context is changed
+ * are seen by all threads using this client. If set to true, the context is changed
* to be a ThreadLocal and values set are not seen by other threads.
* @param b
*/
void setThreadLocalRequestContext(boolean b);
-
+
/**
* Checks if the Request context is thread local or global.
* @return true if the request context is a thread local
@@ -248,36 +248,36 @@ public interface Client extends InterceptorProvider, MessageObserver, ConduitSel
* @return Conduit
*/
Conduit getConduit();
-
+
/**
* Get the ConduitSelector responsible for retreiving the Conduit.
- *
+ *
* @return the current ConduitSelector
*/
ConduitSelector getConduitSelector();
/**
* Set the ConduitSelector responsible for retreiving the Conduit.
- *
+ *
* @param selector the ConduitSelector to use
*/
void setConduitSelector(ConduitSelector selector);
-
+
/**
* Indicates that the client is no longer needed and that any resources it holds
* can now be freed.
*
*/
void destroy();
-
+
/**
* Sets the executor which is used to process Asynchronous responses. The default
- * is to use the threads provided by the transport. (example: the JMS listener threads)
+ * is to use the threads provided by the transport. (example: the JMS listener threads)
* @param executor
*/
void setExecutor(Executor executor);
-
-
+
+
/**
* Retrieves the Bus that was used to create the Client
* @return the Bus
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index 282eeb0..3641d82 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -78,7 +78,7 @@ public class ClientImpl
public static final String THREAD_LOCAL_REQUEST_CONTEXT = "thread.local.request.context";
/**
* When a synchronous request/response invoke is done using an asynchronous transport mechanism,
- * this is the timeout used for waiting for the response. Default is 60 seconds.
+ * this is the timeout used for waiting for the response. Default is 60 seconds.
*/
public static final String SYNC_TIMEOUT = "cxf.synchronous.timeout";
@@ -95,10 +95,10 @@ public class ClientImpl
protected PhaseChainCache inboundChainCache = new PhaseChainCache();
protected Map<String, Object> currentRequestContext = new ConcurrentHashMap<String, Object>(8, 0.75f, 4);
- protected Map<Thread, EchoContext> requestContext
+ protected Map<Thread, EchoContext> requestContext
= Collections.synchronizedMap(new WeakHashMap<Thread, EchoContext>());
- protected Map<Thread, Map<String, Object>> responseContext
+ protected Map<Thread, Map<String, Object>> responseContext
= Collections.synchronizedMap(new WeakHashMap<Thread, Map<String, Object>>());
protected Executor executor;
@@ -117,7 +117,7 @@ public class ClientImpl
getConduitSelector(sc).setEndpoint(e);
notifyLifecycleManager();
}
-
+
/**
* Create a Client that uses a specific EndpointImpl.
* @param bus
@@ -142,7 +142,7 @@ public class ClientImpl
}
notifyLifecycleManager();
}
-
+
public Bus getBus() {
return bus;
}
@@ -174,7 +174,7 @@ public class ClientImpl
getConduit().close();
}
}
-
+
bus = null;
conduitSelector = null;
outFaultObserver = null;
@@ -186,7 +186,7 @@ public class ClientImpl
requestContext = null;
responseContext.clear();
responseContext = null;
- executor = null;
+ executor = null;
}
private void notifyLifecycleManager() {
@@ -393,14 +393,14 @@ public class ClientImpl
Object... params) throws Exception {
invoke(callback, oi, params, null, null);
}
-
+
public void invoke(ClientCallback callback,
BindingOperationInfo oi,
Object[] params,
Map<String, Object> context) throws Exception {
invoke(callback, oi, params, context, null);
}
-
+
public void invoke(ClientCallback callback,
BindingOperationInfo oi,
Object[] params,
@@ -444,7 +444,7 @@ public class ClientImpl
LOG.fine("Invoke, operation info: " + oi + ", params: " + Arrays.toString(params));
}
Message message = endpoint.getBinding().createMessage();
-
+
// Make sure INVOCATION CONTEXT, REQUEST_CONTEXT and RESPONSE_CONTEXT are present
// on message
Map<String, Object> reqContext = null;
@@ -454,7 +454,7 @@ public class ClientImpl
}
reqContext = CastUtils.cast((Map<?, ?>)context.get(REQUEST_CONTEXT));
resContext = CastUtils.cast((Map<?, ?>)context.get(RESPONSE_CONTEXT));
- if (reqContext == null) {
+ if (reqContext == null) {
reqContext = new HashMap<String, Object>(getRequestContext());
context.put(REQUEST_CONTEXT, reqContext);
}
@@ -462,11 +462,11 @@ public class ClientImpl
resContext = new HashMap<String, Object>();
context.put(RESPONSE_CONTEXT, resContext);
}
-
+
message.put(Message.INVOCATION_CONTEXT, context);
setContext(reqContext, message);
exchange.putAll(reqContext);
-
+
setParameters(params, message);
if (null != oi) {
@@ -475,7 +475,7 @@ public class ClientImpl
exchange.setOutMessage(message);
exchange.put(ClientCallback.class, callback);
-
+
setOutMessageProperties(message, oi);
setExchangeProperties(exchange, endpoint, oi);
@@ -516,7 +516,7 @@ public class ClientImpl
enrichFault(fault);
throw fault;
}
-
+
if (callback != null) {
return null;
} else {
@@ -536,11 +536,11 @@ public class ClientImpl
getConduitSelector().complete(exchange);
Message outMessage = exchange.getOutMessage();
if (outMessage != null && outMessage.get("transport.retransmit.url") != null) {
- //FIXME: target address has been updated at the transport level,
+ //FIXME: target address has been updated at the transport level,
// update the the current client accordingly
}
}
-
+
/**
* TODO This is SOAP specific code and should not be in cxf core
* @param fault
@@ -551,8 +551,8 @@ public class ClientImpl
String soap11NS = "http://schemas.xmlsoap.org/soap/envelope/";
String soap12NS = "http://www.w3.org/2003/05/soap-envelope";
QName faultCode = fault.getFaultCode();
- //for SoapFault, if it's underlying cause is IOException,
- //it means something like server is down or can't create
+ //for SoapFault, if it's underlying cause is IOException,
+ //it means something like server is down or can't create
//connection, according to soap spec we should set fault as
//Server Fault
if (faultCode.getNamespaceURI().equals(
@@ -594,10 +594,10 @@ public class ClientImpl
}
throw ex;
}
-
- //REVISIT
+
+ //REVISIT
// - use a protocol neutral no-content marker instead of 202?
- // - move the decoupled destination property name into api
+ // - move the decoupled destination property name into api
Integer responseCode = (Integer)exchange.get(Message.RESPONSE_CODE);
if (null != responseCode && 202 == responseCode) {
Endpoint ep = exchange.getEndpoint();
@@ -749,7 +749,7 @@ public class ClientImpl
chain.setFaultObserver(outFaultObserver);
modifyChain(chain, message, true);
modifyChain(chain, message.getExchange().getOutMessage(), true);
-
+
Bus origBus = BusFactory.getAndSetThreadDefaultBus(bus);
// execute chain
ClientCallback callback = message.getExchange().get(ClientCallback.class);
@@ -779,7 +779,7 @@ public class ClientImpl
try {
chain.doIntercept(message);
} catch (Throwable error) {
- //so that asyn callback handler get chance to
+ //so that asyn callback handler get chance to
//handle non-runtime exceptions
message.getExchange().setInMessage(message);
Map<String, Object> resCtx = CastUtils
@@ -800,7 +800,7 @@ public class ClientImpl
} else {
chain.doIntercept(message);
}
-
+
}
callback = message.getExchange().get(ClientCallback.class);
@@ -834,7 +834,7 @@ public class ClientImpl
BusFactory.setThreadDefaultBus(origBus);
}
synchronized (message.getExchange()) {
- if (!isPartialResponse(message)
+ if (!isPartialResponse(message)
|| message.getContent(Exception.class) != null) {
message.getExchange().put(FINISHED, Boolean.TRUE);
message.getExchange().setInMessage(message);
@@ -887,7 +887,7 @@ public class ClientImpl
public void onMessage(final Message message) {
if (!message.getExchange()
.containsKey(Executor.class.getName() + ".USING_SPECIFIED")) {
-
+
executor.execute(new Runnable() {
public void run() {
ClientImpl.this.onMessage(message);
@@ -968,7 +968,7 @@ public class ClientImpl
if (ctx == null) {
return;
}
- Collection<InterceptorProvider> providers
+ Collection<InterceptorProvider> providers
= CastUtils.cast((Collection<?>)ctx.get(Message.INTERCEPTOR_PROVIDERS));
if (providers != null) {
for (InterceptorProvider p : providers) {
@@ -980,7 +980,7 @@ public class ClientImpl
}
}
String key = in ? Message.IN_INTERCEPTORS : Message.OUT_INTERCEPTORS;
- Collection<Interceptor<? extends Message>> is
+ Collection<Interceptor<? extends Message>> is
= CastUtils.cast((Collection<?>)ctx.get(key));
if (is != null) {
chain.add(is);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleListener.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleListener.java b/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleListener.java
index f4c5433..77279e3 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleListener.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleListener.java
@@ -21,5 +21,5 @@ package org.apache.cxf.endpoint;
public interface ClientLifeCycleListener {
void clientCreated(Client client);
- void clientDestroyed(Client client);
+ void clientDestroyed(Client client);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManager.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManager.java b/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManager.java
index a1f0226..53acdf7 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManager.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientLifeCycleManager.java
@@ -20,7 +20,7 @@
package org.apache.cxf.endpoint;
-public interface ClientLifeCycleManager {
+public interface ClientLifeCycleManager {
void clientCreated(Client client);
void clientDestroyed(Client client);
void registerListener(ClientLifeCycleListener listener);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java b/core/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java
index 1ca3c7d..e4d3063 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ConduitSelector.java
@@ -30,12 +30,12 @@ import org.apache.cxf.transport.Conduit;
* into the Client via config.
*/
public interface ConduitSelector {
-
+
/**
* Called prior to the interceptor chain being traversed.
* This is the point at which an eager strategy would retrieve
* a Conduit.
- *
+ *
* @param message the current Message
*/
void prepare(Message message);
@@ -44,17 +44,17 @@ public interface ConduitSelector {
* Called when a Conduit is actually required.
* This is the point at which a lazy strategy would retrieve
* a Conduit.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
Conduit selectConduit(Message message);
-
+
/**
* Called on completion of the MEP for which the Conduit was required.
* This is the point at which a one-shot strategy would dispose of
* the Conduit.
- *
+ *
* @param exchange represents the completed MEP
*/
void complete(Exchange exchange);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/endpoint/ConduitSelectorHolder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ConduitSelectorHolder.java b/core/src/main/java/org/apache/cxf/endpoint/ConduitSelectorHolder.java
index f650039..c8ff4db 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ConduitSelectorHolder.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ConduitSelectorHolder.java
@@ -20,6 +20,6 @@ package org.apache.cxf.endpoint;
public interface ConduitSelectorHolder {
ConduitSelector getConduitSelector();
-
+
void setConduitSelector(ConduitSelector conduitSelector);
}
[50/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
----------------------------------------------------------------------
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java b/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
index ac8c17d..60922d8 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/client/BenchClient.java
@@ -49,7 +49,7 @@ public class BenchClient {
private final static QName SERVICE_NAME = new QName("http://www.extreme.indiana.edu/wsdl/Benchmark1", "Benchmark");
private final static boolean VERBOSE = true;
private final static String SMOKE_TEST = "smoke_test";
-
+
Benchmark_Service service;
Benchmark port;
@@ -64,12 +64,12 @@ public class BenchClient {
}
} catch (MalformedURLException e) {
e.printStackTrace();
- }
-
+ }
+
service = new Benchmark_Service(wsdlURL, SERVICE_NAME);
- port = service.getBenchmark();
-
-
+ port = service.getBenchmark();
+
+
/*options.setProperty(org.apache.axis2.transport.http.HTTPConstants.SO_TIMEOUT,new Integer(480000));
options.setProperty(org.apache.axis2.transport.http.HTTPConstants.CONNECTION_TIMEOUT,new Integer(480000));*/
}
@@ -87,12 +87,12 @@ public class BenchClient {
verbose("Starting " + ID + " at " + (new Date()));
// allow multiple URLs (each must start with http"
- List<String> locationList = new ArrayList<>();
+ List<String> locationList = new ArrayList<>();
int pos = 0;
while (pos < args.length) {
String s = args[pos];
if (s.startsWith("http") || s.startsWith("file")) {
- locationList.add(s);
+ locationList.add(s);
} else {
break;
}
@@ -115,13 +115,13 @@ public class BenchClient {
if (args.length > (pos + 2)) {
arrSizeToSend = args[(pos + 2)];
}
-
+
String[] locations = new String[locationList.size()];
locationList.toArray(locations);
for (int i = 0; i < locations.length; i++) {
String location = locations[i];
- verbose("connecting to " + location);
+ verbose("connecting to " + location);
runTestsForSize(location, elementsToSend, testType, arrSizeToSend);
}
long benchmarkEnd = System.currentTimeMillis();
@@ -172,12 +172,12 @@ public class BenchClient {
final char method = td.method;
if (method == 'a') {
if (direction == 'e') {
- //test for the void
+ //test for the void
td.setMethod('v');
runOneTest(td);
}
/*
- // test for Base64
+ // test for Base64
td.setMethod('b');
runOneTest(td);
// test for Doubles
@@ -200,7 +200,7 @@ public class BenchClient {
runOneTest(td);
}
}
-
+
public static void runOneTest(TestDescriptor td)
throws Exception {
@@ -227,32 +227,32 @@ public class BenchClient {
}
}
- Double[] darr = null;
- if (method == 'd') {
+ Double[] darr = null;
+ if (method == 'd') {
darr = new Double[totalInv];
for (int i = 0; i < darr.length; i++) {
darr[i] = new Double(i);
}
}
- Integer[] iarr = null;
- if (method == 'i') {
+ Integer[] iarr = null;
+ if (method == 'i') {
iarr = new Integer[totalInv];
for (int i = 0; i < iarr.length ; i++) {
iarr[i] = new Integer(i);
}
}
- String[] sarr = null;
- if (method == 's') {
+ String[] sarr = null;
+ if (method == 's') {
sarr = new String[totalInv];
for (int i = 0; i < sarr.length; i++) {
sarr[i] = "s" + i;
}
}
- MeshInterfaceObject[] marr = null;
- if (method == 'm') {
+ MeshInterfaceObject[] marr = null;
+ if (method == 'm') {
marr = new MeshInterfaceObject[totalInv];
for (int i = 0; i < totalInv; i++) {
marr[i] = new MeshInterfaceObject();
@@ -262,8 +262,8 @@ public class BenchClient {
}
}
- SimpleEvent[] earr = null;
- if (method == 'e') {
+ SimpleEvent[] earr = null;
+ if (method == 'e') {
earr = new SimpleEvent[totalInv];
for (int i = 0; i < earr.length; i++) {
earr[i] = new SimpleEvent();
@@ -320,8 +320,8 @@ public class BenchClient {
}
}
} else if (method == 'd') {
- ArrayList<Double> da = new ArrayList<>();
- new Util<Double>().copyList(darr, off, da, td.arrSizeToSend);
+ ArrayList<Double> da = new ArrayList<>();
+ new Util<Double>().copyList(darr, off, da, td.arrSizeToSend);
List<Double> uda = null;
int dlen = -1;
if (direction == 'e') {
@@ -516,7 +516,7 @@ public class BenchClient {
private static void verbose(String msg) {
if(VERBOSE) {
System.out.println("B1> " + msg);
- }
+ }
}
private static void fail(String msg) {
@@ -621,7 +621,7 @@ public class BenchClient {
}
- public void echoVoid() throws java.lang.Exception {
+ public void echoVoid() throws java.lang.Exception {
port.echoVoid();
}
@@ -629,25 +629,25 @@ public class BenchClient {
return port.echoStrings(input);
}
- public int receiveBase64(byte[] input) throws java.lang.Exception {
+ public int receiveBase64(byte[] input) throws java.lang.Exception {
return port.receiveBase64(input);
-
+
}
public int receiveDoubles(List<Double> input) throws java.lang.Exception {
-
+
return port.receiveDoubles(input);
}
- public List<Integer> sendInts(int input) throws java.lang.Exception {
+ public List<Integer> sendInts(int input) throws java.lang.Exception {
return port.sendInts(input);
}
public byte[] echoBase64(byte[] input) throws java.lang.Exception {
- return port.echoBase64(input);
+ return port.echoBase64(input);
}
- public int receiveStrings(List<String> input) throws java.lang.Exception {
+ public int receiveStrings(List<String> input) throws java.lang.Exception {
return port.receiveStrings(input);
}
@@ -664,15 +664,15 @@ public class BenchClient {
}
public byte[] sendBase64(int input) throws java.lang.Exception {
-
+
return port.sendBase64(input);
}
- public List<Double> echoDoubles(List<Double> input) throws java.lang.Exception {
+ public List<Double> echoDoubles(List<Double> input) throws java.lang.Exception {
return port.echoDoubles(input);
}
- public List<String> sendStrings(int input) throws java.lang.Exception {
+ public List<String> sendStrings(int input) throws java.lang.Exception {
return port.sendStrings(input);
}
@@ -716,13 +716,13 @@ public class BenchClient {
public List<MeshInterfaceObject> sendMeshInterfaceObjects(int size) throws java.lang.Exception {
SendMeshInterfaceObjectsRequest request = new SendMeshInterfaceObjectsRequest();
request.setSize(size);
- SendMeshInterfaceObjectsResponse response = port.sendMeshInterfaceObjects(request);
+ SendMeshInterfaceObjectsResponse response = port.sendMeshInterfaceObjects(request);
return response.getSendMeshInterfaceObjectsReturn().getItem();
}
-
+
static class Util<E> {
public Util() {
-
+
}
public void copyList(E[] src, int off, ArrayList<E>des, int size) {
des.clear();
@@ -730,7 +730,7 @@ public class BenchClient {
E o = src[i+off];
des.add(o);
}
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
index d47a384..447be85 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkImpl.java
@@ -41,32 +41,32 @@ import edu.indiana.extreme.wsdl.benchmark1.SimpleEvent;
@javax.jws.WebService(name = "Benchmark", serviceName = "Benchmark",
portName = "Benchmark",
- targetNamespace = "http://www.extreme.indiana.edu/wsdl/Benchmark1",
+ targetNamespace = "http://www.extreme.indiana.edu/wsdl/Benchmark1",
endpointInterface = "edu.indiana.extreme.wsdl.benchmark1.Benchmark")
-
+
public class BenchmarkImpl implements Benchmark {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(BenchmarkImpl.class.getPackage().getName());
-
+
public BenchmarkImpl() {
LOG.setLevel(Level.INFO);
}
-
-
+
+
/* (non-Javadoc)
* @see edu.indiana.extreme.wsdl.benchmark1.Benchmark#echoVoid(*
*/
- public void echoVoid() {
+ public void echoVoid() {
LOG.info("Executing operation echoVoid");
}
/* (non-Javadoc)
* @see edu.indiana.extreme.wsdl.benchmark1.Benchmark#echoBase64(byte[] input )*
*/
- public byte[] echoBase64 (byte[] input) {
- LOG.info("Executing operation echoBase64");
+ public byte[] echoBase64 (byte[] input) {
+ LOG.info("Executing operation echoBase64");
return input;
}
@@ -76,7 +76,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.String> echoStrings(
java.util.List<java.lang.String> input
)
- {
+ {
LOG.info("Executing operation echoStrings");
return input;
}
@@ -87,7 +87,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.Integer> echoInts(
java.util.List<java.lang.Integer> input
)
- {
+ {
LOG.info("Executing operation echoInts");
return input;
}
@@ -98,7 +98,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.Double> echoDoubles(
java.util.List<java.lang.Double> input
)
- {
+ {
LOG.info("Executing operation echoDoubles");
return input;
}
@@ -109,7 +109,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.EchoSimpleEventsResponse echoSimpleEvents(
edu.indiana.extreme.wsdl.benchmark1.EchoSimpleEventsRequest input
)
- {
+ {
LOG.info("Executing operation echoSimpleEvents");
EchoSimpleEventsResponse ret = new EchoSimpleEventsResponse();
ret.setEchoSimpleEventsReturn(input.getInput());
@@ -122,7 +122,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.EchoMeshInterfaceObjectsResponse echoMeshInterfaceObjects(
edu.indiana.extreme.wsdl.benchmark1.EchoMeshInterfaceObjectsRequest input
)
- {
+ {
LOG.info("Executing operation echoMeshInterfaceObjects");
EchoMeshInterfaceObjectsResponse ret = new EchoMeshInterfaceObjectsResponse();
List<MeshInterfaceObject> output = ret.getEchoMeshInterfaceObjectReturn();
@@ -138,10 +138,10 @@ public class BenchmarkImpl implements Benchmark {
public int receiveBase64(
byte[] input
)
- {
+ {
LOG.info("Executing operation receiveBase64");
System.out.println("Executing operation receiveBase64 " + input.length);
- return input.length;
+ return input.length;
}
/* (non-Javadoc)
@@ -150,9 +150,9 @@ public class BenchmarkImpl implements Benchmark {
public int receiveStrings(
java.util.List<java.lang.String> input
)
- {
+ {
LOG.info("Executing operation receiveStrings");
- return input.size();
+ return input.size();
}
/* (non-Javadoc)
@@ -161,7 +161,7 @@ public class BenchmarkImpl implements Benchmark {
public int receiveInts(
java.util.List<java.lang.Integer> input
)
- {
+ {
LOG.info("Executing operation receiveInts");
return input.size();
}
@@ -172,7 +172,7 @@ public class BenchmarkImpl implements Benchmark {
public int receiveDoubles(
java.util.List<java.lang.Double> input
)
- {
+ {
LOG.info("Executing operation receiveDoubles");
return input.size();
}
@@ -183,7 +183,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.ReceiveSimpleEventsResponse receiveSimpleEvents(
edu.indiana.extreme.wsdl.benchmark1.ReceiveSimpleEventsRequest input
)
- {
+ {
LOG.info("Executing operation receiveSimpleEvents");
ReceiveSimpleEventsResponse ret = new ReceiveSimpleEventsResponse();
ret.setReceiveSimpleEventsReturn(input.getInput().getItem().size());
@@ -196,7 +196,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.ReceiveMeshInterfaceObjectsResponse receiveMeshInterfaceObjects(
edu.indiana.extreme.wsdl.benchmark1.ReceiveMeshInterfaceObjectsRequest input
)
- {
+ {
LOG.info("Executing operation receiveMeshInterfaceObjects");
ReceiveMeshInterfaceObjectsResponse ret = new ReceiveMeshInterfaceObjectsResponse();
ret.setReceiveMeshInterfaceObjectsReturn(input.getInput().getItem().size());
@@ -209,8 +209,8 @@ public class BenchmarkImpl implements Benchmark {
public byte[] sendBase64(
int size
)
- {
- LOG.info("Executing operation sendBase64");
+ {
+ LOG.info("Executing operation sendBase64");
return new byte[size];
}
@@ -220,8 +220,8 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.String> sendStrings(
int size
)
- {
- LOG.info("Executing operation sendStrings");
+ {
+ LOG.info("Executing operation sendStrings");
List<String> ret = new ArrayList<>(0);
for (int i = 0; i < size; i++) {
String temp = "s" + i;
@@ -236,7 +236,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.Integer> sendInts(
int size
)
- {
+ {
LOG.info("Executing operation sendInts");
List<Integer> ret = new LinkedList<Integer>();
for (int i = 0; i < size; i++) {
@@ -252,7 +252,7 @@ public class BenchmarkImpl implements Benchmark {
public java.util.List<java.lang.Double> sendDoubles(
int size
)
- {
+ {
LOG.info("Executing operation sendDoubles");
List<Double> ret = new LinkedList<Double>();
for (int i = 0; i < size; i++) {
@@ -268,12 +268,12 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.SendSimpleEventsResponse sendSimpleEvents(
edu.indiana.extreme.wsdl.benchmark1.SendSimpleEventsRequest size
)
- {
+ {
LOG.info("Executing operation sendSimpleEvents");
SendSimpleEventsResponse ret = new SendSimpleEventsResponse();
ArrayOfSimpleEvent value = new ArrayOfSimpleEvent();
List<SimpleEvent> item = value.getItem();
- for(int i = 0 ; i < size.getSize() ; i++) {
+ for(int i = 0 ; i < size.getSize() ; i++) {
SimpleEvent object = new SimpleEvent();
object.setSequenceNumber(i);
object.setMessage("Message #" + i);
@@ -290,7 +290,7 @@ public class BenchmarkImpl implements Benchmark {
public edu.indiana.extreme.wsdl.benchmark1.SendMeshInterfaceObjectsResponse sendMeshInterfaceObjects(
edu.indiana.extreme.wsdl.benchmark1.SendMeshInterfaceObjectsRequest size
)
- {
+ {
LOG.info("Executing operation sendMeshInterfaceObjects");
SendMeshInterfaceObjectsResponse ret = new SendMeshInterfaceObjectsResponse();
ArrayOfMeshInterfaceObject value = new ArrayOfMeshInterfaceObject();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
----------------------------------------------------------------------
diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
index d0e9709..00cd212 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
@@ -23,9 +23,9 @@ import javax.xml.ws.Endpoint;
/**
- *
+ *
*/
-
+
public class BenchmarkServer{
protected BenchmarkServer() throws Exception {
@@ -34,11 +34,11 @@ public class BenchmarkServer{
String address = "http://localhost:8080/cxf/services/Benchmark";
Endpoint.publish(address, implementor);
}
-
- public static void main(String args[]) throws Exception {
+
+ public static void main(String args[]) throws Exception {
new BenchmarkServer();
- System.out.println("Server ready...");
- Thread.sleep(Integer.MAX_VALUE);
+ System.out.println("Server ready...");
+ Thread.sleep(Integer.MAX_VALUE);
System.out.println("Server exitting");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
index 2180469..b3dce75 100644
--- a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
+++ b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestCaseBase.java
@@ -27,7 +27,7 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
public abstract class TestCaseBase<T> {
private boolean initialized;
-
+
protected String wsdlPath;
protected String serviceName;
@@ -46,14 +46,14 @@ public abstract class TestCaseBase<T> {
protected int amount = 1;
- protected String wsdlNameSpace;
+ protected String wsdlNameSpace;
protected List<TestResult> results = new ArrayList<>();
protected int numberOfThreads;
-
+
protected String busCfg;
-
+
private String name;
private String[] args;
@@ -63,7 +63,7 @@ public abstract class TestCaseBase<T> {
private boolean timedTestDone = false;
private boolean doWarmup = true;
-
+
public TestCaseBase() {
this("DEFAULT TESTCASE", null);
}
@@ -91,7 +91,7 @@ public abstract class TestCaseBase<T> {
public void processArgs() {
int count = 0;
- int argc = args.length;
+ int argc = args.length;
while (count < argc) {
if ("-WSDL".equals(args[count])) {
wsdlPath = args[count + 1];
@@ -167,11 +167,11 @@ public abstract class TestCaseBase<T> {
}
}
- public void tearDown() {
+ public void tearDown() {
}
protected void setUp() throws Exception {
-
+
clearTestResults();
printTitle();
printSetting("Default Setting: ");
@@ -199,7 +199,7 @@ public abstract class TestCaseBase<T> {
final int threadCount = 4;
final long timeLimit = 30;
final int countLimit = 1200;
-
+
System.out.println("TestCase " + name + " is warming up the jit. (" + timeLimit + " sec/" + countLimit + " iterations, " + threadCount + " threads)");
final long startTime = System.currentTimeMillis();
final long endTime = startTime + (timeLimit * 1000l);
@@ -276,7 +276,7 @@ public abstract class TestCaseBase<T> {
public void testRun() throws Exception {
if (numberOfThreads == 0) {
- numberOfThreads = 1;
+ numberOfThreads = 1;
}
List<Thread> threadList = new ArrayList<>();
for (int i = 0; i < numberOfThreads; i++) {
@@ -316,7 +316,7 @@ public abstract class TestCaseBase<T> {
System.out.println("Overall AVG. response time: " + totalAvgResponseTime * 1000 + TestResult.AVG_UNIT);
System.out.println(totalInvocations + " (invocations), running " + totalDuration + " (sec) ");
System.out.println("============================================");
-
+
}
public void run() {
@@ -400,6 +400,6 @@ public abstract class TestCaseBase<T> {
public String getName() {
return this.name;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java
index 61fec95..f0a2d0b 100644
--- a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java
+++ b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestResult.java
@@ -22,16 +22,16 @@ package org.apache.cxf.pat.internal;
public class TestResult {
public static final String AVG_UNIT = " (ms)";
public static final String THROUGHPUT_UNIT = " (invocations/sec)";
-
+
private String name;
private TestCaseBase testCase;
-
+
private double duration;
private double numOfInvocations;
-
+
private double avgResponseTime;
private double throughput;
-
+
public TestResult() {
this("Default Result");
}
@@ -48,7 +48,7 @@ public class TestResult {
public void compute(long startTime, long endTime, int numberOfInvocations) {
numOfInvocations = (double)numberOfInvocations;
duration = convertToSeconds(endTime - startTime);
-
+
throughput = numOfInvocations / duration;
avgResponseTime = duration / numOfInvocations;
System.out.println();
@@ -75,11 +75,11 @@ public class TestResult {
public double getThroughput() {
return throughput;
}
-
+
public double getDuration() {
return duration;
}
-
+
public double getNumOfInvocations() {
return numOfInvocations;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java
index d309ba3..bf24ac3 100644
--- a/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java
+++ b/benchmark/performance/base/src/main/java/org/apache/cxf/pat/internal/TestRunner.java
@@ -23,7 +23,7 @@ public class TestRunner<T> implements Runnable {
protected TestCaseBase<T> testCase;
private String name;
- private T port;
+ private T port;
public TestRunner() {
this("Default runner");
@@ -39,16 +39,16 @@ public class TestRunner<T> implements Runnable {
this.port = test.getPort();
}
- public void run() {
+ public void run() {
System.out.println("TestRunner " + name + " is running");
try {
testCase.internalTestRun(name, port);
} catch (Exception e) {
e.printStackTrace();
- }
+ }
System.out.println("TestRunner " + name + " is finished");
}
-
+
public void start() {
Thread thread = new Thread(this);
thread.start();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
index 4858d68..38860b3 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
@@ -31,19 +31,19 @@ import org.apache.cxf.pat.internal.TestResult;
import org.apache.cxf.performance.basic_type.BasicPortType;
import org.apache.cxf.performance.basic_type.BasicService;
import org.apache.cxf.performance.basic_type.server.Server;
-
+
public final class Client extends TestCaseBase<BasicPortType> {
-
- private static final QName SERVICE_NAME
+
+ private static final QName SERVICE_NAME
= new QName("http://cxf.apache.org/performance/basic_type", "BasicService");
private static int opid;
-
+
private byte[] inputBase64;
private String inputString = new String();
private final int asciiCount = 1 * 1024;
-
+
private BasicService ss;
public Client(String[] args) {
@@ -113,7 +113,7 @@ public final class Client extends TestCaseBase<BasicPortType> {
}
public BasicPortType getPort() {
-
+
try {
URL wsdl = null;
if ((wsdlPath.startsWith("file://")) || (wsdlPath.startsWith("http://"))) {
@@ -127,7 +127,7 @@ public final class Client extends TestCaseBase<BasicPortType> {
}
return ss.getSoapHttpPort();
}
-}
-
+}
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
index de73adc..2c2cca3 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
@@ -23,7 +23,7 @@ import javax.xml.ws.Endpoint;
public class Server implements Runnable {
-
+
public Server(String address) throws Exception {
System.out.println("Starting Server");
Object implementor = new ServerImpl();
@@ -34,18 +34,18 @@ public class Server implements Runnable {
public Server(String[] args) throws Exception {
this("http://localhost:20000/performance/basic_type/SoapPort");
}
-
+
public static void main(String args[]) throws Exception {
Server server = new Server(args);
server.run();
}
-
+
public void run() {
System.out.println("running server");
System.out.println("READY");
-
+
}
-
+
void shutdown(boolean wait) {
System.out.println("shutting down server");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
index 555a932..adb6b4e 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/ServerImpl.java
@@ -21,24 +21,24 @@ package org.apache.cxf.performance.basic_type.server;
import java.util.logging.Logger;
import org.apache.cxf.performance.basic_type.BasicPortType;
-@javax.jws.WebService(portName = "SoapHttpPort", serviceName = "BasicService",
+@javax.jws.WebService(portName = "SoapHttpPort", serviceName = "BasicService",
targetNamespace = "http://cxf.apache.org/performance/basic_type",
endpointInterface = "org.apache.cxf.performance.basic_type.BasicPortType",
- wsdlLocation = "wsdl/basic_type.wsdl"
+ wsdlLocation = "wsdl/basic_type.wsdl"
)
public class ServerImpl implements BasicPortType {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(ServerImpl.class.getPackage().getName());
-
+
public byte[] echoBase64(byte[] inputBase64) {
//LOG.info("Executing operation echoBase64 ");
//System.out.println("Executing operation echoBase64");
//System.out.println("Message received: " + inputBase64 + "\n");
return inputBase64;
}
-
+
public String echoString(String inputString) {
//LOG.info("Executing operation echoString");
//System.out.println("Executing operation echoString\n");
@@ -46,4 +46,4 @@ public class ServerImpl implements BasicPortType {
return inputString;
}
}
-
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
index 360adb4..ebeffb9 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
@@ -42,13 +42,13 @@ import org.apache.cxf.performance.complex_type.types.SimpleStruct;
public final class Client extends TestCaseBase<ComplexPortType> {
private static final QName SERVICE_NAME = new QName(
"http://cxf.apache.org/performance/complex_type",
- "ComplexService");
+ "ComplexService");
private static final QName PORT_NAME = new QName(
"http://cxf.apache.org/performance/complex_type",
"ComplexPortType");
private ComplexService cs;
private final NestedComplexTypeSeq complexTypeSeq = new NestedComplexTypeSeq();
-
+
public Client(String[] args) {
super("Complex Type TestCase", args);
serviceName = "ComplexService";
@@ -60,13 +60,13 @@ public final class Client extends TestCaseBase<ComplexPortType> {
}
public static void main(String args[]) throws Exception {
-
+
Client client = new Client(args);
-
- client.initialize();
-
+
+ client.initialize();
+
client.run();
-
+
List results = client.getTestResults();
TestResult testResult = null;
for (Iterator iter = results.iterator(); iter.hasNext();) {
@@ -77,7 +77,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
System.out.println("cxf client is going to shutdown!");
System.exit(0);
}
-
+
private SimpleStruct getSimpleStruct() throws DatatypeConfigurationException {
SimpleStruct ss = new SimpleStruct();
ss.setVarFloat(Float.MAX_VALUE);
@@ -91,7 +91,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
return ss;
}
-
+
public void initTestData() {
NestedComplexType complexType = new NestedComplexType();
complexType.setVarString("#12345ABc");
@@ -104,7 +104,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
} catch (DatatypeConfigurationException e) {
e.printStackTrace();
}
-
+
complexType.setVarEnum(ColourEnum.RED);
byte[] binary = new byte[1024];
for (int idx = 0; idx < 4; idx++) {
@@ -117,15 +117,15 @@ public final class Client extends TestCaseBase<ComplexPortType> {
for (int i = 0; i < packetSize; i++) {
complexTypeSeq.getItem().add(complexType);
- }
+ }
}
-
+
public void doJob(ComplexPortType port) {
port.sendReceiveData(complexTypeSeq);
}
- public ComplexPortType getPort() {
- try{
+ public ComplexPortType getPort() {
+ try{
URL wsdl = null;
if ((wsdlPath.startsWith("file://")) || (wsdlPath.startsWith("http://"))) {
wsdl = new URL(wsdlPath);
@@ -136,7 +136,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
} catch (MalformedURLException e) {
e.printStackTrace();
}
- return cs.getSoapPort();
+ return cs.getSoapPort();
}
public void printUsage() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
index 6367590..9c1d07c 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
@@ -24,7 +24,7 @@ import javax.xml.ws.Endpoint;
public class Server implements Runnable {
-
+
public Server(String address) throws Exception {
System.out.println("Starting Server");
Object implementor = new ServerImpl();
@@ -35,20 +35,20 @@ public class Server implements Runnable {
public Server(String[] args) throws Exception {
this("http://localhost:20003/performance/complex_type/SoapPort");
}
-
+
public static void main(String args[]) throws Exception {
Server server = new Server(args);
server.run();
}
-
+
public void run() {
System.out.println("running server");
System.out.println("READY");
}
-
+
void shutdown(boolean wait) {
System.out.println("shutting down server");
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
index bda1e76..6d41577 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/ServerImpl.java
@@ -23,15 +23,15 @@ import java.util.logging.Logger;
import org.apache.cxf.performance.complex_type.ComplexPortType;
import org.apache.cxf.performance.complex_type.types.NestedComplexTypeSeq;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "ComplexService",
+@javax.jws.WebService(portName = "SoapPort", serviceName = "ComplexService",
targetNamespace = "http://cxf.apache.org/performance/complex_type",
endpointInterface = "org.apache.cxf.performance.complex_type.ComplexPortType")
public class ServerImpl implements ComplexPortType {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(ServerImpl.class.getPackage().getName());
-
+
public NestedComplexTypeSeq sendReceiveData(NestedComplexTypeSeq request) {
//LOG.info("Executing operation sendReceiveData opt");
//System.out.println("Executing operation sendReceiveData\n");
@@ -39,4 +39,4 @@ public class ServerImpl implements ComplexPortType {
return request;
}
}
-
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
index acdef44..39921b8 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
@@ -38,7 +38,7 @@ import javax.xml.ws.Holder;
import org.apache.cxf.frontend.ClientProxy;
import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-
+
import org.apache.cxf.pat.internal.TestCaseBase;
import org.apache.cxf.pat.internal.TestResult;
import org.apache.cxf.cxf.performance.DocPortType;
@@ -56,7 +56,7 @@ import org.apache.cxf.performance.complex_type.server.Server;
public final class Client extends TestCaseBase<DocPortType> {
private static final QName SERVICE_NAME = new QName(
"http://cxf.apache.org/cxf/performance",
- "PerfService");
+ "PerfService");
private static final QName PORT_NAME = new QName(
"http://cxf.apache.org/cxf/performance",
"DocPortType");
@@ -99,7 +99,7 @@ public final class Client extends TestCaseBase<DocPortType> {
public static void main(String args[]) throws Exception {
//workaround issue of xmlsec logging too much
Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
-
+
int threadIdx = -1;
int servIdx = -1;
for (int x = 0; x < args.length; x++) {
@@ -114,7 +114,7 @@ public final class Client extends TestCaseBase<DocPortType> {
String tmp[] = new String[args.length - servIdx];
System.arraycopy(args, servIdx, tmp, 0, args.length - servIdx);
Server.main(tmp);
-
+
tmp = new String[servIdx];
System.arraycopy(args, 0, tmp, 0, servIdx);
args = tmp;
@@ -130,10 +130,10 @@ public final class Client extends TestCaseBase<DocPortType> {
int i2 = Integer.parseInt(s2);
for (int x = i1; x <= i2; x++) {
threadList.add(Integer.toString(x));
- }
+ }
} else {
threadList.add(s);
- }
+ }
}
} else {
threadList.add("1");
@@ -147,7 +147,7 @@ public final class Client extends TestCaseBase<DocPortType> {
System.out.println(Arrays.asList(args));
Client client = new Client(args, first);
first = false;
- client.initialize();
+ client.initialize();
client.run();
@@ -218,7 +218,7 @@ public final class Client extends TestCaseBase<DocPortType> {
NestedComplexType ct = createComplexType();
for (int i = 0; i < packetSize; i++) {
complexTypeSeq.getItem().add(ct);
- }
+ }
// init String and Binary
String temp = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*()_+?><[]/0123456789";
inputBase64 = new byte[1024];
@@ -264,7 +264,7 @@ public final class Client extends TestCaseBase<DocPortType> {
public synchronized DocPortType getPort() {
try {
URL wsdl = null;
- if (wsdlPath.startsWith("file:")
+ if (wsdlPath.startsWith("file:")
|| wsdlPath.startsWith("http://")
|| wsdlPath.startsWith("https://")) {
wsdl = new URL(wsdlPath);
@@ -282,7 +282,7 @@ public final class Client extends TestCaseBase<DocPortType> {
HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
//httpClientPolicy.setAllowChunking(false);
-
+
http.setClient(httpClientPolicy);
*/
return port;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
index 9ddfe41..1d6cc83 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/common/KeystorePasswordCallback.java
@@ -32,17 +32,17 @@ import org.apache.ws.security.WSPasswordCallback;
*/
public class KeystorePasswordCallback implements CallbackHandler {
-
- private Map<String, String> passwords =
+
+ private Map<String, String> passwords =
new HashMap<String, String>();
-
+
public KeystorePasswordCallback() {
passwords.put("myclientkey", "ckpass");
passwords.put("myservicekey", "skpass");
}
/**
- * It attempts to get the password from the private
+ * It attempts to get the password from the private
* alias/passwords map.
*/
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
index e2d4d7c..66f8675 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
@@ -27,14 +27,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
public class Server implements Runnable {
-
+
public Server(String address) throws Exception {
System.out.println("Starting Server");
Object implementor = new ServerImpl();
Endpoint.publish(address, implementor);
System.out.println("Server published " + address);
}
-
+
public static void main(String args[]) throws Exception {
String host = "localhost";
String protocol = "http";
@@ -59,23 +59,23 @@ public class Server implements Runnable {
} else {
BusFactory.setDefaultBus(new SpringBusFactory().createBus(cfg));
}
-
- Server server = new Server(protocol + "://" + host
+
+ Server server = new Server(protocol + "://" + host
+ ":8080/cxf-benchmark-soapdoclit/services/SoapHttpDocLitPort");
server.run();
if (wait) {
Thread.sleep(10000000);
}
}
-
+
public void run() {
System.out.println("running server");
System.out.println("READY");
}
-
+
void shutdown(boolean wait) {
System.out.println("shutting down server");
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
----------------------------------------------------------------------
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
index 8c31e22..5785925 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/ServerImpl.java
@@ -29,7 +29,7 @@ import org.apache.cxf.cxf.performance.types.NestedComplexType;
import org.apache.cxf.cxf.performance.types.NestedComplexTypeSeq;
-@javax.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
+@javax.jws.WebService(portName = "SoapHttpDocLitPort", serviceName = "PerfService",
targetNamespace = "http://cxf.apache.org/cxf/performance",
endpointInterface = "org.apache.cxf.cxf.performance.DocPortType",
wsdlLocation="/wsdl/perf.wsdl")
@@ -38,24 +38,24 @@ public class ServerImpl implements DocPortType {
//workaround issue of xmlsec logging too much
Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
}
-
+
public NestedComplexTypeSeq echoComplexTypeDoc(NestedComplexTypeSeq request, int id, javax.xml.ws.Holder<Integer> i) {
//System.out.println("Executing operation echoComplexTypeDoc\n");
//System.out.println("Message received: " + request + "\n");
i.value = id;
return request;
}
-
+
public String echoStringDoc(String request) {
//System.out.println("Executing operation echoStringDoc\n");
//System.out.println("Message received: " + request + "\n");
return request;
}
-
+
public byte[] echoBase64Doc(byte[] request) {
//System.out.println("Executing operation echoBase64Doc\n");
//System.out.println("Message received: " + request + "\n");
return request;
}
}
-
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java
index 15b142f..84c786d 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/ClientEndpointCreationLoop.java
@@ -30,23 +30,23 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.SOAPService;
/**
- *
+ *
*/
public final class ClientEndpointCreationLoop {
-
+
private final QName portName = new QName("http://apache.org/hello_world_soap_http",
"SoapPort");
private ClientEndpointCreationLoop() {
}
-
- private void iteration() throws URISyntaxException {
+
+ private void iteration() throws URISyntaxException {
SOAPService service = new SOAPService();
service.getPort(portName, Greeter.class);
}
/**
* @param args
- * @throws URISyntaxException
+ * @throws URISyntaxException
*/
public static void main(String[] args) throws URISyntaxException {
Controller.stopAllocRecording();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java
index bda6142..8f62a6c 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/DefaultBusInitialization.java
@@ -26,10 +26,10 @@ import java.io.File;
import org.apache.cxf.BusFactory;
/**
- *
+ *
*/
public class DefaultBusInitialization {
-
+
public static void main(String[] args) {
Controller.stopAllocRecording();
Controller.stopCPURecording();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java
index b66b166..e62af58 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/DynamicClientEndpointCreationLoop.java
@@ -28,18 +28,18 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.dynamic.DynamicClientFactory;
/**
- *
+ *
*/
public final class DynamicClientEndpointCreationLoop {
-
+
private Bus bus;
-
+
private DynamicClientEndpointCreationLoop() {
- CXFBusFactory busFactory = new CXFBusFactory();
+ CXFBusFactory busFactory = new CXFBusFactory();
bus = busFactory.createBus();
}
-
- private void iteration() throws URISyntaxException {
+
+ private void iteration() throws URISyntaxException {
URL wsdl = getClass().getResource("/wsdl/others/dynamic_client_base64.wsdl");
String wsdlUrl = null;
wsdlUrl = wsdl.toURI().toString();
@@ -49,7 +49,7 @@ public final class DynamicClientEndpointCreationLoop {
}
/**
* @param args
- * @throws URISyntaxException
+ * @throws URISyntaxException
*/
public static void main(String[] args) throws URISyntaxException {
DynamicClientEndpointCreationLoop ecl = new DynamicClientEndpointCreationLoop();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java
index d6efa50..e36a9ab 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop.java
@@ -25,21 +25,21 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
/**
- *
+ *
*/
public final class EndpointCreationLoop {
-
+
private GenericApplicationContext applicationContext;
-
+
private EndpointCreationLoop() {
}
-
+
private void readBeans(Resource beanResource) {
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(
applicationContext);
reader.loadBeanDefinitions(beanResource);
}
-
+
private void iteration() {
applicationContext = new GenericApplicationContext();
readBeans(new ClassPathResource("extrajaxbclass.xml"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java
index 97bbf6d..6b6a95d 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop2.java
@@ -25,31 +25,31 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
/**
- *
+ *
*/
public final class EndpointCreationLoop2 {
-
+
private GenericApplicationContext applicationContext;
-
+
private EndpointCreationLoop2() {
}
-
+
private void readBeans(Resource beanResource) {
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(
applicationContext);
reader.loadBeanDefinitions(beanResource);
}
-
+
private void init() {
applicationContext = new GenericApplicationContext();
readBeans(new ClassPathResource("extrajaxbclass.xml"));
applicationContext.refresh();
}
-
+
private void close() {
applicationContext.close();
}
-
+
private void iteration() {
applicationContext.stop();
applicationContext.start();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java
index 4ba42f5..1013089 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/EndpointCreationLoop3.java
@@ -26,20 +26,20 @@ import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
/**
- *
+ *
*/
public final class EndpointCreationLoop3 {
-
-
+
+
private EndpointCreationLoop3() {
}
-
+
private void iteration() {
JaxWsServerFactoryBean sf = new JaxWsServerFactoryBean();
sf.setAddress("http://localhost:9000/test");
sf.setServiceClass(org.apache.cxf.systest.jaxb.service.TestServiceImpl.class);
sf.setStart(false);
-
+
Server server = sf.create();
server.start();
server.stop();
@@ -53,7 +53,7 @@ public final class EndpointCreationLoop3 {
EndpointCreationLoop3 ecl = new EndpointCreationLoop3();
int count = Integer.parseInt(args[0]);
ecl.iteration();
-
+
Controller.startCPURecording(true);
Controller.startAllocRecording(true);
for (int x = 0; x < count; x++) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
----------------------------------------------------------------------
diff --git a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
index 4c35e21..f3e4f9b 100644
--- a/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
+++ b/benchmark/profiling/src/main/java/org/apache/cxf/profile/FastInfosetExperiment.java
@@ -55,19 +55,19 @@ import org.xml.sax.SAXNotSupportedException;
import org.xml.sax.XMLReader;
public class FastInfosetExperiment {
-
+
private DocumentBuilder documentBuilder;
TransformerFactory transformerFactory;
private File fiFile;
private final static int iterCount = 10000;
-
+
private FastInfosetExperiment() throws ParserConfigurationException {
documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
transformerFactory = TransformerFactory.newInstance();
transformerFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true);
fiFile = new File("fiTest.fixml");
}
-
+
private void dehydrate(InputStream input, OutputStream output) throws ParserConfigurationException, SAXException, IOException {
// Create Fast Infoset SAX serializer
SAXDocumentSerializer saxDocumentSerializer = new SAXDocumentSerializer();
@@ -88,12 +88,12 @@ public class FastInfosetExperiment {
// Parse the XML document and convert to a fast infoset document
saxParser.parse(input, saxDocumentSerializer);
}
-
+
private void readWithWoodstox() throws SAXException, TransformerConfigurationException, TransformerException, IOException {
InputStream is = getClass().getResourceAsStream("/META-INF/cxf/cxf.xml");
WstxSAXParserFactory woodstoxParserFactory;
woodstoxParserFactory = new WstxSAXParserFactory();
- woodstoxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes",
+ woodstoxParserFactory.setFeature("http://xml.org/sax/features/namespace-prefixes",
true);
SAXParser parser = woodstoxParserFactory.newSAXParser();
XMLReader reader = parser.getXMLReader();
@@ -104,7 +104,7 @@ public class FastInfosetExperiment {
transformerFactory.newTransformer().transform(saxSource, domResult);
is.close();
}
-
+
private void readWithFI() throws TransformerConfigurationException, TransformerException, IOException {
InputStream is = new FileInputStream(fiFile);
XMLReader saxReader = new SAXDocumentParser();
@@ -116,7 +116,7 @@ public class FastInfosetExperiment {
transformerFactory.newTransformer().transform(saxSource, domResult);
is.close();
}
-
+
private void readWithFIDom() throws FastInfosetException, IOException {
InputStream is = new FileInputStream(fiFile);
DOMDocumentParser ddp = new DOMDocumentParser();
@@ -125,38 +125,38 @@ public class FastInfosetExperiment {
ddp.parse(document, is);
is.close();
}
-
+
private void benchmark() throws ParserConfigurationException, SAXException, IOException, TransformerConfigurationException, TransformerException, FastInfosetException {
InputStream is = getClass().getResourceAsStream("/META-INF/cxf/cxf.xml");
OutputStream os = new FileOutputStream(fiFile);
dehydrate(is, os);
is.close();
os.close();
-
+
long totalTime = 0;
-
+
for(int x = 0; x < iterCount; x ++) {
long startTime = System.nanoTime();
readWithWoodstox();
long endTime = System.nanoTime();
totalTime += endTime - startTime;
}
-
+
double averageNanos = totalTime / iterCount;
System.out.println("Woodstox average us: " + averageNanos / 1000);
totalTime = 0;
-
+
for(int x = 0; x < iterCount; x ++) {
long startTime = System.nanoTime();
readWithFI();
long endTime = System.nanoTime();
totalTime += endTime - startTime;
}
-
+
averageNanos = totalTime / iterCount;
System.out.println("FastInfoset average us: " + averageNanos / 1000);
-
+
totalTime = 0;
for(int x = 0; x < iterCount; x ++) {
@@ -165,11 +165,11 @@ public class FastInfosetExperiment {
long endTime = System.nanoTime();
totalTime += endTime - startTime;
}
-
+
averageNanos = totalTime / iterCount;
System.out.println("FastInfoset DOM average us: " + averageNanos / 1000);
}
-
+
public static void main(String[] args) throws Exception {
FastInfosetExperiment that = new FastInfosetExperiment();
that.benchmark();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/bin/DoMerges.java
----------------------------------------------------------------------
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index 35f3c97..28d22ea 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -22,62 +22,62 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/* dkulp - Stupid little program I use to help merge changes from
- trunk to the fixes branches. It requires the command line version of
+/* dkulp - Stupid little program I use to help merge changes from
+ trunk to the fixes branches. It requires the command line version of
svn to be available on the path. If using a git checkout, it also requires
the command line version of git on the path.
- Basically, git does all the work, but this little wrapper
+ Basically, git does all the work, but this little wrapper
thing will display the commit logs, prompt if you want to merge/block/ignore
- each commit, prompt for commit (so you can resolve any conflicts first),
+ each commit, prompt for commit (so you can resolve any conflicts first),
etc....
- Yes - doing this in python itself (or perl or even bash itself or ruby or ...)
- would probably be better. However, I'd then need to spend time
+ Yes - doing this in python itself (or perl or even bash itself or ruby or ...)
+ would probably be better. However, I'd then need to spend time
learning python/ruby/etc... that I just don't have time to do right now.
What is more productive: Taking 30 minutes to bang this out in Java or
spending a couple days learning another language that would allow me to
bang it out in 15 minutes?
- Explanation of commands:
+ Explanation of commands:
- [B]lock will permanently block the particular commit from being merged.
+ [B]lock will permanently block the particular commit from being merged.
It won't ask again on subsequent runs of DoMerge.
- [I]gnore ignores the commit for the current DoMerges run, but will ask
+ [I]gnore ignores the commit for the current DoMerges run, but will ask
again the next time you DoMerges. If you're not certain for a particular
commit use this option for someone else to determine on a later run.
- [R]ecord formally records that a merge occurred, but it does *not*
+ [R]ecord formally records that a merge occurred, but it does *not*
actually merge the commit. This is useful if you another tool to do
the merging but still wish to record a merge did occur.
- [F]lush will permanently save all the [B]'s and [R]'s you've earlier made,
- useful when you need to stop DoMerges (due to a missed commit or other
- problem) before it's complete. That way subsequent runs of DoMerges
+ [F]lush will permanently save all the [B]'s and [R]'s you've earlier made,
+ useful when you need to stop DoMerges (due to a missed commit or other
+ problem) before it's complete. That way subsequent runs of DoMerges
won't go through the blocked/recorded items again. (Flushes occur
automatically when DoMerges is finished running.)
- [C]hanges will display the changes in the commit to help you decide the
+ [C]hanges will display the changes in the commit to help you decide the
appropriate action to take.
*/
public class DoMerges {
public static final String MERGEINFOFILE = ".gitmergeinfo";
-
+
public static boolean auto = false;
public static Pattern jiraPattern = Pattern.compile("([A-Z]{2,10}+-\\d+)");
public static String username;
public static String fromBranch;
-
+
public static Set<String> records = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
public static Set<String> patchIds = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
-
+
static class ToFrom {
final String from;
final String to;
-
+
public ToFrom(String t, String f) {
to = t;
from = f;
@@ -116,7 +116,7 @@ public class DoMerges {
}
return waitFor(p, exit);
}
-
+
static boolean doCommit() throws Exception {
while (System.in.available() > 0) {
@@ -134,17 +134,17 @@ public class DoMerges {
runProcess(p);
return false;
}
-
+
Process p = Runtime.getRuntime().exec(new String[] {"git", "commit", "--no-edit", "-a"});
runProcess(p);
return true;
- }
+ }
public static void changes(String ver) throws Exception {
Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "show", ver}));
runProcess(p);
}
-
+
public static void flush() throws Exception {
BufferedWriter writer = new BufferedWriter(new FileWriter(MERGEINFOFILE));
writer.write(fromBranch);
@@ -162,7 +162,7 @@ public class DoMerges {
}
writer.flush();
writer.close();
-
+
Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "commit", "-m",
"Recording .gitmergeinfo Changes",
MERGEINFOFILE}));
@@ -171,7 +171,7 @@ public class DoMerges {
public static void doUpdate() throws Exception {
Process p = Runtime.getRuntime().exec(new String[] {"git", "pull", "--rebase"});
runProcess(p);
-
+
File file = new File(MERGEINFOFILE);
records.clear();
if (file.exists()) {
@@ -209,15 +209,15 @@ public class DoMerges {
Process p;
BufferedReader reader;
String line;
-
+
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "cherry",
- "HEAD", fromBranch}));
-
+ "HEAD", fromBranch}));
+
reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
line = reader.readLine();
while (line != null) {
if (line.charAt(0) == '+') {
- String ver = line.substring(2).trim();
+ String ver = line.substring(2).trim();
if (!records.contains("B " + ver) && !records.contains("M " + ver)) {
verList.add(ver);
}
@@ -257,7 +257,7 @@ public class DoMerges {
}
return map;
}
-
+
public static String[] getLog(String ver, Set<String> jiras) throws Exception {
Process p;
BufferedReader reader;
@@ -280,13 +280,13 @@ public class DoMerges {
p.waitFor();
return lines.toArray(new String[lines.size()]);
}
-
+
private static void doMerge(String ver) throws Exception {
Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "cherry-pick", ver}));
if (runProcess(p, false) != 0) {
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "status"}));
runProcess(p);
-
+
if (doCommit()) {
records.add("M " + ver);
}
@@ -301,11 +301,11 @@ public class DoMerges {
private static void doMappedMerge(String ver) throws Exception {
Process p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "format-patch", "--stdout", "-1", "-k", ver}));
BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
-
+
File outputFile = File.createTempFile("merge", ".patch");
outputFile.deleteOnExit();
BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile));
-
+
String line = reader.readLine();
while (line != null) {
if ((line.startsWith("--- ")
@@ -314,7 +314,7 @@ public class DoMerges {
for (ToFrom ent : pathMaps) {
if (file.contains(ent.from)) {
String newf = file.replace(ent.from, ent.to);
- File fo = new File(newf);
+ File fo = new File(newf);
if (fo.exists() && fo.isFile()) {
line = line.substring(0, 6) + newf;
break;
@@ -330,13 +330,13 @@ public class DoMerges {
waitFor(p, false);
writer.flush();
writer.close();
-
+
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "am", "-k", outputFile.getCanonicalPath()}));
-
+
if (waitFor(p, false) != 0) {
p = Runtime.getRuntime().exec(getCommandLine(new String[] {"git", "status"}));
runProcess(p);
-
+
if (doCommit()) {
records.add("M " + ver);
}
@@ -346,11 +346,11 @@ public class DoMerges {
outputFile.delete();
}
private static String getPatchId(String id) throws Exception {
-
+
String commands[] = new String[] { "git", "show", id};
Process p = Runtime.getRuntime().exec(commands);
InputStream in = p.getInputStream();
-
+
commands = new String[] { "git", "patch-id"};
Process p2 = Runtime.getRuntime().exec(commands);
OutputStream out = p2.getOutputStream();
@@ -363,14 +363,14 @@ public class DoMerges {
}
p.waitFor();
out.close();
-
+
id = r2.readLine();
p2.waitFor();
-
+
id = id.substring(0, id.indexOf(" "));
return id;
}
-
+
private static String getUserName() throws Exception {
BufferedReader reader;
String line;
@@ -381,24 +381,24 @@ public class DoMerges {
p.waitFor();
return line;
}
-
+
public static void main(String a[]) throws Exception {
File file = new File(".git-commit-message.txt");
if (file.exists()) {
//make sure we delete this to not cause confusion
file.delete();
}
-
+
System.out.println("Updating directory");
doUpdate();
-
+
List<String> args = new LinkedList<String>(Arrays.asList(a));
List<String> check = new LinkedList<String>();
while (!args.isEmpty()) {
String get = args.remove(0);
-
- if ("-auto".equals(get)) {
+
+ if ("-auto".equals(get)) {
auto = true;
} else if ("-me".equals(get)) {
username = getUserName();
@@ -409,7 +409,7 @@ public class DoMerges {
}
}
-
+
List<String> verList = getAvailableUpdates();
if (!check.isEmpty()) {
List<String> newList = new LinkedList<String>();
@@ -428,10 +428,10 @@ public class DoMerges {
System.out.println("Merging versions (" + verList.size() + "): " + verList);
List<String[]> gitLogs = null;
- //with GIT, we can relatively quickly check the logs on the current branch
+ //with GIT, we can relatively quickly check the logs on the current branch
//and compare with what should be merged and check if things are already merged
gitLogs = getGitLogs();
-
+
Set<String> jiras = new TreeSet<String>();
for (int cur = 0; cur < verList.size(); cur++) {
@@ -446,7 +446,7 @@ public class DoMerges {
System.out.println();
System.out.println("Merging: " + ver + " (" + (cur + 1) + "/" + verList.size() + ")");
//System.out.println("http://svn.apache.org/viewvc?view=revision&revision=" + ver);
-
+
for (String s : jiras) {
System.out.println("https://issues.apache.org/jira/browse/" + s);
}
@@ -459,7 +459,7 @@ public class DoMerges {
System.out.println(s);
log.append(s).append("\n");
}
-
+
char c = auto ? 'M' : 0;
if (checkPatchId(ver)) {
continue;
@@ -553,7 +553,7 @@ public class DoMerges {
matchingLogs.add(ll);
}
}
-
+
if (!matchingLogs.isEmpty()) {
//everything in the source log is in a log on this branch, let's prompt to record the merge
System.out.println("Found possible commit(s) already on branch:");
@@ -563,7 +563,7 @@ public class DoMerges {
}
System.out.println("------------------------");
}
-
+
while (System.in.available() > 0) {
System.in.read();
}
@@ -579,33 +579,33 @@ public class DoMerges {
}
}
return false;
- }
+ }
private static List<String> compareLogs(String[] f, String[] logLines) throws IOException {
ArrayList<String> onBranch = new ArrayList<>(f.length);
for (String s : f) {
if (s.trim().startsWith("Conflicts:")) {
break;
}
- if (s.trim().length() > 0
+ if (s.trim().length() > 0
&& s.charAt(0) == ' '
&& !s.contains("git-svn-id")) {
onBranch.add(s.trim());
}
}
-
+
List<String> ll = new ArrayList<>();
for (String s : logLines) {
- if (s.trim().length() > 0
+ if (s.trim().length() > 0
&& onBranch.remove(s.trim())
&& !s.startsWith("Author: ")
&& !s.startsWith("Date: ")
- && !s.contains("git-svn-id")) {
+ && !s.contains("git-svn-id")) {
ll.add(s);
- }
+ }
}
return ll;
}
-
+
private static String[] getCommandLine(String[] args) {
List<String> argLine = new ArrayList<>();
@@ -632,8 +632,8 @@ public class DoMerges {
private static boolean isWindows() {
return System.getProperty("os.name").toLowerCase().indexOf("windows") != -1;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/Bus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/Bus.java b/core/src/main/java/org/apache/cxf/Bus.java
index b06f0a7..436a33f 100644
--- a/core/src/main/java/org/apache/cxf/Bus.java
+++ b/core/src/main/java/org/apache/cxf/Bus.java
@@ -35,28 +35,28 @@ public interface Bus extends InterceptorProvider {
enum BusState {
INITIAL, INITIALIZING, RUNNING, SHUTTING_DOWN, SHUTDOWN;
}
-
+
String DEFAULT_BUS_ID = "cxf";
-
+
<T> T getExtension(Class<T> extensionType);
-
+
<T> void setExtension(T extension, Class<T> extensionType);
-
+
boolean hasExtensionByName(String name);
-
+
String getId();
void setId(String i);
-
+
void shutdown(boolean wait);
-
+
void setProperty(String s, Object o);
Object getProperty(String s);
void setProperties(Map<String, Object> properties);
- Map<String, Object> getProperties();
-
+ Map<String, Object> getProperties();
+
Collection<Feature> getFeatures();
void setFeatures(Collection<? extends Feature> features);
-
+
BusState getState();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/BusFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/BusFactory.java b/core/src/main/java/org/apache/cxf/BusFactory.java
index 7f1dd01..ad50d27 100644
--- a/core/src/main/java/org/apache/cxf/BusFactory.java
+++ b/core/src/main/java/org/apache/cxf/BusFactory.java
@@ -68,12 +68,12 @@ public abstract class BusFactory {
public static final String DEFAULT_BUS_FACTORY = "org.apache.cxf.bus.CXFBusFactory";
protected static Bus defaultBus;
-
+
static class BusHolder {
Bus bus;
volatile boolean stale;
}
-
+
protected static final Map<Thread, BusHolder> THREAD_BUSSES = new WeakHashMap<Thread, BusHolder>();
protected static final ThreadLocal<BusHolder> THREAD_BUS = new ThreadLocal<BusHolder>();
@@ -113,7 +113,7 @@ public abstract class BusFactory {
return defaultBus;
}
}
-
+
private static BusHolder getThreadBusHolder(boolean set) {
BusHolder h = THREAD_BUS.get();
if (h == null || h.stale) {
@@ -123,7 +123,7 @@ public abstract class BusFactory {
}
if (h == null || h.stale) {
h = new BusHolder();
-
+
synchronized (THREAD_BUSSES) {
THREAD_BUSSES.put(cur, h);
}
@@ -134,7 +134,7 @@ public abstract class BusFactory {
}
return h;
}
-
+
/**
* Sets the default bus.
@@ -175,7 +175,7 @@ public abstract class BusFactory {
b.bus = bus;
}
}
-
+
/**
* Sets the default bus for the thread.
*
@@ -265,7 +265,7 @@ public abstract class BusFactory {
if (itBus != null) {
itBus.bus = null;
//mark as stale so if a thread asks again, it will create a new one
- itBus.stale = true;
+ itBus.stale = true;
}
//This will remove the BusHolder from the only place that should
//strongly reference it
@@ -327,7 +327,7 @@ public abstract class BusFactory {
try {
busFactoryClass = ClassLoaderUtils.loadClass(className, BusFactory.class)
.asSubclass(BusFactory.class);
-
+
instance = busFactoryClass.newInstance();
} catch (Exception ex) {
LogUtils.log(LOG, Level.SEVERE, "BUS_FACTORY_INSTANTIATION_EXC", ex);
@@ -384,7 +384,7 @@ public abstract class BusFactory {
busFactoryCondition = rd.readLine();
}
}
- if (isValidBusFactoryClass(busFactoryClass)
+ if (isValidBusFactoryClass(busFactoryClass)
&& busFactoryCondition != null) {
try {
Class<?> cls = ClassLoaderUtils.loadClass(busFactoryClass, BusFactory.class)
@@ -404,7 +404,7 @@ public abstract class BusFactory {
} catch (NoClassDefFoundError e) {
busFactoryClass = DEFAULT_BUS_FACTORY;
}
-
+
}
return busFactoryClass;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/DataBinding.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/DataBinding.java b/core/src/main/java/org/apache/cxf/annotations/DataBinding.java
index 4fdf090..2dd2bca 100644
--- a/core/src/main/java/org/apache/cxf/annotations/DataBinding.java
+++ b/core/src/main/java/org/apache/cxf/annotations/DataBinding.java
@@ -35,9 +35,9 @@ import java.lang.annotation.Target;
@Inherited
public @interface DataBinding {
Class<? extends org.apache.cxf.databinding.DataBinding> value();
-
+
/**
- * Bean reference to lookup in configuration. Bean must be castable
+ * Bean reference to lookup in configuration. Bean must be castable
* to the Class set above
* @return The id of the bean reference
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java b/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java
index c223741..5630890 100644
--- a/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java
+++ b/core/src/main/java/org/apache/cxf/annotations/EndpointProperties.java
@@ -34,12 +34,12 @@ import java.lang.annotation.Target;
@Target({ ElementType.TYPE })
@Inherited
public @interface EndpointProperties {
-
+
/**
* The properties
* @return the list of properties to set
*/
EndpointProperty[] value();
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java b/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java
index 0893697..ba90083 100644
--- a/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java
+++ b/core/src/main/java/org/apache/cxf/annotations/EndpointProperty.java
@@ -34,35 +34,35 @@ import java.lang.annotation.Target;
@Target({ ElementType.TYPE })
@Inherited
public @interface EndpointProperty {
-
+
/**
* The value(s) of the property
* @return the value of the property
*/
String[] value() default { };
-
+
/**
* The key to record the property
* @return the key for the property
*/
String key();
-
+
/**
* Reference to a named bean that is looked up from the
- * configuration associated with the application.
+ * configuration associated with the application.
*/
String ref() default "";
-
+
/**
* The class for the property. If "ref" is specified,
* this class is used to cast the looked up reference
- * to make sure the Object is of the correct type.
- *
+ * to make sure the Object is of the correct type.
+ *
* If ref is not set and value is not set, this class
- * is used to create a bean. The class must have either
+ * is used to create a bean. The class must have either
* a default constructor, a constructor that takes an
* org.apache.cxf.endpoint.Endpoint, or a constructor
- * that takes a org.apache.cxf.endpoint.Endpoint and
+ * that takes a org.apache.cxf.endpoint.Endpoint and
* an org.apache.cxf.Bus.
*/
Class<?> beanClass() default Object.class;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/FactoryType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/FactoryType.java b/core/src/main/java/org/apache/cxf/annotations/FactoryType.java
index 954c106..b25fbfc 100644
--- a/core/src/main/java/org/apache/cxf/annotations/FactoryType.java
+++ b/core/src/main/java/org/apache/cxf/annotations/FactoryType.java
@@ -30,8 +30,8 @@ import org.apache.cxf.message.Exchange;
import org.apache.cxf.service.invoker.Factory;
/**
* Defines the factory used for the service.
- *
- * Either use the factoryClass attribute to define your own
+ *
+ * Either use the factoryClass attribute to define your own
* factory or use one of the "value" convenience enums.
*/
@Documented
@@ -41,24 +41,24 @@ import org.apache.cxf.service.invoker.Factory;
public @interface FactoryType {
Type value() default Type.Singleton;
-
+
String[] args() default { };
-
+
/**
* The class for the factory. It MUST have a constructor that takes
* two arguments:
* 1) The Class for the service
- * 2) String[] of the args from above
+ * 2) String[] of the args from above
*/
Class<? extends Factory> factoryClass() default DEFAULT.class;
-
+
enum Type {
Singleton,
Session,
Pooled, //args[0] is the size of the pool
PerRequest
};
-
+
final class DEFAULT implements Factory {
public Object create(Exchange e) throws Throwable {
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java b/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java
index 1082d8c..d3df141 100644
--- a/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java
+++ b/core/src/main/java/org/apache/cxf/annotations/FastInfoset.java
@@ -79,6 +79,6 @@ public @interface FastInfoset {
* Fast Infoset data.
*/
int serializerMaxCharacterContentChunkSize() default -1;
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/Logging.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/Logging.java b/core/src/main/java/org/apache/cxf/annotations/Logging.java
index 120e5b9..3300f16 100644
--- a/core/src/main/java/org/apache/cxf/annotations/Logging.java
+++ b/core/src/main/java/org/apache/cxf/annotations/Logging.java
@@ -37,26 +37,26 @@ import org.apache.cxf.interceptor.AbstractLoggingInterceptor;
@Inherited
public @interface Logging {
/**
- * The size limit at which messages are truncated in the log
+ * The size limit at which messages are truncated in the log
*/
int limit() default AbstractLoggingInterceptor.DEFAULT_LIMIT;
-
+
/**
* the locations where the messages are logged. The default is
- * <logger> which means to log to the java.util.logging.Logger,
- * but <stdout>, <stderr>, and a "file:/.." URI are acceptable.
+ * <logger> which means to log to the java.util.logging.Logger,
+ * but <stdout>, <stderr>, and a "file:/.." URI are acceptable.
*/
String inLocation() default "<logger>";
String outLocation() default "<logger>";
-
-
+
+
/**
* For XML content, turn on pretty printing in the logs
*/
boolean pretty() default false;
-
+
/**
- * Ignore binary payloads by default
+ * Ignore binary payloads by default
*/
boolean showBinary() default false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/annotations/Policies.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/annotations/Policies.java b/core/src/main/java/org/apache/cxf/annotations/Policies.java
index 1313b5d..88cf885 100644
--- a/core/src/main/java/org/apache/cxf/annotations/Policies.java
+++ b/core/src/main/java/org/apache/cxf/annotations/Policies.java
@@ -29,9 +29,9 @@ import java.lang.annotation.Target;
/**
- * Used to attach multiple Policy annotations
+ * Used to attach multiple Policy annotations
* to a method or type if policies need to be added
- * to more than one place in the wsdl.
+ * to more than one place in the wsdl.
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
[25/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
index 407300b..c57083d 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -29,11 +29,11 @@ public class Server {
// Register and map the dispatcher servlet
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(servletHolder, "/*");
-
- servletHolder.setInitParameter("javax.ws.rs.Application",
+
+ servletHolder.setInitParameter("javax.ws.rs.Application",
CatalogApplication.class.getName());
server.setHandler(context);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
index 10e3917..cf37b6e 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
@@ -63,7 +63,7 @@ public final class Client {
client.await(5);
responses = client.getReceivedResponses();
System.out.println(responses.get(0));
-
+
// Sent POST request to add customer
client.reset(1);
System.out.println("Sent POST request to add customer");
@@ -85,7 +85,7 @@ public final class Client {
client2.await(5);
responses = client2.getReceivedResponses();
System.out.println(responses.get(0));
-
+
// one retrieval, one delete
client2.reset(2);
client.reset(2);
@@ -95,9 +95,9 @@ public final class Client {
client2.await(5);
responses = client2.getReceivedResponses();
for (Object o : responses) {
- System.out.println(o);
+ System.out.println(o);
}
-
+
client.close();
client2.close();
System.exit(0);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
index 8e958a9..064c5eb 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
@@ -42,7 +42,7 @@ import org.apache.cxf.common.logging.LogUtils;
/**
* Test client to do websocket calls.
* @see JAXRSClientServerWebSocketTest
- *
+ *
* we may put this in test-tools so that other systests can use this code.
* for now keep it here to experiment jaxrs websocket scenarios.
*/
@@ -55,7 +55,7 @@ class WebSocketTestClient {
private AsyncHttpClient client;
private WebSocket websocket;
private String url;
-
+
WebSocketTestClient(String url) {
this.received = new ArrayList<>();
this.fragments = new ArrayList<>();
@@ -63,7 +63,7 @@ class WebSocketTestClient {
this.client = new AsyncHttpClient();
this.url = url;
}
-
+
public void connect() throws InterruptedException, ExecutionException, IOException {
websocket = client.prepareGet(url).execute(
new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WsSocketListener()).build()).get();
@@ -76,11 +76,11 @@ class WebSocketTestClient {
public void sendMessage(byte[] message) {
websocket.sendMessage(message);
}
-
+
public boolean await(int secs) throws InterruptedException {
return latch.await(secs, TimeUnit.SECONDS);
}
-
+
public void reset(int count) {
latch = new CountDownLatch(count);
received.clear();
@@ -98,7 +98,7 @@ class WebSocketTestClient {
}
return responses;
}
-
+
public void close() {
websocket.close();
client.close();
@@ -107,15 +107,15 @@ class WebSocketTestClient {
class WsSocketListener implements WebSocketTextListener, WebSocketByteListener {
public void onOpen(WebSocket ws) {
- LOG.info("[ws] opened");
+ LOG.info("[ws] opened");
}
public void onClose(WebSocket ws) {
- LOG.info("[ws] closed");
+ LOG.info("[ws] closed");
}
public void onError(Throwable t) {
- LOG.info("[ws] error: " + t);
+ LOG.info("[ws] error: " + t);
}
public void onMessage(byte[] message) {
@@ -137,7 +137,7 @@ class WebSocketTestClient {
public void onFragment(String fragment, boolean last) {
processFragments(fragment, last);
}
-
+
private void processFragments(Object f, boolean last) {
synchronized (fragments) {
fragments.add(f);
@@ -169,7 +169,7 @@ class WebSocketTestClient {
}
}
}
-
+
private static String makeString(byte[] data) {
return data == null ? null : makeString(data, 0, data.length).toString();
}
@@ -186,11 +186,11 @@ class WebSocketTestClient {
}
return xbuf.append(cbuf);
}
-
+
private static void writeHex(StringBuilder buf, int b) {
buf.append(Integer.toHexString(0x100 | (0xff & b)).substring(1)).append(' ');
}
-
+
private static void writePrintable(StringBuilder buf, int b) {
if (b == 0x0d) {
buf.append("\\r");
@@ -205,15 +205,15 @@ class WebSocketTestClient {
}
buf.append(' ');
}
-
+
//TODO this is a temporary way to verify the response; we should come up with something better.
public static class Response {
private Object data;
- private int pos;
+ private int pos;
private int statusCode;
private String contentType;
private Object entity;
-
+
Response(Object data) {
this.data = data;
String line;
@@ -240,25 +240,25 @@ class WebSocketTestClient {
System.arraycopy((byte[])data, pos, (byte[])entity, 0, ((byte[])entity).length);
}
}
-
+
private static boolean isStatusCode(String line) {
char c = line.charAt(0);
return '0' <= c && c <= '9';
}
-
+
public int getStatusCode() {
return statusCode;
}
-
+
public String getContentType() {
return contentType;
}
-
+
@SuppressWarnings("unused")
public Object getEntity() {
return entity;
}
-
+
public String getTextEntity() {
return gettext(entity);
}
@@ -270,7 +270,7 @@ class WebSocketTestClient {
sb.append("Entity: ").append(gettext(entity)).append("\r\n");
return sb.toString();
}
-
+
private String readLine() {
StringBuilder sb = new StringBuilder();
while (pos < length(data)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index ac765a2..ce3297c 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -133,13 +133,13 @@ public class CustomerService {
@Produces("text/*")
public StreamingOutput monitorCustomers(
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
return new StreamingOutput() {
public void write(final OutputStream out) throws IOException, WebApplicationException {
monitors.put(key, new WriterHolder(out, MAX_ERROR_COUNT));
out.write(("Subscribed at " + new java.util.Date()).getBytes());
}
-
+
};
}
@@ -149,7 +149,7 @@ public class CustomerService {
public void monitorCustomers2(
@javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
try {
httpResponse.getOutputStream().write(("Subscribed at " + new java.util.Date()).getBytes());
@@ -162,14 +162,14 @@ public class CustomerService {
@Path("/unmonitor/{key}")
@Produces("text/*")
public String unmonitorCustomers(@PathParam("key") String key) {
- return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
@GET
@Path("/unmonitor2/{key}")
@Produces("text/*")
public String unmonitorCustomers2(@PathParam("key") String key) {
- return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
// CHECKSTYLE:OFF
@@ -199,7 +199,7 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
@@ -229,7 +229,7 @@ public class CustomerService {
}
// CHECKSTYLE:ON
-
+
final void init() {
Customer c = new Customer();
c.setName("John");
@@ -239,7 +239,7 @@ public class CustomerService {
c.setName("Homer");
c.setId(235);
customers.put(c.getId(), c);
-
+
Order o = new Order();
o.setDescription("order 223");
o.setId(223);
@@ -248,7 +248,7 @@ public class CustomerService {
private static class WriterHolder<T> {
private final T value;
- private final int max;
+ private final int max;
private final AtomicInteger errorCount;
WriterHolder(T object, int max) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
index 851a512..9a7ad62 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
@@ -29,7 +29,7 @@ public class Server {
protected Server() throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CustomerService.class);
- sf.setResourceProvider(CustomerService.class,
+ sf.setResourceProvider(CustomerService.class,
new SingletonResourceProvider(new CustomerService()));
sf.setAddress(HOST_URL + CONTEXT_PATH);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
index ac765a2..ce3297c 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -133,13 +133,13 @@ public class CustomerService {
@Produces("text/*")
public StreamingOutput monitorCustomers(
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
return new StreamingOutput() {
public void write(final OutputStream out) throws IOException, WebApplicationException {
monitors.put(key, new WriterHolder(out, MAX_ERROR_COUNT));
out.write(("Subscribed at " + new java.util.Date()).getBytes());
}
-
+
};
}
@@ -149,7 +149,7 @@ public class CustomerService {
public void monitorCustomers2(
@javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
try {
httpResponse.getOutputStream().write(("Subscribed at " + new java.util.Date()).getBytes());
@@ -162,14 +162,14 @@ public class CustomerService {
@Path("/unmonitor/{key}")
@Produces("text/*")
public String unmonitorCustomers(@PathParam("key") String key) {
- return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
@GET
@Path("/unmonitor2/{key}")
@Produces("text/*")
public String unmonitorCustomers2(@PathParam("key") String key) {
- return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
// CHECKSTYLE:OFF
@@ -199,7 +199,7 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
@@ -229,7 +229,7 @@ public class CustomerService {
}
// CHECKSTYLE:ON
-
+
final void init() {
Customer c = new Customer();
c.setName("John");
@@ -239,7 +239,7 @@ public class CustomerService {
c.setName("Homer");
c.setId(235);
customers.put(c.getId(), c);
-
+
Order o = new Order();
o.setDescription("order 223");
o.setId(223);
@@ -248,7 +248,7 @@ public class CustomerService {
private static class WriterHolder<T> {
private final T value;
- private final int max;
+ private final int max;
private final AtomicInteger errorCount;
WriterHolder(T object, int max) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
index ac765a2..ce3297c 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -133,13 +133,13 @@ public class CustomerService {
@Produces("text/*")
public StreamingOutput monitorCustomers(
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
return new StreamingOutput() {
public void write(final OutputStream out) throws IOException, WebApplicationException {
monitors.put(key, new WriterHolder(out, MAX_ERROR_COUNT));
out.write(("Subscribed at " + new java.util.Date()).getBytes());
}
-
+
};
}
@@ -149,7 +149,7 @@ public class CustomerService {
public void monitorCustomers2(
@javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
try {
httpResponse.getOutputStream().write(("Subscribed at " + new java.util.Date()).getBytes());
@@ -162,14 +162,14 @@ public class CustomerService {
@Path("/unmonitor/{key}")
@Produces("text/*")
public String unmonitorCustomers(@PathParam("key") String key) {
- return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
@GET
@Path("/unmonitor2/{key}")
@Produces("text/*")
public String unmonitorCustomers2(@PathParam("key") String key) {
- return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
// CHECKSTYLE:OFF
@@ -199,7 +199,7 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
@@ -229,7 +229,7 @@ public class CustomerService {
}
// CHECKSTYLE:ON
-
+
final void init() {
Customer c = new Customer();
c.setName("John");
@@ -239,7 +239,7 @@ public class CustomerService {
c.setName("Homer");
c.setId(235);
customers.put(c.getId(), c);
-
+
Order o = new Order();
o.setDescription("order 223");
o.setId(223);
@@ -248,7 +248,7 @@ public class CustomerService {
private static class WriterHolder<T> {
private final T value;
- private final int max;
+ private final int max;
private final AtomicInteger errorCount;
WriterHolder(T object, int max) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
index 52a3f1f..7c56ae8 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
@@ -27,7 +27,7 @@ import org.apache.cxf.frontend.ClientProxyFactoryBean;
public final class Client {
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java
index 005cd94..9775561 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java
@@ -22,7 +22,7 @@ package demo.hw.client;
* A 'clean' copy of the SEI that does not have any annotations.
*/
public interface HelloWorld {
-
+
String sayHi(String text);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
index 67b543a..b80a2a4 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
@@ -23,7 +23,7 @@ import javax.jws.WebService;
@WebService
public interface HelloWorld {
-
+
String sayHi(@WebParam(name = "greeting") String text);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
index 102a569..13f8124 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
@@ -35,18 +35,18 @@ import org.apache.hello_world_async_soap_http.types.GreetMeSometimeResponse;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://apache.org/hello_world_async_soap_http", "SOAPService");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
-
- if (args.length == 0) {
+
+ if (args.length == 0) {
System.out.println("please specify wsdl");
- System.exit(1);
+ System.exit(1);
}
URL url = null;
File wsdl = new File(args[0]);
@@ -55,36 +55,36 @@ public final class Client {
} else {
url = new URL(args[0]);
}
-
+
SOAPService ss = new SOAPService(url, SERVICE_NAME);
ExecutorService executor = Executors.newFixedThreadPool(5);
ss.setExecutor(executor);
GreeterAsync port = ss.getSoapPort();
- String resp;
-
+ String resp;
+
// callback method
TestAsyncHandler testAsyncHandler = new TestAsyncHandler();
System.out.println("Invoking greetMeSometimeAsync using callback object...");
Future<?> response = port.greetMeSometimeAsync(System.getProperty("user.name"), testAsyncHandler);
while (!response.isDone()) {
Thread.sleep(100);
- }
+ }
resp = testAsyncHandler.getResponse();
System.out.println();
System.out.println("Server responded through callback with: " + resp);
System.out.println();
-
+
//polling method
System.out.println("Invoking greetMeSometimeAsync using polling...");
- Response<GreetMeSometimeResponse> greetMeSomeTimeResp =
+ Response<GreetMeSometimeResponse> greetMeSomeTimeResp =
port.greetMeSometimeAsync(System.getProperty("user.name"));
while (!greetMeSomeTimeResp.isDone()) {
Thread.sleep(100);
}
GreetMeSometimeResponse reply = greetMeSomeTimeResp.get();
- System.out.println("Server responded through polling with: " + reply.getResponseType());
+ System.out.println("Server responded through polling with: " + reply.getResponseType());
- System.exit(0);
+ System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
index 30d83bc..d807b8c 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
@@ -26,7 +26,7 @@ import org.apache.hello_world_async_soap_http.types.GreetMeSometimeResponse;
public class TestAsyncHandler implements AsyncHandler<GreetMeSometimeResponse> {
-
+
private GreetMeSometimeResponse reply;
public void handleResponse(Response<GreetMeSometimeResponse> response) {
@@ -37,9 +37,9 @@ public class TestAsyncHandler implements AsyncHandler<GreetMeSometimeResponse> {
ex.printStackTrace();
}
}
-
+
public String getResponse() {
return reply.getResponseType();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
index dff8db7..2f0e2fb 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
@@ -32,15 +32,15 @@ import org.apache.cxf.jaxws.ServerAsyncResponse;
import org.apache.hello_world_async_soap_http.GreeterAsync;
import org.apache.hello_world_async_soap_http.types.GreetMeSometimeResponse;
-@WebService(serviceName = "SOAPService",
- portName = "SoapPort",
+@WebService(serviceName = "SOAPService",
+ portName = "SoapPort",
endpointInterface = "org.apache.hello_world_async_soap_http.GreeterAsync",
targetNamespace = "http://apache.org/hello_world_async_soap_http")
-
+
public class GreeterImpl implements GreeterAsync {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeSometime(java.lang.String)
*/
@@ -50,12 +50,12 @@ public class GreeterImpl implements GreeterAsync {
System.out.println("Executing operation greetMeSometime synchronously\n");
return "How are you " + me;
}
-
- public Future<?> greetMeSometimeAsync(final String me,
+
+ public Future<?> greetMeSometimeAsync(final String me,
final AsyncHandler<GreetMeSometimeResponse> asyncHandler) {
LOG.info("Executing operation greetMeSometimeAsync asynchronously");
System.out.println("Executing operation greetMeSometimeAsync asynchronously\n");
- final ServerAsyncResponse<GreetMeSometimeResponse> r
+ final ServerAsyncResponse<GreetMeSometimeResponse> r
= new ServerAsyncResponse<GreetMeSometimeResponse>();
new Thread() {
public void run() {
@@ -66,14 +66,14 @@ public class GreeterImpl implements GreeterAsync {
asyncHandler.handleResponse(r);
}
} .start();
-
- return r;
+
+ return r;
}
-
+
public Response<GreetMeSometimeResponse> greetMeSometimeAsync(String requestType) {
- return null;
+ return null;
/*not called */
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
index 33041ef..ffb7f8b 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
@@ -32,12 +32,12 @@ public class Server {
String address = "http://localhost:9000/SoapContext/SoapPort";
Endpoint.publish(address, implementor);
}
-
+
public static void main(String args[]) throws Exception {
new Server();
- System.out.println("Server ready...");
-
- Thread.sleep(5 * 60 * 1000);
+ System.out.println("Server ready...");
+
+ Thread.sleep(5 * 60 * 1000);
System.out.println("Server exiting");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
index 63c7ef8..24e672d 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
@@ -120,14 +120,14 @@ public final class Client {
DOMSource domRespPayload = dispDOMSrcPayload.invoke(domReqPayload);
System.out.println("Response from server: "
- + fetchElementByName(domRespPayload.getNode(),
+ + fetchElementByName(domRespPayload.getNode(),
"greetMeResponse").getTextContent());
System.exit(0);
}
private static Element fetchElementByName(Node parent, String name) {
- Element ret = null;
+ Element ret = null;
Node node = parent.getFirstChild();
while (node != null) {
if (node instanceof Element && ((Element)node).getLocalName().equals(name)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
index d1163d8..9431382 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
@@ -29,7 +29,7 @@ import javax.xml.ws.ServiceMode;
import javax.xml.ws.WebServiceProvider;
@WebServiceProvider()
-@ServiceMode(value = Service.Mode.MESSAGE)
+@ServiceMode(value = Service.Mode.MESSAGE)
public class GreeterDOMSourceMessageProvider implements Provider<DOMSource> {
public GreeterDOMSourceMessageProvider() {
@@ -42,11 +42,11 @@ public class GreeterDOMSourceMessageProvider implements Provider<DOMSource> {
MessageFactory factory = MessageFactory.newInstance();
SOAPMessage soapReq = factory.createMessage();
soapReq.getSOAPPart().setContent(request);
-
+
System.out.println("Incoming Client Request as a DOMSource data in MESSAGE Mode");
soapReq.writeTo(System.out);
System.out.println("\n");
-
+
InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp2.xml");
SOAPMessage greetMeResponse = factory.createMessage(null, is);
is.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
index 5d6ba88..345f75f 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
@@ -47,11 +47,11 @@ public class GreeterDOMSourcePayloadProvider implements Provider<DOMSource> {
StreamResult result = new StreamResult(System.out);
transformer.transform(request, result);
System.out.println("\n");
-
+
InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp3.xml");
-
+
SOAPMessage greetMeResponse = MessageFactory.newInstance().createMessage(null, is);
- is.close();
+ is.close();
response.setNode(greetMeResponse.getSOAPBody().extractContentAsDocument());
} catch (Exception ex) {
ex.printStackTrace();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
index fc73d8c..92c9cd9 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
@@ -29,16 +29,16 @@ public class Server {
Object implementor = new GreeterSoapMessageProvider();
String address = "http://localhost:9000/SoapContext/SoapPort1";
Endpoint.publish(address, implementor);
-
+
System.out.println("Starting SoapService2");
implementor = new GreeterDOMSourceMessageProvider();
address = "http://localhost:9000/SoapContext/SoapPort2";
Endpoint.publish(address, implementor);
-
+
System.out.println("Starting SoapService3");
implementor = new GreeterDOMSourcePayloadProvider();
address = "http://localhost:9000/SoapContext/SoapPort3";
- Endpoint.publish(address, implementor);
+ Endpoint.publish(address, implementor);
}
public static void main(String args[]) throws Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
index 5ccbdf5..cd9d017 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
@@ -77,20 +77,20 @@ public class SmallNumberHandler implements LogicalHandler<LogicalMessageContext>
//System.out.printf("SmallNumberHandler addNumbers(%d, %d) == %d\n", a, b, answer);
// ok, we've done the calculation, so build the
// response and set it as the payload of the message
-
+
AddNumbersResponse resp = new AddNumbersResponse();
resp.setReturn(answer);
msg.setPayload(new ObjectFactory().createAddNumbersResponse(resp),
jaxbContext);
-
- Source src = msg.getPayload();
+
+ Source src = msg.getPayload();
msg.setPayload(src);
-
+
payload = msg.getPayload(jaxbContext);
if (payload instanceof JAXBElement) {
payload = ((JAXBElement)payload).getValue();
}
-
+
AddNumbersResponse resp2 = (AddNumbersResponse)payload;
if (resp2 == resp) {
throw new WebServiceException("Shouldn't be the same object");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
index 0b6c3ef..dbddb5e 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
@@ -34,9 +34,9 @@ public class Server {
public static void main(String args[]) throws Exception {
new Server();
- System.out.println("Server ready...");
-
- Thread.sleep(5 * 60 * 1000);
+ System.out.println("Server ready...");
+
+ Thread.sleep(5 * 60 * 1000);
System.out.println("Server exiting");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
index 15ea971..361b067 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
@@ -26,7 +26,7 @@ import javax.xml.transform.stream.StreamSource;
//CHECKSTYLE:OFF
public class SampleWsApplicationClient {
-
+
public static void main(String[] args) {
String address = "http://localhost:8080/Service/Hello";
// final String request =
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
index e0872b4..1ea2242 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
@@ -34,12 +34,12 @@ import javax.xml.ws.ResponseWrapper;
public interface Hello {
@WebResult(name = "return", targetNamespace = "")
- @RequestWrapper(localName = "sayHello",
- targetNamespace = "http://service.ws.sample/",
+ @RequestWrapper(localName = "sayHello",
+ targetNamespace = "http://service.ws.sample/",
className = "sample.ws.service.SayHello")
@WebMethod(action = "urn:SayHello")
- @ResponseWrapper(localName = "sayHelloResponse",
- targetNamespace = "http://service.ws.sample/",
+ @ResponseWrapper(localName = "sayHelloResponse",
+ targetNamespace = "http://service.ws.sample/",
className = "sample.ws.service.SayHelloResponse")
String sayHello(@WebParam(name = "myname", targetNamespace = "") String myname);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
index b63fabc..416fbf2 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
@@ -26,8 +26,8 @@ import java.util.logging.Logger;
* 3.1.0 2015-05-18T13:02:03.098-05:00 Generated source version: 3.1.0
*/
-@javax.jws.WebService(serviceName = "HelloService", portName = "HelloPort",
- targetNamespace = "http://service.ws.sample/",
+@javax.jws.WebService(serviceName = "HelloService", portName = "HelloPort",
+ targetNamespace = "http://service.ws.sample/",
endpointInterface = "sample.ws.service.Hello")
public class HelloPortImpl implements Hello {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java
index 0d5cce4..9131b4f 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java
@@ -21,7 +21,7 @@ package demo.jaxws.tracing.server;
public class Book {
private String id;
private String title;
-
+
public Book() {
}
@@ -33,7 +33,7 @@ public class Book {
public String getId() {
return id;
}
-
+
public void setId(String id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
index 4dd17c1..74e1f3a 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
@@ -39,16 +39,16 @@ public class CatalogServiceImpl implements CatalogService {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final Map<String, Book> books = new ConcurrentHashMap<>();
private final Brave brave;
-
+
public CatalogServiceImpl(final Brave brave) {
this.brave = brave;
}
-
+
@UseAsyncMethod
public void addBook(Book book) {
throw new UnsupportedOperationException("Please use async version of the method");
}
-
+
public Future<?> addBookAsync(Book book, AsyncHandler<Book> handler) {
final ServerAsyncResponse<Book> response = new ServerAsyncResponse<Book>();
@@ -61,21 +61,21 @@ public class CatalogServiceImpl implements CatalogService {
brave.localTracer().finishSpan();
}
});
-
+
return response;
}
@Override
public Book getBook(final String id) {
final Book book = books.get(id);
-
+
if (book == null) {
throw new RuntimeException("Book with does not exists: " + id);
}
-
+
return book;
}
-
+
@Override
public void delete(final String id) {
if (books.remove(id) == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
index 0bb601f..57fe6ce 100644
--- a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
+++ b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
@@ -21,7 +21,7 @@ package demo.jms_greeter.server;
import java.util.logging.Logger;
import org.apache.cxf.jms_greeter.JMSGreeterPortType;
-@javax.jws.WebService(portName = "GreeterPort",
+@javax.jws.WebService(portName = "GreeterPort",
serviceName = "JMSGreeterService",
targetNamespace = "http://cxf.apache.org/jms_greeter",
endpointInterface = "org.apache.cxf.jms_greeter.JMSGreeterPortType",
@@ -42,7 +42,7 @@ public class GreeterJMSImpl implements JMSGreeterPortType {
System.out.println("Executing operation sayHi" + "\n");
return "Bonjour";
}
-
+
public void greetMeOneWay(String me) {
LOG.info("Executing operation greetMeOneWay");
System.out.println("Executing operation greetMeOneWay\n");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
index e5cac8a..4786b6f 100644
--- a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
+++ b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
System.out.println("Starting Server");
Object implementor = new GreeterJMSImpl();
ep = Endpoint.publish(null, implementor);
-
+
Runtime.getRuntime().addShutdownHook(new Thread() {
public void run() {
shutdown();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java b/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
index 0bb601f..57fe6ce 100644
--- a/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
+++ b/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
@@ -21,7 +21,7 @@ package demo.jms_greeter.server;
import java.util.logging.Logger;
import org.apache.cxf.jms_greeter.JMSGreeterPortType;
-@javax.jws.WebService(portName = "GreeterPort",
+@javax.jws.WebService(portName = "GreeterPort",
serviceName = "JMSGreeterService",
targetNamespace = "http://cxf.apache.org/jms_greeter",
endpointInterface = "org.apache.cxf.jms_greeter.JMSGreeterPortType",
@@ -42,7 +42,7 @@ public class GreeterJMSImpl implements JMSGreeterPortType {
System.out.println("Executing operation sayHi" + "\n");
return "Bonjour";
}
-
+
public void greetMeOneWay(String me) {
LOG.info("Executing operation greetMeOneWay");
System.out.println("Executing operation greetMeOneWay\n");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
index 451e013..10c1277 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
@@ -21,17 +21,17 @@ package com.example.customerservice.client;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
- * Starter that initializes the spring context, fetches our test client and then shuts down spring
+ * Starter that initializes the spring context, fetches our test client and then shuts down spring
*/
public final class CustomerServiceSpringClient {
private CustomerServiceSpringClient() {
}
- public static void main(String args[]) throws Exception {
- ClassPathXmlApplicationContext context
+ public static void main(String args[]) throws Exception {
+ ClassPathXmlApplicationContext context
= new ClassPathXmlApplicationContext(new String[] {"classpath:client-applicationContext.xml"});
CustomerServiceTester client = (CustomerServiceTester)context.getBean("tester");
-
+
client.testCustomerService();
context.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
index 818992c..feaa2ff 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
@@ -29,18 +29,18 @@ import org.junit.Assert;
/**
- * Calls the CustomerService using the proxy created by CXF and does some assertions to make
+ * Calls the CustomerService using the proxy created by CXF and does some assertions to make
* sure the calls work.
- *
- * This also shows how typical user code on the client side
+ *
+ * This also shows how typical user code on the client side
* could look like. Make sure to keep your business code
* free from spring and cxf dependencies as far as possible.
*/
public final class CustomerServiceTester {
-
- // The CustomerService proxy will be injected either by spring or by a direct call to the setter
+
+ // The CustomerService proxy will be injected either by spring or by a direct call to the setter
CustomerService customerService;
-
+
public CustomerService getCustomerService() {
return customerService;
}
@@ -51,7 +51,7 @@ public final class CustomerServiceTester {
public void testCustomerService() throws NoSuchCustomerException {
List<Customer> customers = null;
-
+
// First we test the positive case where customers are found and we retreive
// a list of customers
System.out.println("Sending request for customers named Smith");
@@ -59,7 +59,7 @@ public final class CustomerServiceTester {
System.out.println("Response received");
Assert.assertEquals(2, customers.size());
Assert.assertEquals("Smith", customers.get(0).getName());
-
+
// Then we test for an unknown Customer name and expect the NoSuchCustomerException
try {
customers = customerService.getCustomersByName("None");
@@ -70,14 +70,14 @@ public final class CustomerServiceTester {
Assert.assertEquals("None", e.getFaultInfo().getCustomerName());
System.out.println("NoSuchCustomer exception was received as expected");
}
-
- // The implementation of updateCustomer is set to sleep for some seconds.
+
+ // The implementation of updateCustomer is set to sleep for some seconds.
// Still this method should return instantly as the method is declared
// as a one way method in the WSDL
Customer customer = new Customer();
customer.setName("Smith");
customerService.updateCustomer(customer);
-
+
System.out.println("All calls were successful");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
index f2e91c0..eac3ea7 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
@@ -34,9 +34,9 @@ import com.example.customerservice.NoSuchCustomer;
import com.example.customerservice.NoSuchCustomerException;
public class CustomerServiceImpl implements CustomerService {
-
+
/**
- * The WebServiceContext can be used to retrieve special attributes like the
+ * The WebServiceContext can be used to retrieve special attributes like the
* user principal. Normally it is not needed
*/
@Resource
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
index f7e4af9..73f5497 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
@@ -26,7 +26,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public final class CustomerServiceSpringServer {
private CustomerServiceSpringServer() {
}
-
+
public static void main(String args[]) throws Exception {
ClassPathXmlApplicationContext ctx
= new ClassPathXmlApplicationContext("server-applicationContext.xml");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java
index 1acd14e..d4bf5be 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java
@@ -30,9 +30,9 @@ import demo.hw.server.data.Ingredient;
@WebService(endpointInterface = "demo.hw.server.JavascriptExample")
public class JavascriptExampleImpl implements JavascriptExample {
-
+
private List<Beverage> beverages;
-
+
public JavascriptExampleImpl() {
beverages = new ArrayList<>();
Ingredient calcium = new Ingredient();
@@ -47,7 +47,7 @@ public class JavascriptExampleImpl implements JavascriptExample {
Ingredient apple = new Ingredient();
apple.setName("apple");
apple.setCategory(Category.Fruit);
-
+
Beverage b = new Beverage();
b.setName("zinc-fortified broccoli shake");
b.setProof(20);
@@ -57,7 +57,7 @@ public class JavascriptExampleImpl implements JavascriptExample {
ingredients[1] = broccoli;
b.setIngredients(ingredients);
beverages.add(b);
-
+
b = new Beverage();
b.setName("apple broccoli shake");
b.setProof(50);
@@ -66,7 +66,7 @@ public class JavascriptExampleImpl implements JavascriptExample {
ingredients[1] = broccoli;
b.setIngredients(ingredients);
beverages.add(b);
-
+
b = new Beverage();
b.setName("calcium-fortified apple juice");
b.setProof(13);
@@ -75,7 +75,7 @@ public class JavascriptExampleImpl implements JavascriptExample {
ingredients[1] = calcium;
b.setIngredients(ingredients);
beverages.add(b);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java
index c75dd38..cf0bbc1 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java
@@ -19,11 +19,11 @@
package demo.hw.server.data;
public class Beverage {
-
+
private String name;
private Ingredient[] ingredients;
private int proof;
-
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java
index 2a606a8..ac53138 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java
@@ -20,7 +20,7 @@ package demo.hw.server.data;
public class Ingredient {
private String name;
- private Category category;
+ private Category category;
@Override
public boolean equals(Object obj) {
@@ -31,8 +31,8 @@ public class Ingredient {
return false;
}
}
-
-
+
+
public String getName() {
return name;
}
@@ -45,7 +45,7 @@ public class Ingredient {
public void setCategory(Category category) {
this.category = category;
}
-
+
@Override
public int hashCode() {
return name.hashCode() + (37 * category.hashCode());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
index bc22c4c..b9fbb88 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
@@ -30,18 +30,18 @@ import org.apache.hello_world_soap_http.types.FaultDetail;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://apache.org/hello_world_soap_http", "SOAPService");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
-
- if (args.length == 0) {
+
+ if (args.length == 0) {
System.out.println("please specify wsdl");
- System.exit(1);
+ System.exit(1);
}
URL wsdlURL;
@@ -51,11 +51,11 @@ public final class Client {
} else {
wsdlURL = new URL(args[0]);
}
-
+
System.out.println(wsdlURL);
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
Greeter port = ss.getSoapPort();
- String resp;
+ String resp;
System.out.println("Invoking sayHi...");
resp = port.sayHi();
@@ -89,9 +89,9 @@ public final class Client {
System.out.println("Expected exception: PingMeFault has occurred: " + ex.getMessage());
FaultDetail detail = ex.getFaultInfo();
System.out.println("FaultDetail major:" + detail.getMajor());
- System.out.println("FaultDetail minor:" + detail.getMinor());
- }
- System.exit(0);
+ System.out.println("FaultDetail minor:" + detail.getMinor());
+ }
+ System.exit(0);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
index e47fdf5..cf46a24 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
@@ -35,7 +35,7 @@ import javax.xml.transform.stream.StreamSource;
public final class Get {
private Get() {
- }
+ }
public static void main(String args[]) throws Exception {
// Sent HTTP GET request to invoke sayHi
@@ -115,5 +115,5 @@ public final class Get {
} catch (Exception e) {
e.printStackTrace();
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java
index 3f97ff4..5b094f5 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java
@@ -24,17 +24,17 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
endpointInterface = "org.apache.hello_world_soap_http.Greeter")
-
+
public class GreeterImpl implements Greeter {
-
- private static final Logger LOG =
+
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
private int sayHiCounter;
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -44,7 +44,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
@@ -62,7 +62,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Executing operation sayHi\n");
return "Bonjour " + (++sayHiCounter);
}
-
+
public void pingMe() throws PingMeFault {
FaultDetail faultDetail = new FaultDetail();
faultDetail.setMajor((short)2);
@@ -72,5 +72,5 @@ public class GreeterImpl implements Greeter {
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java
index ca0afd6..3616cec 100644
--- a/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java
@@ -24,15 +24,15 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
endpointInterface = "org.apache.hello_world_soap_http.Greeter")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -42,7 +42,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
@@ -60,7 +60,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Executing operation sayHi\n");
return "Bonjour";
}
-
+
public void pingMe() throws PingMeFault {
FaultDetail faultDetail = new FaultDetail();
faultDetail.setMajor((short)2);
@@ -70,5 +70,5 @@ public class GreeterImpl implements Greeter {
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
index d886b9b..3d57c8e 100644
--- a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
+++ b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
@@ -30,8 +30,8 @@ public class Server {
Object implementor = new TestMtomPortTypeImpl();
String address = "http://localhost:9000/mime-test";
Endpoint ep = Endpoint.publish(address, implementor);
- Binding binding = ep.getBinding();
- ((SOAPBinding)binding).setMTOMEnabled(true);
+ Binding binding = ep.getBinding();
+ ((SOAPBinding)binding).setMTOMEnabled(true);
}
public static void main(String args[]) throws Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java
index 24713b1..49f4b44 100644
--- a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java
+++ b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java
@@ -40,8 +40,8 @@ public class TestMtomPortTypeImpl implements TestMtomPortType {
public void testByteArray(Holder<String> name, Holder<byte[]> attachinfo) {
System.out.println("Received image from client");
- System.out.println("The image data size is " + attachinfo.value.length);
- name.value = "Hello " + name.value;
+ System.out.println("The image data size is " + attachinfo.value.length);
+ name.value = "Hello " + name.value;
}
public void testDataHandler(Holder<String> name, Holder<DataHandler> attachinfo) {
@@ -71,6 +71,6 @@ public class TestMtomPortTypeImpl implements TestMtomPortType {
}
return total;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
index 1e275fb..7b5ec25 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
@@ -61,7 +61,7 @@ public class GetProtectedResourceController {
provider);
OAuthAccessor accessor = new OAuthAccessor(consumer);
accessor.requestToken = oAuthParams.getOauthToken();
- accessor.tokenSecret = oAuthParams.getOauthTokenSecret();
+ accessor.tokenSecret = oAuthParams.getOauthTokenSecret();
Map<String, String> parameters = new HashMap<String, String>();
parameters.put(OAuth.OAUTH_SIGNATURE_METHOD, oAuthParams.getSignatureMethod());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
index 36786f3..03734f7 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
@@ -96,7 +96,7 @@ public class TemporaryCredentialsController {
oAuthParams.setOauthTokenSecret(accessor.tokenSecret);
Cookie cId = new Cookie("clientID", oAuthParams.getClientID());
Cookie cSec = new Cookie("clientSecret", oAuthParams.getClientSecret());
- Cookie tokenSec = new Cookie("tokenSec", accessor.tokenSecret);
+ Cookie tokenSec = new Cookie("tokenSec", accessor.tokenSecret);
response.addCookie(cId);
response.addCookie(cSec);
response.addCookie(tokenSec);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
index 7e67bf3..a66bec5 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
@@ -82,7 +82,7 @@ public class TokenRequestController {
OAuthAccessor accessor = new OAuthAccessor(consumer);
accessor.requestToken = oauthToken;
accessor.tokenSecret = Common.findCookieValue(request, "tokenSec");
-
+
Map<String, String> parameters = new HashMap<String, String>();
parameters.put(OAuth.OAUTH_SIGNATURE_METHOD, oAuthParams.getSignatureMethod());
parameters.put(OAuth.OAUTH_NONCE, UUID.randomUUID().toString());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java
index 7a485a3..6431063 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java
@@ -31,7 +31,7 @@ public class CustomAuth extends LoginUrlAuthenticationEntryPoint {
public CustomAuth(String v) {
super(v);
}
-
+
@Override
public void commence(HttpServletRequest request, HttpServletResponse response,
AuthenticationException authException) throws IOException, ServletException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
index e49eb37..e81529b 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
@@ -74,7 +74,7 @@ public class ApplicationController implements ServletContextAware {
String secretKey = tokenGen.generate(new SecureRandom().generateSeed(20));
- Client clientInfo =
+ Client clientInfo =
new Client(consumerKey, secretKey, clientApp.getClientName(), null);
clientInfo.setCallbackURI(clientApp.getCallbackURL());
clientInfo.setLoginName(principal.getName());
@@ -124,7 +124,7 @@ public class ApplicationController implements ServletContextAware {
@RequestMapping("/revokeAccess")
public ModelAndView revokeAccess(HttpServletRequest request) {
String consumerKey = request.getParameter("consumerKey");
-
+
clientManager.removeAllTokens(consumerKey);
ModelAndView modelAndView = new ModelAndView(new RedirectView("/app/listAuthorizedClients"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
index 6927aad..7da40ab 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
@@ -50,7 +50,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
public static final String CLIENT_ID = "12345678";
public static final String CLIENT_SECRET = "secret";
- private static final ConcurrentHashMap<String, OAuthPermission> AVAILABLE_PERMISSIONS =
+ private static final ConcurrentHashMap<String, OAuthPermission> AVAILABLE_PERMISSIONS =
new ConcurrentHashMap<String, OAuthPermission>();
static {
@@ -58,7 +58,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
.put("read_info", new OAuthPermission("read_info", "Read your personal information",
Collections.singletonList("ROLE_USER")));
AVAILABLE_PERMISSIONS.put("modify_info",
- new OAuthPermission("modify_info", "Modify your personal information",
+ new OAuthPermission("modify_info", "Modify your personal information",
Collections.singletonList("ROLE_ADMIN")));
}
@@ -76,17 +76,17 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
Client client = new Client(CLIENT_ID, CLIENT_SECRET, APPLICATION_NAME, CALLBACK);
clientAuthInfo.put(CLIENT_ID, client);
}
-
+
private List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions) {
List<OAuthPermission> permissions = new ArrayList<>();
for (String requestScope : requestPermissions) {
OAuthPermission oAuthPermission = AVAILABLE_PERMISSIONS.get(requestScope);
permissions.add(oAuthPermission);
}
-
+
return permissions;
}
-
+
public Client getClient(String consumerKey) {
return clientAuthInfo.get(consumerKey);
}
@@ -95,7 +95,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
String token = generateToken();
String tokenSecret = generateToken();
- RequestToken reqToken = new RequestToken(reg.getClient(), token, tokenSecret,
+ RequestToken reqToken = new RequestToken(reg.getClient(), token, tokenSecret,
reg.getLifetime(), reg.getIssuedAt());
reqToken.setScopes(getPermissionsInfo(reg.getScopes()));
reqToken.setCallback(reg.getCallback());
@@ -134,7 +134,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
tokenSecretString, 3600, System.currentTimeMillis() / 1000);
accessToken.setScopes(requestToken.getScopes());
-
+
synchronized (oauthTokens) {
oauthTokens.remove(requestToken.getTokenKey());
oauthTokens.put(accessTokenString, accessToken);
@@ -155,7 +155,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
}
public void removeToken(Token t) {
-
+
for (Token token : oauthTokens.values()) {
Client authNInfo = token.getClient();
if (t.getClient().getConsumerKey().equals(authNInfo.getConsumerKey())) {
@@ -163,7 +163,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
break;
}
}
-
+
}
protected String generateToken() throws OAuthServiceException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java
index 20a1797..4a69e87 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java
@@ -58,7 +58,7 @@ public class SampleOAuthDataProvider extends MemoryOAuthDataProvider
}
return apps;
}
-
+
public synchronized void removeRegisteredClient(String consumerKey) {
List<String> registeredApps = this.userRegisteredClients.get(consumerKey);
this.clientAuthInfo.remove(consumerKey);
@@ -81,5 +81,5 @@ public class SampleOAuthDataProvider extends MemoryOAuthDataProvider
oauthTokens.remove(token.getTokenKey());
}
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
index 758a268..65abf4b 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
@@ -30,7 +30,7 @@ public final class Client {
public static void main(String args[]) throws Exception {
// START SNIPPET: client
- ClassPathXmlApplicationContext context
+ ClassPathXmlApplicationContext context
= new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
HelloWorld client = (HelloWorld)context.getBean("client");
[15/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
index b12a902..a21c191 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
@@ -64,12 +64,12 @@ import org.omg.CORBA.TypeCode;
public class CorbaConduitTest extends Assert {
-
+
private static IMocksControl control;
private static ORB orb;
private static Bus bus;
protected EndpointInfo endpointInfo;
- protected EndpointReferenceType target;
+ protected EndpointReferenceType target;
protected MessageObserver observer;
Message inMessage;
CorbaBindingFactory factory;
@@ -78,12 +78,12 @@ public class CorbaConduitTest extends Assert {
@Before
public void setUp() throws Exception {
control = EasyMock.createNiceControl();
-
- bus = BusFactory.getDefaultBus();
-
+
+ bus = BusFactory.getDefaultBus();
+
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
orbConfig = new OrbConfig();
@@ -97,23 +97,23 @@ public class CorbaConduitTest extends Assert {
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
@Test
public void testCorbaConduit() throws Exception {
- CorbaConduit conduit = setupCorbaConduit(false);
+ CorbaConduit conduit = setupCorbaConduit(false);
assertTrue("conduit should not be null", conduit != null);
}
-
+
@Test
- public void testPrepare() throws Exception {
+ public void testPrepare() throws Exception {
setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
"/wsdl_corbabinding/simpleIdl.wsdl", "SimpleCORBAService",
"SimpleCORBAPort");
CorbaDestination destination = new CorbaDestination(endpointInfo, orbConfig);
-
+
if (System.getProperty("java.vendor").contains("IBM")) {
//IBM requires it to activate to resolve it, but cannot
//activate on sun without more config
@@ -125,17 +125,17 @@ public class CorbaConduitTest extends Assert {
try {
conduit.prepare(message);
} catch (Exception ex) {
- ex.printStackTrace();
+ ex.printStackTrace();
}
OutputStream os = message.getContent(OutputStream.class);
- assertTrue("OutputStream should not be null", os != null);
+ assertTrue("OutputStream should not be null", os != null);
ORB orb2 = (ORB)message.get("orb");
assertTrue("Orb should not be null", orb2 != null);
Object obj = message.get("endpoint");
- assertTrue("EndpointReferenceType should not be null", obj != null);
+ assertTrue("EndpointReferenceType should not be null", obj != null);
}
-
-
+
+
@Test
public void testGetTargetReference() throws Exception {
setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
@@ -144,12 +144,12 @@ public class CorbaConduitTest extends Assert {
CorbaDestination destination = new CorbaDestination(endpointInfo, orbConfig);
CorbaConduit conduit = new CorbaConduit(endpointInfo, destination.getAddress(), orbConfig);
-
+
EndpointReferenceType t = null;
EndpointReferenceType ref = conduit.getTargetReference(t);
assertTrue("ref should not be null", ref != null);
}
-
+
@Test
public void testGetAddress() throws Exception {
setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
@@ -158,19 +158,19 @@ public class CorbaConduitTest extends Assert {
CorbaDestination destination = new CorbaDestination(endpointInfo, orbConfig);
endpointInfo.setAddress("corbaloc::localhost:40000/Simple");
- CorbaConduit conduit = new CorbaConduit(endpointInfo, destination.getAddress(), orbConfig);
+ CorbaConduit conduit = new CorbaConduit(endpointInfo, destination.getAddress(), orbConfig);
String address = conduit.getAddress();
assertTrue("address should not be null", address != null);
- assertEquals(address, "corbaloc::localhost:40000/Simple");
+ assertEquals(address, "corbaloc::localhost:40000/Simple");
}
-
+
@Test
- public void testClose() throws Exception {
- Method m = CorbaConduit.class.getDeclaredMethod("buildRequest",
+ public void testClose() throws Exception {
+ Method m = CorbaConduit.class.getDeclaredMethod("buildRequest",
new Class[] {CorbaMessage.class, OperationType.class});
CorbaConduit conduit = EasyMock.createMockBuilder(CorbaConduit.class)
- .addMockedMethod(m).createMock();
-
+ .addMockedMethod(m).createMock();
+
org.omg.CORBA.Object obj = control.createMock(org.omg.CORBA.Object.class);
CorbaMessage msg = control.createMock(CorbaMessage.class);
EasyMock.expect(msg.get(CorbaConstants.CORBA_ENDPOINT_OBJECT)).andReturn(obj);
@@ -187,65 +187,65 @@ public class CorbaConduitTest extends Assert {
EasyMock.expect(msg.getContent(OutputStream.class)).andReturn(os);
os.close();
EasyMock.expectLastCall();
-
+
control.replay();
conduit.close(msg);
control.verify();
}
-
+
@Test
public void testGetTarget() throws Exception {
CorbaConduit conduit = setupCorbaConduit(false);
EndpointReferenceType endpoint = conduit.getTarget();
assertTrue("EndpointReferenceType should not be null", endpoint != null);
}
-
+
@Test
- public void testGetOperationExceptions() {
- CorbaConduit conduit = control.createMock(CorbaConduit.class);
+ public void testGetOperationExceptions() {
+ CorbaConduit conduit = control.createMock(CorbaConduit.class);
OperationType opType = control.createMock(OperationType.class);
CorbaTypeMap typeMap = control.createMock(CorbaTypeMap.class);
-
- List<RaisesType> exlist = CastUtils.cast(control.createMock(ArrayList.class));
+
+ List<RaisesType> exlist = CastUtils.cast(control.createMock(ArrayList.class));
opType.getRaises();
EasyMock.expectLastCall().andReturn(exlist);
int i = 0;
- EasyMock.expect(exlist.size()).andReturn(i);
- RaisesType rType = control.createMock(RaisesType.class);
+ EasyMock.expect(exlist.size()).andReturn(i);
+ RaisesType rType = control.createMock(RaisesType.class);
EasyMock.expect(exlist.get(0)).andReturn(rType);
-
+
control.replay();
conduit.getOperationExceptions(opType, typeMap);
- assertEquals(exlist.size(), 0);
+ assertEquals(exlist.size(), 0);
}
-
+
@Test
public void testBuildRequest() throws Exception {
- CorbaConduit conduit = setupCorbaConduit(false);
+ CorbaConduit conduit = setupCorbaConduit(false);
CorbaMessage message = control.createMock(CorbaMessage.class);
Exchange exchange = control.createMock(Exchange.class);
EasyMock.expect(message.getExchange());
- EasyMock.expectLastCall().andReturn(exchange);
+ EasyMock.expectLastCall().andReturn(exchange);
ServiceInfo service = control.createMock(ServiceInfo.class);
EasyMock.expect(exchange.get(ServiceInfo.class)).andReturn(service);
List<CorbaTypeMap> list = CastUtils.cast(control.createMock(List.class));
CorbaTypeMap typeMap = control.createMock(CorbaTypeMap.class);
- EasyMock.expect(service.getExtensors(CorbaTypeMap.class)).andReturn(list);
-
+ EasyMock.expect(service.getExtensors(CorbaTypeMap.class)).andReturn(list);
+
OperationType opType = control.createMock(OperationType.class);
conduit.getArguments(message);
- EasyMock.expectLastCall().andReturn(null);
+ EasyMock.expectLastCall().andReturn(null);
conduit.getReturn(message);
EasyMock.expectLastCall().andReturn(null);
conduit.getExceptionList(conduit.getOperationExceptions(opType, typeMap),
message,
opType);
EasyMock.expectLastCall().andReturn(null);
-
+
conduit.getRequest(message, "Hello", null, null, null);
EasyMock.expectLastCall();
}
-
+
@Test
public void testBuildArguments() throws Exception {
Message msg = new MessageImpl();
@@ -255,23 +255,23 @@ public class CorbaConduitTest extends Assert {
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
CorbaPrimitiveHandler obj1 = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable arg = message.createStreamableObject(obj1, objName);
+ CorbaStreamable arg = message.createStreamableObject(obj1, objName);
arguments[0] = arg;
arguments[0].setMode(org.omg.CORBA.ARG_OUT.value);
-
+
CorbaConduit conduit = setupCorbaConduit(false);
NVList list = conduit.getArguments(message);
assertNotNull("list should not be null", list != null);
-
+
message.setStreamableArguments(arguments);
NVList listArgs = conduit.getArguments(message);
assertNotNull("listArgs should not be null", listArgs != null);
assertNotNull("listArgs Item should not be null", listArgs.item(0) != null);
assertEquals("Name should be equal", listArgs.item(0).name(), "object");
assertEquals("flags should be 2", listArgs.item(0).flags(), 2);
- assertNotNull("Any Value should not be null", listArgs.item(0).value() != null);
+ assertNotNull("Any Value should not be null", listArgs.item(0).value() != null);
}
-
+
@Test
public void testBuildReturn() throws Exception {
Message msg = new MessageImpl();
@@ -281,19 +281,19 @@ public class CorbaConduitTest extends Assert {
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
CorbaPrimitiveHandler obj1 = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable arg = message.createStreamableObject(obj1, objName);
-
+ CorbaStreamable arg = message.createStreamableObject(obj1, objName);
+
CorbaConduit conduit = setupCorbaConduit(false);
NamedValue ret = conduit.getReturn(message);
assertNotNull("Return should not be null", ret != null);
assertEquals("name should be equal", ret.name(), "return");
-
+
message.setStreamableReturn(arg);
NamedValue ret2 = conduit.getReturn(message);
assertNotNull("Return2 should not be null", ret2 != null);
- assertEquals("name should be equal", ret2.name(), "returnName");
+ assertEquals("name should be equal", ret2.name(), "returnName");
}
-
+
@Test
public void testBuildExceptionListEmpty() throws Exception {
CorbaConduit conduit = setupCorbaConduit(false);
@@ -305,11 +305,11 @@ public class CorbaConduitTest extends Assert {
message,
opType);
assertNotNull("ExcepitonList is not null", exList != null);
- assertEquals("The list should be empty", exList.count(), 0);
+ assertEquals("The list should be empty", exList.count(), 0);
}
-
+
@Test
- public void testBuildExceptionListWithExceptions() throws Exception {
+ public void testBuildExceptionListWithExceptions() throws Exception {
CorbaConduit conduit = setupCorbaConduit(false);
Message msg = new MessageImpl();
CorbaMessage message = new CorbaMessage(msg);
@@ -321,24 +321,24 @@ public class CorbaConduitTest extends Assert {
OperationType opType = bInfo.getExtensor(OperationType.class);
CorbaTypeMap typeMap = null;
List<TypeMappingType> corbaTypes =
- endpointInfo2.getService().getDescription().getExtensors(TypeMappingType.class);
+ endpointInfo2.getService().getDescription().getExtensors(TypeMappingType.class);
if (corbaTypes != null) {
typeMap = CorbaUtils.createCorbaTypeMap(corbaTypes);
}
-
+
ExceptionList exList = conduit.getExceptionList(conduit.getOperationExceptions(opType, typeMap),
message,
opType);
-
+
assertNotNull("ExceptionList is not null", exList != null);
assertNotNull("TypeCode is not null", exList.item(0) != null);
assertEquals("ID should be equal", exList.item(0).id(), "IDL:BadRecord:1.0");
assertEquals("ID should be equal", exList.item(0).name(), "BadRecord");
assertEquals("ID should be equal", exList.item(0).member_count(), 2);
assertEquals("ID should be equal", exList.item(0).member_name(0), "reason");
- assertNotNull("Member type is not null", exList.item(0).member_type(0) != null);
+ assertNotNull("Member type is not null", exList.item(0).member_type(0) != null);
}
-
+
@Test
public void testInvoke() throws Exception {
CorbaConduit conduit = setupCorbaConduit(false);
@@ -346,21 +346,21 @@ public class CorbaConduitTest extends Assert {
CorbaMessage message = control.createMock(CorbaMessage.class);
/*String opName = "GreetMe";
NVList nvlist = (NVList)orb.create_list(0);
-
+
Request request = conduit.getRequest(message, "GreetMe", nvlist, null, null);
request.invoke();
- */
-
- org.omg.CORBA.Object obj = control.createMock(org.omg.CORBA.Object.class);
+ */
+
+ org.omg.CORBA.Object obj = control.createMock(org.omg.CORBA.Object.class);
EasyMock.expect(message.get(CorbaConstants.CORBA_ENDPOINT_OBJECT)).andReturn(obj);
-
- //msg.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, obj);
- Request r = control.createMock(Request.class);
+
+ //msg.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, obj);
+ Request r = control.createMock(Request.class);
NVList nvList = orb.create_list(0);
NamedValue ret = control.createMock(NamedValue.class);
- ExceptionList exList = control.createMock(ExceptionList.class);
-
- EasyMock.expect(obj._create_request((Context)EasyMock.anyObject(),
+ ExceptionList exList = control.createMock(ExceptionList.class);
+
+ EasyMock.expect(obj._create_request((Context)EasyMock.anyObject(),
EasyMock.eq("greetMe"),
EasyMock.isA(NVList.class),
EasyMock.isA(NamedValue.class),
@@ -369,12 +369,12 @@ public class CorbaConduitTest extends Assert {
EasyMock.expectLastCall().andReturn(r);
r.invoke();
EasyMock.expectLastCall();
-
+
control.replay();
Request request = conduit.getRequest(message, "greetMe", nvList, ret, exList);
request.invoke();
control.verify();
-
+
/* try {
ContextList ctxList = orb.create_context_list();
Context ctx = orb.get_default_context();
@@ -387,36 +387,36 @@ public class CorbaConduitTest extends Assert {
ex.printStackTrace();
}*/
}
-
+
protected CorbaConduit setupCorbaConduit(boolean send) {
- target = EasyMock.createMock(EndpointReferenceType.class);
+ target = EasyMock.createMock(EndpointReferenceType.class);
endpointInfo = EasyMock.createMock(EndpointInfo.class);
CorbaConduit corbaConduit = new CorbaConduit(endpointInfo, target, orbConfig);
-
+
if (send) {
// setMessageObserver
observer = new MessageObserver() {
- public void onMessage(Message m) {
+ public void onMessage(Message m) {
inMessage = m;
}
};
corbaConduit.setMessageObserver(observer);
}
-
- return corbaConduit;
+
+ return corbaConduit;
}
-
- protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
+
+ protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
URL wsdlUrl = getClass().getResource(wsdl);
assertNotNull(wsdlUrl);
WSDLServiceFactory f = new WSDLServiceFactory(bus, wsdlUrl.toString(), new QName(ns, serviceName));
- Service service = f.create();
+ Service service = f.create();
endpointInfo = service.getEndpointInfo(new QName(ns, portName));
-
+
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
index 6598ef6..b4e0d17 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaDestinationTest.java
@@ -31,38 +31,38 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class CorbaDestinationTest extends Assert {
-
+public class CorbaDestinationTest extends Assert {
+
protected static TestUtils testUtils;
EndpointInfo endpointInfo;
OrbConfig orbConfig;
-
-
+
+
@Before
public void setUp() throws Exception {
testUtils = new TestUtils();
orbConfig = new OrbConfig();
}
-
+
@Test
- public void testDestination() throws Exception {
+ public void testDestination() throws Exception {
endpointInfo = testUtils.setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
"/wsdl_corbabinding/simpleIdl.wsdl", "SimpleCORBAService",
"SimpleCORBAPort");
CorbaDestination destination = new CorbaDestination(endpointInfo, orbConfig);
-
+
EndpointReferenceType rtype = destination.getAddress();
- assertTrue("EndpointReferenceType should not be null", rtype != null);
+ assertTrue("EndpointReferenceType should not be null", rtype != null);
BindingInfo bindingInfo = destination.getBindingInfo();
- assertTrue("BindingInfo should not be null", bindingInfo != null);
+ assertTrue("BindingInfo should not be null", bindingInfo != null);
EndpointInfo e2 = destination.getEndPointInfo();
assertTrue("EndpointInfo should not be null", e2 != null);
-
+
Message m = new MessageImpl();
CorbaServerConduit serverConduit = (CorbaServerConduit)destination.getBackChannel(m);
- assertNotNull("CorbaServerConduit should not be null", serverConduit);
+ assertNotNull("CorbaServerConduit should not be null", serverConduit);
}
-
+
/*
@Test
public void testSetMessageObserverActivate() throws Exception {
@@ -71,26 +71,26 @@ public class CorbaDestinationTest extends Assert {
"SimpleCORBAPort");
CorbaDestination destination = new CorbaDestination(endpointInfo);
String addr = destination.getAddressType().getLocation();
- assertEquals(addr, "corbaloc::localhost:40000/Simple");
-
+ assertEquals(addr, "corbaloc::localhost:40000/Simple");
+
Bus bus = BusFactory.newInstance().getDefaultBus();
Service service = new ServiceImpl();
- Endpoint endpoint = new EndpointImpl(bus, service, endpointInfo);
- MessageObserver observer = new ChainInitiationObserver(endpoint, bus);
- destination.setMessageObserver(observer);
+ Endpoint endpoint = new EndpointImpl(bus, service, endpointInfo);
+ MessageObserver observer = new ChainInitiationObserver(endpoint, bus);
+ destination.setMessageObserver(observer);
assertTrue("orb should not be null", destination.getOrb() != null);
-
- try {
- File file = new File("endpoint.ior");
+
+ try {
+ File file = new File("endpoint.ior");
assertEquals(true,file.exists());
} finally {
new File("endpoint.ior").deleteOnExit();
}
-
+
addr = destination.getAddressType().getLocation();
addr = addr.substring(0,4);
- assertEquals(addr, "IOR:");
+ assertEquals(addr, "IOR:");
destination.shutdown();
- }*/
+ }*/
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
index 42c9e20..caad534 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaMessageTest.java
@@ -38,22 +38,22 @@ public class CorbaMessageTest extends Assert {
private static ORB orb;
private Message message;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
IMocksControl control = EasyMock.createNiceControl();
message = control.createMock(Message.class);
}
-
+
@Test
public void testGetCorbaMessageAttributes() {
CorbaMessage msg = new CorbaMessage(message);
-
+
QName param1Name = new QName("param1");
QName param1IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
TypeCode param1TypeCode = orb.get_primitive_tc(TCKind.tk_long);
@@ -62,7 +62,7 @@ public class CorbaMessageTest extends Assert {
param1TypeCode,
null);
CorbaStreamable p1 = msg.createStreamableObject(param1, param1Name);
-
+
QName param2Name = new QName("param2");
QName param2IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
TypeCode param2TypeCode = orb.get_primitive_tc(TCKind.tk_string);
@@ -71,15 +71,15 @@ public class CorbaMessageTest extends Assert {
param2TypeCode,
null);
CorbaStreamable p2 = msg.createStreamableObject(param2, param2Name);
-
+
msg.addStreamableArgument(p1);
msg.addStreamableArgument(p2);
-
+
CorbaStreamable[] arguments = msg.getStreamableArguments();
assertTrue(arguments.length == 2);
assertNotNull(arguments[0]);
assertNotNull(arguments[1]);
-
+
QName param3Name = new QName("param3");
QName param3IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
TypeCode param3TypeCode = orb.get_primitive_tc(TCKind.tk_short);
@@ -88,7 +88,7 @@ public class CorbaMessageTest extends Assert {
param3TypeCode,
null);
CorbaStreamable p3 = msg.createStreamableObject(param3, param3Name);
-
+
QName param4Name = new QName("param4");
QName param4IdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "float", CorbaConstants.NP_WSDL_CORBA);
TypeCode param4TypeCode = orb.get_primitive_tc(TCKind.tk_float);
@@ -97,30 +97,30 @@ public class CorbaMessageTest extends Assert {
param4TypeCode,
null);
CorbaStreamable p4 = msg.createStreamableObject(param4, param4Name);
-
+
CorbaStreamable[] args = new CorbaStreamable[2];
args[0] = p3;
- args[1] = p4;
+ args[1] = p4;
msg.setStreamableArguments(args);
-
+
arguments = msg.getStreamableArguments();
assertTrue(arguments.length == 4);
assertNotNull(arguments[0]);
assertNotNull(arguments[1]);
assertNotNull(arguments[2]);
assertNotNull(arguments[3]);
-
- NVList list = orb.create_list(2);
+
+ NVList list = orb.create_list(2);
Any value = orb.create_any();
value.insert_Streamable(p1);
list.add_value(p1.getName(), value, p1.getMode());
value.insert_Streamable(p2);
list.add_value(p2.getName(), value, p2.getMode());
-
+
msg.setList(list);
NVList resultList = msg.getList();
- assertTrue(resultList.count() == 2);
-
+ assertTrue(resultList.count() == 2);
+
QName returnName = new QName("param2");
QName returnIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean",
CorbaConstants.NP_WSDL_CORBA);
@@ -129,11 +129,11 @@ public class CorbaMessageTest extends Assert {
returnIdlType,
returnTypeCode, null);
CorbaStreamable ret = msg.createStreamableObject(returnValue, returnName);
-
+
msg.setStreamableReturn(ret);
CorbaStreamable retVal = msg.getStreamableReturn();
assertNotNull(retVal);
-
+
// NEED TO DO TEST FOR EXCEPTIONS
/*Exception ex = new CorbaBindingException("TestException");
msg.s.setException(ex);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
index 6165a70..afa4059 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaServerConduitTest.java
@@ -53,9 +53,9 @@ import org.omg.CORBA.TypeCode;
public class CorbaServerConduitTest extends Assert {
protected EndpointInfo endpointInfo;
- protected EndpointReferenceType target;
+ protected EndpointReferenceType target;
protected MessageObserver observer;
-
+
IMocksControl control;
ORB orb;
Bus bus;
@@ -70,20 +70,20 @@ public class CorbaServerConduitTest extends Assert {
@Before
public void setUp() throws Exception {
control = EasyMock.createNiceControl();
-
- bus = BusFactory.getDefaultBus();
-
+
+ bus = BusFactory.getDefaultBus();
+
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
orbConfig = new OrbConfig();
targetObject = EasyMock.createMock(org.omg.CORBA.Object.class);
}
-
+
@After
- public void tearDown() {
+ public void tearDown() {
bus.shutdown(true);
if (orb != null) {
try {
@@ -91,17 +91,17 @@ public class CorbaServerConduitTest extends Assert {
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
@Test
public void testCorbaServerConduit() throws Exception {
- CorbaServerConduit conduit = setupCorbaServerConduit(false);
+ CorbaServerConduit conduit = setupCorbaServerConduit(false);
assertTrue("conduit should not be null", conduit != null);
}
-
+
@Test
- public void testPrepare() throws Exception {
+ public void testPrepare() throws Exception {
setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
"/wsdl_corbabinding/simpleIdl.wsdl", "SimpleCORBAService",
"SimpleCORBAPort");
@@ -116,22 +116,22 @@ public class CorbaServerConduitTest extends Assert {
try {
conduit.prepare(message);
} catch (Exception ex) {
- ex.printStackTrace();
+ ex.printStackTrace();
}
OutputStream os = message.getContent(OutputStream.class);
- assertTrue("OutputStream should not be null", os != null);
+ assertTrue("OutputStream should not be null", os != null);
ORB orb2 = (ORB)message.get("orb");
assertTrue("Orb should not be null", orb2 != null);
Object obj = message.get("endpoint");
assertTrue("EndpointReferenceType should not be null", obj != null);
-
- assertTrue("passed in targetObject is used",
+
+ assertTrue("passed in targetObject is used",
targetObject.equals(message.get(CorbaConstants.CORBA_ENDPOINT_OBJECT)));
-
+
destination.shutdown();
}
-
-
+
+
@Test
public void testGetTargetReference() throws Exception {
setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
@@ -145,13 +145,13 @@ public class CorbaServerConduitTest extends Assert {
null,
orbConfig,
corbaTypeMap);
-
+
EndpointReferenceType t = null;
EndpointReferenceType ref = conduit.getTargetReference(t);
assertTrue("ref should not be null", ref != null);
destination.shutdown();
}
-
+
@Test
public void testGetAddress() throws Exception {
setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
@@ -168,86 +168,86 @@ public class CorbaServerConduitTest extends Assert {
corbaTypeMap);
String address = conduit.getAddress();
assertTrue("address should not be null", address != null);
- assertEquals(address, "corbaloc::localhost:40000/Simple");
+ assertEquals(address, "corbaloc::localhost:40000/Simple");
}
-
+
@Test
- public void testClose() throws Exception {
-
- Method m = CorbaServerConduit.class.getDeclaredMethod("buildRequestResult",
+ public void testClose() throws Exception {
+
+ Method m = CorbaServerConduit.class.getDeclaredMethod("buildRequestResult",
new Class[] {CorbaMessage.class});
CorbaServerConduit conduit = EasyMock.createMockBuilder(CorbaServerConduit.class)
.addMockedMethod(m)
.createMock();
-
- CorbaMessage msg = control.createMock(CorbaMessage.class);
+
+ CorbaMessage msg = control.createMock(CorbaMessage.class);
conduit.buildRequestResult(msg);
EasyMock.expectLastCall();
OutputStream stream = control.createMock(OutputStream.class);
EasyMock.expect(msg.getContent(OutputStream.class)).andReturn(stream);
stream.close();
EasyMock.expectLastCall();
-
+
control.replay();
conduit.close(msg);
control.verify();
- }
-
+ }
+
@Test
public void testBuildRequestResult() {
- NVList list = orb.create_list(0);
- CorbaServerConduit conduit = setupCorbaServerConduit(false);
+ NVList list = orb.create_list(0);
+ CorbaServerConduit conduit = setupCorbaServerConduit(false);
CorbaMessage msg = control.createMock(CorbaMessage.class);
- Exchange exchange = control.createMock(Exchange.class);
+ Exchange exchange = control.createMock(Exchange.class);
ServerRequest request = control.createMock(ServerRequest.class);
-
+
EasyMock.expect(msg.getExchange()).andReturn(exchange);
EasyMock.expect(exchange.get(ServerRequest.class)).andReturn(request);
-
+
EasyMock.expect(exchange.isOneWay()).andReturn(false);
CorbaMessage inMsg = EasyMock.createMock(CorbaMessage.class);
EasyMock.expect(msg.getExchange()).andReturn(exchange);
EasyMock.expect(exchange.getInMessage()).andReturn(inMsg);
-
+
EasyMock.expect(inMsg.getList()).andReturn(list);
- EasyMock.expect(msg.getStreamableException()).andReturn(null);
+ EasyMock.expect(msg.getStreamableException()).andReturn(null);
EasyMock.expect(msg.getStreamableArguments()).andReturn(null);
EasyMock.expect(msg.getStreamableReturn()).andReturn(null);
-
+
control.replay();
conduit.buildRequestResult(msg);
- control.verify();
+ control.verify();
}
-
+
@Test
public void testBuildRequestResultException() {
- NVList list = orb.create_list(0);
- CorbaServerConduit conduit = setupCorbaServerConduit(false);
+ NVList list = orb.create_list(0);
+ CorbaServerConduit conduit = setupCorbaServerConduit(false);
CorbaMessage msg = control.createMock(CorbaMessage.class);
- Exchange exchange = control.createMock(Exchange.class);
+ Exchange exchange = control.createMock(Exchange.class);
ServerRequest request = control.createMock(ServerRequest.class);
-
+
EasyMock.expect(msg.getExchange()).andReturn(exchange);
EasyMock.expect(exchange.get(ServerRequest.class)).andReturn(request);
-
+
EasyMock.expect(exchange.isOneWay()).andReturn(false);
CorbaMessage inMsg = EasyMock.createMock(CorbaMessage.class);
EasyMock.expect(msg.getExchange()).andReturn(exchange);
- EasyMock.expect(exchange.getInMessage()).andReturn(inMsg);
+ EasyMock.expect(exchange.getInMessage()).andReturn(inMsg);
- EasyMock.expect(inMsg.getList()).andReturn(list);
+ EasyMock.expect(inMsg.getList()).andReturn(list);
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable exception = new CorbaStreamableImpl(obj, objName);
+ CorbaStreamable exception = new CorbaStreamableImpl(obj, objName);
EasyMock.expect(msg.getStreamableException()).andReturn(exception);
EasyMock.expect(msg.getStreamableException()).andReturn(exception);
-
+
control.replay();
conduit.buildRequestResult(msg);
- control.verify();
+ control.verify();
}
@Test
@@ -257,77 +257,77 @@ public class CorbaServerConduitTest extends Assert {
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable arg = new CorbaStreamableImpl(obj, objName);
+ CorbaStreamable arg = new CorbaStreamableImpl(obj, objName);
arguments[0] = arg;
- arguments[0].setMode(org.omg.CORBA.ARG_OUT.value);
-
- NVList nvlist = orb.create_list(2);
+ arguments[0].setMode(org.omg.CORBA.ARG_OUT.value);
+
+ NVList nvlist = orb.create_list(2);
Any value = orb.create_any();
value.insert_Streamable(arguments[0]);
nvlist.add_value(arguments[0].getName(), value, arguments[0].getMode());
-
- CorbaServerConduit conduit = setupCorbaServerConduit(false);
+
+ CorbaServerConduit conduit = setupCorbaServerConduit(false);
CorbaMessage msg = control.createMock(CorbaMessage.class);
- Exchange exchange = control.createMock(Exchange.class);
+ Exchange exchange = control.createMock(Exchange.class);
ServerRequest request = control.createMock(ServerRequest.class);
-
+
EasyMock.expect(msg.getExchange()).andReturn(exchange);
EasyMock.expect(exchange.get(ServerRequest.class)).andReturn(request);
-
- EasyMock.expect(exchange.isOneWay()).andReturn(false);
- EasyMock.expect(msg.getExchange()).andReturn(exchange);
+
+ EasyMock.expect(exchange.isOneWay()).andReturn(false);
+ EasyMock.expect(msg.getExchange()).andReturn(exchange);
Message message = new MessageImpl();
CorbaMessage corbaMessage = new CorbaMessage(message);
corbaMessage.setList(nvlist);
-
- EasyMock.expect(exchange.getInMessage()).andReturn(corbaMessage);
+
+ EasyMock.expect(exchange.getInMessage()).andReturn(corbaMessage);
EasyMock.expect(msg.getStreamableException()).andReturn(null);
- EasyMock.expect(msg.getStreamableArguments()).andReturn(arguments);
+ EasyMock.expect(msg.getStreamableArguments()).andReturn(arguments);
EasyMock.expect(msg.getStreamableReturn()).andReturn(arg);
-
+
control.replay();
conduit.buildRequestResult(msg);
- control.verify();
+ control.verify();
}
-
+
public void testGetTarget() {
CorbaServerConduit conduit = setupCorbaServerConduit(false);
EndpointReferenceType endpoint = conduit.getTarget();
assertTrue("EndpointReferenceType should not be null", endpoint != null);
}
-
-
+
+
protected CorbaServerConduit setupCorbaServerConduit(boolean send) {
- target = EasyMock.createMock(EndpointReferenceType.class);
+ target = EasyMock.createMock(EndpointReferenceType.class);
endpointInfo = EasyMock.createMock(EndpointInfo.class);
- CorbaServerConduit corbaServerConduit =
- new CorbaServerConduit(endpointInfo, target, targetObject,
+ CorbaServerConduit corbaServerConduit =
+ new CorbaServerConduit(endpointInfo, target, targetObject,
null, orbConfig, corbaTypeMap);
-
+
if (send) {
// setMessageObserver
observer = new MessageObserver() {
- public void onMessage(Message m) {
+ public void onMessage(Message m) {
inMessage = m;
}
};
corbaServerConduit.setMessageObserver(observer);
}
-
- return corbaServerConduit;
+
+ return corbaServerConduit;
}
-
- protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
+
+ protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
URL wsdlUrl = getClass().getResource(wsdl);
assertNotNull(wsdlUrl);
WSDLServiceFactory f = new WSDLServiceFactory(bus, wsdlUrl.toString(), new QName(ns, serviceName));
- Service service = f.create();
+ Service service = f.create();
endpointInfo = service.getEndpointInfo(new QName(ns, portName));
-
+
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
index 766f42e..850034e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaTypeMapTest.java
@@ -29,21 +29,21 @@ public class CorbaTypeMapTest extends Assert {
@Test
public void testCorbaTypeMap() throws Exception {
CorbaTypeMap typeMap = new CorbaTypeMap("http://yoko.apache.org/ComplexTypes");
-
+
String targetNamespace = typeMap.getTargetNamespace();
assertEquals(targetNamespace, "http://yoko.apache.org/ComplexTypes");
-
+
QName type = new QName("http://yoko.apache.org/ComplexTypes",
"xsd1:Test.MultiPart.Colour", "");
-
+
CorbaType corbaTypeImpl = new CorbaType();
corbaTypeImpl.setType(type);
corbaTypeImpl.setName("Test.MultiPart.Colour");
typeMap.addType("Test.MultiPart.Colour", corbaTypeImpl);
-
+
CorbaType corbatype = typeMap.getType("Test.MultiPart.Colour");
assertEquals(corbatype.getName(), "Test.MultiPart.Colour");
assertEquals(corbatype.getType().getLocalPart(), "xsd1:Test.MultiPart.Colour");
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
index f209d0a..e42e6fd 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/TestUtils.java
@@ -29,13 +29,13 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.wsdl11.WSDLServiceFactory;
-public class TestUtils {
-
+public class TestUtils {
+
protected static Bus bus;
protected CorbaBindingFactory factory;
protected EndpointInfo endpointInfo;
-
- public TestUtils() {
+
+ public TestUtils() {
bus = BusFactory.getDefaultBus();
BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
try {
@@ -43,35 +43,35 @@ public class TestUtils {
"http://cxf.apache.org/bindings/corba");
bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
} catch (BusException ex) {
- ex.printStackTrace();
+ ex.printStackTrace();
}
- }
-
+ }
+
public EndpointInfo setupServiceInfo(String ns, String wsdl,
- String serviceName, String portName) throws Exception {
+ String serviceName, String portName) throws Exception {
URL wsdlUrl = getClass().getResource(wsdl);
WSDLServiceFactory f = new WSDLServiceFactory(bus, wsdlUrl.toString(),
new QName(ns, serviceName));
Service service = f.create();
return service.getEndpointInfo(new QName(ns, portName));
- }
+ }
public CorbaDestination getExceptionTypesTestDestination() throws Exception {
endpointInfo = setupServiceInfo("http://schemas.apache.org/idl/except",
- "/wsdl_corbabinding/exceptions.wsdl",
+ "/wsdl_corbabinding/exceptions.wsdl",
"ExceptionTestCORBAService",
"ExceptionTestCORBAPort");
CorbaBindingFactory corbaBF = factory;
- return (CorbaDestination)corbaBF.getDestination(endpointInfo, bus);
+ return (CorbaDestination)corbaBF.getDestination(endpointInfo, bus);
}
-
+
public CorbaDestination getComplexTypesTestDestination() throws Exception {
endpointInfo = setupServiceInfo("http://cxf.apache.org/bindings/corba/ComplexTypes",
"/wsdl_corbabinding/ComplexTypes.wsdl",
"ComplexTypesCORBAService",
"ComplexTypesCORBAPort");
- CorbaBindingFactory corbaBF = factory;
+ CorbaBindingFactory corbaBF = factory;
return (CorbaDestination)corbaBF.getDestination(endpointInfo, bus);
}
public CorbaDestination getComplexTypesTestDestinationYoko() throws Exception {
@@ -79,7 +79,7 @@ public class TestUtils {
"/wsdl_corbabinding/ComplexTypesYoko.wsdl",
"ComplexTypesCORBAService",
"ComplexTypesCORBAPort");
- CorbaBindingFactory corbaBF = factory;
+ CorbaBindingFactory corbaBF = factory;
return (CorbaDestination)corbaBF.getDestination(endpointInfo, bus);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
index ce972bd..e906e84 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServantTest.java
@@ -30,7 +30,7 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.corba.CorbaDestination;
import org.apache.cxf.binding.corba.TestUtils;
import org.apache.cxf.message.Message;
-import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.MessageObserver;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -43,22 +43,22 @@ import org.omg.CORBA.ServerRequest;
public class CorbaDSIServantTest extends Assert {
protected static ORB orb;
protected static Bus bus;
-
+
public CorbaDSIServantTest() {
super();
}
-
+
@Before
- public void setUp() throws Exception {
+ public void setUp() throws Exception {
bus = BusFactory.getDefaultBus();
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
-
+
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -67,15 +67,15 @@ public class CorbaDSIServantTest extends Assert {
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
/*public void testCorbaDSIServant() throws Exception {
-
- CorbaDestination destination = testUtils.getSimpleTypesTestDestination();
+
+ CorbaDestination destination = testUtils.getSimpleTypesTestDestination();
Service service = new ServiceImpl();
- Endpoint endpoint = new EndpointImpl(bus, service, destination.getEndPointInfo());
- MessageObserver observer = new ChainInitiationObserver(endpoint, bus);
+ Endpoint endpoint = new EndpointImpl(bus, service, destination.getEndPointInfo());
+ MessageObserver observer = new ChainInitiationObserver(endpoint, bus);
destination.setMessageObserver(observer);
POA rootPOA = null;
CorbaDSIServant dsiServant = new CorbaDSIServant();
@@ -83,26 +83,26 @@ public class CorbaDSIServantTest extends Assert {
rootPOA,
destination,
observer);
-
+
assertNotNull("DSIServant should not be null", dsiServant != null);
assertNotNull("POA should not be null", dsiServant._default_POA() != null);
assertNotNull("Destination should not be null", dsiServant.getDestination() != null);
assertNotNull("ORB should not be null", dsiServant.getOrb() != null);
assertNotNull("MessageObserver should not be null", dsiServant.getObserver() != null);
-
+
byte[] objectId = new byte[10];
String[] interfaces = dsiServant._all_interfaces(rootPOA, objectId);
assertNotNull("Interfaces should not be null", interfaces != null);
assertEquals("Interface ID should be equal", interfaces[0], "IDL:Simple:1.0");
-
+
}*/
-
+
@Test
public void testInvoke() throws Exception {
-
+
CorbaDestination dest = new TestUtils().getComplexTypesTestDestination();
-
+
CorbaDSIServant dsiServant = new CorbaDSIServant();
dsiServant.init(orb, null, dest, null);
ServerRequest request = new ServerRequest() {
@@ -112,31 +112,31 @@ public class CorbaDSIServantTest extends Assert {
public Context ctx() {
return null;
}
-
+
};
-
- MessageObserver incomingObserver = new TestObserver();
+
+ MessageObserver incomingObserver = new TestObserver();
dsiServant.setObserver(incomingObserver);
-
+
Map<String, QName> map = new HashMap<String, QName>(2);
map.put("greetMe", new QName("greetMe"));
dsiServant.setOperationMapping(map);
-
+
dsiServant.invoke(request);
}
-
+
class TestObserver implements MessageObserver {
-
+
TestObserver() {
super();
- }
-
- public void onMessage(Message msg) {
- //System.out.println("Test OnMessage in TestObserver");
+ }
+
+ public void onMessage(Message msg) {
+ //System.out.println("Test OnMessage in TestObserver");
}
}
}
-
-
-
+
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index e05cee1..6b94e5b 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -58,16 +58,16 @@ import org.omg.CORBA.portable.OutputStream;
public class CorbaObjectReaderTest extends Assert {
private static ORB orb;
-
+
@Before
public void setUp() throws java.lang.Exception {
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws java.lang.Exception {
if (orb != null) {
@@ -83,176 +83,176 @@ public class CorbaObjectReaderTest extends Assert {
public void testReadBoolean() {
OutputStream oStream = orb.create_output_stream();
oStream.write_boolean(true);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Boolean boolValue = reader.readBoolean();
assertTrue(boolValue.booleanValue());
}
-
+
@Test
public void testReadChar() {
OutputStream oStream = orb.create_output_stream();
oStream.write_char('c');
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Character charValue = reader.readChar();
assertTrue(charValue.charValue() == 'c');
}
-
+
@Test
public void testReadWChar() {
OutputStream oStream = orb.create_output_stream();
oStream.write_wchar('w');
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Character wcharValue = reader.readWChar();
assertTrue(wcharValue.charValue() == 'w');
}
-
+
@Test
public void testReadOctet() {
OutputStream oStream = orb.create_output_stream();
oStream.write_octet((byte)27);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Byte octetValue = reader.readOctet();
assertTrue(octetValue.byteValue() == (byte)27);
}
-
+
@Test
public void testReadShort() {
OutputStream oStream = orb.create_output_stream();
oStream.write_short((short)-100);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Short shortValue = reader.readShort();
assertTrue(shortValue.shortValue() == (short)-100);
}
-
+
@Test
public void testReadUShort() {
OutputStream oStream = orb.create_output_stream();
oStream.write_ushort((short)100);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Integer ushortValue = reader.readUShort();
assertTrue(ushortValue.intValue() == 100);
}
-
+
@Test
public void testReadLong() {
OutputStream oStream = orb.create_output_stream();
oStream.write_long(-100000);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Integer longValue = reader.readLong();
assertTrue(longValue.intValue() == -100000);
}
-
+
@Test
public void testReadULong() {
OutputStream oStream = orb.create_output_stream();
oStream.write_ulong(100000);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
long ulongValue = reader.readULong();
assertTrue(ulongValue == 100000);
}
-
+
@Test
public void testReadLongLong() {
OutputStream oStream = orb.create_output_stream();
oStream.write_longlong(1000000000);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Long longlongValue = reader.readLongLong();
assertTrue(longlongValue.longValue() == 1000000000);
}
-
+
@Test
public void testReadULongLong() {
OutputStream oStream = orb.create_output_stream();
oStream.write_ulonglong(-1000000000L);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
BigInteger ulonglongValue = reader.readULongLong();
assertEquals(1, ulonglongValue.signum());
}
-
+
@Test
public void testReadFloat() {
OutputStream oStream = orb.create_output_stream();
oStream.write_float((float)1234.56);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Float floatValue = reader.readFloat();
assertTrue(floatValue.floatValue() == (float)1234.56);
}
-
+
@Test
public void testReadDouble() {
OutputStream oStream = orb.create_output_stream();
oStream.write_double(6543.21);
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Double doubleValue = reader.readDouble();
assertTrue(doubleValue.doubleValue() == 6543.21);
}
-
+
@Test
public void testReadString() {
OutputStream oStream = orb.create_output_stream();
oStream.write_string("String");
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
String stringValue = reader.readString();
assertTrue("String".equals(stringValue));
}
-
+
@Test
public void testReadWString() {
OutputStream oStream = orb.create_output_stream();
oStream.write_wstring("WString");
-
+
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
String wstringValue = reader.readWString();
assertTrue("WString".equals(wstringValue));
}
-
+
// need to add tests for arrays, sequences, struct, exceptions
@Test
public void testReadArray() {
-
+
int data[] = {1, 1, 2, 3, 5, 8, 13, 21};
-
+
OutputStream oStream = orb.create_output_stream();
oStream.write_long_array(data, 0, data.length);
@@ -272,23 +272,23 @@ public class CorbaObjectReaderTest extends Assert {
CorbaArrayHandler obj = new CorbaArrayHandler(new QName("Array"), arrayIdlType, arrayTC, arrayType);
for (int i = 0; i < data.length; ++i) {
CorbaObjectHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), longIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), longIdlType,
orb.get_primitive_tc(TCKind.tk_long), null);
obj.addElement(nestedObj);
}
-
+
reader.readArray(obj);
int length = obj.getElements().size();
for (int i = 0; i < length; ++i) {
- assertTrue(new Long(((CorbaPrimitiveHandler)obj.getElement(i)).getDataFromValue()).intValue()
- == data[i]);
+ assertTrue(new Long(((CorbaPrimitiveHandler)obj.getElement(i)).getDataFromValue()).intValue()
+ == data[i]);
}
}
-
+
@Test
public void testReadSequence() {
String data[] = {"one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one"};
-
+
OutputStream oStream = orb.create_output_stream();
oStream.write_long(data.length);
for (int i = 0; i < data.length; ++i) {
@@ -304,7 +304,7 @@ public class CorbaObjectReaderTest extends Assert {
Sequence seqType = new Sequence();
seqType.setBound(data.length);
- seqType.setElemtype(stringIdlType);
+ seqType.setElemtype(stringIdlType);
// name and respoitory ID of the sequence are not needed for this test
// build the object holder for a sequence.
@@ -312,20 +312,20 @@ public class CorbaObjectReaderTest extends Assert {
CorbaSequenceHandler obj = new CorbaSequenceHandler(new QName("Seq"), seqIdlType, seqTC, seqType);
for (int i = 0; i < data.length; ++i) {
CorbaPrimitiveHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
orb.get_primitive_tc(TCKind.tk_string), null);
obj.addElement(nestedObj);
}
-
+
reader.readSequence(obj);
int length = obj.getElements().size();
for (int i = 0; i < length; ++i) {
assertTrue(((CorbaPrimitiveHandler)obj.getElement(i)).getDataFromValue().equals(data[i]));
}
}
-
+
@Test
- public void testReadStruct() {
+ public void testReadStruct() {
OutputStream oStream = orb.create_output_stream();
// create the following struct
@@ -337,19 +337,19 @@ public class CorbaObjectReaderTest extends Assert {
int member1 = 12345;
String member2 = "54321";
boolean member3 = true;
-
+
oStream.write_long(member1);
oStream.write_string(member2);
oStream.write_boolean(member3);
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
QName structIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "struct", CorbaConstants.NP_WSDL_CORBA);
QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
QName boolIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
-
+
Struct structType = new Struct();
structType.setName("TestStruct");
MemberType m1 = new MemberType();
@@ -370,9 +370,9 @@ public class CorbaObjectReaderTest extends Assert {
structMembers[0] = new StructMember("member1", orb.get_primitive_tc(TCKind.tk_long), null);
structMembers[1] = new StructMember("member2", orb.get_primitive_tc(TCKind.tk_string), null);
structMembers[2] = new StructMember("member3", orb.get_primitive_tc(TCKind.tk_boolean), null);
- TypeCode structTC = orb.create_struct_tc("IDL:org.apache.cxf.TestStruct/1.0", "TestStruct",
+ TypeCode structTC = orb.create_struct_tc("IDL:org.apache.cxf.TestStruct/1.0", "TestStruct",
structMembers);
- CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
+ CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
structTC, structType);
obj.addMember(
new CorbaPrimitiveHandler(new QName("member1"), longIdlType, structMembers[0].type, null));
@@ -380,18 +380,18 @@ public class CorbaObjectReaderTest extends Assert {
new CorbaPrimitiveHandler(new QName("member2"), stringIdlType, structMembers[1].type, null));
obj.addMember(
new CorbaPrimitiveHandler(new QName("member3"), boolIdlType, structMembers[2].type, null));
-
+
reader.readStruct(obj);
-
+
List<CorbaObjectHandler> nestedObjs = obj.getMembers();
- assertTrue(new Integer(((CorbaPrimitiveHandler)nestedObjs.get(0)).getDataFromValue()).intValue()
+ assertTrue(new Integer(((CorbaPrimitiveHandler)nestedObjs.get(0)).getDataFromValue()).intValue()
== member1);
assertTrue(((CorbaPrimitiveHandler)nestedObjs.get(1)).getDataFromValue().equals(member2));
assertTrue(Boolean.valueOf(((CorbaPrimitiveHandler)nestedObjs.get(2))
.getDataFromValue()).booleanValue()
== member3);
}
-
+
@Test
public void testReadException() {
OutputStream oStream = orb.create_output_stream();
@@ -403,21 +403,21 @@ public class CorbaObjectReaderTest extends Assert {
// }
short code = 12345;
String message = "54321";
-
+
oStream.write_string("IDL:org.apache.cxf.TestException/1.0");
oStream.write_short(code);
oStream.write_string(message);
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
QName exceptIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "exception",
CorbaConstants.NP_WSDL_CORBA);
- QName shortIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short",
+ QName shortIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short",
CorbaConstants.NP_WSDL_CORBA);
- QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string",
+ QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string",
CorbaConstants.NP_WSDL_CORBA);
-
+
Exception exceptType = new Exception();
exceptType.setName("TestException");
MemberType m1 = new MemberType();
@@ -433,33 +433,33 @@ public class CorbaObjectReaderTest extends Assert {
StructMember[] exceptMembers = new StructMember[2];
exceptMembers[0] = new StructMember("code", orb.get_primitive_tc(TCKind.tk_short), null);
exceptMembers[1] = new StructMember("message", orb.get_primitive_tc(TCKind.tk_string), null);
- TypeCode exceptTC = orb.create_exception_tc("IDL:org.apache.cxf.TestException/1.0", "TestException",
+ TypeCode exceptTC = orb.create_exception_tc("IDL:org.apache.cxf.TestException/1.0", "TestException",
exceptMembers);
- CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
+ CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
exceptTC, exceptType);
obj.addMember(
new CorbaPrimitiveHandler(new QName("code"), shortIdlType, exceptMembers[0].type, null));
obj.addMember(
new CorbaPrimitiveHandler(new QName("message"), stringIdlType, exceptMembers[1].type, null));
-
+
reader.readException(obj);
-
+
List<CorbaObjectHandler> nestedObjs = obj.getMembers();
assertTrue(new Short(((CorbaPrimitiveHandler)nestedObjs.get(0))
.getDataFromValue()).shortValue() == code);
assertTrue(((CorbaPrimitiveHandler)nestedObjs.get(1)).getDataFromValue().equals(message));
- }
-
+ }
+
@Test
public void testReadEnum() {
OutputStream oStream = orb.create_output_stream();
-
+
// create the following enum
// enum { RED, GREEN, BLUE };
oStream.write_long(1);
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
String[] enums = {"RED", "GREEN", "BLUE" };
Enum enumType = new Enum();
Enumerator enumRed = new Enumerator();
@@ -471,17 +471,17 @@ public class CorbaObjectReaderTest extends Assert {
enumType.getEnumerator().add(enumRed);
enumType.getEnumerator().add(enumGreen);
enumType.getEnumerator().add(enumBlue);
-
+
// These values don't matter to the outcome of the test but are needed during construction
QName enumName = new QName("TestEnum");
QName enumIdlType = new QName("corbatm:TestEnum");
TypeCode enumTC = orb.create_enum_tc("IDL:TestEnum:1.0", enumName.getLocalPart(), enums);
CorbaEnumHandler obj = new CorbaEnumHandler(enumName, enumIdlType, enumTC, enumType);
-
+
reader.readEnum(obj);
assertTrue(obj.getValue().equals(enums[1]));
}
-
+
@Test
public void testReadFixed() {
if (System.getProperty("java.vendor").contains("IBM")) {
@@ -490,57 +490,57 @@ public class CorbaObjectReaderTest extends Assert {
return;
}
OutputStream oStream = orb.create_output_stream();
-
+
// create the following fixed
// fixed<5,2>
oStream.write_fixed(new java.math.BigDecimal("12345.67").movePointRight(2));
InputStream iStream = oStream.create_input_stream();
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
Fixed fixedType = new Fixed();
fixedType.setDigits(5);
fixedType.setScale(2);
-
+
// These values don't matter to the outcome of the test but are needed during construction
QName fixedName = new QName("TestFixed");
QName fixedIdlType = new QName("corbatm:TestFixed");
TypeCode fixedTC = orb.create_fixed_tc((short)fixedType.getDigits(), (short)fixedType.getScale());
CorbaFixedHandler obj = new CorbaFixedHandler(fixedName, fixedIdlType, fixedTC, fixedType);
-
+
reader.readFixed(obj);
-
+
assertTrue(obj.getValue().equals(new java.math.BigDecimal("12345.67")));
}
-
+
@Test
public void testReadObjectReference() throws IOException {
OutputStream oStream = orb.create_output_stream();
-
+
URL refUrl = getClass().getResource("/references/account.ref");
String oRef = IOUtils.toString(refUrl.openStream()).trim();
- org.omg.CORBA.Object objRef =
+ org.omg.CORBA.Object objRef =
orb.string_to_object(oRef);
-
+
assertNotNull(objRef);
oStream.write_Object(objRef);
- // we need an ORBinstance to handle reading objects so use the input stream
+ // we need an ORBinstance to handle reading objects so use the input stream
InputStream iStream = oStream.create_input_stream();
-
+
CorbaObjectReader reader = new CorbaObjectReader(iStream);
-
+
// create a test object
- org.apache.cxf.binding.corba.wsdl.Object objectType =
+ org.apache.cxf.binding.corba.wsdl.Object objectType =
new org.apache.cxf.binding.corba.wsdl.Object();
objectType.setRepositoryID("IDL:Account:1.0");
objectType.setBinding(new QName("AccountCORBABinding"));
-
+
QName objectName = new QName("TestObject");
QName objectIdlType = new QName("corbaatm:TestObject");
TypeCode objectTC = orb.create_interface_tc("IDL:Account:1.0", "TestObject");
-
- CorbaObjectReferenceHandler obj = new CorbaObjectReferenceHandler(objectName, objectIdlType,
+
+ CorbaObjectReferenceHandler obj = new CorbaObjectReferenceHandler(objectName, objectIdlType,
objectTC, objectType);
-
+
reader.readObjectReference(obj);
assertTrue(obj.getReference()._is_equivalent(objRef));
}
[32/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
index b68e012..d2d4f98 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
@@ -42,41 +42,41 @@ import org.junit.Assert;
import org.junit.Test;
public class AttachmentSerializerTest extends Assert {
-
+
@Test
public void testMessageWriteXopOn1() throws Exception {
doTestMessageWrite(true, "text/xml");
}
-
+
@Test
public void testMessageWriteXopOn2() throws Exception {
doTestMessageWrite(true, "application/soap+xml; action=\"urn:foo\"");
}
-
+
@Test
public void testMessageWriteXopOff1() throws Exception {
doTestMessageWrite(false, "text/xml");
}
-
+
@Test
public void testMessageWriteXopOff2() throws Exception {
doTestMessageWrite(false, "application/soap+xml; action=\"urn:foo\"");
}
-
+
private void doTestMessageWrite(boolean xop, String soapContentType) throws Exception {
MessageImpl msg = new MessageImpl();
-
+
Collection<Attachment> atts = new ArrayList<>();
AttachmentImpl a = new AttachmentImpl("test.xml");
-
+
InputStream is = getClass().getResourceAsStream("my.wav");
ByteArrayDataSource ds = new ByteArrayDataSource(is, "application/octet-stream");
a.setDataHandler(new DataHandler(ds));
-
+
atts.add(a);
-
+
msg.setAttachments(atts);
-
+
// Set the SOAP content type
msg.put(Message.CONTENT_TYPE, soapContentType);
String soapCtType = null;
@@ -94,13 +94,13 @@ public class AttachmentSerializerTest extends Assert {
}
ByteArrayOutputStream out = new ByteArrayOutputStream();
msg.setContent(OutputStream.class, out);
-
+
AttachmentSerializer serializer = new AttachmentSerializer(msg);
if (!xop) {
// default is "on"
serializer.setXop(xop);
}
-
+
serializer.writeProlog();
// we expect the following rules at the package header level
@@ -109,7 +109,7 @@ public class AttachmentSerializerTest extends Assert {
// value must contain the content type associated with the root content's xml serialization,
// including its parameters as appropriate.
// - the action property should not appear directly in the package header level
- // - the type property must contain the media type type/subtype of the root content part.
+ // - the type property must contain the media type type/subtype of the root content part.
// namely application/xop+xml for mtom but otherwise text/xml or application/soap+xml
// depending on the soap version 1.1 or 1.2, respectively.
String ct = (String) msg.get(Message.CONTENT_TYPE);
@@ -123,120 +123,120 @@ public class AttachmentSerializerTest extends Assert {
assertTrue(ct.indexOf("type=\"" + soapCtType + "\"") > -1);
}
out.write("<soap:Body/>".getBytes());
-
+
serializer.writeAttachments();
-
+
out.flush();
-
+
DataSource source = new ByteArrayDataSource(new ByteArrayInputStream(out.toByteArray()), ct);
MimeMultipart mpart = new MimeMultipart(source);
Session session = Session.getDefaultInstance(new Properties());
MimeMessage inMsg = new MimeMessage(session);
inMsg.setContent(mpart);
inMsg.addHeaderLine("Content-Type: " + ct);
-
+
MimeMultipart multipart = (MimeMultipart) inMsg.getContent();
-
+
MimeBodyPart part = (MimeBodyPart) multipart.getBodyPart(0);
// we expect the following rules at the root content level
- // - the envelope header must have type application/xop+xml for mtom but otherwise the content's
+ // - the envelope header must have type application/xop+xml for mtom but otherwise the content's
// serialization type.
// - the type property must be present for mtom and it must contain the content's serialization type
- // including its parameters if appropriate.
+ // including its parameters if appropriate.
// - the action must appear if it was present in the original message (i.e., for soap 1.2)
if (xop) {
assertEquals("application/xop+xml; charset=UTF-8; type=\"" + soapCtType + soapCtParamsEscaped + "\"",
part.getHeader("Content-Type")[0]);
} else {
- assertEquals(soapCtType + "; charset=UTF-8" + soapCtParams,
+ assertEquals(soapCtType + "; charset=UTF-8" + soapCtParams,
part.getHeader("Content-Type")[0]);
}
-
+
assertEquals("binary", part.getHeader("Content-Transfer-Encoding")[0]);
assertEquals("<ro...@cxf.apache.org>", part.getHeader("Content-ID")[0]);
-
+
InputStream in = part.getDataHandler().getInputStream();
ByteArrayOutputStream bodyOut = new ByteArrayOutputStream();
IOUtils.copy(in, bodyOut);
out.close();
in.close();
-
+
assertEquals("<soap:Body/>", bodyOut.toString());
-
+
MimeBodyPart part2 = (MimeBodyPart) multipart.getBodyPart(1);
assertEquals("application/octet-stream", part2.getHeader("Content-Type")[0]);
assertEquals("binary", part2.getHeader("Content-Transfer-Encoding")[0]);
assertEquals("<test.xml>", part2.getHeader("Content-ID")[0]);
}
-
+
@Test
public void testMessageMTOM() throws Exception {
MessageImpl msg = new MessageImpl();
-
+
Collection<Attachment> atts = new ArrayList<>();
AttachmentImpl a = new AttachmentImpl("test.xml");
-
+
InputStream is = getClass().getResourceAsStream("my.wav");
ByteArrayDataSource ds = new ByteArrayDataSource(is, "application/octet-stream");
a.setDataHandler(new DataHandler(ds));
-
+
atts.add(a);
-
+
msg.setAttachments(atts);
-
+
// Set the SOAP content type
msg.put(Message.CONTENT_TYPE, "application/soap+xml");
-
+
ByteArrayOutputStream out = new ByteArrayOutputStream();
msg.setContent(OutputStream.class, out);
-
+
AttachmentSerializer serializer = new AttachmentSerializer(msg);
-
+
serializer.writeProlog();
String ct = (String) msg.get(Message.CONTENT_TYPE);
assertTrue(ct.indexOf("multipart/related;") == 0);
assertTrue(ct.indexOf("start=\"<ro...@cxf.apache.org>\"") > -1);
assertTrue(ct.indexOf("start-info=\"application/soap+xml\"") > -1);
-
+
out.write("<soap:Body/>".getBytes());
-
+
serializer.writeAttachments();
-
+
out.flush();
DataSource source = new ByteArrayDataSource(new ByteArrayInputStream(out.toByteArray()), ct);
MimeMultipart mpart = new MimeMultipart(source);
Session session = Session.getDefaultInstance(new Properties());
MimeMessage inMsg = new MimeMessage(session);
inMsg.setContent(mpart);
-
+
inMsg.addHeaderLine("Content-Type: " + ct);
-
+
MimeMultipart multipart = (MimeMultipart) inMsg.getContent();
-
+
MimeBodyPart part = (MimeBodyPart) multipart.getBodyPart(0);
- assertEquals("application/xop+xml; charset=UTF-8; type=\"application/soap+xml\"",
+ assertEquals("application/xop+xml; charset=UTF-8; type=\"application/soap+xml\"",
part.getHeader("Content-Type")[0]);
assertEquals("binary", part.getHeader("Content-Transfer-Encoding")[0]);
assertEquals("<ro...@cxf.apache.org>", part.getHeader("Content-ID")[0]);
-
+
InputStream in = part.getDataHandler().getInputStream();
ByteArrayOutputStream bodyOut = new ByteArrayOutputStream();
IOUtils.copy(in, bodyOut);
out.close();
in.close();
-
+
assertEquals("<soap:Body/>", bodyOut.toString());
-
+
MimeBodyPart part2 = (MimeBodyPart) multipart.getBodyPart(1);
assertEquals("application/octet-stream", part2.getHeader("Content-Type")[0]);
assertEquals("binary", part2.getHeader("Content-Transfer-Encoding")[0]);
assertEquals("<test.xml>", part2.getHeader("Content-ID")[0]);
-
+
}
private static String escapeQuotes(String s) {
- return s.indexOf('"') != 0 ? s.replace("\"", "\\\"") : s;
+ return s.indexOf('"') != 0 ? s.replace("\"", "\\\"") : s;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
index 1c93eb2..10c8ad6 100644
--- a/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/CXFBusImplTest.java
@@ -52,40 +52,40 @@ public class CXFBusImplTest extends Assert {
}
@Test
public void testConstructionWithoutExtensions() throws BusException {
-
+
Bus bus = new ExtensionManagerBus();
assertNotNull(bus.getExtension(BindingFactoryManager.class));
- assertNotNull(bus.getExtension(ConduitInitiatorManager.class));
+ assertNotNull(bus.getExtension(ConduitInitiatorManager.class));
assertNotNull(bus.getExtension(DestinationFactoryManager.class));
assertNotNull(bus.getExtension(PhaseManager.class));
bus.shutdown(true);
}
-
+
@Test
public void testConstructionWithExtensions() throws BusException {
-
+
IMocksControl control;
BindingFactoryManager bindingFactoryManager;
InstrumentationManager instrumentationManager;
PhaseManager phaseManager;
-
+
control = EasyMock.createNiceControl();
-
+
Map<Class<?>, Object> extensions = new HashMap<Class<?>, Object>();
bindingFactoryManager = control.createMock(BindingFactoryManager.class);
instrumentationManager = control.createMock(InstrumentationManager.class);
phaseManager = control.createMock(PhaseManager.class);
-
+
extensions.put(BindingFactoryManager.class, bindingFactoryManager);
extensions.put(InstrumentationManager.class, instrumentationManager);
extensions.put(PhaseManager.class, phaseManager);
-
+
Bus bus = new ExtensionManagerBus(extensions);
-
+
assertSame(bindingFactoryManager, bus.getExtension(BindingFactoryManager.class));
assertSame(instrumentationManager, bus.getExtension(InstrumentationManager.class));
assertSame(phaseManager, bus.getExtension(PhaseManager.class));
-
+
}
@Test
@@ -96,7 +96,7 @@ public class CXFBusImplTest extends Assert {
assertSame(extension, bus.getExtension(String.class));
bus.shutdown(true);
}
-
+
@Test
public void testBusID() {
Bus bus = new ExtensionManagerBus();
@@ -106,7 +106,7 @@ public class CXFBusImplTest extends Assert {
assertEquals("The bus id should be changed", "test", bus.getId());
bus.shutdown(true);
}
-
+
@Test
public void testShutdownWithBusLifecycle() {
final Bus bus = new ExtensionManagerBus();
@@ -116,12 +116,12 @@ public class CXFBusImplTest extends Assert {
listener.preShutdown();
EasyMock.expectLastCall();
listener.postShutdown();
- EasyMock.expectLastCall();
- EasyMock.replay(listener);
+ EasyMock.expectLastCall();
+ EasyMock.replay(listener);
lifeCycleManager.registerLifeCycleListener(listener);
bus.shutdown(true);
EasyMock.verify(listener);
- bus.shutdown(true);
+ bus.shutdown(true);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
index 057200d..6a71200 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionManagerTest.java
@@ -35,27 +35,27 @@ public class ExtensionManagerTest extends Assert {
private static final String EXTENSIONMANAGER_TEST_RESOURECE_NAME = "extensionManagerTest";
private ExtensionManagerImpl manager;
private Map<Class<?>, Object> extensions;
-
+
@Before
public void setUp() {
ResourceResolver resolver = new SinglePropertyResolver(EXTENSIONMANAGER_TEST_RESOURECE_NAME, this);
ResourceManager rm = new DefaultResourceManager(resolver);
-
+
extensions = new HashMap<Class<?>, Object>();
extensions.put(Integer.class, Integer.valueOf(0));
-
- manager = new ExtensionManagerImpl("test-extension.xml",
- Thread.currentThread().getContextClassLoader(), extensions, rm, null);
+
+ manager = new ExtensionManagerImpl("test-extension.xml",
+ Thread.currentThread().getContextClassLoader(), extensions, rm, null);
}
-
+
@Test
public void testLoadAndRegister() {
Extension e = new Extension();
e.setClassname("java.lang.String");
- e.setDeferred(false);
+ e.setDeferred(false);
manager.loadAndRegister(e);
-
-
+
+
String interfaceName = "java.lang.Runnable";
e.setDeferred(false);
e.setClassname("java.lang.Thread");
@@ -63,7 +63,7 @@ public class ExtensionManagerTest extends Assert {
assertNull("Object is registered.", extensions.get(Runnable.class));
manager.loadAndRegister(e);
assertNotNull("Object was not registered.", extensions.get(Runnable.class));
-
+
interfaceName = "java.lang.Integer";
e.setInterfaceName(interfaceName);
e.setClassname("no.such.Class");
@@ -71,9 +71,9 @@ public class ExtensionManagerTest extends Assert {
assertNotNull("Object is not registered.", obj);
manager.loadAndRegister(e);
assertSame("Registered object was replaced.", obj, extensions.get(Integer.class));
-
+
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
index a0a7c90..85b01b1 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/ExtensionTest.java
@@ -27,30 +27,30 @@ public class ExtensionTest extends Assert {
@Test
public void testMutators() {
Extension e = new Extension();
-
+
String className = "org.apache.cxf.bindings.soap.SoapBinding";
e.setClassname(className);
assertEquals("Unexpected class name.", className, e.getClassname());
assertNull("Unexpected interface name.", e.getInterfaceName());
-
+
String interfaceName = "org.apache.cxf.bindings.Binding";
e.setInterfaceName(interfaceName);
assertEquals("Unexpected interface name.", interfaceName, e.getInterfaceName());
-
+
assertTrue("Extension is deferred.", !e.isDeferred());
e.setDeferred(true);
assertTrue("Extension is not deferred.", e.isDeferred());
-
+
assertEquals("Unexpected size of namespace list.", 0, e.getNamespaces().size());
}
-
+
@Test
public void testLoad() throws ExtensionException {
Extension e = new Extension();
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- e.setClassname("no.such.Extension");
+ e.setClassname("no.such.Extension");
try {
- e.load(cl, null);
+ e.load(cl, null);
} catch (ExtensionException ex) {
assertTrue("ExtensionException does not wrap ClassNotFoundException",
ex.getCause() instanceof ClassNotFoundException);
@@ -58,44 +58,44 @@ public class ExtensionTest extends Assert {
e.setClassname("java.lang.System");
try {
- e.load(cl, null);
+ e.load(cl, null);
} catch (ExtensionException ex) {
assertTrue("ExtensionException does not wrap NoSuchMethodException " + ex.getCause(),
ex.getCause() instanceof NoSuchMethodException);
- }
+ }
e.setClassname(MyServiceConstructorThrowsException.class.getName());
try {
- e.load(cl, null);
+ e.load(cl, null);
} catch (ExtensionException ex) {
assertTrue("ExtensionException does not wrap IllegalArgumentException",
ex.getCause() instanceof IllegalArgumentException);
- }
+ }
e.setClassname("java.lang.String");
Object obj = e.load(cl, null);
- assertTrue("Object is not type String", obj instanceof String);
+ assertTrue("Object is not type String", obj instanceof String);
}
-
+
@Test
public void testLoadInterface() {
Extension e = new Extension();
ClassLoader cl = Thread.currentThread().getContextClassLoader();
- e.setInterfaceName("no.such.Extension");
+ e.setInterfaceName("no.such.Extension");
try {
- e.loadInterface(cl);
+ e.loadInterface(cl);
} catch (ExtensionException ex) {
assertTrue("ExtensionException does not wrap ClassNotFoundException",
ex.getCause() instanceof ClassNotFoundException);
}
-
+
e.setInterfaceName(Assert.class.getName());
Class<?> cls = e.loadInterface(cl);
assertNotNull(cls);
}
-
+
public static class MyServiceConstructorThrowsException {
public MyServiceConstructorThrowsException() {
throw new IllegalArgumentException();
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
index e715051..86371df 100644
--- a/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/extension/TextExtensionFragmentParserTest.java
@@ -33,15 +33,15 @@ public class TextExtensionFragmentParserTest extends Assert {
InputStream is = TextExtensionFragmentParserTest.class.getResourceAsStream("extension2.txt");
List<Extension> extensions = new TextExtensionFragmentParser(null).getExtensions(is);
assertEquals("Unexpected number of Extension elements.", 3, extensions.size());
-
+
Extension e = extensions.get(0);
assertTrue("Extension is deferred.", !e.isDeferred());
- assertEquals("Unexpected class name.",
+ assertEquals("Unexpected class name.",
"org.apache.cxf.foo.FooImpl", e.getClassname());
assertEquals("Unexpected number of namespace elements.", 0, e.getNamespaces().size());
e = extensions.get(1);
assertTrue("Extension is not deferred.", e.isDeferred());
- assertEquals("Unexpected implementation class name.",
+ assertEquals("Unexpected implementation class name.",
"java.lang.Boolean", e.getClassname());
assertNull("Interface should be null", e.getInterfaceName());
assertEquals("Unexpected number of namespace elements.", 0, e.getNamespaces().size());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
index 25c6163..a8cae96 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/EndpointResolverRegistryImplTest.java
@@ -68,26 +68,26 @@ public class EndpointResolverRegistryImplTest extends Assert {
assertEquals("unexpected resolver count",
0,
registry.getResolvers().size());
-
+
registry.register(resolver1);
-
+
assertEquals("unexpected resolver count",
1,
registry.getResolvers().size());
assertTrue("expected resolver to be registered",
registry.getResolvers().contains(resolver1));
-
+
registry.unregister(resolver1);
-
+
assertEquals("unexpected resolver count",
0,
registry.getResolvers().size());
assertFalse("expected resolver to be registered",
registry.getResolvers().contains(resolver1));
-
+
registry.register(resolver2);
registry.register(resolver1);
-
+
assertEquals("unexpected resolver count",
2,
registry.getResolvers().size());
@@ -95,9 +95,9 @@ public class EndpointResolverRegistryImplTest extends Assert {
registry.getResolvers().contains(resolver1));
assertTrue("expected resolver to be registered",
registry.getResolvers().contains(resolver2));
-
+
registry.unregister(resolver2);
-
+
assertEquals("unexpected resolver count",
1,
registry.getResolvers().size());
@@ -106,7 +106,7 @@ public class EndpointResolverRegistryImplTest extends Assert {
assertFalse("expected resolver to be registered",
registry.getResolvers().contains(resolver2));
}
-
+
@Test
public void testResolve() {
registry.register(resolver1);
@@ -114,21 +114,21 @@ public class EndpointResolverRegistryImplTest extends Assert {
resolver1.resolve(logical);
EasyMock.expectLastCall().andReturn(physical);
control.replay();
-
+
EndpointReferenceType resolved = registry.resolve(logical);
-
+
control.verify();
assertSame("unexpected physical EPR", physical, resolved);
-
+
control.reset();
resolver1.resolve(logical);
EasyMock.expectLastCall().andReturn(null);
resolver2.resolve(logical);
EasyMock.expectLastCall().andReturn(physical);
control.replay();
-
+
resolved = registry.resolve(logical);
-
+
control.verify();
assertSame("unexpected physical EPR", physical, resolved);
@@ -144,7 +144,7 @@ public class EndpointResolverRegistryImplTest extends Assert {
control.verify();
assertNull("unexpected physical EPR", resolved);
}
-
+
@Test
public void testRenew() {
registry.register(resolver1);
@@ -152,21 +152,21 @@ public class EndpointResolverRegistryImplTest extends Assert {
resolver1.renew(logical, physical);
EasyMock.expectLastCall().andReturn(fresh);
control.replay();
-
+
EndpointReferenceType renewed = registry.renew(logical, physical);
-
+
control.verify();
assertSame("unexpected physical EPR", fresh, renewed);
-
+
control.reset();
resolver1.renew(logical, physical);
EasyMock.expectLastCall().andReturn(null);
resolver2.renew(logical, physical);
EasyMock.expectLastCall().andReturn(physical);
control.replay();
-
+
renewed = registry.renew(logical, physical);
-
+
control.verify();
assertSame("unexpected physical EPR", physical, renewed);
@@ -182,7 +182,7 @@ public class EndpointResolverRegistryImplTest extends Assert {
control.verify();
assertNull("unexpected physical EPR", renewed);
}
-
+
@Test
public void testMintFromServiceName() {
registry.register(resolver1);
@@ -190,21 +190,21 @@ public class EndpointResolverRegistryImplTest extends Assert {
resolver1.mint(serviceName);
EasyMock.expectLastCall().andReturn(logical);
control.replay();
-
+
EndpointReferenceType minted = registry.mint(serviceName);
-
+
control.verify();
assertSame("unexpected minted EPR", logical, minted);
-
+
control.reset();
resolver1.mint(serviceName);
EasyMock.expectLastCall().andReturn(null);
resolver2.mint(serviceName);
EasyMock.expectLastCall().andReturn(logical);
control.replay();
-
+
minted = registry.mint(serviceName);
-
+
control.verify();
assertSame("unexpected minted EPR", logical, minted);
@@ -220,7 +220,7 @@ public class EndpointResolverRegistryImplTest extends Assert {
control.verify();
assertNull("unexpected minted EPR", minted);
}
-
+
@Test
public void testMintFromPhysical() {
registry.register(resolver1);
@@ -228,21 +228,21 @@ public class EndpointResolverRegistryImplTest extends Assert {
resolver1.mint(physical);
EasyMock.expectLastCall().andReturn(logical);
control.replay();
-
+
EndpointReferenceType minted = registry.mint(physical);
-
+
control.verify();
assertSame("unexpected minted EPR", logical, minted);
-
+
control.reset();
resolver1.mint(physical);
EasyMock.expectLastCall().andReturn(null);
resolver2.mint(physical);
EasyMock.expectLastCall().andReturn(logical);
control.replay();
-
+
minted = registry.mint(physical);
-
+
control.verify();
assertSame("unexpected minted EPR", logical, minted);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
index f069cc9..ab85e24 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServerRegistryImpTest.java
@@ -26,10 +26,10 @@ import org.junit.Assert;
import org.junit.Test;
public class ServerRegistryImpTest extends Assert {
-
+
@Test
public void testServerRegistryPreShutdown() {
- ServerRegistryImpl serverRegistryImpl = new ServerRegistryImpl();
+ ServerRegistryImpl serverRegistryImpl = new ServerRegistryImpl();
Server server = new DummyServer(serverRegistryImpl);
server.start();
assertEquals("The serverList should have one service", serverRegistryImpl.serversList.size(), 1);
@@ -37,8 +37,8 @@ public class ServerRegistryImpTest extends Assert {
assertEquals("The serverList should be clear ", serverRegistryImpl.serversList.size(), 0);
serverRegistryImpl.postShutdown();
assertEquals("The serverList should be clear ", serverRegistryImpl.serversList.size(), 0);
- }
-
-
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
index 836ec65..5bb9f68 100644
--- a/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImplTest.java
@@ -58,32 +58,32 @@ public class ServiceContractResolverRegistryImplTest extends Assert {
resolver2 = null;
serviceName = null;
}
-
+
@Test
public void testRegister() {
assertEquals("unexpected resolver count",
0,
registry.getResolvers().size());
-
+
registry.register(resolver1);
-
+
assertEquals("unexpected resolver count",
1,
registry.getResolvers().size());
assertTrue("expected resolver to be registered",
registry.getResolvers().contains(resolver1));
-
+
registry.unregister(resolver1);
-
+
assertEquals("unexpected resolver count",
0,
registry.getResolvers().size());
assertFalse("expected resolver to be registered",
registry.getResolvers().contains(resolver1));
-
+
registry.register(resolver2);
registry.register(resolver1);
-
+
assertEquals("unexpected resolver count",
2,
registry.getResolvers().size());
@@ -91,9 +91,9 @@ public class ServiceContractResolverRegistryImplTest extends Assert {
registry.getResolvers().contains(resolver1));
assertTrue("expected resolver to be registered",
registry.getResolvers().contains(resolver2));
-
+
registry.unregister(resolver2);
-
+
assertEquals("unexpected resolver count",
1,
registry.getResolvers().size());
@@ -102,7 +102,7 @@ public class ServiceContractResolverRegistryImplTest extends Assert {
assertFalse("expected resolver to be registered",
registry.getResolvers().contains(resolver2));
}
-
+
@Test
public void testGetContactLocation() {
registry.register(resolver1);
@@ -110,21 +110,21 @@ public class ServiceContractResolverRegistryImplTest extends Assert {
resolver1.getContractLocation(serviceName);
EasyMock.expectLastCall().andReturn(uri1);
control.replay();
-
+
URI resolved = registry.getContractLocation(serviceName);
-
+
control.verify();
assertSame("unexpected physical EPR", uri1, resolved);
-
+
control.reset();
resolver1.getContractLocation(serviceName);
EasyMock.expectLastCall().andReturn(null);
resolver2.getContractLocation(serviceName);
EasyMock.expectLastCall().andReturn(uri2);
control.replay();
-
+
resolved = registry.getContractLocation(serviceName);
-
+
control.verify();
assertSame("unexpected physical EPR", uri2, resolved);
assertNotSame("unexpected physical EPR", uri1, resolved);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
index 21c3e99..4b2c55a 100644
--- a/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/osgi/OSGiBusListenerTest.java
@@ -1,210 +1,210 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.cxf.bus.osgi;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.buslifecycle.BusLifeCycleManager;
-import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.endpoint.ClientLifeCycleListener;
-import org.apache.cxf.endpoint.ClientLifeCycleManager;
-import org.apache.cxf.endpoint.ServerLifeCycleListener;
-import org.apache.cxf.endpoint.ServerLifeCycleManager;
-import org.apache.cxf.feature.Feature;
-import org.easymock.EasyMock;
-import org.easymock.IMocksControl;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
-
-/**
- *
- */
-public class OSGiBusListenerTest extends Assert {
- private static final String[] SERVICE_BUNDLE_NAMES = new String[]{"me.temp.foo.test", "me.temp.bar.sample"};
- private static final String EXCLUDES = "me\\.temp\\.bar\\..*";
- private static final String RESTRICTED = "me\\.my\\.app\\..*";
- private static final String BUNDLE_NAME = "me.my.app";
-
- private IMocksControl control;
- private Bus bus;
- private BundleContext bundleContext;
- private Bundle bundle;
-
-
- @Before
- public void setUp() {
- control = EasyMock.createNiceControl();
- bus = control.createMock(Bus.class);
- BusLifeCycleManager blcManager = control.createMock(BusLifeCycleManager.class);
- EasyMock.expect(bus.getExtension(BusLifeCycleManager.class)).andReturn(blcManager).anyTimes();
-
- blcManager.registerLifeCycleListener(EasyMock.isA(OSGIBusListener.class));
- EasyMock.expectLastCall();
- bundleContext = control.createMock(BundleContext.class);
-
- BundleContext app = control.createMock(BundleContext.class);
- EasyMock.expect(bus.getExtension(BundleContext.class)).andReturn(app).anyTimes();
- bundle = control.createMock(Bundle.class);
- EasyMock.expect(app.getBundle()).andReturn(bundle).anyTimes();
- EasyMock.expect(bundle.getSymbolicName()).andReturn(BUNDLE_NAME).anyTimes();
- }
-
- @Test
- public void testRegistratioWithNoServices() throws Exception {
- control.replay();
- new OSGIBusListener(bus, new Object[]{bundleContext});
-
- control.verify();
- }
-
- @Test
- public void testRegistratioWithServices() throws Exception {
- setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null);
- setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null);
- Collection<Feature> lst = new ArrayList<>();
- setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst);
-
- control.replay();
- new OSGIBusListener(bus, new Object[]{bundleContext});
-
- assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null), lst.size());
-
- control.verify();
- }
-
- @Test
- public void testRegistratioWithServicesExcludes() throws Exception {
- setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES);
- setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES);
- Collection<Feature> lst = new ArrayList<>();
- setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst);
- EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES);
- control.replay();
- new OSGIBusListener(bus, new Object[]{bundleContext});
-
- assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES), lst.size());
-
- control.verify();
- }
-
- @Test
- public void testRegistratioWithServicesExcludesAndRestricted() throws Exception {
- setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES);
- setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES);
- Collection<Feature> lst = new ArrayList<>();
- setFeatures(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, lst);
- EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES);
- control.replay();
- new OSGIBusListener(bus, new Object[]{bundleContext});
-
- assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES), lst.size());
-
- control.verify();
- }
-
- private void setUpClientLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
- ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
- EasyMock.expect(bundleContext.getServiceReferences(ClientLifeCycleListener.class.getName(), null))
- .andReturn(svcrefs);
- ClientLifeCycleManager lcmanager = control.createMock(ClientLifeCycleManager.class);
- EasyMock.expect(bus.getExtension(ClientLifeCycleManager.class)).andReturn(lcmanager).anyTimes();
- for (int i = 0; i < names.length; i++) {
- ClientLifeCycleListener cl = control.createMock(ClientLifeCycleListener.class);
- EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(cl).anyTimes();
- if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excludes)) {
- lcmanager.registerListener(cl);
- EasyMock.expectLastCall();
- }
- }
- }
-
- private void setUpServerLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
- ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
- EasyMock.expect(bundleContext.getServiceReferences(ServerLifeCycleListener.class.getName(), null))
- .andReturn(svcrefs);
- ServerLifeCycleManager lcmanager = control.createMock(ServerLifeCycleManager.class);
- EasyMock.expect(bus.getExtension(ServerLifeCycleManager.class)).andReturn(lcmanager).anyTimes();
- for (int i = 0; i < names.length; i++) {
- ServerLifeCycleListener cl = control.createMock(ServerLifeCycleListener.class);
- EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(cl).anyTimes();
- if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excludes)) {
- lcmanager.registerListener(cl);
- EasyMock.expectLastCall();
- }
- }
- }
-
- private void setFeatures(String[] names, String[] restricted,
- Collection<Feature> lst) throws Exception {
- ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
- EasyMock.expect(bundleContext.getServiceReferences(Feature.class.getName(), null))
- .andReturn(svcrefs);
- for (int i = 0; i < names.length; i++) {
- Feature f = control.createMock(Feature.class);
- EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(f).anyTimes();
- }
- EasyMock.expect(bus.getFeatures()).andReturn(lst).anyTimes();
-
- }
-
- // Creates test service references with the specified symbolic names and the restricted extension properties.
- private ServiceReference[] createTestServiceReferences(String[] names, String[] restricted) {
- ServiceReference[] refs = new ServiceReference[names.length];
- for (int i = 0; i < names.length; i++) {
- refs[i] = createTestServiceReference(names[i], restricted[i]);
- }
- return refs;
- }
-
-
- // Creates a test service reference with the specified symbolic name and the restricted extension property.
- private ServiceReference createTestServiceReference(String name, String rst) {
- ServiceReference ref = control.createMock(ServiceReference.class);
- Bundle b = control.createMock(Bundle.class);
- EasyMock.expect(b.getSymbolicName()).andReturn(name).anyTimes();
- EasyMock.expect(ref.getBundle()).andReturn(b).anyTimes();
- EasyMock.expect(ref.getProperty("org.apache.cxf.bus.restricted.extension")).andReturn(rst).anyTimes();
- return ref;
- }
-
- private static boolean isExcluded(String aname, String sname, String rst, String exc) {
- if (!StringUtils.isEmpty(rst) && !aname.matches(rst)) {
- return true;
- }
- return exc != null && sname.matches(exc);
- }
-
- private static int countServices(String[] names, String[] restricted, String excluded) {
- int c = 0;
- for (int i = 0; i < names.length; i++) {
- if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excluded)) {
- c++;
- }
- }
- return c;
- }
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.bus.osgi;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.endpoint.ClientLifeCycleListener;
+import org.apache.cxf.endpoint.ClientLifeCycleManager;
+import org.apache.cxf.endpoint.ServerLifeCycleListener;
+import org.apache.cxf.endpoint.ServerLifeCycleManager;
+import org.apache.cxf.feature.Feature;
+import org.easymock.EasyMock;
+import org.easymock.IMocksControl;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ *
+ */
+public class OSGiBusListenerTest extends Assert {
+ private static final String[] SERVICE_BUNDLE_NAMES = new String[]{"me.temp.foo.test", "me.temp.bar.sample"};
+ private static final String EXCLUDES = "me\\.temp\\.bar\\..*";
+ private static final String RESTRICTED = "me\\.my\\.app\\..*";
+ private static final String BUNDLE_NAME = "me.my.app";
+
+ private IMocksControl control;
+ private Bus bus;
+ private BundleContext bundleContext;
+ private Bundle bundle;
+
+
+ @Before
+ public void setUp() {
+ control = EasyMock.createNiceControl();
+ bus = control.createMock(Bus.class);
+ BusLifeCycleManager blcManager = control.createMock(BusLifeCycleManager.class);
+ EasyMock.expect(bus.getExtension(BusLifeCycleManager.class)).andReturn(blcManager).anyTimes();
+
+ blcManager.registerLifeCycleListener(EasyMock.isA(OSGIBusListener.class));
+ EasyMock.expectLastCall();
+ bundleContext = control.createMock(BundleContext.class);
+
+ BundleContext app = control.createMock(BundleContext.class);
+ EasyMock.expect(bus.getExtension(BundleContext.class)).andReturn(app).anyTimes();
+ bundle = control.createMock(Bundle.class);
+ EasyMock.expect(app.getBundle()).andReturn(bundle).anyTimes();
+ EasyMock.expect(bundle.getSymbolicName()).andReturn(BUNDLE_NAME).anyTimes();
+ }
+
+ @Test
+ public void testRegistratioWithNoServices() throws Exception {
+ control.replay();
+ new OSGIBusListener(bus, new Object[]{bundleContext});
+
+ control.verify();
+ }
+
+ @Test
+ public void testRegistratioWithServices() throws Exception {
+ setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null);
+ setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null);
+ Collection<Feature> lst = new ArrayList<>();
+ setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst);
+
+ control.replay();
+ new OSGIBusListener(bus, new Object[]{bundleContext});
+
+ assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{null, null}, null), lst.size());
+
+ control.verify();
+ }
+
+ @Test
+ public void testRegistratioWithServicesExcludes() throws Exception {
+ setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES);
+ setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES);
+ Collection<Feature> lst = new ArrayList<>();
+ setFeatures(SERVICE_BUNDLE_NAMES, new String[]{null, null}, lst);
+ EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES);
+ control.replay();
+ new OSGIBusListener(bus, new Object[]{bundleContext});
+
+ assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{null, null}, EXCLUDES), lst.size());
+
+ control.verify();
+ }
+
+ @Test
+ public void testRegistratioWithServicesExcludesAndRestricted() throws Exception {
+ setUpClientLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES);
+ setUpServerLifeCycleListeners(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES);
+ Collection<Feature> lst = new ArrayList<>();
+ setFeatures(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, lst);
+ EasyMock.expect(bus.getProperty("bus.extension.bundles.excludes")).andReturn(EXCLUDES);
+ control.replay();
+ new OSGIBusListener(bus, new Object[]{bundleContext});
+
+ assertEquals(countServices(SERVICE_BUNDLE_NAMES, new String[]{RESTRICTED, null}, EXCLUDES), lst.size());
+
+ control.verify();
+ }
+
+ private void setUpClientLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
+ ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
+ EasyMock.expect(bundleContext.getServiceReferences(ClientLifeCycleListener.class.getName(), null))
+ .andReturn(svcrefs);
+ ClientLifeCycleManager lcmanager = control.createMock(ClientLifeCycleManager.class);
+ EasyMock.expect(bus.getExtension(ClientLifeCycleManager.class)).andReturn(lcmanager).anyTimes();
+ for (int i = 0; i < names.length; i++) {
+ ClientLifeCycleListener cl = control.createMock(ClientLifeCycleListener.class);
+ EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(cl).anyTimes();
+ if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excludes)) {
+ lcmanager.registerListener(cl);
+ EasyMock.expectLastCall();
+ }
+ }
+ }
+
+ private void setUpServerLifeCycleListeners(String[] names, String[] restricted, String excludes) throws Exception {
+ ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
+ EasyMock.expect(bundleContext.getServiceReferences(ServerLifeCycleListener.class.getName(), null))
+ .andReturn(svcrefs);
+ ServerLifeCycleManager lcmanager = control.createMock(ServerLifeCycleManager.class);
+ EasyMock.expect(bus.getExtension(ServerLifeCycleManager.class)).andReturn(lcmanager).anyTimes();
+ for (int i = 0; i < names.length; i++) {
+ ServerLifeCycleListener cl = control.createMock(ServerLifeCycleListener.class);
+ EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(cl).anyTimes();
+ if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excludes)) {
+ lcmanager.registerListener(cl);
+ EasyMock.expectLastCall();
+ }
+ }
+ }
+
+ private void setFeatures(String[] names, String[] restricted,
+ Collection<Feature> lst) throws Exception {
+ ServiceReference[] svcrefs = createTestServiceReferences(names, restricted);
+ EasyMock.expect(bundleContext.getServiceReferences(Feature.class.getName(), null))
+ .andReturn(svcrefs);
+ for (int i = 0; i < names.length; i++) {
+ Feature f = control.createMock(Feature.class);
+ EasyMock.expect(bundleContext.getService(svcrefs[i])).andReturn(f).anyTimes();
+ }
+ EasyMock.expect(bus.getFeatures()).andReturn(lst).anyTimes();
+
+ }
+
+ // Creates test service references with the specified symbolic names and the restricted extension properties.
+ private ServiceReference[] createTestServiceReferences(String[] names, String[] restricted) {
+ ServiceReference[] refs = new ServiceReference[names.length];
+ for (int i = 0; i < names.length; i++) {
+ refs[i] = createTestServiceReference(names[i], restricted[i]);
+ }
+ return refs;
+ }
+
+
+ // Creates a test service reference with the specified symbolic name and the restricted extension property.
+ private ServiceReference createTestServiceReference(String name, String rst) {
+ ServiceReference ref = control.createMock(ServiceReference.class);
+ Bundle b = control.createMock(Bundle.class);
+ EasyMock.expect(b.getSymbolicName()).andReturn(name).anyTimes();
+ EasyMock.expect(ref.getBundle()).andReturn(b).anyTimes();
+ EasyMock.expect(ref.getProperty("org.apache.cxf.bus.restricted.extension")).andReturn(rst).anyTimes();
+ return ref;
+ }
+
+ private static boolean isExcluded(String aname, String sname, String rst, String exc) {
+ if (!StringUtils.isEmpty(rst) && !aname.matches(rst)) {
+ return true;
+ }
+ return exc != null && sname.matches(exc);
+ }
+
+ private static int countServices(String[] names, String[] restricted, String excluded) {
+ int c = 0;
+ for (int i = 0; i < names.length; i++) {
+ if (!isExcluded(BUNDLE_NAME, names[i], restricted[i], excluded)) {
+ c++;
+ }
+ }
+ return c;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
index 60d6101..7d69da9 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationContextTest.java
@@ -25,12 +25,12 @@ import org.junit.Test;
import org.springframework.beans.BeansException;
public class BusApplicationContextTest extends Assert {
-
+
@Test
public void testGetResources() {
BusApplicationContext ctx = null;
- try {
+ try {
ctx = new BusApplicationContext("nowhere.xml", false);
fail("Bus creation should have thrown exception.");
} catch (BeansException bex) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
index 9b0b7a3..8ebdcbb 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusApplicationListenerTest.java
@@ -30,7 +30,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class BusApplicationListenerTest extends Assert {
-
+
@Test
public void testParentApplicationEvent() {
AbstractRefreshableApplicationContext parent = new ClassPathXmlApplicationContext();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
index 2c63150..7377566 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/BusDefinitionParserTest.java
@@ -40,12 +40,12 @@ import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class BusDefinitionParserTest extends Assert {
-
+
@Test
public void testFeatures() {
String cfgFile = "org/apache/cxf/bus/spring/bus.xml";
Bus bus = new SpringBusFactory().createBus(cfgFile, true);
-
+
List<Interceptor<? extends Message>> in = bus.getInInterceptors();
boolean found = false;
for (Interceptor<? extends Message> i : in) {
@@ -54,7 +54,7 @@ public class BusDefinitionParserTest extends Assert {
}
}
assertTrue("could not find logging interceptor.", found);
-
+
Collection<Feature> features = bus.getFeatures();
TestFeature tf = null;
for (Feature f : features) {
@@ -63,23 +63,23 @@ public class BusDefinitionParserTest extends Assert {
break;
}
}
-
+
assertNotNull(tf);
assertTrue("test feature has not been initialised", tf.initialised);
assertNotNull("test feature has not been injected", tf.testBean);
assertTrue("bean injected into test feature has not been initialised", tf.testBean.initialised);
}
-
+
@Test
public void testBusConfigure() {
ClassPathXmlApplicationContext context = null;
try {
context = new ClassPathXmlApplicationContext("org/apache/cxf/bus/spring/customerBus.xml");
Bus cxf1 = (Bus)context.getBean("cxf1");
-
+
assertTrue(cxf1.getOutInterceptors().size() == 1);
assertTrue(cxf1.getInInterceptors().size() == 0);
-
+
Bus cxf2 = (Bus)context.getBean("cxf2");
assertTrue(cxf2.getInInterceptors().size() == 1);
assertTrue(cxf2.getOutInterceptors().size() == 0);
@@ -96,15 +96,15 @@ public class BusDefinitionParserTest extends Assert {
try {
context = new ClassPathXmlApplicationContext("org/apache/cxf/bus/spring/customerBus2.xml");
Bus cxf1 = (Bus)context.getBean("cxf1");
-
+
assertTrue(cxf1.getOutInterceptors().size() == 1);
assertTrue(cxf1.getInInterceptors().size() == 0);
-
+
Bus cxf2 = (Bus)context.getBean("cxf2");
-
+
assertTrue(cxf2.getInInterceptors().size() == 1);
assertTrue(cxf2.getOutInterceptors().size() == 0);
-
+
cxf2.getExtension(BusLifeCycleManager.class)
.registerLifeCycleListener(new BusLifeCycleListener() {
public void initComplete() {
@@ -116,7 +116,7 @@ public class BusDefinitionParserTest extends Assert {
public void postShutdown() {
b.set(true);
}
-
+
});
} finally {
if (context != null) {
@@ -143,18 +143,18 @@ public class BusDefinitionParserTest extends Assert {
static class TestBean {
boolean initialised;
-
+
@PostConstruct
public void initialise() {
initialised = true;
}
}
-
+
static class TestFeature extends AbstractFeature {
-
+
boolean initialised;
TestBean testBean;
-
+
@PostConstruct
public void initialise() {
initialised = true;
@@ -164,5 +164,5 @@ public class BusDefinitionParserTest extends Assert {
testBean = tb;
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
index bf4a96a..d366dbf 100644
--- a/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
+++ b/core/src/test/java/org/apache/cxf/bus/spring/SpringBusFactoryTest.java
@@ -59,12 +59,12 @@ public class SpringBusFactoryTest extends Assert {
public void tearDown() {
BusFactory.setDefaultBus(null);
}
-
+
@Test
public void testDefault() {
Bus bus = new SpringBusFactory().createBus();
assertNotNull(bus);
- BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+ BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
assertNotNull("No binding factory manager", bfm);
assertNotNull("No configurer", bus.getExtension(Configurer.class));
assertNotNull("No resource manager", bus.getExtension(ResourceManager.class));
@@ -74,27 +74,27 @@ public class SpringBusFactoryTest extends Assert {
assertNotNull("No workqueue manager", bus.getExtension(WorkQueueManager.class));
assertNotNull("No lifecycle manager", bus.getExtension(BusLifeCycleManager.class));
assertNotNull("No service registry", bus.getExtension(ServerRegistry.class));
-
+
try {
bfm.getBindingFactory("http://cxf.apache.org/unknown");
} catch (BusException ex) {
// expected
}
-
+
assertEquals("Unexpected interceptors", 0, bus.getInInterceptors().size());
assertEquals("Unexpected interceptors", 0, bus.getInFaultInterceptors().size());
assertEquals("Unexpected interceptors", 0, bus.getOutInterceptors().size());
assertEquals("Unexpected interceptors", 0, bus.getOutFaultInterceptors().size());
}
-
+
@Test
public void testCustomFileName() {
String cfgFile = "org/apache/cxf/bus/spring/resources/bus-overwrite.xml";
Bus bus = new SpringBusFactory().createBus(cfgFile, true);
checkCustomerConfiguration(bus);
}
-
+
@Test
public void testCustomerBusShutdown() {
String cfgFile = "org/apache/cxf/bus/spring/customerBus.xml";
@@ -102,23 +102,23 @@ public class SpringBusFactoryTest extends Assert {
// We have three bus here, which should be closed rightly
bus.shutdown(true);
}
-
+
@Test
public void testCustomFileURLFromSystemProperty() {
- URL cfgFileURL = this.getClass().getResource("resources/bus-overwrite.xml");
+ URL cfgFileURL = this.getClass().getResource("resources/bus-overwrite.xml");
System.setProperty(Configurer.USER_CFG_FILE_PROPERTY_URL, cfgFileURL.toString());
Bus bus = new SpringBusFactory().createBus((String)null, true);
checkCustomerConfiguration(bus);
System.clearProperty(Configurer.USER_CFG_FILE_PROPERTY_URL);
}
-
+
@Test
public void testCustomFileURL() {
URL cfgFileURL = this.getClass().getResource("resources/bus-overwrite.xml");
Bus bus = new SpringBusFactory().createBus(cfgFileURL, true);
checkCustomerConfiguration(bus);
}
-
+
private void checkCustomerConfiguration(Bus bus) {
assertNotNull(bus);
List<Interceptor<? extends Message>> interceptors = bus.getInInterceptors();
@@ -135,7 +135,7 @@ public class SpringBusFactoryTest extends Assert {
assertEquals("Unexpected number of interceptors", 1, interceptors.size());
assertEquals("Unexpected interceptor", "out", interceptors.get(0).toString());
}
-
+
@Test
public void testForLifeCycle() {
BusLifeCycleListener bl = EasyMock.createMock(BusLifeCycleListener.class);
@@ -150,7 +150,7 @@ public class SpringBusFactoryTest extends Assert {
EasyMock.replay(bl);
bus.shutdown(true);
EasyMock.verify(bl);
-
+
}
@Test
@@ -176,42 +176,42 @@ public class SpringBusFactoryTest extends Assert {
assertTrue("@PreDestroy annoated method has been called already.", !te.preDestroyMethodCalled);
bus.shutdown(true);
assertTrue("@PreDestroy annotated method has not been called.", te.preDestroyMethodCalled);
-
+
}
@Test
public void testInitialisation() {
Bus bus = new SpringBusFactory().createBus("org/apache/cxf/bus/spring/init.xml");
- assertNotNull(bus.getExtension(TestListener.class));
+ assertNotNull(bus.getExtension(TestListener.class));
assertSame(bus, bus.getExtension(BusApplicationContext.class).getBean("cxf"));
}
-
+
static class TestInterceptor implements Interceptor<Message> {
private String name;
-
- TestInterceptor() {
+
+ TestInterceptor() {
}
-
+
public void setName(String n) {
name = n;
}
-
+
@Override
public String toString() {
return name;
}
-
- public void handleFault(Message message) {
+
+ public void handleFault(Message message) {
}
- public void handleMessage(Message message) throws Fault {
+ public void handleMessage(Message message) throws Fault {
}
-
- public void postHandleMessage(Message message) throws Fault {
+
+ public void postHandleMessage(Message message) throws Fault {
}
-
+
}
static class TestExtension {
@@ -222,7 +222,7 @@ public class SpringBusFactoryTest extends Assert {
TestExtension(Bus bus) {
bus.setExtension(this, TestExtension.class);
}
-
+
@PostConstruct
void postConstructMethod() {
postConstructMethodCalled = true;
@@ -233,7 +233,7 @@ public class SpringBusFactoryTest extends Assert {
preDestroyMethodCalled = true;
}
}
-
+
static class TestFeature extends AbstractFeature {
boolean initialised;
TestFeature() {
@@ -243,30 +243,30 @@ public class SpringBusFactoryTest extends Assert {
@Override
public void initialize(Bus bus) {
initialised = true;
- }
+ }
}
-
+
static class TestListener implements BusLifeCycleListener {
Bus bus;
-
+
@Resource
- public void setBus(Bus b) {
- bus = b;
+ public void setBus(Bus b) {
+ bus = b;
}
-
+
@PostConstruct
public void register() {
- bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(this);
+ bus.getExtension(BusLifeCycleManager.class).registerLifeCycleListener(this);
}
-
+
public void initComplete() {
assertNull(bus.getExtension(TestFeature.class));
Collection<Feature> features = bus.getFeatures();
assertEquals(1, features.size());
TestFeature tf = (TestFeature)features.iterator().next();
assertTrue(tf.initialised);
- bus.setExtension(this, TestListener.class);
+ bus.setExtension(this, TestListener.class);
}
public void postShutdown() {
@@ -274,6 +274,6 @@ public class SpringBusFactoryTest extends Assert {
public void preShutdown() {
}
-
- }
+
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
index cd68169..6e65590 100644
--- a/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
+++ b/core/src/test/java/org/apache/cxf/buslifecycle/CXFBusLifeCycleManagerTest.java
@@ -48,13 +48,13 @@ public class CXFBusLifeCycleManagerTest extends Assert {
mgr.postShutdown();
EasyMock.verify(listener1);
}
-
+
@Test
public void testSingleListenerRegistration() {
BusLifeCycleListener listener1 = EasyMock.createMock(BusLifeCycleListener.class);
CXFBusLifeCycleManager mgr = new CXFBusLifeCycleManager();
-
+
mgr.registerLifeCycleListener(listener1);
EasyMock.reset(listener1);
@@ -73,35 +73,35 @@ public class CXFBusLifeCycleManagerTest extends Assert {
listener1.postShutdown();
EasyMock.replay(listener1);
mgr.postShutdown();
- EasyMock.verify(listener1);
+ EasyMock.verify(listener1);
}
-
+
@Test
public void testMultipleListeners() {
-
+
IMocksControl ctrl = EasyMock.createStrictControl();
-
+
BusLifeCycleListener listener1 = ctrl.createMock(BusLifeCycleListener.class);
BusLifeCycleListener listener2 = ctrl.createMock(BusLifeCycleListener.class);
CXFBusLifeCycleManager mgr = new CXFBusLifeCycleManager();
mgr.registerLifeCycleListener(listener1);
mgr.registerLifeCycleListener(listener2);
-
+
ctrl.reset();
listener1.initComplete();
listener2.initComplete();
ctrl.replay();
mgr.initComplete();
ctrl.verify();
-
+
ctrl.reset();
listener2.preShutdown();
listener1.preShutdown();
ctrl.replay();
mgr.preShutdown();
ctrl.verify();
-
+
ctrl.reset();
listener2.postShutdown();
listener1.postShutdown();
@@ -109,12 +109,12 @@ public class CXFBusLifeCycleManagerTest extends Assert {
mgr.postShutdown();
ctrl.verify();
}
-
+
@Test
public void testDeregistration() {
-
+
IMocksControl ctrl = EasyMock.createStrictControl();
-
+
BusLifeCycleListener listener1 = ctrl.createMock(BusLifeCycleListener.class);
BusLifeCycleListener listener2 = ctrl.createMock(BusLifeCycleListener.class);
CXFBusLifeCycleManager mgr = new CXFBusLifeCycleManager();
@@ -122,19 +122,19 @@ public class CXFBusLifeCycleManagerTest extends Assert {
mgr.registerLifeCycleListener(listener2);
mgr.registerLifeCycleListener(listener1);
mgr.unregisterLifeCycleListener(listener2);
-
+
ctrl.reset();
listener1.initComplete();
ctrl.replay();
mgr.initComplete();
ctrl.verify();
-
+
ctrl.reset();
listener1.preShutdown();
ctrl.replay();
mgr.preShutdown();
ctrl.verify();
-
+
ctrl.reset();
listener1.postShutdown();
ctrl.replay();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
index fca985f..8390e51 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotatedGreeterImpl.java
@@ -33,16 +33,16 @@ import javax.xml.ws.WebServiceContext;
import org.apache.cxf.common.logging.LogUtils;
-@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
+@javax.jws.WebService(name = "Greeter", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap_http")
@HandlerChain(name = "TestHandlerChain", file = "handlers.xml")
public class AnnotatedGreeterImpl {
- private static final Logger LOG =
+ private static final Logger LOG =
LogUtils.getL7dLogger(AnnotatedGreeterImpl.class);
@Resource
- private int foo;
+ private int foo;
private WebServiceContext context;
@@ -106,7 +106,7 @@ public class AnnotatedGreeterImpl {
incrementInvocationCount("greetMe");
return "Bonjour " + me + "!";
}
-
+
@WebMethod
@RequestWrapper(className = "org.apache.hello_world_soap_http.types.GreetMeOneWay",
localName = "greetMeOneWay",
@@ -117,11 +117,11 @@ public class AnnotatedGreeterImpl {
System.out.println("That was OneWay to say hello");
}
- public void testDocLitFault(String faultType) {
+ public void testDocLitFault(String faultType) {
}
@Resource
- public void setContext(WebServiceContext ctx) {
+ public void setContext(WebServiceContext ctx) {
context = ctx;
}
@@ -130,12 +130,12 @@ public class AnnotatedGreeterImpl {
}
/**
- * stop eclipse from whinging
+ * stop eclipse from whinging
*/
- public int getFoo() {
+ public int getFoo() {
return foo;
}
-
+
private void incrementInvocationCount(String method) {
LOG.info("Executing " + method);
int n = invocationCount.get(method);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
index 28335b6..7967cbe 100644
--- a/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
+++ b/core/src/test/java/org/apache/cxf/common/annotation/AnnotationProcessorTest.java
@@ -38,79 +38,79 @@ import org.junit.Test;
public class AnnotationProcessorTest extends Assert {
- AnnotatedGreeterImpl greeterImpl = new AnnotatedGreeterImpl();
- AnnotationProcessor processor = new AnnotationProcessor(greeterImpl);
- List<Class<? extends Annotation>> expectedAnnotations = new ArrayList<Class<? extends Annotation>>();
+ AnnotatedGreeterImpl greeterImpl = new AnnotatedGreeterImpl();
+ AnnotationProcessor processor = new AnnotationProcessor(greeterImpl);
+ List<Class<? extends Annotation>> expectedAnnotations = new ArrayList<Class<? extends Annotation>>();
AnnotationVisitor visitor = EasyMock.createMock(AnnotationVisitor.class);
-
+
@Before
- public void setUp() {
- EasyMock.checkOrder(visitor, false);
- }
+ public void setUp() {
+ EasyMock.checkOrder(visitor, false);
+ }
@Test
- public void testVisitClass() {
+ public void testVisitClass() {
expectedAnnotations.add(WebService.class);
prepareCommonExpectations(visitor);
- visitor.visitClass(EasyMock.eq(AnnotatedGreeterImpl.class),
+ visitor.visitClass(EasyMock.eq(AnnotatedGreeterImpl.class),
EasyMock.isA(WebService.class));
runProcessor(visitor);
- }
+ }
@Test
- public void testVisitField() throws Exception {
+ public void testVisitField() throws Exception {
- Field expectedField = AnnotatedGreeterImpl.class.getDeclaredField("foo");
+ Field expectedField = AnnotatedGreeterImpl.class.getDeclaredField("foo");
expectedAnnotations.add(Resource.class);
prepareCommonExpectations(visitor);
- visitor.visitField(EasyMock.eq(expectedField),
+ visitor.visitField(EasyMock.eq(expectedField),
EasyMock.isA(Resource.class));
visitor.visitMethod((Method)EasyMock.anyObject(), (Annotation)EasyMock.anyObject());
runProcessor(visitor);
-
- }
+
+ }
@Test
public void testVisitMethod() throws Exception {
- Field expectedField = AnnotatedGreeterImpl.class.getDeclaredField("foo");
- Method expectedMethod1 = AnnotatedGreeterImpl.class.getDeclaredMethod("sayHi");
- Method expectedMethod2 = AnnotatedGreeterImpl.class.getDeclaredMethod("sayHi", String.class);
- Method expectedMethod3 = AnnotatedGreeterImpl.class.getDeclaredMethod("greetMe", String.class);
- Method expectedMethod4 =
- AnnotatedGreeterImpl.class.getDeclaredMethod("setContext", WebServiceContext.class);
+ Field expectedField = AnnotatedGreeterImpl.class.getDeclaredField("foo");
+ Method expectedMethod1 = AnnotatedGreeterImpl.class.getDeclaredMethod("sayHi");
+ Method expectedMethod2 = AnnotatedGreeterImpl.class.getDeclaredMethod("sayHi", String.class);
+ Method expectedMethod3 = AnnotatedGreeterImpl.class.getDeclaredMethod("greetMe", String.class);
+ Method expectedMethod4 =
+ AnnotatedGreeterImpl.class.getDeclaredMethod("setContext", WebServiceContext.class);
Method expectedMethod5 = AnnotatedGreeterImpl.class.getDeclaredMethod("greetMeOneWay", String.class);
expectedAnnotations.add(WebMethod.class);
- expectedAnnotations.add(Resource.class);
+ expectedAnnotations.add(Resource.class);
prepareCommonExpectations(visitor);
- visitor.visitField(EasyMock.eq(expectedField),
+ visitor.visitField(EasyMock.eq(expectedField),
EasyMock.isA(Resource.class));
- visitor.visitMethod(EasyMock.eq(expectedMethod1),
+ visitor.visitMethod(EasyMock.eq(expectedMethod1),
EasyMock.isA(WebMethod.class));
- visitor.visitMethod(EasyMock.eq(expectedMethod2),
+ visitor.visitMethod(EasyMock.eq(expectedMethod2),
EasyMock.isA(WebMethod.class));
- visitor.visitMethod(EasyMock.eq(expectedMethod3),
+ visitor.visitMethod(EasyMock.eq(expectedMethod3),
EasyMock.isA(WebMethod.class));
- visitor.visitMethod(EasyMock.eq(expectedMethod4),
+ visitor.visitMethod(EasyMock.eq(expectedMethod4),
EasyMock.isA(Resource.class));
- visitor.visitMethod(EasyMock.eq(expectedMethod5),
+ visitor.visitMethod(EasyMock.eq(expectedMethod5),
EasyMock.isA(WebMethod.class));
runProcessor(visitor);
}
@Test
- public void testProcessorInvalidConstructorArgs() {
-
+ public void testProcessorInvalidConstructorArgs() {
+
try {
- new AnnotationProcessor(null);
+ new AnnotationProcessor(null);
fail("did not get expected argument");
} catch (IllegalArgumentException e) {
// happy
@@ -119,7 +119,7 @@ public class AnnotationProcessorTest extends Assert {
}
@Test
- public void testProcessorInvalidAcceptArg() {
+ public void testProcessorInvalidAcceptArg() {
try {
processor.accept(null);
@@ -128,7 +128,7 @@ public class AnnotationProcessorTest extends Assert {
// happy
}
- }
+ }
private void prepareCommonExpectations(AnnotationVisitor v) {
@@ -137,10 +137,10 @@ public class AnnotationProcessorTest extends Assert {
v.setTarget(greeterImpl);
}
- private void runProcessor(AnnotationVisitor v) {
- EasyMock.replay(v);
+ private void runProcessor(AnnotationVisitor v) {
+ EasyMock.replay(v);
processor.accept(v);
- EasyMock.verify(v);
- }
+ EasyMock.verify(v);
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
index 1ee7305..1c4019f 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/BundleUtilsTest.java
@@ -40,13 +40,13 @@ public class BundleUtilsTest extends Assert {
public void testGetBundle() throws Exception {
ResourceBundle bundle = BundleUtils.getBundle(getClass());
assertNotNull("expected resource bundle", bundle);
- assertEquals("unexpected resource",
+ assertEquals("unexpected resource",
"localized message",
bundle.getString("I18N_MSG"));
ResourceBundle nonDefaultBundle = BundleUtils.getBundle(getClass(), "Messages");
assertNotNull("expected resource bundle", nonDefaultBundle);
- assertEquals("unexpected resource",
+ assertEquals("unexpected resource",
"localized message",
- nonDefaultBundle.getString("I18N_MSG"));
+ nonDefaultBundle.getString("I18N_MSG"));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
index 1fe7428..1585b48 100644
--- a/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
+++ b/core/src/test/java/org/apache/cxf/common/i18n/MessageTest.java
@@ -33,16 +33,16 @@ import org.junit.Test;
public class MessageTest extends Assert {
private static final Logger LOG = LogUtils.getL7dLogger(MessageTest.class);
-
+
@Test
public void testMessageWithLoggerBundle() throws Exception {
Message msg = new Message("SUB1_EXC", LOG, new Object[] {1});
assertSame("unexpected resource bundle",
LOG.getResourceBundle(),
msg.bundle);
- assertEquals("unexpected message string",
- "subbed in 1 only",
- msg.toString());
+ assertEquals("unexpected message string",
+ "subbed in 1 only",
+ msg.toString());
}
@Test
@@ -50,11 +50,11 @@ public class MessageTest extends Assert {
ResourceBundle bundle = BundleUtils.getBundle(getClass());
Message msg = new Message("SUB2_EXC", bundle, new Object[] {3, 4});
assertSame("unexpected resource bundle", bundle, msg.bundle);
- assertEquals("unexpected message string",
+ assertEquals("unexpected message string",
"subbed in 4 & 3",
- msg.toString());
+ msg.toString());
}
-
+
@Test
public void testExceptionIO() throws java.lang.Exception {
ResourceBundle bundle = BundleUtils.getBundle(getClass());
@@ -64,13 +64,13 @@ public class MessageTest extends Assert {
ByteArrayOutputStream bout = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(bout);
out.writeObject(ex);
-
+
ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
ObjectInputStream in = new ObjectInputStream(bin);
Object o = in.readObject();
assertTrue(o instanceof UncheckedException);
UncheckedException ex2 = (UncheckedException)o;
assertEquals("subbed in 4 & 3", ex2.getMessage());
-
+
}
}
[46/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
index dcbe9fc..542e7ce 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextCache.java
@@ -47,16 +47,16 @@ import org.apache.cxf.common.util.CachedClass;
import org.apache.cxf.common.util.StringUtils;
/**
- *
+ *
*/
-public final class JAXBContextCache {
-
+public final class JAXBContextCache {
+
/**
* Return holder of the context, classes, etc...
* Do NOT hold onto these strongly as that can lock the JAXBContext and Set<Class> objects
* into memory. It preferred to grab the context and classes (if needed) from this object
* immediately after the call to getCachedContextAndSchemas and then discard it. The
- * main purpose of this class is to hold onto the context/set strongly until the caller
+ * main purpose of this class is to hold onto the context/set strongly until the caller
* has a chance to copy those into a place where they can hold onto it strongly as
* needed.
*/
@@ -89,7 +89,7 @@ public final class JAXBContextCache {
i.setSchemas(schemas);
}
}
-
+
}
private static final class CachedContextAndSchemasInternal {
private final WeakReference<JAXBContext> context;
@@ -115,16 +115,16 @@ public final class JAXBContextCache {
public void setSchemas(Collection<DOMSource> schemas) {
this.schemas = schemas;
}
- }
-
+ }
+
private static final Map<Set<Class<?>>, Map<String, CachedContextAndSchemasInternal>> JAXBCONTEXT_CACHE
= new CacheMap<Set<Class<?>>, Map<String, CachedContextAndSchemasInternal>>();
private static final Map<Package, CachedClass> OBJECT_FACTORY_CACHE
= new CacheMap<Package, CachedClass>();
-
+
private static final boolean HAS_MOXY;
-
+
static {
boolean b = false;
try {
@@ -135,11 +135,11 @@ public final class JAXBContextCache {
}
HAS_MOXY = b;
}
-
+
private JAXBContextCache() {
//utility class
}
-
+
/**
* Clear any caches to make sure new contexts are created
*/
@@ -155,7 +155,7 @@ public final class JAXBContextCache {
public static void scanPackages(Set<Class<?>> classes) {
JAXBUtils.scanPackages(classes, OBJECT_FACTORY_CACHE);
}
-
+
public static CachedContextAndSchemas getCachedContextAndSchemas(Class<?> ... cls) throws JAXBException {
Set<Class<?>> classes = new HashSet<Class<?>>();
for (Class<?> c : cls) {
@@ -164,16 +164,16 @@ public final class JAXBContextCache {
scanPackages(classes);
return JAXBContextCache.getCachedContextAndSchemas(classes, null, null, null, false);
}
-
+
public static CachedContextAndSchemas getCachedContextAndSchemas(String pkg,
Map<String, Object> props,
- ClassLoader loader)
+ ClassLoader loader)
throws JAXBException {
Set<Class<?>> classes = new HashSet<Class<?>>();
addPackage(classes, pkg, loader);
return getCachedContextAndSchemas(classes, null, props, null, true);
}
-
+
public static CachedContextAndSchemas getCachedContextAndSchemas(final Set<Class<?>> classes,
String defaultNs,
Map<String, Object> props,
@@ -204,7 +204,7 @@ public final class JAXBContextCache {
Map<String, CachedContextAndSchemasInternal> cachedContextAndSchemasInternalMap = null;
if (typeRefs == null || typeRefs.isEmpty()) {
synchronized (JAXBCONTEXT_CACHE) {
-
+
if (exact) {
cachedContextAndSchemasInternalMap
= JAXBCONTEXT_CACHE.get(classes);
@@ -212,7 +212,7 @@ public final class JAXBContextCache {
cachedContextAndSchemasInternal = cachedContextAndSchemasInternalMap.get(defaultNs);
}
} else {
- for (Entry<Set<Class<?>>, Map<String, CachedContextAndSchemasInternal>> k
+ for (Entry<Set<Class<?>>, Map<String, CachedContextAndSchemasInternal>> k
: JAXBCONTEXT_CACHE.entrySet()) {
Set<Class<?>> key = k.getKey();
if (key != null && key.containsAll(classes)) {
@@ -242,7 +242,7 @@ public final class JAXBContextCache {
try {
context = createContext(classes, map, typeRefs);
} catch (JAXBException ex) {
- // load jaxb needed class and try to create jaxb context
+ // load jaxb needed class and try to create jaxb context
boolean added = addJaxbObjectFactory(ex, classes);
if (added) {
try {
@@ -264,10 +264,10 @@ public final class JAXBContextCache {
synchronized (JAXBCONTEXT_CACHE) {
if (typeRefs == null || typeRefs.isEmpty()) {
if (cachedContextAndSchemasInternalMap == null) {
- cachedContextAndSchemasInternalMap
+ cachedContextAndSchemasInternalMap
= new CacheMap<String, CachedContextAndSchemasInternal>();
- }
- cachedContextAndSchemasInternalMap.put((defaultNs != null) ? defaultNs : "",
+ }
+ cachedContextAndSchemasInternalMap.put((defaultNs != null) ? defaultNs : "",
cachedContextAndSchemasInternal);
JAXBCONTEXT_CACHE.put(classes, cachedContextAndSchemasInternalMap);
}
@@ -275,7 +275,7 @@ public final class JAXBContextCache {
return new CachedContextAndSchemas(context, classes, cachedContextAndSchemasInternal);
}
-
+
private static boolean checkObjectFactoryNamespaces(Class<?> clz) {
for (Method meth : clz.getMethods()) {
XmlElementDecl decl = meth.getAnnotation(XmlElementDecl.class);
@@ -288,8 +288,8 @@ public final class JAXBContextCache {
return false;
}
-
-
+
+
private static JAXBContext createContext(final Set<Class<?>> classes,
final Map<String, Object> map,
Collection<Object> typeRefs)
@@ -404,7 +404,7 @@ public final class JAXBContextCache {
if (!StringUtils.isEmpty(pkg)) {
pkg += ".";
}
-
+
String line = reader.readLine();
while (line != null) {
line = line.trim();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java
index 5115aca..729baf0 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBContextProxy.java
@@ -20,7 +20,7 @@
package org.apache.cxf.common.jaxb;
/**
- *
+ *
*/
public interface JAXBContextProxy {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index fdbe147..3e42b20 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -93,7 +93,7 @@ import org.apache.cxf.helpers.JavaUtils;
public final class JAXBUtils {
public static final Logger LOG = LogUtils.getL7dLogger(JAXBUtils.class);
-
+
public enum IdentifierType {
CLASS,
INTERFACE,
@@ -102,12 +102,12 @@ public final class JAXBUtils {
VARIABLE,
CONSTANT
};
-
+
public static final String JAXB_URI = "http://java.sun.com/xml/ns/jaxb";
-
-
+
+
private static final char[] XML_NAME_PUNCTUATION_CHARS = new char[] {
- /* hyphen */ '\u002D',
+ /* hyphen */ '\u002D',
/* period */ '\u002E',
/* colon */'\u003A',
/* dot */ '\u00B7',
@@ -116,15 +116,15 @@ public final class JAXBUtils {
/* arabic start of rub el hizb */'\u06DE',
/* underscore */ '\u005F',
};
-
+
private static final String XML_NAME_PUNCTUATION_STRING = new String(XML_NAME_PUNCTUATION_CHARS);
-
+
private static final Map<String, String> BUILTIN_DATATYPES_MAP;
private static final Map<String, Class<?>> HOLDER_TYPES_MAP;
private static ClassLoader jaxbXjcLoader;
static {
- BUILTIN_DATATYPES_MAP = new HashMap<String, String>();
+ BUILTIN_DATATYPES_MAP = new HashMap<String, String>();
BUILTIN_DATATYPES_MAP.put("string", "java.lang.String");
BUILTIN_DATATYPES_MAP.put("integer", "java.math.BigInteger");
BUILTIN_DATATYPES_MAP.put("int", "int");
@@ -152,7 +152,7 @@ public final class JAXBUtils {
BUILTIN_DATATYPES_MAP.put("duration", "javax.xml.datatype.Duration");
BUILTIN_DATATYPES_MAP.put("NOTATION", "javax.xml.namespace.QName");
BUILTIN_DATATYPES_MAP.put("string", "java.lang.String");
-
+
HOLDER_TYPES_MAP = new HashMap<String, Class<?>>();
HOLDER_TYPES_MAP.put("int", java.lang.Integer.class);
HOLDER_TYPES_MAP.put("long", java.lang.Long.class);
@@ -162,15 +162,15 @@ public final class JAXBUtils {
HOLDER_TYPES_MAP.put("boolean", java.lang.Boolean.class);
HOLDER_TYPES_MAP.put("byte", java.lang.Byte.class);
}
-
-
+
+
/**
* prevents instantiation
*
*/
private JAXBUtils() {
}
-
+
public static void closeUnmarshaller(Unmarshaller u) {
if (u instanceof Closeable) {
//need to do this to clear the ThreadLocal cache
@@ -231,18 +231,18 @@ public final class JAXBUtils {
closeUnmarshaller(u);
}
}
-
+
public static String builtInTypeToJavaType(String type) {
return BUILTIN_DATATYPES_MAP.get(type);
}
-
+
public static Class<?> holderClass(String type) {
return HOLDER_TYPES_MAP.get(type);
}
-
- /**
+
+ /**
* Checks if the specified word is a Java keyword (as defined in JavaUtils).
- *
+ *
* @param word the word to check.
* @return true if the word is a keyword.
* @see org.apache.cxf.helpers.JavaUtils
@@ -254,7 +254,7 @@ public final class JAXBUtils {
/**
* Generates a Java package name from a URI according to the
* algorithm outlined in JAXB 2.0.
- *
+ *
* @param namespaceURI the namespace URI.
* @return the package name.
*/
@@ -265,23 +265,23 @@ public final class JAXBUtils {
return null;
}
}
-
+
/**
* Generates a Java package name from a URI according to the
* algorithm outlined in Appendix D of JAXB (2.0+).
- *
+ *
* @param uri the namespace URI.
* @return the package name.
*/
public static String nameSpaceURIToPackage(URI uri) {
-
+
StringBuilder packageName = new StringBuilder();
String authority = uri.getAuthority();
String scheme = uri.getScheme();
if (authority == null && "urn".equals(scheme)) {
authority = uri.getSchemeSpecificPart();
}
-
+
if (null != authority && !"".equals(authority)) {
if ("urn".equals(scheme)) {
packageName.append(authority);
@@ -289,11 +289,11 @@ public final class JAXBUtils {
for (int i = 0; i < packageName.length(); i++) {
if (packageName.charAt(i) == '-') {
packageName.setCharAt(i, '.');
- }
+ }
}
authority = packageName.toString();
packageName.setLength(0);
-
+
StringTokenizer st = new StringTokenizer(authority, ":");
while (st.hasMoreTokens()) {
String token = st.nextToken();
@@ -306,9 +306,9 @@ public final class JAXBUtils {
}
authority = packageName.toString();
packageName.setLength(0);
-
- }
-
+
+ }
+
StringTokenizer st = new StringTokenizer(authority, ".");
if (st.hasMoreTokens()) {
String token = null;
@@ -324,12 +324,12 @@ public final class JAXBUtils {
packageName.insert(0, normalizePackageNamePart(token));
}
}
-
+
if (!("http".equalsIgnoreCase(scheme) || "urn".equalsIgnoreCase(scheme))) {
packageName.insert(0, ".");
packageName.insert(0, normalizePackageNamePart(scheme));
}
-
+
}
String path = uri.getPath();
@@ -342,7 +342,7 @@ public final class JAXBUtils {
index = path.length();
} else {
String ending = path.substring(index + 1);
- if (ending.length() < 2 || (ending.length() > 3
+ if (ending.length() < 2 || (ending.length() > 3
&& !"html".equalsIgnoreCase(ending))) {
index = path.length();
}
@@ -357,36 +357,36 @@ public final class JAXBUtils {
}
return packageName.toString();
}
-
+
private static String normalizePackageNamePart(String name) {
StringBuilder sname = new StringBuilder(name.toLowerCase());
for (int i = 0; i < sname.length(); i++) {
sname.setCharAt(i, Character.toLowerCase(sname.charAt(i)));
}
-
+
for (int i = 0; i < sname.length(); i++) {
if (!Character.isJavaIdentifierPart(sname.charAt(i))) {
sname.setCharAt(i, '_');
}
}
-
+
if (isJavaKeyword(sname.toString())) {
sname.insert(0, '_');
}
-
+
if (!Character.isJavaIdentifierStart(sname.charAt(0))) {
- sname.insert(0, '_');
+ sname.insert(0, '_');
}
-
+
return sname.toString();
}
-
-
+
+
/**
* Converts an XML name to a Java identifier according to the mapping
* algorithm outlined in the JAXB specification
- *
+ *
* @param name the XML name
* @return the Java identifier
*/
@@ -406,31 +406,31 @@ public final class JAXBUtils {
for (int i = 1; i < name.length() && legalIdentifier; i++) {
legalIdentifier = legalIdentifier && Character.isJavaIdentifierPart(buf.charAt(i));
}
-
- boolean conventionalIdentifier = isConventionalIdentifier(buf, type);
+
+ boolean conventionalIdentifier = isConventionalIdentifier(buf, type);
if (legalIdentifier && conventionalIdentifier) {
if (JAXBUtils.isJavaKeyword(name) && type == IdentifierType.VARIABLE) {
name = normalizePackageNamePart(name);
}
return name;
}
-
- // split into words
+
+ // split into words
List<String> words = new ArrayList<>();
StringTokenizer st = new StringTokenizer(name, XML_NAME_PUNCTUATION_STRING);
while (st.hasMoreTokens()) {
words.add(st.nextToken());
- }
+ }
for (int i = 0; i < words.size(); i++) {
splitWord(words, i);
}
-
+
return makeConventionalIdentifier(words, type);
}
-
+
private static void splitWord(List<String> words, int listIndex) {
String word = words.get(listIndex);
if (word.length() <= 1) {
@@ -444,34 +444,34 @@ public final class JAXBUtils {
sword.setCharAt(first, Character.toUpperCase(firstChar));
}
int i = 1;
-
- while (i < sword.length()) {
+
+ while (i < sword.length()) {
if (Character.isDigit(firstChar)) {
while (i < sword.length() && Character.isDigit(sword.charAt(i))) {
i++;
}
} else if (isCasedLetter(firstChar)) {
- boolean previousIsLower = Character.isLowerCase(firstChar);
+ boolean previousIsLower = Character.isLowerCase(firstChar);
while (i < sword.length() && isCasedLetter(sword.charAt(i))) {
if (Character.isUpperCase(sword.charAt(i)) && previousIsLower) {
break;
- }
+ }
previousIsLower = Character.isLowerCase(sword.charAt(i));
i++;
- }
- } else {
+ }
+ } else {
// first must be a mark or an uncased letter
while (i < sword.length() && (isMark(sword.charAt(i)) || !isCasedLetter(sword.charAt(i)))) {
i++;
- }
+ }
}
-
+
// characters from first to i are all either
// * digits
// * upper or lower case letters, with only the first one an upper
// * uncased letters or marks
-
-
+
+
String newWord = sword.substring(first, i);
words.add(index, newWord);
index++;
@@ -482,20 +482,20 @@ public final class JAXBUtils {
firstChar = sword.charAt(first);
}
}
-
+
if (index > (listIndex + 1)) {
words.remove(listIndex);
}
}
-
+
private static boolean isMark(char c) {
return Character.isJavaIdentifierPart(c) && !Character.isLetter(c) && !Character.isDigit(c);
}
-
+
private static boolean isCasedLetter(char c) {
return Character.isUpperCase(c) || Character.isLowerCase(c);
}
-
+
private static boolean isConventionalIdentifier(StringBuilder buf, IdentifierType type) {
if (null == buf || buf.length() == 0) {
return false;
@@ -504,7 +504,7 @@ public final class JAXBUtils {
if (IdentifierType.CONSTANT == type) {
for (int i = 0; i < buf.length(); i++) {
if (Character.isLowerCase(buf.charAt(i))) {
- return false;
+ return false;
}
}
result = true;
@@ -512,11 +512,11 @@ public final class JAXBUtils {
result = Character.isLowerCase(buf.charAt(0));
} else {
int pos = 3;
- if (IdentifierType.GETTER == type
- && !(buf.length() >= pos
+ if (IdentifierType.GETTER == type
+ && !(buf.length() >= pos
&& "get".equals(buf.subSequence(0, 3)))) {
return false;
- } else if (IdentifierType.SETTER == type
+ } else if (IdentifierType.SETTER == type
&& !(buf.length() >= pos && "set".equals(buf.subSequence(0, 3)))) {
return false;
} else {
@@ -526,7 +526,7 @@ public final class JAXBUtils {
}
return result;
}
-
+
private static String makeConventionalIdentifier(List<String> words, IdentifierType type) {
StringBuilder buf = new StringBuilder();
boolean firstWord = true;
@@ -545,7 +545,7 @@ public final class JAXBUtils {
if (IdentifierType.CONSTANT == type) {
for (int i = l; i < buf.length(); i++) {
if (Character.isLowerCase(buf.charAt(i))) {
- buf.setCharAt(i, Character.toUpperCase(buf.charAt(i)));
+ buf.setCharAt(i, Character.toUpperCase(buf.charAt(i)));
}
}
} else if (IdentifierType.VARIABLE == type) {
@@ -561,7 +561,7 @@ public final class JAXBUtils {
}
return buf.toString();
}
-
+
public static Class<?> getValidClass(Class<?> cls) {
if (cls.isEnum()) {
return cls;
@@ -599,7 +599,7 @@ public final class JAXBUtils {
Class.forName("com.sun.tools.internal.xjc.api.XJC");
jaxbXjcLoader = ClassLoader.getSystemClassLoader();
} catch (Exception t2) {
- //couldn't find either, probably cause tools.jar isn't on
+ //couldn't find either, probably cause tools.jar isn't on
//the classpath. Let's see if we can find the tools jar
String s = SystemPropertyAction.getProperty("java.home");
if (!StringUtils.isEmpty(s)) {
@@ -617,11 +617,11 @@ public final class JAXBUtils {
}
}
}
- }
+ }
}
return jaxbXjcLoader;
}
-
+
public static Object setNamespaceMapper(final Map<String, String> nspref,
Marshaller marshaller) throws PropertyException {
Object mapper = createNamespaceWrapper(marshaller.getClass(), nspref);
@@ -656,8 +656,8 @@ public final class JAXBUtils {
pkg = "com.sun.xml.internal.bind.";
refClass = Class.forName(pkg + "api.TypeReference", true, getXJCClassLoader());
}
- Object ref = refClass.getConstructor(QName.class,
- Type.class,
+ Object ref = refClass.getConstructor(QName.class,
+ Type.class,
anns.getClass()).newInstance(qname, refcls, anns);
List<Object> typeRefs = new ArrayList<>();
typeRefs.add(ref);
@@ -666,21 +666,21 @@ public final class JAXBUtils {
if (!refcls.isInterface()) {
clses.add(refcls);
}
-
+
Object ctx = null;
for (Method m : cls.getDeclaredMethods()) {
if (m.getName().equals("newInstance")
&& m.getParameterTypes().length == 6) {
ctx = m.invoke(null, clses.toArray(new Class[clses.size()]),
typeRefs, null, null, true, null);
-
+
}
}
if (ctx == null) {
throw new JAXBException("No ctx found");
}
-
+
Object bridge = ctx.getClass().getMethod("createBridge", refClass).invoke(ctx, ref);
return ReflectionInvokationHandler.createProxyWrapper(bridge,
BridgeWrapper.class);
@@ -702,8 +702,8 @@ public final class JAXBUtils {
void marshal(Object elValue, Node source, AttachmentMarshaller am) throws JAXBException;
}
-
-
+
+
public static SchemaCompiler createSchemaCompiler() throws JAXBException {
try {
Class<?> cls;
@@ -715,7 +715,7 @@ public final class JAXBUtils {
cls = Class.forName("com.sun.tools.internal.xjc.api.XJC", true, getXJCClassLoader());
sc = cls.getMethod("createSchemaCompiler").invoke(null);
}
-
+
return ReflectionInvokationHandler.createProxyWrapper(sc,
SchemaCompiler.class);
} catch (Exception ex) {
@@ -724,7 +724,7 @@ public final class JAXBUtils {
}
public static SchemaCompiler createSchemaCompilerWithDefaultAllocator(Set<String> allocatorSet) {
-
+
try {
SchemaCompiler compiler = JAXBUtils.createSchemaCompiler();
Object allocator = ReflectionInvokationHandler
@@ -732,23 +732,23 @@ public final class JAXBUtils {
JAXBUtils.getParamClass(compiler, "setClassNameAllocator"));
compiler.setClassNameAllocator(allocator);
- return compiler;
+ return compiler;
} catch (JAXBException e1) {
throw new IllegalStateException("Unable to create schema compiler", e1);
}
-
+
}
-
+
public static void logGeneratedClassNames(Logger logger, JCodeModel codeModel) {
if (!logger.isLoggable(Level.INFO)) {
return;
}
-
+
StringBuilder sb = new StringBuilder();
boolean first = true;
for (Iterator<JPackage> itr = codeModel.packages(); itr.hasNext();) {
JPackage package1 = itr.next();
-
+
for (Iterator<JDefinedClass> citr = package1.classes(); citr.hasNext();) {
if (!first) {
sb.append(", ");
@@ -758,15 +758,15 @@ public final class JAXBUtils {
sb.append(citr.next().fullName());
}
}
-
+
logger.log(Level.INFO, "Created classes: " + sb.toString());
}
-
+
public static List<String> getGeneratedClassNames(JCodeModel codeModel) {
List<String> classes = new ArrayList<>();
for (Iterator<JPackage> itr = codeModel.packages(); itr.hasNext();) {
JPackage package1 = itr.next();
-
+
for (Iterator<JDefinedClass> citr = package1.classes(); citr.hasNext();) {
classes.add(citr.next().fullName());
}
@@ -799,7 +799,7 @@ public final class JAXBUtils {
throw new JAXBException(ex);
}
}
-
+
public static Class<?> getParamClass(SchemaCompiler sc, String method) {
Object o = ((ReflectionInvokationHandler)Proxy.getInvocationHandler(sc)).getTarget();
for (Method m : o.getClass().getMethods()) {
@@ -809,8 +809,8 @@ public final class JAXBUtils {
}
return null;
}
-
-
+
+
public static List<DOMResult> generateJaxbSchemas(
JAXBContext context, final Map<String, DOMResult> builtIns) throws IOException {
final List<DOMResult> results = new ArrayList<>();
@@ -819,7 +819,7 @@ public final class JAXBUtils {
@Override
public Result createOutput(String ns, String file) throws IOException {
DOMResult result = new DOMResult();
-
+
if (builtIns.containsKey(ns)) {
DOMResult dr = builtIns.get(ns);
result.setSystemId(dr.getSystemId());
@@ -833,11 +833,11 @@ public final class JAXBUtils {
});
return results;
}
-
+
public static String getPackageNamespace(Class<?> cls) {
Package p = cls.getPackage();
if (p != null) {
- javax.xml.bind.annotation.XmlSchema schemaAnn =
+ javax.xml.bind.annotation.XmlSchema schemaAnn =
p.getAnnotation(javax.xml.bind.annotation.XmlSchema.class);
if (schemaAnn != null) {
return schemaAnn.namespace();
@@ -845,7 +845,7 @@ public final class JAXBUtils {
}
return null;
}
-
+
public static void scanPackages(Set<Class<?>> classes,
Map<Package, CachedClass> objectFactoryCache) {
scanPackages(classes, null, objectFactoryCache);
@@ -853,14 +853,14 @@ public final class JAXBUtils {
public static void scanPackages(Set<Class<?>> classes,
Class<?>[] extraClass,
Map<Package, CachedClass> objectFactoryCache) {
-
+
// add user extra class into jaxb context
if (extraClass != null && extraClass.length > 0) {
for (Class<?> clz : extraClass) {
classes.add(clz);
}
}
-
+
// try and read any jaxb.index files that are with the other classes.
// This should
// allow loading of extra classes (such as subclasses for inheritance
@@ -873,7 +873,7 @@ public final class JAXBUtils {
String pkgName = PackageUtils.getPackageName(jcls);
if (!packages.containsKey(pkgName)) {
Package pkg = jcls.getPackage();
-
+
packages.put(pkgName, jcls.getResourceAsStream("jaxb.index"));
packageLoaders.put(pkgName, jcls.getClassLoader());
String objectFactoryClassName = pkgName + "." + "ObjectFactory";
@@ -897,7 +897,7 @@ public final class JAXBUtils {
addToObjectFactoryCache(pkg, null, objectFactoryCache);
}
} else {
- objectFactories.add(ofactory);
+ objectFactories.add(ofactory);
}
}
}
@@ -945,26 +945,26 @@ public final class JAXBUtils {
classes.addAll(objectFactories);
}
-
- private static void addToObjectFactoryCache(Package objectFactoryPkg,
+
+ private static void addToObjectFactoryCache(Package objectFactoryPkg,
Class<?> ofactory,
Map<Package, CachedClass> objectFactoryCache) {
if (objectFactoryPkg == null || objectFactoryCache == null) {
return;
}
synchronized (objectFactoryCache) {
- objectFactoryCache.put(objectFactoryPkg,
+ objectFactoryCache.put(objectFactoryPkg,
new CachedClass(ofactory));
}
}
-
+
public static class DefaultClassNameAllocator {
private final Set<String> typesClassNames;
public DefaultClassNameAllocator() {
this(new HashSet<>());
}
-
+
public DefaultClassNameAllocator(Set<String> set) {
typesClassNames = set;
}
@@ -981,12 +981,12 @@ public final class JAXBUtils {
typesClassNames.add(fullPckClass);
return fullClassName;
}
-
+
}
-
+
public interface SchemaCompiler {
void setEntityResolver(EntityResolver entityResolver);
-
+
void setErrorListener(Object elForRun);
void setClassNameAllocator(Object allocator);
@@ -1006,7 +1006,7 @@ public final class JAXBUtils {
@WrapReturn(JCodeModel.class)
JCodeModel generateCode(Object object, Object elForRun);
-
+
@WrapReturn(Mapping.class)
Mapping get(QName qn);
@@ -1015,7 +1015,7 @@ public final class JAXBUtils {
}
public interface Mapping {
@WrapReturn(TypeAndAnnotation.class)
- TypeAndAnnotation getType();
+ TypeAndAnnotation getType();
}
public interface TypeAndAnnotation {
@WrapReturn(JType.class)
@@ -1045,7 +1045,7 @@ public final class JAXBUtils {
void addBindFile(InputSource is);
void parseArguments(String[] args);
-
+
String getBuildID();
}
public interface JCodeModel {
@@ -1067,7 +1067,7 @@ public final class JAXBUtils {
String fullName();
}
-
+
public static boolean isJAXB22() {
Target t = XmlElement.class.getAnnotation(Target.class);
//JAXB 2.2 allows XmlElement on params.
@@ -1078,9 +1078,9 @@ public final class JAXBUtils {
}
return false;
}
-
+
private static synchronized Object createNamespaceWrapper(Class<?> mcls, Map<String, String> map) {
- String postFix = "";
+ String postFix = "";
if (mcls.getName().contains("eclipse")) {
return createEclipseNamespaceMapper(mcls, map);
} else if (mcls.getName().contains(".internal")) {
@@ -1096,7 +1096,7 @@ public final class JAXBUtils {
if (cls == null) {
try {
ClassWriter cw = helper.createClassWriter();
- if (cw != null) {
+ if (cw != null) {
cls = createNamespaceWrapperInternal(helper, cw, postFix, mcls);
}
} catch (RuntimeException ex) {
@@ -1107,7 +1107,7 @@ public final class JAXBUtils {
if (cls == null
&& (!mcls.getName().contains(".internal.") && mcls.getName().contains("com.sun"))) {
try {
- cls = ClassLoaderUtils.loadClass("org.apache.cxf.common.jaxb.NamespaceMapper",
+ cls = ClassLoaderUtils.loadClass("org.apache.cxf.common.jaxb.NamespaceMapper",
JAXBUtils.class);
} catch (Throwable ex2) {
// ignore
@@ -1127,11 +1127,11 @@ public final class JAXBUtils {
}
/*
// This is the "prototype" for the ASM generated class below
- public static class MapNamespacePrefixMapper2
+ public static class MapNamespacePrefixMapper2
extends org.eclipse.persistence.internal.oxm.record.namespaces.MapNamespacePrefixMapper {
-
+
String nsctxt[];
-
+
public MapNamespacePrefixMapper2(Map<String, String> foo) {
super(foo);
}
@@ -1161,7 +1161,7 @@ public final class JAXBUtils {
String className = "org.apache.cxf.jaxb.EclipseNamespaceMapper";
String slashedName = "org/apache/cxf/jaxb/EclipseNamespaceMapper";
Class<?> cls = helper.findClass(className, JAXBUtils.class);
-
+
if (cls == null) {
ClassWriter cw = helper.createClassWriter();
if (cw == null) {
@@ -1176,12 +1176,12 @@ public final class JAXBUtils {
superName, null);
cw.visitSource("EclipseNamespaceMapper.java", null);
-
+
fv = cw.visitField(Opcodes.ACC_PRIVATE, "nsctxt", "[Ljava/lang/String;", null, null);
fv.visitEnd();
-
-
- mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "(Ljava/util/Map;)V",
+
+
+ mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "(Ljava/util/Map;)V",
"(Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;)V", null);
mv.visitCode();
Label l0 = helper.createLabel();
@@ -1196,9 +1196,9 @@ public final class JAXBUtils {
Label l2 = helper.createLabel();
mv.visitLabel(l2);
mv.visitMaxs(2, 2);
- mv.visitEnd();
-
-
+ mv.visitEnd();
+
+
mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "setContextualNamespaceDecls", "([Ljava/lang/String;)V",
null, null);
mv.visitCode();
@@ -1231,18 +1231,18 @@ public final class JAXBUtils {
mv.visitLabel(l1);
mv.visitLocalVariable("this", "L" + slashedName + ";", null, l0, l1, 0);
-
+
mv.visitMaxs(1, 1);
mv.visitEnd();
-
-
+
+
mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "getPreDeclaredNamespaceUris", "()[Ljava/lang/String;", null, null);
mv.visitCode();
l0 = helper.createLabel();
mv.visitLabel(l0);
mv.visitLineNumber(1036, l0);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
superName,
"getPreDeclaredNamespaceUris", "()[Ljava/lang/String;", false);
mv.visitVarInsn(Opcodes.ASTORE, 1);
@@ -1264,7 +1264,7 @@ public final class JAXBUtils {
mv.visitTypeInsn(Opcodes.NEW, "java/util/ArrayList");
mv.visitInsn(Opcodes.DUP);
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/util/Arrays", "asList",
+ mv.visitMethodInsn(Opcodes.INVOKESTATIC, "java/util/Arrays", "asList",
"([Ljava/lang/Object;)Ljava/util/List;", false);
mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/util/ArrayList", "<init>", "(Ljava/util/Collection;)V", false);
mv.visitVarInsn(Opcodes.ASTORE, 2);
@@ -1297,7 +1297,7 @@ public final class JAXBUtils {
mv.visitVarInsn(Opcodes.ILOAD, 3);
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitFieldInsn(Opcodes.GETFIELD,
- slashedName,
+ slashedName,
"nsctxt", "[Ljava/lang/String;");
mv.visitInsn(Opcodes.ARRAYLENGTH);
mv.visitJumpInsn(Opcodes.IF_ICMPLT, l7);
@@ -1308,7 +1308,7 @@ public final class JAXBUtils {
mv.visitVarInsn(Opcodes.ALOAD, 2);
mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List", "size", "()I", true);
mv.visitTypeInsn(Opcodes.ANEWARRAY, "java/lang/String");
- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List",
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/List",
"toArray", "([Ljava/lang/Object;)[Ljava/lang/Object;", true);
mv.visitTypeInsn(Opcodes.CHECKCAST, "[Ljava/lang/String;");
mv.visitInsn(Opcodes.ARETURN);
@@ -1336,14 +1336,14 @@ public final class JAXBUtils {
}
}
- private static Class<?> createNamespaceWrapperInternal(ASMHelper helper, ClassWriter cw,
+ private static Class<?> createNamespaceWrapperInternal(ASMHelper helper, ClassWriter cw,
String postFix, Class<?> ref) {
String className = "org.apache.cxf.jaxb.NamespaceMapper" + postFix;
- String superName = "com/sun/xml/"
- + ("RI".equals(postFix) ? "" : "internal/")
+ String superName = "com/sun/xml/"
+ + ("RI".equals(postFix) ? "" : "internal/")
+ "bind/marshaller/NamespacePrefixMapper";
String postFixedName = "org/apache/cxf/jaxb/NamespaceMapper" + postFix;
-
+
FieldVisitor fv;
MethodVisitor mv;
@@ -1354,7 +1354,7 @@ public final class JAXBUtils {
cw.visitSource("NamespaceMapper.java", null);
- fv = cw.visitField(Opcodes.ACC_PRIVATE + Opcodes.ACC_FINAL,
+ fv = cw.visitField(Opcodes.ACC_PRIVATE + Opcodes.ACC_FINAL,
"nspref", "Ljava/util/Map;",
"Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;", null);
fv.visitEnd();
@@ -1362,10 +1362,10 @@ public final class JAXBUtils {
fv = cw.visitField(Opcodes.ACC_PRIVATE, "nsctxt", "[Ljava/lang/String;", null, null);
fv.visitEnd();
- fv = cw.visitField(Opcodes.ACC_PRIVATE + Opcodes.ACC_FINAL + Opcodes.ACC_STATIC,
+ fv = cw.visitField(Opcodes.ACC_PRIVATE + Opcodes.ACC_FINAL + Opcodes.ACC_STATIC,
"EMPTY_STRING", "[Ljava/lang/String;", null, null);
fv.visitEnd();
-
+
mv = cw.visitMethod(Opcodes.ACC_STATIC, "<clinit>", "()V", null, null);
mv.visitCode();
Label l0 = helper.createLabel();
@@ -1406,8 +1406,8 @@ public final class JAXBUtils {
Label l4 = helper.createLabel();
mv.visitLabel(l4);
mv.visitLocalVariable("this", "L" + postFixedName + ";", null, l0, l4, 0);
- mv.visitLocalVariable("nspref",
- "Ljava/util/Map;", "Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;",
+ mv.visitLocalVariable("nspref",
+ "Ljava/util/Map;", "Ljava/util/Map<Ljava/lang/String;Ljava/lang/String;>;",
l0, l4, 1);
mv.visitMaxs(2, 2);
mv.visitEnd();
@@ -1422,7 +1422,7 @@ public final class JAXBUtils {
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitFieldInsn(Opcodes.GETFIELD, postFixedName, "nspref", "Ljava/util/Map;");
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map",
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "java/util/Map",
"get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
mv.visitTypeInsn(Opcodes.CHECKCAST, "java/lang/String");
mv.visitVarInsn(Opcodes.ASTORE, 4);
@@ -1483,7 +1483,7 @@ public final class JAXBUtils {
mv.visitLabel(l1);
mv.visitLocalVariable("this", "L" + postFixedName + ";", null, l0, l1, 0);
-
+
mv.visitMaxs(1, 1);
mv.visitEnd();
@@ -1494,7 +1494,7 @@ public final class JAXBUtils {
ref, bts);
}
//CHECKSTYLE:ON
-
+
public static JAXBContextProxy createJAXBContextProxy(final JAXBContext ctx) {
return createJAXBContextProxy(ctx, null, null);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java b/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
index 20b313d..610d1af 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/NamespaceMapper.java
@@ -34,8 +34,8 @@ public final class NamespaceMapper extends NamespacePrefixMapper {
this.nspref = nspref;
}
- public String getPreferredPrefix(String namespaceUri,
- String suggestion,
+ public String getPreferredPrefix(String namespaceUri,
+ String suggestion,
boolean requirePrefix) {
String prefix = nspref.get(namespaceUri);
if (prefix != null) {
@@ -51,6 +51,6 @@ public final class NamespaceMapper extends NamespacePrefixMapper {
public String[] getContextualNamespaceDecls() {
return nsctxt;
}
-
-
+
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java b/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java
index 5091235..9d91286 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/SchemaCollectionContextProxy.java
@@ -50,16 +50,16 @@ import org.apache.ws.commons.schema.XmlSchemaType;
import org.apache.ws.commons.schema.constants.Constants;
/**
- *
+ *
*/
public class SchemaCollectionContextProxy implements JAXBContextProxy {
private static final Map<Class<?>, QName> TYPE_MAP = new HashMap<Class<?>, QName>();
-
+
final JAXBContext context;
final SchemaCollection schemas;
final String defaultNamespace;
-
-
+
+
static {
defaultRegister(BigDecimal.class, Constants.XSD_DECIMAL);
defaultRegister(BigInteger.class, Constants.XSD_INTEGER);
@@ -79,7 +79,7 @@ public class SchemaCollectionContextProxy implements JAXBContextProxy {
defaultRegister(Timestamp.class, Constants.XSD_DATETIME);
defaultRegister(URI.class, Constants.XSD_ANYURI);
defaultRegister(XMLStreamReader.class, Constants.XSD_ANYTYPE);
-
+
defaultRegister(boolean.class, Constants.XSD_BOOLEAN);
defaultRegister(Date.class, Constants.XSD_DATETIME);
defaultRegister(Float.class, Constants.XSD_FLOAT);
@@ -95,7 +95,7 @@ public class SchemaCollectionContextProxy implements JAXBContextProxy {
defaultRegister(Timestamp.class, Constants.XSD_DATETIME);
defaultRegister(URI.class, Constants.XSD_ANYURI);
defaultRegister(XMLStreamReader.class, Constants.XSD_ANYTYPE);
-
+
defaultRegister(boolean.class, Constants.XSD_BOOLEAN);
defaultRegister(byte[].class, Constants.XSD_BASE64);
defaultRegister(double.class, Constants.XSD_DOUBLE);
@@ -113,7 +113,7 @@ public class SchemaCollectionContextProxy implements JAXBContextProxy {
defaultRegister(DataHandler.class, Constants.XSD_BASE64);
defaultRegister(Document.class, Constants.XSD_ANYTYPE);
}
-
+
public SchemaCollectionContextProxy(JAXBContext ctx, SchemaCollection c, String defaultNs) {
schemas = c;
context = ctx;
@@ -143,7 +143,7 @@ public class SchemaCollectionContextProxy implements JAXBContextProxy {
if (sc != null) {
namespace = sc.namespace();
}
- }
+ }
if ("##default".equals(namespace) || StringUtils.isEmpty(namespace)) {
namespace = JAXBUtils.getPackageNamespace(cls);
if (namespace == null) {
@@ -174,7 +174,7 @@ public class SchemaCollectionContextProxy implements JAXBContextProxy {
return null;
}
final QName typeName = type == null ? null : type.getQName();
-
+
JAXBBeanInfo bi = new JAXBBeanInfo() {
public boolean isElement() {
return el == null ? false : true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java b/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
index 5bd5347..8d7c0dd 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
@@ -128,7 +128,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
}
}
- public void logrb(Level level, String sourceClass, String sourceMethod,
+ public void logrb(Level level, String sourceClass, String sourceMethod,
String bundleName, String msg, Object param1) {
if (isLoggable(level)) {
LogRecord lr = new LogRecord(level, msg);
@@ -140,7 +140,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
}
}
- public void logrb(Level level, String sourceClass, String sourceMethod,
+ public void logrb(Level level, String sourceClass, String sourceMethod,
String bundleName, String msg, Object params[]) {
if (isLoggable(level)) {
LogRecord lr = new LogRecord(level, msg);
@@ -151,7 +151,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
}
}
- public void logrb(Level level, String sourceClass, String sourceMethod,
+ public void logrb(Level level, String sourceClass, String sourceMethod,
String bundleName, String msg, Throwable thrown) {
if (isLoggable(level)) {
LogRecord lr = new LogRecord(level, msg);
@@ -278,7 +278,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
protected boolean supportsHandlers() {
return false;
}
-
+
public synchronized void addHandler(Handler handler) throws SecurityException {
if (supportsHandlers()) {
super.addHandler(handler);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java b/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java
index 1ab35c2..3e579ab 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/JDKBugHacks.java
@@ -40,19 +40,19 @@ import org.apache.cxf.common.util.StringUtils;
* This is called from LogUtils as LogUtils is almost always one of the VERY
* first classes loaded in CXF so we can try and register to hacks/workarounds
* for various bugs in the JDK.
- *
+ *
* Much of this is taken from work the Tomcat folks have done to find
* places where memory leaks and jars are locked and such.
* See:
* http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/
* core/JreMemoryLeakPreventionListener.java
- *
+ *
*/
final class JDKBugHacks {
private JDKBugHacks() {
//not constructed
}
-
+
private static boolean skipHack(final String key) {
return skipHack(key, "false");
}
@@ -87,11 +87,11 @@ final class JDKBugHacks {
}
return Boolean.parseBoolean(cname);
}
-
+
public static void doHacks() {
if (skipHack("org.apache.cxf.JDKBugHacks.all")) {
return;
- }
+ }
try {
// Use the system classloader as the victim for all this
// ClassLoader pinning we're about to do.
@@ -132,12 +132,12 @@ final class JDKBugHacks {
new Class[] {Long.TYPE});
method.invoke(null, Long.valueOf(36000000));
}
- }
+ }
} catch (Throwable e) {
//ignore
}
-
- // Calling getPolicy retains a static reference to the context
+
+ // Calling getPolicy retains a static reference to the context
// class loader.
try {
// Policy.getPolicy();
@@ -151,10 +151,10 @@ final class JDKBugHacks {
// ignore
}
try {
- // Initializing javax.security.auth.login.Configuration retains a static reference
+ // Initializing javax.security.auth.login.Configuration retains a static reference
// to the context class loader.
if (!skipHack("org.apache.cxf.JDKBugHacks.authConfiguration")) {
- Class.forName("javax.security.auth.login.Configuration", true,
+ Class.forName("javax.security.auth.login.Configuration", true,
ClassLoader.getSystemClassLoader());
}
} catch (Throwable e) {
@@ -167,7 +167,7 @@ final class JDKBugHacks {
if (!skipHack("org.apache.cxf.JDKBugHacks.securityProviders")) {
java.security.Security.getProviders();
}
-
+
try {
// Several components end up opening JarURLConnections without first
// disabling caching. This effectively locks the file.
@@ -186,7 +186,7 @@ final class JDKBugHacks {
}
} catch (Throwable e) {
//ignore
- }
+ }
} finally {
if (orig != null) {
orig.reset();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
index ae3aa0f..a727ae6 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/Log4jLogger.java
@@ -42,14 +42,14 @@ import org.apache.log4j.spi.LoggingEvent;
* setUseParentHandlers / getUseParentHandlers
*/
public class Log4jLogger extends AbstractDelegatingLogger {
- private static final Map<Level, org.apache.log4j.Level> TO_LOG4J =
+ private static final Map<Level, org.apache.log4j.Level> TO_LOG4J =
new HashMap<Level, org.apache.log4j.Level>();
private static final org.apache.log4j.Level TRACE;
private final org.apache.log4j.Logger log;
- static {
+ static {
//older versions of log4j don't have TRACE, use debug
org.apache.log4j.Level t = org.apache.log4j.Level.DEBUG;
try {
@@ -59,7 +59,7 @@ public class Log4jLogger extends AbstractDelegatingLogger {
//ignore, assume old version of log4j
}
TRACE = t;
-
+
TO_LOG4J.put(Level.ALL, org.apache.log4j.Level.ALL);
TO_LOG4J.put(Level.SEVERE, org.apache.log4j.Level.ERROR);
TO_LOG4J.put(Level.WARNING, org.apache.log4j.Level.WARN);
@@ -83,11 +83,11 @@ public class Log4jLogger extends AbstractDelegatingLogger {
}
return null;
}
-
+
public void setLevel(Level newLevel) throws SecurityException {
log.setLevel(TO_LOG4J.get(newLevel));
}
-
+
public synchronized void addHandler(Handler handler) throws SecurityException {
log.addAppender(new HandlerWrapper(handler));
}
@@ -105,7 +105,7 @@ public class Log4jLogger extends AbstractDelegatingLogger {
}
return ret.toArray(new Handler[ret.size()]);
}
-
+
protected void internalLogFormatted(String msg, LogRecord record) {
log.log(AbstractDelegatingLogger.class.getName(),
TO_LOG4J.get(record.getLevel()),
@@ -142,19 +142,19 @@ public class Log4jLogger extends AbstractDelegatingLogger {
if (l.toInt() == TRACE.toInt()) {
l2 = Level.FINEST;
}
- }
+ }
return l2;
- }
-
-
+ }
+
+
private class HandlerWrapper extends AppenderSkeleton {
Handler handler;
-
+
HandlerWrapper(Handler h) {
handler = h;
- name = "HandlerWrapper-" + h.hashCode();
+ name = "HandlerWrapper-" + h.hashCode();
}
-
+
public Handler getHandler() {
return handler;
}
@@ -183,8 +183,8 @@ public class Log4jLogger extends AbstractDelegatingLogger {
public boolean requiresLayout() {
return false;
- }
-
+ }
+
@Override
public Priority getThreshold() {
return TO_LOG4J.get(handler.getLevel());
@@ -193,7 +193,7 @@ public class Log4jLogger extends AbstractDelegatingLogger {
public boolean isAsSevereAsThreshold(Priority priority) {
Priority p = getThreshold();
return (p == null) || priority.isGreaterOrEqual(p);
- }
+ }
}
private static void getFullInfoForLogUtils(LogRecord lr, String cname) {
StackTraceElement el[] = Thread.currentThread().getStackTrace();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
index 83faf0f..4195913 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
@@ -43,7 +43,7 @@ import org.apache.cxf.common.util.StringUtils;
* application must provide an object that extends {@link AbstractDelegatingLogger}, and advertise that class
* via one of the following mechanisms:
* <ul>
- * <li>Create a file, in the classpath, named META-INF/cxf/org.apache.cxf.Logger.
+ * <li>Create a file, in the classpath, named META-INF/cxf/org.apache.cxf.Logger.
* This file should contain the fully-qualified name
* of the class, with no comments, on a single line.</li>
* <li>Call {@link #setLoggerClass(Class)} with a Class<?> reference to the logger class.</li>
@@ -52,12 +52,12 @@ import org.apache.cxf.common.util.StringUtils;
*/
public final class LogUtils {
public static final String KEY = "org.apache.cxf.Logger";
-
+
private static final Object[] NO_PARAMETERS = new Object[0];
-
+
private static Class<?> loggerClass;
-
+
/**
* Prevents instantiation.
*/
@@ -66,9 +66,9 @@ public final class LogUtils {
static {
JDKBugHacks.doHacks();
-
+
try {
-
+
String cname = null;
try {
cname = AccessController.doPrivileged(new PrivilegedAction<String>() {
@@ -98,12 +98,12 @@ public final class LogUtils {
// as we'll just use j.u.l and pax-logging will pick it up fine
// If we don't call this and there isn't a slf4j impl avail,
// you get warnings printed to stderr about NOPLoggers and such
- Class.forName("org.slf4j.impl.StaticLoggerBinder");
+ Class.forName("org.slf4j.impl.StaticLoggerBinder");
Class<?> cls = Class.forName("org.slf4j.LoggerFactory");
Class<?> fcls = cls.getMethod("getILoggerFactory").invoke(null).getClass();
String clsName = fcls.getName();
if (clsName.contains("NOPLogger")) {
- //no real slf4j implementation, use j.u.l
+ //no real slf4j implementation, use j.u.l
cname = null;
} else if (clsName.contains("Log4j")) {
cname = "org.apache.cxf.common.logging.Log4jLogger";
@@ -115,7 +115,7 @@ public final class LogUtils {
}
} else if (clsName.contains("JDK14")
|| clsName.contains("pax.logging")) {
- //both of these we can use the appropriate j.u.l API's
+ //both of these we can use the appropriate j.u.l API's
//directly and have it work properly
cname = null;
} else {
@@ -142,8 +142,8 @@ public final class LogUtils {
loggerClass = null;
}
}
-
-
+
+
/**
* Specify a logger class that inherits from {@link AbstractDelegatingLogger}.
* Enable users to use their own logger implementation.
@@ -152,23 +152,23 @@ public final class LogUtils {
loggerClass = cls;
}
-
+
/**
* Get a Logger with the associated default resource bundle for the class.
*
* @param cls the Class to contain the Logger
- * @return an appropriate Logger
+ * @return an appropriate Logger
*/
public static Logger getLogger(Class<?> cls) {
return createLogger(cls, null, cls.getName());
}
-
+
/**
* Get a Logger with an associated resource bundle.
*
* @param cls the Class to contain the Logger
* @param resourcename the resource name
- * @return an appropriate Logger
+ * @return an appropriate Logger
*/
public static Logger getLogger(Class<?> cls, String resourcename) {
return createLogger(cls, resourcename, cls.getName());
@@ -180,7 +180,7 @@ public final class LogUtils {
* @param cls the Class to contain the Logger (to find resources)
* @param resourcename the resource name
* @param loggerName the full name for the logger
- * @return an appropriate Logger
+ * @return an appropriate Logger
*/
public static Logger getLogger(Class<?> cls,
String resourcename,
@@ -192,18 +192,18 @@ public final class LogUtils {
* Get a Logger with the associated default resource bundle for the class.
*
* @param cls the Class to contain the Logger
- * @return an appropriate Logger
+ * @return an appropriate Logger
*/
public static Logger getL7dLogger(Class<?> cls) {
return createLogger(cls, null, cls.getName());
}
-
+
/**
* Get a Logger with an associated resource bundle.
*
* @param cls the Class to contain the Logger
* @param resourcename the resource name
- * @return an appropriate Logger
+ * @return an appropriate Logger
*/
public static Logger getL7dLogger(Class<?> cls, String resourcename) {
return createLogger(cls, resourcename, cls.getName());
@@ -215,19 +215,19 @@ public final class LogUtils {
* @param cls the Class to contain the Logger (to find resources)
* @param resourcename the resource name
* @param loggerName the full name for the logger
- * @return an appropriate Logger
+ * @return an appropriate Logger
*/
public static Logger getL7dLogger(Class<?> cls,
String resourcename,
String loggerName) {
return createLogger(cls, resourcename, loggerName);
}
-
+
/**
* Create a logger
*/
- protected static Logger createLogger(Class<?> cls,
- String name,
+ protected static Logger createLogger(Class<?> cls,
+ String name,
String loggerName) {
ClassLoader orig = Thread.currentThread().getContextClassLoader();
ClassLoader n = cls.getClassLoader();
@@ -239,7 +239,7 @@ public final class LogUtils {
Logger logger = null;
ResourceBundle b = null;
if (bundleName == null) {
- //grab the bundle prior to the call to Logger.getLogger(...) so the
+ //grab the bundle prior to the call to Logger.getLogger(...) so the
//ResourceBundle can be loaded outside the big sync block that getLogger really is
bundleName = BundleUtils.getBundleName(cls);
try {
@@ -258,7 +258,7 @@ public final class LogUtils {
if (b != null) {
b.getLocale();
}
-
+
if (loggerClass != null) {
try {
Constructor<?> cns = loggerClass.getConstructor(String.class, String.class);
@@ -271,7 +271,7 @@ public final class LogUtils {
} else {
throw ite;
}
- }
+ }
} else {
try {
return (Logger) cns.newInstance(loggerName, bundleName);
@@ -281,13 +281,13 @@ public final class LogUtils {
} else {
throw ite;
}
- }
+ }
}
} catch (Exception e) {
throw new RuntimeException(e);
}
}
-
+
try {
logger = Logger.getLogger(loggerName, bundleName); //NOPMD
} catch (IllegalArgumentException iae) {
@@ -305,7 +305,7 @@ public final class LogUtils {
}
}
}
-
+
private static void setContextClassLoader(final ClassLoader classLoader) {
AccessController.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
@@ -324,13 +324,13 @@ public final class LogUtils {
* @param throwable the Throwable to log
* @param parameter the parameter to substitute into message
*/
- public static void log(Logger logger,
- Level level,
- String message,
+ public static void log(Logger logger,
+ Level level,
+ String message,
Throwable throwable,
Object parameter) {
if (logger.isLoggable(level)) {
- final String formattedMessage =
+ final String formattedMessage =
MessageFormat.format(localize(logger, message), parameter);
doLog(logger, level, formattedMessage, throwable);
}
@@ -345,31 +345,31 @@ public final class LogUtils {
* @param throwable the Throwable to log
* @param parameters the parameters to substitute into message
*/
- public static void log(Logger logger,
- Level level,
- String message,
+ public static void log(Logger logger,
+ Level level,
+ String message,
Throwable throwable,
Object... parameters) {
if (logger.isLoggable(level)) {
- final String formattedMessage =
+ final String formattedMessage =
MessageFormat.format(localize(logger, message), parameters);
doLog(logger, level, formattedMessage, throwable);
}
}
-
+
/**
* Checks log level and logs
*
* @param logger the Logger the log to
* @param level the severity level
* @param message the log message
- */
- public static void log(Logger logger,
- Level level,
+ */
+ public static void log(Logger logger,
+ Level level,
String message) {
- log(logger, level, message, NO_PARAMETERS);
- }
-
+ log(logger, level, message, NO_PARAMETERS);
+ }
+
/**
* Checks log level and logs
*
@@ -377,14 +377,14 @@ public final class LogUtils {
* @param level the severity level
* @param message the log message
* @param throwable the Throwable to log
- */
- public static void log(Logger logger,
- Level level,
- String message,
+ */
+ public static void log(Logger logger,
+ Level level,
+ String message,
Throwable throwable) {
log(logger, level, message, throwable, NO_PARAMETERS);
}
-
+
/**
* Checks log level and logs
*
@@ -392,14 +392,14 @@ public final class LogUtils {
* @param level the severity level
* @param message the log message
* @param parameter the parameter to substitute into message
- */
- public static void log(Logger logger,
- Level level,
- String message,
+ */
+ public static void log(Logger logger,
+ Level level,
+ String message,
Object parameter) {
log(logger, level, message, new Object[] {parameter});
}
-
+
/**
* Checks log level and logs
*
@@ -407,10 +407,10 @@ public final class LogUtils {
* @param level the severity level
* @param message the log message
* @param parameters the parameters to substitute into message
- */
- public static void log(Logger logger,
- Level level,
- String message,
+ */
+ public static void log(Logger logger,
+ Level level,
+ String message,
Object[] parameters) {
if (logger.isLoggable(level)) {
String msg = localize(logger, message);
@@ -420,20 +420,20 @@ public final class LogUtils {
//ignore, log as is
}
doLog(logger, level, msg, null);
- }
+ }
}
private static void doLog(Logger log, Level level, String msg, Throwable t) {
LogRecord record = new LogRecord(level, msg);
-
+
record.setLoggerName(log.getName());
record.setResourceBundleName(log.getResourceBundleName());
record.setResourceBundle(log.getResourceBundle());
-
+
if (t != null) {
record.setThrown(t);
}
-
+
//try to get the right class name/method name - just trace
//back the stack till we get out of this class
StackTraceElement stack[] = (new Throwable()).getStackTrace();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java b/core/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
index 904dcaa..96b8443 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/Slf4jLogger.java
@@ -36,7 +36,7 @@ import org.slf4j.spi.LocationAwareLogger;
* <p>
* Level mapping inspired by {@link org.slf4j.bridge.SLF4JBridgeHandler}:
* </p>
- *
+ *
* <pre>
* FINEST -> TRACE
* FINER -> DEBUG
@@ -53,7 +53,7 @@ public class Slf4jLogger extends AbstractDelegatingLogger {
private final org.slf4j.Logger logger;
private LocationAwareLogger locationAwareLogger;
-
+
public Slf4jLogger(String name, String resourceBundleName) {
super(name, resourceBundleName);
@@ -111,7 +111,7 @@ public class Slf4jLogger extends AbstractDelegatingLogger {
Level level = record.getLevel();
Throwable t = record.getThrown();
-
+
Handler targets[] = getHandlers();
if (targets != null) {
for (Handler h : targets) {
@@ -121,7 +121,7 @@ public class Slf4jLogger extends AbstractDelegatingLogger {
if (!getUseParentHandlers()) {
return;
}
-
+
/*
* As we can not use a "switch ... case" block but only a "if ... else if ..." block, the order of the
* comparisons is important. We first try log level FINE then INFO, WARN, FINER, etc
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java b/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
index f1ecd34..c6814e9 100644
--- a/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
+++ b/core/src/main/java/org/apache/cxf/common/security/SimpleGroup.java
@@ -30,19 +30,19 @@ import java.util.Set;
*
*/
public class SimpleGroup extends SimplePrincipal implements Group {
-
+
private static final long serialVersionUID = 1L;
private Set<Principal> members = new HashSet<>();
-
+
public SimpleGroup(String groupName) {
super(groupName);
}
-
+
public SimpleGroup(String groupName, String memberName) {
super(groupName);
members.add(new SimplePrincipal(memberName));
}
-
+
public SimpleGroup(String groupName, Principal member) {
super(groupName);
members.add(member);
@@ -55,11 +55,11 @@ public class SimpleGroup extends SimplePrincipal implements Group {
public boolean addMember(Principal p) {
return members.add(p);
}
-
+
public Enumeration<? extends Principal> members() {
-
+
final Iterator<Principal> it = members.iterator();
-
+
return new Enumeration<Principal>() {
public boolean hasMoreElements() {
@@ -69,14 +69,14 @@ public class SimpleGroup extends SimplePrincipal implements Group {
public Principal nextElement() {
return it.next();
}
-
+
};
}
public boolean removeMember(Principal p) {
return members.remove(p);
}
-
+
public boolean equals(Object obj) {
if (!(obj instanceof SimpleGroup)) {
return false;
@@ -84,7 +84,7 @@ public class SimpleGroup extends SimplePrincipal implements Group {
SimpleGroup other = (SimpleGroup)obj;
return members.equals(other.members) && super.equals(obj);
}
-
+
public int hashCode() {
return getName().hashCode() + 37 * members.hashCode();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/security/SimplePrincipal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/security/SimplePrincipal.java b/core/src/main/java/org/apache/cxf/common/security/SimplePrincipal.java
index c150006..9413c59 100644
--- a/core/src/main/java/org/apache/cxf/common/security/SimplePrincipal.java
+++ b/core/src/main/java/org/apache/cxf/common/security/SimplePrincipal.java
@@ -27,32 +27,32 @@ import java.security.Principal;
*/
public class SimplePrincipal implements Principal, Serializable {
private static final long serialVersionUID = -5171549568204891853L;
-
+
private String name;
-
+
public SimplePrincipal(String name) {
if (name == null) {
throw new IllegalArgumentException("Principal name can not be null");
}
this.name = name;
}
-
+
public String getName() {
return name;
}
-
+
public boolean equals(Object obj) {
if (!(obj instanceof SimplePrincipal)) {
return false;
}
-
+
return name.equals(((SimplePrincipal)obj).name);
}
-
+
public int hashCode() {
return name.hashCode();
}
-
+
public String toString() {
return name;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/security/SimpleSecurityContext.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/security/SimpleSecurityContext.java b/core/src/main/java/org/apache/cxf/common/security/SimpleSecurityContext.java
index ab5d87d..11b2a8e 100644
--- a/core/src/main/java/org/apache/cxf/common/security/SimpleSecurityContext.java
+++ b/core/src/main/java/org/apache/cxf/common/security/SimpleSecurityContext.java
@@ -30,7 +30,7 @@ public class SimpleSecurityContext implements SecurityContext {
public SimpleSecurityContext(Principal principal) {
this.principal = principal;
}
-
+
public Principal getUserPrincipal() {
return principal;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/security/UsernameToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/security/UsernameToken.java b/core/src/main/java/org/apache/cxf/common/security/UsernameToken.java
index 9f3f0b7..ec5bec2 100644
--- a/core/src/main/java/org/apache/cxf/common/security/UsernameToken.java
+++ b/core/src/main/java/org/apache/cxf/common/security/UsernameToken.java
@@ -26,7 +26,7 @@ public class UsernameToken implements SecurityToken {
private boolean isHashed;
private String nonce;
private String createdTime;
-
+
public UsernameToken(String name,
String password,
String passwordType,
@@ -64,7 +64,7 @@ public class UsernameToken implements SecurityToken {
public String getCreatedTime() {
return createdTime;
}
-
+
public TokenType getTokenType() {
return TokenType.UsernameToken;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
index 2287625..b83742d 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
@@ -40,15 +40,15 @@ public class ASMHelper {
protected static final Map<Class<?>, String> PRIMITIVE_MAP = new HashMap<Class<?>, String>();
protected static final Map<Class<?>, String> NONPRIMITIVE_MAP = new HashMap<Class<?>, String>();
protected static final Map<Class<?>, Integer> PRIMITIVE_ZERO_MAP = new HashMap<Class<?>, Integer>();
-
- protected static final Map<ClassLoader, WeakReference<TypeHelperClassLoader>> LOADER_MAP
+
+ protected static final Map<ClassLoader, WeakReference<TypeHelperClassLoader>> LOADER_MAP
= new WeakIdentityHashMap<ClassLoader, WeakReference<TypeHelperClassLoader>>();
- protected static final Map<Class<?>, WeakReference<TypeHelperClassLoader>> CLASS_MAP
+ protected static final Map<Class<?>, WeakReference<TypeHelperClassLoader>> CLASS_MAP
= new WeakIdentityHashMap<Class<?>, WeakReference<TypeHelperClassLoader>>();
-
+
protected static boolean badASM;
private static Class<?> cwClass;
-
+
static {
PRIMITIVE_MAP.put(Byte.TYPE, "B");
PRIMITIVE_MAP.put(Boolean.TYPE, "Z");
@@ -68,12 +68,12 @@ public class ASMHelper {
NONPRIMITIVE_MAP.put(Float.TYPE, Float.class.getName().replaceAll("\\.", "/"));
NONPRIMITIVE_MAP.put(Double.TYPE, Double.class.getName().replaceAll("\\.", "/"));
}
-
+
private static void tryClass(String s) {
if (cwClass == null) {
try {
Class<?> c2 = ClassLoaderUtils.loadClass(s, ASMHelper.class);
-
+
//old versions don't have this, but we need it
Class<?> cls = ClassLoaderUtils.loadClass(c2.getPackage().getName() + ".MethodVisitor", c2);
cls.getMethod("visitFrame", Integer.TYPE, Integer.TYPE,
@@ -88,14 +88,14 @@ public class ASMHelper {
//force this to make sure the proper OSGi import is generated
return org.objectweb.asm.ClassWriter.class;
}
-
+
private static synchronized Class<?> getASMClass() throws ClassNotFoundException {
if (cwClass == null) {
//try the "real" asm first, then the others
- tryClass("org.objectweb.asm.ClassWriter");
- tryClass("org.apache.xbean.asm5.ClassWriter");
- tryClass("org.apache.xbean.asm4.ClassWriter");
- tryClass("org.apache.xbean.asm.ClassWriter");
+ tryClass("org.objectweb.asm.ClassWriter");
+ tryClass("org.apache.xbean.asm5.ClassWriter");
+ tryClass("org.apache.xbean.asm4.ClassWriter");
+ tryClass("org.apache.xbean.asm.ClassWriter");
tryClass("org.springframework.asm.ClassWriter");
if (cwClass == null) {
cwClass = getASMClassWriterClass();
@@ -103,11 +103,11 @@ public class ASMHelper {
}
return cwClass;
}
-
+
public static class Opcodes {
//CHECKSTYLE:OFF
//Will use reflection to set these based on the package name and such
- //so we don't want them "final" or the compiler will optimize them out
+ //so we don't want them "final" or the compiler will optimize them out
//to just "0" which we really don't want
public static int ARETURN = 0;
public static int ALOAD = 0;
@@ -158,7 +158,7 @@ public class ASMHelper {
public static int DCONST_0;
public static int IF_ICMPLT = 0;
public static java.lang.Integer INTEGER;
-
+
//CHECKSTYLE:ON
static {
try {
@@ -171,7 +171,7 @@ public class ASMHelper {
} catch (Throwable e) {
//ignore
}
-
+
PRIMITIVE_ZERO_MAP.put(Byte.TYPE, Opcodes.ICONST_0);
PRIMITIVE_ZERO_MAP.put(Boolean.TYPE, Opcodes.ICONST_0);
PRIMITIVE_ZERO_MAP.put(Long.TYPE, Opcodes.LCONST_0);
@@ -182,7 +182,7 @@ public class ASMHelper {
PRIMITIVE_ZERO_MAP.put(Double.TYPE, Opcodes.DCONST_0);
}
}
-
+
protected static String getMethodSignature(Method m) {
StringBuilder buf = new StringBuilder("(");
for (Class<?> cl : m.getParameterTypes()) {
@@ -190,10 +190,10 @@ public class ASMHelper {
}
buf.append(")");
buf.append(getClassCode(m.getReturnType()));
-
+
return buf.toString();
}
-
+
public static String periodToSlashes(String s) {
char ch[] = s.toCharArray();
for (int x = 0; x < ch.length; x++) {
@@ -203,8 +203,8 @@ public class ASMHelper {
}
return new String(ch);
}
-
-
+
+
public static String getClassCode(Class<?> cl) {
if (cl == Void.TYPE) {
return "V";
@@ -262,7 +262,7 @@ public class ASMHelper {
return null;
}
-
+
public ClassWriter createClassWriter() {
Object newCw = null;
if (!badASM) {
@@ -276,13 +276,13 @@ public class ASMHelper {
}
try {
// ASM 1.5.x/2.x
- Constructor<?> cons
+ Constructor<?> cons
= cwClass.getConstructor(new Class<?>[] {Boolean.TYPE});
-
+
try {
// got constructor, now check if it's 1.x which is very
// different from 2.x and 3.x
- cwClass.getMethod("newConstInt", new Class<?>[] {Integer.TYPE});
+ cwClass.getMethod("newConstInt", new Class<?>[] {Integer.TYPE});
// newConstInt was removed in 2.x, if we get this far, we're
// using 1.5.x,
// set to null so we don't attempt to use it.
@@ -290,11 +290,11 @@ public class ASMHelper {
} catch (Throwable t) {
newCw = cons.newInstance(new Object[] {Boolean.TRUE});
}
-
+
} catch (Throwable e) {
// ASM 3.x/4.x
try {
- Constructor<?> cons
+ Constructor<?> cons
= cwClass.getConstructor(new Class<?>[] {Integer.TYPE});
int i = cwClass.getField("COMPUTE_MAXS").getInt(null);
i |= cwClass.getField("COMPUTE_FRAMES").getInt(null);
@@ -309,8 +309,8 @@ public class ASMHelper {
}
return null;
}
-
-
+
+
public Class<?> loadClass(String className, Class<?> clz, byte[] bytes) {
TypeHelperClassLoader loader = getTypeHelperClassLoader(clz);
synchronized (loader) {
@@ -331,15 +331,15 @@ public class ASMHelper {
return cls;
}
}
- public Class<?> findClass(String className, Class<?> clz) {
+ public Class<?> findClass(String className, Class<?> clz) {
TypeHelperClassLoader loader = getTypeHelperClassLoader(clz);
return loader.lookupDefinedClass(className);
}
- public Class<?> findClass(String className, ClassLoader l) {
+ public Class<?> findClass(String className, ClassLoader l) {
TypeHelperClassLoader loader = getTypeHelperClassLoader(l);
return loader.lookupDefinedClass(className);
}
-
+
private static synchronized TypeHelperClassLoader getTypeHelperClassLoader(ClassLoader l) {
WeakReference<TypeHelperClassLoader> ref = LOADER_MAP.get(l);
TypeHelperClassLoader ret;
@@ -362,10 +362,10 @@ public class ASMHelper {
}
return ret;
}
-
+
public static class TypeHelperClassLoader extends ClassLoader {
ConcurrentHashMap<String, Class<?>> defined = new ConcurrentHashMap<String, Class<?>>();
-
+
TypeHelperClassLoader(ClassLoader parent) {
super(parent);
}
@@ -380,7 +380,7 @@ public class ASMHelper {
}
return super.findClass(name);
}
-
+
public Class<?> defineClass(String name, byte bytes[]) {
Class<?> ret = defined.get(name.replace('/', '.'));
if (ret != null) {
@@ -392,14 +392,14 @@ public class ASMHelper {
definePackage(name.substring(0, name.length() - 13).replace('/', '.'),
null,
null,
- null,
+ null,
null,
null,
null,
null);
}
}
-
+
ret = super.defineClass(name.replace('/', '.'), bytes, 0, bytes.length);
Class<?> tmpRet = defined.putIfAbsent(name.replace('/', '.'), ret);
if (tmpRet != null) {
@@ -457,29 +457,29 @@ public class ASMHelper {
throw new RuntimeException(e);
}
}
-
+
public interface ClassWriter {
@WrapReturn(AnnotationVisitor.class)
AnnotationVisitor visitAnnotation(String cls, boolean t);
-
+
@WrapReturn(FieldVisitor.class)
FieldVisitor visitField(int accPrivate, String fieldName, String classCode,
String fieldDescriptor, Object object);
-
+
void visitEnd();
byte[] toByteArray();
-
- @WrapReturn(MethodVisitor.class)
- MethodVisitor visitMethod(int accPublic, String string, String string2,
+
+ @WrapReturn(MethodVisitor.class)
+ MethodVisitor visitMethod(int accPublic, String string, String string2,
String s3,
String[] s4);
void visit(int v15, int i, String newClassName, String object, String string, String[] object2);
void visitSource(String arg0, String arg1);
}
-
+
public interface Label {
}
-
+
public interface FieldVisitor {
@WrapReturn(AnnotationVisitor.class)
AnnotationVisitor visitAnnotation(String cls, boolean b);
@@ -494,9 +494,9 @@ public class ASMHelper {
void visitVarInsn(int aload, int i);
void visitCode();
void visitLdcInsn(String sig);
- void visitLocalVariable(String string,
+ void visitLocalVariable(String string,
String string2,
- String string3,
+ String string3,
@UnwrapParam(typeMethodName = "realType") Label lBegin,
@UnwrapParam(typeMethodName = "realType") Label lEnd,
int i);
@@ -509,7 +509,7 @@ public class ASMHelper {
String string, String string2);
void visitJumpInsn(int ifnonnull, @UnwrapParam(typeMethodName = "realType") Label nonNullLabel);
void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack);
-
+
@WrapReturn(AnnotationVisitor.class)
AnnotationVisitor visitAnnotation(String cls, boolean b);
}
@@ -523,6 +523,6 @@ public class ASMHelper {
void visitEnd();
void visitEnum(String arg0, String arg1, String arg2);
}
-
-
+
+
}
[29/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
index c65412d..e839e9e 100644
--- a/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/InterfaceInfoTest.java
@@ -26,7 +26,7 @@ import org.junit.Before;
import org.junit.Test;
public class InterfaceInfoTest extends Assert {
-
+
private InterfaceInfo interfaceInfo;
@Before
@@ -34,7 +34,7 @@ public class InterfaceInfoTest extends Assert {
interfaceInfo = new InterfaceInfo(new ServiceInfo(), new QName(
"http://apache.org/hello_world_soap_http", "interfaceTest"));
}
-
+
@Test
public void testName() throws Exception {
assertEquals(interfaceInfo.getName().getLocalPart(), "interfaceTest");
@@ -47,7 +47,7 @@ public class InterfaceInfoTest extends Assert {
assertEquals(interfaceInfo.getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http1");
}
-
+
@Test
public void testOperation() throws Exception {
QName name = new QName("urn:test:ns", "sayHi");
@@ -59,7 +59,7 @@ public class InterfaceInfoTest extends Assert {
try {
interfaceInfo.addOperation(name);
} catch (IllegalArgumentException e) {
- assertEquals(e.getMessage(),
+ assertEquals(e.getMessage(),
"An operation with name [{urn:test:ns}sayHi] already exists in this service");
duplicatedOperationName = true;
}
@@ -78,5 +78,5 @@ public class InterfaceInfoTest extends Assert {
fail("should get NullPointerException");
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
index 5bc9f01..1e41f5d 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessageInfoTest.java
@@ -26,27 +26,27 @@ import org.junit.Before;
import org.junit.Test;
public class MessageInfoTest extends Assert {
-
+
private MessageInfo messageInfo;
-
+
@Before
public void setUp() throws Exception {
messageInfo = new MessageInfo(null, MessageInfo.Type.INPUT,
new QName("http://apache.org/hello_world_soap_http", "testMessage"));
}
-
+
@Test
public void testName() throws Exception {
assertEquals(messageInfo.getName().getLocalPart(), "testMessage");
assertEquals(messageInfo.getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http");
}
-
+
@Test
public void testMessagePartInfo() throws Exception {
QName qname = new QName(
"http://apache.org/hello_world_soap_http", "testMessagePart");
-
+
messageInfo.addMessagePart(qname);
assertEquals(messageInfo.getMessageParts().size(), 1);
MessagePartInfo messagePartInfo = messageInfo.getMessagePart(qname);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
index 684545f..bc76049 100644
--- a/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/MessagePartInfoTest.java
@@ -27,13 +27,13 @@ import org.junit.Before;
import org.junit.Test;
public class MessagePartInfoTest extends Assert {
-
-
+
+
private MessagePartInfo messagePartInfo;
-
+
@Before
public void setUp() throws Exception {
-
+
MessageInfo msg = new MessageInfo(null,
MessageInfo.Type.INPUT,
new QName("http://apache.org/hello_world_soap_http/types",
@@ -42,7 +42,7 @@ public class MessagePartInfoTest extends Assert {
"http://apache.org/hello_world_soap_http", "testMessagePart"), msg);
messagePartInfo.setElement(true);
}
-
+
@Test
public void testName() throws Exception {
assertEquals(messagePartInfo.getName().getLocalPart(), "testMessagePart");
@@ -53,7 +53,7 @@ public class MessagePartInfoTest extends Assert {
assertEquals(messagePartInfo.getName().getLocalPart(), "testMessagePart1");
assertEquals(messagePartInfo.getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http1");
-
+
}
@Test
@@ -66,7 +66,7 @@ public class MessagePartInfoTest extends Assert {
"http://apache.org/hello_world_soap_http/types");
assertNull(messagePartInfo.getTypeQName());
}
-
+
@Test
public void testType() {
messagePartInfo.setTypeQName(new QName(
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
index 7c840af..a3561bd 100644
--- a/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
+++ b/core/src/test/java/org/apache/cxf/service/model/OperationInfoTest.java
@@ -28,12 +28,12 @@ import org.junit.Test;
public class OperationInfoTest extends Assert {
private OperationInfo operationInfo;
-
+
@Before
public void setUp() throws Exception {
operationInfo = new OperationInfo(null, new QName("urn:test:ns", "operationTest"));
}
-
+
@Test
public void testName() throws Exception {
assertNull(operationInfo.getInterface());
@@ -47,7 +47,7 @@ public class OperationInfoTest extends Assert {
assertEquals(e.getMessage(), "Operation Name cannot be null.");
}
}
-
+
@Test
public void testInput() throws Exception {
assertFalse(operationInfo.hasInput());
@@ -62,7 +62,7 @@ public class OperationInfoTest extends Assert {
inputMessage.getName().getNamespaceURI());
assertEquals(operationInfo.getInputName(), "input");
}
-
+
@Test
public void testOutput() throws Exception {
assertFalse(operationInfo.hasOutput());
@@ -77,7 +77,7 @@ public class OperationInfoTest extends Assert {
outputMessage.getName().getNamespaceURI());
assertEquals(operationInfo.getOutputName(), "output");
}
-
+
@Test
public void testOneWay() throws Exception {
assertFalse(operationInfo.isOneWay());
@@ -87,7 +87,7 @@ public class OperationInfoTest extends Assert {
operationInfo.setInput("input", inputMessage);
assertTrue(operationInfo.isOneWay());
}
-
+
@Test
public void testFault() throws Exception {
assertEquals(operationInfo.getFaults().size(), 0);
@@ -99,7 +99,7 @@ public class OperationInfoTest extends Assert {
assertNotNull(fault);
assertEquals(fault.getFaultName().getLocalPart(), "fault");
assertEquals(fault.getName().getLocalPart(), "faultMessage");
- assertEquals(fault.getName().getNamespaceURI(),
+ assertEquals(fault.getName().getNamespaceURI(),
"http://apache.org/hello_world_soap_http");
operationInfo.removeFault(faultName);
assertEquals(operationInfo.getFaults().size(), 0);
@@ -114,10 +114,10 @@ public class OperationInfoTest extends Assert {
operationInfo.addFault(faultName, null);
fail("should get IllegalArgumentException");
} catch (IllegalArgumentException e) {
- assertEquals(e.getMessage(),
+ assertEquals(e.getMessage(),
"A fault with name [{urn:test:ns}fault] already exists in this operation");
}
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
index 690a717..7d78232 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthRestrictingStreamReaderTest.java
@@ -27,90 +27,90 @@ import org.junit.Assert;
import org.junit.Test;
public class DepthRestrictingStreamReaderTest extends Assert {
-
+
@Test
public void testReaderOK() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml"));
-
+
DepthRestrictingStreamReader dr = new DepthRestrictingStreamReader(reader,
- 7,
+ 7,
4,
4);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
StaxUtils.copy(dr, bos);
assertTrue(bos.toString().contains("ItemLookup"));
}
-
+
@Test
public void testReaderOKComplex() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/wstrustReqSTRC.xml"));
-
+
DepthRestrictingStreamReader dr = new DepthRestrictingStreamReader(reader,
- -1,
+ -1,
8,
3);
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
StaxUtils.copy(dr, bos);
assertTrue(bos.toString().contains("RequestSecurityTokenResponse"));
}
-
+
@Test(expected = DepthExceededStaxException.class)
public void testElementCountExceeded() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml"));
-
+
DepthRestrictingStreamReader dr = new DepthRestrictingStreamReader(reader,
- 6,
+ 6,
4,
4);
StaxUtils.copy(dr, new ByteArrayOutputStream());
}
-
+
@Test(expected = DepthExceededStaxException.class)
public void testElementLevelExceeded() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml"));
-
+
DepthRestrictingStreamReader dr = new DepthRestrictingStreamReader(reader,
- 7,
+ 7,
3,
4);
StaxUtils.copy(dr, new ByteArrayOutputStream());
}
-
+
@Test(expected = DepthExceededStaxException.class)
public void testElementLevelExceededComplex() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/wstrustReqSTRC.xml"));
-
+
DepthRestrictingStreamReader dr = new DepthRestrictingStreamReader(reader,
- -1,
+ -1,
7,
3);
StaxUtils.copy(dr, new ByteArrayOutputStream());
}
-
+
@Test(expected = DepthExceededStaxException.class)
public void testInnerElementCountExceeded() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml"));
-
+
DepthRestrictingStreamReader dr = new DepthRestrictingStreamReader(reader,
- 7,
+ 7,
4,
3);
StaxUtils.copy(dr, new ByteArrayOutputStream());
}
-
+
@Test(expected = DepthExceededStaxException.class)
public void testInnerElementCountExceededComplex() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/wstrustReqSTRC.xml"));
-
+
DepthRestrictingStreamReader dr = new DepthRestrictingStreamReader(reader,
- -1,
+ -1,
7,
2);
StaxUtils.copy(dr, new ByteArrayOutputStream());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
index b3554bb..502b845 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/DepthXMLStreamReaderTest.java
@@ -25,14 +25,14 @@ import org.junit.Assert;
import org.junit.Test;
public class DepthXMLStreamReaderTest extends Assert {
-
+
@Test
public void testReader() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml"));
-
+
DepthXMLStreamReader dr = new DepthXMLStreamReader(reader);
-
+
StaxUtils.toNextElement(dr);
assertEquals("ItemLookup", dr.getLocalName());
assertEquals(XMLStreamReader.START_ELEMENT, reader.getEventType());
@@ -54,7 +54,7 @@ public class DepthXMLStreamReaderTest extends Assert {
dr.next();
assertEquals("1E5AY4ZG53H4AMC8QH82", dr.getText());
-
+
dr.close();
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
index 0d85779..cb0981f 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/FragmentStreamReaderTest.java
@@ -30,30 +30,30 @@ public class FragmentStreamReaderTest extends Assert {
@Test
public void testReader() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(getClass().getResourceAsStream("./resources/amazon.xml"));
-
+
DepthXMLStreamReader dr = new DepthXMLStreamReader(reader);
-
+
StaxUtils.toNextElement(dr);
assertEquals("ItemLookup", dr.getLocalName());
assertEquals(XMLStreamReader.START_ELEMENT, reader.getEventType());
-
+
FragmentStreamReader fsr = new FragmentStreamReader(dr);
assertTrue(fsr.hasNext());
-
+
assertEquals(XMLStreamReader.START_DOCUMENT, fsr.getEventType());
-
+
fsr.next();
assertEquals("ItemLookup", fsr.getLocalName());
assertEquals("ItemLookup", dr.getLocalName());
assertEquals(XMLStreamReader.START_ELEMENT, reader.getEventType());
-
+
fsr.close();
}
-
-
+
+
@Test
public void testEvents() throws Exception {
String test = "<foo><foo2/></foo>";
@@ -70,14 +70,14 @@ public class FragmentStreamReaderTest extends Assert {
reader = new FragmentStreamReader(reader, false);
assertEvents(reader, 7, 1, 1, 2, 2, 8);
-
+
//test a partial stream, skip over the startdoc even prior to creating
//the FragmentStreamReader to make sure the event could be generated
reader = StaxUtils.createXMLStreamReader(new StringReader(test));
reader.next();
reader = new FragmentStreamReader(reader);
assertEvents(reader, 7, 1, 1, 2, 2, 8);
-
+
reader = StaxUtils.createXMLStreamReader(new StringReader(test));
reader.next();
reader = new FragmentStreamReader(reader, true);
@@ -88,7 +88,7 @@ public class FragmentStreamReaderTest extends Assert {
reader = new FragmentStreamReader(reader, false);
assertEvents(reader, 1, 1, 2, 2);
}
-
+
private void assertEvents(XMLStreamReader reader, int initial, int ... events) throws Exception {
assertEquals(initial, reader.getEventType());
for (int x : events) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
index 7415edf..b376eb4 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PartialXMLStreamReaderTest.java
@@ -34,8 +34,8 @@ public class PartialXMLStreamReaderTest extends Assert {
@Test
public void testReader() throws Exception {
- String test =
- "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+ String test =
+ "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+ "<soap:Header>"
+ "<ns2:SoapHeaderIn xmlns:ns4=\"http://cxf.apache.org/transform/fault\" "
+ "xmlns:ns3=\"http://cxf.apache.org/transform/header/element\" "
@@ -53,22 +53,22 @@ public class PartialXMLStreamReaderTest extends Assert {
+ "xmlns:ns3=\"http://cxf.apache.org/transform/header/element\" "
+ "xmlns:ns4=\"http://cxf.apache.org/transform/fault\" />"
+ "</soap:Body></soap:Envelope>";
-
- XMLStreamReader reader =
+
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(new StringReader(test));
QName bodyTag = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body");
PartialXMLStreamReader filteredReader = new PartialXMLStreamReader(reader, bodyTag);
-
+
Document doc = StaxUtils.read(filteredReader);
-
+
assertNotNull(doc);
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(bos);
StaxUtils.copy(doc, writer);
writer.flush();
String value = bos.toString();
-
+
assertTrue(("<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+ "<soap:Header>"
+ "<ns2:SoapHeaderIn xmlns=\"http://cxf.apache.org/transform/test\" "
@@ -82,7 +82,7 @@ public class PartialXMLStreamReaderTest extends Assert {
+ "<soap:Body/>"
+ "</soap:Envelope>").
equals(value.trim()));
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
index c975895..93eb19a 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/PropertiesExpandingStreamReaderTest.java
@@ -42,10 +42,10 @@ public class PropertiesExpandingStreamReaderTest extends Assert {
XMLStreamReader reader = new PropertiesExpandingStreamReader(
StaxUtils.createXMLStreamReader(getTestStream("./resources/sysprops.xml")), map);
Document doc = StaxUtils.read(reader);
- Element abc = DOMUtils.getChildrenWithName(doc.getDocumentElement(),
+ Element abc = DOMUtils.getChildrenWithName(doc.getDocumentElement(),
"http://foo/bar", "abc").iterator().next();
assertEquals("fooBAR-VALUEfoo", abc.getTextContent());
- Element def = DOMUtils.getChildrenWithName(doc.getDocumentElement(),
+ Element def = DOMUtils.getChildrenWithName(doc.getDocumentElement(),
"http://foo/bar", "def").iterator().next();
assertEquals("ggggg", def.getTextContent());
assertEquals("BLAH-VALUE2", def.getAttribute("myAttr"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
index ae5b2a3..47b83fc 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxStreamFilterTest.java
@@ -29,9 +29,9 @@ import org.junit.Assert;
import org.junit.Test;
public class StaxStreamFilterTest extends Assert {
- public static final QName SOAP_ENV =
+ public static final QName SOAP_ENV =
new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope");
- public static final QName SOAP_BODY =
+ public static final QName SOAP_BODY =
new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body");
@Test
@@ -40,12 +40,12 @@ public class StaxStreamFilterTest extends Assert {
String soapMessage = "./resources/sayHiRpcLiteralReq.xml";
XMLStreamReader reader = StaxUtils.createXMLStreamReader(getTestStream(soapMessage));
reader = StaxUtils.createFilteredReader(reader, filter);
-
+
DepthXMLStreamReader dr = new DepthXMLStreamReader(reader);
StaxUtils.toNextElement(dr);
QName sayHi = new QName("http://apache.org/hello_world_rpclit", "sayHi");
-
+
assertEquals(sayHi, dr.getName());
}
@@ -55,7 +55,7 @@ public class StaxStreamFilterTest extends Assert {
String soapMessage = "./resources/greetMeRpcLitReq.xml";
XMLStreamReader reader = StaxUtils.createXMLStreamReader(getTestStream(soapMessage));
reader = StaxUtils.createFilteredReader(reader, filter);
-
+
DepthXMLStreamReader dr = new DepthXMLStreamReader(reader);
StaxUtils.toNextElement(dr);
@@ -72,16 +72,16 @@ public class StaxStreamFilterTest extends Assert {
StaxUtils.nextEvent(dr);
StaxUtils.toNextText(dr);
assertEquals("this is element 1", dr.getText());
-
+
StaxUtils.toNextElement(dr);
assertEquals(new QName("http://apache.org/hello_world_rpclit/types", "elem1"), dr.getName());
assertEquals(XMLStreamConstants.END_ELEMENT, dr.getEventType());
StaxUtils.nextEvent(dr);
StaxUtils.toNextElement(dr);
-
+
assertEquals(new QName("http://apache.org/hello_world_rpclit/types", "elem2"), dr.getName());
- }
+ }
private InputStream getTestStream(String file) {
return getClass().getResourceAsStream(file);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
index eda6049..8ac46da 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/StaxUtilsTest.java
@@ -86,7 +86,7 @@ public class StaxUtilsTest extends Assert {
assertTrue(StaxUtils.toNextElement(reader));
assertEquals("Body", reader.getLocalName());
}
-
+
@Test
public void testToNextTag() throws Exception {
String soapMessage = "./resources/headerSoapReq.xml";
@@ -95,24 +95,24 @@ public class StaxUtilsTest extends Assert {
reader.nextTag();
StaxUtils.toNextTag(reader, new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"));
assertEquals("Body", reader.getLocalName());
- }
-
+ }
+
@Test
public void testCopy() throws Exception {
-
+
// do the stream copying
- String soapMessage = "./resources/headerSoapReq.xml";
+ String soapMessage = "./resources/headerSoapReq.xml";
ByteArrayOutputStream baos = new ByteArrayOutputStream();
XMLStreamReader reader = StaxUtils.createXMLStreamReader(getTestStream(soapMessage));
XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(baos);
StaxUtils.copy(reader, writer);
writer.flush();
baos.flush();
-
+
// write output to a string
- String output = baos.toString();
+ String output = baos.toString();
baos.close();
-
+
// re-read the input xml doc to a string
InputStreamReader inputStreamReader = new InputStreamReader(getTestStream(soapMessage));
StringWriter stringWriter = new StringWriter();
@@ -130,14 +130,14 @@ public class StaxUtilsTest extends Assert {
input = input.substring(beginIndex);
beginIndex = output.indexOf("<soap:Envelope");
output = output.substring(beginIndex);
-
+
output = output.replaceAll("\r\n", "\n");
input = input.replaceAll("\r\n", "\n");
-
+
// compare the input and output string
assertEquals(input, output);
}
-
+
@Test
public void testCXF2468() throws Exception {
Document doc = DOMUtils.newDocument();
@@ -154,28 +154,28 @@ public class StaxUtilsTest extends Assert {
swriter.flush();
assertTrue("No xsi namespace: " + sw.toString(), sw.toString().contains("XMLSchema-instance"));
}
-
+
@Test
public void testNonNamespaceAwareParser() throws Exception {
String xml = "<blah xmlns=\"http://blah.org/\" xmlns:snarf=\"http://snarf.org\">"
+ "<foo snarf:blop=\"blop\">foo</foo></blah>";
-
+
StringReader reader = new StringReader(xml);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(false);
dbf.setValidating(false);
Document doc = dbf.newDocumentBuilder().parse(new InputSource(reader));
Source source = new DOMSource(doc);
-
+
dbf.setNamespaceAware(true);
reader = new StringReader(xml);
Document docNs = dbf.newDocumentBuilder().parse(new InputSource(reader));
Source sourceNs = new DOMSource(docNs);
-
-
+
+
XMLStreamReader sreader = StaxUtils.createXMLStreamReader(source);
-
+
StringWriter sw = new StringWriter();
XMLStreamWriter swriter = StaxUtils.createXMLStreamWriter(sw);
@@ -183,14 +183,14 @@ public class StaxUtilsTest extends Assert {
StaxUtils.copy(sreader, swriter);
swriter.flush();
swriter.close();
-
+
String output = sw.toString();
- assertTrue(output.contains("blah"));
- assertTrue(output.contains("foo"));
- assertTrue(output.contains("snarf"));
- assertTrue(output.contains("blop"));
-
-
+ assertTrue(output.contains("blah"));
+ assertTrue(output.contains("foo"));
+ assertTrue(output.contains("snarf"));
+ assertTrue(output.contains("blop"));
+
+
sreader = StaxUtils.createXMLStreamReader(sourceNs);
sw = new StringWriter();
swriter = StaxUtils.createXMLStreamWriter(sw);
@@ -198,36 +198,36 @@ public class StaxUtilsTest extends Assert {
StaxUtils.copy(sreader, swriter);
swriter.flush();
swriter.close();
-
+
output = sw.toString();
- assertTrue(output.contains("blah"));
- assertTrue(output.contains("foo"));
- assertTrue(output.contains("snarf"));
- assertTrue(output.contains("blop"));
+ assertTrue(output.contains("blah"));
+ assertTrue(output.contains("foo"));
+ assertTrue(output.contains("snarf"));
+ assertTrue(output.contains("blop"));
+
-
sreader = StaxUtils.createXMLStreamReader(source);
-
+
ByteArrayOutputStream bout = new ByteArrayOutputStream();
swriter = StaxUtils.createXMLStreamWriter(bout);
- StaxUtils.copy(sreader, swriter);
+ StaxUtils.copy(sreader, swriter);
swriter.flush();
swriter.close();
-
+
output = bout.toString();
- assertTrue(output.contains("blah"));
- assertTrue(output.contains("foo"));
- assertTrue(output.contains("snarf"));
- assertTrue(output.contains("blop"));
+ assertTrue(output.contains("blah"));
+ assertTrue(output.contains("foo"));
+ assertTrue(output.contains("snarf"));
+ assertTrue(output.contains("blop"));
}
-
+
@Test
public void testEmptyNamespace() throws Exception {
String testString = "<ns1:a xmlns:ns1=\"http://www.apache.org/\"><s1 xmlns=\"\">"
+ "abc</s1><s2 xmlns=\"\">def</s2></ns1:a>";
-
+
cycleString(testString);
-
+
testString = "<a xmlns=\"http://www.apache.org/\"><s1 xmlns=\"\">"
+ "abc</s1><s2 xmlns=\"\">def</s2></a>";
cycleString(testString);
@@ -235,36 +235,36 @@ public class StaxUtilsTest extends Assert {
testString = "<a xmlns=\"http://www.apache.org/\"><s1 xmlns=\"\">"
+ "abc</s1><s2>def</s2></a>";
cycleString(testString);
-
+
testString = "<ns1:a xmlns:ns1=\"http://www.apache.org/\"><s1>"
+ "abc</s1><s2 xmlns=\"\">def</s2></ns1:a>";
-
+
cycleString(testString);
}
-
+
private void cycleString(String s) throws Exception {
StringReader reader = new StringReader(s);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
Document doc = dbf.newDocumentBuilder().parse(new InputSource(reader));
String orig = StaxUtils.toString(doc.getDocumentElement());
-
+
StringWriter sw = new StringWriter();
XMLStreamWriter swriter = StaxUtils.createXMLStreamWriter(sw);
//should not throw an exception
StaxUtils.writeDocument(doc, swriter, false, true);
swriter.flush();
swriter.close();
-
+
String output = sw.toString();
assertEquals(s, output);
-
+
W3CDOMStreamWriter domwriter = new W3CDOMStreamWriter();
StaxUtils.writeDocument(doc, domwriter, false, true);
output = StaxUtils.toString(domwriter.getDocument().getDocumentElement());
assertEquals(orig, output);
}
-
+
@Test
public void testRootPI() throws Exception {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -279,7 +279,7 @@ public class StaxUtilsTest extends Assert {
assertTrue(output.contains("<?pi in='the sky'?>"));
assertTrue(output.contains("<?e excl='gads'?>"));
}
-
+
@Test
public void testRootPInoProlog() throws Exception {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -294,10 +294,10 @@ public class StaxUtilsTest extends Assert {
assertFalse(output.contains("<?pi in='the sky'?>"));
assertFalse(output.contains("<?e excl='gads'?>"));
}
-
+
@Test
public void testDefaultPrefix() throws Exception {
- String soapMessage = "./resources/AddRequest.xml";
+ String soapMessage = "./resources/AddRequest.xml";
ByteArrayOutputStream baos = new ByteArrayOutputStream();
XMLStreamReader reader = StaxUtils.createXMLStreamReader(getTestStream(soapMessage));
XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(baos);
@@ -387,31 +387,31 @@ public class StaxUtilsTest extends Assert {
StaxUtils.writeEvent(event, xwriter);
}
xwriter.flush();
-
+
String s = swriter.toString();
int idx = s.indexOf("xmlns:a");
idx = s.indexOf("xmlns:a", idx + 1);
- assertEquals(-1, idx);
- }
-
+ assertEquals(-1, idx);
+ }
+
@Test
public void testCopyWithEmptyNamespace() throws Exception {
StringBuilder in = new StringBuilder();
in.append("<foo xmlns=\"http://example.com/\">");
in.append("<bar xmlns=\"\"/>");
in.append("</foo>");
-
+
XMLStreamReader reader = StaxUtils.createXMLStreamReader(
new ByteArrayInputStream(in.toString().getBytes()));
-
+
Writer out = new StringWriter();
XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(out);
StaxUtils.copy(reader, writer);
writer.close();
-
+
assertEquals(in.toString(), out.toString());
}
-
+
@Test
public void testQName() throws Exception {
StringBuilder in = new StringBuilder();
@@ -423,7 +423,7 @@ public class StaxUtilsTest extends Assert {
XMLStreamReader reader = StaxUtils.createXMLStreamReader(
new ByteArrayInputStream(in.toString().getBytes()));
-
+
QName qname = new QName("http://example.com/", "Bar");
assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
assertEquals(XMLStreamReader.START_ELEMENT, reader.next());
@@ -441,7 +441,7 @@ public class StaxUtilsTest extends Assert {
// ignore
}
}
-
+
@Test
public void testCopyFromTheMiddle() throws Exception {
String innerXml =
@@ -477,5 +477,5 @@ public class StaxUtilsTest extends Assert {
//System.out.println(innerXml);
//System.out.println(sw.toString());
assertEquals(innerXml, sw.toString());
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
index 40b0be4..41af065 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/W3CDOMStreamReaderTest.java
@@ -39,8 +39,8 @@ import org.junit.Test;
public class W3CDOMStreamReaderTest extends Assert {
-
- private static final String RESULT =
+
+ private static final String RESULT =
"<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">"
+ "<SOAP-ENV:Header/><SOAP-ENV:Body/>"
+ "<Test xmlns=\"http://example.org/types\">"
@@ -69,7 +69,7 @@ public class W3CDOMStreamReaderTest extends Assert {
assertTrue(StaxUtils.toString(writer.getDocument()).endsWith(RESULT));
}
-
+
@Test
public void testTopLevelText() throws Exception {
ByteArrayInputStream is = new ByteArrayInputStream(
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
index 52b3ebe..dd477fb 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/DelegatingNamespaceContextTest.java
@@ -33,7 +33,7 @@ public class DelegatingNamespaceContextTest extends Assert {
@Test
public void testSomeAddsAndGets() throws Exception {
DelegatingNamespaceContext dnc = getTestDelegatingNamespaceContext();
-
+
dnc.down(); //1
dnc.addPrefix("p1", "urn:foo1");
dnc.addPrefix("p2", "urn:foo2");
@@ -45,7 +45,7 @@ public class DelegatingNamespaceContextTest extends Assert {
assertEquals("p2", dnc.getPrefix("urn:foo2"));
verifyPrefixes(dnc.getPrefixes("urn:foo1"), new String[]{"p1"});
verifyPrefixes(dnc.getPrefixes("urn:foo2"), new String[]{"p2"});
-
+
dnc.down(); //2
dnc.addPrefix("p11", "urn:foo1");
dnc.addPrefix("p2", "urn:foo22");
@@ -81,9 +81,9 @@ public class DelegatingNamespaceContextTest extends Assert {
verifyPrefixes(dnc.getPrefixes("urn:foo1"), new String[]{"p1"});
verifyPrefixes(dnc.getPrefixes("urn:foo2"), new String[]{"p2"});
verifyPrefixes(dnc.getPrefixes("urn:foo3"), new String[]{});
-
+
dnc.up(); //0
-
+
try {
dnc.up(); //-1
fail("not allowed to go up");
@@ -95,7 +95,7 @@ public class DelegatingNamespaceContextTest extends Assert {
@Test
public void testSomeAddsWithDuplicatedPrefixName() throws Exception {
DelegatingNamespaceContext dnc = getTestDelegatingNamespaceContext();
-
+
dnc.down(); // 1
dnc.addPrefix("p00", "urn:foo0");
dnc.addPrefix("p1", "urn:foo1");
@@ -143,6 +143,6 @@ public class DelegatingNamespaceContextTest extends Assert {
}
assertTrue(tmp.isEmpty());
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
index f1022d5..191e02f 100644
--- a/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
+++ b/core/src/test/java/org/apache/cxf/staxutils/transform/InTransformReaderTest.java
@@ -42,220 +42,220 @@ public class InTransformReaderTest extends Assert {
public void testReadWithDefaultNamespace() throws Exception {
InputStream is = new ByteArrayInputStream("<test xmlns=\"http://bar\"/>".getBytes());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(is);
- reader = new InTransformReader(reader,
+ reader = new InTransformReader(reader,
Collections.singletonMap("{http://bar}test", "test2"),
null, null, null, false);
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
StaxUtils.copy(reader, bos);
String value = bos.toString();
- assertTrue("<test2 xmlns=\"\"/>".equals(value));
+ assertTrue("<test2 xmlns=\"\"/>".equals(value));
}
-
+
@Test
public void testReplaceSimpleElement() throws Exception {
InputStream is = new ByteArrayInputStream(
"<ns:test xmlns:ns=\"http://bar\"><ns:a>1</ns:a></ns:test>".getBytes());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(is);
- reader = new InTransformReader(reader,
+ reader = new InTransformReader(reader,
null,
Collections.singletonMap("{http://bar}a", "{http://bar}a=1 2 3"),
- null,
+ null,
null, false);
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
StaxUtils.copy(reader, bos);
String value = bos.toString();
- assertEquals("<ns:test xmlns:ns=\"http://bar\"><ns:a>1 2 3</ns:a></ns:test>", value);
+ assertEquals("<ns:test xmlns:ns=\"http://bar\"><ns:a>1 2 3</ns:a></ns:test>", value);
}
-
+
@Test
public void testTransformAndReplaceSimpleElement() throws Exception {
InputStream is = new ByteArrayInputStream(
"<ns:test xmlns:ns=\"http://bar\"><ns:a>1</ns:a></ns:test>".getBytes());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(is);
- reader = new InTransformReader(reader,
+ reader = new InTransformReader(reader,
Collections.singletonMap("{http://bar}*", "{http://foo}*"),
Collections.singletonMap("{http://bar}a", "{http://bar}a=1 2 3"),
- null,
+ null,
null, false);
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
StaxUtils.copy(reader, bos);
String value = bos.toString();
assertEquals(
- "<ns:test xmlns:ns=\"http://foo\"><ns:a>1 2 3</ns:a></ns:test>", value);
+ "<ns:test xmlns:ns=\"http://foo\"><ns:a>1 2 3</ns:a></ns:test>", value);
}
-
+
@Test
public void testReadWithParentDefaultNamespace() throws Exception {
InputStream is = new ByteArrayInputStream(
"<test xmlns=\"http://bar\"><ns:subtest xmlns:ns=\"http://bar1\"/></test>".getBytes());
XMLStreamReader reader = StaxUtils.createXMLStreamReader(is);
- reader = new InTransformReader(reader,
- Collections.singletonMap("{http://bar1}subtest", "subtest"),
+ reader = new InTransformReader(reader,
+ Collections.singletonMap("{http://bar1}subtest", "subtest"),
null, null, null, false);
-
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
StaxUtils.copy(reader, bos);
String value = bos.toString();
assertEquals("<test xmlns=\"http://bar\"><subtest xmlns=\"\"/></test>",
- value);
+ value);
}
-
+
// additional test cases
@Test
public void testReadWithComplexRequestSameNamespace() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReqIn1.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/complexReqIn1.xml"));
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/element}*");
-
- reader = new InTransformReader(reader,
+
+ reader = new InTransformReader(reader,
inMap, null, null,
null, false);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
InTransformReader.class.getResourceAsStream("../resources/complexReq1.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, true);
}
-
+
@Test
public void testReadWithComplexRequestMultipleNamespace() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReqIn2.xml"));
-
+ InTransformReader.class.getResourceAsStream("../resources/complexReqIn2.xml"));
+
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/otherelement}*");
- inMap.put("{http://cxf.apache.org/transform/test}*",
+ inMap.put("{http://cxf.apache.org/transform/test}*",
"{http://cxf.apache.org/transform/othertest}*");
-
- reader = new InTransformReader(reader,
+
+ reader = new InTransformReader(reader,
inMap, null, null,
null, false);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReq2.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/complexReq2.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, true);
}
-
+
@Test
public void testReadWithComplexTransformationNamespace() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReqIn3.xml"));
-
+ InTransformReader.class.getResourceAsStream("../resources/complexReqIn3.xml"));
+
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/otherelement}*");
- inMap.put("{http://cxf.apache.org/transform/test}*",
+ inMap.put("{http://cxf.apache.org/transform/test}*",
"{http://cxf.apache.org/transform/othertest}*");
- inMap.put("{http://schemas.xmlsoap.org/soap/envelope/}Envelope",
+ inMap.put("{http://schemas.xmlsoap.org/soap/envelope/}Envelope",
"{http://schemas.xmlsoap.org/soap/envelope/}TheEnvelope");
-
+
// set the block original reader flag to true
- reader = new InTransformReader(reader,
+ reader = new InTransformReader(reader,
inMap, null, null,
null, true);
- XMLStreamReader reader2 =
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReq3.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/complexReq3.xml"));
TransformTestUtils.verifyReaders(reader2, reader, true, true);
}
@Test
public void testReadPartialWithComplexRequestSameNamespace() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReqIn1.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/complexReqIn1.xml"));
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/element}*");
-
- reader = new InTransformReader(reader,
+
+ reader = new InTransformReader(reader,
inMap, null, null,
null, false);
-
+
QName bodyTag = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body");
PartialXMLStreamReader filteredReader = new PartialXMLStreamReader(reader, bodyTag);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReq1partial.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/complexReq1partial.xml"));
TransformTestUtils.verifyReaders(reader2, filteredReader, false, true);
}
-
+
@Test
public void testPartialReadWithComplexRequestMultipleNamespace() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReqIn2.xml"));
-
+ InTransformReader.class.getResourceAsStream("../resources/complexReqIn2.xml"));
+
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/otherelement}*");
- inMap.put("{http://cxf.apache.org/transform/test}*",
+ inMap.put("{http://cxf.apache.org/transform/test}*",
"{http://cxf.apache.org/transform/othertest}*");
-
- reader = new InTransformReader(reader,
+
+ reader = new InTransformReader(reader,
inMap, null, null,
null, false);
-
+
QName bodyTag = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body");
PartialXMLStreamReader filteredReader = new PartialXMLStreamReader(reader, bodyTag);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReq2partial.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/complexReq2partial.xml"));
TransformTestUtils.verifyReaders(reader2, filteredReader, false, true);
}
-
+
@Test
public void testPartialReadWithComplexTransformationNamespace() throws Exception {
- XMLStreamReader reader =
+ XMLStreamReader reader =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReqIn3.xml"));
-
+ InTransformReader.class.getResourceAsStream("../resources/complexReqIn3.xml"));
+
Map<String, String> inMap = new HashMap<String, String>();
- inMap.put("{http://cxf.apache.org/transform/header/element}*",
+ inMap.put("{http://cxf.apache.org/transform/header/element}*",
"{http://cxf.apache.org/transform/header/otherelement}*");
- inMap.put("{http://cxf.apache.org/transform/test}*",
+ inMap.put("{http://cxf.apache.org/transform/test}*",
"{http://cxf.apache.org/transform/othertest}*");
- inMap.put("{http://schemas.xmlsoap.org/soap/envelope/}Envelope",
+ inMap.put("{http://schemas.xmlsoap.org/soap/envelope/}Envelope",
"{http://schemas.xmlsoap.org/soap/envelope/}TheEnvelope");
-
+
// set the block original reader flag to true
- reader = new InTransformReader(reader,
+ reader = new InTransformReader(reader,
inMap, null, null,
null, true);
-
+
QName bodyTag = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body");
PartialXMLStreamReader filteredReader = new PartialXMLStreamReader(reader, bodyTag);
-
- XMLStreamReader reader2 =
+
+ XMLStreamReader reader2 =
StaxUtils.createXMLStreamReader(
- InTransformReader.class.getResourceAsStream("../resources/complexReq3partial.xml"));
+ InTransformReader.class.getResourceAsStream("../resources/complexReq3partial.xml"));
TransformTestUtils.verifyReaders(reader2, filteredReader, false, true);
}
-
-
+
+
@Test
public void testReadWithReplaceAppend() throws Exception {
Map<String, String> transformElements = new HashMap<String, String>();
transformElements.put("requestValue",
"{http://cxf.apache.org/hello_world_soap_http/types}requestType");
-
+
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("requestValue",
"{http://cxf.apache.org/hello_world_soap_http/types}greetMe");
- TransformTestUtils.transformInStreamAndCompare("../resources/greetMeReqIn1.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/greetMeReqIn1.xml",
"../resources/greetMeReq.xml",
transformElements, appendElements, null, null, null);
}
@@ -267,21 +267,21 @@ public class InTransformReaderTest extends Assert {
"{http://cxf.apache.org/hello_world_soap_http/types}requestType");
transformElements.put("{http://cxf.apache.org/hello_world_soap_http/types}requestDate",
"");
-
+
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("requestValue",
"{http://cxf.apache.org/hello_world_soap_http/types}greetMe");
-
+
List<String> dropElements = new ArrayList<>();
dropElements.add("value");
-
+
Map<String, String> transformAttributes = new HashMap<String, String>();
transformAttributes.put("num", "");
transformAttributes.put("nombre", "{http://cxf.apache.org/hello_world_soap_http/types}name");
-
- TransformTestUtils.transformInStreamAndCompare("../resources/greetMeReqIn2.xml",
+
+ TransformTestUtils.transformInStreamAndCompare("../resources/greetMeReqIn2.xml",
"../resources/greetMeReq.xml",
- transformElements, appendElements, dropElements,
+ transformElements, appendElements, dropElements,
transformAttributes, null);
}
@@ -291,7 +291,7 @@ public class InTransformReaderTest extends Assert {
transformElements.put("*",
"{http://cxf.apache.org/hello_world_soap_http/types}*");
- TransformTestUtils.transformInStreamAndCompare("../resources/greetMeReqIn3.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/greetMeReqIn3.xml",
"../resources/greetMeReq.xml",
transformElements, null, null, null, null);
}
@@ -302,20 +302,20 @@ public class InTransformReaderTest extends Assert {
transformAttributes.put("{http://www.w3.org/2001/XMLSchema-instance}type",
"");
- TransformTestUtils.transformInStreamAndCompare("../resources/greetMeReqIn4.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/greetMeReqIn4.xml",
"../resources/greetMeReq.xml",
null, null, null, transformAttributes, null);
}
-
+
@Test
public void testReadWithAppendPreInclude1() throws Exception {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId",
"{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN");
- TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn1.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn1.xml",
"../resources/amazon.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -323,10 +323,10 @@ public class InTransformReaderTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId",
"{http://xml.amazon.com/AWSECommerceService/2004-08-01}IdType=ASIN");
- TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn1nospace.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn1nospace.xml",
"../resources/amazon.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -337,7 +337,7 @@ public class InTransformReaderTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://apache.org/cxf/calculator/types}add",
"{http://www.w3.org/2003/05/soap-envelope}Body");
- TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn2.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn2.xml",
"../resources/AddRequest2.xml",
transformElements, appendElements, null, null, null);
}
@@ -350,7 +350,7 @@ public class InTransformReaderTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://apache.org/cxf/calculator/types}add",
"{http://www.w3.org/2003/05/soap-envelope}Body");
- TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn2nospace.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn2nospace.xml",
"../resources/AddRequest2.xml",
transformElements, appendElements, null, null, null);
}
@@ -360,10 +360,10 @@ public class InTransformReaderTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/",
"{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214");
- TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn2.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn2.xml",
"../resources/amazon.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -371,10 +371,10 @@ public class InTransformReaderTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://xml.amazon.com/AWSECommerceService/2004-08-01}Request/",
"{http://xml.amazon.com/AWSECommerceService/2004-08-01}ItemId=0486411214");
- TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn2nospace.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/amazonIn2nospace.xml",
"../resources/amazon.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -382,10 +382,10 @@ public class InTransformReaderTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/",
"{http://apache.org/cxf/calculator/types}add");
- TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn1.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn1.xml",
"../resources/AddRequest.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -393,10 +393,10 @@ public class InTransformReaderTest extends Assert {
Map<String, String> appendElements = new HashMap<String, String>();
appendElements.put("{http://www.w3.org/2003/05/soap-envelope}Body/",
"{http://apache.org/cxf/calculator/types}add");
- TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn1nospace.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn1nospace.xml",
"../resources/AddRequest.xml",
null, appendElements, null, null, null);
-
+
}
@Test
@@ -418,10 +418,10 @@ public class InTransformReaderTest extends Assert {
List<String> dropElements = new ArrayList<>();
dropElements.add("param");
- TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn3.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/AddRequestIn3.xml",
"../resources/AddRequest3.xml",
transformElements, appendElements, dropElements, null, null);
-
+
}
@Test
@@ -430,12 +430,12 @@ public class InTransformReaderTest extends Assert {
transformElements.put("{http://docs.oasis-open.org/ws-sx/ws-trust/200512}*",
"{http://schemas.xmlsoap.org/ws/2005/02/trust}*");
-
- TransformTestUtils.transformInStreamAndCompare("../resources/wstrustReqSTRCIn1.xml",
+
+ TransformTestUtils.transformInStreamAndCompare("../resources/wstrustReqSTRCIn1.xml",
"../resources/wstrustReqSTRC.xml",
transformElements, null, null, null, null);
-
+
}
@Test
@@ -444,7 +444,7 @@ public class InTransformReaderTest extends Assert {
transformElements.put("{urn:abc}*",
"{urn:a}*");
- TransformTestUtils.transformInStreamAndCompare("../resources/multiNSIn1.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/multiNSIn1.xml",
"../resources/multiNS.xml",
transformElements, null, null, null, null);
}
@@ -454,10 +454,10 @@ public class InTransformReaderTest extends Assert {
Map<String, String> transformElements = new HashMap<String, String>();
transformElements.put("{http://bar.com/foo}*",
"{http://bar.com/foobar}*");
- TransformTestUtils.transformInStreamAndCompare("../resources/multiNS2In1.xml",
+ TransformTestUtils.transformInStreamAndCompare("../resources/multiNS2In1.xml",
"../resources/multiNS2.xml",
transformElements, null, null, null, null);
-
+
}
}
[08/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
index 4b11c93..03b4d63 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
@@ -32,32 +32,32 @@ import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Test;
/**
- *
+ *
*/
public class TypeCreationOptionsSpringTest extends AbstractCXFSpringTest {
public static final String PORT = TestUtil.getPortNumber(TypeCreationOptionsSpringTest.class);
-
-
+
+
@Override
protected String[] getConfigLocations() {
setConfigContextClass(TypeCreationOptionsSpringTest.class);
return new String[] {"/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml"};
}
-
- @Test
+
+ @Test
public void testMinOccurs() throws Exception {
TestUtilities testUtilities = new TestUtilities(TypeCreationOptionsSpringTest.class);
testUtilities.setBus(getBean(Bus.class, "cxf"));
testUtilities.addDefaultNamespaces();
testUtilities.addNamespace("ts", "http://cxf.org.apache/service");
//{urn:org.apache.cxf.aegis}arrayService
- Server s = testUtilities.getServerForService(new QName("urn:org.apache.cxf.aegis",
+ Server s = testUtilities.getServerForService(new QName("urn:org.apache.cxf.aegis",
"arrayService"));
Document wsdl = testUtilities.getWSDLDocument(s);
- assertXPathEquals("//xsd:complexType[@name='ArrayOfInt']/"
- + "xsd:sequence/xsd:element[@name='int']/@minOccurs",
+ assertXPathEquals("//xsd:complexType[@name='ArrayOfInt']/"
+ + "xsd:sequence/xsd:element[@name='int']/@minOccurs",
"3", wsdl);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
index 0ca9a45..504ac15 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
@@ -20,7 +20,7 @@
package org.apache.cxf.aegis.type.array;
public class DuplicateArrayReturnItem implements Comparable<Object> {
-
+
String name;
public int compareTo(Object arg0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java
index 586f9a7..7a68c66 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java
@@ -26,20 +26,20 @@ import javax.jws.WebService;
@WebService(name = "DuplicateArray", targetNamespace = "urn:org.apache.cxf.aegis.type.java5")
public interface DuplicateArrayService {
-
+
@WebMethod()
DuplicateArrayReturnItem[] lookup(String indexid);
-
+
@WebMethod
List<List<DuplicateArrayReturnItem>> lookupBatch(String indexid);
-
- @WebMethod
+
+ @WebMethod
Foo<String> doFoo(Foo<Integer> foo);
-
-
+
+
class Foo<T> {
List<T> list;
-
+
public void setList(List<T> l) {
list = l;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java
index 2faaa1e..f1ae611 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java
@@ -35,7 +35,7 @@ public class DuplicateArrayServiceBean implements DuplicateArrayService {
public List<List<DuplicateArrayReturnItem>> lookupBatch(String indexid) {
return null;
}
-
+
@WebMethod
public Foo<String> doFoo(Foo<Integer> foo) {
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java
index a083cae..1771af0 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java
@@ -19,14 +19,14 @@
package org.apache.cxf.aegis.type.array;
public class FlatArrayService implements FlatArrayServiceInterface {
-
+
String[] stringArrayValue;
BeanWithFlatArray beanWithFlatArrayValue;
BeanWithFlatCollection beanWithFlatCollection;
-
+
public FlatArrayService() {
}
-
+
/** {@inheritDoc}*/
public String[] getStringArrayValue() {
return new String[] {"bleh", "bleh"};
@@ -36,12 +36,12 @@ public class FlatArrayService implements FlatArrayServiceInterface {
public void submitStringArray(String[] array) {
stringArrayValue = array;
}
-
+
/** {@inheritDoc}*/
public void takeBeanWithFlatArray(BeanWithFlatArray bwfa) {
beanWithFlatArrayValue = bwfa;
}
-
+
public BeanWithFlatCollection echoBeanWithFlatCollection(BeanWithFlatCollection c) {
beanWithFlatCollection = c;
return c;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java
index 2aae725..6fc560b 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java
@@ -25,7 +25,7 @@ public interface FlatArrayServiceInterface {
void submitStringArray(String[] array);
void takeBeanWithFlatArray(BeanWithFlatArray bwfa);
-
+
BeanWithFlatCollection echoBeanWithFlatCollection(BeanWithFlatCollection c);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java
index ec6af3a..3ad70f9 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java
@@ -28,6 +28,6 @@ public class BadBeanDescriptor {
public void setProperty(String property) {
this.property = property;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
index 6fe2154..b03a0af 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
@@ -757,23 +757,23 @@ public class BeanTest extends AbstractAegisTest {
this.howdy = howdy;
}
}
-
+
public interface SerializableBean extends Serializable {
String getString();
}
-
+
public interface CloneableBean extends Cloneable {
String getString();
}
-
+
public interface SimpleInterface {
String getString();
}
-
+
public interface ExtendingInterface extends SimpleInterface {
String getAnotherString();
}
-
+
public enum EnumBean {
VALUE1, VALUE2;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
index 1a93785..7cfb0e6 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
@@ -51,7 +51,7 @@ public class ByteDataTest extends AbstractAegisTest {
addNamespace("wsdl", WSDLConstants.NS_WSDL11);
addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
addNamespace("xsd", WSDLConstants.NS_SCHEMA_XSD);
-
+
assertValid("//xsd:element[@name='data'][@type='xsd:base64Binary']", doc);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
index 7c88f25..d41ba02 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
@@ -47,76 +47,76 @@ public class DateTimezoneTest extends AbstractAegisTest {
context.initialize();
mapping = context.getTypeMapping();
}
-
+
@Test
public void testTimezoneLessCalendar() throws Exception {
BeanTypeInfo info = new BeanTypeInfo(CalendarBean.class, "urn:Bean");
mapping.register(Calendar.class, Constants.XSD_DATETIME, new TimezoneLessDateType());
- mapping.register(Calendar.class, Constants.XSD_DATE, new TimezoneLessDateType());
+ mapping.register(Calendar.class, Constants.XSD_DATE, new TimezoneLessDateType());
info.setTypeMapping(mapping);
-
+
BeanType type = new BeanType(info);
type.setTypeClass(CalendarBean.class);
type.setTypeMapping(mapping);
type.setSchemaType(new QName("urn:Bean", "bean"));
-
+
CalendarBean bean = new CalendarBean();
bean.setCalendar(Calendar.getInstance());
// Test writing
Element element = writeObjectToElement(type, bean, getContext());
-
+
assertTimezoneLessString(element.getTextContent());
}
-
+
@Test
public void testTimezoneLessDate() throws Exception {
BeanTypeInfo info = new BeanTypeInfo(DateBean.class, "urn:Bean");
mapping.register(Date.class, Constants.XSD_DATETIME, new TimezoneLessDateType());
- mapping.register(Date.class, Constants.XSD_DATE, new TimezoneLessDateType());
+ mapping.register(Date.class, Constants.XSD_DATE, new TimezoneLessDateType());
info.setTypeMapping(mapping);
-
+
BeanType type = new BeanType(info);
type.setTypeClass(DateBean.class);
type.setTypeMapping(mapping);
type.setSchemaType(new QName("urn:Bean", "bean"));
-
+
DateBean bean = new DateBean();
bean.setDate(Calendar.getInstance().getTime());
// Test writing
Element element = writeObjectToElement(type, bean, getContext());
assertTimezoneLessString(element.getTextContent());
-
+
}
-
+
private void assertTimezoneLessString(String dateString) {
assertTrue(dateString.length() <= 10);
assertFalse(dateString.contains("+"));
assertFalse(dateString.contains("Z"));
}
-
+
//TODO add tests with Timezones
-
+
public static class CalendarBean {
private Calendar calendar;
-
+
public Calendar getCalendar() {
return calendar;
}
-
+
public void setCalendar(Calendar calendar) {
this.calendar = calendar;
}
}
-
+
public static class DateBean {
private Date date;
-
+
public Date getDate() {
return date;
}
-
+
public void setDate(Date date) {
this.date = date;
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
index 81c0b6f..aa752dc 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
@@ -36,7 +36,7 @@ public class DynamicProxyTest extends AbstractAegisTest {
context.initialize();
mapping = context.getTypeMapping();
}
-
+
@Test
public void testDynamicProxy() throws Exception {
BeanType type = new BeanType();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
index e5965e7..e33b92e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
@@ -38,19 +38,19 @@ public class QualificationTest extends AbstractAegisTest {
public void setUp() throws Exception {
super.setUp();
-
+
addNamespace("b", "urn:Bean");
addNamespace("xyzzy", "urn:xyzzy");
addNamespace("pkg", "http://services.aegis.cxf.apache.org");
addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
}
-
+
@Test
public void testAnnotatedDefaultUnqualifiedAttribute() throws Exception {
AegisContext context = new AegisContext();
context.initialize();
TypeMapping mapping = context.getTypeMapping();
-
+
AegisType type = mapping.getTypeCreator().createType(AttributeBean.class);
type.setSchemaType(new QName("urn:Bean", "bean"));
@@ -62,17 +62,17 @@ public class QualificationTest extends AbstractAegisTest {
assertValid("/b:root[@attrPlainString]", element);
assertXPathEquals("/b:root/@attrPlainString", "attrPlain", element);
}
-
+
@Test
public void testAnnotatedDefaultQualifiedAttribute() throws Exception {
AegisContext context = new AegisContext();
- TypeCreationOptions typeCreationOptions =
+ TypeCreationOptions typeCreationOptions =
new TypeCreationOptions();
typeCreationOptions.setQualifyAttributes(true);
context.setTypeCreationOptions(typeCreationOptions);
context.initialize();
TypeMapping mapping = context.getTypeMapping();
-
+
AegisType type = mapping.getTypeCreator().createType(AttributeBean.class);
type.setSchemaType(new QName("urn:Bean", "bean"));
@@ -89,28 +89,28 @@ public class QualificationTest extends AbstractAegisTest {
AegisContext context = new AegisContext();
context.initialize();
TypeMapping mapping = context.getTypeMapping();
-
+
AegisType type = mapping.getTypeCreator().createType(XmlMappedAttributeBean.class);
type.setSchemaType(new QName("urn:Bean", "bean"));
Context messageContext = new Context(context);
XmlMappedAttributeBean bean = new XmlMappedAttributeBean();
-
+
Element element = writeObjectToElement(type, bean, messageContext);
assertValid("/b:root[@attrXmlString]", element);
assertXPathEquals("/b:root/@attrXmlString", "attrXml", element);
}
-
+
@Test
public void testXmlDefaultQualifiedAttribute() throws Exception {
AegisContext context = new AegisContext();
- TypeCreationOptions typeCreationOptions =
+ TypeCreationOptions typeCreationOptions =
new TypeCreationOptions();
typeCreationOptions.setQualifyAttributes(true);
context.setTypeCreationOptions(typeCreationOptions);
context.initialize();
TypeMapping mapping = context.getTypeMapping();
-
+
AegisType type = mapping.getTypeCreator().createType(XmlMappedAttributeBean.class);
type.setSchemaType(new QName("urn:Bean", "bean"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
index 6349554..19d1e42 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
@@ -67,7 +67,7 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
// serialization root type
trailingBlocks = new TrailingBlocks();
}
-
+
protected Context getContext() {
AegisContext globalContext = new AegisContext();
globalContext.initialize();
@@ -77,7 +77,7 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
public <T> T readWriteReadRef(String file, Class<T> typeClass) throws XMLStreamException {
Context context = getContext();
-
+
AegisType type = mapping.getType(typeClass);
assertNotNull("no type found for " + typeClass.getName());
@@ -88,7 +88,7 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
// write value to element
Element element = writeRef(value);
-
+
// reread value from element
value = typeClass.cast(readRef(element));
@@ -142,7 +142,7 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
// create the document
Element element = createElement("urn:Bean", "root", "b");
MapNamespaceContext namespaces = new MapNamespaceContext();
- // we should not add the out namespace here, as it is not a part of root element
+ // we should not add the out namespace here, as it is not a part of root element
/*for (Map.Entry<String, String> entry : getNamespaces().entrySet()) {
namespaces.addNamespace(entry.getKey(), entry.getValue());
}*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
index 55d89f5..f39ffff 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
@@ -126,7 +126,7 @@ public class SoapArrayTypeTest extends AbstractEncodedTest {
new Object[]{42, new BigDecimal("42.42"), "Forty Two"},
objects);
}
-
+
@Test
public void testUrTypeArrayReadWriteRef1() throws Exception {
Object[] objects;
@@ -141,7 +141,7 @@ public class SoapArrayTypeTest extends AbstractEncodedTest {
// round trip tests
objects = readWriteReadRef("arrayUrType2.xml", Object[].class);
assertArrayEquals(new Object[]{42, new BigDecimal("42.42"), "Forty Two"}, objects);
-
+
}
@Test
@@ -312,7 +312,7 @@ public class SoapArrayTypeTest extends AbstractEncodedTest {
if (strings[i][j] != null) {
assertEquals(4, strings[i][j].length);
for (int k = 0; k < strings[i][j].length; k++) {
- assertNull("strings[" + i + "][" + j + "][" + k + "] is not null",
+ assertNull("strings[" + i + "][" + j + "][" + k + "] is not null",
strings[i][j][k]);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
index c3aa7b2..9a93b11 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
public class StructTypeTest extends AbstractEncodedTest {
private StructType addressType;
private StructType purchaseOrderType;
-
+
private Context getLocalContext() {
AegisContext aegisContext = new AegisContext();
return new Context(aegisContext);
@@ -81,7 +81,7 @@ public class StructTypeTest extends AbstractEncodedTest {
reader.getXMLStreamReader().close();
// Test writing
- Element element = writeObjectToElement(addressType, address, getLocalContext());
+ Element element = writeObjectToElement(addressType, address, getLocalContext());
validateShippingAddress(element);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
index 912e501..f49a475 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
@@ -52,7 +52,7 @@ public class ClassTest extends AbstractAegisTest {
AegisContext context = new AegisContext();
context.initialize();
context.getTypeMapping().register(new ClassAsStringType());
-
+
ServerFactoryBean b = new ServerFactoryBean();
b.setDataBinding(new AegisDatabinding(context));
b.setServiceClass(GenericsService.class);
@@ -80,21 +80,21 @@ public class ClassTest extends AbstractAegisTest {
return type.newInstance();
}
}
-
-
+
+
public static class ClassAsStringType extends AegisType {
-
- public static final QName CLASS_AS_STRING_TYPE_QNAME
+
+ public static final QName CLASS_AS_STRING_TYPE_QNAME
= new QName("http://cxf.apache.org/my/class/test", "class");
-
+
private StringType stringType;
-
+
public ClassAsStringType() {
stringType = new StringType();
super.setTypeClass(Class.class);
super.setSchemaType(CLASS_AS_STRING_TYPE_QNAME);
}
-
+
public Object readObject(MessageReader reader, Context context)
throws DatabindingException {
String className = (String) stringType.readObject(reader, context);
@@ -107,8 +107,8 @@ public class ClassTest extends AbstractAegisTest {
}
return cls;
}
-
- public void writeObject(Object object, MessageWriter writer, Context context)
+
+ public void writeObject(Object object, MessageWriter writer, Context context)
throws DatabindingException {
if (object == null) {
stringType.writeObject(null, writer, context);
@@ -120,15 +120,15 @@ public class ClassTest extends AbstractAegisTest {
public void writeSchema(XmlSchema root) {
XmlSchemaSimpleType xst = new XmlSchemaSimpleType(root, true);
xst.setName("class");
-
+
XmlSchemaSimpleTypeRestriction content = new XmlSchemaSimpleTypeRestriction();
content.setBaseTypeName(Constants.XSD_STRING);
xst.setContent(content);
}
-
+
public boolean usesUtilityTypes() {
return true;
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
index 9ae6597..5cb0b6a 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
@@ -35,9 +35,9 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class CollectionService implements CollectionServiceInterface {
-
+
private Map<String, Map<String, BeanWithGregorianDate>> lastComplexMap;
-
+
/** {@inheritDoc}*/
public Collection<String> getStrings() {
return null;
@@ -56,11 +56,11 @@ public class CollectionService implements CollectionServiceInterface {
public Collection<Collection<String>> getStringCollections() {
return null;
}
-
+
/** {@inheritDoc}*/
public void takeDoubleList(List<Double> doublesList) {
}
-
+
/** {@inheritDoc}*/
public String takeSortedStrings(SortedSet<String> strings) {
return strings.first();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
index d685b74..f7c469d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
@@ -42,18 +42,18 @@ public interface CollectionServiceInterface {
void takeDoubleList(List<Double> doublesList);
String takeSortedStrings(SortedSet<String> strings);
-
+
//CHECKSTYLE:OFF
String takeUnsortedSet(HashSet<String> strings);
String takeStack(Stack<String> strings);
String takeArrayList(ArrayList<String> strings);
//CHECKSTYLE:ON
-
+
void method1(List<String> headers1);
-
- void mapOfMapWithStringAndPojo(Map<String, Map<String, BeanWithGregorianDate>> bigParam);
-
+
+ void mapOfMapWithStringAndPojo(Map<String, Map<String, BeanWithGregorianDate>> bigParam);
+
Collection<double[]> returnCollectionOfPrimitiveArrays();
-
+
Collection<Document[]> returnCollectionOfDOMFragments();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
index 71d8180..0a3dfa4 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
@@ -174,7 +174,7 @@ public class CollectionTest extends AbstractAegisTest {
@Test
public void testCollectionServiceWSDL() throws Exception {
-
+
createService(CollectionServiceInterface.class, new CollectionService(), null);
Document wsdl = getWSDLDocument("CollectionServiceInterface");
@@ -182,7 +182,7 @@ public class CollectionTest extends AbstractAegisTest {
}
@Test
- public void testUnannotatedStrings() throws Exception {
+ public void testUnannotatedStrings() throws Exception {
createService(CollectionServiceInterface.class, new CollectionService(), null);
Document doc = getWSDLDocument("CollectionServiceInterface");
@@ -192,7 +192,7 @@ public class CollectionTest extends AbstractAegisTest {
+ "/xsd:sequence/xsd:element[@type='tns:ArrayOfString']",
doc);
}
-
+
@Test
public void testDoubleList() throws Exception {
createService(CollectionServiceInterface.class, new CollectionService(), null);
@@ -201,9 +201,9 @@ public class CollectionTest extends AbstractAegisTest {
"//xsd:complexType[@name='ArrayOfDouble']"
+ "/xsd:sequence/xsd:element[@type='xsd:double']",
doc);
-
+
}
-
+
/**
* CXF-1833 complained of a bizarre schema when @@WebParaming a parameter of List<String>. This regression
* test captures the fact that we don't, in fact, have this problem with correct use of JAX-WS.
@@ -217,12 +217,12 @@ public class CollectionTest extends AbstractAegisTest {
assertInvalid("//xsd:schema[@targetNamespace='http://util.java']",
doc);
}
-
-
+
+
@Test
public void testNestedMapType() throws Exception {
- Method m = CollectionService.class.getMethod("mapOfMapWithStringAndPojo",
+ Method m = CollectionService.class.getMethod("mapOfMapWithStringAndPojo",
new Class[] {Map.class});
AegisType type = creator.createType(m, 0);
tm.register(type);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
index d75b5e2..6c95545 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
@@ -40,9 +40,9 @@ public class DualOutServiceTest extends AbstractAegisTest {
Document wsdl = getWSDLDocument("DualOutService");
assertNotNull(wsdl);
-
+
addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
-
+
assertValid(
"//xsd:complexType[@name='getValuesResponse']//xsd:element"
+ "[@name='return'][@type='xsd:string']",
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
index c3f1550..96dd683 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
@@ -48,7 +48,7 @@ public class EnumTypeTest extends AbstractAegisTest {
public String toString() {
return name() + "*";
}
-
+
};
@Before
@@ -60,7 +60,7 @@ public class EnumTypeTest extends AbstractAegisTest {
creator.setConfiguration(new TypeCreationOptions());
tm.setTypeCreator(creator);
}
-
+
@Test
public void testType() throws Exception {
EnumType type = new EnumType();
@@ -72,7 +72,7 @@ public class EnumTypeTest extends AbstractAegisTest {
Element element = writeObjectToElement(type, SmallEnum.VALUE1, getContext());
assertEquals("VALUE1", element.getTextContent());
-
+
XMLStreamReader xreader = StaxUtils.createXMLStreamReader(element);
ElementReader reader = new ElementReader(xreader);
Object value = type.readObject(reader, getContext());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
index 4dedb1b..33f6911 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
@@ -47,7 +47,7 @@ public class JaxbTypeTest extends AbstractAegisTest {
@Before
public void setUp() throws Exception {
super.setUp();
-
+
Server s = createService(JaxbService.class);
service = s.getEndpoint().getService();
databinding = (AegisDatabinding) service.getDataBinding();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java
index 768c8ae..b917b99 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java
@@ -38,7 +38,7 @@ public class JaxbXmlParamTypeTest extends AbstractAegisTest {
public void setUp() throws Exception {
super.setUp();
- tm = new DefaultTypeMapping(null,
+ tm = new DefaultTypeMapping(null,
DefaultTypeMapping.createDefaultTypeMapping(false, false));
creator = new Java5TypeCreator();
creator.setNextCreator(new DefaultTypeCreator());
@@ -51,7 +51,7 @@ public class JaxbXmlParamTypeTest extends AbstractAegisTest {
public void testMapServiceWSDL() throws Exception {
createService(CustomTypeService.class, new CustomTypeService(), null);
- // Document wsdl =
+ // Document wsdl =
getWSDLDocument("CustomTypeService");
// todo overriding type qname only seems to work with a Aegis annotation with type class defined
// if type is not defined, aegis ignores specified qname
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
index 12807d9..294c704 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
@@ -24,12 +24,12 @@ package org.apache.cxf.aegis.type.java5.map;
public class Student {
private String name;
private long id;
-
+
public Student() {
name = "";
id = Long.valueOf(0);
}
-
+
public Student(String name, long id) {
this.name = name;
this.id = id;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java
index 46f6da2..1f4c4b2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-@WebService(targetNamespace = "http://client.webservice.crm.ecot.com/skeleton/StudentService",
+@WebService(targetNamespace = "http://client.webservice.crm.ecot.com/skeleton/StudentService",
name = "StudentService")
@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL)
public interface StudentService {
@@ -32,7 +32,7 @@ public interface StudentService {
Student findStudent(Long id);
Map<Long, Student> getStudentsMap();
-
+
Map<String, ?> getWildcardMap();
List<Student> getStudents(Map<String, String> filters);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
index 08de48b..bad35e2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
@@ -25,7 +25,7 @@ import java.util.Map;
import javax.jws.WebService;
-@WebService(targetNamespace = "uri:org.apache.cxf.aegis.test.map",
+@WebService(targetNamespace = "uri:org.apache.cxf.aegis.test.map",
name = "StudentService")
public interface StudentServiceDocLiteral {
@@ -36,7 +36,7 @@ public interface StudentServiceDocLiteral {
List<Student> getStudents(Map<String, String> filters);
List<Student> getStudentsByIds(List<String> ids);
-
+
//CHECKSTYLE:OFF
void takeMapMap(HashMap<String, HashMap<String, Student>> myComplexData);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
index abe4af3..c108fcf 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
@@ -24,16 +24,16 @@ import java.util.List;
import java.util.Map;
public class StudentServiceDocLiteralImpl implements StudentServiceDocLiteral {
-
+
private Map<Long, Student> studentMap;
-
+
public StudentServiceDocLiteralImpl() {
studentMap = new HashMap<Long, Student>();
studentMap.put(Long.valueOf(1), new Student("Student1", 1));
studentMap.put(Long.valueOf(100), new Student("Student100", 100));
studentMap.put(Long.valueOf(-1), new Student("StudentNegative", -1));
}
-
+
public Student findStudent(Long id) {
return studentMap.get(id);
}
@@ -44,7 +44,7 @@ public class StudentServiceDocLiteralImpl implements StudentServiceDocLiteral {
if (filters.containsKey(e.getValue())) {
returnValue.add(e.getValue());
}
-
+
}
return returnValue;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
index 983f90a..93ed075 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
@@ -24,16 +24,16 @@ import java.util.List;
import java.util.Map;
public class StudentServiceImpl implements StudentService {
-
+
private Map<Long, Student> studentMap;
-
+
public StudentServiceImpl() {
studentMap = new HashMap<Long, Student>();
studentMap.put(Long.valueOf(1), new Student("Student1", 1));
studentMap.put(Long.valueOf(100), new Student("Student100", 100));
studentMap.put(Long.valueOf(-1), new Student("StudentNegative", -1));
}
-
+
public Student findStudent(Long id) {
return studentMap.get(id);
}
@@ -44,7 +44,7 @@ public class StudentServiceImpl implements StudentService {
if (filters.containsKey(e.getValue())) {
returnValue.add(e.getValue());
}
-
+
}
return returnValue;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
index 314912d..7d3480d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
@@ -41,10 +41,10 @@ import org.junit.Ignore;
import org.junit.Test;
/**
- *
+ *
*/
public class MapsTest extends AbstractAegisTest {
-
+
private static MapTest clientInterface;
private static Server server;
@@ -60,16 +60,16 @@ public class MapsTest extends AbstractAegisTest {
// server.getEndpoint().getInInterceptors().add(new LoggingInInterceptor());
// server.getEndpoint().getOutInterceptors().add(new LoggingOutInterceptor());
server.start();
-
+
JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean();
proxyFac.setAddress("local://MapTest");
proxyFac.setServiceClass(MapTest.class);
proxyFac.setBus(getBus());
setupAegis(proxyFac.getClientFactoryBean());
- clientInterface = (MapTest)proxyFac.create();
+ clientInterface = (MapTest)proxyFac.create();
}
-
+
@Ignore
@Test
public void testMapWsdl() throws WSDLException {
@@ -78,36 +78,36 @@ public class MapsTest extends AbstractAegisTest {
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDef, sink);
System.out.println(sink.toString());
}
-
+
@Test
public void testInvocations() throws Exception {
Map<Long, String> lts = clientInterface.getMapLongToString();
assertEquals("twenty-seven", lts.get(Long.valueOf(27)));
}
-
+
@Test
public void testNull() throws Exception {
ObjectWithAMap obj1 = clientInterface.returnObjectWithAMap();
assertNull(obj1.getTheMap().get("raw"));
Map<Long, String> m = clientInterface.getMapLongToString();
- String str2 = m.get(Long.valueOf(2));
+ String str2 = m.get(Long.valueOf(2));
assertNull("value for 2 should be null, was " + str2, str2);
-
+
}
-
+
@Test
public void testObjectsWithMaps() throws Exception {
ObjectWithAMap obj1 = clientInterface.returnObjectWithAMap();
ObjectWithAMapNs2 obj2 = clientInterface.returnObjectWithAMapNs2();
assertNotNull(obj1);
assertNotNull(obj2);
-
+
assertNotNull(obj1.getTheMap());
- assertNotNull(obj2.getTheMap());
-
+ assertNotNull(obj2.getTheMap());
+
assertEquals(3, obj1.getTheMap().size());
assertEquals(3, obj2.getTheMap().size());
-
+
assertTrue(obj1.getTheMap().get("rainy"));
assertTrue(obj2.getTheMap().get("rainy"));
assertFalse(obj1.getTheMap().get("sunny"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
index e060153..892f684 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
@@ -26,9 +26,9 @@ import javax.jws.WebService;
import org.apache.cxf.aegis.type.map.ns2.ObjectWithAMapNs2;
/**
- *
+ *
*/
-@WebService(targetNamespace = "uri:org.apache.cxf.aegis.fortest.map",
+@WebService(targetNamespace = "uri:org.apache.cxf.aegis.fortest.map",
name = "MapTest")
public interface MapTest {
ObjectWithAMap returnObjectWithAMap();
@@ -36,8 +36,8 @@ public interface MapTest {
Map<String, Long> getMapStringToLong();
Map<?, ?> getRawMapStringToInteger();
Map<Long, String> getMapLongToString();
-
+
ObjectWithAMapNs2 returnObjectWithAMapNs2();
void takeMapNs2(ObjectWithAMapNs2 map);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java
index 5b2aa74..4af428d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java
@@ -27,7 +27,7 @@ import java.util.Map;
*/
public class ObjectWithAMap {
private Map<String, Boolean> theMap;
-
+
public ObjectWithAMap() {
theMap = new HashMap<String, Boolean>();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java
index 7bad2ac..422b1d3 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java
@@ -27,7 +27,7 @@ import java.util.Map;
*/
public class ObjectWithAMapNs2 {
private Map<String, Boolean> theMap;
-
+
public ObjectWithAMapNs2() {
theMap = new HashMap<String, Boolean>();
theMap.put("rainy", Boolean.TRUE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java
index b7c5d5d..64ac583 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
public class Inner implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = -1009032817440459241L;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java
index 2fac06a..c8e03d2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java
@@ -22,8 +22,8 @@ package org.apache.cxf.aegis.type.missing;
import javax.jws.WebMethod;
import javax.jws.WebService;
-@WebService(serviceName = "MissingType",
- endpointInterface = "org.apache.cxf.aegis.type.missing.MissingType",
+@WebService(serviceName = "MissingType",
+ endpointInterface = "org.apache.cxf.aegis.type.missing.MissingType",
targetNamespace = "urn:org:apache:cxf:aegis:type:missing")
public class MissingTypeImpl implements MissingType {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
index 8aa3bd7..4317fe0 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
@@ -28,7 +28,7 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.junit.Test;
public class MissingTypeWSDLTest extends AbstractAegisTest {
-
+
@Test
public void testMissingTransliteration() throws Exception {
Server server = createService(MissingType.class, new MissingTypeImpl(), null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java
index 8117e76..5e730b9 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java
@@ -30,7 +30,7 @@ public class Outer implements Serializable {
// object.
/**
- *
+ *
*/
private static final long serialVersionUID = -2435297692897827392L;
/**
@@ -48,14 +48,14 @@ public class Outer implements Serializable {
/**
* The type of name in the taxonomy of entity types.
- *
+ *
* @see com.basistech.rlp.RLPNEConstants for constants for this field.
*/
int entityType;
/**
* The unique identifier of the entity containing this name, or none.
- *
+ *
* @see Entity
*/
String entityUID;
@@ -67,7 +67,7 @@ public class Outer implements Serializable {
/**
* Any pre-computed inners for the name.
- *
+ *
* @@uml.property name="inners"
* @@uml.associationEnd multiplicity="(0 -1)"
*/
@@ -89,7 +89,7 @@ public class Outer implements Serializable {
/**
* Set arbitrary data stored with this name.
- *
+ *
* @param extra the extra to set
*/
public void setExtra(String extra) {
@@ -99,7 +99,7 @@ public class Outer implements Serializable {
/**
* Set a unique ID for this name. This API does not check or enforce
* uniqueness.
- *
+ *
* @param uid
*/
public void setUID(String auid) {
@@ -116,7 +116,7 @@ public class Outer implements Serializable {
/**
* Set the textual content of the name. This call does not automatically set
* any other properties, such as script or language.
- *
+ *
* @param data the data to set.
*/
public void setData(String data) {
@@ -136,7 +136,7 @@ public class Outer implements Serializable {
* influences the interpretating and matching of the name. Use the value
* {@link com.basistech.rlp.RLPNEConstants#NE_TYPE_NONE} if there is no type
* available.
- *
+ *
* @param entityType
*/
public void setEntityType(int entityType) {
@@ -154,7 +154,7 @@ public class Outer implements Serializable {
* Set an entity UID for this name. Entities group multiple names for a
* single real-world item. All the names of a single entity are connected
* via their entity unique ID.
- *
+ *
* @param entityUID the UID.
*/
public void setEntityUID(String entityUID) {
@@ -174,7 +174,7 @@ public class Outer implements Serializable {
* Set the 'primary' flag for this name. If names are grouped by entities
* {@link #setEntityUID(String)}, one of the names of an entity may be
* marked primary. This API does not check that only one name is marked.
- *
+ *
* @param primary the primary flag.
*/
public void setPrimary(boolean primary) {
@@ -190,7 +190,7 @@ public class Outer implements Serializable {
/**
* Set pre-calculated inners for this name.
- *
+ *
* @param inners the inners.
*/
public void setTransliterations(Inner[] transliterations) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
index 63191f9..0501569 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
@@ -51,13 +51,13 @@ public class XMLStreamReaderMappingTest extends AbstractAegisTest {
// create a different mapping than the context creates.
TypeMapping baseMapping = DefaultTypeMapping.createSoap11TypeMapping(true, false, false);
mapping = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD, baseMapping);
- mapping.register(XMLStreamReader.class,
+ mapping.register(XMLStreamReader.class,
new QName("urn:Bean", "SimpleBean"), new XMLStreamReaderType());
mapping.setTypeCreator(context.createTypeCreator());
context.setTypeMapping(mapping);
context.initialize();
}
-
+
@Test
public void testReadStream() throws Exception {
// Test reading
@@ -71,7 +71,7 @@ public class XMLStreamReaderMappingTest extends AbstractAegisTest {
beanReader.nextTag();
assertEquals("bleh", beanReader.getLocalName());
}
-
+
protected Context getContext() {
AegisContext globalContext = new AegisContext();
globalContext.initialize();
@@ -79,6 +79,6 @@ public class XMLStreamReaderMappingTest extends AbstractAegisTest {
return new Context(globalContext);
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java
index d11a786..f5977c3 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java
@@ -20,7 +20,7 @@
package org.apache.cxf.aegis.xmlconfig;
/**
- * class used to test remapping the schema type of date.
+ * class used to test remapping the schema type of date.
*/
public class BeanWithDate {
private java.util.Date fig;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
index 0b054cf..a275e2e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
@@ -39,14 +39,14 @@ public class TestDateMapping {
private AegisContext context;
private TestUtilities testUtilities;
private XMLOutputFactory xmlOutputFactory;
-
+
@Before
public void before() {
testUtilities = new TestUtilities(getClass());
testUtilities.addNamespace("test", "urn:test");
xmlOutputFactory = XMLOutputFactory.newInstance();
}
-
+
@Test
public void testWriteSqlDateAsDate() throws Exception {
context = new AegisContext();
@@ -66,7 +66,7 @@ public class TestDateMapping {
xmlWriter.close();
// an absence of exception is success here.
}
-
+
@Test
public void testWriteCustomTypeSchemaType() throws Exception {
context = new AegisContext();
@@ -81,6 +81,6 @@ public class TestDateMapping {
XmlSchema root = new XmlSchema(); // dummy to put schema in.
/* will explode if the type object created for the custom mapping isn't fully initialized.
*/
- sbType.writeSchema(root);
+ sbType.writeSchema(root);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java
index 2328184..cdbac77 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java
@@ -20,23 +20,23 @@
package org.apache.cxf.doclitbare;
/**
- *
+ *
*/
public class Course {
private long id;
private String name;
private String description;
-
+
public Course() {
id = 0;
}
-
+
public Course(long id, String name, String description) {
this.id = id;
this.name = name;
this.description = description;
}
-
+
public long getId() {
return id;
}
@@ -55,6 +55,6 @@ public class Course {
public void setDescription(String description) {
this.description = description;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
index d3265c3..81d1c58 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
* Test motivated by CXF-1504
*/
public class DocLitBareTest extends AbstractCXFTest {
-
+
@Test
public void testNamespaceCrash() {
ServerFactoryBean svrFactory = new ServerFactoryBean();
@@ -40,16 +40,16 @@ public class DocLitBareTest extends AbstractCXFTest {
svrFactory.setAddress("local://dlbTest");
svrFactory.setServiceBean(new UniversityImpl());
svrFactory.getServiceFactory().setDataBinding(new AegisDatabinding());
- svrFactory.create();
+ svrFactory.create();
ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
factory.getServiceFactory().setDataBinding(new AegisDatabinding());
-
+
factory.setServiceClass(University.class);
factory.setTransportId(LocalTransportFactory.TRANSPORT_ID);
factory.setAddress("local://dlbTest");
University client = (University) factory.create();
-
+
Teacher tr = client.getTeacher(new Course(40, "Intro to CS", "Introductory Comp Sci"));
assertNotNull(tr);
assertEquals(52, tr.getAge());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java
index 67523c8..974d496 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java
@@ -20,23 +20,23 @@
package org.apache.cxf.doclitbare;
/**
- *
+ *
*/
public class Teacher {
private int age;
private String name;
private String department;
-
+
public Teacher() {
age = 0;
}
-
+
public Teacher(int age, String name, String department) {
this.age = age;
this.name = name;
this.department = department;
}
-
+
public int getAge() {
return age;
}
@@ -55,5 +55,5 @@ public class Teacher {
public void setDepartment(String department) {
this.department = department;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java
index bbc5b7c..6abee1d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java
@@ -20,7 +20,7 @@
package org.apache.cxf.doclitbare;
/**
- *
+ *
*/
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -29,13 +29,13 @@ import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
@WebService(name = "University", targetNamespace = "http://cxf.apache.org/dlb/")
-@SOAPBinding(use = SOAPBinding.Use.LITERAL, style = SOAPBinding.Style.DOCUMENT,
+@SOAPBinding(use = SOAPBinding.Use.LITERAL, style = SOAPBinding.Style.DOCUMENT,
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public interface University {
@WebResult(targetNamespace = "http://education.toorosystems.com/", name = "return", partName = "return")
@WebMethod(operationName = "getTeacher", exclude = false)
Teacher getTeacher(
- @WebParam(targetNamespace = "http://cxf.apache.org/dlb/",
+ @WebParam(targetNamespace = "http://cxf.apache.org/dlb/",
name = "course", mode = WebParam.Mode.IN)
Course course);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java
index a52acb8..84a61dc 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java
@@ -23,16 +23,16 @@ import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
/**
- *
+ *
*/
@WebService(name = "University", targetNamespace = "http://cxf.apache.org/dlb/")
-@SOAPBinding(use = SOAPBinding.Use.LITERAL,
- style = SOAPBinding.Style.DOCUMENT,
+@SOAPBinding(use = SOAPBinding.Use.LITERAL,
+ style = SOAPBinding.Style.DOCUMENT,
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public class UniversityImpl implements University {
public Teacher getTeacher(Course course) {
- return new Teacher(52, "Mr. Tom", "Computer Science" + course.getName());
+ return new Teacher(52, "Mr. Tom", "Computer Science" + course.getName());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
index 79678f6..dad8087 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
@@ -32,10 +32,10 @@ import org.apache.cxf.common.logging.LogUtils;
*
*/
public final class DatatypeFactory {
-
+
public static final Duration PT0S;
private static final Logger LOG = LogUtils.getL7dLogger(DatatypeFactory.class);
-
+
static {
PT0S = createDuration("PT0S");
@@ -46,7 +46,7 @@ public final class DatatypeFactory {
*
*/
private DatatypeFactory() {
-
+
}
public static Duration createDuration(String s) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 8415f0e..a727bf4 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -76,7 +76,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
JAXBContextInitializer(ServiceInfo serviceInfo,
Set<Class<?>> classes,
- Collection<Object> typeReferences,
+ Collection<Object> typeReferences,
Map<String, Object> unmarshallerProperties) {
super(serviceInfo);
this.classes = classes;
@@ -97,7 +97,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
Boolean.TRUE);
}
boolean isFromWrapper = part.getMessageInfo().getOperation().isUnwrapped();
- if (isFromWrapper
+ if (isFromWrapper
&& !Boolean.TRUE.equals(part.getProperty("messagepart.isheader"))) {
UnwrappedOperationInfo uop = (UnwrappedOperationInfo)part.getMessageInfo().getOperation();
OperationInfo op = uop.getWrappedOperation();
@@ -120,7 +120,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
&& !Byte.TYPE.equals(clazz.getComponentType())) {
clazz = clazz.getComponentType();
}
-
+
Annotation[] a = (Annotation[])part.getProperty("parameter.annotations");
checkForAdapter(clazz, a);
@@ -174,7 +174,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
}
if (clazz != null) {
- if (!isFromWrapper
+ if (!isFromWrapper
&& clazz.getAnnotation(XmlRootElement.class) == null
&& clazz.getAnnotation(XmlType.class) != null
&& StringUtils.isEmpty(clazz.getAnnotation(XmlType.class).name())) {
@@ -183,7 +183,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
typeReferences.add(ref);
}
}
-
+
addClass(clazz);
}
}
@@ -309,7 +309,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
return true;
}
-
+
void addClass(Class<?> claz) {
if (Throwable.class.isAssignableFrom(claz)) {
if (!Throwable.class.equals(claz)
@@ -322,8 +322,8 @@ class JAXBContextInitializer extends ServiceModelVisitor {
return;
} else {
Class<?> cls = JAXBUtils.getValidClass(claz);
- if (cls == null
- && ReflectionUtil.getDeclaredConstructors(claz).length > 0
+ if (cls == null
+ && ReflectionUtil.getDeclaredConstructors(claz).length > 0
&& !Modifier.isAbstract(claz.getModifiers())) {
if (LOG.isLoggable(Level.INFO)) {
LOG.info("Class " + claz.getName() + " does not have a default constructor which JAXB requires.");
@@ -359,7 +359,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
return;
}
-
+
if (cls.getSuperclass() != null) {
//JAXB should do this, but it doesn't always.
//in particular, older versions of jaxb don't
@@ -369,10 +369,10 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (!cls.isInterface()) {
walkReferences(cls);
}
- }
+ }
}
}
-
+
private void walkReferences(Class<?> cls) {
if (cls == null) {
return;
@@ -392,7 +392,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (accessType != XmlAccessType.PROPERTY) { // only look for fields if we are instructed to
//fields are accessible even if not public, must look at the declared fields
//then walk to parents declared fields, etc...
- Field fields[] = ReflectionUtil.getDeclaredFields(cls);
+ Field fields[] = ReflectionUtil.getDeclaredFields(cls);
for (Field f : fields) {
if (isFieldAccepted(f, accessType)) {
XmlJavaTypeAdapter xjta = Utils.getFieldXJTA(f);
@@ -410,7 +410,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
if (accessType != XmlAccessType.FIELD) { // only look for methods if we are instructed to
- Method methods[] = ReflectionUtil.getDeclaredMethods(cls);
+ Method methods[] = ReflectionUtil.getDeclaredMethods(cls);
for (Method m : methods) {
if (isMethodAccepted(m, accessType)) {
XmlJavaTypeAdapter xjta = Utils.getMethodXJTA(m);
@@ -442,7 +442,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (Modifier.isStatic(field.getModifiers())) {
return field.isAnnotationPresent(XmlAttribute.class);
}
- if (accessType == XmlAccessType.PUBLIC_MEMBER
+ if (accessType == XmlAccessType.PUBLIC_MEMBER
&& !Modifier.isPublic(field.getModifiers())) {
return false;
}
@@ -459,7 +459,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
*/
static boolean isMethodAccepted(Method method, XmlAccessType accessType) {
// We only accept non static property getters which are not marked @XmlTransient
- if (Modifier.isStatic(method.getModifiers())
+ if (Modifier.isStatic(method.getModifiers())
|| method.isAnnotationPresent(XmlTransient.class)
|| !Modifier.isPublic(method.getModifiers())
|| "getClass".equals(method.getName())) {
@@ -479,7 +479,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (method.getName().startsWith("is")) {
beginIndex = 2;
}
-
+
Method setter = null;
try {
setter = method.getDeclaringClass()
@@ -496,7 +496,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
} else if (!Collection.class.isAssignableFrom(method.getReturnType())
&& !Throwable.class.isAssignableFrom(method.getDeclaringClass())) {
//no setter, it's not a collection (thus getter().add(...)), and
- //not an Exception,
+ //not an Exception,
return false;
}
@@ -522,12 +522,12 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
return false;
}
-
+
/**
* The TypeReference class is a sun specific class that is found in two different
* locations depending on environment. In IBM JDK the class is not available at all.
* So we have to load it at runtime.
- *
+ *
* @param n
* @param cls
* @return initiated TypeReference
@@ -535,7 +535,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
private static Object createTypeReference(QName n, Class<?> cls) {
Class<?> refClass = null;
try {
- refClass = ClassLoaderUtils.loadClass("com.sun.xml.bind.api.TypeReference",
+ refClass = ClassLoaderUtils.loadClass("com.sun.xml.bind.api.TypeReference",
JAXBContextInitializer.class);
} catch (Throwable ex) {
try {
@@ -555,9 +555,9 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
return null;
}
-
- @SuppressWarnings("unused")
- private Object createFactory(Class<?> cls, Constructor<?> contructor) {
+
+ @SuppressWarnings("unused")
+ private Object createFactory(Class<?> cls, Constructor<?> contructor) {
String newClassName = cls.getName() + "Factory";
ASMHelper helper = new ASMHelper();
ClassWriter cw = helper.createClassWriter();
@@ -583,10 +583,10 @@ class JAXBContextInitializer extends ServiceModelVisitor {
mv.visitTypeInsn(Opcodes.NEW, name);
mv.visitInsn(Opcodes.DUP);
StringBuilder paraString = new StringBuilder("(");
-
+
for (Class<?> paraClass : contructor.getParameterTypes()) {
mv.visitInsn(Opcodes.ACONST_NULL);
- paraString.append("Ljava/lang/Object;");
+ paraString.append("Ljava/lang/Object;");
}
paraString.append(")V");
@@ -602,9 +602,9 @@ class JAXBContextInitializer extends ServiceModelVisitor {
return factoryClass.newInstance();
} catch (Exception e) {
//ignore
- }
+ }
return null;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
index a670b7d..2501ea4 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
@@ -41,19 +41,19 @@ import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
/**
- *
+ *
*/
public abstract class JAXBDataBase {
-
- protected JAXBContext context;
+
+ protected JAXBContext context;
protected Schema schema;
protected Collection<Attachment> attachments;
protected Integer mtomThreshold; // null if we should default.
-
+
protected JAXBDataBase(JAXBContext ctx) {
context = ctx;
}
-
+
public void setSchema(Schema s) {
this.schema = s;
}
@@ -61,7 +61,7 @@ public abstract class JAXBDataBase {
public void setJAXBContext(JAXBContext jc) {
this.context = jc;
}
-
+
public Schema getSchema() {
return schema;
}
@@ -84,10 +84,10 @@ public abstract class JAXBDataBase {
protected AttachmentMarshaller getAttachmentMarshaller() {
return new JAXBAttachmentMarshaller(attachments, mtomThreshold);
}
-
+
public void setProperty(String prop, Object value) {
}
-
+
protected Annotation[] getJAXBAnnotation(MessagePartInfo mpi) {
List<Annotation> annoList = null;
if (mpi != null) {
@@ -96,9 +96,9 @@ public abstract class JAXBDataBase {
annoList = extractJAXBAnnotations(getReturnMethodAnnotations(mpi));
}
}
- return annoList == null ? new Annotation[0] : annoList.toArray(new Annotation[annoList.size()]);
+ return annoList == null ? new Annotation[0] : annoList.toArray(new Annotation[annoList.size()]);
}
-
+
private List<Annotation> extractJAXBAnnotations(Annotation[] anns) {
List<Annotation> annoList = null;
if (anns != null) {
@@ -114,7 +114,7 @@ public abstract class JAXBDataBase {
}
return annoList;
}
-
+
private Annotation[] getReturnMethodAnnotations(MessagePartInfo mpi) {
AbstractMessageContainer mi = mpi.getMessageInfo();
if (mi == null || !isOutputMessage(mi)) {
@@ -123,7 +123,7 @@ public abstract class JAXBDataBase {
OperationInfo oi = mi != null ? mi.getOperation() : null;
return oi != null ? (Annotation[])oi.getProperty("method.return.annotations") : null;
}
-
+
protected boolean isOutputMessage(AbstractMessageContainer messageContainer) {
if (messageContainer instanceof MessageInfo) {
return MessageInfo.Type.OUTPUT.equals(((MessageInfo)messageContainer).getType());
@@ -138,7 +138,7 @@ public abstract class JAXBDataBase {
public void setMtomThreshold(Integer threshold) {
this.mtomThreshold = threshold;
}
-
+
protected final boolean honorJAXBAnnotations(MessagePartInfo part) {
if (part == null) {
return false;
@@ -152,6 +152,6 @@ public abstract class JAXBDataBase {
Boolean b = (Boolean)part.getProperty("honor.jaxb.annotations");
return b == null ? false : b;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index eb57c5e..8cd5fda 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -98,7 +98,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
public static final String VALIDATION_EVENT_HANDLER = "jaxb-validation-event-handler";
public static final String SET_VALIDATION_EVENT_HANDLER = "set-jaxb-validation-event-handler";
public static final String WRITER_VALIDATION_EVENT_HANDLER = "jaxb-writer-validation-event-handler";
-
+
public static final String SCHEMA_RESOURCE = "SCHEMRESOURCE";
public static final String MTOM_THRESHOLD = "org.apache.cxf.jaxb.mtomThreshold";
@@ -117,7 +117,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
Node.class,
XMLEventWriter.class,
XMLStreamWriter.class};
-
+
private static class DelayedDOMResult extends DOMResult {
private final URL resource;
private final String publicId;
@@ -308,7 +308,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
}
contextClasses = new LinkedHashSet<Class<?>>();
-
+
for (ServiceInfo serviceInfo : service.getServiceInfos()) {
JAXBContextInitializer initializer
= new JAXBContextInitializer(serviceInfo, contextClasses, typeRefs, this.getUnmarshallerProperties());
@@ -468,9 +468,9 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
JAXBContextCache.scanPackages(classes);
}
addWsAddressingTypes(classes);
-
- return JAXBContextCache.getCachedContextAndSchemas(classes, defaultNs,
- contextProperties,
+
+ return JAXBContextCache.getCachedContextAndSchemas(classes, defaultNs,
+ contextProperties,
typeRefs, true);
}
[05/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
index 467d2fc..cf8d791 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/FailoverTargetSelector.java
@@ -39,8 +39,8 @@ import org.apache.cxf.transport.Conduit;
/**
- * Implements a target selection strategy based on failover to an
- * alternate target endpoint when a transport level failure is
+ * Implements a target selection strategy based on failover to an
+ * alternate target endpoint when a transport level failure is
* encountered.
* Note that this feature changes the conduit on the fly and thus makes
* the Client not thread safe.
@@ -48,10 +48,10 @@ import org.apache.cxf.transport.Conduit;
public class FailoverTargetSelector extends AbstractConduitSelector {
private static final Logger LOG = LogUtils.getL7dLogger(FailoverTargetSelector.class);
- private static final String COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY =
+ private static final String COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY =
"org.apache.cxf.transport.complete_if_service_not_available";
- protected ConcurrentHashMap<InvocationKey, InvocationContext> inProgress
+ protected ConcurrentHashMap<InvocationKey, InvocationContext> inProgress
= new ConcurrentHashMap<InvocationKey, InvocationContext>();
protected FailoverStrategy failoverStrategy;
private boolean supportNotAvailableErrorsOnly = true;
@@ -62,24 +62,24 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
public FailoverTargetSelector() {
super();
}
-
+
public FailoverTargetSelector(String clientBootstrapAddress) {
super();
this.clientBootstrapAddress = clientBootstrapAddress;
}
-
+
/**
* Constructor, allowing a specific conduit to override normal selection.
- *
+ *
* @param c specific conduit
*/
public FailoverTargetSelector(Conduit c) {
super(c);
}
-
+
/**
* Called prior to the interceptor chain being traversed.
- *
+ *
* @param message the current Message
*/
public void prepare(Message message) {
@@ -88,27 +88,27 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
}
Exchange exchange = message.getExchange();
setupExchangeExceptionProperties(exchange);
-
+
InvocationKey key = new InvocationKey(exchange);
if (getInvocationContext(key) == null) {
-
+
if (getClientBootstrapAddress() != null
&& getClientBootstrapAddress().equals(message.get(Message.ENDPOINT_ADDRESS))) {
- List<String> addresses = failoverStrategy.getAlternateAddresses(exchange);
+ List<String> addresses = failoverStrategy.getAlternateAddresses(exchange);
if (addresses != null && !addresses.isEmpty()) {
getEndpoint().getEndpointInfo().setAddress(addresses.get(0));
message.put(Message.ENDPOINT_ADDRESS, addresses.get(0));
}
}
-
+
Endpoint endpoint = exchange.getEndpoint();
BindingOperationInfo bindingOperationInfo =
exchange.getBindingOperationInfo();
Object[] params = message.getContent(List.class).toArray();
Map<String, Object> context =
CastUtils.cast((Map<?, ?>)message.get(Message.INVOCATION_CONTEXT));
- InvocationContext invocation =
- new InvocationContext(endpoint,
+ InvocationContext invocation =
+ new InvocationContext(endpoint,
bindingOperationInfo,
params,
context);
@@ -122,10 +122,10 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
}
ex.put(COMPLETE_IF_SERVICE_NOT_AVAIL_PROPERTY, true);
}
-
+
/**
* Called when a Conduit is actually required.
- *
+ *
* @param message
* @return the Conduit to use for mediation of the message
*/
@@ -137,13 +137,13 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
return getSelectedConduit(message);
}
- protected InvocationContext getInvocationContext(InvocationKey key) {
+ protected InvocationContext getInvocationContext(InvocationKey key) {
return inProgress.get(key);
}
-
+
/**
* Called on completion of the MEP for which the Conduit was required.
- *
+ *
* @param exchange represents the completed MEP
*/
public void complete(Exchange exchange) {
@@ -153,13 +153,13 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
super.complete(exchange);
return;
}
-
+
boolean failover = false;
final Exception ex = getExceptionIfPresent(exchange);
if (requiresFailover(exchange, ex)) {
onFailure(invocation, ex);
Conduit old = (Conduit)exchange.getOutMessage().remove(Conduit.class.getName());
-
+
Endpoint failoverTarget = getFailoverTarget(exchange, invocation);
if (failoverTarget != null) {
setEndpoint(failoverTarget);
@@ -173,28 +173,28 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
getLogger().fine("FAILOVER_NOT_REQUIRED");
onSuccess(invocation);
}
-
+
if (!failover) {
inProgress.remove(key);
doComplete(exchange);
}
}
-
+
protected void doComplete(Exchange exchange) {
super.complete(exchange);
}
-
+
protected void setOriginalEndpoint(InvocationContext invocation) {
setEndpoint(invocation.retrieveOriginalEndpoint(endpoint));
}
-
+
protected boolean performFailover(Exchange exchange, InvocationContext invocation) {
Exception prevExchangeFault = (Exception)exchange.remove(Exception.class.getName());
Message outMessage = exchange.getOutMessage();
Exception prevMessageFault = outMessage.getContent(Exception.class);
outMessage.setContent(Exception.class, null);
overrideAddressProperty(invocation.getContext());
-
+
Retryable retry = exchange.get(Retryable.class);
exchange.clear();
boolean failover = false;
@@ -221,13 +221,13 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
}
return failover;
}
-
+
protected void onSuccess(InvocationContext context) {
}
-
+
protected void onFailure(InvocationContext context, Exception ex) {
}
-
+
/**
* @param strategy the FailoverStrategy to use
*/
@@ -237,10 +237,10 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
failoverStrategy = strategy;
}
}
-
+
/**
* @return strategy the FailoverStrategy to use
- */
+ */
public synchronized FailoverStrategy getStrategy() {
if (failoverStrategy == null) {
failoverStrategy = new SequentialStrategy();
@@ -270,10 +270,10 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
//perhaps supporting FailoverTargetSelector specific property can make sense too
return 0;
}
-
+
/**
* Check if the exchange is suitable for a failover.
- *
+ *
* @param exchange the current Exchange
* @return boolean true if a failover should be attempted
*/
@@ -307,10 +307,10 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
: exchange.get(Exception.class);
return ex;
}
-
+
/**
* Get the failover target endpoint, if a suitable one is available.
- *
+ *
* @param exchange the current Exchange
* @param invocation the current InvocationContext
* @return a failover endpoint if one is available
@@ -320,7 +320,7 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
List<String> alternateAddresses = updateContextAlternatives(exchange, invocation);
Endpoint failoverTarget = null;
if (alternateAddresses != null) {
- String alternateAddress =
+ String alternateAddress =
getStrategy().selectAlternateAddress(alternateAddresses);
if (alternateAddress != null) {
// re-use current endpoint
@@ -337,7 +337,7 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
}
/**
- * Fetches and updates the alternative address or/and alternative endpoints
+ * Fetches and updates the alternative address or/and alternative endpoints
* (depending on the strategy) for current invocation context.
* @param exchange the current Exchange
* @param invocation the current InvocationContext
@@ -348,7 +348,7 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
if (!invocation.hasAlternates()) {
// no previous failover attempt on this invocation
//
- alternateAddresses =
+ alternateAddresses =
getStrategy().getAlternateAddresses(exchange);
if (alternateAddresses != null) {
invocation.setAlternateAddresses(alternateAddresses);
@@ -361,16 +361,16 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
}
return alternateAddresses;
}
-
+
/**
* Override the ENDPOINT_ADDRESS property in the request context
- *
+ *
* @param context the request context
*/
protected void overrideAddressProperty(Map<String, Object> context) {
overrideAddressProperty(context, getEndpoint().getEndpointInfo().getAddress());
}
-
+
protected void overrideAddressProperty(Map<String, Object> context,
String address) {
Map<String, Object> requestContext =
@@ -380,12 +380,12 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
requestContext.put("javax.xml.ws.service.endpoint.address", address);
}
}
-
+
// Some conduits may replace the endpoint address after it has already been prepared
// but before the invocation has been done (ex, org.apache.cxf.clustering.LoadDistributorTargetSelector)
- // which may affect JAX-RS clients where actual endpoint address property may include additional path
- // segments.
- protected boolean replaceEndpointAddressPropertyIfNeeded(Message message,
+ // which may affect JAX-RS clients where actual endpoint address property may include additional path
+ // segments.
+ protected boolean replaceEndpointAddressPropertyIfNeeded(Message message,
String endpointAddress,
Conduit cond) {
String requestURI = (String)message.get(Message.REQUEST_URI);
@@ -415,7 +415,7 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
}
return false;
}
-
+
public boolean isSupportNotAvailableErrorsOnly() {
return supportNotAvailableErrorsOnly;
}
@@ -440,16 +440,16 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
*/
protected static class InvocationKey {
private Exchange exchange;
-
+
InvocationKey(Exchange ex) {
- exchange = ex;
+ exchange = ex;
}
-
+
@Override
public int hashCode() {
return System.identityHashCode(exchange);
}
-
+
@Override
public boolean equals(Object o) {
return o instanceof InvocationKey
@@ -465,14 +465,14 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
private Endpoint originalEndpoint;
private String originalAddress;
private BindingOperationInfo bindingOperationInfo;
- private Object[] params;
+ private Object[] params;
private Map<String, Object> context;
private List<Endpoint> alternateEndpoints;
private List<String> alternateAddresses;
-
+
InvocationContext(Endpoint endpoint,
BindingOperationInfo boi,
- Object[] prms,
+ Object[] prms,
Map<String, Object> ctx) {
originalEndpoint = endpoint;
originalAddress = endpoint.getEndpointInfo().getAddress();
@@ -497,19 +497,19 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
}
return originalEndpoint;
}
-
+
BindingOperationInfo getBindingOperationInfo() {
return bindingOperationInfo;
}
-
+
Object[] getParams() {
return params;
}
-
+
Map<String, Object> getContext() {
return context;
}
-
+
List<Endpoint> getAlternateEndpoints() {
return alternateEndpoints;
}
@@ -529,5 +529,5 @@ public class FailoverTargetSelector extends AbstractConduitSelector {
boolean hasAlternates() {
return !(alternateEndpoints == null && alternateAddresses == null);
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorFeature.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorFeature.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorFeature.java
index 97840f2..ade09ac 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorFeature.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorFeature.java
@@ -29,14 +29,14 @@ import org.apache.cxf.common.injection.NoJSR250Annotations;
@NoJSR250Annotations
public class LoadDistributorFeature extends FailoverFeature {
-
+
public LoadDistributorFeature() {
-
+
}
public LoadDistributorFeature(String clientBootstrapAddress) {
super(clientBootstrapAddress);
}
-
+
@Override
public FailoverTargetSelector getTargetSelector() {
return new LoadDistributorTargetSelector(getClientBootstrapAddress());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java
index 53a7582..5ef66f5 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/LoadDistributorTargetSelector.java
@@ -31,7 +31,7 @@ import org.apache.cxf.transport.Conduit;
* The LoadDistributorTargetSelector attempts to do the same job as the
* FailoverTargetSelector, but to choose an alternate target on every request
* rather than just when a fault occurs.
- * The LoadDistributorTargetSelector uses the same FailoverStrategy interface as
+ * The LoadDistributorTargetSelector uses the same FailoverStrategy interface as
* the FailoverTargetSelector, but has a few significant limitations:
* 1. Because the LoadDistributorTargetSelector needs to maintain a list of targets
* between calls it has to obtain that list without reference to a Message.
@@ -42,7 +42,7 @@ import org.apache.cxf.transport.Conduit;
* discarded after this message has been processed. As a consequence, if the
* strategy chosen is a simple sequential one the first item in the list will
* be chosen every time.
- * Conclusion: Be aware that if you are working with targets that are
+ * Conclusion: Be aware that if you are working with targets that are
* dependent on the Message the process will be less efficient and that the
* SequentialStrategy will not distribute the load at all.
* 2. The AbstractStaticFailoverStrategy base class excludes the 'default' endpoint
@@ -54,7 +54,7 @@ import org.apache.cxf.transport.Conduit;
public class LoadDistributorTargetSelector extends FailoverTargetSelector {
private static final Logger LOG = LogUtils.getL7dLogger(
LoadDistributorTargetSelector.class);
- private static final String IS_DISTRIBUTED =
+ private static final String IS_DISTRIBUTED =
"org.apache.cxf.clustering.LoadDistributorTargetSelector.IS_DISTRIBUTED";
private List<String> addressList;
@@ -67,7 +67,7 @@ public class LoadDistributorTargetSelector extends FailoverTargetSelector {
public LoadDistributorTargetSelector() {
super();
}
-
+
public LoadDistributorTargetSelector(String clientBootstrapAddress) {
super(clientBootstrapAddress);
}
@@ -127,7 +127,7 @@ public class LoadDistributorTargetSelector extends FailoverTargetSelector {
* @param exchange the current Exchange
* @param invocation the current InvocationContext
* @return a failover endpoint if one is available
- *
+ *
* Note: The only difference between this and the super implementation is
* that the current (failed) address is removed from the list set of alternates,
* it could be argued that that change should be in the super implementation
@@ -139,7 +139,7 @@ public class LoadDistributorTargetSelector extends FailoverTargetSelector {
if (!invocation.hasAlternates()) {
// no previous failover attempt on this invocation
//
- alternateAddresses =
+ alternateAddresses =
getStrategy().getAlternateAddresses(exchange);
if (alternateAddresses != null) {
alternateAddresses.remove(exchange.getEndpoint().getEndpointInfo().getAddress());
@@ -154,7 +154,7 @@ public class LoadDistributorTargetSelector extends FailoverTargetSelector {
Endpoint failoverTarget = null;
if (alternateAddresses != null) {
- String alternateAddress =
+ String alternateAddress =
getStrategy().selectAlternateAddress(alternateAddresses);
if (alternateAddress != null) {
// re-use current endpoint
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RandomStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RandomStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RandomStrategy.java
index 29aba0a..676c47e 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RandomStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RandomStrategy.java
@@ -24,13 +24,13 @@ import java.util.Random;
/**
* Failover strategy based on a randomized walk through the
- * static cluster represented by multiple endpoints associated
+ * static cluster represented by multiple endpoints associated
* with the same service instance.
*/
public class RandomStrategy extends AbstractStaticFailoverStrategy {
-
+
private Random random;
-
+
/**
* Constructor.
*/
@@ -40,8 +40,8 @@ public class RandomStrategy extends AbstractStaticFailoverStrategy {
/**
* Get next alternate endpoint.
- *
- * @param alternates non-empty List of alternate endpoints
+ *
+ * @param alternates non-empty List of alternate endpoints
* @return
*/
protected <T> T getNextAlternate(List<T> alternates) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
index feada0e..a6cb801 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/RetryStrategy.java
@@ -31,7 +31,7 @@ public class RetryStrategy extends SequentialStrategy {
private int maxNumberOfRetries;
private int counter;
-
+
/* (non-Javadoc)
* @see org.apache.cxf.clustering.AbstractStaticFailoverStrategy#getAlternateEndpoints(
* org.apache.cxf.message.Exchange)
@@ -40,7 +40,7 @@ public class RetryStrategy extends SequentialStrategy {
public List<Endpoint> getAlternateEndpoints(Exchange exchange) {
return getEndpoints(exchange, stillTheSameAddress());
}
-
+
protected <T> T getNextAlternate(List<T> alternates) {
return stillTheSameAddress() ? alternates.get(0) : alternates.remove(0);
}
@@ -52,13 +52,13 @@ public class RetryStrategy extends SequentialStrategy {
// let the target selector move to the next address
// and then stay on the same address for maxNumberOfRetries
if (++counter <= maxNumberOfRetries) {
- return true;
+ return true;
} else {
counter = 0;
return false;
}
}
-
+
public void setMaxNumberOfRetries(int maxNumberOfRetries) {
if (maxNumberOfRetries < 0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/SequentialStrategy.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/SequentialStrategy.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/SequentialStrategy.java
index 6a7e883..6ef077c 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/SequentialStrategy.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/SequentialStrategy.java
@@ -23,15 +23,15 @@ import java.util.List;
/**
* Failover strategy based on a sequential walk through the
- * static cluster represented by multiple endpoints associated
+ * static cluster represented by multiple endpoints associated
* with the same service instance.
*/
public class SequentialStrategy extends AbstractStaticFailoverStrategy {
/**
* Get next alternate endpoint.
- *
- * @param alternates non-empty List of alternate endpoints
+ *
+ * @param alternates non-empty List of alternate endpoints
* @return
*/
protected <T> T getNextAlternate(List<T> alternates) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPBeanDefinitionParser.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPBeanDefinitionParser.java
index b5367d1..d03a52d 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPBeanDefinitionParser.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/blueprint/ClusteringBPBeanDefinitionParser.java
@@ -28,7 +28,7 @@ public class ClusteringBPBeanDefinitionParser extends SimpleBPBeanDefinitionPars
public ClusteringBPBeanDefinitionParser(Class<?> cls) {
super(cls);
}
-
+
@Override
protected void mapElement(ParserContext ctx, MutableBeanMetadata bean, Element el, String name) {
setFirstChildAsProperty(el, ctx, bean, name);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreaker.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreaker.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreaker.java
index 4a4e3e0..00ed187 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreaker.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreaker.java
@@ -28,14 +28,14 @@ public interface CircuitBreaker {
* @return "false" if circuit breaker is open, "true" otherwise
*/
boolean allowRequest();
-
+
/**
* Reports about failure conditions to circuit breaker.
* @param cause exception happened (could be null in case the error is deducted
* from response status/code).
*/
void markFailure(Throwable cause);
-
+
/**
* Reports about successful invocation to circuit breaker.
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreakerFailoverFeature.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreakerFailoverFeature.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreakerFailoverFeature.java
index bc37632..317d880 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreakerFailoverFeature.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/CircuitBreakerFailoverFeature.java
@@ -28,18 +28,18 @@ public class CircuitBreakerFailoverFeature extends FailoverFeature {
private int threshold;
private long timeout;
private FailoverTargetSelector targetSelector;
-
+
public CircuitBreakerFailoverFeature() {
- this(CircuitBreakerTargetSelector.DEFAULT_THESHOLD,
+ this(CircuitBreakerTargetSelector.DEFAULT_THESHOLD,
CircuitBreakerTargetSelector.DEFAULT_TIMEOUT);
}
-
+
public CircuitBreakerFailoverFeature(String clientBootstrapAddress) {
- this(CircuitBreakerTargetSelector.DEFAULT_THESHOLD,
+ this(CircuitBreakerTargetSelector.DEFAULT_THESHOLD,
CircuitBreakerTargetSelector.DEFAULT_TIMEOUT,
clientBootstrapAddress);
}
-
+
public CircuitBreakerFailoverFeature(int threshold, long timeout) {
this.threshold = threshold;
this.timeout = timeout;
@@ -50,28 +50,28 @@ public class CircuitBreakerFailoverFeature extends FailoverFeature {
this.threshold = threshold;
this.timeout = timeout;
}
-
+
@Override
public FailoverTargetSelector getTargetSelector() {
if (this.targetSelector == null) {
- this.targetSelector = new CircuitBreakerTargetSelector(threshold, timeout,
+ this.targetSelector = new CircuitBreakerTargetSelector(threshold, timeout,
super.getClientBootstrapAddress());
}
return this.targetSelector;
}
-
+
public int getThreshold() {
return threshold;
}
-
+
public long getTimeout() {
return timeout;
}
-
+
public void setThreshold(int threshold) {
this.threshold = threshold;
}
-
+
public void setTimeout(long timeout) {
this.timeout = timeout;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/ZestCircuitBreaker.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/ZestCircuitBreaker.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/ZestCircuitBreaker.java
index a64936d..2d6e524 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/ZestCircuitBreaker.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/circuitbreaker/ZestCircuitBreaker.java
@@ -21,25 +21,25 @@ package org.apache.cxf.clustering.circuitbreaker;
import org.qi4j.library.circuitbreaker.CircuitBreaker;
-public class ZestCircuitBreaker extends CircuitBreaker
+public class ZestCircuitBreaker extends CircuitBreaker
implements org.apache.cxf.clustering.circuitbreaker.CircuitBreaker {
-
+
private final CircuitBreaker delegate;
-
+
public ZestCircuitBreaker(final int threshold, final long timeout) {
delegate = new CircuitBreaker(threshold, timeout);
}
-
+
@Override
public boolean allowRequest() {
return delegate.isOn();
}
-
+
@Override
public void markFailure(Throwable cause) {
delegate.throwable(cause);
}
-
+
@Override
public void markSuccess() {
delegate.success();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/CircuitBreakerFailoverBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/CircuitBreakerFailoverBeanDefinitionParser.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/CircuitBreakerFailoverBeanDefinitionParser.java
index d3a8288..67d5cf8 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/CircuitBreakerFailoverBeanDefinitionParser.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/CircuitBreakerFailoverBeanDefinitionParser.java
@@ -30,7 +30,7 @@ public class CircuitBreakerFailoverBeanDefinitionParser extends AbstractBeanDefi
protected Class<?> getBeanClass(Element element) {
return CircuitBreakerFailoverFeature.class;
}
-
+
@Override
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element e, String name) {
setFirstChildAsProperty(e, ctx, bean, name);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java
index 231a149..87d43d9 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/FailoverBeanDefinitionParser.java
@@ -31,7 +31,7 @@ public class FailoverBeanDefinitionParser extends AbstractBeanDefinitionParser {
protected Class<?> getBeanClass(Element element) {
return FailoverFeature.class;
}
-
+
@Override
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element e, String name) {
setFirstChildAsProperty(e, ctx, bean, name);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java
index 86000a6..9c5f379 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/LoadDistributorBeanDefinitionParser.java
@@ -31,7 +31,7 @@ public class LoadDistributorBeanDefinitionParser extends AbstractBeanDefinitionP
protected Class<?> getBeanClass(Element element) {
return LoadDistributorFeature.class;
}
-
+
@Override
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element e, String name) {
setFirstChildAsProperty(e, ctx, bean, name);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/NamespaceHandler.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/NamespaceHandler.java b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/NamespaceHandler.java
index 156356b..6081b54 100644
--- a/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/NamespaceHandler.java
+++ b/rt/features/clustering/src/main/java/org/apache/cxf/clustering/spring/NamespaceHandler.java
@@ -27,6 +27,6 @@ public class NamespaceHandler extends NamespaceHandlerSupport {
registerBeanDefinitionParser("loadDistributor",
new LoadDistributorBeanDefinitionParser());
registerBeanDefinitionParser("circuit-breaker-failover",
- new CircuitBreakerFailoverBeanDefinitionParser());
+ new CircuitBreakerFailoverBeanDefinitionParser());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
index 226e2ec..004b802 100644
--- a/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
+++ b/rt/features/clustering/src/test/java/org/apache/cxf/clustering/blueprint/ClusteringBPNamespaceHandlerTest.java
@@ -23,13 +23,13 @@ import org.junit.Assert;
import org.junit.Test;
/**
- *
+ *
*/
public class ClusteringBPNamespaceHandlerTest extends Assert {
@Test
public void testGetSchemaLocation() {
ClusteringBPNamespaceHandler handler = new ClusteringBPNamespaceHandler();
-
+
assertNotNull(handler.getSchemaLocation("http://cxf.apache.org/clustering"));
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
index cdc8618..a64c39c 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/AbstractLoggingInterceptor.java
@@ -42,7 +42,7 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
super(phase);
this.sender = sender;
}
-
+
public void setLimit(int lim) {
this.limit = lim;
}
@@ -64,21 +64,21 @@ public abstract class AbstractLoggingInterceptor extends AbstractPhaseIntercepto
((PrettyLoggingFilter)this.sender).setPrettyLogging(prettyLogging);
}
}
-
+
protected boolean shouldLogContent(LogEvent event) {
- return event.isBinaryContent() && logBinary
+ return event.isBinaryContent() && logBinary
|| event.isMultipartContent() && logMultipart
|| !event.isBinaryContent() && !event.isMultipartContent();
}
-
+
public void setLogBinary(boolean logBinary) {
this.logBinary = logBinary;
}
-
+
public void setLogMultipart(boolean logMultipart) {
this.logMultipart = logMultipart;
}
-
+
public void createExchangeId(Message message) {
Exchange exchange = message.getExchange();
String exchangeId = (String)exchange.get(LogEvent.KEY_EXCHANGE_ID);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
index 1e34887..77287df 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingFeature.java
@@ -29,7 +29,7 @@ import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
/**
- * This class is used to control message-on-the-wire logging.
+ * This class is used to control message-on-the-wire logging.
* By attaching this feature to an endpoint, you
* can specify logging. If this feature is present, an endpoint will log input
* and output of ordinary and log messages.
@@ -59,10 +59,10 @@ public class LoggingFeature extends AbstractFeature {
in = new LoggingInInterceptor(prettyFilter);
out = new LoggingOutInterceptor(prettyFilter);
}
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
-
+
provider.getInInterceptors().add(wireTapIn);
provider.getInInterceptors().add(in);
provider.getInFaultInterceptors().add(in);
@@ -76,13 +76,13 @@ public class LoggingFeature extends AbstractFeature {
out.setLimit(limit);
wireTapIn.setLimit(limit);
}
-
+
public void setInMemThreshold(long inMemThreshold) {
in.setInMemThreshold(inMemThreshold);
out.setInMemThreshold(inMemThreshold);
wireTapIn.setThreshold(inMemThreshold);
}
-
+
public void setSender(LogEventSender sender) {
this.prettyFilter.setNext(sender);
}
@@ -90,18 +90,18 @@ public class LoggingFeature extends AbstractFeature {
public void setPrettyLogging(boolean prettyLogging) {
this.prettyFilter.setPrettyLogging(prettyLogging);
}
-
+
/**
* Log binary content?
- * @param logBinary defaults to false
+ * @param logBinary defaults to false
*/
public void setLogBinary(boolean logBinary) {
in.setLogBinary(logBinary);
out.setLogBinary(logBinary);
}
-
+
/**
- * Log multipart content?
+ * Log multipart content?
* @param logMultipart defaults to true
*/
public void setLogMultipart(boolean logMultipart) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
index 6c19109..a3f3ee4 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingInInterceptor.java
@@ -44,7 +44,7 @@ import org.apache.cxf.phase.Phase;
import org.apache.cxf.phase.PhaseInterceptor;
/**
- *
+ *
*/
@NoJSR250Annotations
public class LoggingInInterceptor extends AbstractLoggingInterceptor {
@@ -62,9 +62,9 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
message.remove(LogEvent.class);
sender.send(event);
}
- }
+ }
}
-
+
public LoggingInInterceptor() {
this(new Slf4jEventSender());
}
@@ -77,8 +77,8 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
public Collection<PhaseInterceptor<? extends Message>> getAdditionalInterceptors() {
return Collections.singleton(new SendLogEventInterceptor());
}
-
-
+
+
public void handleFault(Message message) {
LogEvent event = message.get(LogEvent.class);
if (event != null) {
@@ -99,8 +99,8 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
} else {
event.setPayload(AbstractLoggingInterceptor.CONTENT_SUPPRESSED);
}
- // at this point, we have the payload. However, we may not have the endpoint yet. Delay sending
- // the event till a little bit later
+ // at this point, we have the payload. However, we may not have the endpoint yet. Delay sending
+ // the event till a little bit later
message.put(LogEvent.class, event);
}
}
@@ -116,7 +116,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
}
}
}
-
+
protected void logInputStream(Message message, InputStream is, LogEvent event) {
CachedOutputStream bos = new CachedOutputStream();
if (threshold > 0) {
@@ -125,16 +125,16 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
String encoding = event.getEncoding();
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);
@@ -149,7 +149,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
if (bos.size() > limit && limit != -1) {
event.setTruncated(true);
}
-
+
StringBuilder builder = new StringBuilder(limit);
if (StringUtils.isEmpty(encoding)) {
bos.writeCacheTo(builder, limit);
@@ -168,7 +168,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...
event.setFullContentFile(writer.getTempFile());
@@ -179,7 +179,7 @@ public class LoggingInInterceptor extends AbstractLoggingInterceptor {
int max = writer.size() > limit ? (int)limit : (int)writer.size();
StringBuilder b = new StringBuilder(max);
writer.writeCacheTo(b);
- event.setPayload(b.toString());
+ event.setPayload(b.toString());
} catch (Exception e) {
throw new Fault(e);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
index 2885f6e..7d25139 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/LoggingOutInterceptor.java
@@ -41,7 +41,7 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
/**
- *
+ *
*/
@NoJSR250Annotations
public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
@@ -65,7 +65,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
message.setContent(OutputStream.class, createCachingOut(message, os, callback));
} else {
final Writer iowriter = message.getContent(Writer.class);
- if (iowriter != null) {
+ if (iowriter != null) {
message.setContent(Writer.class, new LogEventSendingWriter(sender, message, iowriter, limit));
}
}
@@ -130,7 +130,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
if (w2 == null) {
w2 = (StringWriter)out;
}
-
+
String payload = shouldLogContent(event) ? getPayload(event, w2) : CONTENT_SUPPRESSED;
event.setPayload(payload);
sender.send(event);
@@ -148,7 +148,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
}
return payload.toString();
}
-
+
protected void writePayload(StringBuilder builder, StringWriter stringWriter, String contentType)
throws Exception {
StringBuffer buffer = stringWriter.getBuffer();
@@ -207,7 +207,7 @@ public class LoggingOutInterceptor extends AbstractLoggingInterceptor {
// ignore
}
}
-
+
protected void writePayload(StringBuilder builder, CachedOutputStream cos, String encoding,
String contentType) throws Exception {
if (StringUtils.isEmpty(encoding)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java
index e6b8508..f7d4d66 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/WireTapIn.java
@@ -38,7 +38,7 @@ public class WireTapIn extends AbstractPhaseInterceptor<Message> {
/**
* Instantiates a new WireTapIn
- * @param limit
+ * @param limit
*
* @param logMessageContent the log message content
*/
@@ -94,13 +94,13 @@ public class WireTapIn extends AbstractPhaseInterceptor<Message> {
message.setContent(CachedOutputStream.class, bos);
}
-
+
public void setLimit(int limit) {
this.limit = limit;
}
-
+
public void setThreshold(long threshold) {
this.threshold = threshold;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 7829b2e..030cd8c 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -170,7 +170,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
String contentType = safeGet(message, Message.CONTENT_TYPE);
return contentType != null && BINARY_CONTENT_MEDIA_TYPES.contains(contentType);
}
-
+
private boolean isMultipartContent(Message message) {
String contentType = safeGet(message, Message.CONTENT_TYPE);
return contentType != null && contentType.startsWith(MULTIPART_CONTENT_MEDIA_TYPE);
@@ -189,7 +189,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
/**
* Get MessageId from WS Addressing properties
- *
+ *
* @param message
* @return message id
*/
@@ -245,7 +245,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
}
return new StringBuffer().append(httpMethod).append('[').append(path).append(']').toString();
}
-
+
private static String safeGet(Message message, String key) {
if (message == null || !message.containsKey(key)) {
return null;
@@ -285,7 +285,7 @@ public class DefaultLogEventMapper implements LogEventMapper {
/**
* For REST we also consider a response to be a fault if the operation is not found or the response code
* is an error
- *
+ *
* @param message
* @return
*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEvent.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEvent.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEvent.java
index 2ce1b83..cc7084d 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEvent.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/LogEvent.java
@@ -64,15 +64,15 @@ public final class LogEvent {
public void setExchangeId(String exchangeId) {
this.exchangeId = exchangeId;
}
-
+
public EventType getType() {
return type;
}
-
+
public void setType(EventType type) {
this.type = type;
}
-
+
public String getAddress() {
return address;
}
@@ -112,15 +112,15 @@ public final class LogEvent {
public void setResponseCode(String responseCode) {
this.responseCode = responseCode;
}
-
+
public String getPrincipal() {
return principal;
}
-
+
public void setPrincipal(String principal) {
this.principal = principal;
}
-
+
public QName getServiceName() {
return serviceName;
}
@@ -144,11 +144,11 @@ public final class LogEvent {
public void setPortTypeName(QName portTypeName) {
this.portTypeName = portTypeName;
}
-
+
public String getOperationName() {
return operationName;
}
-
+
public void setOperationName(String operationName) {
this.operationName = operationName;
}
@@ -168,11 +168,11 @@ public final class LogEvent {
public void setBinaryContent(boolean binaryContent) {
this.binaryContent = binaryContent;
}
-
+
public boolean isMultipartContent() {
return multipartContent;
}
-
+
public void setMultipartContent(boolean multipartContent) {
this.multipartContent = multipartContent;
}
@@ -184,7 +184,7 @@ public final class LogEvent {
public void setPayload(String payload) {
this.payload = payload;
}
-
+
public boolean isTruncated() {
return truncated;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
index db42fd4..27ed7e4 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrettyLoggingFilter.java
@@ -51,9 +51,9 @@ public class PrettyLoggingFilter implements LogEventSender {
}
private boolean shouldPrettyPrint(LogEvent event) {
- String contentType = event.getContentType();
- return prettyLogging
- && contentType != null
+ String contentType = event.getContentType();
+ return prettyLogging
+ && contentType != null
&& contentType.indexOf("xml") >= 0
&& contentType.toLowerCase().indexOf("multipart/related") < 0
&& event.getPayload().length() > 0;
@@ -90,7 +90,7 @@ public class PrettyLoggingFilter implements LogEventSender {
public void setNext(LogEventSender next) {
this.next = next;
}
-
+
public void setPrettyLogging(boolean prettyLogging) {
this.prettyLogging = prettyLogging;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
index b34133d..d618028 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/PrintWriterEventSender.java
@@ -25,25 +25,25 @@ import java.time.Instant;
import javax.xml.namespace.QName;
/**
- *
+ *
*/
public class PrintWriterEventSender implements LogEventSender {
PrintWriter writer;
-
+
public PrintWriterEventSender(PrintWriter writer) {
this.writer = writer;
}
-
+
void setPrintWriter(PrintWriter w) {
writer = w;
}
-
-
+
+
/** {@inheritDoc}*/
@Override
public void send(LogEvent event) {
StringBuilder b = new StringBuilder();
-
+
b.append(Instant.now().toString()).append(" - PrintWriterEventSender\n");
put(b, "type", event.getType().toString());
put(b, "address", event.getAddress());
@@ -68,7 +68,7 @@ public class PrintWriterEventSender implements LogEventSender {
protected String localPart(QName name) {
return name == null ? null : name.getLocalPart();
}
-
+
protected void put(StringBuilder b, String key, String value) {
if (value != null) {
b.append(" ").append(key).append(": ").append(value).append("\n");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
index 815f7b9..7bc1faa 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/osgi/Activator.java
@@ -48,7 +48,7 @@ public class Activator implements BundleActivator {
public void stop(BundleContext context) throws Exception {
}
-
+
private static final class ConfigUpdater implements ManagedService {
private BundleContext bundleContext;
private ServiceRegistration serviceReg;
@@ -84,7 +84,7 @@ public class Activator implements BundleActivator {
properties.put("org.apache.cxf.dosgi.IntentName", "logging");
bundleContext.registerService(AbstractFeature.class.getName(), logging, properties);
}
-
+
if (enabled) {
if (serviceReg == null) {
Dictionary<String, Object> properties = new Hashtable<>();
@@ -98,7 +98,7 @@ public class Activator implements BundleActivator {
}
}
}
-
+
@SuppressWarnings("rawtypes")
private String getValue(Dictionary config, String key, String defaultValue) {
if (config == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
index 4515c1a..57795a2 100644
--- a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
+++ b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/slf4j/Slf4jEventSender.java
@@ -45,7 +45,7 @@ public class Slf4jEventSender implements LogEventSender {
String cat = logCategory != null ? logCategory
: "org.apache.cxf.services." + event.getPortTypeName().getLocalPart() + "." + event.getType();
Logger log = LoggerFactory.getLogger(cat);
- Set<String> keys = new HashSet<>();
+ Set<String> keys = new HashSet<>();
try {
put(keys, "type", event.getType().toString());
put(keys, "address", event.getAddress());
@@ -68,9 +68,9 @@ public class Slf4jEventSender implements LogEventSender {
MDC.remove(key);
}
}
-
+
}
-
+
private String localPart(QName name) {
return name == null ? null : name.getLocalPart();
}
@@ -78,7 +78,7 @@ public class Slf4jEventSender implements LogEventSender {
private String getLogMessage(LogEvent event) {
return event.getPayload();
}
-
+
private void put(Set<String> keys, String key, String value) {
if (value != null) {
MDC.put(key, value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
----------------------------------------------------------------------
diff --git a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
index 8792e23..eed4de1 100644
--- a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
+++ b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
@@ -40,7 +40,7 @@ public class DefaultLogEventMapperTest {
LogEvent event = mapper.map(message);
Assert.assertEquals("GET[test]", event.getOperationName());
}
-
+
/**
* Test for NPE described in CXF-6436
*/
@@ -55,6 +55,6 @@ public class DefaultLogEventMapperTest {
LogEvent event = mapper.map(message);
Assert.assertEquals("", event.getOperationName());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/ExchangeMetrics.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/ExchangeMetrics.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/ExchangeMetrics.java
index 342d921..c8df47c 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/ExchangeMetrics.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/ExchangeMetrics.java
@@ -27,14 +27,14 @@ import org.apache.cxf.metrics.interceptors.CountingInputStream;
import org.apache.cxf.metrics.interceptors.CountingOutputStream;
/**
- *
+ *
*/
public class ExchangeMetrics {
Deque<MetricsContext> contexts = new LinkedList<MetricsContext>();
Exchange exchange;
boolean started;
long startTime = -1;
-
+
public ExchangeMetrics(Exchange e) {
exchange = e;
}
@@ -46,7 +46,7 @@ public class ExchangeMetrics {
}
return this;
}
-
+
public void start() {
started = true;
startTime = System.nanoTime();
@@ -54,7 +54,7 @@ public class ExchangeMetrics {
ctx.start(exchange);
}
}
-
+
public void stop() {
started = false;
if (startTime == -1) {
@@ -75,5 +75,5 @@ public class ExchangeMetrics {
ctx.stop(l, inSize, outSize, exchange);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsContext.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsContext.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsContext.java
index 2c28b2e..21c461f 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsContext.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsContext.java
@@ -27,17 +27,17 @@ import org.apache.cxf.message.Exchange;
* Class to hold all the various metric pieces for a given context (Endpoint, Customer, Operation, etc...)
*/
public interface MetricsContext {
-
+
/**
* Will be called at the start of invoke (or when added to a started MessageMetrics). This is
- * when the metrics should increment "inFlight" counts and other stats. There is no need to
+ * when the metrics should increment "inFlight" counts and other stats. There is no need to
* record a "start time" as the invoke time will be passed into the stop method.
*/
void start(Exchange m);
-
+
/**
* Called when the invocation is complete.
- *
+ *
* @param timeInNS
* @param inSize
* @param outSize
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java
index 45719a9..958644f 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsFeature.java
@@ -42,13 +42,13 @@ import org.apache.cxf.metrics.interceptors.MetricsMessageInPreInvokeInterceptor;
import org.apache.cxf.metrics.interceptors.MetricsMessageOutInterceptor;
/**
- *
+ *
*/
@NoJSR250Annotations
@Provider(Type.Feature)
public class MetricsFeature extends AbstractFeature {
MetricsProvider[] providers;
-
+
public MetricsFeature() {
this.providers = null;
}
@@ -58,7 +58,7 @@ public class MetricsFeature extends AbstractFeature {
public MetricsFeature(MetricsProvider ... providers) {
this.providers = providers.length > 0 ? providers : null;
}
-
+
@Override
public void initialize(Server server, Bus bus) {
createDefaultProvidersIfNeeded(bus);
@@ -66,24 +66,24 @@ public class MetricsFeature extends AbstractFeature {
Endpoint provider = server.getEndpoint();
MetricsMessageOutInterceptor out = new MetricsMessageOutInterceptor(providers);
CountingOutInterceptor countingOut = new CountingOutInterceptor();
-
+
provider.getInInterceptors().add(new MetricsMessageInInterceptor(providers));
provider.getInInterceptors().add(new MetricsMessageInOneWayInterceptor(providers));
provider.getInInterceptors().add(new MetricsMessageInPreInvokeInterceptor(providers));
-
+
provider.getOutInterceptors().add(countingOut);
provider.getOutInterceptors().add(out);
provider.getOutFaultInterceptors().add(countingOut);
provider.getOutFaultInterceptors().add(out);
}
-
+
@Override
public void initialize(Client client, Bus bus) {
createDefaultProvidersIfNeeded(bus);
//can optimize for client case and just put interceptors it needs
MetricsMessageOutInterceptor out = new MetricsMessageOutInterceptor(providers);
CountingOutInterceptor countingOut = new CountingOutInterceptor();
-
+
client.getInInterceptors().add(new MetricsMessageInInterceptor(providers));
client.getInInterceptors().add(new MetricsMessageInPostInvokeInterceptor(providers));
client.getInFaultInterceptors().add(new MetricsMessageInPostInvokeInterceptor(providers));
@@ -91,22 +91,22 @@ public class MetricsFeature extends AbstractFeature {
client.getOutInterceptors().add(out);
client.getOutInterceptors().add(new MetricsMessageClientOutInterceptor(providers));
}
-
-
+
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
createDefaultProvidersIfNeeded(bus);
//if feature is added to the bus, we need to add all the interceptors
MetricsMessageOutInterceptor out = new MetricsMessageOutInterceptor(providers);
CountingOutInterceptor countingOut = new CountingOutInterceptor();
-
+
provider.getInInterceptors().add(new MetricsMessageInInterceptor(providers));
provider.getInInterceptors().add(new MetricsMessageInOneWayInterceptor(providers));
provider.getInInterceptors().add(new MetricsMessageInPreInvokeInterceptor(providers));
provider.getInInterceptors().add(new MetricsMessageInPostInvokeInterceptor(providers));
provider.getInFaultInterceptors().add(new MetricsMessageInPreInvokeInterceptor(providers));
provider.getInFaultInterceptors().add(new MetricsMessageInPostInvokeInterceptor(providers));
-
+
provider.getOutInterceptors().add(countingOut);
provider.getOutInterceptors().add(out);
provider.getOutInterceptors().add(new MetricsMessageClientOutInterceptor(providers));
@@ -125,7 +125,7 @@ public class MetricsFeature extends AbstractFeature {
}
if (providers == null) {
try {
- Class<?> cls = ClassLoaderUtils.loadClass("org.apache.cxf.metrics.codahale.CodahaleMetricsProvider",
+ Class<?> cls = ClassLoaderUtils.loadClass("org.apache.cxf.metrics.codahale.CodahaleMetricsProvider",
MetricsFeature.class);
Constructor<?> c = cls.getConstructor(Bus.class);
providers = new MetricsProvider[] {(MetricsProvider)c.newInstance(bus)};
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsProvider.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsProvider.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsProvider.java
index 0184723..6eb076f 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsProvider.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/MetricsProvider.java
@@ -23,7 +23,7 @@ import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.service.model.BindingOperationInfo;
/**
- *
+ *
*/
public interface MetricsProvider {
String CLIENT_ID = "MetricsProvider.CLIENT_ID";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java
index 27dbc80..ccce93b 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsContext.java
@@ -33,7 +33,7 @@ import org.apache.cxf.message.FaultMode;
import org.apache.cxf.metrics.MetricsContext;
/**
- *
+ *
*/
public class CodahaleMetricsContext implements MetricsContext, Closeable {
protected Counter inFlight;
@@ -44,15 +44,15 @@ public class CodahaleMetricsContext implements MetricsContext, Closeable {
protected Timer logicalRuntimeFaults;
protected Meter incomingData;
protected Meter outgoingData;
-
+
protected final String baseName;
protected final MetricRegistry registry;
-
+
public CodahaleMetricsContext(String prefix, MetricRegistry registry) {
baseName = prefix;
this.registry = registry;
totals = registry.timer(baseName + "Attribute=Totals");
- uncheckedApplicationFaults = registry.timer(baseName
+ uncheckedApplicationFaults = registry.timer(baseName
+ "Attribute=Unchecked Application Faults");
checkedApplicationFaults = registry.timer(baseName + "Attribute=Checked Application Faults");
runtimeFaults = registry.timer(baseName + "Attribute=Runtime Faults");
@@ -74,11 +74,11 @@ public class CodahaleMetricsContext implements MetricsContext, Closeable {
registry.remove(baseName + "Attribute=Data Written");
}
-
+
public void start(Exchange ex) {
inFlight.inc();
}
-
+
public void stop(long timeInNS, long inSize, long outSize, Exchange ex) {
totals.update(timeInNS, TimeUnit.NANOSECONDS);
@@ -89,7 +89,7 @@ public class CodahaleMetricsContext implements MetricsContext, Closeable {
outgoingData.mark(outSize);
}
FaultMode fm = ex.get(FaultMode.class);
- if (fm == null && ex.getOutFaultMessage() != null) {
+ if (fm == null && ex.getOutFaultMessage() != null) {
fm = ex.getOutFaultMessage().get(FaultMode.class);
}
if (fm == null && ex.getInMessage() != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java
index 3858032..fd5187f 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/codahale/CodahaleMetricsProvider.java
@@ -37,18 +37,18 @@ import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
/**
- *
+ *
*/
@NoJSR250Annotations
-public class CodahaleMetricsProvider implements MetricsProvider {
+public class CodahaleMetricsProvider implements MetricsProvider {
private static final String QUESTION_MARK = "?";
private static final String ESCAPED_QUESTION_MARK = "\\?";
protected Bus bus;
protected MetricRegistry registry;
-
+
/**
- *
+ *
*/
public CodahaleMetricsProvider(Bus b) {
this.bus = b;
@@ -60,7 +60,7 @@ public class CodahaleMetricsProvider implements MetricsProvider {
}
}
-
+
public static void setupJMXReporter(Bus b, MetricRegistry reg) {
InstrumentationManager im = b.getExtension(InstrumentationManager.class);
if (im != null) {
@@ -114,8 +114,8 @@ public class CodahaleMetricsProvider implements MetricsProvider {
}
return buffer;
}
-
-
+
+
/** {@inheritDoc}*/
@Override
public MetricsContext createEndpointContext(final Endpoint endpoint, boolean isClient, String clientId) {
@@ -135,7 +135,7 @@ public class CodahaleMetricsProvider implements MetricsProvider {
/** {@inheritDoc}*/
@Override
- public MetricsContext createResourceContext(Endpoint endpoint, String resourceName,
+ public MetricsContext createResourceContext(Endpoint endpoint, String resourceName,
boolean asClient, String clientId) {
StringBuilder buffer = getBaseServiceName(endpoint, asClient, clientId);
buffer.append("Operation=").append(resourceName).append(',');
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
index ec10739..5b08747 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/AbstractMetricsInterceptor.java
@@ -49,7 +49,7 @@ public abstract class AbstractMetricsInterceptor extends AbstractPhaseIntercepto
super(phase);
providers = p;
}
-
+
protected Collection<? extends MetricsProvider> getMetricProviders(Bus bus) {
if (providers != null) {
return Arrays.asList(providers);
@@ -60,13 +60,13 @@ public abstract class AbstractMetricsInterceptor extends AbstractPhaseIntercepto
}
return b.getBeansOfType(MetricsProvider.class);
}
-
+
protected ExchangeMetrics getExchangeMetrics(Message m, boolean create) {
ExchangeMetrics ctx = m.getExchange().get(ExchangeMetrics.class);
if (ctx == null && create) {
ctx = new ExchangeMetrics(m.getExchange());
m.getExchange().put(ExchangeMetrics.class, ctx);
-
+
addEndpointMetrics(ctx, m);
}
return ctx;
@@ -157,7 +157,7 @@ public abstract class AbstractMetricsInterceptor extends AbstractPhaseIntercepto
ctx.addContext((MetricsContext)metrics);
}
}
-
+
private synchronized Object createMetricsContextForRestResource(Message message, String resource) {
Map<String, Object> restMap = getRestMetricsMap(message.getExchange().getEndpoint());
Object o = restMap.get(resource);
@@ -208,7 +208,7 @@ public abstract class AbstractMetricsInterceptor extends AbstractPhaseIntercepto
}
return o;
}
-
+
public void stop(Message m) {
ExchangeMetrics ctx = getExchangeMetrics(m, false);
if (ctx != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutInterceptor.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutInterceptor.java
index ce103ca..0986e06 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutInterceptor.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutInterceptor.java
@@ -38,5 +38,5 @@ public class CountingOutInterceptor extends AbstractPhaseInterceptor<Message> {
message.setContent(OutputStream.class, newOut);
message.getExchange().put(CountingOutputStream.class, newOut);
}
- }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java
index 5247e21..673a503 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/CountingOutputStream.java
@@ -28,7 +28,7 @@ public final class CountingOutputStream extends FilterOutputStream {
public CountingOutputStream(OutputStream out) {
super(out);
}
-
+
public long getCount() {
return count;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInOneWayInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInOneWayInterceptor.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInOneWayInterceptor.java
index 1ded851..59a8977 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInOneWayInterceptor.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInOneWayInterceptor.java
@@ -36,5 +36,5 @@ public class MetricsMessageInOneWayInterceptor extends AbstractMetricsIntercepto
if (ex.isOneWay() && !isRequestor(message)) {
stop(message);
}
- }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPostInvokeInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPostInvokeInterceptor.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPostInvokeInterceptor.java
index f1b5027..ce73338 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPostInvokeInterceptor.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPostInvokeInterceptor.java
@@ -33,5 +33,5 @@ public class MetricsMessageInPostInvokeInterceptor extends AbstractMetricsInterc
if (isRequestor(message)) {
stop(message);
}
- }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPreInvokeInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPreInvokeInterceptor.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPreInvokeInterceptor.java
index cdb92d8..2b1d3c7 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPreInvokeInterceptor.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageInPreInvokeInterceptor.java
@@ -40,5 +40,5 @@ public class MetricsMessageInPreInvokeInterceptor extends AbstractMetricsInterce
addOperationMetrics(ctx, message, ex.getBindingOperationInfo());
}
}
- }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageOutInterceptor.java b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageOutInterceptor.java
index 78dd8de..3aede6a 100644
--- a/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageOutInterceptor.java
+++ b/rt/features/metrics/src/main/java/org/apache/cxf/metrics/interceptors/MetricsMessageOutInterceptor.java
@@ -36,5 +36,5 @@ public class MetricsMessageOutInterceptor extends AbstractMetricsInterceptor {
//one way on the client, it's sent, now stop
stop(message);
}
- }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
index 7c5ec84..39f580a 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/SimpleThrottlingManager.java
@@ -29,10 +29,10 @@ import org.apache.cxf.phase.Phase;
*/
public class SimpleThrottlingManager extends ThrottleResponse implements ThrottlingManager {
private static final String THROTTLED_KEY = "THROTTLED";
-
+
private int threshold;
private ThrottlingCounter counter = new ThrottlingCounter();
-
+
@Override
public List<String> getDecisionPhases() {
return Collections.singletonList(Phase.PRE_STREAM);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottleResponse.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottleResponse.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottleResponse.java
index af0bcbd..a0cd975 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottleResponse.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottleResponse.java
@@ -23,22 +23,22 @@ import java.util.HashMap;
import java.util.Map;
/**
- *
+ *
*/
public class ThrottleResponse {
protected long delay;
protected Map<String, String> responseHeaders = new HashMap<>();
protected int responseCode = -1;
protected String errorMessage;
-
+
public ThrottleResponse() {
-
+
}
-
+
public ThrottleResponse(int responceCode) {
this.responseCode = responceCode;
}
-
+
public ThrottleResponse(int responceCode, long delay) {
this(responceCode);
this.delay = delay;
@@ -73,7 +73,7 @@ public class ThrottleResponse {
}
/**
- * Delay processing for specified milliseconds.
+ * Delay processing for specified milliseconds.
* Should be "small" to prevent the client from timing out unless the client request is
* aborted with the HTTP error code.
* @return
@@ -85,5 +85,5 @@ public class ThrottleResponse {
public ThrottleResponse setDelay(long d) {
this.delay = d;
return this;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingFeature.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingFeature.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingFeature.java
index 4276564..f171b94 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingFeature.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingFeature.java
@@ -24,11 +24,11 @@ import org.apache.cxf.feature.AbstractFeature;
import org.apache.cxf.interceptor.InterceptorProvider;
/**
- *
+ *
*/
public class ThrottlingFeature extends AbstractFeature {
final ThrottlingManager manager;
-
+
public ThrottlingFeature() {
manager = null;
}
@@ -36,7 +36,7 @@ public class ThrottlingFeature extends AbstractFeature {
public ThrottlingFeature(ThrottlingManager manager) {
this.manager = manager;
}
-
+
@Override
protected void initializeProvider(InterceptorProvider provider, Bus bus) {
ThrottlingManager m = manager;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java
index a6cf392..90c2b6f 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingInterceptor.java
@@ -31,11 +31,11 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
/**
- *
+ *
*/
public class ThrottlingInterceptor extends AbstractPhaseInterceptor<Message> {
- public static final Logger LOG = LogUtils.getL7dLogger(ThrottlingInterceptor.class);
-
+ public static final Logger LOG = LogUtils.getL7dLogger(ThrottlingInterceptor.class);
+
final ThrottlingManager manager;
public ThrottlingInterceptor(String phase, ThrottlingManager manager) {
super(ThrottlingInterceptor.class.getName() + "-" + phase, phase);
@@ -55,7 +55,7 @@ public class ThrottlingInterceptor extends AbstractPhaseInterceptor<Message> {
OutgoingChainInterceptor.class.getName());
return;
}
-
+
long l = rsp.getDelay();
if (l > 0) {
ContinuationProvider cp = message.get(ContinuationProvider.class);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingManager.java
----------------------------------------------------------------------
diff --git a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingManager.java b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingManager.java
index 86094a9..d0a8695 100644
--- a/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingManager.java
+++ b/rt/features/throttling/src/main/java/org/apache/cxf/throttling/ThrottlingManager.java
@@ -24,18 +24,18 @@ import java.util.List;
import org.apache.cxf.message.Message;
/**
- *
+ *
*/
public interface ThrottlingManager {
-
+
/**
* Get the list of phases where this manager will expect to have to make throttling decisions.
- * For example: using BasicAuth or other protocol based header, it can be a very early in the
- * chain, but for WS-Security based authentication, it would be later.
+ * For example: using BasicAuth or other protocol based header, it can be a very early in the
+ * chain, but for WS-Security based authentication, it would be later.
* @return
*/
List<String> getDecisionPhases();
-
+
/**
* Use information in the message to determine what throttling measures should be taken
* @param phase
[14/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index 4fc4ab4..a72db55 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -52,16 +52,16 @@ import org.omg.CORBA.portable.OutputStream;
public class CorbaObjectWriterTest extends Assert {
private static ORB orb;
-
+
@Before
public void setUp() throws java.lang.Exception {
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws java.lang.Exception {
if (orb != null) {
@@ -76,24 +76,24 @@ public class CorbaObjectWriterTest extends Assert {
@Test
public void testWriteBoolean() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Boolean boolValue = Boolean.TRUE;
writer.writeBoolean(boolValue);
-
+
InputStream iStream = oStream.create_input_stream();
boolean b = iStream.read_boolean();
assertTrue(b == boolValue.booleanValue());
}
-
+
@Test
public void testWriteChar() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Character charValue = new Character('c');
writer.writeChar(charValue);
-
+
InputStream iStream = oStream.create_input_stream();
char c = iStream.read_char();
assertTrue(c == charValue.charValue());
@@ -102,128 +102,128 @@ public class CorbaObjectWriterTest extends Assert {
@Test
public void testWriteWChar() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Character wcharValue = new Character('w');
writer.writeChar(wcharValue);
-
+
InputStream iStream = oStream.create_input_stream();
char wc = iStream.read_char();
assertTrue(wc == wcharValue.charValue());
}
-
+
@Test
public void testWriteShort() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Short shortValue = new Short((short)-123);
writer.writeShort(shortValue);
-
+
InputStream iStream = oStream.create_input_stream();
short s = iStream.read_short();
assertTrue(s == shortValue.shortValue());
}
-
+
@Test
public void testWriteUShort() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Integer ushortValue = new Integer(123);
writer.writeUShort(ushortValue);
-
+
InputStream iStream = oStream.create_input_stream();
int us = iStream.read_ushort();
assertTrue(us == ushortValue.intValue());
}
-
+
@Test
public void testWriteLong() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Integer longValue = new Integer(-1234567);
writer.writeLong(longValue);
-
+
InputStream iStream = oStream.create_input_stream();
int l = iStream.read_long();
assertTrue(l == longValue.intValue());
}
-
+
@Test
public void testWriteULong() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
long ulongValue = 1234567L;
writer.writeULong(ulongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ul = iStream.read_ulong();
assertTrue(ul == ulongValue);
}
-
+
@Test
public void testWriteLongLong() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Long longlongValue = new Long("-12345678900");
writer.writeLongLong(longlongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ll = iStream.read_longlong();
assertTrue(ll == longlongValue.longValue());
}
-
+
@Test
public void testWriteULongLong() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
BigInteger ulonglongValue = new BigInteger("12345678900");
writer.writeULongLong(ulonglongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ul = iStream.read_ulonglong();
assertTrue(ul == ulonglongValue.longValue());
}
-
+
@Test
public void testWriteFloat() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Float floatValue = new Float((float)123456.78);
writer.writeFloat(floatValue);
-
+
InputStream iStream = oStream.create_input_stream();
float f = iStream.read_float();
assertTrue(f == floatValue.floatValue());
}
-
+
@Test
public void testWriteDouble() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Double doubleValue = new Double(987654.321);
writer.writeDouble(doubleValue);
-
+
InputStream iStream = oStream.create_input_stream();
double d = iStream.read_double();
assertTrue(d == doubleValue.doubleValue());
}
-
+
@Test
public void testWriteString() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
String stringValue = new String("String");
writer.writeString(stringValue);
-
+
InputStream iStream = oStream.create_input_stream();
String s = iStream.read_string();
assertTrue(s.equals(stringValue));
@@ -232,20 +232,20 @@ public class CorbaObjectWriterTest extends Assert {
@Test
public void testWriteWString() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
String wstringValue = new String("String");
writer.writeWString(wstringValue);
-
+
InputStream iStream = oStream.create_input_stream();
String s = iStream.read_wstring();
assertTrue(s.equals(wstringValue));
}
-
+
@Test
public void testWriteArray() {
int data[] = {1, 1, 2, 3, 5, 8, 13, 21};
-
+
// create an array of longs
QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
QName arrayIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "array", CorbaConstants.NP_WSDL_CORBA);
@@ -259,7 +259,7 @@ public class CorbaObjectWriterTest extends Assert {
CorbaArrayHandler obj = new CorbaArrayHandler(new QName("Array"), arrayIdlType, arrayTC, arrayType);
for (int i = 0; i < data.length; ++i) {
CorbaPrimitiveHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), longIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), longIdlType,
orb.get_primitive_tc(TCKind.tk_long), null);
nestedObj.setValueFromData(Integer.toString(data[i]));
obj.addElement(nestedObj);
@@ -268,25 +268,25 @@ public class CorbaObjectWriterTest extends Assert {
OutputStream oStream = orb.create_output_stream();
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeArray(obj);
-
+
InputStream iStream = oStream.create_input_stream();
for (int i = 0; i < data.length; ++i) {
int val = iStream.read_long();
assertTrue(val == data[i]);
}
}
-
+
@Test
public void testWriteSequence() {
String data[] = {"one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one"};
-
+
// create an sequence of strings
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
QName seqIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "sequence", CorbaConstants.NP_WSDL_CORBA);
Sequence seqType = new Sequence();
seqType.setBound(data.length);
- seqType.setElemtype(stringIdlType);
+ seqType.setElemtype(stringIdlType);
// name and respoitory ID of the sequence are not needed for this test
// build the object holder for a sequence.
@@ -294,16 +294,16 @@ public class CorbaObjectWriterTest extends Assert {
CorbaSequenceHandler obj = new CorbaSequenceHandler(new QName("Seq"), seqIdlType, seqTC, seqType);
for (int i = 0; i < data.length; ++i) {
CorbaPrimitiveHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
orb.get_primitive_tc(TCKind.tk_string), null);
nestedObj.setValueFromData(data[i]);
obj.addElement(nestedObj);
}
-
+
OutputStream oStream = orb.create_output_stream();
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeSequence(obj);
-
+
InputStream iStream = oStream.create_input_stream();
int length = iStream.read_long();
for (int i = 0; i < length; ++i) {
@@ -311,7 +311,7 @@ public class CorbaObjectWriterTest extends Assert {
assertTrue(val.equals(data[i]));
}
}
-
+
@Test
public void testWriteStruct() {
// create the following struct
@@ -323,12 +323,12 @@ public class CorbaObjectWriterTest extends Assert {
int member1 = 12345;
String member2 = "54321";
boolean member3 = true;
-
+
QName structIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "struct", CorbaConstants.NP_WSDL_CORBA);
QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
QName boolIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
-
+
Struct structType = new Struct();
structType.setName("TestStruct");
MemberType m1 = new MemberType();
@@ -349,29 +349,29 @@ public class CorbaObjectWriterTest extends Assert {
structMembers[0] = new StructMember("member1", orb.get_primitive_tc(TCKind.tk_long), null);
structMembers[1] = new StructMember("member2", orb.get_primitive_tc(TCKind.tk_string), null);
structMembers[2] = new StructMember("member3", orb.get_primitive_tc(TCKind.tk_boolean), null);
- TypeCode structTC = orb.create_struct_tc("IDL:org.apache.cxf.TestStruct/1.0", "TestStruct",
+ TypeCode structTC = orb.create_struct_tc("IDL:org.apache.cxf.TestStruct/1.0", "TestStruct",
structMembers);
- CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
+ CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
structTC, structType);
- CorbaPrimitiveHandler memberObj1 =
+ CorbaPrimitiveHandler memberObj1 =
new CorbaPrimitiveHandler(new QName("member1"), longIdlType, structMembers[0].type, null);
- CorbaPrimitiveHandler memberObj2 =
+ CorbaPrimitiveHandler memberObj2 =
new CorbaPrimitiveHandler(new QName("member2"), stringIdlType, structMembers[1].type, null);
- CorbaPrimitiveHandler memberObj3 =
+ CorbaPrimitiveHandler memberObj3 =
new CorbaPrimitiveHandler(new QName("member3"), boolIdlType, structMembers[2].type, null);
-
+
memberObj1.setValueFromData(Integer.toString(member1));
memberObj2.setValueFromData(member2);
memberObj3.setValueFromData(Boolean.toString(member3));
-
+
obj.addMember(memberObj1);
obj.addMember(memberObj2);
obj.addMember(memberObj3);
-
+
OutputStream oStream = orb.create_output_stream();
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeStruct(obj);
-
+
InputStream iStream = oStream.create_input_stream();
int readMember1 = iStream.read_long();
assertTrue(readMember1 == member1);
@@ -380,7 +380,7 @@ public class CorbaObjectWriterTest extends Assert {
boolean readMember3 = iStream.read_boolean();
assertTrue(readMember3 == member3);
}
-
+
@Test
public void testWriteException() {
// create the following exception
@@ -391,14 +391,14 @@ public class CorbaObjectWriterTest extends Assert {
short code = 12345;
String message = "54321";
String reposID = "IDL:org.apache.cxf.TestException/1.0";
-
+
QName exceptIdlType = new QName(CorbaConstants.NU_WSDL_CORBA,
"exception", CorbaConstants.NP_WSDL_CORBA);
QName shortIdlType = new QName(CorbaConstants.NU_WSDL_CORBA,
"short", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA,
"string", CorbaConstants.NP_WSDL_CORBA);
-
+
Exception exceptType = new Exception();
exceptType.setName("TestException");
exceptType.setRepositoryID(reposID);
@@ -416,13 +416,13 @@ public class CorbaObjectWriterTest extends Assert {
exceptMembers[0] = new StructMember("code", orb.get_primitive_tc(TCKind.tk_short), null);
exceptMembers[1] = new StructMember("message", orb.get_primitive_tc(TCKind.tk_string), null);
TypeCode exceptTC = orb.create_exception_tc(reposID, "TestException", exceptMembers);
- CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
+ CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
exceptTC, exceptType);
-
- CorbaPrimitiveHandler member1 =
+
+ CorbaPrimitiveHandler member1 =
new CorbaPrimitiveHandler(new QName("code"), shortIdlType, exceptMembers[0].type, null);
member1.setValueFromData(Short.toString(code));
- CorbaPrimitiveHandler member2 =
+ CorbaPrimitiveHandler member2 =
new CorbaPrimitiveHandler(new QName("message"), stringIdlType, exceptMembers[1].type, null);
member2.setValueFromData(message);
obj.addMember(member1);
@@ -433,7 +433,7 @@ public class CorbaObjectWriterTest extends Assert {
writer.writeException(obj);
InputStream iStream = oStream.create_input_stream();
-
+
String readId = iStream.read_string();
assertTrue(readId.equals(reposID));
short readCode = iStream.read_short();
@@ -441,29 +441,29 @@ public class CorbaObjectWriterTest extends Assert {
String readMessage = iStream.read_string();
assertTrue(readMessage.equals(message));
}
-
+
@Test
public void testWriteObject() throws IOException {
URL refUrl = getClass().getResource("/references/account.ref");
String oRef = IOUtils.toString(refUrl.openStream()).trim();
- org.omg.CORBA.Object objRef =
+ org.omg.CORBA.Object objRef =
orb.string_to_object(oRef);
assertNotNull(objRef);
-
+
// create a test object
- org.apache.cxf.binding.corba.wsdl.Object objectType =
+ org.apache.cxf.binding.corba.wsdl.Object objectType =
new org.apache.cxf.binding.corba.wsdl.Object();
objectType.setRepositoryID("IDL:Account:1.0");
objectType.setBinding(new QName("AccountCORBABinding"));
-
+
QName objectName = new QName("TestObject");
QName objectIdlType = new QName("corbaatm:TestObject");
TypeCode objectTC = orb.create_interface_tc("IDL:Account:1.0", "TestObject");
-
- CorbaObjectReferenceHandler obj = new CorbaObjectReferenceHandler(objectName, objectIdlType,
+
+ CorbaObjectReferenceHandler obj = new CorbaObjectReferenceHandler(objectName, objectIdlType,
objectTC, objectType);
- obj.setReference(objRef);
-
+ obj.setReference(objRef);
+
OutputStream oStream = orb.create_output_stream();
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeObjectReference(obj);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
index 5c08bc9..b69ddeb 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
@@ -27,51 +27,51 @@ import org.junit.Before;
import org.junit.Test;
public class CorbaStreamReaderTest extends Assert {
-
+
private CorbaStreamReader reader;
private CorbaTypeEventProducer mock;
-
+
@Before
public void setUp() throws Exception {
mock = EasyMock.createMock(CorbaTypeEventProducer.class);
reader = new CorbaStreamReader(mock);
}
-
+
@Test
public void testGetName() throws Exception {
EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
EasyMock.replay(mock);
assertEquals("checking getName ", new QName("http://foo.org", "test"), reader.getName());
}
-
+
@Test
public void testGetLocalName() throws Exception {
EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
EasyMock.replay(mock);
assertEquals("checking localName ", "test", reader.getLocalName());
}
-
+
@Test
public void testGetNamespaceURI() throws Exception {
EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
EasyMock.replay(mock);
- assertEquals("checking namespace ", "http://foo.org", reader.getNamespaceURI());
+ assertEquals("checking namespace ", "http://foo.org", reader.getNamespaceURI());
}
-
+
@Test
public void testGetText() throws Exception {
EasyMock.expect(mock.getText()).andReturn("abcdef");
EasyMock.replay(mock);
assertEquals("checking getText", "abcdef", reader.getText());
}
-
-
+
+
@Test
public void testGetTextCharacters() throws Exception {
EasyMock.expect(mock.getText()).andReturn("abcdef");
EasyMock.replay(mock);
- assertEquals("checking getTextCharacters",
+ assertEquals("checking getTextCharacters",
"abcdef",
new String(reader.getTextCharacters()));
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index 53ccd61..44e89a3 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -37,16 +37,16 @@ import org.omg.CORBA.portable.OutputStream;
public class CorbaStreamableTest extends Assert {
private static ORB orb;
-
-
+
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
-
+
props.put("yoko.orb.id", "CXF-CORBA-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -57,73 +57,73 @@ public class CorbaStreamableTest extends Assert {
}
}
}
-
+
@Test
public void testCreateStreamable() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
assertNotNull(streamable);
}
-
+
@Test
public void testGetStreamableAttributes() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "float", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_float);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
TypeCode type = streamable._type();
assertTrue(type.kind().value() == objTypeCode.kind().value());
-
+
CorbaPrimitiveHandler storedObj = (CorbaPrimitiveHandler)streamable.getObject();
assertNotNull(storedObj);
-
+
int mode = streamable.getMode();
assertTrue(mode == org.omg.CORBA.ARG_OUT.value);
-
+
String name = streamable.getName();
assertTrue(name.equals(objName.getLocalPart()));
}
-
+
@Test
public void testSetStreamableAttributes() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_boolean);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
streamable.setMode(org.omg.CORBA.ARG_IN.value);
int mode = streamable.getMode();
assertTrue(mode == org.omg.CORBA.ARG_IN.value);
}
-
+
@Test
public void testReadStreamable() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "char", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_char);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
-
+ CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
+
OutputStream oStream = orb.create_output_stream();
oStream.write_char('c');
-
+
InputStream iStream = oStream.create_input_stream();
streamable._read(iStream);
CorbaPrimitiveHandler streamableObj = (CorbaPrimitiveHandler)streamable.getObject();
Object o = streamableObj.getValue();
-
+
assertTrue(o instanceof Character);
Character charValue = (Character)o;
assertTrue(charValue.charValue() == 'c');
}
-
+
@Test
public void testWriteStreamable() {
QName objName = new QName("object");
@@ -132,10 +132,10 @@ public class CorbaStreamableTest extends Assert {
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
obj.setValueFromData("TestWString");
CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
-
+
OutputStream oStream = orb.create_output_stream();
streamable._write(oStream);
-
+
InputStream iStream = oStream.create_input_stream();
String value = iStream.read_wstring();
assertEquals("TestWString", value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index ac42dfd..1ff2aca 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -44,7 +44,7 @@ public class CorbaAnyHandlerTest extends Assert {
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -53,7 +53,7 @@ public class CorbaAnyHandlerTest extends Assert {
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
@Test
@@ -66,7 +66,7 @@ public class CorbaAnyHandlerTest extends Assert {
QName anyIdlType = CorbaConstants.NT_CORBA_ANY;
TypeCode anyTC = orb.get_primitive_tc(TCKind.from_int(TCKind._tk_any));
CorbaTypeMap tm = new CorbaTypeMap(CorbaConstants.NU_WSDL_CORBA);
-
+
CorbaAnyHandler anyHandler = new CorbaAnyHandler(anyName, anyIdlType, anyTC, null);
anyHandler.setTypeMap(tm);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index db5b223..7555175 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -37,11 +37,11 @@ public class CorbaArrayHandlerTest extends Assert {
private QName objName;
private QName objIdlType;
private TypeCode objTypeCode;
-
-
+
+
@Before
public void setUp() throws Exception {
-
+
java.util.Properties props = System.getProperties();
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
@@ -50,7 +50,7 @@ public class CorbaArrayHandlerTest extends Assert {
objIdlType = null;
objTypeCode = null;
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index c5579be..abd776e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -41,7 +41,7 @@ public class CorbaEnumHandlerTest extends Assert {
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -52,13 +52,13 @@ public class CorbaEnumHandlerTest extends Assert {
}
}
}
-
+
@Test
public void testCorbaEnumHandler() {
Enum enumType = new Enum();
enumType.setName("EnumType");
enumType.setRepositoryID("IDL:EnumType:1.0");
-
+
Enumerator enumerator0 = new Enumerator();
enumerator0.setValue("ENUM0");
Enumerator enumerator1 = new Enumerator();
@@ -68,22 +68,22 @@ public class CorbaEnumHandlerTest extends Assert {
enumType.getEnumerator().add(enumerator0);
enumType.getEnumerator().add(enumerator1);
enumType.getEnumerator().add(enumerator2);
-
+
QName enumName = new QName("EnumType");
- QName enumIdlType =
+ QName enumIdlType =
new QName(CorbaConstants.NU_WSDL_CORBA, "EnumType", CorbaConstants.NP_WSDL_CORBA);
String members[] = new String[3];
members[0] = enumerator0.getValue();
members[1] = enumerator1.getValue();
members[2] = enumerator2.getValue();
TypeCode enumTC = orb.create_enum_tc(enumType.getRepositoryID(), enumType.getName(), members);
-
+
CorbaEnumHandler obj = new CorbaEnumHandler(enumName, enumIdlType, enumTC, enumType);
assertNotNull(obj);
-
+
obj.setValue(members[1]);
assertTrue(obj.getValue().equals(enumerator1.getValue()));
-
+
assertTrue(obj.getIndex() == 1);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
index db4be9c..a74a80b 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
@@ -34,7 +34,7 @@ import org.omg.CORBA.TypeCode;
public class CorbaFixedHandlerTest extends Assert {
private ORB orb;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
@@ -52,29 +52,29 @@ public class CorbaFixedHandlerTest extends Assert {
}
}
}
-
+
@Test
public void testCorbaFixedHandler() {
Fixed fixedType = new Fixed();
fixedType.setName("FixedType");
fixedType.setDigits(3);
fixedType.setScale(2);
-
+
QName fixedName = new QName(fixedType.getName());
- QName fixedIdlType =
+ QName fixedIdlType =
new QName(CorbaConstants.NU_WSDL_CORBA, "FixedType", CorbaConstants.NP_WSDL_CORBA);
TypeCode fixedTC = orb.create_fixed_tc((short)fixedType.getDigits(), (short)fixedType.getScale());
CorbaFixedHandler obj = new CorbaFixedHandler(fixedName, fixedIdlType, fixedTC, fixedType);
assertNotNull(obj);
-
+
java.math.BigDecimal value = new java.math.BigDecimal(123.45);
obj.setValue(value);
-
+
assertTrue(value.equals(obj.getValue()));
-
+
String valueData = obj.getValueData();
assertTrue(valueData.equals(value.toString()));
-
+
assertTrue(fixedType.getDigits() == obj.getDigits());
assertTrue(fixedType.getScale() == obj.getScale());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
index b002a14..38b9816 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
@@ -49,61 +49,61 @@ public class CorbaHandlerUtilsTest extends Assert {
CorbaTypeMap typeMap;
ServiceInfo service;
- private final String complexTypesNamespaceURI
+ private final String complexTypesNamespaceURI
= "http://cxf.apache.org/bindings/corba/ComplexTypes/idl_types";
- private final String complexTypesPrefix = "corbatm";
+ private final String complexTypesPrefix = "corbatm";
private ORB orb;
- private Bus bus;
-
-
+ private Bus bus;
+
+
@Before
public void setUp() throws Exception {
- bus = BusFactory.getDefaultBus();
- BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+ bus = BusFactory.getDefaultBus();
+ BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
factory = bfm.getBindingFactory("http://cxf.apache.org/bindings/corba");
- bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
+ bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
-
+
CorbaDestination destination = getDestination();
service = destination.getBindingInfo().getService();
- List<TypeMappingType> corbaTypes
- = service.getDescription().getExtensors(TypeMappingType.class);
+ List<TypeMappingType> corbaTypes
+ = service.getDescription().getExtensors(TypeMappingType.class);
typeMap = CorbaUtils.createCorbaTypeMap(corbaTypes);
}
-
+
protected CorbaDestination getDestination() throws Exception {
TestUtils testUtils = new TestUtils();
return testUtils.getComplexTypesTestDestination();
}
-
+
@After
public void tearDown() throws Exception {
- bus.shutdown(true);
+ bus.shutdown(true);
if (orb != null) {
try {
orb.destroy();
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
@Test
public void testCreateTypeHandler() {
QName objName = null;
QName objIdlType = null;
- CorbaObjectHandler result = null;
-
+ CorbaObjectHandler result = null;
+
// Test for an array handler
objName = new QName("object");
- objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
+ objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaArrayHandler);
@@ -121,7 +121,7 @@ public class CorbaHandlerUtilsTest extends Assert {
// Test for a primitive handler
objName = new QName("object");
- objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
+ objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaPrimitiveHandler);
@@ -143,12 +143,12 @@ public class CorbaHandlerUtilsTest extends Assert {
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaUnionHandler);
}
-
+
@Test
- public void testInitializeObjectHandler() {
+ public void testInitializeObjectHandler() {
QName objName = null;
QName objIdlType = null;
- CorbaObjectHandler result = null;
+ CorbaObjectHandler result = null;
// Test for an array handler
objName = new QName("object");
@@ -158,7 +158,7 @@ public class CorbaHandlerUtilsTest extends Assert {
CorbaArrayHandler arrayHandler = (CorbaArrayHandler)result;
// WSDL defines the array to have 5 elements
assertTrue(arrayHandler.getElements().size() == 5);
-
+
// Test for a sequence handler
objName = new QName("object");
@@ -170,7 +170,7 @@ public class CorbaHandlerUtilsTest extends Assert {
// element has been set.
assertTrue(seqHandler.getElements().size() == 0);
assertNotNull(seqHandler.getTemplateElement());
-
+
// Test for a bounded sequence handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestBoundedSequence", complexTypesPrefix);
@@ -179,7 +179,7 @@ public class CorbaHandlerUtilsTest extends Assert {
CorbaSequenceHandler boundedSeqHandler = (CorbaSequenceHandler)result;
// This is a bounded sequence with WSDL defining 5 elements.
assertTrue(boundedSeqHandler.getElements().size() == 5);
-
+
// Test for a struct handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestStruct", complexTypesPrefix);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java
index b83fde0..0b83085 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java
@@ -26,10 +26,10 @@ import org.apache.cxf.binding.corba.TestUtils;
public class CorbaHandlerUtilsYokoNSTest extends CorbaHandlerUtilsTest {
-
+
protected CorbaDestination getDestination() throws Exception {
TestUtils testUtils = new TestUtils();
return testUtils.getComplexTypesTestDestinationYoko();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index 0d761c8..886fdd3 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -39,12 +39,12 @@ public class CorbaObjectHandlerTest extends Assert {
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -55,7 +55,7 @@ public class CorbaObjectHandlerTest extends Assert {
}
}
}
-
+
@Test
public void testCreateCorbaObjectHandler() {
QName objName = new QName("object");
@@ -64,7 +64,7 @@ public class CorbaObjectHandlerTest extends Assert {
CorbaObjectHandler obj = new CorbaObjectHandler(objName, objIdlType, objTypeCode, null);
assertNotNull(obj);
}
-
+
@Test
public void testGetObjectAttributes() {
QName objName = new QName("object");
@@ -75,15 +75,15 @@ public class CorbaObjectHandlerTest extends Assert {
QName name = obj.getName();
assertNotNull(name);
assertTrue(name.equals(objName));
-
+
QName idlType = obj.getIdlType();
assertNotNull(idlType);
assertTrue(idlType.equals(objIdlType));
-
+
TypeCode tc = obj.getTypeCode();
assertNotNull(tc);
assertTrue(tc.kind().value() == objTypeCode.kind().value());
-
+
Object objDef = obj.getType();
assertNull(objDef);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index 2ce5065..0ed66ab 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -33,14 +33,14 @@ import org.omg.CORBA.TCKind;
public class CorbaPrimitiveHandlerTest extends Assert {
private ORB orb;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -55,17 +55,17 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaBoolean() {
Boolean val = Boolean.FALSE;
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("boolean"),
CorbaConstants.NT_CORBA_BOOLEAN,
orb.get_primitive_tc(TCKind.tk_boolean),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
-
+
obj.setValue(val);
Object resultObj = obj.getValue();
assertNotNull(resultObj);
@@ -73,17 +73,17 @@ public class CorbaPrimitiveHandlerTest extends Assert {
Boolean boolResult = (Boolean)resultObj;
assertTrue(boolResult.booleanValue() == val.booleanValue());
}
-
+
@Test
public void testCreateCorbaChararacter() {
Character val = new Character('c');
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("char"),
CorbaConstants.NT_CORBA_CHAR,
orb.get_primitive_tc(TCKind.tk_char),
null);
assertNotNull(obj);
-
+
//CXF corba maps the XML char type to a Byte so we need to provide the string data as a Byte value
Byte byteValue = new Byte((byte)val.charValue());
obj.setValueFromData(byteValue.toString());
@@ -99,19 +99,19 @@ public class CorbaPrimitiveHandlerTest extends Assert {
assertTrue(resultObj instanceof Character);
Character charResult = (Character)resultObj;
assertTrue(charResult.charValue() == val.charValue());
-
+
}
@Test
public void testCreateCorbaWChararacter() {
Character val = new Character('w');
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("wchar"),
CorbaConstants.NT_CORBA_WCHAR,
orb.get_primitive_tc(TCKind.tk_wchar),
null);
assertNotNull(obj);
-
+
obj.setValueFromData("w");
String result = obj.getDataFromValue();
assertTrue(val.charValue() == result.charAt(0));
@@ -127,13 +127,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaOctet() {
Byte val = new Byte((byte)100);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("octet"),
CorbaConstants.NT_CORBA_OCTET,
orb.get_primitive_tc(TCKind.tk_octet),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -145,17 +145,17 @@ public class CorbaPrimitiveHandlerTest extends Assert {
Byte byteResult = (Byte)resultObj;
assertTrue(byteResult.byteValue() == val.byteValue());
}
-
+
@Test
public void testCreateCorbaShort() {
Short val = new Short((short)1234);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("short"),
CorbaConstants.NT_CORBA_SHORT,
orb.get_primitive_tc(TCKind.tk_short),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -171,13 +171,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaUShort() {
Short val = new Short((short)4321);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("ushort"),
CorbaConstants.NT_CORBA_USHORT,
orb.get_primitive_tc(TCKind.tk_ushort),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -193,13 +193,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaLong() {
Integer val = new Integer(123456);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("long"),
CorbaConstants.NT_CORBA_LONG,
orb.get_primitive_tc(TCKind.tk_long),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -215,13 +215,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaULong() {
Integer val = new Integer(654321);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("ulong"),
CorbaConstants.NT_CORBA_ULONG,
orb.get_primitive_tc(TCKind.tk_ulong),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -237,13 +237,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaLongLong() {
Long val = new Long(123456789);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("longlong"),
CorbaConstants.NT_CORBA_LONGLONG,
orb.get_primitive_tc(TCKind.tk_longlong),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -259,13 +259,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaULongLong() {
Long val = new Long(987654321);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("ulonglong"),
CorbaConstants.NT_CORBA_ULONGLONG,
orb.get_primitive_tc(TCKind.tk_ulonglong),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -281,13 +281,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaFloat() {
Float val = new Float(1234.56);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("float"),
CorbaConstants.NT_CORBA_FLOAT,
orb.get_primitive_tc(TCKind.tk_float),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -303,13 +303,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaDouble() {
Double val = new Double(123456.789);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("double"),
CorbaConstants.NT_CORBA_DOUBLE,
orb.get_primitive_tc(TCKind.tk_double),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -325,13 +325,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaString() {
String val = "Test String";
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("string"),
CorbaConstants.NT_CORBA_STRING,
orb.get_primitive_tc(TCKind.tk_string),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.equals(result));
@@ -347,13 +347,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaWString() {
String val = "Test Wide String";
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("wstring"),
CorbaConstants.NT_CORBA_WSTRING,
orb.get_primitive_tc(TCKind.tk_wstring),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.equals(result));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index cf41815..b5dd884 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -39,14 +39,14 @@ public class CorbaSequenceHandlerTest extends Assert {
private QName objName;
private QName objIdlType;
private TypeCode objTypeCode;
-
-
+
+
@Before
public void setUp() throws Exception {
-
+
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
obj = null;
@@ -54,7 +54,7 @@ public class CorbaSequenceHandlerTest extends Assert {
objIdlType = null;
objTypeCode = null;
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
index 2539a65..abaaa34 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
@@ -35,20 +35,20 @@ import org.omg.CORBA.StructMember;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
-// Since the exception handler is essentially the same as the struct handler (just included in case
+// Since the exception handler is essentially the same as the struct handler (just included in case
// structs and exceptions diverge at a later date), this test should cover both.
public class CorbaStructHandlerTest extends Assert {
private ORB orb;
-
-
+
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -59,7 +59,7 @@ public class CorbaStructHandlerTest extends Assert {
}
}
}
-
+
@Test
public void testCorbaStructHandler() {
Struct structType = new Struct();
@@ -71,31 +71,31 @@ public class CorbaStructHandlerTest extends Assert {
MemberType member1 = new MemberType();
member1.setIdltype(CorbaConstants.NT_CORBA_STRING);
member1.setName("member1");
-
+
QName structName = new QName("TestStruct");
- QName structIdlType =
+ QName structIdlType =
new QName(CorbaConstants.NU_WSDL_CORBA, "testStruct", CorbaConstants.NP_WSDL_CORBA);
StructMember[] structMembers = new StructMember[2];
- structMembers[0] = new StructMember("member0",
+ structMembers[0] = new StructMember("member0",
orb.get_primitive_tc(TCKind.tk_long),
null);
- structMembers[1] = new StructMember("member1",
+ structMembers[1] = new StructMember("member1",
orb.get_primitive_tc(TCKind.tk_string),
null);
- TypeCode structTC = orb.create_struct_tc(structType.getRepositoryID(),
+ TypeCode structTC = orb.create_struct_tc(structType.getRepositoryID(),
structType.getName(),
structMembers);
-
+
CorbaStructHandler obj = new CorbaStructHandler(structName, structIdlType, structTC, structType);
assertNotNull(obj);
-
+
CorbaPrimitiveHandler objMember0 = new CorbaPrimitiveHandler(new QName(member0.getName()),
member0.getIdltype(),
orb.get_primitive_tc(TCKind.tk_long),
null);
assertNotNull(objMember0);
obj.addMember(objMember0);
-
+
CorbaPrimitiveHandler objMember1 = new CorbaPrimitiveHandler(new QName(member1.getName()),
member1.getIdltype(),
orb.get_primitive_tc(TCKind.tk_string),
@@ -105,19 +105,19 @@ public class CorbaStructHandlerTest extends Assert {
int memberSize = obj.getMembers().size();
assertTrue(memberSize == 2);
-
+
QName nameResult = obj.getName();
assertTrue(structName.equals(nameResult));
-
+
QName idlTypeResult = obj.getIdlType();
assertTrue(structIdlType.equals(idlTypeResult));
-
+
CorbaObjectHandler member0Result = obj.getMemberByName("member0");
assertNotNull(member0Result);
assertTrue(member0Result.getName().equals(objMember0.getName()));
-
+
CorbaObjectHandler member1Result = obj.getMember(1);
assertNotNull(member1Result);
- assertTrue(member1Result.getName().equals(objMember1.getName()));
+ assertTrue(member1Result.getName().equals(objMember1.getName()));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
index d92d754..886534e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
@@ -31,13 +31,13 @@ import org.junit.Test;
* Holder for utility methods relating to contexts.
*/
public final class ContextUtilsTest extends Assert {
-
+
@Test
public void testIsRequestor() throws Exception {
Message message = new MessageImpl();
message.put("org.apache.cxf.client", "org.apache.cxf.client");
- assertEquals(ContextUtils.isRequestor(message), true);
+ assertEquals(ContextUtils.isRequestor(message), true);
}
@Test
@@ -46,9 +46,9 @@ public final class ContextUtilsTest extends Assert {
Exchange exchange = new ExchangeImpl();
exchange.setOutMessage(message);
message.setExchange(exchange);
-
+
assertEquals(ContextUtils.isOutbound(message), true);
}
}
-
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
index 6b0a6e9..d063ac4 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
@@ -37,14 +37,14 @@ import org.omg.CORBA.TypeCode;
public class CorbaUtilsTest extends Assert {
private static ORB orb;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -55,7 +55,7 @@ public class CorbaUtilsTest extends Assert {
}
}
}
-
+
@Test
public void testBooleanTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", "corba");
@@ -64,7 +64,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_boolean);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testCharTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "char", "corba");
@@ -73,7 +73,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_char);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testWCharTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "wchar", "corba");
@@ -82,7 +82,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_wchar);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testOctetTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "octet", "corba");
@@ -91,7 +91,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_octet);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testShortTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "short", "corba");
@@ -100,7 +100,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_short);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testUShortTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ushort", "corba");
@@ -109,7 +109,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_ushort);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "long", "corba");
@@ -118,7 +118,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_long);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testULongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ulong", "corba");
@@ -127,7 +127,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_ulong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testLongLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "longlong", "corba");
@@ -136,7 +136,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_longlong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testULongLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ulonglong", "corba");
@@ -145,7 +145,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_ulonglong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testFloatTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "float", "corba");
@@ -154,7 +154,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_float);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testDoubleTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "double", "corba");
@@ -163,7 +163,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_double);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testStringTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "string", "corba");
@@ -172,7 +172,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_string);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testWStringTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "wstring", "corba");
@@ -181,7 +181,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_wstring);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testErrorConditionNullTypeQName() {
try {
@@ -190,24 +190,24 @@ public class CorbaUtilsTest extends Assert {
} catch (CorbaBindingException expected) {
//ignore
}
-
+
CorbaTypeMap typeMap = new CorbaTypeMap("dud:namespace");
QName seen = new QName("bla", "Bla");
- Stack<QName> seenTypes = new Stack<QName>();
+ Stack<QName> seenTypes = new Stack<QName>();
seenTypes.add(seen);
try {
CorbaUtils.getTypeCode(orb, null, typeMap, seenTypes);
fail("expect exception on null type");
- } catch (CorbaBindingException expected) {
+ } catch (CorbaBindingException expected) {
assertTrue("enclosed type is present",
expected.getMessage().indexOf(seen.toString()) != -1);
}
-
+
CorbaType ctype = new CorbaType();
try {
CorbaUtils.getTypeCode(orb, null, ctype, typeMap);
fail("expect exception on null type");
- } catch (CorbaBindingException expected) {
+ } catch (CorbaBindingException expected) {
assertTrue("enclosed corba type is present",
expected.getMessage().indexOf(ctype.toString()) != -1);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
index 2ff077d..b112b26 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
@@ -90,7 +90,7 @@ public final class SOAPBindingUtil {
proxy = Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
new Class[] {cls}, ih);
} catch (Throwable ex) {
- // Using cls classloader as a fallback to make it work within OSGi
+ // Using cls classloader as a fallback to make it work within OSGi
ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
if (contextLoader != cls.getClassLoader()) {
proxy = Proxy.newProxyInstance(cls.getClassLoader(),
@@ -336,7 +336,7 @@ public final class SOAPBindingUtil {
String bindingStyle = "";
String previousOpStyle = "";
String style = "";
-
+
for (Object obj : binding.getExtensibilityElements()) {
if (isSOAPBinding(obj)) {
SoapBinding soapBinding = getSoapBinding(obj);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
index 10ee250..a58e467 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
@@ -23,10 +23,10 @@ import javax.xml.namespace.QName;
/**
* Singleton object that represents the SOAP 1.1 VERSION.
- *
+ *
*/
public final class Soap11 implements SoapVersion {
-
+
// some constants that don't fit into the SoapVersion paradigm.
public static final String SOAP_NAMESPACE = "http://schemas.xmlsoap.org/soap/envelope/";
public static final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
@@ -50,7 +50,7 @@ public final class Soap11 implements SoapVersion {
private static final String NONE_ROLE = SOAP_NAMESPACE + "/role/none";
private static final String ULTIMATE_RECEIVER_ROLE = SOAP_NAMESPACE + "/role/ultimateReceiver";
-
+
private static final String NEXT_ROLE = "http://schemas.xmlsoap.org/soap/actor/next";
private static final String SOAP_ENCODING_STYLE = SOAP_ENCODING_URI;
@@ -61,12 +61,12 @@ public final class Soap11 implements SoapVersion {
private final QName body = new QName(SOAP_NAMESPACE, "Body");
- private final QName fault = new QName(SOAP_NAMESPACE, "Fault");
+ private final QName fault = new QName(SOAP_NAMESPACE, "Fault");
private Soap11() {
- // Singleton
+ // Singleton
}
-
+
public static Soap11 getInstance() {
return INSTANCE;
@@ -129,7 +129,7 @@ public final class Soap11 implements SoapVersion {
public String getAttrValueMustUnderstand(boolean value) {
return value ? "1" : "0";
}
-
+
public QName getReceiver() {
return new QName(SOAP_NAMESPACE, "Server");
}
@@ -150,7 +150,7 @@ public final class Soap11 implements SoapVersion {
// There is no such fault code in soap11
return null;
}
-
+
public String getContentType() {
return "text/xml";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
index c57844c..bc5d9c5 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
@@ -23,11 +23,11 @@ import javax.xml.namespace.QName;
/**
* Represents the SOAP 1.2 version
- *
+ *
*/
public final class Soap12 implements SoapVersion {
public static final String SOAP_NAMESPACE = "http://www.w3.org/2003/05/soap-envelope";
-
+
private static final Soap12 INSTANCE = new Soap12();
private static final double VERSION = 1.2;
@@ -49,9 +49,9 @@ public final class Soap12 implements SoapVersion {
private final QName fault = new QName(SOAP_NAMESPACE, "Fault");
private Soap12() {
- // Singleton
+ // Singleton
}
-
+
public static Soap12 getInstance() {
return INSTANCE;
}
@@ -82,7 +82,7 @@ public final class Soap12 implements SoapVersion {
public QName getFault() {
return fault;
}
-
+
public String getSoapEncodingStyle() {
return SOAP_ENCODING_STYLE;
}
@@ -100,7 +100,7 @@ public final class Soap12 implements SoapVersion {
public String getNextRole() {
return NEXT_ROLE;
}
-
+
public String getAttrNameRole() {
return "role";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
index fa8df8f..fda0492 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
@@ -25,19 +25,19 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingInfo;
public class SoapBinding extends AbstractBasicInterceptorProvider implements Binding {
-
+
private SoapVersion version;
private BindingInfo bindingInfo;
-
+
public SoapBinding(BindingInfo info) {
this(info, Soap11.getInstance());
}
-
+
public SoapBinding(BindingInfo info, SoapVersion v) {
- version = v;
+ version = v;
bindingInfo = info;
}
-
+
public BindingInfo getBindingInfo() {
return bindingInfo;
}
@@ -49,7 +49,7 @@ public class SoapBinding extends AbstractBasicInterceptorProvider implements Bin
public SoapVersion getSoapVersion() {
return version;
}
-
+
public Message createMessage() {
SoapMessage soapMessage = new SoapMessage(version);
soapMessage.put(Message.CONTENT_TYPE, soapMessage.getVersion().getContentType());
@@ -58,11 +58,11 @@ public class SoapBinding extends AbstractBasicInterceptorProvider implements Bin
public Message createMessage(Message m) {
SoapMessage soapMessage = new SoapMessage(m);
- if (m.getExchange() != null) {
+ if (m.getExchange() != null) {
if (m.getExchange().getInMessage() instanceof SoapMessage) {
soapMessage.setVersion(((SoapMessage)m.getExchange().getInMessage()).getVersion());
} else {
- soapMessage.setVersion(version);
+ soapMessage.setVersion(version);
}
} else {
soapMessage.setVersion(version);
@@ -71,7 +71,7 @@ public class SoapBinding extends AbstractBasicInterceptorProvider implements Bin
if (!soapMessage.containsKey(Message.CONTENT_TYPE)) {
soapMessage.put(Message.CONTENT_TYPE, soapMessage.getVersion().getContentType());
}
-
+
return soapMessage;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
index d3ce15e..6a6f857 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
@@ -37,11 +37,11 @@ public class SoapBindingConfiguration extends BindingConfiguration {
private boolean mtomEnabled;
private QName bindingName;
private String bindingNamePostfix = "SoapBinding";
-
+
public SoapBindingConfiguration() {
-
+
}
-
+
@Override
public String getBindingId() {
@@ -73,7 +73,7 @@ public class SoapBindingConfiguration extends BindingConfiguration {
public boolean isSetStyle() {
return style != null;
}
-
+
public String getStyle() {
return style == null ? "document" : style;
}
@@ -109,7 +109,7 @@ public class SoapBindingConfiguration extends BindingConfiguration {
public void setMtomEnabled(boolean mtomEnabled) {
this.mtomEnabled = mtomEnabled;
}
-
+
public QName getBindingName(ServiceInfo si) {
if (bindingName == null) {
return new QName(si.getName().getNamespaceURI(),
@@ -121,17 +121,17 @@ public class SoapBindingConfiguration extends BindingConfiguration {
public QName getBindingName() {
return bindingName;
}
-
+
public void setBindingName(QName b) {
bindingName = b;
}
-
+
public String getBindingNamePostfix() {
return bindingNamePostfix;
}
-
+
public void setBindingNamePostfix(String b) {
bindingNamePostfix = b;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
index 6586af5..7d122d9 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
@@ -22,14 +22,14 @@ package org.apache.cxf.binding.soap;
public final class SoapBindingConstants {
public static final String BINDING_STYLE_RPC = "rpc";
public static final String BINDING_STYLE_DOC = "document";
-
+
public static final String PARAMETER_STYLE_BARE = "bare";
public static final String PARAMETER_STYLE_WRAPPED = "wrapped";
-
+
public static final String SOAP_ACTION = "SOAPAction";
public static final String SOAP11_BINDING_ID = "http://schemas.xmlsoap.org/soap/";
public static final String SOAP12_BINDING_ID = "http://schemas.xmlsoap.org/wsdl/soap12/";
-
+
private SoapBindingConstants() {
//utility class
}
[23/51] [partial] cxf git commit: Remove all trailing whitespaces
Posted by co...@apache.org.
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
index 0df66ae..718c0bf 100644
--- a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
+++ b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
@@ -32,8 +32,8 @@ public class Server {
public static void main(String args[]) throws Exception {
new Server();
System.out.println("Server ready...");
-
- Thread.sleep(5 * 60 * 1000);
+
+ Thread.sleep(5 * 60 * 1000);
System.out.println("Server exiting");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
index 97448dc..9a56382 100644
--- a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
@@ -30,18 +30,18 @@ import org.apache.hello_world_soap12_http.types.FaultDetail;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://apache.org/hello_world_soap12_http", "SOAPService");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
-
- if (args.length == 0) {
+
+ if (args.length == 0) {
System.out.println("please specify wsdl");
- System.exit(1);
+ System.exit(1);
}
URL wsdlURL;
@@ -51,11 +51,11 @@ public final class Client {
} else {
wsdlURL = new URL(args[0]);
}
-
+
System.out.println(wsdlURL);
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
Greeter port = ss.getSoapPort();
- String resp;
+ String resp;
System.out.println("Invoking sayHi...");
resp = port.sayHi();
@@ -88,9 +88,9 @@ public final class Client {
System.out.println("Expected exception: PingMeFault has occurred: " + ex.getMessage());
FaultDetail detail = ex.getFaultInfo();
System.out.println("FaultDetail major:" + detail.getMajor());
- System.out.println("FaultDetail minor:" + detail.getMinor());
- }
- System.exit(0);
+ System.out.println("FaultDetail minor:" + detail.getMinor());
+ }
+ System.exit(0);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java
index 46ecca4..63f1f64 100644
--- a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/GreeterImpl.java
@@ -24,23 +24,23 @@ import org.apache.hello_world_soap12_http.Greeter;
import org.apache.hello_world_soap12_http.PingMeFault;
import org.apache.hello_world_soap12_http.types.FaultDetail;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap12_http",
+@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap12_http",
endpointInterface = "org.apache.hello_world_soap12_http.Greeter")
-@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
+@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")
@org.apache.cxf.annotations.SchemaValidation
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
public String greetMe(String me) {
LOG.info("Executing operation greetMe");
System.out.println("Executing operation greetMe");
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
public void greetMeOneWay(String me) {
LOG.info("Executing operation greetMeOneWay");
System.out.println("Executing operation greetMeOneWay\n");
@@ -52,7 +52,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Executing operation sayHi\n");
return "Bonjour";
}
-
+
public void pingMe() throws PingMeFault {
FaultDetail faultDetail = new FaultDetail();
faultDetail.setMajor((short)2);
@@ -62,5 +62,5 @@ public class GreeterImpl implements Greeter {
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
index 9c03f65..aa69ba9 100644
--- a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
@@ -32,7 +32,7 @@ public final class Client {
public static final QName SERVICE_NAME = new QName("http://apache.org/hello_world_xml_http/wrapped",
"XMLService");
- public static final QName PORT_NAME =
+ public static final QName PORT_NAME =
new QName("http://apache.org/hello_world_xml_http/wrapped", "XMLPort");
private Client() {
@@ -79,7 +79,7 @@ public final class Client {
} catch (PingMeFault ex) {
System.out.println("Expected exception: " + ex.getMessage());
}
-
+
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java
index 544698d..8b44fb9 100644
--- a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/GreeterImpl.java
@@ -23,7 +23,7 @@ import org.apache.hello_world_xml_http.wrapped.Greeter;
import org.apache.hello_world_xml_http.wrapped.PingMeFault;
import org.apache.hello_world_xml_http.wrapped.types.FaultDetail;
-@javax.jws.WebService(serviceName = "XMLService",
+@javax.jws.WebService(serviceName = "XMLService",
portName = "XMLPort",
endpointInterface = "org.apache.hello_world_xml_http.wrapped.Greeter",
targetNamespace = "http://apache.org/hello_world_xml_http/wrapped")
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java
index 7a090e5..68fd102 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/CXFCdiServlet.java
@@ -31,33 +31,33 @@ import org.apache.cxf.BusFactory;
import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
/**
- * Apache CXF servlet with CDI 1.1 integration support
+ * Apache CXF servlet with CDI 1.1 integration support
*/
public class CXFCdiServlet extends CXFNonSpringServlet {
private static final long serialVersionUID = -2890970731778523861L;
private boolean busCreated;
-
+
@Override @Inject
public void setBus(final Bus bus) {
super.setBus(bus);
}
-
+
@Override
protected void loadBus(ServletConfig servletConfig) {
Bus bus = null;
-
- final BeanManager beanManager = CDI.current().getBeanManager();
+
+ final BeanManager beanManager = CDI.current().getBeanManager();
if (beanManager != null) {
final Set< Bean< ? > > candidates = beanManager.getBeans(CdiBusBean.CXF);
-
+
if (!candidates.isEmpty()) {
final Bean< ? > candidate = beanManager.resolve(candidates);
-
- bus = (Bus)beanManager.getReference(candidate, Bus.class,
- beanManager.createCreationalContext(candidate));
+
+ bus = (Bus)beanManager.getReference(candidate, Bus.class,
+ beanManager.createCreationalContext(candidate));
}
- }
-
+ }
+
if (bus != null) {
setBus(bus);
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
index fe111a5..523701e 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiBusBean.java
@@ -31,13 +31,13 @@ import org.apache.cxf.bus.extension.ExtensionManagerBus;
final class CdiBusBean extends AbstractCXFBean< ExtensionManagerBus > {
static final String CXF = "cxf";
-
+
private final InjectionTarget<ExtensionManagerBus> injectionTarget;
-
+
CdiBusBean(final InjectionTarget<ExtensionManagerBus> injectionTarget) {
this.injectionTarget = injectionTarget;
}
-
+
@Override
public Class< ? > getBeanClass() {
return Bus.class;
@@ -59,20 +59,20 @@ final class CdiBusBean extends AbstractCXFBean< ExtensionManagerBus > {
types.add(Bus.class);
return types;
}
-
+
@Override
public ExtensionManagerBus create(final CreationalContext< ExtensionManagerBus > ctx) {
final ExtensionManagerBus instance = injectionTarget.produce(ctx);
CXFBusFactory.possiblySetDefaultBus(instance);
instance.initialize();
-
+
injectionTarget.inject(instance, ctx);
injectionTarget.postConstruct(instance);
return instance;
}
@Override
- public void destroy(final ExtensionManagerBus instance,
+ public void destroy(final ExtensionManagerBus instance,
final CreationalContext< ExtensionManagerBus > ctx) {
injectionTarget.preDestroy(instance);
injectionTarget.dispose(instance);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java
index a417c0f..dfb8d69 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/CdiResourceProvider.java
@@ -29,22 +29,22 @@ import org.apache.cxf.message.Message;
public class CdiResourceProvider implements ResourceProvider {
private Object instance;
private CreationalContext< ? > context;
-
+
private final BeanManager beanManager;
private final Bean< ? > bean;
-
+
CdiResourceProvider(final BeanManager beanManager, final Bean< ? > bean) {
this.beanManager = beanManager;
this.bean = bean;
}
-
+
@Override
public Object getInstance(Message m) {
if (instance == null) {
context = beanManager.createCreationalContext(bean);
instance = beanManager.getReference(bean, bean.getBeanClass(), context);
}
-
+
return instance;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
index 89394d2..51c4f2f 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/JAXRSCdiResourceExtension.java
@@ -52,7 +52,7 @@ import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
import org.apache.cxf.jaxrs.utils.ResourceUtils;
/**
- * Apache CXF portable CDI extension to support initialization of JAX-RS resources.
+ * Apache CXF portable CDI extension to support initialization of JAX-RS resources.
*/
public class JAXRSCdiResourceExtension implements Extension {
private boolean hasBus;
@@ -62,7 +62,7 @@ public class JAXRSCdiResourceExtension implements Extension {
private final List< Bean< ? > > serviceBeans = new ArrayList< Bean< ? > >();
private final List< Bean< ? > > providerBeans = new ArrayList< Bean< ? > >();
private final List< Bean< ? extends Feature > > featureBeans = new ArrayList< Bean< ? extends Feature > >();
- private final List< CreationalContext< ? > > disposableCreationalContexts =
+ private final List< CreationalContext< ? > > disposableCreationalContexts =
new ArrayList< CreationalContext< ? > >();
/**
@@ -73,32 +73,32 @@ public class JAXRSCdiResourceExtension implements Extension {
private List< Object > providers = new ArrayList<>();
private List< Feature > features = new ArrayList<>();
private List< CdiResourceProvider > resourceProviders = new ArrayList<>();
-
+
public void addProviders(final Collection< Object > others) {
this.providers.addAll(others);
}
-
+
public void addFeatures(final Collection< Feature > others) {
this.features.addAll(others);
}
-
+
public void addResourceProvider(final CdiResourceProvider other) {
this.resourceProviders.add(other);
}
-
+
public List< Object > getProviders() {
return providers;
}
-
+
public List< Feature > getFeatures() {
return features;
}
-
+
public List<CdiResourceProvider> getResourceProviders() {
return resourceProviders;
}
}
-
+
@SuppressWarnings("unchecked")
public <T> void collect(@Observes final ProcessBean< T > event) {
if (event.getAnnotated().isAnnotationPresent(ApplicationPath.class)) {
@@ -120,9 +120,9 @@ public class JAXRSCdiResourceExtension implements Extension {
public void load(@Observes final AfterDeploymentValidation event, final BeanManager beanManager) {
// no need of creational context, it only works for app scoped instances anyway
final Bean<?> busBean = beanManager.resolve(beanManager.getBeans(CdiBusBean.CXF));
-
+
bus = (Bus)beanManager.getReference(
- busBean,
+ busBean,
Bus.class,
beanManager.createCreationalContext(busBean));
@@ -167,16 +167,16 @@ public class JAXRSCdiResourceExtension implements Extension {
event.addBean(applicationBean);
}
}
-
+
/**
- * Releases created CreationalContext instances
+ * Releases created CreationalContext instances
*/
public void release(@Observes final BeforeShutdown event) {
for (final CreationalContext<?> disposableCreationalContext: disposableCreationalContexts) {
disposableCreationalContext.release();
}
}
-
+
/**
* Create the JAXRSServerFactoryBean from the application and all discovered service and provider instances.
* @param application application instance
@@ -205,10 +205,10 @@ public class JAXRSCdiResourceExtension implements Extension {
final JAXRSServerFactoryBean instance = ResourceUtils.createApplication(application, false, false, bus);
final ClassifiedClasses classified = classes2singletons(application, beanManager);
-
+
instance.setProviders(classified.getProviders());
instance.getFeatures().addAll(classified.getFeatures());
-
+
for (final CdiResourceProvider resourceProvider: classified.getResourceProviders()) {
instance.setResourceProvider(resourceProvider.getResourceClass(), resourceProvider);
}
@@ -224,21 +224,21 @@ public class JAXRSCdiResourceExtension implements Extension {
* @return classified instances of classes by instance types
*/
private ClassifiedClasses classes2singletons(final Application application, final BeanManager beanManager) {
- final ClassifiedClasses classified = new ClassifiedClasses();
+ final ClassifiedClasses classified = new ClassifiedClasses();
// now loop through the classes
Set<Class<?>> classes = application.getClasses();
if (!classes.isEmpty()) {
classified.addProviders(loadProviders(beanManager, classes));
classified.addFeatures(loadFeatures(beanManager, classes));
-
+
for (final Bean< ? > bean: serviceBeans) {
if (classes.contains(bean.getBeanClass())) {
classified.addResourceProvider(new CdiResourceProvider(beanManager, bean));
}
}
}
-
+
return classified;
}
@@ -316,7 +316,7 @@ public class JAXRSCdiResourceExtension implements Extension {
*/
private List< Feature > loadFeatures(final BeanManager beanManager, Collection<Class<?>> limitedClasses) {
final List< Feature > features = new ArrayList<>();
-
+
for (final Bean< ? extends Feature > bean: featureBeans) {
if (limitedClasses.isEmpty() || limitedClasses.contains(bean.getBeanClass())) {
features.add(
@@ -328,10 +328,10 @@ public class JAXRSCdiResourceExtension implements Extension {
);
}
}
-
+
return features;
}
-
+
/**
* Look and apply the available JAXRSServerFactoryBean extensions to customize its
* creation (f.e. add features, providers, assign transport, ...)
@@ -340,20 +340,20 @@ public class JAXRSCdiResourceExtension implements Extension {
*/
private void customize(final BeanManager beanManager, final JAXRSServerFactoryBean bean) {
final Collection<Bean<?>> extensionBeans = beanManager.getBeans(JAXRSServerFactoryCustomizationExtension.class);
-
+
for (final Bean<?> extensionBean: extensionBeans) {
final JAXRSServerFactoryCustomizationExtension extension =
(JAXRSServerFactoryCustomizationExtension)beanManager.getReference(
- extensionBean,
- extensionBean.getBeanClass(),
- beanManager.createCreationalContext(extensionBean)
+ extensionBean,
+ extensionBean.getBeanClass(),
+ beanManager.createCreationalContext(extensionBean)
);
extension.customize(bean);
}
}
-
+
/**
- * Creates and collects the CreationalContext instances for future releasing.
+ * Creates and collects the CreationalContext instances for future releasing.
* @param beanManager bean manager instance
* @param bean bean instance to create CreationalContext for
* @return CreationalContext instance
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java
----------------------------------------------------------------------
diff --git a/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java b/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java
index a74cdb5..7b5c845 100644
--- a/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java
+++ b/integration/cdi/src/main/java/org/apache/cxf/cdi/extension/JAXRSServerFactoryCustomizationExtension.java
@@ -21,8 +21,8 @@ package org.apache.cxf.cdi.extension;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
/**
- * Serves as an extension point in order to allow to customize JAX-RS server
- * factory bean creation (f.e. add features, providers, assign transport, ...)
+ * Serves as an extension point in order to allow to customize JAX-RS server
+ * factory bean creation (f.e. add features, providers, assign transport, ...)
* during the CDI beans discovery and initialization.
*/
public interface JAXRSServerFactoryCustomizationExtension {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java
index 4ab2135..5383326 100644
--- a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionFactory.java
@@ -27,7 +27,7 @@ import javax.resource.ResourceException;
*/
public interface CXFConnectionFactory {
-
+
/**
* Creates a client proxy based on the connection parameter object.
* @param param,
@@ -37,8 +37,8 @@ public interface CXFConnectionFactory {
* @throws ResourceException
*/
Object getConnection(CXFConnectionParam param) throws ResourceException;
-
-
+
+
/**
* Returns the underlying {@link Bus} for this connection factory. In some
* J2EE environments, for example Weblogic, the {@link Bus} and dependent
@@ -51,7 +51,7 @@ public interface CXFConnectionFactory {
* should be safe without having to modify the classpath <code>
* org.apache.cxf.Bus = (org.apache.cxf.Bus)connectionFactory.getBus();
* </code>
- *
+ *
* @return the connection factory&s {@link Bus}
*/
Object getBus();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
index ed7be87..dd062d6 100644
--- a/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
+++ b/integration/jca/src/main/java/org/apache/cxf/connector/CXFConnectionParam.java
@@ -32,11 +32,11 @@ public class CXFConnectionParam {
private QName serviceName;
private QName portName;
private String address;
-
+
public CXFConnectionParam() {
}
- public CXFConnectionParam(Class<?> aIface, URL aWsdlLocation,
+ public CXFConnectionParam(Class<?> aIface, URL aWsdlLocation,
QName aServiceName, QName aPortName) {
this.iface = aIface;
this.wsdlLocation = aWsdlLocation;
@@ -68,18 +68,18 @@ public class CXFConnectionParam {
public boolean equals(java.lang.Object other) {
boolean result = false;
if (other instanceof CXFConnectionRequestInfo) {
- CXFConnectionRequestInfo cri = (CXFConnectionRequestInfo)other;
- result = areEquals(iface, cri.getInterface())
+ CXFConnectionRequestInfo cri = (CXFConnectionRequestInfo)other;
+ result = areEquals(iface, cri.getInterface())
&& areEquals(wsdlLocation, cri.getWsdlLocation())
- && areEquals(serviceName, cri.getServiceName())
+ && areEquals(serviceName, cri.getServiceName())
&& areEquals(portName, cri.getPortName())
&& areEquals(address, cri.getAddress());
}
return result;
}
-
-
-
+
+
+
public void setAddress(String address) {
this.address = address;
}
@@ -95,18 +95,18 @@ public class CXFConnectionParam {
public void setWsdlLocation(URL wsdlLocation) {
this.wsdlLocation = wsdlLocation;
}
-
+
public void setInterface(Class<?> aInterface) {
this.iface = aInterface;
}
- public int hashCode() {
+ public int hashCode() {
if (getServiceName() != null) {
return getInterface().hashCode() ^ getServiceName().hashCode();
} else {
return getInterface().hashCode() ^ (getAddress() != null ? getAddress().hashCode() : 1);
}
- }
+ }
public String toString() {
StringBuilder buf = new StringBuilder(256);
@@ -121,9 +121,9 @@ public class CXFConnectionParam {
private boolean areEquals(Object obj1, Object obj2) {
if (obj1 == null) {
- return null == obj2;
+ return null == obj2;
} else {
return obj1.equals(obj2);
- }
+ }
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java b/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java
index bb96fc2..e19a2f1 100644
--- a/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java
+++ b/integration/jca/src/main/java/org/apache/cxf/connector/Connection.java
@@ -30,7 +30,7 @@ public interface Connection {
/**
* close the connection handle. A caller should not use a closed connection.
- *
+ *
* @throws ResourceException if an error occurs during close.
*/
void close() throws ResourceException;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
index 8935574..4e8ea43 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/FireWallClassLoader.java
@@ -42,23 +42,23 @@ import java.security.SecureClassLoader;
* because someone put them on the classpath or in the extensions directory).
* <P>
* For these cases, the FireWallClassLoader can be used.
- *
+ *
* <PRE>
- *
+ *
* System ClassLoader | FireWallClassLoader | User's ClassLoader
- *
+ *
* </PRE>
- *
+ *
* The FireWallClassLoader is placed between the user's class loader and the
* parent class loader. It has a set of filters that define what classes are
* allowed to go through. These filters describe (a groups of) packages, or a
* specific classes or resources that are allowed through to the parent
* classloader. Take as example this filter set:
- *
+ *
* <pre>
* ["com.iona.", "javax.servlet.jsp."]
* </pre>
- *
+ *
* This will allow requests to any class/resource staring with com.iona. or
* javax.servlet.jsp. through to the parent classloader and block all other
* requests.
@@ -77,7 +77,7 @@ public class FireWallClassLoader extends SecureClassLoader {
/**
* Constructor.
- *
+ *
* @param parent The Parent ClassLoader to use.
* @param fs A set of filters to let through. The filters and be either in
* package form (<CODE>org.omg.</CODE> or <CODE>org.omg.*</CODE>)
@@ -98,7 +98,7 @@ public class FireWallClassLoader extends SecureClassLoader {
/**
* Constructor.
- *
+ *
* @param parent The Parent ClassLoader to use.
* @param fs A set of filters to let through. The filters and be either in
* package form (<CODE>org.omg.</CODE> or <CODE>org.omg.*</CODE>)
@@ -151,8 +151,8 @@ public class FireWallClassLoader extends SecureClassLoader {
}
if (!javaCovered) {
- throw new SecurityException("It's unsafe to construct a "
- + "FireWallClassLoader that does not let the java. "
+ throw new SecurityException("It's unsafe to construct a "
+ + "FireWallClassLoader that does not let the java. "
+ "package through.");
}
}
@@ -227,7 +227,7 @@ public class FireWallClassLoader extends SecureClassLoader {
throw new ClassNotFoundException(name);
}*/
-
+
public java.net.URL getResource(String name) {
if (negativeFNFilters != null) {
for (int i = 0; i < negativeFNFilters.length; i++) {
@@ -252,7 +252,7 @@ public class FireWallClassLoader extends SecureClassLoader {
/**
* Returns the list of filters used by this FireWallClassLoader. The list is
* a copy of the array internally used.
- *
+ *
* @return The filters used.
*/
public String[] getFilters() {
@@ -266,7 +266,7 @@ public class FireWallClassLoader extends SecureClassLoader {
/**
* Returns the list of negative filters used by this FireWallClassLoader.
* The list is a copy of the array internally used.
- *
+ *
* @return The filters used.
*/
public String[] getNegativeFilters() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
index 18facd5..faa5e81 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
@@ -45,11 +45,11 @@ public class PlugInClassLoader extends SecureClassLoader {
private static final String NEFILTERS_PROPS_FILE = "negativefilters.properties";
private String jarUrls[] = new String[0];
private final ProtectionDomain protectionDomain;
-
+
private final ClassLoader ploader;
- public PlugInClassLoader(final ClassLoader p) throws IOException {
- super(new FireWallClassLoader(p,
+ public PlugInClassLoader(final ClassLoader p) throws IOException {
+ super(new FireWallClassLoader(p,
getFilterList(p, FILTERS_PROPS_FILE),
getFilterList(p, NEFILTERS_PROPS_FILE)));
ploader = p;
@@ -61,7 +61,7 @@ public class PlugInClassLoader extends SecureClassLoader {
private void processJarUrls(String urls[]) {
for (int i = 0; i < urls.length; i++) {
if (urls[i].startsWith(ZIP_COLON)) {
- urls[i] = FILE_COLON + urls[i].substring(ZIP_COLON.length());
+ urls[i] = FILE_COLON + urls[i].substring(ZIP_COLON.length());
}
}
}
@@ -69,9 +69,9 @@ public class PlugInClassLoader extends SecureClassLoader {
private static String[] getFilterList(ClassLoader parent, String propFile) throws IOException {
Properties filtersProps = getProperties(parent, propFile);
Iterator<Object> i = filtersProps.keySet().iterator();
- while (i.hasNext()) {
- LOG.config("get Filter " + propFile + "::" + (String)i.next());
- }
+ while (i.hasNext()) {
+ LOG.config("get Filter " + propFile + "::" + (String)i.next());
+ }
return filtersProps.keySet().toArray(new String[filtersProps.keySet().size()]);
}
@@ -127,7 +127,7 @@ public class PlugInClassLoader extends SecureClassLoader {
byte bytes[] = null;
for (int i = 0; i < jarUrls.length; i++) {
- String fullpath = jarUrls[i] + "!/" + path;
+ String fullpath = jarUrls[i] + "!/" + path;
try {
bytes = PlugInClassLoaderHelper.getResourceAsBytes(fullpath);
@@ -150,21 +150,21 @@ public class PlugInClassLoader extends SecureClassLoader {
throw new ClassNotFoundException(name);
} else {
return result;
- }
+ }
}
}
-
-
+
+
protected URL findResource(String name) {
LOG.fine("findResource: " + name);
for (int i = 0; i < jarUrls.length; i++) {
- String fullpath = jarUrls[i] + "!/" + name;
-
- if (PlugInClassLoaderHelper.hasResource(fullpath)) {
+ String fullpath = jarUrls[i] + "!/" + name;
+
+ if (PlugInClassLoaderHelper.hasResource(fullpath)) {
return genURL(fullpath);
}
}
-
+
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
index a88c5ea..c16716f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
@@ -29,10 +29,10 @@ import org.apache.cxf.jca.jarloader.JarLoader;
public final class PlugInClassLoaderHelper {
- private static final Logger LOG =
+ private static final Logger LOG =
LogUtils.getL7dLogger(PlugInClassLoaderHelper.class);
private static Map<String, byte[]> nonClassesMap = new HashMap<String, byte[]>();
-
+
private PlugInClassLoaderHelper() {
// singleton
@@ -47,11 +47,11 @@ public final class PlugInClassLoaderHelper {
return false;
}
}
-
+
public static byte[] getResourceAsBytes(String name) throws IOException {
// check nonClassCache for properties etc..
if (!name.endsWith(".class") && nonClassesMap.containsKey(name)) {
- return nonClassesMap.get(name);
+ return nonClassesMap.get(name);
}
// first check file path directorys, then check jars
@@ -90,7 +90,7 @@ public final class PlugInClassLoaderHelper {
if (!name.endsWith(".class")) {
nonClassesMap.put(name, bytes);
}
- return bytes;
+ return bytes;
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
index 0b3df67..8131a44 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
@@ -29,7 +29,7 @@ import org.apache.cxf.common.logging.LogUtils;
public final class LoggerHelper {
- public static final Level DEFAULT_LOG_LEVEL = Level.WARNING;
+ public static final Level DEFAULT_LOG_LEVEL = Level.WARNING;
public static final String CONSOLE_HANDLER = "ConsoleHandler";
public static final String WRITER_HANDLER = "WriterHandler";
private static String rootLoggerName = "org.apache.cxf";
@@ -60,11 +60,11 @@ public final class LoggerHelper {
}
}
-
+
public static void deleteLoggingOnWriter() {
Logger cxfLogger = getRootCXFLogger();
Handler handler = getHandler(cxfLogger, WRITER_HANDLER);
-
+
if (handler != null) {
cxfLogger.removeHandler(handler);
}
@@ -72,8 +72,8 @@ public final class LoggerHelper {
}
// true if log output is already going somewhere
- public static boolean loggerInitialisedOutsideConnector() {
- final Handler[] handlers = getConsoleLogger().getHandlers(); //NOPMD
+ public static boolean loggerInitialisedOutsideConnector() {
+ final Handler[] handlers = getConsoleLogger().getHandlers(); //NOPMD
return handlers != null && handlers.length > 0;
}
@@ -88,12 +88,12 @@ public final class LoggerHelper {
return result;
}
- public static void disableConsoleLogging() {
+ public static void disableConsoleLogging() {
final Handler handler = getHandler(getConsoleLogger(), CONSOLE_HANDLER); //NOPMD
getConsoleLogger().removeHandler(handler); //NOPMD
}
- public static void enableConsoleLogging() {
+ public static void enableConsoleLogging() {
if (getHandler(getConsoleLogger(), CONSOLE_HANDLER) == null) { //NOPMD
final Handler console = new ConsoleHandler();
getConsoleLogger().addHandler(console); //NOPMD
@@ -117,7 +117,7 @@ public final class LoggerHelper {
public static Logger getRootCXFLogger() {
return LogUtils.getLogger(LoggerHelper.class, null, getRootLoggerName());
}
-
+
public static Logger getConsoleLogger() {
return LogUtils.getLogger(LoggerHelper.class, null, "");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
index be4bb16..0168b08 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionFactoryImpl.java
@@ -36,8 +36,8 @@ import javax.security.auth.Subject;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.logging.LoggerHelper;
-
-public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean
+
+public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean
implements ManagedConnectionFactory {
private static final long serialVersionUID = 1886331424891906960L;
@@ -67,18 +67,18 @@ public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean
protected abstract void validateReference(AbstractManagedConnectionImpl conn, Subject subject)
throws ResourceAdapterInternalException;
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings("rawtypes")
public ManagedConnection matchManagedConnections(
Set aMCSet, Subject subject, ConnectionRequestInfo crInfo)
throws ResourceException {
-
+
LOG.log(Level.FINE, "MATCHING_CONNECTIONS",
new Object[] {Integer.valueOf(aMCSet.size()), crInfo, subject});
for (Iterator iterator = aMCSet.iterator(); iterator.hasNext();) {
AbstractManagedConnectionImpl conn = (AbstractManagedConnectionImpl)iterator.next();
- LOG.log(Level.FINE, "MATCH_CONNECTION_AGAINST",
+ LOG.log(Level.FINE, "MATCH_CONNECTION_AGAINST",
new Object[] {conn.getConnectionRequestInfo(),
crInfo});
@@ -106,7 +106,7 @@ public abstract class AbstractManagedConnectionFactoryImpl extends ResourceBean
if (candidate.equals(crInfo) && (subject == null || subject.equals(candidateConn.getSubject()))) {
try {
validateReference(candidateConn, subject);
- result = true;
+ result = true;
} catch (Exception thrown) {
result = false;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
index 848ffbc..845c073 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/AbstractManagedConnectionImpl.java
@@ -39,19 +39,19 @@ public abstract class AbstractManagedConnectionImpl implements ManagedConnection
protected PrintWriter printWriter;
protected ConnectionRequestInfo crinfo;
protected Subject subject;
- protected Set<ConnectionEventListener> connectionEventListeners =
+ protected Set<ConnectionEventListener> connectionEventListeners =
new HashSet<>();
private final AbstractManagedConnectionFactoryImpl managedConnectionFactory;
- public AbstractManagedConnectionImpl(AbstractManagedConnectionFactoryImpl managedFactory,
+ public AbstractManagedConnectionImpl(AbstractManagedConnectionFactoryImpl managedFactory,
ConnectionRequestInfo crInfo,
Subject sj) throws ResourceException {
-
+
this.managedConnectionFactory = managedFactory;
this.crinfo = crInfo;
}
-
+
public void addConnectionEventListener(ConnectionEventListener aListener) {
LOG.log(Level.FINE, "ADD_EVENT_LISTENER_CALLED", new Object[] {this, aListener});
connectionEventListeners.add(aListener);
@@ -89,7 +89,7 @@ public abstract class AbstractManagedConnectionImpl implements ManagedConnection
public void destroy() throws ResourceException {
LOG.log(Level.FINE, "DESTROY_CALLED", new Object[] {this});
connectionEventListeners = new HashSet<>();
-
+
LoggerHelper.deleteLoggingOnWriter();
if (printWriter != null) {
printWriter.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
index aeadbcb..15fc36a 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/ResourceBean.java
@@ -37,13 +37,13 @@ public class ResourceBean implements Serializable {
public static final String DEFAULT_VALUE_STRING = "DEFAULT";
public static final String LOG_LEVEL = "log.level";
-
- public static final String DEFAULT_MONITOR_POLL_INTERVAL = "120";
+
+ public static final String DEFAULT_MONITOR_POLL_INTERVAL = "120";
public static final String EJB_SERVICE_PROPERTIES_URL = "ejb.service.properties.url";
public static final String MONITOR_EJB_SERVICE_PROPERTIES = "monitor.ejb.service.properties";
- public static final String MONITOR_POLL_INTERVAL = "monitor.poll.interval";
+ public static final String MONITOR_POLL_INTERVAL = "monitor.poll.interval";
public static final String EJB_SERVANT_BASE_URL = "ejb.servant.base.url";
-
+
private static final long serialVersionUID = -2373577203597864072L;
static {
@@ -67,8 +67,8 @@ public class ResourceBean implements Serializable {
if (disable) {
LoggerHelper.disableConsoleLogging();
}
- }
-
+ }
+
public Properties getPluginProps() {
return pluginProps;
}
@@ -83,7 +83,7 @@ public class ResourceBean implements Serializable {
}
}
-
+
protected URL getPropsURL(String propsUrl) throws ResourceException {
URL ret = null;
if (propsUrl != null) {
@@ -110,6 +110,6 @@ public class ResourceBean implements Serializable {
throw new ResourceAdapterInternalException(msg, ioe);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
index 6a38260..068908f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/resourceadapter/UriHandlerInit.java
@@ -25,7 +25,7 @@ import org.apache.cxf.common.logging.LogUtils;
public class UriHandlerInit {
private static final String PACKAGE_PREFIX = "org.apache.cxf.jca.core";
private static final Logger LOG = LogUtils.getL7dLogger(UriHandlerInit.class);
-
+
public UriHandlerInit() {
initUriHandlers(PACKAGE_PREFIX);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
index 6714137..614a5ab 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/AssociatedManagedConnectionFactoryImpl.java
@@ -31,7 +31,7 @@ import javax.resource.spi.ResourceAdapterAssociation;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
-public class AssociatedManagedConnectionFactoryImpl
+public class AssociatedManagedConnectionFactoryImpl
extends ManagedConnectionFactoryImpl implements ResourceAdapterAssociation {
private static final long serialVersionUID = 4305487562182780773L;
@@ -65,7 +65,7 @@ public class AssociatedManagedConnectionFactoryImpl
public ResourceAdapter getResourceAdapter() {
return ra;
}
-
+
/**
* If outbound-resourceAdapter and the resourceAdapter has same property,
* the outbound-resourceAdapter property's value would take precedence.
@@ -88,20 +88,20 @@ public class AssociatedManagedConnectionFactoryImpl
if (ra == null) {
throw new ResourceAdapterInternalException("ResourceAdapter can not be null");
}
-
+
((ResourceAdapterImpl)ra).registerBus(getBus());
}
protected Object getBootstrapContext() {
return ((ResourceAdapterImpl)ra).getBootstrapContext();
}
-
- //Explicit override these two methods,
+
+ //Explicit override these two methods,
//otherwise when deploy rar to weblogic9.1, it would complaint about this.
public int hashCode() {
return super.hashCode();
}
-
+
public boolean equals(Object o) {
return super.equals(o);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java
index f114612..9a4704f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFConnectionRequestInfo.java
@@ -28,14 +28,14 @@ import org.apache.cxf.connector.CXFConnectionParam;
public class CXFConnectionRequestInfo extends CXFConnectionParam implements ConnectionRequestInfo {
-
+
public CXFConnectionRequestInfo() {
super();
}
-
- public CXFConnectionRequestInfo(Class<?> aIface, URL aWsdlLocation,
+
+ public CXFConnectionRequestInfo(Class<?> aIface, URL aWsdlLocation,
QName aServiceName, QName aPortName) {
super(aIface, aWsdlLocation, aServiceName, aPortName);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java
index 7b48bc1..b0d2805 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandler.java
@@ -23,8 +23,8 @@ import java.lang.reflect.InvocationHandler;
public interface CXFInvocationHandler extends InvocationHandler {
void setNext(CXFInvocationHandler next);
-
- CXFInvocationHandler getNext();
- CXFInvocationHandlerData getData();
+ CXFInvocationHandler getNext();
+
+ CXFInvocationHandlerData getData();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java
index c828a9a..952b613 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFInvocationHandlerData.java
@@ -24,16 +24,16 @@ import javax.security.auth.Subject;
import org.apache.cxf.Bus;
public interface CXFInvocationHandlerData {
-
- void setTarget(Object t);
- Object getTarget();
-
- void setBus(Bus bus);
- Bus getBus();
-
- void setManagedConnection(CXFManagedConnection managedConnection);
- CXFManagedConnection getManagedConnection();
+
+ void setTarget(Object t);
+ Object getTarget();
+
+ void setBus(Bus bus);
+ Bus getBus();
+
+ void setManagedConnection(CXFManagedConnection managedConnection);
+ CXFManagedConnection getManagedConnection();
void setSubject(Subject subject);
- Subject getSubject();
+ Subject getSubject();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java
index f652937..878ec52 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnection.java
@@ -23,7 +23,7 @@ import javax.resource.spi.ManagedConnection;
public interface CXFManagedConnection extends ManagedConnection {
- void close(Object handle) throws ResourceException;
- CXFManagedConnectionFactory getManagedConnectionFactory();
- CXFTransaction getCXFTransaction();
+ void close(Object handle) throws ResourceException;
+ CXFManagedConnectionFactory getManagedConnectionFactory();
+ CXFTransaction getCXFTransaction();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java
index f2df8b9..2e0df4a 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFManagedConnectionMetaData.java
@@ -25,7 +25,7 @@ import javax.resource.spi.ManagedConnectionMetaData;
public class CXFManagedConnectionMetaData implements ManagedConnectionMetaData {
-
+
public String getEISProductName() throws ResourceException {
return "WS-based-EIS";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java
index 3bf431a..430a281 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/CXFWorkAdapter.java
@@ -27,32 +27,32 @@ import javax.resource.spi.work.WorkListener;
import org.apache.cxf.common.logging.LogUtils;
/**
- *
+ *
*/
public class CXFWorkAdapter implements WorkListener {
-
+
public static final long DEFAULT_START_TIME_OUT = 1 * 60 * 1000; // 1 minute
private static final Logger LOG = LogUtils.getL7dLogger(CXFWorkAdapter.class);
-
+
public void workAccepted(WorkEvent e) {
LOG.fine("workAccepted: [" + e.getWork() + "], source is [" + e.getSource() + "]");
}
-
+
public void workCompleted(WorkEvent e) {
LOG.fine("workCompleted: [" + e.getWork() + "], source is [" + e.getSource() + "]");
}
-
+
public void workRejected(WorkEvent e) {
LOG.severe("workRejected: [" + e.getWork() + "], source is [" + e.getSource() + "]");
LOG.severe("root cause is:" + e.getException().getMessage());
-
+
e.getException().printStackTrace();
}
-
+
public void workStarted(WorkEvent e) {
LOG.fine("workStarted: [" + e.getWork() + "], source is [" + e.getSource() + "]");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
index 4cf62fb..902511a 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ConnectionFactoryImpl.java
@@ -36,8 +36,8 @@ import org.apache.cxf.connector.CXFConnectionFactory;
import org.apache.cxf.connector.CXFConnectionParam;
import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
-public class ConnectionFactoryImpl implements CXFConnectionFactory,
- Referenceable,
+public class ConnectionFactoryImpl implements CXFConnectionFactory,
+ Referenceable,
Serializable {
private static final long serialVersionUID = 3664687493256918163L;
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ConnectionFactoryImpl.class);
@@ -57,26 +57,26 @@ public class ConnectionFactoryImpl implements CXFConnectionFactory,
public Reference getReference() throws NamingException {
return reference;
}
-
-
- public Object getBus() {
+
+
+ public Object getBus() {
return ((ManagedConnectionFactoryImpl)managedConnectionFactory).getBus();
}
public Object getConnection(CXFConnectionParam param) throws ResourceException {
-
+
if (param.getInterface() == null) {
throw new ResourceAdapterInternalException(new Message("INTERFACE_IS_NULL", BUNDLE).toString());
}
-
+
if (!param.getInterface().isInterface()) {
- throw new ResourceAdapterInternalException(new Message("IS_NOT_AN_INTERFACE",
+ throw new ResourceAdapterInternalException(new Message("IS_NOT_AN_INTERFACE",
BUNDLE, param.getInterface()).toString());
}
-
+
CXFConnectionRequestInfo reqInfo = (CXFConnectionRequestInfo) param;
-
+
if (connectionManager == null) {
// non-managed, null Subject
ManagedConnection connection = managedConnectionFactory.createManagedConnection(null, reqInfo);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
index 9779acc..82a73b4 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
@@ -47,24 +47,24 @@ import org.apache.cxf.jca.servant.EJBServantConfig;
public class JCABusFactory {
-
+
private static final Logger LOG = LogUtils.getL7dLogger(JCABusFactory.class);
-
+
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(JCABusFactory.class);
-
+
private Bus bus;
private List<Server> servantsCache = new ArrayList<>();
private ClassLoader appserverClassLoader;
private ManagedConnectionFactoryImpl mcf;
private Object raBootstrapContext;
-
+
public JCABusFactory(ManagedConnectionFactoryImpl aMcf) {
this.mcf = aMcf;
}
-
+
protected synchronized void init() throws ResourceException {
-
+
LOG.info("Initializing the CXF Bus ...");
new UriHandlerInit();
ClassLoader original = Thread.currentThread().getContextClassLoader();
@@ -73,10 +73,10 @@ public class JCABusFactory {
// ensure resourceadapter: url handler can be found by URLFactory
Thread.currentThread().setContextClassLoader(cl);
-
+
//TODO Check for the managed connection factory properties
- //TODO We may need get the configuration file from properties
-
+ //TODO We may need get the configuration file from properties
+
BusFactory bf = BusFactory.newInstance();
bus = bf.createBus();
initializeServants();
@@ -92,25 +92,25 @@ public class JCABusFactory {
}
}
-
+
protected void initializeServants() throws ResourceException {
- if (isMonitorEJBServicePropertiesEnabled()) {
+ if (isMonitorEJBServicePropertiesEnabled()) {
LOG.info("Ejb service properties auto-detect enabled. ");
startPropertiesMonitorWorker();
- } else {
+ } else {
URL propsUrl = mcf.getEJBServicePropertiesURLInstance();
if (propsUrl != null) {
initializeServantsFromProperties(loadProperties(propsUrl));
}
}
}
-
+
private void initializeServantsFromProperties(Properties ejbServants) throws ResourceException {
-
+
deregisterServants(bus);
LOG.info("Initializing EJB endpoints from properties file...");
-
- try {
+
+ try {
Enumeration<?> keys = ejbServants.keys();
while (keys.hasMoreElements()) {
String theJNDIName = (String)keys.nextElement();
@@ -120,7 +120,7 @@ public class JCABusFactory {
ejbEndpoint.setEjbServantBaseURL(mcf.getEJBServantBaseURL());
ejbEndpoint.setWorkManager(getWorkManager());
Server servant = ejbEndpoint.publish();
-
+
synchronized (servantsCache) {
if (servant != null) {
servantsCache.add(servant);
@@ -131,16 +131,16 @@ public class JCABusFactory {
e.printStackTrace();
throw new ResourceException(new Message("FAIL_TO_START_EJB_SERVANTS", BUNDLE).toString(), e);
}
-
+
}
-
+
private void startPropertiesMonitorWorker() throws ResourceException {
Integer pollIntervalInteger = mcf.getEJBServicePropertiesPollInterval();
int pollInterval = pollIntervalInteger.intValue();
-
+
LOG.info("Ejb service properties poll interval is: [" + pollInterval + " seconds]");
-
+
EJBServicePropertiesMonitorWorker worker = new EJBServicePropertiesMonitorWorker(pollInterval);
if (getWorkManager() != null) {
getWorkManager().startWork(worker, CXFWorkAdapter.DEFAULT_START_TIME_OUT, null, worker);
@@ -180,7 +180,7 @@ public class JCABusFactory {
servantsCache.clear();
}
}
-
+
protected Properties loadProperties(URL propsUrl) throws ResourceException {
Properties props = null;
InputStream istream = null;
@@ -206,7 +206,7 @@ public class JCABusFactory {
return props;
}
-
+
protected List<Server> getRegisteredServants() {
return servantsCache;
@@ -231,18 +231,18 @@ public class JCABusFactory {
public void setBus(Bus b) {
bus = b;
}
-
+
public void create(ClassLoader classLoader, Object context) throws ResourceException {
this.appserverClassLoader = classLoader;
this.raBootstrapContext = context;
init();
}
-
+
private class EJBServicePropertiesMonitorWorker extends CXFWorkAdapter implements Work {
private long previousModificationTime;
private final int pollIntervalSeconds;
private final File propsFile;
-
+
//The release() method will be called on separate thread while the run() is processing.
private volatile boolean continuing = true;
@@ -265,7 +265,7 @@ public class JCABusFactory {
}
} while (continuing);
}
-
+
public void release() {
this.continuing = false;
}
@@ -295,8 +295,8 @@ public class JCABusFactory {
}
return null;
}
-
-
-
+
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
index 2bcdc38..cfdcf23 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionFactoryImpl.java
@@ -38,14 +38,14 @@ import org.apache.cxf.jca.core.resourceadapter.AbstractManagedConnectionFactoryI
import org.apache.cxf.jca.core.resourceadapter.AbstractManagedConnectionImpl;
import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
-public class ManagedConnectionFactoryImpl
+public class ManagedConnectionFactoryImpl
extends AbstractManagedConnectionFactoryImpl
implements CXFManagedConnectionFactory {
private static final long serialVersionUID = -891927761318109853L;
private static final Logger LOG = LogUtils.getL7dLogger(ManagedConnectionFactoryImpl.class);
private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ManagedConnectionFactoryImpl.class);
-
+
protected JCABusFactory jcaBusFactory;
public ManagedConnectionFactoryImpl() {
@@ -61,7 +61,7 @@ public class ManagedConnectionFactoryImpl
public void setLogLevel(String logLevel) {
setProperty(LOG_LEVEL, logLevel);
}
-
+
public void setEJBServicePropertiesURL(String name) {
setProperty(EJB_SERVICE_PROPERTIES_URL, name);
}
@@ -73,11 +73,11 @@ public class ManagedConnectionFactoryImpl
public void setEJBServicePropertiesPollInterval(Integer pollInterval) {
setProperty(MONITOR_POLL_INTERVAL, pollInterval.toString());
}
-
+
public String getLogLevel() {
return getPluginProps().getProperty(LOG_LEVEL);
}
-
+
public String getEJBServicePropertiesURL() {
return getPluginProps().getProperty(EJB_SERVICE_PROPERTIES_URL);
}
@@ -87,18 +87,18 @@ public class ManagedConnectionFactoryImpl
}
public Integer getEJBServicePropertiesPollInterval() {
- return Integer.valueOf(getPluginProps().getProperty(MONITOR_POLL_INTERVAL,
+ return Integer.valueOf(getPluginProps().getProperty(MONITOR_POLL_INTERVAL,
DEFAULT_MONITOR_POLL_INTERVAL));
}
-
+
public URL getEJBServicePropertiesURLInstance() throws ResourceException {
return getPropsURL(getEJBServicePropertiesURL());
}
-
+
public String getEJBServantBaseURL() throws ResourceException {
return getPluginProps().getProperty(EJB_SERVANT_BASE_URL);
}
-
+
public void setEJBServantBaseURL(String url) throws ResourceException {
setProperty(EJB_SERVANT_BASE_URL, url);
}
@@ -106,7 +106,7 @@ public class ManagedConnectionFactoryImpl
// compliance: WL9 checks
// need to ensure multiple instances with same config properties are equal
// multiple instances with same config do not make sense to me
-
+
protected void validateReference(AbstractManagedConnectionImpl conn, javax.security.auth.Subject subj) {
}
@@ -127,7 +127,7 @@ public class ManagedConnectionFactoryImpl
return new ConnectionFactoryImpl(this, connMgr);
}
- public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo connReqInfo)
+ public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo connReqInfo)
throws ResourceException {
LOG.info("create connection, subject=" + subject + " connReqInfo=" + connReqInfo);
init(Thread.currentThread().getContextClassLoader());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java
index 06427ee..89d4eaa 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ManagedConnectionImpl.java
@@ -43,13 +43,13 @@ import org.apache.cxf.jca.core.resourceadapter.AbstractManagedConnectionImpl;
import org.apache.cxf.jca.core.resourceadapter.ResourceAdapterInternalException;
import org.apache.cxf.jca.cxf.handlers.InvocationHandlerFactory;
-public class ManagedConnectionImpl
- extends AbstractManagedConnectionImpl
+public class ManagedConnectionImpl
+ extends AbstractManagedConnectionImpl
implements CXFManagedConnection, Connection {
- private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ConnectionFactoryImpl.class);
+ private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ConnectionFactoryImpl.class);
- private InvocationHandlerFactory handlerFactory;
+ private InvocationHandlerFactory handlerFactory;
private Object cxfService;
private boolean connectionHandleActive;
@@ -59,8 +59,8 @@ public class ManagedConnectionImpl
}
public void associateConnection(Object connection) throws ResourceException {
- try {
- CXFInvocationHandler handler =
+ try {
+ CXFInvocationHandler handler =
(CXFInvocationHandler)Proxy.getInvocationHandler(connection);
Object managedConnection = handler.getData().getManagedConnection();
@@ -68,7 +68,7 @@ public class ManagedConnectionImpl
handler.getData().setManagedConnection(this);
((ManagedConnectionImpl)managedConnection).disassociateConnectionHandle(connection);
- if (getCXFService() == null) {
+ if (getCXFService() == null) {
// Very unlikely as THIS
// managed connection is
// already involved in a transaction.
@@ -76,7 +76,7 @@ public class ManagedConnectionImpl
connectionHandleActive = true;
}
}
- } catch (Exception ex) {
+ } catch (Exception ex) {
throw new ResourceAdapterInternalException(
new Message("ASSOCIATED_ERROR", BUNDLE).toString(), ex);
}
@@ -100,10 +100,10 @@ public class ManagedConnectionImpl
public Object getConnection(Subject subject, ConnectionRequestInfo crInfo) throws ResourceException {
Object connection = null;
-
+
if (getCXFService() == null) {
initializeCXFConnection(crInfo, subject);
- connection = getCXFService();
+ connection = getCXFService();
} else {
if (!connectionHandleActive && this.crinfo.equals(crInfo)) {
connection = getCXFService();
@@ -141,14 +141,14 @@ public class ManagedConnectionImpl
if (requestInfo.getAddress() != null) {
factoryBean.setAddress(requestInfo.getAddress());
}
-
+
Object obj = factoryBean.create();
-
+
setSubject(subject);
-
+
return createConnectionProxy(obj, requestInfo, subject);
} catch (WebServiceException wse) {
- throw new ResourceAdapterInternalException(new Message("FAILED_TO_GET_CXF_CONNECTION",
+ throw new ResourceAdapterInternalException(new Message("FAILED_TO_GET_CXF_CONNECTION",
BUNDLE, requestInfo).toString(), wse);
} finally {
Thread.currentThread().setContextClassLoader(orig);
@@ -158,25 +158,25 @@ public class ManagedConnectionImpl
public ManagedConnectionMetaData getMetaData() throws ResourceException {
return new CXFManagedConnectionMetaData();
}
-
-
+
+
private boolean isJaxWsServiceInterface(Class<?> cls) {
if (cls == null) {
return false;
}
return null != cls.getAnnotation(WebService.class);
}
-
+
public boolean isBound() {
return getCXFService() != null;
}
-
+
// Compliance: WL9 checks
// implemention of Connection method - never used as real Connection impl is
// a java.lang.Proxy
public void close() throws ResourceException {
- //TODO
+ //TODO
}
void disassociateConnectionHandle(Object handle) {
@@ -191,10 +191,10 @@ public class ManagedConnectionImpl
Class<?> classes[] = {Connection.class, BindingProvider.class, cri.getInterface()};
- return Proxy.newProxyInstance(cri.getInterface().getClassLoader(), classes,
+ return Proxy.newProxyInstance(cri.getInterface().getClassLoader(), classes,
createInvocationHandler(obj, subject));
}
-
+
private InvocationHandler createInvocationHandler(Object obj, Subject subject) throws ResourceException {
return getHandlerFactory().createHandlers(obj, subject);
@@ -211,7 +211,7 @@ public class ManagedConnectionImpl
return ((ManagedConnectionFactoryImpl)getManagedConnectionFactory()).getBus();
}
-
+
public void close(Object closingHandle) throws ResourceException {
if (closingHandle == cxfService) {
connectionHandleActive = false;
@@ -225,9 +225,9 @@ public class ManagedConnectionImpl
this.cxfService = null;
super.destroy();
}
-
+
public CXFTransaction getCXFTransaction() {
- //TODO should throw the exception
+ //TODO should throw the exception
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
index 32ba1ec..e41670d 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/ResourceAdapterImpl.java
@@ -51,7 +51,7 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
private BootstrapContext ctx;
private Set<Bus> busCache = new HashSet<>();
private Map<String, InboundEndpoint> endpoints = new ConcurrentHashMap<String, InboundEndpoint>();
-
+
public ResourceAdapterImpl() {
super();
}
@@ -59,7 +59,7 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
public ResourceAdapterImpl(Properties props) {
super(props);
}
-
+
public void registerBus(Bus bus) {
LOG.fine("Bus " + bus + " initialized and added to ResourceAdapter busCache");
busCache.add(bus);
@@ -71,8 +71,8 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
protected void setBusCache(Set<Bus> cache) {
this.busCache = cache;
- }
-
+ }
+
public void start(BootstrapContext aCtx) throws ResourceAdapterInternalException {
LOG.fine("Resource Adapter is starting by appserver...");
if (aCtx == null) {
@@ -87,14 +87,14 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
for (Bus bus : busCache) {
bus.shutdown(true);
}
- }
-
+ }
+
// shutdown all the inbound endpoints
for (Map.Entry<String, InboundEndpoint> entry : endpoints.entrySet()) {
try {
entry.getValue().shutdown();
} catch (Exception e) {
- LOG.log(Level.WARNING, "Failed to stop endpoint " + entry.getKey(), e);
+ LOG.log(Level.WARNING, "Failed to stop endpoint " + entry.getKey(), e);
}
}
endpoints.clear();
@@ -107,37 +107,37 @@ public class ResourceAdapterImpl extends ResourceBean implements ResourceAdapter
public void endpointActivation(MessageEndpointFactory mef, ActivationSpec as)
throws ResourceException {
-
+
if (!(as instanceof MDBActivationSpec)) {
LOG.fine("Ignored unknown activation spec " + as);
return;
}
-
+
MDBActivationSpec spec = (MDBActivationSpec)as;
LOG.info("CXF resource adapter is activating " + spec.getDisplayName());
Work work = new MDBActivationWork(spec, mef, endpoints);
- ctx.getWorkManager().scheduleWork(work);
+ ctx.getWorkManager().scheduleWork(work);
}
public void endpointDeactivation(MessageEndpointFactory mef, ActivationSpec as) {
-
+
if (!(as instanceof MDBActivationSpec)) {
LOG.fine("Ignored unknown activation spec " + as);
return;
}
-
+
MDBActivationSpec spec = (MDBActivationSpec)as;
LOG.info("CXF resource adapter is deactivating " + spec.getDisplayName());
-
+
InboundEndpoint endpoint = endpoints.remove(spec.getDisplayName());
if (endpoint != null) {
try {
endpoint.shutdown();
} catch (Exception e) {
- LOG.log(Level.WARNING, "Failed to stop endpoint "
- + spec.getDisplayName(), e);
+ LOG.log(Level.WARNING, "Failed to stop endpoint "
+ + spec.getDisplayName(), e);
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
index ded96d8..15b80a4 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
@@ -27,21 +27,21 @@ import javax.resource.spi.work.WorkManager;
import org.eclipse.jetty.util.thread.ThreadPool;
/**
- * The adapter for using Application Server's thread pool.
+ * The adapter for using Application Server's thread pool.
* Just simply override the dispatch method.
*/
public class WorkManagerThreadPool extends CXFWorkAdapter implements ThreadPool {
-
+
private WorkManager workManager;
-
+
private boolean isLowOnThreads;
-
+
private Runnable theJob;
-
+
public WorkManagerThreadPool(WorkManager wm) {
this.workManager = wm;
}
-
+
public boolean dispatch(Runnable job) {
try {
theJob = job;
@@ -53,47 +53,47 @@ public class WorkManagerThreadPool extends CXFWorkAdapter implements ThreadPool
}
}
-
+
public int getIdleThreads() {
return 0;
}
-
+
public int getThreads() {
return 1;
}
-
+
public boolean isLowOnThreads() {
return isLowOnThreads;
}
-
-
+
+
void setIsLowOnThreads(boolean isLow) {
this.isLowOnThreads = isLow;
}
-
+
public void join() throws InterruptedException {
//Do nothing
}
-
+
public class WorkImpl implements Work {
-
+
private Runnable job;
-
+
public WorkImpl(Runnable job) {
this.job = job;
}
-
+
public void run() {
job.run();
}
-
+
public void release() {
//empty
}
}
-
+
@Override
public void workRejected(WorkEvent e) {
super.workRejected(e);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java
index e451b22..0a3bf94 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/CXFInvocationHandlerBase.java
@@ -107,7 +107,7 @@ class CXFInvocationHandlerDataImpl implements CXFInvocationHandlerData {
private CXFManagedConnection managedConnection;
private Subject subject;
private Object target;
-
+
public final void setSubject(Subject sub) {
this.subject = sub;
}
@@ -133,11 +133,11 @@ class CXFInvocationHandlerDataImpl implements CXFInvocationHandlerData {
}
public void setTarget(Object t) {
- this.target = t;
-
+ this.target = t;
+
}
- public Object getTarget() {
+ public Object getTarget() {
return target;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
index dfdce6f..82316f2 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvocationHandlerFactory.java
@@ -39,9 +39,9 @@ import org.apache.cxf.jca.cxf.CXFManagedConnection;
public class InvocationHandlerFactory {
-
+
public static final String JCA_HANDLERS_RESOURCE = "META-INF/cxf-jca-handlers.properties";
-
+
private static final Logger LOG = LogUtils.getL7dLogger(InvocationHandlerFactory.class);
final Class<?>[] handlerChainTypes;
@@ -112,9 +112,9 @@ public class InvocationHandlerFactory {
getResources(JCA_HANDLERS_RESOURCE);
while (urls.hasMoreElements()) {
URL url = urls.nextElement();
- loadProperties(handlersMap, url);
+ loadProperties(handlersMap, url);
}
-
+
Class<?>[] handlers = new Class[handlersMap.size()];
String[] handlerClasses = new String[handlersMap.size()];
handlersMap.values().toArray(handlerClasses);
@@ -124,11 +124,11 @@ public class InvocationHandlerFactory {
}
return handlers;
}
-
-
+
+
private void loadProperties(Map<Long, String> handlersMap, URL url) throws IOException {
Properties p = new Properties();
- p.load(url.openStream());
+ p.load(url.openStream());
Iterator<Object> keys = p.keySet().iterator();
while (keys.hasNext()) {
String key = (String)keys.next();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
index 7eb7567..e2b9811 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
@@ -28,7 +28,7 @@ import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.jca.cxf.CXFInvocationHandlerData;
/**
- * delegates invocations to the target object
+ * delegates invocations to the target object
*/
public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
@@ -38,8 +38,8 @@ public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
super(data);
}
- public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+
Object ret = null;
if (!isConnectionCloseMethod(method)) {
ret = invokeTargetMethod(proxy, method, args);
@@ -48,7 +48,7 @@ public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
}
return ret;
- }
+ }
private boolean isConnectionCloseMethod(Method m) {
@@ -59,7 +59,7 @@ public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
LOG.fine("calling close on managed connection with handle");
getData().getManagedConnection().close(handle);
}
-
+
private Object invokeTargetMethod(Object proxy, Method method, Object args[]) throws Throwable {
Object ret = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
----------------------------------------------------------------------
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
index 6b1237c..39a3fd6 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
@@ -36,23 +36,23 @@ import org.apache.cxf.jca.cxf.ManagedConnectionFactoryImpl;
public class ProxyInvocationHandler extends CXFInvocationHandlerBase {
private static final Logger LOG = LogUtils.getL7dLogger(ProxyInvocationHandler.class);
-
+
public ProxyInvocationHandler(CXFInvocationHandlerData data) {
super(data);
- LOG.fine("ProxyInvocationHandler instance created");
+ LOG.fine("ProxyInvocationHandler instance created");
}
public final Object invoke(final Object proxy,
final Method method,
final Object args[]) throws Throwable {
-
+
LOG.fine(this + " on " + method);
Object o = getData().getManagedConnection().getManagedConnectionFactory();
ManagedConnectionFactoryImpl mcf = (ManagedConnectionFactoryImpl)o;
//NOTE reset the inited bus to current ,so CXF-rt can play with JCA setup bus
- Bus bus = mcf.getBus();
- BusFactory.setDefaultBus(bus);
+ Bus bus = mcf.getBus();
+ BusFactory.setDefaultBus(bus);
return invokeNext(proxy, method, args);
}
}