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:19 UTC
[14/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index 4fc4ab4..a72db55 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -52,16 +52,16 @@ import org.omg.CORBA.portable.OutputStream;
public class CorbaObjectWriterTest extends Assert {
private static ORB orb;
-
+
@Before
public void setUp() throws java.lang.Exception {
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws java.lang.Exception {
if (orb != null) {
@@ -76,24 +76,24 @@ public class CorbaObjectWriterTest extends Assert {
@Test
public void testWriteBoolean() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Boolean boolValue = Boolean.TRUE;
writer.writeBoolean(boolValue);
-
+
InputStream iStream = oStream.create_input_stream();
boolean b = iStream.read_boolean();
assertTrue(b == boolValue.booleanValue());
}
-
+
@Test
public void testWriteChar() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Character charValue = new Character('c');
writer.writeChar(charValue);
-
+
InputStream iStream = oStream.create_input_stream();
char c = iStream.read_char();
assertTrue(c == charValue.charValue());
@@ -102,128 +102,128 @@ public class CorbaObjectWriterTest extends Assert {
@Test
public void testWriteWChar() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Character wcharValue = new Character('w');
writer.writeChar(wcharValue);
-
+
InputStream iStream = oStream.create_input_stream();
char wc = iStream.read_char();
assertTrue(wc == wcharValue.charValue());
}
-
+
@Test
public void testWriteShort() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Short shortValue = new Short((short)-123);
writer.writeShort(shortValue);
-
+
InputStream iStream = oStream.create_input_stream();
short s = iStream.read_short();
assertTrue(s == shortValue.shortValue());
}
-
+
@Test
public void testWriteUShort() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Integer ushortValue = new Integer(123);
writer.writeUShort(ushortValue);
-
+
InputStream iStream = oStream.create_input_stream();
int us = iStream.read_ushort();
assertTrue(us == ushortValue.intValue());
}
-
+
@Test
public void testWriteLong() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Integer longValue = new Integer(-1234567);
writer.writeLong(longValue);
-
+
InputStream iStream = oStream.create_input_stream();
int l = iStream.read_long();
assertTrue(l == longValue.intValue());
}
-
+
@Test
public void testWriteULong() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
long ulongValue = 1234567L;
writer.writeULong(ulongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ul = iStream.read_ulong();
assertTrue(ul == ulongValue);
}
-
+
@Test
public void testWriteLongLong() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Long longlongValue = new Long("-12345678900");
writer.writeLongLong(longlongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ll = iStream.read_longlong();
assertTrue(ll == longlongValue.longValue());
}
-
+
@Test
public void testWriteULongLong() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
BigInteger ulonglongValue = new BigInteger("12345678900");
writer.writeULongLong(ulonglongValue);
-
+
InputStream iStream = oStream.create_input_stream();
long ul = iStream.read_ulonglong();
assertTrue(ul == ulonglongValue.longValue());
}
-
+
@Test
public void testWriteFloat() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Float floatValue = new Float((float)123456.78);
writer.writeFloat(floatValue);
-
+
InputStream iStream = oStream.create_input_stream();
float f = iStream.read_float();
assertTrue(f == floatValue.floatValue());
}
-
+
@Test
public void testWriteDouble() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
Double doubleValue = new Double(987654.321);
writer.writeDouble(doubleValue);
-
+
InputStream iStream = oStream.create_input_stream();
double d = iStream.read_double();
assertTrue(d == doubleValue.doubleValue());
}
-
+
@Test
public void testWriteString() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
String stringValue = new String("String");
writer.writeString(stringValue);
-
+
InputStream iStream = oStream.create_input_stream();
String s = iStream.read_string();
assertTrue(s.equals(stringValue));
@@ -232,20 +232,20 @@ public class CorbaObjectWriterTest extends Assert {
@Test
public void testWriteWString() {
OutputStream oStream = orb.create_output_stream();
-
+
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
String wstringValue = new String("String");
writer.writeWString(wstringValue);
-
+
InputStream iStream = oStream.create_input_stream();
String s = iStream.read_wstring();
assertTrue(s.equals(wstringValue));
}
-
+
@Test
public void testWriteArray() {
int data[] = {1, 1, 2, 3, 5, 8, 13, 21};
-
+
// create an array of longs
QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
QName arrayIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "array", CorbaConstants.NP_WSDL_CORBA);
@@ -259,7 +259,7 @@ public class CorbaObjectWriterTest extends Assert {
CorbaArrayHandler obj = new CorbaArrayHandler(new QName("Array"), arrayIdlType, arrayTC, arrayType);
for (int i = 0; i < data.length; ++i) {
CorbaPrimitiveHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), longIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), longIdlType,
orb.get_primitive_tc(TCKind.tk_long), null);
nestedObj.setValueFromData(Integer.toString(data[i]));
obj.addElement(nestedObj);
@@ -268,25 +268,25 @@ public class CorbaObjectWriterTest extends Assert {
OutputStream oStream = orb.create_output_stream();
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeArray(obj);
-
+
InputStream iStream = oStream.create_input_stream();
for (int i = 0; i < data.length; ++i) {
int val = iStream.read_long();
assertTrue(val == data[i]);
}
}
-
+
@Test
public void testWriteSequence() {
String data[] = {"one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one"};
-
+
// create an sequence of strings
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
QName seqIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "sequence", CorbaConstants.NP_WSDL_CORBA);
Sequence seqType = new Sequence();
seqType.setBound(data.length);
- seqType.setElemtype(stringIdlType);
+ seqType.setElemtype(stringIdlType);
// name and respoitory ID of the sequence are not needed for this test
// build the object holder for a sequence.
@@ -294,16 +294,16 @@ public class CorbaObjectWriterTest extends Assert {
CorbaSequenceHandler obj = new CorbaSequenceHandler(new QName("Seq"), seqIdlType, seqTC, seqType);
for (int i = 0; i < data.length; ++i) {
CorbaPrimitiveHandler nestedObj =
- new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
+ new CorbaPrimitiveHandler(new QName("item"), stringIdlType,
orb.get_primitive_tc(TCKind.tk_string), null);
nestedObj.setValueFromData(data[i]);
obj.addElement(nestedObj);
}
-
+
OutputStream oStream = orb.create_output_stream();
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeSequence(obj);
-
+
InputStream iStream = oStream.create_input_stream();
int length = iStream.read_long();
for (int i = 0; i < length; ++i) {
@@ -311,7 +311,7 @@ public class CorbaObjectWriterTest extends Assert {
assertTrue(val.equals(data[i]));
}
}
-
+
@Test
public void testWriteStruct() {
// create the following struct
@@ -323,12 +323,12 @@ public class CorbaObjectWriterTest extends Assert {
int member1 = 12345;
String member2 = "54321";
boolean member3 = true;
-
+
QName structIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "struct", CorbaConstants.NP_WSDL_CORBA);
QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
QName boolIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
-
+
Struct structType = new Struct();
structType.setName("TestStruct");
MemberType m1 = new MemberType();
@@ -349,29 +349,29 @@ public class CorbaObjectWriterTest extends Assert {
structMembers[0] = new StructMember("member1", orb.get_primitive_tc(TCKind.tk_long), null);
structMembers[1] = new StructMember("member2", orb.get_primitive_tc(TCKind.tk_string), null);
structMembers[2] = new StructMember("member3", orb.get_primitive_tc(TCKind.tk_boolean), null);
- TypeCode structTC = orb.create_struct_tc("IDL:org.apache.cxf.TestStruct/1.0", "TestStruct",
+ TypeCode structTC = orb.create_struct_tc("IDL:org.apache.cxf.TestStruct/1.0", "TestStruct",
structMembers);
- CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
+ CorbaStructHandler obj = new CorbaStructHandler(new QName("TestStruct"), structIdlType,
structTC, structType);
- CorbaPrimitiveHandler memberObj1 =
+ CorbaPrimitiveHandler memberObj1 =
new CorbaPrimitiveHandler(new QName("member1"), longIdlType, structMembers[0].type, null);
- CorbaPrimitiveHandler memberObj2 =
+ CorbaPrimitiveHandler memberObj2 =
new CorbaPrimitiveHandler(new QName("member2"), stringIdlType, structMembers[1].type, null);
- CorbaPrimitiveHandler memberObj3 =
+ CorbaPrimitiveHandler memberObj3 =
new CorbaPrimitiveHandler(new QName("member3"), boolIdlType, structMembers[2].type, null);
-
+
memberObj1.setValueFromData(Integer.toString(member1));
memberObj2.setValueFromData(member2);
memberObj3.setValueFromData(Boolean.toString(member3));
-
+
obj.addMember(memberObj1);
obj.addMember(memberObj2);
obj.addMember(memberObj3);
-
+
OutputStream oStream = orb.create_output_stream();
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeStruct(obj);
-
+
InputStream iStream = oStream.create_input_stream();
int readMember1 = iStream.read_long();
assertTrue(readMember1 == member1);
@@ -380,7 +380,7 @@ public class CorbaObjectWriterTest extends Assert {
boolean readMember3 = iStream.read_boolean();
assertTrue(readMember3 == member3);
}
-
+
@Test
public void testWriteException() {
// create the following exception
@@ -391,14 +391,14 @@ public class CorbaObjectWriterTest extends Assert {
short code = 12345;
String message = "54321";
String reposID = "IDL:org.apache.cxf.TestException/1.0";
-
+
QName exceptIdlType = new QName(CorbaConstants.NU_WSDL_CORBA,
"exception", CorbaConstants.NP_WSDL_CORBA);
QName shortIdlType = new QName(CorbaConstants.NU_WSDL_CORBA,
"short", CorbaConstants.NP_WSDL_CORBA);
QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA,
"string", CorbaConstants.NP_WSDL_CORBA);
-
+
Exception exceptType = new Exception();
exceptType.setName("TestException");
exceptType.setRepositoryID(reposID);
@@ -416,13 +416,13 @@ public class CorbaObjectWriterTest extends Assert {
exceptMembers[0] = new StructMember("code", orb.get_primitive_tc(TCKind.tk_short), null);
exceptMembers[1] = new StructMember("message", orb.get_primitive_tc(TCKind.tk_string), null);
TypeCode exceptTC = orb.create_exception_tc(reposID, "TestException", exceptMembers);
- CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
+ CorbaExceptionHandler obj = new CorbaExceptionHandler(new QName("TestException"), exceptIdlType,
exceptTC, exceptType);
-
- CorbaPrimitiveHandler member1 =
+
+ CorbaPrimitiveHandler member1 =
new CorbaPrimitiveHandler(new QName("code"), shortIdlType, exceptMembers[0].type, null);
member1.setValueFromData(Short.toString(code));
- CorbaPrimitiveHandler member2 =
+ CorbaPrimitiveHandler member2 =
new CorbaPrimitiveHandler(new QName("message"), stringIdlType, exceptMembers[1].type, null);
member2.setValueFromData(message);
obj.addMember(member1);
@@ -433,7 +433,7 @@ public class CorbaObjectWriterTest extends Assert {
writer.writeException(obj);
InputStream iStream = oStream.create_input_stream();
-
+
String readId = iStream.read_string();
assertTrue(readId.equals(reposID));
short readCode = iStream.read_short();
@@ -441,29 +441,29 @@ public class CorbaObjectWriterTest extends Assert {
String readMessage = iStream.read_string();
assertTrue(readMessage.equals(message));
}
-
+
@Test
public void testWriteObject() throws IOException {
URL refUrl = getClass().getResource("/references/account.ref");
String oRef = IOUtils.toString(refUrl.openStream()).trim();
- org.omg.CORBA.Object objRef =
+ org.omg.CORBA.Object objRef =
orb.string_to_object(oRef);
assertNotNull(objRef);
-
+
// create a test object
- org.apache.cxf.binding.corba.wsdl.Object objectType =
+ org.apache.cxf.binding.corba.wsdl.Object objectType =
new org.apache.cxf.binding.corba.wsdl.Object();
objectType.setRepositoryID("IDL:Account:1.0");
objectType.setBinding(new QName("AccountCORBABinding"));
-
+
QName objectName = new QName("TestObject");
QName objectIdlType = new QName("corbaatm:TestObject");
TypeCode objectTC = orb.create_interface_tc("IDL:Account:1.0", "TestObject");
-
- CorbaObjectReferenceHandler obj = new CorbaObjectReferenceHandler(objectName, objectIdlType,
+
+ CorbaObjectReferenceHandler obj = new CorbaObjectReferenceHandler(objectName, objectIdlType,
objectTC, objectType);
- obj.setReference(objRef);
-
+ obj.setReference(objRef);
+
OutputStream oStream = orb.create_output_stream();
CorbaObjectWriter writer = new CorbaObjectWriter(oStream);
writer.writeObjectReference(obj);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
index 5c08bc9..b69ddeb 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReaderTest.java
@@ -27,51 +27,51 @@ import org.junit.Before;
import org.junit.Test;
public class CorbaStreamReaderTest extends Assert {
-
+
private CorbaStreamReader reader;
private CorbaTypeEventProducer mock;
-
+
@Before
public void setUp() throws Exception {
mock = EasyMock.createMock(CorbaTypeEventProducer.class);
reader = new CorbaStreamReader(mock);
}
-
+
@Test
public void testGetName() throws Exception {
EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
EasyMock.replay(mock);
assertEquals("checking getName ", new QName("http://foo.org", "test"), reader.getName());
}
-
+
@Test
public void testGetLocalName() throws Exception {
EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
EasyMock.replay(mock);
assertEquals("checking localName ", "test", reader.getLocalName());
}
-
+
@Test
public void testGetNamespaceURI() throws Exception {
EasyMock.expect(mock.getName()).andReturn(new QName("http://foo.org", "test"));
EasyMock.replay(mock);
- assertEquals("checking namespace ", "http://foo.org", reader.getNamespaceURI());
+ assertEquals("checking namespace ", "http://foo.org", reader.getNamespaceURI());
}
-
+
@Test
public void testGetText() throws Exception {
EasyMock.expect(mock.getText()).andReturn("abcdef");
EasyMock.replay(mock);
assertEquals("checking getText", "abcdef", reader.getText());
}
-
-
+
+
@Test
public void testGetTextCharacters() throws Exception {
EasyMock.expect(mock.getText()).andReturn("abcdef");
EasyMock.replay(mock);
- assertEquals("checking getTextCharacters",
+ assertEquals("checking getTextCharacters",
"abcdef",
new String(reader.getTextCharacters()));
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
index 53ccd61..44e89a3 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaStreamableTest.java
@@ -37,16 +37,16 @@ import org.omg.CORBA.portable.OutputStream;
public class CorbaStreamableTest extends Assert {
private static ORB orb;
-
-
+
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
-
+
props.put("yoko.orb.id", "CXF-CORBA-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -57,73 +57,73 @@ public class CorbaStreamableTest extends Assert {
}
}
}
-
+
@Test
public void testCreateStreamable() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "short", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_short);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
assertNotNull(streamable);
}
-
+
@Test
public void testGetStreamableAttributes() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "float", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_float);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
TypeCode type = streamable._type();
assertTrue(type.kind().value() == objTypeCode.kind().value());
-
+
CorbaPrimitiveHandler storedObj = (CorbaPrimitiveHandler)streamable.getObject();
assertNotNull(storedObj);
-
+
int mode = streamable.getMode();
assertTrue(mode == org.omg.CORBA.ARG_OUT.value);
-
+
String name = streamable.getName();
assertTrue(name.equals(objName.getLocalPart()));
}
-
+
@Test
public void testSetStreamableAttributes() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_boolean);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
+ CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
streamable.setMode(org.omg.CORBA.ARG_IN.value);
int mode = streamable.getMode();
assertTrue(mode == org.omg.CORBA.ARG_IN.value);
}
-
+
@Test
public void testReadStreamable() {
QName objName = new QName("object");
QName objIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "char", CorbaConstants.NP_WSDL_CORBA);
TypeCode objTypeCode = orb.get_primitive_tc(TCKind.tk_char);
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
- CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
-
+ CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
+
OutputStream oStream = orb.create_output_stream();
oStream.write_char('c');
-
+
InputStream iStream = oStream.create_input_stream();
streamable._read(iStream);
CorbaPrimitiveHandler streamableObj = (CorbaPrimitiveHandler)streamable.getObject();
Object o = streamableObj.getValue();
-
+
assertTrue(o instanceof Character);
Character charValue = (Character)o;
assertTrue(charValue.charValue() == 'c');
}
-
+
@Test
public void testWriteStreamable() {
QName objName = new QName("object");
@@ -132,10 +132,10 @@ public class CorbaStreamableTest extends Assert {
CorbaPrimitiveHandler obj = new CorbaPrimitiveHandler(objName, objIdlType, objTypeCode, null);
obj.setValueFromData("TestWString");
CorbaStreamable streamable = new CorbaStreamableImpl(obj, objName);
-
+
OutputStream oStream = orb.create_output_stream();
streamable._write(oStream);
-
+
InputStream iStream = oStream.create_input_stream();
String value = iStream.read_wstring();
assertEquals("TestWString", value);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
index ac42dfd..1ff2aca 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaAnyHandlerTest.java
@@ -44,7 +44,7 @@ public class CorbaAnyHandlerTest extends Assert {
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -53,7 +53,7 @@ public class CorbaAnyHandlerTest extends Assert {
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
@Test
@@ -66,7 +66,7 @@ public class CorbaAnyHandlerTest extends Assert {
QName anyIdlType = CorbaConstants.NT_CORBA_ANY;
TypeCode anyTC = orb.get_primitive_tc(TCKind.from_int(TCKind._tk_any));
CorbaTypeMap tm = new CorbaTypeMap(CorbaConstants.NU_WSDL_CORBA);
-
+
CorbaAnyHandler anyHandler = new CorbaAnyHandler(anyName, anyIdlType, anyTC, null);
anyHandler.setTypeMap(tm);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index db5b223..7555175 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -37,11 +37,11 @@ public class CorbaArrayHandlerTest extends Assert {
private QName objName;
private QName objIdlType;
private TypeCode objTypeCode;
-
-
+
+
@Before
public void setUp() throws Exception {
-
+
java.util.Properties props = System.getProperties();
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
@@ -50,7 +50,7 @@ public class CorbaArrayHandlerTest extends Assert {
objIdlType = null;
objTypeCode = null;
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index c5579be..abd776e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -41,7 +41,7 @@ public class CorbaEnumHandlerTest extends Assert {
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -52,13 +52,13 @@ public class CorbaEnumHandlerTest extends Assert {
}
}
}
-
+
@Test
public void testCorbaEnumHandler() {
Enum enumType = new Enum();
enumType.setName("EnumType");
enumType.setRepositoryID("IDL:EnumType:1.0");
-
+
Enumerator enumerator0 = new Enumerator();
enumerator0.setValue("ENUM0");
Enumerator enumerator1 = new Enumerator();
@@ -68,22 +68,22 @@ public class CorbaEnumHandlerTest extends Assert {
enumType.getEnumerator().add(enumerator0);
enumType.getEnumerator().add(enumerator1);
enumType.getEnumerator().add(enumerator2);
-
+
QName enumName = new QName("EnumType");
- QName enumIdlType =
+ QName enumIdlType =
new QName(CorbaConstants.NU_WSDL_CORBA, "EnumType", CorbaConstants.NP_WSDL_CORBA);
String members[] = new String[3];
members[0] = enumerator0.getValue();
members[1] = enumerator1.getValue();
members[2] = enumerator2.getValue();
TypeCode enumTC = orb.create_enum_tc(enumType.getRepositoryID(), enumType.getName(), members);
-
+
CorbaEnumHandler obj = new CorbaEnumHandler(enumName, enumIdlType, enumTC, enumType);
assertNotNull(obj);
-
+
obj.setValue(members[1]);
assertTrue(obj.getValue().equals(enumerator1.getValue()));
-
+
assertTrue(obj.getIndex() == 1);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
index db4be9c..a74a80b 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaFixedHandlerTest.java
@@ -34,7 +34,7 @@ import org.omg.CORBA.TypeCode;
public class CorbaFixedHandlerTest extends Assert {
private ORB orb;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
@@ -52,29 +52,29 @@ public class CorbaFixedHandlerTest extends Assert {
}
}
}
-
+
@Test
public void testCorbaFixedHandler() {
Fixed fixedType = new Fixed();
fixedType.setName("FixedType");
fixedType.setDigits(3);
fixedType.setScale(2);
-
+
QName fixedName = new QName(fixedType.getName());
- QName fixedIdlType =
+ QName fixedIdlType =
new QName(CorbaConstants.NU_WSDL_CORBA, "FixedType", CorbaConstants.NP_WSDL_CORBA);
TypeCode fixedTC = orb.create_fixed_tc((short)fixedType.getDigits(), (short)fixedType.getScale());
CorbaFixedHandler obj = new CorbaFixedHandler(fixedName, fixedIdlType, fixedTC, fixedType);
assertNotNull(obj);
-
+
java.math.BigDecimal value = new java.math.BigDecimal(123.45);
obj.setValue(value);
-
+
assertTrue(value.equals(obj.getValue()));
-
+
String valueData = obj.getValueData();
assertTrue(valueData.equals(value.toString()));
-
+
assertTrue(fixedType.getDigits() == obj.getDigits());
assertTrue(fixedType.getScale() == obj.getScale());
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
index b002a14..38b9816 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsTest.java
@@ -49,61 +49,61 @@ public class CorbaHandlerUtilsTest extends Assert {
CorbaTypeMap typeMap;
ServiceInfo service;
- private final String complexTypesNamespaceURI
+ private final String complexTypesNamespaceURI
= "http://cxf.apache.org/bindings/corba/ComplexTypes/idl_types";
- private final String complexTypesPrefix = "corbatm";
+ private final String complexTypesPrefix = "corbatm";
private ORB orb;
- private Bus bus;
-
-
+ private Bus bus;
+
+
@Before
public void setUp() throws Exception {
- bus = BusFactory.getDefaultBus();
- BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+ bus = BusFactory.getDefaultBus();
+ BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
factory = bfm.getBindingFactory("http://cxf.apache.org/bindings/corba");
- bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
+ bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
-
+
CorbaDestination destination = getDestination();
service = destination.getBindingInfo().getService();
- List<TypeMappingType> corbaTypes
- = service.getDescription().getExtensors(TypeMappingType.class);
+ List<TypeMappingType> corbaTypes
+ = service.getDescription().getExtensors(TypeMappingType.class);
typeMap = CorbaUtils.createCorbaTypeMap(corbaTypes);
}
-
+
protected CorbaDestination getDestination() throws Exception {
TestUtils testUtils = new TestUtils();
return testUtils.getComplexTypesTestDestination();
}
-
+
@After
public void tearDown() throws Exception {
- bus.shutdown(true);
+ bus.shutdown(true);
if (orb != null) {
try {
orb.destroy();
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
@Test
public void testCreateTypeHandler() {
QName objName = null;
QName objIdlType = null;
- CorbaObjectHandler result = null;
-
+ CorbaObjectHandler result = null;
+
// Test for an array handler
objName = new QName("object");
- objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
+ objIdlType = new QName(complexTypesNamespaceURI, "TestArray", complexTypesPrefix);
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaArrayHandler);
@@ -121,7 +121,7 @@ public class CorbaHandlerUtilsTest extends Assert {
// Test for a primitive handler
objName = new QName("object");
- objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
+ objIdlType = CorbaConstants.NT_CORBA_BOOLEAN;
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaPrimitiveHandler);
@@ -143,12 +143,12 @@ public class CorbaHandlerUtilsTest extends Assert {
result = CorbaHandlerUtils.createTypeHandler(orb, objName, objIdlType, typeMap);
assertTrue(result instanceof CorbaUnionHandler);
}
-
+
@Test
- public void testInitializeObjectHandler() {
+ public void testInitializeObjectHandler() {
QName objName = null;
QName objIdlType = null;
- CorbaObjectHandler result = null;
+ CorbaObjectHandler result = null;
// Test for an array handler
objName = new QName("object");
@@ -158,7 +158,7 @@ public class CorbaHandlerUtilsTest extends Assert {
CorbaArrayHandler arrayHandler = (CorbaArrayHandler)result;
// WSDL defines the array to have 5 elements
assertTrue(arrayHandler.getElements().size() == 5);
-
+
// Test for a sequence handler
objName = new QName("object");
@@ -170,7 +170,7 @@ public class CorbaHandlerUtilsTest extends Assert {
// element has been set.
assertTrue(seqHandler.getElements().size() == 0);
assertNotNull(seqHandler.getTemplateElement());
-
+
// Test for a bounded sequence handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestBoundedSequence", complexTypesPrefix);
@@ -179,7 +179,7 @@ public class CorbaHandlerUtilsTest extends Assert {
CorbaSequenceHandler boundedSeqHandler = (CorbaSequenceHandler)result;
// This is a bounded sequence with WSDL defining 5 elements.
assertTrue(boundedSeqHandler.getElements().size() == 5);
-
+
// Test for a struct handler
objName = new QName("object");
objIdlType = new QName(complexTypesNamespaceURI, "TestStruct", complexTypesPrefix);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java
index b83fde0..0b83085 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaHandlerUtilsYokoNSTest.java
@@ -26,10 +26,10 @@ import org.apache.cxf.binding.corba.TestUtils;
public class CorbaHandlerUtilsYokoNSTest extends CorbaHandlerUtilsTest {
-
+
protected CorbaDestination getDestination() throws Exception {
TestUtils testUtils = new TestUtils();
return testUtils.getComplexTypesTestDestinationYoko();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
index 0d761c8..886fdd3 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaObjectHandlerTest.java
@@ -39,12 +39,12 @@ public class CorbaObjectHandlerTest extends Assert {
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -55,7 +55,7 @@ public class CorbaObjectHandlerTest extends Assert {
}
}
}
-
+
@Test
public void testCreateCorbaObjectHandler() {
QName objName = new QName("object");
@@ -64,7 +64,7 @@ public class CorbaObjectHandlerTest extends Assert {
CorbaObjectHandler obj = new CorbaObjectHandler(objName, objIdlType, objTypeCode, null);
assertNotNull(obj);
}
-
+
@Test
public void testGetObjectAttributes() {
QName objName = new QName("object");
@@ -75,15 +75,15 @@ public class CorbaObjectHandlerTest extends Assert {
QName name = obj.getName();
assertNotNull(name);
assertTrue(name.equals(objName));
-
+
QName idlType = obj.getIdlType();
assertNotNull(idlType);
assertTrue(idlType.equals(objIdlType));
-
+
TypeCode tc = obj.getTypeCode();
assertNotNull(tc);
assertTrue(tc.kind().value() == objTypeCode.kind().value());
-
+
Object objDef = obj.getType();
assertNull(objDef);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
index 2ce5065..0ed66ab 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandlerTest.java
@@ -33,14 +33,14 @@ import org.omg.CORBA.TCKind;
public class CorbaPrimitiveHandlerTest extends Assert {
private ORB orb;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -55,17 +55,17 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaBoolean() {
Boolean val = Boolean.FALSE;
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("boolean"),
CorbaConstants.NT_CORBA_BOOLEAN,
orb.get_primitive_tc(TCKind.tk_boolean),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
-
+
obj.setValue(val);
Object resultObj = obj.getValue();
assertNotNull(resultObj);
@@ -73,17 +73,17 @@ public class CorbaPrimitiveHandlerTest extends Assert {
Boolean boolResult = (Boolean)resultObj;
assertTrue(boolResult.booleanValue() == val.booleanValue());
}
-
+
@Test
public void testCreateCorbaChararacter() {
Character val = new Character('c');
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("char"),
CorbaConstants.NT_CORBA_CHAR,
orb.get_primitive_tc(TCKind.tk_char),
null);
assertNotNull(obj);
-
+
//CXF corba maps the XML char type to a Byte so we need to provide the string data as a Byte value
Byte byteValue = new Byte((byte)val.charValue());
obj.setValueFromData(byteValue.toString());
@@ -99,19 +99,19 @@ public class CorbaPrimitiveHandlerTest extends Assert {
assertTrue(resultObj instanceof Character);
Character charResult = (Character)resultObj;
assertTrue(charResult.charValue() == val.charValue());
-
+
}
@Test
public void testCreateCorbaWChararacter() {
Character val = new Character('w');
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("wchar"),
CorbaConstants.NT_CORBA_WCHAR,
orb.get_primitive_tc(TCKind.tk_wchar),
null);
assertNotNull(obj);
-
+
obj.setValueFromData("w");
String result = obj.getDataFromValue();
assertTrue(val.charValue() == result.charAt(0));
@@ -127,13 +127,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaOctet() {
Byte val = new Byte((byte)100);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("octet"),
CorbaConstants.NT_CORBA_OCTET,
orb.get_primitive_tc(TCKind.tk_octet),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -145,17 +145,17 @@ public class CorbaPrimitiveHandlerTest extends Assert {
Byte byteResult = (Byte)resultObj;
assertTrue(byteResult.byteValue() == val.byteValue());
}
-
+
@Test
public void testCreateCorbaShort() {
Short val = new Short((short)1234);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("short"),
CorbaConstants.NT_CORBA_SHORT,
orb.get_primitive_tc(TCKind.tk_short),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -171,13 +171,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaUShort() {
Short val = new Short((short)4321);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("ushort"),
CorbaConstants.NT_CORBA_USHORT,
orb.get_primitive_tc(TCKind.tk_ushort),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -193,13 +193,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaLong() {
Integer val = new Integer(123456);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("long"),
CorbaConstants.NT_CORBA_LONG,
orb.get_primitive_tc(TCKind.tk_long),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -215,13 +215,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaULong() {
Integer val = new Integer(654321);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("ulong"),
CorbaConstants.NT_CORBA_ULONG,
orb.get_primitive_tc(TCKind.tk_ulong),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -237,13 +237,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaLongLong() {
Long val = new Long(123456789);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("longlong"),
CorbaConstants.NT_CORBA_LONGLONG,
orb.get_primitive_tc(TCKind.tk_longlong),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -259,13 +259,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaULongLong() {
Long val = new Long(987654321);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("ulonglong"),
CorbaConstants.NT_CORBA_ULONGLONG,
orb.get_primitive_tc(TCKind.tk_ulonglong),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -281,13 +281,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaFloat() {
Float val = new Float(1234.56);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("float"),
CorbaConstants.NT_CORBA_FLOAT,
orb.get_primitive_tc(TCKind.tk_float),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -303,13 +303,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaDouble() {
Double val = new Double(123456.789);
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("double"),
CorbaConstants.NT_CORBA_DOUBLE,
orb.get_primitive_tc(TCKind.tk_double),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.toString().equals(result));
@@ -325,13 +325,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaString() {
String val = "Test String";
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("string"),
CorbaConstants.NT_CORBA_STRING,
orb.get_primitive_tc(TCKind.tk_string),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.equals(result));
@@ -347,13 +347,13 @@ public class CorbaPrimitiveHandlerTest extends Assert {
@Test
public void testCreateCorbaWString() {
String val = "Test Wide String";
- CorbaPrimitiveHandler obj =
+ CorbaPrimitiveHandler obj =
new CorbaPrimitiveHandler(new QName("wstring"),
CorbaConstants.NT_CORBA_WSTRING,
orb.get_primitive_tc(TCKind.tk_wstring),
null);
assertNotNull(obj);
-
+
obj.setValueFromData(val.toString());
String result = obj.getDataFromValue();
assertTrue(val.equals(result));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index cf41815..b5dd884 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -39,14 +39,14 @@ public class CorbaSequenceHandlerTest extends Assert {
private QName objName;
private QName objIdlType;
private TypeCode objTypeCode;
-
-
+
+
@Before
public void setUp() throws Exception {
-
+
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
obj = null;
@@ -54,7 +54,7 @@ public class CorbaSequenceHandlerTest extends Assert {
objIdlType = null;
objTypeCode = null;
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
index 2539a65..abaaa34 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaStructHandlerTest.java
@@ -35,20 +35,20 @@ import org.omg.CORBA.StructMember;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
-// Since the exception handler is essentially the same as the struct handler (just included in case
+// Since the exception handler is essentially the same as the struct handler (just included in case
// structs and exceptions diverge at a later date), this test should cover both.
public class CorbaStructHandlerTest extends Assert {
private ORB orb;
-
-
+
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -59,7 +59,7 @@ public class CorbaStructHandlerTest extends Assert {
}
}
}
-
+
@Test
public void testCorbaStructHandler() {
Struct structType = new Struct();
@@ -71,31 +71,31 @@ public class CorbaStructHandlerTest extends Assert {
MemberType member1 = new MemberType();
member1.setIdltype(CorbaConstants.NT_CORBA_STRING);
member1.setName("member1");
-
+
QName structName = new QName("TestStruct");
- QName structIdlType =
+ QName structIdlType =
new QName(CorbaConstants.NU_WSDL_CORBA, "testStruct", CorbaConstants.NP_WSDL_CORBA);
StructMember[] structMembers = new StructMember[2];
- structMembers[0] = new StructMember("member0",
+ structMembers[0] = new StructMember("member0",
orb.get_primitive_tc(TCKind.tk_long),
null);
- structMembers[1] = new StructMember("member1",
+ structMembers[1] = new StructMember("member1",
orb.get_primitive_tc(TCKind.tk_string),
null);
- TypeCode structTC = orb.create_struct_tc(structType.getRepositoryID(),
+ TypeCode structTC = orb.create_struct_tc(structType.getRepositoryID(),
structType.getName(),
structMembers);
-
+
CorbaStructHandler obj = new CorbaStructHandler(structName, structIdlType, structTC, structType);
assertNotNull(obj);
-
+
CorbaPrimitiveHandler objMember0 = new CorbaPrimitiveHandler(new QName(member0.getName()),
member0.getIdltype(),
orb.get_primitive_tc(TCKind.tk_long),
null);
assertNotNull(objMember0);
obj.addMember(objMember0);
-
+
CorbaPrimitiveHandler objMember1 = new CorbaPrimitiveHandler(new QName(member1.getName()),
member1.getIdltype(),
orb.get_primitive_tc(TCKind.tk_string),
@@ -105,19 +105,19 @@ public class CorbaStructHandlerTest extends Assert {
int memberSize = obj.getMembers().size();
assertTrue(memberSize == 2);
-
+
QName nameResult = obj.getName();
assertTrue(structName.equals(nameResult));
-
+
QName idlTypeResult = obj.getIdlType();
assertTrue(structIdlType.equals(idlTypeResult));
-
+
CorbaObjectHandler member0Result = obj.getMemberByName("member0");
assertNotNull(member0Result);
assertTrue(member0Result.getName().equals(objMember0.getName()));
-
+
CorbaObjectHandler member1Result = obj.getMember(1);
assertNotNull(member1Result);
- assertTrue(member1Result.getName().equals(objMember1.getName()));
+ assertTrue(member1Result.getName().equals(objMember1.getName()));
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
index d92d754..886534e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/ContextUtilsTest.java
@@ -31,13 +31,13 @@ import org.junit.Test;
* Holder for utility methods relating to contexts.
*/
public final class ContextUtilsTest extends Assert {
-
+
@Test
public void testIsRequestor() throws Exception {
Message message = new MessageImpl();
message.put("org.apache.cxf.client", "org.apache.cxf.client");
- assertEquals(ContextUtils.isRequestor(message), true);
+ assertEquals(ContextUtils.isRequestor(message), true);
}
@Test
@@ -46,9 +46,9 @@ public final class ContextUtilsTest extends Assert {
Exchange exchange = new ExchangeImpl();
exchange.setOutMessage(message);
message.setExchange(exchange);
-
+
assertEquals(ContextUtils.isOutbound(message), true);
}
}
-
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
index 6b0a6e9..d063ac4 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/utils/CorbaUtilsTest.java
@@ -37,14 +37,14 @@ import org.omg.CORBA.TypeCode;
public class CorbaUtilsTest extends Assert {
private static ORB orb;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
+
@After
public void tearDown() throws Exception {
if (orb != null) {
@@ -55,7 +55,7 @@ public class CorbaUtilsTest extends Assert {
}
}
}
-
+
@Test
public void testBooleanTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "boolean", "corba");
@@ -64,7 +64,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_boolean);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testCharTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "char", "corba");
@@ -73,7 +73,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_char);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testWCharTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "wchar", "corba");
@@ -82,7 +82,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_wchar);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testOctetTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "octet", "corba");
@@ -91,7 +91,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_octet);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testShortTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "short", "corba");
@@ -100,7 +100,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_short);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testUShortTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ushort", "corba");
@@ -109,7 +109,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_ushort);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "long", "corba");
@@ -118,7 +118,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_long);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testULongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ulong", "corba");
@@ -127,7 +127,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_ulong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testLongLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "longlong", "corba");
@@ -136,7 +136,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_longlong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testULongLongTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "ulonglong", "corba");
@@ -145,7 +145,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_ulonglong);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testFloatTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "float", "corba");
@@ -154,7 +154,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_float);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testDoubleTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "double", "corba");
@@ -163,7 +163,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_double);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testStringTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "string", "corba");
@@ -172,7 +172,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_string);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testWStringTypeCode() {
QName type = new QName(CorbaConstants.NU_WSDL_CORBA, "wstring", "corba");
@@ -181,7 +181,7 @@ public class CorbaUtilsTest extends Assert {
assertTrue(tc.kind().value() == TCKind._tk_wstring);
assertTrue(CorbaUtils.isPrimitiveIdlType(type));
}
-
+
@Test
public void testErrorConditionNullTypeQName() {
try {
@@ -190,24 +190,24 @@ public class CorbaUtilsTest extends Assert {
} catch (CorbaBindingException expected) {
//ignore
}
-
+
CorbaTypeMap typeMap = new CorbaTypeMap("dud:namespace");
QName seen = new QName("bla", "Bla");
- Stack<QName> seenTypes = new Stack<QName>();
+ Stack<QName> seenTypes = new Stack<QName>();
seenTypes.add(seen);
try {
CorbaUtils.getTypeCode(orb, null, typeMap, seenTypes);
fail("expect exception on null type");
- } catch (CorbaBindingException expected) {
+ } catch (CorbaBindingException expected) {
assertTrue("enclosed type is present",
expected.getMessage().indexOf(seen.toString()) != -1);
}
-
+
CorbaType ctype = new CorbaType();
try {
CorbaUtils.getTypeCode(orb, null, ctype, typeMap);
fail("expect exception on null type");
- } catch (CorbaBindingException expected) {
+ } catch (CorbaBindingException expected) {
assertTrue("enclosed corba type is present",
expected.getMessage().indexOf(ctype.toString()) != -1);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
index 2ff077d..b112b26 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SOAPBindingUtil.java
@@ -90,7 +90,7 @@ public final class SOAPBindingUtil {
proxy = Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(),
new Class[] {cls}, ih);
} catch (Throwable ex) {
- // Using cls classloader as a fallback to make it work within OSGi
+ // Using cls classloader as a fallback to make it work within OSGi
ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
if (contextLoader != cls.getClassLoader()) {
proxy = Proxy.newProxyInstance(cls.getClassLoader(),
@@ -336,7 +336,7 @@ public final class SOAPBindingUtil {
String bindingStyle = "";
String previousOpStyle = "";
String style = "";
-
+
for (Object obj : binding.getExtensibilityElements()) {
if (isSOAPBinding(obj)) {
SoapBinding soapBinding = getSoapBinding(obj);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
index 10ee250..a58e467 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap11.java
@@ -23,10 +23,10 @@ import javax.xml.namespace.QName;
/**
* Singleton object that represents the SOAP 1.1 VERSION.
- *
+ *
*/
public final class Soap11 implements SoapVersion {
-
+
// some constants that don't fit into the SoapVersion paradigm.
public static final String SOAP_NAMESPACE = "http://schemas.xmlsoap.org/soap/envelope/";
public static final String SOAP_ENCODING_URI = "http://schemas.xmlsoap.org/soap/encoding/";
@@ -50,7 +50,7 @@ public final class Soap11 implements SoapVersion {
private static final String NONE_ROLE = SOAP_NAMESPACE + "/role/none";
private static final String ULTIMATE_RECEIVER_ROLE = SOAP_NAMESPACE + "/role/ultimateReceiver";
-
+
private static final String NEXT_ROLE = "http://schemas.xmlsoap.org/soap/actor/next";
private static final String SOAP_ENCODING_STYLE = SOAP_ENCODING_URI;
@@ -61,12 +61,12 @@ public final class Soap11 implements SoapVersion {
private final QName body = new QName(SOAP_NAMESPACE, "Body");
- private final QName fault = new QName(SOAP_NAMESPACE, "Fault");
+ private final QName fault = new QName(SOAP_NAMESPACE, "Fault");
private Soap11() {
- // Singleton
+ // Singleton
}
-
+
public static Soap11 getInstance() {
return INSTANCE;
@@ -129,7 +129,7 @@ public final class Soap11 implements SoapVersion {
public String getAttrValueMustUnderstand(boolean value) {
return value ? "1" : "0";
}
-
+
public QName getReceiver() {
return new QName(SOAP_NAMESPACE, "Server");
}
@@ -150,7 +150,7 @@ public final class Soap11 implements SoapVersion {
// There is no such fault code in soap11
return null;
}
-
+
public String getContentType() {
return "text/xml";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
index c57844c..bc5d9c5 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/Soap12.java
@@ -23,11 +23,11 @@ import javax.xml.namespace.QName;
/**
* Represents the SOAP 1.2 version
- *
+ *
*/
public final class Soap12 implements SoapVersion {
public static final String SOAP_NAMESPACE = "http://www.w3.org/2003/05/soap-envelope";
-
+
private static final Soap12 INSTANCE = new Soap12();
private static final double VERSION = 1.2;
@@ -49,9 +49,9 @@ public final class Soap12 implements SoapVersion {
private final QName fault = new QName(SOAP_NAMESPACE, "Fault");
private Soap12() {
- // Singleton
+ // Singleton
}
-
+
public static Soap12 getInstance() {
return INSTANCE;
}
@@ -82,7 +82,7 @@ public final class Soap12 implements SoapVersion {
public QName getFault() {
return fault;
}
-
+
public String getSoapEncodingStyle() {
return SOAP_ENCODING_STYLE;
}
@@ -100,7 +100,7 @@ public final class Soap12 implements SoapVersion {
public String getNextRole() {
return NEXT_ROLE;
}
-
+
public String getAttrNameRole() {
return "role";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
index fa8df8f..fda0492 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBinding.java
@@ -25,19 +25,19 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.service.model.BindingInfo;
public class SoapBinding extends AbstractBasicInterceptorProvider implements Binding {
-
+
private SoapVersion version;
private BindingInfo bindingInfo;
-
+
public SoapBinding(BindingInfo info) {
this(info, Soap11.getInstance());
}
-
+
public SoapBinding(BindingInfo info, SoapVersion v) {
- version = v;
+ version = v;
bindingInfo = info;
}
-
+
public BindingInfo getBindingInfo() {
return bindingInfo;
}
@@ -49,7 +49,7 @@ public class SoapBinding extends AbstractBasicInterceptorProvider implements Bin
public SoapVersion getSoapVersion() {
return version;
}
-
+
public Message createMessage() {
SoapMessage soapMessage = new SoapMessage(version);
soapMessage.put(Message.CONTENT_TYPE, soapMessage.getVersion().getContentType());
@@ -58,11 +58,11 @@ public class SoapBinding extends AbstractBasicInterceptorProvider implements Bin
public Message createMessage(Message m) {
SoapMessage soapMessage = new SoapMessage(m);
- if (m.getExchange() != null) {
+ if (m.getExchange() != null) {
if (m.getExchange().getInMessage() instanceof SoapMessage) {
soapMessage.setVersion(((SoapMessage)m.getExchange().getInMessage()).getVersion());
} else {
- soapMessage.setVersion(version);
+ soapMessage.setVersion(version);
}
} else {
soapMessage.setVersion(version);
@@ -71,7 +71,7 @@ public class SoapBinding extends AbstractBasicInterceptorProvider implements Bin
if (!soapMessage.containsKey(Message.CONTENT_TYPE)) {
soapMessage.put(Message.CONTENT_TYPE, soapMessage.getVersion().getContentType());
}
-
+
return soapMessage;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
index d3ce15e..6a6f857 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConfiguration.java
@@ -37,11 +37,11 @@ public class SoapBindingConfiguration extends BindingConfiguration {
private boolean mtomEnabled;
private QName bindingName;
private String bindingNamePostfix = "SoapBinding";
-
+
public SoapBindingConfiguration() {
-
+
}
-
+
@Override
public String getBindingId() {
@@ -73,7 +73,7 @@ public class SoapBindingConfiguration extends BindingConfiguration {
public boolean isSetStyle() {
return style != null;
}
-
+
public String getStyle() {
return style == null ? "document" : style;
}
@@ -109,7 +109,7 @@ public class SoapBindingConfiguration extends BindingConfiguration {
public void setMtomEnabled(boolean mtomEnabled) {
this.mtomEnabled = mtomEnabled;
}
-
+
public QName getBindingName(ServiceInfo si) {
if (bindingName == null) {
return new QName(si.getName().getNamespaceURI(),
@@ -121,17 +121,17 @@ public class SoapBindingConfiguration extends BindingConfiguration {
public QName getBindingName() {
return bindingName;
}
-
+
public void setBindingName(QName b) {
bindingName = b;
}
-
+
public String getBindingNamePostfix() {
return bindingNamePostfix;
}
-
+
public void setBindingNamePostfix(String b) {
bindingNamePostfix = b;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
index 6586af5..7d122d9 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingConstants.java
@@ -22,14 +22,14 @@ package org.apache.cxf.binding.soap;
public final class SoapBindingConstants {
public static final String BINDING_STYLE_RPC = "rpc";
public static final String BINDING_STYLE_DOC = "document";
-
+
public static final String PARAMETER_STYLE_BARE = "bare";
public static final String PARAMETER_STYLE_WRAPPED = "wrapped";
-
+
public static final String SOAP_ACTION = "SOAPAction";
public static final String SOAP11_BINDING_ID = "http://schemas.xmlsoap.org/soap/";
public static final String SOAP12_BINDING_ID = "http://schemas.xmlsoap.org/wsdl/soap12/";
-
+
private SoapBindingConstants() {
//utility class
}