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:21 UTC
[16/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java
index e51476a..a9344fc 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveArrayEventProducer.java
@@ -22,7 +22,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.omg.CORBA.ORB;
public class CorbaPrimitiveArrayEventProducer extends AbstractNoStartEndEventProducer {
-
+
// No start and end elements for the array
public CorbaPrimitiveArrayEventProducer(CorbaObjectHandler h,
ServiceInfo service,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
index 99a299d..37dad36 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
@@ -27,23 +27,23 @@ import org.omg.CORBA.TypeCode;
public class CorbaPrimitiveHandler extends CorbaObjectHandler {
- private static final int UNSIGNED_MAX = 256;
+ private static final int UNSIGNED_MAX = 256;
private Object value;
private String valueAsString;
private boolean objectSet;
private Any any;
-
+
public CorbaPrimitiveHandler(QName primName, QName primIdlType, TypeCode primTC, Object primType) {
super(primName, primIdlType, primTC, primType);
}
-
+
public Object getValue() {
return value;
}
public Any getAny() {
return any;
}
-
+
public void setIntoAny(Any val, CorbaStreamable stream, boolean output) {
any = val;
if (stream != null) {
@@ -94,7 +94,7 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
any.insert_wstring((String)value);
break;
default:
- // Default: assume that whatever stored the data will also know how to convert it into what
+ // Default: assume that whatever stored the data will also know how to convert it into what
// it needs.
}
}
@@ -125,8 +125,8 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
case TCKind._tk_char:
char charValue = ((Character)value).charValue();
// outside the normal range it will -256
- data = Byte.toString((byte)(charValue > Byte.MAX_VALUE
- ? charValue - UNSIGNED_MAX
+ data = Byte.toString((byte)(charValue > Byte.MAX_VALUE
+ ? charValue - UNSIGNED_MAX
: charValue));
break;
case TCKind._tk_wchar:
@@ -176,14 +176,14 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
data = (String)value;
break;
default:
- // Default: assume that whatever stored the data will also know how to convert it into what
+ // Default: assume that whatever stored the data will also know how to convert it into what
// it needs.
data = value.toString();
}
valueAsString = data;
return data;
}
-
+
public void setValueFromData(String data) {
Object obj = null;
switch (typeCode.kind().value()) {
@@ -193,10 +193,10 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
case TCKind._tk_char:
// A char is mapped to a byte, we need it as a character
Byte byteValue = Byte.valueOf(data);
- // for values < 0 + 256
+ // for values < 0 + 256
// This means that we can directly write out the chars in the normal
// range 0-127 even when using UTF-8
- obj = Character.valueOf((char)(byteValue.byteValue() < 0
+ obj = Character.valueOf((char)(byteValue.byteValue() < 0
? byteValue.byteValue() + UNSIGNED_MAX
: byteValue.byteValue()));
break;
@@ -267,8 +267,8 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
case TCKind._tk_char:
char charValue = any.extract_char();
// outside the normal range it will -256
- data = Byte.toString((byte)(charValue > Byte.MAX_VALUE
- ? charValue - UNSIGNED_MAX
+ data = Byte.toString((byte)(charValue > Byte.MAX_VALUE
+ ? charValue - UNSIGNED_MAX
: charValue));
break;
case TCKind._tk_wchar:
@@ -330,7 +330,7 @@ public class CorbaPrimitiveHandler extends CorbaObjectHandler {
valueAsString = data;
return data;
}
-
+
public void clear() {
value = null;
objectSet = false;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java
index d91f219..1e01321 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveListener.java
@@ -22,8 +22,8 @@ public class CorbaPrimitiveListener extends AbstractCorbaTypeListener {
public CorbaPrimitiveListener(CorbaObjectHandler handler) {
super(handler);
- }
-
+ }
+
public void processCharacters(String text) {
((CorbaPrimitiveHandler) handler).setValueFromData(text);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
index ea5f091..0753437 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveSequenceEventProducer.java
@@ -23,7 +23,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.omg.CORBA.ORB;
public class CorbaPrimitiveSequenceEventProducer extends AbstractNoStartEndEventProducer {
-
+
// No start and end elements for the sequence
public CorbaPrimitiveSequenceEventProducer(CorbaObjectHandler h,
ServiceInfo service,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
index f8c55c4..7cb0d46 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveTypeEventProducer.java
@@ -37,7 +37,7 @@ public class CorbaPrimitiveTypeEventProducer implements CorbaTypeEventProducer {
name = handler.getName();
}
- public String getLocalName() {
+ public String getLocalName() {
return handler.getSimpleName();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java
index 2d0ad23..e1e9ae0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandler.java
@@ -30,29 +30,29 @@ public class CorbaSequenceHandler extends CorbaObjectHandler {
private List<CorbaObjectHandler> elements = new ArrayList<>();
private CorbaObjectHandler templateElement;
private boolean hasRecursiveTypeElement;
-
+
public CorbaSequenceHandler(QName seqName, QName seqIdlType, TypeCode seqTC, Object seqType) {
super(seqName, seqIdlType, seqTC, seqType);
hasRecursiveTypeElement = false;
}
-
+
public void addElement(CorbaObjectHandler el) {
elements.add(el);
}
-
+
public int getNumberOfElements() {
return elements.size();
}
-
+
public List<CorbaObjectHandler> getElements() {
return elements;
}
-
+
public CorbaObjectHandler getElement(int index) {
return elements.get(index);
}
-
- // These handle the case where we have an unbounded sequence and we need to
+
+ // These handle the case where we have an unbounded sequence and we need to
// construct Corba objects during the reading of an object.
public CorbaObjectHandler getTemplateElement() {
return templateElement;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
index a84a80b..0433e1a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaSequenceListener.java
@@ -39,7 +39,7 @@ public class CorbaSequenceListener extends AbstractCorbaTypeListener {
public CorbaSequenceListener(CorbaObjectHandler handler,
CorbaTypeMap map,
- ORB orbRef,
+ ORB orbRef,
ServiceInfo sInfo) {
super(handler);
value = (CorbaSequenceHandler) handler;
@@ -61,7 +61,7 @@ public class CorbaSequenceListener extends AbstractCorbaTypeListener {
elementName,
seqElementType,
typeMap,
- serviceInfo);
+ serviceInfo);
value.setTemplateElement(template);
}
@@ -95,7 +95,7 @@ public class CorbaSequenceListener extends AbstractCorbaTypeListener {
public void processCharacters(String text) {
if (currentTypeListener == null) {
// primitive sequence
- CorbaTypeListener primitiveListener =
+ CorbaTypeListener primitiveListener =
CorbaHandlerUtils.getTypeListener(value.getName(),
seqElementType,
typeMap,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
index e5c0462..d0dca8e 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructEventProducer.java
@@ -33,14 +33,14 @@ public class CorbaStructEventProducer extends AbstractStartEndEventProducer {
iterator = handler.members.iterator();
serviceInfo = service;
orb = orbRef;
- if (handler.members.isEmpty()
+ if (handler.members.isEmpty()
&& handler.getSimpleName().equals(handler.getIdlType().getLocalPart() + "_f")) {
state = states.length;
}
}
- public int next() {
+ public int next() {
int event = states[state];
if (event != 0) {
state++;
@@ -73,12 +73,12 @@ public class CorbaStructEventProducer extends AbstractStartEndEventProducer {
currentEventProducer = new CorbaPrimitiveArrayEventProducer(obj, serviceInfo, orb);
}
}
- } else if (obj.getSimpleName().equals(obj.getIdlType().getLocalPart() + "_f")) {
+ } else if (obj.getSimpleName().equals(obj.getIdlType().getLocalPart() + "_f")) {
//some "special cases" we need to make sure are mapped correctly
currentEventProducer =
CorbaHandlerUtils.getTypeEventProducer(obj, serviceInfo, orb);
-
+
} else {
currentEventProducer =
CorbaHandlerUtils.getTypeEventProducer(obj, serviceInfo, orb);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java
index 0f65fe1..a0151b8 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructHandler.java
@@ -29,26 +29,26 @@ import org.omg.CORBA.TypeCode;
public class CorbaStructHandler extends CorbaObjectHandler {
List<CorbaObjectHandler> members = new ArrayList<>();
-
+
public CorbaStructHandler(QName structName, QName structIdlType, TypeCode structTC, Object structType) {
super(structName, structIdlType, structTC, structType);
}
-
+
public void addMember(CorbaObjectHandler member) {
members.add(member);
}
-
+
public List<CorbaObjectHandler> getMembers() {
return members;
}
-
+
public CorbaObjectHandler getMember(int index) {
return members.get(index);
}
-
+
public CorbaObjectHandler getMemberByName(String name) {
CorbaObjectHandler member = null;
-
+
for (Iterator<CorbaObjectHandler> iterator = members.iterator(); iterator.hasNext();) {
CorbaObjectHandler current = iterator.next();
if (current.getName().getLocalPart().equals(name)) {
@@ -56,7 +56,7 @@ public class CorbaStructHandler extends CorbaObjectHandler {
break;
}
}
-
+
return member;
}
@@ -64,5 +64,5 @@ public class CorbaStructHandler extends CorbaObjectHandler {
for (int i = 0; i < members.size(); i++) {
members.get(i).clear();
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
index b498817..28cd7a0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaStructListener.java
@@ -153,10 +153,10 @@ public class CorbaStructListener extends AbstractCorbaTypeListener {
} else {
if ("type".equals(localName)
&& "http://www.w3.org/2001/XMLSchema-instance".equals(namespaceURI)) {
-
+
String pfx = value.substring(0, value.indexOf(":"));
String ns = ctx.getNamespaceURI(pfx);
- QName qn = new QName(ns,
+ QName qn = new QName(ns,
value.substring(value.indexOf(":") + 1));
CorbaTypeListener l = CorbaHandlerUtils.getTypeListener(qn,
qn,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
index 41845c7..fd6a8fb 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeEventProducer.java
@@ -26,24 +26,24 @@ import javax.xml.stream.events.Attribute;
import javax.xml.stream.events.Namespace;
public interface CorbaTypeEventProducer {
-
+
boolean hasNext();
-
- /*
+
+ /*
* return the current event
- */
+ */
int next();
-
+
/*
* qname of current content
*/
QName getName();
-
+
/*
* local name of current content
*/
- String getLocalName();
-
+ String getLocalName();
+
/*
* text of current content
*/
@@ -57,6 +57,6 @@ public interface CorbaTypeEventProducer {
/*
* return any namespace for the current type
*/
- List<Namespace> getNamespaces();
+ List<Namespace> getNamespaces();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java
index f78ad55..db5ce49 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaTypeListener.java
@@ -25,7 +25,7 @@ import javax.xml.namespace.QName;
public interface CorbaTypeListener {
void setNamespaceContext(NamespaceContext ctx);
-
+
void processStartElement(QName name);
void processEndElement(QName name);
void processCharacters(String text);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java
index 268eada..f46ac23 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionEventProducer.java
@@ -43,14 +43,14 @@ public class CorbaUnionEventProducer extends AbstractStartEndEventProducer {
CorbaUnionHandler handler = (CorbaUnionHandler) h;
serviceInfo = sInfo;
orb = o;
- name = handler.getName();
+ name = handler.getName();
isNil = checkIsNil(handler);
if (!isNil) {
CorbaObjectHandler contents = handler.getValue();
- if (contents != null) {
+ if (contents != null) {
Union unionType = (Union)handler.getType();
if (unionType.isSetNillable() && unionType.isNillable()) {
- CorbaTypeEventProducer contentEventProducer =
+ CorbaTypeEventProducer contentEventProducer =
CorbaHandlerUtils.getTypeEventProducer(contents, serviceInfo, orb);
currentEventProducer = new SkipStartEndEventProducer(contentEventProducer, name);
} else {
@@ -77,7 +77,7 @@ public class CorbaUnionEventProducer extends AbstractStartEndEventProducer {
}
return isItNil;
}
-
+
public List<Attribute> getAttributes() {
List<Attribute> attributes = IS_NIL_ATTRIBUTE_LIST;
if (!isNil) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
index c51105c..f7de2e1 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionHandler.java
@@ -43,8 +43,8 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
public CorbaUnionHandler(QName unionName, QName unionIdlType, TypeCode unionTC, Object unionType) {
super(unionName, unionIdlType, unionTC, unionType);
-
- // Build a list of labels. This will be used to generate a discriminator value for the
+
+ // Build a list of labels. This will be used to generate a discriminator value for the
// default case (since we are not provided with one from the Stax stream of the Celtix object)
Union union = (Union)unionType;
List<Unionbranch> branches = union.getUnionbranch();
@@ -60,15 +60,15 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
labels.add(ct.getLabel());
}
}
-
+
index++;
}
}
-
+
public CorbaObjectHandler getDiscriminator() {
return discriminator;
}
-
+
public String getDisciminatorValueData() {
String result = null;
// The discriminator is handled by either the enum handler or the primitive handler.
@@ -79,13 +79,13 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
CorbaPrimitiveHandler primitiveHandler = (CorbaPrimitiveHandler)discriminator;
result = primitiveHandler.getDataFromValue();
}
- return result;
+ return result;
}
-
+
public void setDiscriminator(CorbaObjectHandler disc) {
discriminator = disc;
}
-
+
public void setDiscriminatorValueFromData(String data) {
// The discriminator is handled by either the enum handler or the primitive handler.
if (discriminator.getTypeCodeKind().value() == TCKind._tk_enum) {
@@ -96,11 +96,11 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
primitiveHandler.setValueFromData(data);
}
}
-
+
public List<CorbaObjectHandler> getCases() {
return cases;
}
-
+
public CorbaObjectHandler getBranchByName(String caseName) {
for (Iterator<CorbaObjectHandler> caseIter = cases.iterator(); caseIter.hasNext();) {
CorbaObjectHandler obj = caseIter.next();
@@ -108,35 +108,35 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
return obj;
}
}
-
+
return null;
}
-
+
public void addCase(CorbaObjectHandler unionCase) {
cases.add(unionCase);
}
-
+
public CorbaObjectHandler getValue() {
return value;
}
-
+
public void setValue(String caseName, CorbaObjectHandler val) {
value = val;
}
-
+
public int getDefaultIndex() {
return defaultIndex;
}
-
+
public String createDefaultDiscriminatorLabel() {
String label = null;
- // According to the CORBA specification, an enumeration discriminator can be one of the
+ // According to the CORBA specification, an enumeration discriminator can be one of the
// following types:
// - *integer* (short, long, ulong, either signed or unsigned)
// - boolean
// - character
// - enumeration
- // So when we need to create a default discriminator to accomodate for the lack of a
+ // So when we need to create a default discriminator to accomodate for the lack of a
// discriminator from, these are the four cases we must check for.
if (discriminator.getTypeCodeKind().value() == TCKind._tk_boolean) {
// We can only have a default case with a boolean discriminator if we have
@@ -160,14 +160,14 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
}
} else if (discriminator.getTypeCodeKind().value() == TCKind._tk_enum) {
// Get the list of possible enumerations in the enumerator and compare these to the
- // labels we obtained from the Union definition. In order for the union/enum
+ // labels we obtained from the Union definition. In order for the union/enum
// combination to be syntactically correct, there must be one enumeration not included
// as a case for the default case to be valid.
Enum enumType = (Enum)discriminator.getType();
List<Enumerator> enumerators = enumType.getEnumerator();
if (labels.isEmpty()) {
// Any value will do since we only have a default case.
- label = enumerators.get(0).getValue();
+ label = enumerators.get(0).getValue();
} else {
String enumLabel = null;
for (Iterator<Enumerator> enumIter = enumerators.iterator(); enumIter.hasNext();) {
@@ -187,7 +187,7 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
if (!labels.contains(String.valueOf(i))) {
label = String.valueOf(i);
break;
- }
+ }
}
} else if ((discriminator.getTypeCodeKind().value() == TCKind._tk_long)
|| (discriminator.getTypeCodeKind().value() == TCKind._tk_ulong)) {
@@ -198,7 +198,7 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
if (!labels.contains(String.valueOf(i))) {
label = String.valueOf(i);
break;
- }
+ }
}
}
return label;
@@ -206,10 +206,10 @@ public class CorbaUnionHandler extends CorbaObjectHandler {
public void clear() {
if (discriminator != null) {
- discriminator.clear();
+ discriminator.clear();
}
if (value != null) {
value.clear();
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java
index 504c8c8..0a48805 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaUnionListener.java
@@ -48,12 +48,12 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
serviceInfo = sInfo;
orb = oorb;
unionType = (Union) handler.getType();
- branches = unionType.getUnionbranch();
+ branches = unionType.getUnionbranch();
}
public void processStartElement(QName name) {
if (currentTypeListener == null) {
- for (Unionbranch branch : branches) {
+ for (Unionbranch branch : branches) {
CorbaObjectHandler content;
QName unionName = null;
String branchName = branch.getName();
@@ -85,14 +85,14 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
currentTypeListener.processStartElement(name);
}
} else {
- QName emptyBranchContentQName =
+ QName emptyBranchContentQName =
new QName(name.getNamespaceURI(), branchName);
content = CorbaHandlerUtils.initializeObjectHandler(orb,
emptyBranchContentQName,
branch.getIdltype(),
typeMap,
serviceInfo);
- }
+ }
((CorbaUnionHandler)handler).addCase(content);
}
} else {
@@ -104,14 +104,14 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
if (currentTypeListener != null) {
currentTypeListener.processCharacters(text);
} else {
- //Nillable primitive cases, you do not get the start element
+ //Nillable primitive cases, you do not get the start element
CorbaPrimitiveHandler discObj =
new CorbaPrimitiveHandler(new QName("discriminator"),
unionType.getDiscriminator(),
orb.get_primitive_tc(TCKind.from_int(TCKind._tk_boolean)),
null);
discObj.setValue(Boolean.TRUE);
- ((CorbaUnionHandler)handler).setDiscriminator(discObj);
+ ((CorbaUnionHandler)handler).setDiscriminator(discObj);
CorbaTypeListener typeListener =
CorbaHandlerUtils.getTypeListener(handler.getName(),
branches.get(0).getIdltype(),
@@ -132,7 +132,7 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
private String determineDescriminatorValue(Unionbranch branch) {
String descriminatorValue;
- // Determine the value of the discriminator.
+ // Determine the value of the discriminator.
List<CaseType> branchCases = branch.getCase();
if (branchCases.size() != 0) {
CaseType caseLabel = branchCases.get(0);
@@ -157,7 +157,7 @@ public class CorbaUnionListener extends AbstractCorbaTypeListener {
discObj.setValue(Boolean.FALSE);
((CorbaUnionHandler)handler).setDiscriminator(discObj);
Unionbranch branch = branches.get(0);
- QName emptyBranchContentQName =
+ QName emptyBranchContentQName =
new QName(handler.getName().getNamespaceURI(), branch.getName());
CorbaObjectHandler content = CorbaHandlerUtils.initializeObjectHandler(orb,
emptyBranchContentQName,
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java
index 419be94..06800a5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/HandlerIterator.java
@@ -28,7 +28,7 @@ public class HandlerIterator implements Iterator<CorbaObjectHandler> {
int count;
CorbaObjectHandler next;
boolean isServer;
-
+
public HandlerIterator(CorbaMessage msg, boolean server) {
params = msg.getStreamableArguments();
isServer = server;
@@ -36,7 +36,7 @@ public class HandlerIterator implements Iterator<CorbaObjectHandler> {
next = msg.getStreamableReturn().getObject();
}
}
-
+
public boolean hasNext() {
while (next == null && count < params.length) {
int mode = params[count].getMode();
@@ -48,7 +48,7 @@ public class HandlerIterator implements Iterator<CorbaObjectHandler> {
|| mode == org.omg.CORBA.ARG_INOUT.value) {
next = params[count].getObject();
}
- if (!isServer
+ if (!isServer
&& mode == org.omg.CORBA.ARG_INOUT.value
&& next instanceof CorbaPrimitiveHandler) {
CorbaPrimitiveHandler prim = (CorbaPrimitiveHandler)next;
@@ -58,13 +58,13 @@ public class HandlerIterator implements Iterator<CorbaObjectHandler> {
}
return next != null;
}
-
+
public CorbaObjectHandler next() {
CorbaObjectHandler current = next;
next = null;
return current;
}
-
+
public void remove() {
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
index a83fced..0ff98f7 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/ParameterEventProducer.java
@@ -59,7 +59,7 @@ public class ParameterEventProducer implements CorbaTypeEventProducer {
public boolean hasNext() {
return (currentEventProducer != null
? currentEventProducer.hasNext() : false)
- || (iterator != null ? iterator.hasNext() : false);
+ || (iterator != null ? iterator.hasNext() : false);
}
public int next() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
index 514d94f..9f71e04 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/SkipStartEndEventProducer.java
@@ -28,7 +28,7 @@ import javax.xml.stream.events.Namespace;
public class SkipStartEndEventProducer implements CorbaTypeEventProducer {
private final CorbaTypeEventProducer eventProducer;
- private QName name;
+ private QName name;
private int peekedEvent;
private boolean hasNext = true;
@@ -48,7 +48,7 @@ public class SkipStartEndEventProducer implements CorbaTypeEventProducer {
return name;
}
- public String getText() {
+ public String getText() {
return eventProducer.getText();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java
index b3df49c..cd144e6 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/ContextUtils.java
@@ -39,7 +39,7 @@ public final class ContextUtils {
private ContextUtils() {
//utility class
}
-
+
public static boolean isRequestor(Message message) {
return Boolean.TRUE.equals(message.containsKey(Message.REQUESTOR_ROLE));
}
@@ -55,7 +55,7 @@ public final class ContextUtils {
return exchange != null
&& message == exchange.getOutMessage();
}
-
+
public static DataWriter<XMLEventWriter> getDataWriter(CorbaMessage message) {
Service service = ServiceModelUtil.getService(message.getExchange());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
index f912f9a..0a53299 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaAnyHelper.java
@@ -42,16 +42,16 @@ import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
public final class CorbaAnyHelper {
-
+
private static final Map<QName, QName> SCHEMA_TO_IDL_TYPES = new HashMap<QName, QName>();
private static final Map<QName, QName> IDL_TO_SCHEMA_TYPES = new HashMap<QName, QName>();
-
+
private static Constructor<?> fixedAnyConstructor;
-
+
private CorbaAnyHelper() {
//utility class
}
-
+
public static Any createAny(ORB orb) {
Any value = orb.create_any();
if ("com.sun.corba.se.impl.corba.AnyImpl".equals(value.getClass().getName())) {
@@ -67,7 +67,7 @@ public final class CorbaAnyHelper {
public static boolean isPrimitiveIdlType(QName idlType) {
return IDL_TO_SCHEMA_TYPES.get(idlType) != null;
}
-
+
public static QName convertPrimitiveSchemaToIdlType(QName schemaType) {
return SCHEMA_TO_IDL_TYPES.get(schemaType);
}
@@ -177,7 +177,7 @@ public final class CorbaAnyHelper {
a.insert_wstring((String)primitive.getValue());
break;
default:
- throw new CorbaBindingException("Unable to insert type into any. Kind = "
+ throw new CorbaBindingException("Unable to insert type into any. Kind = "
+ primitive.getTypeCode().kind().value());
}
}
@@ -228,7 +228,7 @@ public final class CorbaAnyHelper {
primitive.setValue(a.extract_wstring());
break;
default:
- throw new CorbaBindingException("Unable to extract type from any. Kind = "
+ throw new CorbaBindingException("Unable to extract type from any. Kind = "
+ primitive.getTypeCode().kind().value());
}
}
@@ -271,7 +271,7 @@ public final class CorbaAnyHelper {
IDL_TO_SCHEMA_TYPES.put(CorbaConstants.NT_CORBA_WSTRING, W3CConstants.NT_SCHEMA_STRING);
IDL_TO_SCHEMA_TYPES.put(CorbaConstants.NT_CORBA_ANY, W3CConstants.NT_SCHEMA_ANYTYPE);
}
-
+
private static Any createFixedAny(ORB orb, Any any) {
createFixedAnyConstructor();
try {
@@ -284,13 +284,13 @@ public final class CorbaAnyHelper {
if (fixedAnyConstructor != null) {
return;
}
-
+
ASMHelper helper = new ASMHelper();
ClassWriter cw = helper.createClassWriter();
FieldVisitor fv;
cw.visit(Opcodes.V1_6, Opcodes.ACC_PUBLIC + Opcodes.ACC_SUPER,
- "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
+ "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
null, "com/sun/corba/se/impl/corba/AnyImpl", null);
cw.visitSource("FixedAnyImpl.java", null);
@@ -302,11 +302,11 @@ public final class CorbaAnyHelper {
addExtractOverride(helper, cw);
addWriteOverride(helper, cw);
addReadOverride(helper, cw);
-
+
cw.visitEnd();
byte[] b = cw.toByteArray();
- Class<?> c = helper.loadClass("org.apache.cxf.binding.corba.utils.FixedAnyImpl",
+ Class<?> c = helper.loadClass("org.apache.cxf.binding.corba.utils.FixedAnyImpl",
CorbaAnyHelper.class, b);
try {
fixedAnyConstructor = c.getConstructor(ORB.class, Any.class);
@@ -316,8 +316,8 @@ public final class CorbaAnyHelper {
}
private static void addReadOverride(ASMHelper helper, ClassWriter cw) {
- MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "read_value",
- "(Lorg/omg/CORBA/portable/InputStream;Lorg/omg/CORBA/TypeCode;)V",
+ MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "read_value",
+ "(Lorg/omg/CORBA/portable/InputStream;Lorg/omg/CORBA/TypeCode;)V",
null, null);
mv.visitCode();
Label l0 = helper.createLabel();
@@ -332,10 +332,10 @@ public final class CorbaAnyHelper {
mv.visitLabel(l2);
mv.visitLineNumber(55, l2);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
+ mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
"obj", "Lorg/omg/CORBA/portable/Streamable;");
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable",
+ mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable",
"_read", "(Lorg/omg/CORBA/portable/InputStream;)V", true);
Label l3 = helper.createLabel();
mv.visitJumpInsn(Opcodes.GOTO, l3);
@@ -344,8 +344,8 @@ public final class CorbaAnyHelper {
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitVarInsn(Opcodes.ALOAD, 2);
- mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "com/sun/corba/se/impl/corba/AnyImpl",
- "read_value",
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL, "com/sun/corba/se/impl/corba/AnyImpl",
+ "read_value",
"(Lorg/omg/CORBA/portable/InputStream;Lorg/omg/CORBA/TypeCode;)V", false);
mv.visitLabel(l3);
mv.visitLineNumber(59, l3);
@@ -359,9 +359,9 @@ public final class CorbaAnyHelper {
mv.visitMaxs(3, 3);
mv.visitEnd();
}
-
+
private static void addWriteOverride(ASMHelper helper, ClassWriter cw) {
- MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "write_value",
+ MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "write_value",
"(Lorg/omg/CORBA/portable/OutputStream;)V", null, null);
mv.visitCode();
Label l0 = helper.createLabel();
@@ -378,7 +378,7 @@ public final class CorbaAnyHelper {
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
"obj", "Lorg/omg/CORBA/portable/Streamable;");
-
+
Label l3 = helper.createLabel();
mv.visitVarInsn(Opcodes.ALOAD, 1);
mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/omg/CORBA/portable/Streamable",
@@ -400,7 +400,7 @@ public final class CorbaAnyHelper {
mv.visitLocalVariable("os", "Lorg/omg/CORBA/portable/OutputStream;", null, l0, l4, 1);
mv.visitMaxs(2, 2);
mv.visitEnd();
-
+
}
private static void addExtractOverride(ASMHelper helper, ClassWriter cw) {
@@ -412,7 +412,7 @@ public final class CorbaAnyHelper {
mv.visitLabel(l0);
mv.visitLineNumber(47, l0);
mv.visitVarInsn(Opcodes.ALOAD, 0);
- mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
+ mv.visitFieldInsn(Opcodes.GETFIELD, "org/apache/cxf/binding/corba/utils/FixedAnyImpl",
"obj", "Lorg/omg/CORBA/portable/Streamable;");
Label l1 = helper.createLabel();
mv.visitJumpInsn(Opcodes.IFNULL, l1);
@@ -434,12 +434,12 @@ public final class CorbaAnyHelper {
mv.visitLocalVariable("this", "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;", null, l0, l3, 0);
mv.visitMaxs(1, 1);
mv.visitEnd();
-
+
}
private static void addInsertOverride(ASMHelper helper, ClassWriter cw) {
MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC,
- "insert_Streamable",
+ "insert_Streamable",
"(Lorg/omg/CORBA/portable/Streamable;)V", null, null);
mv.visitCode();
Label l0 = helper.createLabel();
@@ -447,17 +447,17 @@ public final class CorbaAnyHelper {
mv.visitLineNumber(43, l0);
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
- "com/sun/corba/se/impl/corba/AnyImpl",
- "insert_Streamable",
+ mv.visitMethodInsn(Opcodes.INVOKESPECIAL,
+ "com/sun/corba/se/impl/corba/AnyImpl",
+ "insert_Streamable",
"(Lorg/omg/CORBA/portable/Streamable;)V", false);
Label l1 = helper.createLabel();
mv.visitLabel(l1);
mv.visitLineNumber(44, l1);
mv.visitVarInsn(Opcodes.ALOAD, 0);
mv.visitVarInsn(Opcodes.ALOAD, 1);
- mv.visitFieldInsn(Opcodes.PUTFIELD,
- "org/apache/cxf/binding/corba/utils/FixedAnyImpl", "obj",
+ mv.visitFieldInsn(Opcodes.PUTFIELD,
+ "org/apache/cxf/binding/corba/utils/FixedAnyImpl", "obj",
"Lorg/omg/CORBA/portable/Streamable;");
Label l2 = helper.createLabel();
mv.visitLabel(l2);
@@ -491,13 +491,13 @@ public final class CorbaAnyHelper {
Label l2 = helper.createLabel();
mv.visitLabel(l2);
mv.visitLocalVariable("this",
- "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;",
+ "Lorg/apache/cxf/binding/corba/utils/FixedAnyImpl;",
null, l0, l2, 0);
mv.visitLocalVariable("orb", "Lorg/omg/CORBA/ORB;", null, l0, l2, 1);
mv.visitMaxs(2, 2);
mv.visitEnd();
-
+
mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>",
"(Lorg/omg/CORBA/ORB;Lorg/omg/CORBA/Any;)V",
null, null);
@@ -525,6 +525,6 @@ public final class CorbaAnyHelper {
mv.visitLocalVariable("any", "Lorg/omg/CORBA/Any;", null, l0, l2, 2);
mv.visitMaxs(3, 3);
mv.visitEnd();
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
index 8947bbd..c23aed0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaBindingHelper.java
@@ -37,12 +37,12 @@ public final class CorbaBindingHelper {
private static Map<String, ORB> orbList = new HashMap<String, ORB>();
private static Map<String, Integer> orbUseCount = new HashMap<String, Integer>();
private static ORB defaultORB;
-
+
private CorbaBindingHelper() {
//utility class
}
-
- public static synchronized ORB getDefaultORB(OrbConfig config) {
+
+ public static synchronized ORB getDefaultORB(OrbConfig config) {
if (defaultORB == null) {
Properties props = System.getProperties();
Properties configSpecifiedOrbProperties = config.getOrbProperties();
@@ -62,9 +62,9 @@ public final class CorbaBindingHelper {
}
return defaultORB;
}
-
- public static synchronized ORB getAddressSpecificORB(String address,
- Properties props,
+
+ public static synchronized ORB getAddressSpecificORB(String address,
+ Properties props,
List<String> orbArgs) {
ORB orb = orbList.get(getORBNameFromAddress(address));
if (orb == null) {
@@ -73,11 +73,11 @@ public final class CorbaBindingHelper {
return orb;
}
- private static ORB createAddressSpecificORB(String address,
- Properties props,
+ private static ORB createAddressSpecificORB(String address,
+ Properties props,
List<String> orbArgs) {
ORB orb = null;
-
+
URI addressURI = null;
try {
addressURI = new URI(address);
@@ -87,7 +87,7 @@ public final class CorbaBindingHelper {
String scheme = addressURI.getScheme();
// A corbaloc address gives us host and port information to use when setting up the
- // endpoint for the ORB. Other types of references will just create ORBs on the
+ // endpoint for the ORB. Other types of references will just create ORBs on the
// host and port used when no preference has been specified.
if ("corbaloc".equals(scheme)) {
String schemeSpecificPart = addressURI.getSchemeSpecificPart();
@@ -103,16 +103,16 @@ public final class CorbaBindingHelper {
index = corbaAddr.indexOf(':', oldIndex + 1);
String host = corbaAddr.substring(oldIndex + 1, index);
String port = corbaAddr.substring(index + 1);
-
+
props.put("yoko.orb.oa.endpoint", new String(protocol + " --host " + host + " --port " + port));
- // WHAT to do for non-yoko orb?
+ // WHAT to do for non-yoko orb?
} else if ("corbaname".equals(scheme)) {
String schemeSpecificPart = addressURI.getSchemeSpecificPart();
if (schemeSpecificPart.startsWith(":")) {
schemeSpecificPart = schemeSpecificPart.substring(1);
}
int idx = schemeSpecificPart.indexOf(':');
-
+
props.put("org.omg.CORBA.ORBInitialHost", schemeSpecificPart.substring(0, idx));
props.put("org.omg.CORBA.ORBInitialPort", schemeSpecificPart.substring(idx + 1));
} else if ("file".equals(scheme)
@@ -128,19 +128,19 @@ public final class CorbaBindingHelper {
return orb;
}
-
-
+
+
private static String getORBNameFromAddress(String address) {
String name = null;
-
+
URI addressURI = null;
try {
addressURI = new URI(address);
} catch (URISyntaxException ex) {
throw new CorbaBindingException("Unable to locate ORB with address " + address);
}
-
+
String scheme = addressURI.getScheme();
if ("corbaloc".equals(scheme) || "corbaname".equals(scheme)) {
String schemeSpecificPart = addressURI.getSchemeSpecificPart();
@@ -149,14 +149,14 @@ public final class CorbaBindingHelper {
}
int keyIndex = schemeSpecificPart.indexOf('/');
if (keyIndex != -1) {
- name = schemeSpecificPart.substring(0, keyIndex);
+ name = schemeSpecificPart.substring(0, keyIndex);
} else {
name = schemeSpecificPart;
}
if (addressURI.getRawQuery() != null) {
name += addressURI.getRawQuery();
}
- } else if ("IOR".equals(scheme) || "ior".equals(scheme)) {
+ } else if ("IOR".equals(scheme) || "ior".equals(scheme)) {
name = addressURI.toString();
} else if ("file".equals(scheme) || "relfile".equals(scheme)) {
name = addressURI.getPath();
@@ -207,5 +207,5 @@ public final class CorbaBindingHelper {
orbUseCount.put(getORBNameFromAddress(address), count);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
index 7d99204..fc1cbd5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
@@ -43,9 +43,9 @@ public final class CorbaObjectReferenceHelper {
public static final String WSDLI_NAMESPACE_URI = "http://www.w3.org/2006/01/wsdl-instance";
public static final String ADDRESSING_NAMESPACE_URI = "http://www.w3.org/2005/08/addressing";
public static final String ADDRESSING_WSDL_NAMESPACE_URI = "http://www.w3.org/2006/05/addressing/wsdl";
-
+
private static final Logger LOG = LogUtils.getL7dLogger(CorbaObjectReferenceHelper.class);
-
+
private CorbaObjectReferenceHelper() {
//utility class
}
@@ -53,7 +53,7 @@ public final class CorbaObjectReferenceHelper {
public static String getWSDLLocation(Definition wsdlDef) {
return wsdlDef.getDocumentBaseURI();
}
-
+
public static QName getServiceName(Binding binding, Definition wsdlDef) {
LOG.log(Level.FINE, "Getting service name for an object reference");
Collection<Service> services = CastUtils.cast(wsdlDef.getServices().values());
@@ -67,7 +67,7 @@ public final class CorbaObjectReferenceHelper {
}
return null;
}
-
+
public static String getEndpointName(Binding binding, Definition wsdlDef) {
LOG.log(Level.FINE, "Getting endpoint name for an object reference");
Collection<Service> services = CastUtils.cast(wsdlDef.getServices().values());
@@ -81,7 +81,7 @@ public final class CorbaObjectReferenceHelper {
}
return null;
}
-
+
public static Binding getDefaultBinding(Object obj, Definition wsdlDef) {
LOG.log(Level.FINEST, "Getting binding for a default object reference");
Collection<Binding> bindings = CastUtils.cast(wsdlDef.getBindings().values());
@@ -104,13 +104,13 @@ public final class CorbaObjectReferenceHelper {
}
public static EprMetaData getBindingForTypeId(String repId, Definition wsdlDef) {
- LOG.log(Level.FINE, "RepositoryId " + repId
+ LOG.log(Level.FINE, "RepositoryId " + repId
+ ", wsdl namespace " + wsdlDef.getTargetNamespace());
EprMetaData ret = new EprMetaData();
Collection<Binding> bindings = CastUtils.cast(wsdlDef.getBindings().values());
for (Binding b : bindings) {
List<?> extElements = b.getExtensibilityElements();
-
+
// Get the list of all extensibility elements
for (Iterator<?> extIter = extElements.iterator(); extIter.hasNext();) {
java.lang.Object element = extIter.next();
@@ -126,7 +126,7 @@ public final class CorbaObjectReferenceHelper {
}
}
}
-
+
if (!ret.isValid()) {
// recursivly check imports
Iterator<?> importLists = wsdlDef.getImports().values().iterator();
@@ -135,7 +135,7 @@ public final class CorbaObjectReferenceHelper {
for (java.lang.Object imp : imports) {
if (imp instanceof Import) {
Definition importDef = ((Import)imp).getDefinition();
- LOG.log(Level.INFO, "Following import " + importDef.getDocumentBaseURI());
+ LOG.log(Level.INFO, "Following import " + importDef.getDocumentBaseURI());
ret = getBindingForTypeId(repId, importDef);
if (ret.isValid()) {
return ret;
@@ -147,7 +147,7 @@ public final class CorbaObjectReferenceHelper {
return ret;
}
- public static String extractTypeIdFromIOR(String url) {
+ public static String extractTypeIdFromIOR(String url) {
String ret = "";
byte data[] = DatatypeConverter.parseHexBinary(url.substring(4));
if (data.length > 0) {
@@ -173,12 +173,12 @@ public final class CorbaObjectReferenceHelper {
if (bigEndian) {
int partial = ((data[index] << 24) & 0xff000000)
| ((data[index + 1] << 16) & 0x00ff0000);
- return partial | ((data[index + 2] << 8) & 0x0000ff00)
+ return partial | ((data[index + 2] << 8) & 0x0000ff00)
| ((data[index + 3]) & 0x000000ff);
} else {
int partial = ((data[index]) & 0x000000ff)
| ((data[index + 1] << 8) & 0x0000ff00);
- return partial | ((data[index + 2] << 16) & 0x00ff0000)
+ return partial | ((data[index + 2] << 16) & 0x00ff0000)
| ((data[index + 3] << 24) & 0xff000000);
}
}
@@ -200,7 +200,7 @@ public final class CorbaObjectReferenceHelper {
}
}
}
-
+
if (info.getServiceQName() == null) {
Iterator<?> importLists = wsdlDef.getImports().values().iterator();
while (info.getServiceQName() == null && importLists.hasNext()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java
index 2d3e035..a785762 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/EprMetaData.java
@@ -23,48 +23,48 @@ import javax.wsdl.Definition;
import javax.xml.namespace.QName;
public class EprMetaData {
-
+
private Definition candidateWsdlDef;
private Binding binding;
private QName serviceQName;
private String portName;
-
+
public Binding getBinding() {
return binding;
}
-
+
public void setBinding(Binding b) {
binding = b;
}
-
+
public Definition getCandidateWsdlDef() {
return candidateWsdlDef;
}
-
+
public void setCandidateWsdlDef(Definition def) {
candidateWsdlDef = def;
}
-
+
public String getPortName() {
return portName;
}
-
+
public void setPortName(String name) {
portName = name;
}
-
+
public QName getServiceQName() {
return serviceQName;
}
-
+
public void setServiceQName(QName name) {
serviceQName = name;
}
-
+
public boolean isValid() {
return binding != null && candidateWsdlDef != null;
}
-
+
public String toString() {
String ret = null;
if (isValid()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
index 6a4bc83..e96bbb7 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/OrbConfig.java
@@ -49,7 +49,7 @@ public class OrbConfig {
protected String orbSingletonClass;
protected List<String> orbArgs = new ArrayList<>();
protected Properties orbProperties = new Properties();
-
+
public OrbConfig() {
//nothing
}
@@ -57,56 +57,56 @@ public class OrbConfig {
public void setOrbClass(String cls) {
orbClass = cls;
}
-
+
public String getOrbClass() {
return orbClass;
}
-
+
public void setOrbSingletonClass(String cls) {
orbSingletonClass = cls;
}
-
+
public String getOrbSingletonClass() {
return orbSingletonClass;
}
-
+
public void setOrbArgs(List<String> args) {
orbArgs = args;
}
-
+
public List<String> getOrbArgs() {
return orbArgs;
}
-
+
public void setOrbProperties(Properties props) {
orbProperties = props;
}
-
+
public Properties getOrbProperties() {
return orbProperties;
}
-
- public void addPOAPolicies(ORB orb,
+
+ public void addPOAPolicies(ORB orb,
String poaName,
POA parentPOA,
POAManager poaManager,
List<Policy> policies) {
//nothing
}
-
-
+
+
public Any createSystemExceptionAny(ORB orb, SystemException sysEx) {
Any exAny = orb.create_any();
SystemExceptionHelper.insert(exAny, sysEx);
return exAny;
}
-
+
public void exportObjectReference(ORB orb,
org.omg.CORBA.Object ref,
String url,
- AddressType address)
+ AddressType address)
throws URISyntaxException, IOException {
-
+
if ((url.startsWith("ior:")) || (url.startsWith("IOR:"))) {
// make use of Thread cache of last exported IOR
String ior = CorbaUtils.exportObjectReference(ref, orb);
@@ -135,7 +135,7 @@ public class OrbConfig {
String location) {
int idx = location.indexOf("#");
String name = location.substring(idx + 1);
-
+
//Register in NameService
try {
org.omg.CORBA.Object nsObj = orb.resolve_initial_references("NameService");
@@ -158,7 +158,7 @@ public class OrbConfig {
bootMgrHelperClass.getMethod("narrow", org.omg.CORBA.Object.class);
java.lang.Object bootMgr = narrowMethod.invoke(null,
orb.resolve_initial_references("BootManager"));
- Method addBindingMethod =
+ Method addBindingMethod =
bootMgrClass.getMethod("add_binding", byte[].class, org.omg.CORBA.Object.class);
addBindingMethod.invoke(bootMgr, key.getBytes(), object);
} catch (ClassNotFoundException ex) {
@@ -173,7 +173,7 @@ public class OrbConfig {
public void exportObjectReferenceToFile(ORB orb,
org.omg.CORBA.Object obj,
- URI iorFile)
+ URI iorFile)
throws IOException {
String ref = orb.object_to_string(obj);
File f = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java
index c8fd8fc..2df964a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaConstants.java
@@ -33,7 +33,7 @@ public interface CorbaConstants {
String NU_TM_CORBA = "http://cxf.apache.org/bindings/corba/typemap/corba/";
String SCHEMA_NS_URI = "http://cxf.apache.org/bindings/corba/idltypes/";
String WSDL_NS_URI = "http://cxf.apache.org/bindings/corba/idl/";
-
+
// CORBA Binding Extensibility Elements
QName NE_CORBA_ADDRESS = new QName(NU_WSDL_CORBA, "address", NP_WSDL_CORBA);
QName NE_CORBA_POLICY = new QName(NU_WSDL_CORBA, "policy", NP_WSDL_CORBA);
@@ -98,7 +98,7 @@ public interface CorbaConstants {
String IDLTYPE = "idltype";
String MODE = "mode";
String EXCEPTION = "exception";
- String SERVICE_ID = "serviceid";
+ String SERVICE_ID = "serviceid";
String BASES = "bases";
String CORBA_ENDPOINT_OBJECT = "endpoint";
String ORB = "orb";
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
index 8daf9c6..457bfe6 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/CorbaTypeImpl.java
@@ -24,14 +24,14 @@ import javax.xml.namespace.QName;
public class CorbaTypeImpl {
protected QName qname;
-
+
/**
* Gets the value of the qname property.
- *
+ *
* @return
* possible object is
* {@link QName }
- *
+ *
*/
public QName getQName() {
return qname;
@@ -39,11 +39,11 @@ public class CorbaTypeImpl {
/**
* Sets the value of the name property.
- *
+ *
* @param value
* allowed object is
* {@link QName }
- *
+ *
*/
public void setQName(QName value) {
this.qname = value;
@@ -52,7 +52,7 @@ public class CorbaTypeImpl {
public boolean isSetQName() {
return this.qname != null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java
index 9940be4..716f9f5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/W3CConstants.java
@@ -25,7 +25,7 @@ public interface W3CConstants {
// XML Namespaces
String NP_XMLNS = "xmlns";
- String NU_XMLNS = "http://www.w3.org/2000/xmlns/";
+ String NU_XMLNS = "http://www.w3.org/2000/xmlns/";
// XML Schema(CR) datatypes + structures
String NP_SCHEMA_XSD = "xsd";
@@ -78,7 +78,7 @@ public interface W3CConstants {
QName NE_SCHEMA_ATTRIBUTEGROUP = new QName(NU_SCHEMA_XSD, "attributeGroup", NP_SCHEMA_XSD);
QName NE_SCHEMA_GROUP = new QName(NU_SCHEMA_XSD, "group", NP_SCHEMA_XSD);
-
+
// XML Schema primitive and derived built-in types
// Primitives
QName NT_SCHEMA_STRING = new QName(NU_SCHEMA_XSD, "string", NP_SCHEMA_XSD);
@@ -130,7 +130,7 @@ public interface W3CConstants {
QName NT_SCHEMA_ANYTYPE = new QName(NU_SCHEMA_XSD, "anyType", NP_SCHEMA_XSD);
QName NT_SCHEMA_ANYSIMPLETYPE = new QName(NU_SCHEMA_XSD, "anySimpleType", NP_SCHEMA_XSD);
- QName NT_SCHEMA_ANY = new QName(NU_SCHEMA_XSD, "any", NP_SCHEMA_XSD);
+ QName NT_SCHEMA_ANY = new QName(NU_SCHEMA_XSD, "any", NP_SCHEMA_XSD);
String getValue(String value);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
index f50f780..2365d1c 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/wsdl/WSDLExtensionRegister.java
@@ -28,18 +28,18 @@ import org.apache.cxf.wsdl.WSDLExtensionLoader;
import org.apache.cxf.wsdl.WSDLManager;
/**
- *
+ *
*/
@NoJSR250Annotations
-public final class WSDLExtensionRegister implements WSDLExtensionLoader {
+public final class WSDLExtensionRegister implements WSDLExtensionLoader {
private static final String YOKO_NAMESPACE = "http://schemas.apache.org/yoko/bindings/corba";
-
+
public WSDLExtensionRegister(Bus b) {
WSDLManager manager = b.getExtension(WSDLManager.class);
registerCXFExtensors(manager);
registerYokoCompatibleExtensors(manager);
}
-
+
void registerCXFExtensors(WSDLManager manager) {
createExtensor(manager, javax.wsdl.Binding.class,
org.apache.cxf.binding.corba.wsdl.BindingType.class);
@@ -69,14 +69,14 @@ public final class WSDLExtensionRegister implements WSDLExtensionLoader {
Class<?> elementType) {
try {
JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
- parentType,
+ parentType,
elementType,
null,
this.getClass().getClassLoader());
} catch (JAXBException e) {
//ignore, won't support CORBA
}
-
+
}
private void createCompatExtensor(WSDLManager manager,
@@ -84,13 +84,13 @@ public final class WSDLExtensionRegister implements WSDLExtensionLoader {
Class<?> elementType) {
try {
JAXBExtensionHelper.addExtensions(manager.getExtensionRegistry(),
- parentType,
+ parentType,
elementType,
YOKO_NAMESPACE);
} catch (JAXBException e) {
//ignore, just won't support the yoko extensors
}
-
+
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
index 084f63b..d906115 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingFactoryTest.java
@@ -50,37 +50,37 @@ import org.junit.Test;
public class CorbaBindingFactoryTest extends Assert {
-
+
protected Bus bus;
protected EndpointInfo endpointInfo;
- protected EndpointReferenceType target;
+ protected EndpointReferenceType target;
protected MessageObserver observer;
protected Message inMessage;
CorbaBindingFactory factory;
-
+
@Before
public void setUp() throws Exception {
- bus = BusFactory.getDefaultBus();
- BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
+ bus = BusFactory.getDefaultBus();
+ BindingFactoryManager bfm = bus.getExtension(BindingFactoryManager.class);
factory = (CorbaBindingFactory)bfm.getBindingFactory("http://cxf.apache.org/bindings/corba");
- bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
+ bfm.registerBindingFactory(CorbaConstants.NU_WSDL_CORBA, factory);
}
-
+
@After
public void tearDown() {
- bus.shutdown(true);
+ bus.shutdown(true);
}
-
- protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
+
+ protected void setupServiceInfo(String ns, String wsdl, String serviceName, String portName) {
URL wsdlUrl = getClass().getResource(wsdl);
assertNotNull(wsdlUrl);
WSDLServiceFactory f = new WSDLServiceFactory(bus, wsdlUrl.toString(), new QName(ns, serviceName));
- Service service = f.create();
+ Service service = f.create();
endpointInfo = service.getEndpointInfo(new QName(ns, portName));
-
+
}
-
+
@Test
public void testCreateBinding() throws Exception {
IMocksControl control = EasyMock.createNiceControl();
@@ -88,55 +88,55 @@ public class CorbaBindingFactoryTest extends Assert {
CorbaBinding binding = (CorbaBinding)factory.createBinding(bindingInfo);
assertNotNull(binding);
- assertTrue(CorbaBinding.class.isInstance(binding));
+ assertTrue(CorbaBinding.class.isInstance(binding));
List<Interceptor<? extends Message>> inInterceptors = binding.getInInterceptors();
assertNotNull(inInterceptors);
List<Interceptor<? extends Message>> outInterceptors = binding.getOutInterceptors();
assertNotNull(outInterceptors);
assertEquals(2, inInterceptors.size());
- assertEquals(2, outInterceptors.size());
+ assertEquals(2, outInterceptors.size());
}
@Test
public void testGetCorbaConduit() throws Exception {
- setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
- "/wsdl_corbabinding/simpleIdl.wsdl",
- "SimpleCORBAService",
+ setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
+ "/wsdl_corbabinding/simpleIdl.wsdl",
+ "SimpleCORBAService",
"SimpleCORBAPort");
-
+
Conduit conduit = factory.getConduit(endpointInfo, bus);
- assertNotNull(conduit);
+ assertNotNull(conduit);
conduit = factory.getConduit(endpointInfo, null, bus);
assertNotNull(conduit);
target = EasyMock.createMock(EndpointReferenceType.class);
conduit = factory.getConduit(endpointInfo, target, bus);
assertNotNull(conduit);
}
-
+
@Test
- public void testGetDestination() throws Exception {
- setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
- "/wsdl_corbabinding/simpleIdl.wsdl",
- "SimpleCORBAService",
+ public void testGetDestination() throws Exception {
+ setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
+ "/wsdl_corbabinding/simpleIdl.wsdl",
+ "SimpleCORBAService",
"SimpleCORBAPort");
-
+
Destination destination = factory.getDestination(endpointInfo, bus);
assertNotNull(destination);
target = destination.getAddress();
assertNotNull(target);
}
-
+
@Test
public void testTransportIds() throws Exception {
- setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
- "/wsdl_corbabinding/simpleIdl.wsdl",
- "SimpleCORBAService",
+ setupServiceInfo("http://cxf.apache.org/bindings/corba/simple",
+ "/wsdl_corbabinding/simpleIdl.wsdl",
+ "SimpleCORBAService",
"SimpleCORBAPort");
-
+
List<String> strs = new ArrayList<>();
strs.add("one");
strs.add("two");
- factory.setTransportIds(strs);
+ factory.setTransportIds(strs);
List<String> retStrs = factory.getTransportIds();
assertNotNull(retStrs);
String str = retStrs.get(0);
@@ -144,17 +144,17 @@ public class CorbaBindingFactoryTest extends Assert {
str = retStrs.get(1);
assertEquals("two", str.toString());
}
-
+
@Test
public void testGetUriPrefixes() throws Exception {
Set<String> prefixes = factory.getUriPrefixes();
assertNotNull("Prefixes should not be null", prefixes != null);
}
-
+
// check this
@Test
public void testSetBus() throws Exception {
- factory.setBus(bus);
+ factory.setBus(bus);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
index 0bfa213..4861591 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaBindingTest.java
@@ -32,28 +32,28 @@ import org.omg.CORBA.ORB;
public class CorbaBindingTest extends Assert {
-
+
private ORB orb;
-
+
@Before
public void setUp() throws Exception {
java.util.Properties props = System.getProperties();
-
-
+
+
props.put("yoko.orb.id", "CXF-CORBA-Server-Binding");
orb = ORB.init(new String[0], props);
}
-
- public void tearDown() {
+
+ public void tearDown() {
if (orb != null) {
try {
orb.destroy();
} catch (Exception ex) {
// Do nothing. Throw an Exception?
}
- }
+ }
}
-
+
@Test
public void testCorbaBinding() {
CorbaBinding binding = new CorbaBinding();
@@ -69,17 +69,17 @@ public class CorbaBindingTest extends Assert {
message.put(ORB.class, orb);
assertNotNull(message);
ORB corbaORB = message.get(ORB.class);
- assertNotNull(corbaORB);
+ assertNotNull(corbaORB);
MessageImpl mesage = new MessageImpl();
mesage.put(ORB.class, orb);
- Message msg = binding.createMessage(mesage);
- assertNotNull(msg);
+ Message msg = binding.createMessage(mesage);
+ assertNotNull(msg);
ORB corbaOrb = msg.get(ORB.class);
assertNotNull(corbaOrb);
/*List<Interceptor> infault = binding.getInFaultInterceptors();
assertEquals(1, infault.size());
List<Interceptor> outfault = binding.getOutFaultInterceptors();
- assertEquals(1, fault.size());*/
- }
-
+ assertEquals(1, fault.size());*/
+ }
+
}