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:15 UTC
[10/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/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);