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:14 UTC
[09/51] [partial] cxf git commit: Remove all trailing whitespaces
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"));
-
+
}
}