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:13 UTC
[08/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
index 4b11c93..03b4d63 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/TypeCreationOptionsSpringTest.java
@@ -32,32 +32,32 @@ import org.apache.cxf.testutil.common.TestUtil;
import org.junit.Test;
/**
- *
+ *
*/
public class TypeCreationOptionsSpringTest extends AbstractCXFSpringTest {
public static final String PORT = TestUtil.getPortNumber(TypeCreationOptionsSpringTest.class);
-
-
+
+
@Override
protected String[] getConfigLocations() {
setConfigContextClass(TypeCreationOptionsSpringTest.class);
return new String[] {"/org/apache/cxf/aegis/type/aegisOptionsTestBeans.xml"};
}
-
- @Test
+
+ @Test
public void testMinOccurs() throws Exception {
TestUtilities testUtilities = new TestUtilities(TypeCreationOptionsSpringTest.class);
testUtilities.setBus(getBean(Bus.class, "cxf"));
testUtilities.addDefaultNamespaces();
testUtilities.addNamespace("ts", "http://cxf.org.apache/service");
//{urn:org.apache.cxf.aegis}arrayService
- Server s = testUtilities.getServerForService(new QName("urn:org.apache.cxf.aegis",
+ Server s = testUtilities.getServerForService(new QName("urn:org.apache.cxf.aegis",
"arrayService"));
Document wsdl = testUtilities.getWSDLDocument(s);
- assertXPathEquals("//xsd:complexType[@name='ArrayOfInt']/"
- + "xsd:sequence/xsd:element[@name='int']/@minOccurs",
+ assertXPathEquals("//xsd:complexType[@name='ArrayOfInt']/"
+ + "xsd:sequence/xsd:element[@name='int']/@minOccurs",
"3", wsdl);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
index 0ca9a45..504ac15 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayReturnItem.java
@@ -20,7 +20,7 @@
package org.apache.cxf.aegis.type.array;
public class DuplicateArrayReturnItem implements Comparable<Object> {
-
+
String name;
public int compareTo(Object arg0) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java
index 586f9a7..7a68c66 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayService.java
@@ -26,20 +26,20 @@ import javax.jws.WebService;
@WebService(name = "DuplicateArray", targetNamespace = "urn:org.apache.cxf.aegis.type.java5")
public interface DuplicateArrayService {
-
+
@WebMethod()
DuplicateArrayReturnItem[] lookup(String indexid);
-
+
@WebMethod
List<List<DuplicateArrayReturnItem>> lookupBatch(String indexid);
-
- @WebMethod
+
+ @WebMethod
Foo<String> doFoo(Foo<Integer> foo);
-
-
+
+
class Foo<T> {
List<T> list;
-
+
public void setList(List<T> l) {
list = l;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java
index 2faaa1e..f1ae611 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/DuplicateArrayServiceBean.java
@@ -35,7 +35,7 @@ public class DuplicateArrayServiceBean implements DuplicateArrayService {
public List<List<DuplicateArrayReturnItem>> lookupBatch(String indexid) {
return null;
}
-
+
@WebMethod
public Foo<String> doFoo(Foo<Integer> foo) {
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java
index a083cae..1771af0 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayService.java
@@ -19,14 +19,14 @@
package org.apache.cxf.aegis.type.array;
public class FlatArrayService implements FlatArrayServiceInterface {
-
+
String[] stringArrayValue;
BeanWithFlatArray beanWithFlatArrayValue;
BeanWithFlatCollection beanWithFlatCollection;
-
+
public FlatArrayService() {
}
-
+
/** {@inheritDoc}*/
public String[] getStringArrayValue() {
return new String[] {"bleh", "bleh"};
@@ -36,12 +36,12 @@ public class FlatArrayService implements FlatArrayServiceInterface {
public void submitStringArray(String[] array) {
stringArrayValue = array;
}
-
+
/** {@inheritDoc}*/
public void takeBeanWithFlatArray(BeanWithFlatArray bwfa) {
beanWithFlatArrayValue = bwfa;
}
-
+
public BeanWithFlatCollection echoBeanWithFlatCollection(BeanWithFlatCollection c) {
beanWithFlatCollection = c;
return c;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java
index 2aae725..6fc560b 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/array/FlatArrayServiceInterface.java
@@ -25,7 +25,7 @@ public interface FlatArrayServiceInterface {
void submitStringArray(String[] array);
void takeBeanWithFlatArray(BeanWithFlatArray bwfa);
-
+
BeanWithFlatCollection echoBeanWithFlatCollection(BeanWithFlatCollection c);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java
index ec6af3a..3ad70f9 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BadBeanDescriptor.java
@@ -28,6 +28,6 @@ public class BadBeanDescriptor {
public void setProperty(String property) {
this.property = property;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
index 6fe2154..b03a0af 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java
@@ -757,23 +757,23 @@ public class BeanTest extends AbstractAegisTest {
this.howdy = howdy;
}
}
-
+
public interface SerializableBean extends Serializable {
String getString();
}
-
+
public interface CloneableBean extends Cloneable {
String getString();
}
-
+
public interface SimpleInterface {
String getString();
}
-
+
public interface ExtendingInterface extends SimpleInterface {
String getAnotherString();
}
-
+
public enum EnumBean {
VALUE1, VALUE2;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
index 1a93785..7cfb0e6 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/ByteDataTest.java
@@ -51,7 +51,7 @@ public class ByteDataTest extends AbstractAegisTest {
addNamespace("wsdl", WSDLConstants.NS_WSDL11);
addNamespace("wsdlsoap", WSDLConstants.NS_SOAP11);
addNamespace("xsd", WSDLConstants.NS_SCHEMA_XSD);
-
+
assertValid("//xsd:element[@name='data'][@type='xsd:base64Binary']", doc);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
index 7c88f25..d41ba02 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DateTimezoneTest.java
@@ -47,76 +47,76 @@ public class DateTimezoneTest extends AbstractAegisTest {
context.initialize();
mapping = context.getTypeMapping();
}
-
+
@Test
public void testTimezoneLessCalendar() throws Exception {
BeanTypeInfo info = new BeanTypeInfo(CalendarBean.class, "urn:Bean");
mapping.register(Calendar.class, Constants.XSD_DATETIME, new TimezoneLessDateType());
- mapping.register(Calendar.class, Constants.XSD_DATE, new TimezoneLessDateType());
+ mapping.register(Calendar.class, Constants.XSD_DATE, new TimezoneLessDateType());
info.setTypeMapping(mapping);
-
+
BeanType type = new BeanType(info);
type.setTypeClass(CalendarBean.class);
type.setTypeMapping(mapping);
type.setSchemaType(new QName("urn:Bean", "bean"));
-
+
CalendarBean bean = new CalendarBean();
bean.setCalendar(Calendar.getInstance());
// Test writing
Element element = writeObjectToElement(type, bean, getContext());
-
+
assertTimezoneLessString(element.getTextContent());
}
-
+
@Test
public void testTimezoneLessDate() throws Exception {
BeanTypeInfo info = new BeanTypeInfo(DateBean.class, "urn:Bean");
mapping.register(Date.class, Constants.XSD_DATETIME, new TimezoneLessDateType());
- mapping.register(Date.class, Constants.XSD_DATE, new TimezoneLessDateType());
+ mapping.register(Date.class, Constants.XSD_DATE, new TimezoneLessDateType());
info.setTypeMapping(mapping);
-
+
BeanType type = new BeanType(info);
type.setTypeClass(DateBean.class);
type.setTypeMapping(mapping);
type.setSchemaType(new QName("urn:Bean", "bean"));
-
+
DateBean bean = new DateBean();
bean.setDate(Calendar.getInstance().getTime());
// Test writing
Element element = writeObjectToElement(type, bean, getContext());
assertTimezoneLessString(element.getTextContent());
-
+
}
-
+
private void assertTimezoneLessString(String dateString) {
assertTrue(dateString.length() <= 10);
assertFalse(dateString.contains("+"));
assertFalse(dateString.contains("Z"));
}
-
+
//TODO add tests with Timezones
-
+
public static class CalendarBean {
private Calendar calendar;
-
+
public Calendar getCalendar() {
return calendar;
}
-
+
public void setCalendar(Calendar calendar) {
this.calendar = calendar;
}
}
-
+
public static class DateBean {
private Date date;
-
+
public Date getDate() {
return date;
}
-
+
public void setDate(Date date) {
this.date = date;
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
index 81c0b6f..aa752dc 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/DynamicProxyTest.java
@@ -36,7 +36,7 @@ public class DynamicProxyTest extends AbstractAegisTest {
context.initialize();
mapping = context.getTypeMapping();
}
-
+
@Test
public void testDynamicProxy() throws Exception {
BeanType type = new BeanType();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
index e5965e7..e33b92e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/QualificationTest.java
@@ -38,19 +38,19 @@ public class QualificationTest extends AbstractAegisTest {
public void setUp() throws Exception {
super.setUp();
-
+
addNamespace("b", "urn:Bean");
addNamespace("xyzzy", "urn:xyzzy");
addNamespace("pkg", "http://services.aegis.cxf.apache.org");
addNamespace("xsi", Constants.URI_2001_SCHEMA_XSI);
}
-
+
@Test
public void testAnnotatedDefaultUnqualifiedAttribute() throws Exception {
AegisContext context = new AegisContext();
context.initialize();
TypeMapping mapping = context.getTypeMapping();
-
+
AegisType type = mapping.getTypeCreator().createType(AttributeBean.class);
type.setSchemaType(new QName("urn:Bean", "bean"));
@@ -62,17 +62,17 @@ public class QualificationTest extends AbstractAegisTest {
assertValid("/b:root[@attrPlainString]", element);
assertXPathEquals("/b:root/@attrPlainString", "attrPlain", element);
}
-
+
@Test
public void testAnnotatedDefaultQualifiedAttribute() throws Exception {
AegisContext context = new AegisContext();
- TypeCreationOptions typeCreationOptions =
+ TypeCreationOptions typeCreationOptions =
new TypeCreationOptions();
typeCreationOptions.setQualifyAttributes(true);
context.setTypeCreationOptions(typeCreationOptions);
context.initialize();
TypeMapping mapping = context.getTypeMapping();
-
+
AegisType type = mapping.getTypeCreator().createType(AttributeBean.class);
type.setSchemaType(new QName("urn:Bean", "bean"));
@@ -89,28 +89,28 @@ public class QualificationTest extends AbstractAegisTest {
AegisContext context = new AegisContext();
context.initialize();
TypeMapping mapping = context.getTypeMapping();
-
+
AegisType type = mapping.getTypeCreator().createType(XmlMappedAttributeBean.class);
type.setSchemaType(new QName("urn:Bean", "bean"));
Context messageContext = new Context(context);
XmlMappedAttributeBean bean = new XmlMappedAttributeBean();
-
+
Element element = writeObjectToElement(type, bean, messageContext);
assertValid("/b:root[@attrXmlString]", element);
assertXPathEquals("/b:root/@attrXmlString", "attrXml", element);
}
-
+
@Test
public void testXmlDefaultQualifiedAttribute() throws Exception {
AegisContext context = new AegisContext();
- TypeCreationOptions typeCreationOptions =
+ TypeCreationOptions typeCreationOptions =
new TypeCreationOptions();
typeCreationOptions.setQualifyAttributes(true);
context.setTypeCreationOptions(typeCreationOptions);
context.initialize();
TypeMapping mapping = context.getTypeMapping();
-
+
AegisType type = mapping.getTypeCreator().createType(XmlMappedAttributeBean.class);
type.setSchemaType(new QName("urn:Bean", "bean"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
index 6349554..19d1e42 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/AbstractEncodedTest.java
@@ -67,7 +67,7 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
// serialization root type
trailingBlocks = new TrailingBlocks();
}
-
+
protected Context getContext() {
AegisContext globalContext = new AegisContext();
globalContext.initialize();
@@ -77,7 +77,7 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
public <T> T readWriteReadRef(String file, Class<T> typeClass) throws XMLStreamException {
Context context = getContext();
-
+
AegisType type = mapping.getType(typeClass);
assertNotNull("no type found for " + typeClass.getName());
@@ -88,7 +88,7 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
// write value to element
Element element = writeRef(value);
-
+
// reread value from element
value = typeClass.cast(readRef(element));
@@ -142,7 +142,7 @@ public abstract class AbstractEncodedTest extends AbstractAegisTest {
// create the document
Element element = createElement("urn:Bean", "root", "b");
MapNamespaceContext namespaces = new MapNamespaceContext();
- // we should not add the out namespace here, as it is not a part of root element
+ // we should not add the out namespace here, as it is not a part of root element
/*for (Map.Entry<String, String> entry : getNamespaces().entrySet()) {
namespaces.addNamespace(entry.getKey(), entry.getValue());
}*/
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
index 55d89f5..f39ffff 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/SoapArrayTypeTest.java
@@ -126,7 +126,7 @@ public class SoapArrayTypeTest extends AbstractEncodedTest {
new Object[]{42, new BigDecimal("42.42"), "Forty Two"},
objects);
}
-
+
@Test
public void testUrTypeArrayReadWriteRef1() throws Exception {
Object[] objects;
@@ -141,7 +141,7 @@ public class SoapArrayTypeTest extends AbstractEncodedTest {
// round trip tests
objects = readWriteReadRef("arrayUrType2.xml", Object[].class);
assertArrayEquals(new Object[]{42, new BigDecimal("42.42"), "Forty Two"}, objects);
-
+
}
@Test
@@ -312,7 +312,7 @@ public class SoapArrayTypeTest extends AbstractEncodedTest {
if (strings[i][j] != null) {
assertEquals(4, strings[i][j].length);
for (int k = 0; k < strings[i][j].length; k++) {
- assertNull("strings[" + i + "][" + j + "][" + k + "] is not null",
+ assertNull("strings[" + i + "][" + j + "][" + k + "] is not null",
strings[i][j][k]);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
index c3aa7b2..9a93b11 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/encoded/StructTypeTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
public class StructTypeTest extends AbstractEncodedTest {
private StructType addressType;
private StructType purchaseOrderType;
-
+
private Context getLocalContext() {
AegisContext aegisContext = new AegisContext();
return new Context(aegisContext);
@@ -81,7 +81,7 @@ public class StructTypeTest extends AbstractEncodedTest {
reader.getXMLStreamReader().close();
// Test writing
- Element element = writeObjectToElement(addressType, address, getLocalContext());
+ Element element = writeObjectToElement(addressType, address, getLocalContext());
validateShippingAddress(element);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
index 912e501..f49a475 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/ClassTest.java
@@ -52,7 +52,7 @@ public class ClassTest extends AbstractAegisTest {
AegisContext context = new AegisContext();
context.initialize();
context.getTypeMapping().register(new ClassAsStringType());
-
+
ServerFactoryBean b = new ServerFactoryBean();
b.setDataBinding(new AegisDatabinding(context));
b.setServiceClass(GenericsService.class);
@@ -80,21 +80,21 @@ public class ClassTest extends AbstractAegisTest {
return type.newInstance();
}
}
-
-
+
+
public static class ClassAsStringType extends AegisType {
-
- public static final QName CLASS_AS_STRING_TYPE_QNAME
+
+ public static final QName CLASS_AS_STRING_TYPE_QNAME
= new QName("http://cxf.apache.org/my/class/test", "class");
-
+
private StringType stringType;
-
+
public ClassAsStringType() {
stringType = new StringType();
super.setTypeClass(Class.class);
super.setSchemaType(CLASS_AS_STRING_TYPE_QNAME);
}
-
+
public Object readObject(MessageReader reader, Context context)
throws DatabindingException {
String className = (String) stringType.readObject(reader, context);
@@ -107,8 +107,8 @@ public class ClassTest extends AbstractAegisTest {
}
return cls;
}
-
- public void writeObject(Object object, MessageWriter writer, Context context)
+
+ public void writeObject(Object object, MessageWriter writer, Context context)
throws DatabindingException {
if (object == null) {
stringType.writeObject(null, writer, context);
@@ -120,15 +120,15 @@ public class ClassTest extends AbstractAegisTest {
public void writeSchema(XmlSchema root) {
XmlSchemaSimpleType xst = new XmlSchemaSimpleType(root, true);
xst.setName("class");
-
+
XmlSchemaSimpleTypeRestriction content = new XmlSchemaSimpleTypeRestriction();
content.setBaseTypeName(Constants.XSD_STRING);
xst.setContent(content);
}
-
+
public boolean usesUtilityTypes() {
return true;
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
index 9ae6597..5cb0b6a 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
@@ -35,9 +35,9 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class CollectionService implements CollectionServiceInterface {
-
+
private Map<String, Map<String, BeanWithGregorianDate>> lastComplexMap;
-
+
/** {@inheritDoc}*/
public Collection<String> getStrings() {
return null;
@@ -56,11 +56,11 @@ public class CollectionService implements CollectionServiceInterface {
public Collection<Collection<String>> getStringCollections() {
return null;
}
-
+
/** {@inheritDoc}*/
public void takeDoubleList(List<Double> doublesList) {
}
-
+
/** {@inheritDoc}*/
public String takeSortedStrings(SortedSet<String> strings) {
return strings.first();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
index d685b74..f7c469d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
@@ -42,18 +42,18 @@ public interface CollectionServiceInterface {
void takeDoubleList(List<Double> doublesList);
String takeSortedStrings(SortedSet<String> strings);
-
+
//CHECKSTYLE:OFF
String takeUnsortedSet(HashSet<String> strings);
String takeStack(Stack<String> strings);
String takeArrayList(ArrayList<String> strings);
//CHECKSTYLE:ON
-
+
void method1(List<String> headers1);
-
- void mapOfMapWithStringAndPojo(Map<String, Map<String, BeanWithGregorianDate>> bigParam);
-
+
+ void mapOfMapWithStringAndPojo(Map<String, Map<String, BeanWithGregorianDate>> bigParam);
+
Collection<double[]> returnCollectionOfPrimitiveArrays();
-
+
Collection<Document[]> returnCollectionOfDOMFragments();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
index 71d8180..0a3dfa4 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionTest.java
@@ -174,7 +174,7 @@ public class CollectionTest extends AbstractAegisTest {
@Test
public void testCollectionServiceWSDL() throws Exception {
-
+
createService(CollectionServiceInterface.class, new CollectionService(), null);
Document wsdl = getWSDLDocument("CollectionServiceInterface");
@@ -182,7 +182,7 @@ public class CollectionTest extends AbstractAegisTest {
}
@Test
- public void testUnannotatedStrings() throws Exception {
+ public void testUnannotatedStrings() throws Exception {
createService(CollectionServiceInterface.class, new CollectionService(), null);
Document doc = getWSDLDocument("CollectionServiceInterface");
@@ -192,7 +192,7 @@ public class CollectionTest extends AbstractAegisTest {
+ "/xsd:sequence/xsd:element[@type='tns:ArrayOfString']",
doc);
}
-
+
@Test
public void testDoubleList() throws Exception {
createService(CollectionServiceInterface.class, new CollectionService(), null);
@@ -201,9 +201,9 @@ public class CollectionTest extends AbstractAegisTest {
"//xsd:complexType[@name='ArrayOfDouble']"
+ "/xsd:sequence/xsd:element[@type='xsd:double']",
doc);
-
+
}
-
+
/**
* CXF-1833 complained of a bizarre schema when @@WebParaming a parameter of List<String>. This regression
* test captures the fact that we don't, in fact, have this problem with correct use of JAX-WS.
@@ -217,12 +217,12 @@ public class CollectionTest extends AbstractAegisTest {
assertInvalid("//xsd:schema[@targetNamespace='http://util.java']",
doc);
}
-
-
+
+
@Test
public void testNestedMapType() throws Exception {
- Method m = CollectionService.class.getMethod("mapOfMapWithStringAndPojo",
+ Method m = CollectionService.class.getMethod("mapOfMapWithStringAndPojo",
new Class[] {Map.class});
AegisType type = creator.createType(m, 0);
tm.register(type);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
index d75b5e2..6c95545 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/DualOutServiceTest.java
@@ -40,9 +40,9 @@ public class DualOutServiceTest extends AbstractAegisTest {
Document wsdl = getWSDLDocument("DualOutService");
assertNotNull(wsdl);
-
+
addNamespace("xsd", Constants.URI_2001_SCHEMA_XSD);
-
+
assertValid(
"//xsd:complexType[@name='getValuesResponse']//xsd:element"
+ "[@name='return'][@type='xsd:string']",
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
index c3f1550..96dd683 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/EnumTypeTest.java
@@ -48,7 +48,7 @@ public class EnumTypeTest extends AbstractAegisTest {
public String toString() {
return name() + "*";
}
-
+
};
@Before
@@ -60,7 +60,7 @@ public class EnumTypeTest extends AbstractAegisTest {
creator.setConfiguration(new TypeCreationOptions());
tm.setTypeCreator(creator);
}
-
+
@Test
public void testType() throws Exception {
EnumType type = new EnumType();
@@ -72,7 +72,7 @@ public class EnumTypeTest extends AbstractAegisTest {
Element element = writeObjectToElement(type, SmallEnum.VALUE1, getContext());
assertEquals("VALUE1", element.getTextContent());
-
+
XMLStreamReader xreader = StaxUtils.createXMLStreamReader(element);
ElementReader reader = new ElementReader(xreader);
Object value = type.readObject(reader, getContext());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
index 4dedb1b..33f6911 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbTypeTest.java
@@ -47,7 +47,7 @@ public class JaxbTypeTest extends AbstractAegisTest {
@Before
public void setUp() throws Exception {
super.setUp();
-
+
Server s = createService(JaxbService.class);
service = s.getEndpoint().getService();
databinding = (AegisDatabinding) service.getDataBinding();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java
index 768c8ae..b917b99 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/JaxbXmlParamTypeTest.java
@@ -38,7 +38,7 @@ public class JaxbXmlParamTypeTest extends AbstractAegisTest {
public void setUp() throws Exception {
super.setUp();
- tm = new DefaultTypeMapping(null,
+ tm = new DefaultTypeMapping(null,
DefaultTypeMapping.createDefaultTypeMapping(false, false));
creator = new Java5TypeCreator();
creator.setNextCreator(new DefaultTypeCreator());
@@ -51,7 +51,7 @@ public class JaxbXmlParamTypeTest extends AbstractAegisTest {
public void testMapServiceWSDL() throws Exception {
createService(CustomTypeService.class, new CustomTypeService(), null);
- // Document wsdl =
+ // Document wsdl =
getWSDLDocument("CustomTypeService");
// todo overriding type qname only seems to work with a Aegis annotation with type class defined
// if type is not defined, aegis ignores specified qname
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
index 12807d9..294c704 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/Student.java
@@ -24,12 +24,12 @@ package org.apache.cxf.aegis.type.java5.map;
public class Student {
private String name;
private long id;
-
+
public Student() {
name = "";
id = Long.valueOf(0);
}
-
+
public Student(String name, long id) {
this.name = name;
this.id = id;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java
index 46f6da2..1f4c4b2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentService.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-@WebService(targetNamespace = "http://client.webservice.crm.ecot.com/skeleton/StudentService",
+@WebService(targetNamespace = "http://client.webservice.crm.ecot.com/skeleton/StudentService",
name = "StudentService")
@SOAPBinding(style = SOAPBinding.Style.RPC, use = SOAPBinding.Use.LITERAL)
public interface StudentService {
@@ -32,7 +32,7 @@ public interface StudentService {
Student findStudent(Long id);
Map<Long, Student> getStudentsMap();
-
+
Map<String, ?> getWildcardMap();
List<Student> getStudents(Map<String, String> filters);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
index 08de48b..bad35e2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
@@ -25,7 +25,7 @@ import java.util.Map;
import javax.jws.WebService;
-@WebService(targetNamespace = "uri:org.apache.cxf.aegis.test.map",
+@WebService(targetNamespace = "uri:org.apache.cxf.aegis.test.map",
name = "StudentService")
public interface StudentServiceDocLiteral {
@@ -36,7 +36,7 @@ public interface StudentServiceDocLiteral {
List<Student> getStudents(Map<String, String> filters);
List<Student> getStudentsByIds(List<String> ids);
-
+
//CHECKSTYLE:OFF
void takeMapMap(HashMap<String, HashMap<String, Student>> myComplexData);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
index abe4af3..c108fcf 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
@@ -24,16 +24,16 @@ import java.util.List;
import java.util.Map;
public class StudentServiceDocLiteralImpl implements StudentServiceDocLiteral {
-
+
private Map<Long, Student> studentMap;
-
+
public StudentServiceDocLiteralImpl() {
studentMap = new HashMap<Long, Student>();
studentMap.put(Long.valueOf(1), new Student("Student1", 1));
studentMap.put(Long.valueOf(100), new Student("Student100", 100));
studentMap.put(Long.valueOf(-1), new Student("StudentNegative", -1));
}
-
+
public Student findStudent(Long id) {
return studentMap.get(id);
}
@@ -44,7 +44,7 @@ public class StudentServiceDocLiteralImpl implements StudentServiceDocLiteral {
if (filters.containsKey(e.getValue())) {
returnValue.add(e.getValue());
}
-
+
}
return returnValue;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
index 983f90a..93ed075 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceImpl.java
@@ -24,16 +24,16 @@ import java.util.List;
import java.util.Map;
public class StudentServiceImpl implements StudentService {
-
+
private Map<Long, Student> studentMap;
-
+
public StudentServiceImpl() {
studentMap = new HashMap<Long, Student>();
studentMap.put(Long.valueOf(1), new Student("Student1", 1));
studentMap.put(Long.valueOf(100), new Student("Student100", 100));
studentMap.put(Long.valueOf(-1), new Student("StudentNegative", -1));
}
-
+
public Student findStudent(Long id) {
return studentMap.get(id);
}
@@ -44,7 +44,7 @@ public class StudentServiceImpl implements StudentService {
if (filters.containsKey(e.getValue())) {
returnValue.add(e.getValue());
}
-
+
}
return returnValue;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
index 314912d..7d3480d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/MapsTest.java
@@ -41,10 +41,10 @@ import org.junit.Ignore;
import org.junit.Test;
/**
- *
+ *
*/
public class MapsTest extends AbstractAegisTest {
-
+
private static MapTest clientInterface;
private static Server server;
@@ -60,16 +60,16 @@ public class MapsTest extends AbstractAegisTest {
// server.getEndpoint().getInInterceptors().add(new LoggingInInterceptor());
// server.getEndpoint().getOutInterceptors().add(new LoggingOutInterceptor());
server.start();
-
+
JaxWsProxyFactoryBean proxyFac = new JaxWsProxyFactoryBean();
proxyFac.setAddress("local://MapTest");
proxyFac.setServiceClass(MapTest.class);
proxyFac.setBus(getBus());
setupAegis(proxyFac.getClientFactoryBean());
- clientInterface = (MapTest)proxyFac.create();
+ clientInterface = (MapTest)proxyFac.create();
}
-
+
@Ignore
@Test
public void testMapWsdl() throws WSDLException {
@@ -78,36 +78,36 @@ public class MapsTest extends AbstractAegisTest {
WSDLFactory.newInstance().newWSDLWriter().writeWSDL(wsdlDef, sink);
System.out.println(sink.toString());
}
-
+
@Test
public void testInvocations() throws Exception {
Map<Long, String> lts = clientInterface.getMapLongToString();
assertEquals("twenty-seven", lts.get(Long.valueOf(27)));
}
-
+
@Test
public void testNull() throws Exception {
ObjectWithAMap obj1 = clientInterface.returnObjectWithAMap();
assertNull(obj1.getTheMap().get("raw"));
Map<Long, String> m = clientInterface.getMapLongToString();
- String str2 = m.get(Long.valueOf(2));
+ String str2 = m.get(Long.valueOf(2));
assertNull("value for 2 should be null, was " + str2, str2);
-
+
}
-
+
@Test
public void testObjectsWithMaps() throws Exception {
ObjectWithAMap obj1 = clientInterface.returnObjectWithAMap();
ObjectWithAMapNs2 obj2 = clientInterface.returnObjectWithAMapNs2();
assertNotNull(obj1);
assertNotNull(obj2);
-
+
assertNotNull(obj1.getTheMap());
- assertNotNull(obj2.getTheMap());
-
+ assertNotNull(obj2.getTheMap());
+
assertEquals(3, obj1.getTheMap().size());
assertEquals(3, obj2.getTheMap().size());
-
+
assertTrue(obj1.getTheMap().get("rainy"));
assertTrue(obj2.getTheMap().get("rainy"));
assertFalse(obj1.getTheMap().get("sunny"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
index e060153..892f684 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/MapTest.java
@@ -26,9 +26,9 @@ import javax.jws.WebService;
import org.apache.cxf.aegis.type.map.ns2.ObjectWithAMapNs2;
/**
- *
+ *
*/
-@WebService(targetNamespace = "uri:org.apache.cxf.aegis.fortest.map",
+@WebService(targetNamespace = "uri:org.apache.cxf.aegis.fortest.map",
name = "MapTest")
public interface MapTest {
ObjectWithAMap returnObjectWithAMap();
@@ -36,8 +36,8 @@ public interface MapTest {
Map<String, Long> getMapStringToLong();
Map<?, ?> getRawMapStringToInteger();
Map<Long, String> getMapLongToString();
-
+
ObjectWithAMapNs2 returnObjectWithAMapNs2();
void takeMapNs2(ObjectWithAMapNs2 map);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java
index 5b2aa74..4af428d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/fortest/ObjectWithAMap.java
@@ -27,7 +27,7 @@ import java.util.Map;
*/
public class ObjectWithAMap {
private Map<String, Boolean> theMap;
-
+
public ObjectWithAMap() {
theMap = new HashMap<String, Boolean>();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java
index 7bad2ac..422b1d3 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/map/ns2/ObjectWithAMapNs2.java
@@ -27,7 +27,7 @@ import java.util.Map;
*/
public class ObjectWithAMapNs2 {
private Map<String, Boolean> theMap;
-
+
public ObjectWithAMapNs2() {
theMap = new HashMap<String, Boolean>();
theMap.put("rainy", Boolean.TRUE);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java
index b7c5d5d..64ac583 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Inner.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
public class Inner implements Serializable {
/**
- *
+ *
*/
private static final long serialVersionUID = -1009032817440459241L;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java
index 2fac06a..c8e03d2 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeImpl.java
@@ -22,8 +22,8 @@ package org.apache.cxf.aegis.type.missing;
import javax.jws.WebMethod;
import javax.jws.WebService;
-@WebService(serviceName = "MissingType",
- endpointInterface = "org.apache.cxf.aegis.type.missing.MissingType",
+@WebService(serviceName = "MissingType",
+ endpointInterface = "org.apache.cxf.aegis.type.missing.MissingType",
targetNamespace = "urn:org:apache:cxf:aegis:type:missing")
public class MissingTypeImpl implements MissingType {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
index 8aa3bd7..4317fe0 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/MissingTypeWSDLTest.java
@@ -28,7 +28,7 @@ import org.apache.cxf.service.invoker.BeanInvoker;
import org.junit.Test;
public class MissingTypeWSDLTest extends AbstractAegisTest {
-
+
@Test
public void testMissingTransliteration() throws Exception {
Server server = createService(MissingType.class, new MissingTypeImpl(), null);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java
index 8117e76..5e730b9 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/missing/Outer.java
@@ -30,7 +30,7 @@ public class Outer implements Serializable {
// object.
/**
- *
+ *
*/
private static final long serialVersionUID = -2435297692897827392L;
/**
@@ -48,14 +48,14 @@ public class Outer implements Serializable {
/**
* The type of name in the taxonomy of entity types.
- *
+ *
* @see com.basistech.rlp.RLPNEConstants for constants for this field.
*/
int entityType;
/**
* The unique identifier of the entity containing this name, or none.
- *
+ *
* @see Entity
*/
String entityUID;
@@ -67,7 +67,7 @@ public class Outer implements Serializable {
/**
* Any pre-computed inners for the name.
- *
+ *
* @@uml.property name="inners"
* @@uml.associationEnd multiplicity="(0 -1)"
*/
@@ -89,7 +89,7 @@ public class Outer implements Serializable {
/**
* Set arbitrary data stored with this name.
- *
+ *
* @param extra the extra to set
*/
public void setExtra(String extra) {
@@ -99,7 +99,7 @@ public class Outer implements Serializable {
/**
* Set a unique ID for this name. This API does not check or enforce
* uniqueness.
- *
+ *
* @param uid
*/
public void setUID(String auid) {
@@ -116,7 +116,7 @@ public class Outer implements Serializable {
/**
* Set the textual content of the name. This call does not automatically set
* any other properties, such as script or language.
- *
+ *
* @param data the data to set.
*/
public void setData(String data) {
@@ -136,7 +136,7 @@ public class Outer implements Serializable {
* influences the interpretating and matching of the name. Use the value
* {@link com.basistech.rlp.RLPNEConstants#NE_TYPE_NONE} if there is no type
* available.
- *
+ *
* @param entityType
*/
public void setEntityType(int entityType) {
@@ -154,7 +154,7 @@ public class Outer implements Serializable {
* Set an entity UID for this name. Entities group multiple names for a
* single real-world item. All the names of a single entity are connected
* via their entity unique ID.
- *
+ *
* @param entityUID the UID.
*/
public void setEntityUID(String entityUID) {
@@ -174,7 +174,7 @@ public class Outer implements Serializable {
* Set the 'primary' flag for this name. If names are grouped by entities
* {@link #setEntityUID(String)}, one of the names of an entity may be
* marked primary. This API does not check that only one name is marked.
- *
+ *
* @param primary the primary flag.
*/
public void setPrimary(boolean primary) {
@@ -190,7 +190,7 @@ public class Outer implements Serializable {
/**
* Set pre-calculated inners for this name.
- *
+ *
* @param inners the inners.
*/
public void setTransliterations(Inner[] transliterations) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
index 63191f9..0501569 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/streams/XMLStreamReaderMappingTest.java
@@ -51,13 +51,13 @@ public class XMLStreamReaderMappingTest extends AbstractAegisTest {
// create a different mapping than the context creates.
TypeMapping baseMapping = DefaultTypeMapping.createSoap11TypeMapping(true, false, false);
mapping = new DefaultTypeMapping(Constants.URI_2001_SCHEMA_XSD, baseMapping);
- mapping.register(XMLStreamReader.class,
+ mapping.register(XMLStreamReader.class,
new QName("urn:Bean", "SimpleBean"), new XMLStreamReaderType());
mapping.setTypeCreator(context.createTypeCreator());
context.setTypeMapping(mapping);
context.initialize();
}
-
+
@Test
public void testReadStream() throws Exception {
// Test reading
@@ -71,7 +71,7 @@ public class XMLStreamReaderMappingTest extends AbstractAegisTest {
beanReader.nextTag();
assertEquals("bleh", beanReader.getLocalName());
}
-
+
protected Context getContext() {
AegisContext globalContext = new AegisContext();
globalContext.initialize();
@@ -79,6 +79,6 @@ public class XMLStreamReaderMappingTest extends AbstractAegisTest {
return new Context(globalContext);
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java
index d11a786..f5977c3 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/BeanWithDate.java
@@ -20,7 +20,7 @@
package org.apache.cxf.aegis.xmlconfig;
/**
- * class used to test remapping the schema type of date.
+ * class used to test remapping the schema type of date.
*/
public class BeanWithDate {
private java.util.Date fig;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
index 0b054cf..a275e2e 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xmlconfig/TestDateMapping.java
@@ -39,14 +39,14 @@ public class TestDateMapping {
private AegisContext context;
private TestUtilities testUtilities;
private XMLOutputFactory xmlOutputFactory;
-
+
@Before
public void before() {
testUtilities = new TestUtilities(getClass());
testUtilities.addNamespace("test", "urn:test");
xmlOutputFactory = XMLOutputFactory.newInstance();
}
-
+
@Test
public void testWriteSqlDateAsDate() throws Exception {
context = new AegisContext();
@@ -66,7 +66,7 @@ public class TestDateMapping {
xmlWriter.close();
// an absence of exception is success here.
}
-
+
@Test
public void testWriteCustomTypeSchemaType() throws Exception {
context = new AegisContext();
@@ -81,6 +81,6 @@ public class TestDateMapping {
XmlSchema root = new XmlSchema(); // dummy to put schema in.
/* will explode if the type object created for the custom mapping isn't fully initialized.
*/
- sbType.writeSchema(root);
+ sbType.writeSchema(root);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java
index 2328184..cdbac77 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Course.java
@@ -20,23 +20,23 @@
package org.apache.cxf.doclitbare;
/**
- *
+ *
*/
public class Course {
private long id;
private String name;
private String description;
-
+
public Course() {
id = 0;
}
-
+
public Course(long id, String name, String description) {
this.id = id;
this.name = name;
this.description = description;
}
-
+
public long getId() {
return id;
}
@@ -55,6 +55,6 @@ public class Course {
public void setDescription(String description) {
this.description = description;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
index d3265c3..81d1c58 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/DocLitBareTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
* Test motivated by CXF-1504
*/
public class DocLitBareTest extends AbstractCXFTest {
-
+
@Test
public void testNamespaceCrash() {
ServerFactoryBean svrFactory = new ServerFactoryBean();
@@ -40,16 +40,16 @@ public class DocLitBareTest extends AbstractCXFTest {
svrFactory.setAddress("local://dlbTest");
svrFactory.setServiceBean(new UniversityImpl());
svrFactory.getServiceFactory().setDataBinding(new AegisDatabinding());
- svrFactory.create();
+ svrFactory.create();
ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
factory.getServiceFactory().setDataBinding(new AegisDatabinding());
-
+
factory.setServiceClass(University.class);
factory.setTransportId(LocalTransportFactory.TRANSPORT_ID);
factory.setAddress("local://dlbTest");
University client = (University) factory.create();
-
+
Teacher tr = client.getTeacher(new Course(40, "Intro to CS", "Introductory Comp Sci"));
assertNotNull(tr);
assertEquals(52, tr.getAge());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java
index 67523c8..974d496 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/Teacher.java
@@ -20,23 +20,23 @@
package org.apache.cxf.doclitbare;
/**
- *
+ *
*/
public class Teacher {
private int age;
private String name;
private String department;
-
+
public Teacher() {
age = 0;
}
-
+
public Teacher(int age, String name, String department) {
this.age = age;
this.name = name;
this.department = department;
}
-
+
public int getAge() {
return age;
}
@@ -55,5 +55,5 @@ public class Teacher {
public void setDepartment(String department) {
this.department = department;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java
index bbc5b7c..6abee1d 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/University.java
@@ -20,7 +20,7 @@
package org.apache.cxf.doclitbare;
/**
- *
+ *
*/
import javax.jws.WebMethod;
import javax.jws.WebParam;
@@ -29,13 +29,13 @@ import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
@WebService(name = "University", targetNamespace = "http://cxf.apache.org/dlb/")
-@SOAPBinding(use = SOAPBinding.Use.LITERAL, style = SOAPBinding.Style.DOCUMENT,
+@SOAPBinding(use = SOAPBinding.Use.LITERAL, style = SOAPBinding.Style.DOCUMENT,
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public interface University {
@WebResult(targetNamespace = "http://education.toorosystems.com/", name = "return", partName = "return")
@WebMethod(operationName = "getTeacher", exclude = false)
Teacher getTeacher(
- @WebParam(targetNamespace = "http://cxf.apache.org/dlb/",
+ @WebParam(targetNamespace = "http://cxf.apache.org/dlb/",
name = "course", mode = WebParam.Mode.IN)
Course course);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java
----------------------------------------------------------------------
diff --git a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java
index a52acb8..84a61dc 100644
--- a/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java
+++ b/rt/databinding/aegis/src/test/java/org/apache/cxf/doclitbare/UniversityImpl.java
@@ -23,16 +23,16 @@ import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
/**
- *
+ *
*/
@WebService(name = "University", targetNamespace = "http://cxf.apache.org/dlb/")
-@SOAPBinding(use = SOAPBinding.Use.LITERAL,
- style = SOAPBinding.Style.DOCUMENT,
+@SOAPBinding(use = SOAPBinding.Use.LITERAL,
+ style = SOAPBinding.Style.DOCUMENT,
parameterStyle = SOAPBinding.ParameterStyle.BARE)
public class UniversityImpl implements University {
public Teacher getTeacher(Course course) {
- return new Teacher(52, "Mr. Tom", "Computer Science" + course.getName());
+ return new Teacher(52, "Mr. Tom", "Computer Science" + course.getName());
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
index 79678f6..dad8087 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/DatatypeFactory.java
@@ -32,10 +32,10 @@ import org.apache.cxf.common.logging.LogUtils;
*
*/
public final class DatatypeFactory {
-
+
public static final Duration PT0S;
private static final Logger LOG = LogUtils.getL7dLogger(DatatypeFactory.class);
-
+
static {
PT0S = createDuration("PT0S");
@@ -46,7 +46,7 @@ public final class DatatypeFactory {
*
*/
private DatatypeFactory() {
-
+
}
public static Duration createDuration(String s) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 8415f0e..a727bf4 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -76,7 +76,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
JAXBContextInitializer(ServiceInfo serviceInfo,
Set<Class<?>> classes,
- Collection<Object> typeReferences,
+ Collection<Object> typeReferences,
Map<String, Object> unmarshallerProperties) {
super(serviceInfo);
this.classes = classes;
@@ -97,7 +97,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
Boolean.TRUE);
}
boolean isFromWrapper = part.getMessageInfo().getOperation().isUnwrapped();
- if (isFromWrapper
+ if (isFromWrapper
&& !Boolean.TRUE.equals(part.getProperty("messagepart.isheader"))) {
UnwrappedOperationInfo uop = (UnwrappedOperationInfo)part.getMessageInfo().getOperation();
OperationInfo op = uop.getWrappedOperation();
@@ -120,7 +120,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
&& !Byte.TYPE.equals(clazz.getComponentType())) {
clazz = clazz.getComponentType();
}
-
+
Annotation[] a = (Annotation[])part.getProperty("parameter.annotations");
checkForAdapter(clazz, a);
@@ -174,7 +174,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
}
if (clazz != null) {
- if (!isFromWrapper
+ if (!isFromWrapper
&& clazz.getAnnotation(XmlRootElement.class) == null
&& clazz.getAnnotation(XmlType.class) != null
&& StringUtils.isEmpty(clazz.getAnnotation(XmlType.class).name())) {
@@ -183,7 +183,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
typeReferences.add(ref);
}
}
-
+
addClass(clazz);
}
}
@@ -309,7 +309,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
return true;
}
-
+
void addClass(Class<?> claz) {
if (Throwable.class.isAssignableFrom(claz)) {
if (!Throwable.class.equals(claz)
@@ -322,8 +322,8 @@ class JAXBContextInitializer extends ServiceModelVisitor {
return;
} else {
Class<?> cls = JAXBUtils.getValidClass(claz);
- if (cls == null
- && ReflectionUtil.getDeclaredConstructors(claz).length > 0
+ if (cls == null
+ && ReflectionUtil.getDeclaredConstructors(claz).length > 0
&& !Modifier.isAbstract(claz.getModifiers())) {
if (LOG.isLoggable(Level.INFO)) {
LOG.info("Class " + claz.getName() + " does not have a default constructor which JAXB requires.");
@@ -359,7 +359,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
return;
}
-
+
if (cls.getSuperclass() != null) {
//JAXB should do this, but it doesn't always.
//in particular, older versions of jaxb don't
@@ -369,10 +369,10 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (!cls.isInterface()) {
walkReferences(cls);
}
- }
+ }
}
}
-
+
private void walkReferences(Class<?> cls) {
if (cls == null) {
return;
@@ -392,7 +392,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (accessType != XmlAccessType.PROPERTY) { // only look for fields if we are instructed to
//fields are accessible even if not public, must look at the declared fields
//then walk to parents declared fields, etc...
- Field fields[] = ReflectionUtil.getDeclaredFields(cls);
+ Field fields[] = ReflectionUtil.getDeclaredFields(cls);
for (Field f : fields) {
if (isFieldAccepted(f, accessType)) {
XmlJavaTypeAdapter xjta = Utils.getFieldXJTA(f);
@@ -410,7 +410,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
if (accessType != XmlAccessType.FIELD) { // only look for methods if we are instructed to
- Method methods[] = ReflectionUtil.getDeclaredMethods(cls);
+ Method methods[] = ReflectionUtil.getDeclaredMethods(cls);
for (Method m : methods) {
if (isMethodAccepted(m, accessType)) {
XmlJavaTypeAdapter xjta = Utils.getMethodXJTA(m);
@@ -442,7 +442,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (Modifier.isStatic(field.getModifiers())) {
return field.isAnnotationPresent(XmlAttribute.class);
}
- if (accessType == XmlAccessType.PUBLIC_MEMBER
+ if (accessType == XmlAccessType.PUBLIC_MEMBER
&& !Modifier.isPublic(field.getModifiers())) {
return false;
}
@@ -459,7 +459,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
*/
static boolean isMethodAccepted(Method method, XmlAccessType accessType) {
// We only accept non static property getters which are not marked @XmlTransient
- if (Modifier.isStatic(method.getModifiers())
+ if (Modifier.isStatic(method.getModifiers())
|| method.isAnnotationPresent(XmlTransient.class)
|| !Modifier.isPublic(method.getModifiers())
|| "getClass".equals(method.getName())) {
@@ -479,7 +479,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
if (method.getName().startsWith("is")) {
beginIndex = 2;
}
-
+
Method setter = null;
try {
setter = method.getDeclaringClass()
@@ -496,7 +496,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
} else if (!Collection.class.isAssignableFrom(method.getReturnType())
&& !Throwable.class.isAssignableFrom(method.getDeclaringClass())) {
//no setter, it's not a collection (thus getter().add(...)), and
- //not an Exception,
+ //not an Exception,
return false;
}
@@ -522,12 +522,12 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
return false;
}
-
+
/**
* The TypeReference class is a sun specific class that is found in two different
* locations depending on environment. In IBM JDK the class is not available at all.
* So we have to load it at runtime.
- *
+ *
* @param n
* @param cls
* @return initiated TypeReference
@@ -535,7 +535,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
private static Object createTypeReference(QName n, Class<?> cls) {
Class<?> refClass = null;
try {
- refClass = ClassLoaderUtils.loadClass("com.sun.xml.bind.api.TypeReference",
+ refClass = ClassLoaderUtils.loadClass("com.sun.xml.bind.api.TypeReference",
JAXBContextInitializer.class);
} catch (Throwable ex) {
try {
@@ -555,9 +555,9 @@ class JAXBContextInitializer extends ServiceModelVisitor {
}
return null;
}
-
- @SuppressWarnings("unused")
- private Object createFactory(Class<?> cls, Constructor<?> contructor) {
+
+ @SuppressWarnings("unused")
+ private Object createFactory(Class<?> cls, Constructor<?> contructor) {
String newClassName = cls.getName() + "Factory";
ASMHelper helper = new ASMHelper();
ClassWriter cw = helper.createClassWriter();
@@ -583,10 +583,10 @@ class JAXBContextInitializer extends ServiceModelVisitor {
mv.visitTypeInsn(Opcodes.NEW, name);
mv.visitInsn(Opcodes.DUP);
StringBuilder paraString = new StringBuilder("(");
-
+
for (Class<?> paraClass : contructor.getParameterTypes()) {
mv.visitInsn(Opcodes.ACONST_NULL);
- paraString.append("Ljava/lang/Object;");
+ paraString.append("Ljava/lang/Object;");
}
paraString.append(")V");
@@ -602,9 +602,9 @@ class JAXBContextInitializer extends ServiceModelVisitor {
return factoryClass.newInstance();
} catch (Exception e) {
//ignore
- }
+ }
return null;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
index a670b7d..2501ea4 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBase.java
@@ -41,19 +41,19 @@ import org.apache.cxf.service.model.MessagePartInfo;
import org.apache.cxf.service.model.OperationInfo;
/**
- *
+ *
*/
public abstract class JAXBDataBase {
-
- protected JAXBContext context;
+
+ protected JAXBContext context;
protected Schema schema;
protected Collection<Attachment> attachments;
protected Integer mtomThreshold; // null if we should default.
-
+
protected JAXBDataBase(JAXBContext ctx) {
context = ctx;
}
-
+
public void setSchema(Schema s) {
this.schema = s;
}
@@ -61,7 +61,7 @@ public abstract class JAXBDataBase {
public void setJAXBContext(JAXBContext jc) {
this.context = jc;
}
-
+
public Schema getSchema() {
return schema;
}
@@ -84,10 +84,10 @@ public abstract class JAXBDataBase {
protected AttachmentMarshaller getAttachmentMarshaller() {
return new JAXBAttachmentMarshaller(attachments, mtomThreshold);
}
-
+
public void setProperty(String prop, Object value) {
}
-
+
protected Annotation[] getJAXBAnnotation(MessagePartInfo mpi) {
List<Annotation> annoList = null;
if (mpi != null) {
@@ -96,9 +96,9 @@ public abstract class JAXBDataBase {
annoList = extractJAXBAnnotations(getReturnMethodAnnotations(mpi));
}
}
- return annoList == null ? new Annotation[0] : annoList.toArray(new Annotation[annoList.size()]);
+ return annoList == null ? new Annotation[0] : annoList.toArray(new Annotation[annoList.size()]);
}
-
+
private List<Annotation> extractJAXBAnnotations(Annotation[] anns) {
List<Annotation> annoList = null;
if (anns != null) {
@@ -114,7 +114,7 @@ public abstract class JAXBDataBase {
}
return annoList;
}
-
+
private Annotation[] getReturnMethodAnnotations(MessagePartInfo mpi) {
AbstractMessageContainer mi = mpi.getMessageInfo();
if (mi == null || !isOutputMessage(mi)) {
@@ -123,7 +123,7 @@ public abstract class JAXBDataBase {
OperationInfo oi = mi != null ? mi.getOperation() : null;
return oi != null ? (Annotation[])oi.getProperty("method.return.annotations") : null;
}
-
+
protected boolean isOutputMessage(AbstractMessageContainer messageContainer) {
if (messageContainer instanceof MessageInfo) {
return MessageInfo.Type.OUTPUT.equals(((MessageInfo)messageContainer).getType());
@@ -138,7 +138,7 @@ public abstract class JAXBDataBase {
public void setMtomThreshold(Integer threshold) {
this.mtomThreshold = threshold;
}
-
+
protected final boolean honorJAXBAnnotations(MessagePartInfo part) {
if (part == null) {
return false;
@@ -152,6 +152,6 @@ public abstract class JAXBDataBase {
Boolean b = (Boolean)part.getProperty("honor.jaxb.annotations");
return b == null ? false : b;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
----------------------------------------------------------------------
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index eb57c5e..8cd5fda 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -98,7 +98,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
public static final String VALIDATION_EVENT_HANDLER = "jaxb-validation-event-handler";
public static final String SET_VALIDATION_EVENT_HANDLER = "set-jaxb-validation-event-handler";
public static final String WRITER_VALIDATION_EVENT_HANDLER = "jaxb-writer-validation-event-handler";
-
+
public static final String SCHEMA_RESOURCE = "SCHEMRESOURCE";
public static final String MTOM_THRESHOLD = "org.apache.cxf.jaxb.mtomThreshold";
@@ -117,7 +117,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
Node.class,
XMLEventWriter.class,
XMLStreamWriter.class};
-
+
private static class DelayedDOMResult extends DOMResult {
private final URL resource;
private final String publicId;
@@ -308,7 +308,7 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
}
contextClasses = new LinkedHashSet<Class<?>>();
-
+
for (ServiceInfo serviceInfo : service.getServiceInfos()) {
JAXBContextInitializer initializer
= new JAXBContextInitializer(serviceInfo, contextClasses, typeRefs, this.getUnmarshallerProperties());
@@ -468,9 +468,9 @@ public class JAXBDataBinding extends AbstractInterceptorProvidingDataBinding
JAXBContextCache.scanPackages(classes);
}
addWsAddressingTypes(classes);
-
- return JAXBContextCache.getCachedContextAndSchemas(classes, defaultNs,
- contextProperties,
+
+ return JAXBContextCache.getCachedContextAndSchemas(classes, defaultNs,
+ contextProperties,
typeRefs, true);
}