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:22 UTC
[17/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/CorbaMessage.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java
index 39f972c..bf66254 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaMessage.java
@@ -38,7 +38,7 @@ public class CorbaMessage extends AbstractWrappedMessage {
private CorbaStreamable except;
private SystemException systemExcept;
private CorbaTypeMap corbaTypeMap;
-
+
private NVList list;
public CorbaMessage(Message m) {
@@ -46,26 +46,26 @@ public class CorbaMessage extends AbstractWrappedMessage {
if (m instanceof CorbaMessage) {
CorbaMessage msg = (CorbaMessage)m;
CorbaStreamable[] data = msg.getStreamableArguments();
- setStreamableArguments(data);
+ setStreamableArguments(data);
returnParam = msg.getStreamableReturn();
except = msg.getStreamableException();
systemExcept = msg.getSystemException();
list = msg.getList();
corbaTypeMap = msg.getCorbaTypeMap();
} else {
- this.arguments = new ArrayList<>();
- }
+ this.arguments = new ArrayList<>();
+ }
}
-
+
public void setList(NVList lst) {
this.list = lst;
}
-
+
public NVList getList() {
return this.list;
}
-
+
public CorbaStreamable getStreamableException() {
return this.except;
}
@@ -73,11 +73,11 @@ public class CorbaMessage extends AbstractWrappedMessage {
public CorbaStreamable getStreamableReturn() {
return this.returnParam;
}
-
+
public SystemException getSystemException() {
return this.systemExcept;
}
-
+
public void setSystemException(SystemException sysEx) {
systemExcept = sysEx;
}
@@ -89,7 +89,7 @@ public class CorbaMessage extends AbstractWrappedMessage {
this.arguments.add(arg);
}
-
+
public CorbaStreamable[] getStreamableArguments() {
return this.arguments.toArray(new CorbaStreamable[this.arguments.size()]);
}
@@ -100,9 +100,9 @@ public class CorbaMessage extends AbstractWrappedMessage {
this.arguments = new ArrayList<>(data.length);
}
- for (CorbaStreamable streamable : data) {
+ for (CorbaStreamable streamable : data) {
addStreamableArgument(streamable);
- }
+ }
}
public void setStreamableArgumentValue(CorbaObjectHandler data, int idx) {
@@ -127,11 +127,11 @@ public class CorbaMessage extends AbstractWrappedMessage {
// TODO: Handle case of the return parameter has not yet been initialized.
returnParam.setObject(data);
}
-
+
public void setStreamableException(CorbaStreamable ex) {
except = ex;
}
-
+
public void setStreamableExceptionValue(CorbaObjectHandler exData) {
// TODO: Handle case of the return parameter has not yet been initialized.
except.setObject(exData);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
index 7f9a968..69308e8 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaServerConduit.java
@@ -73,7 +73,7 @@ public class CorbaServerConduit implements Conduit {
}
}
- public void close(Message message) throws IOException {
+ public void close(Message message) throws IOException {
if (message instanceof CorbaMessage) {
buildRequestResult((CorbaMessage)message);
}
@@ -109,17 +109,17 @@ public class CorbaServerConduit implements Conduit {
public final String getAddress() {
return endpointInfo.getAddress();
}
-
-
- public void buildRequestResult(CorbaMessage msg) {
- Exchange exg = msg.getExchange();
+
+
+ public void buildRequestResult(CorbaMessage msg) {
+ Exchange exg = msg.getExchange();
ServerRequest request = exg.get(ServerRequest.class);
try {
- if (!exg.isOneWay()) {
+ if (!exg.isOneWay()) {
CorbaMessage inMsg = (CorbaMessage)msg.getExchange().getInMessage();
NVList list = inMsg.getList();
- if (msg.getStreamableException() != null) {
+ if (msg.getStreamableException() != null) {
Any exAny = CorbaAnyHelper.createAny(orb);
CorbaStreamable exception = msg.getStreamableException();
exAny.insert_Streamable(exception);
@@ -134,7 +134,7 @@ public class CorbaServerConduit implements Conduit {
if (list.item(i).flags() != org.omg.CORBA.ARG_IN.value) {
arguments[i].getObject().setIntoAny(list.item(i).value(),
arguments[i], true);
- }
+ }
}
}
@@ -150,10 +150,10 @@ public class CorbaServerConduit implements Conduit {
} catch (java.lang.Exception ex) {
throw new CorbaBindingException("Exception during buildRequestResult", ex);
}
- }
-
+ }
+
private class CorbaOutputStream extends CachedOutputStream {
-
+
CorbaOutputStream(Message m) {
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
index 857ec73..2d1dbba 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaTypeMap.java
@@ -64,7 +64,7 @@ public class CorbaTypeMap {
return typeCodeMap.get(name);
}
- // This is used by the Any type when trying to re-construct the type stored inside a
+ // This is used by the Any type when trying to re-construct the type stored inside a
// CORBA Any.
public QName getIdlType(TypeCode tc) {
String repId = null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
index 8295427..92b81be 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/TypeMapCache.java
@@ -31,7 +31,7 @@ public final class TypeMapCache {
private TypeMapCache() {
//utility class
}
-
+
public static CorbaTypeMap get(ServiceInfo service) {
if (service != null) {
synchronized (service) {
@@ -44,7 +44,7 @@ public final class TypeMapCache {
service.setProperty(KEY, map);
}
}
- return map;
+ return map;
}
}
return null;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java
index 80a64a1..8217503 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultInInterceptor.java
@@ -56,21 +56,21 @@ import org.apache.cxf.service.model.ServiceModelUtil;
import org.omg.CORBA.SystemException;
public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Message> {
-
- private static final Logger LOG = LogUtils.getL7dLogger(CorbaStreamFaultInInterceptor.class);
-
+
+ private static final Logger LOG = LogUtils.getL7dLogger(CorbaStreamFaultInInterceptor.class);
+
public CorbaStreamFaultInInterceptor() {
super(Phase.UNMARSHAL);
addAfter(ClientFaultConverter.class.getName());
- }
+ }
public void handleMessage(Message msg) {
CorbaMessage message = (CorbaMessage)msg;
-
-
+
+
try {
-
+
SystemException sysEx = message.getSystemException();
if (sysEx != null) {
// TODO: Do we need anything else to handle system exceptions here...i.e. do
@@ -85,16 +85,16 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
BindingOperationInfo bopInfo = message.getExchange().getBindingOperationInfo();
OperationInfo opInfo = bopInfo.getOperationInfo();
-
+
ServiceInfo service = message.getExchange().getEndpoint().getEndpointInfo().getService();
-
+
org.omg.CORBA.ORB orb = (org.omg.CORBA.ORB) message.get(CorbaConstants.ORB);
if (orb == null) {
- orb = message.getExchange().get(org.omg.CORBA.ORB.class);
+ orb = message.getExchange().get(org.omg.CORBA.ORB.class);
}
QName elName = new QName("", exStreamable.getName());
FaultInfo fault = getFaultInfo(opInfo, elName);
-
+
CorbaTypeEventProducer faultEventProducer =
CorbaHandlerUtils.getTypeEventProducer(exStreamable.getObject(),
service,
@@ -108,13 +108,13 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
Class<?> beanClass = e.getClass();
Constructor<?> constructor =
exClass.getConstructor(new Class[]{String.class, beanClass});
-
- String repId = (message.getStreamableException()._type().id() != null)
+
+ String repId = (message.getStreamableException()._type().id() != null)
? message.getStreamableException()._type().id()
: "";
e = constructor.newInstance(new Object[]{repId, e});
} else {
- // Get the Fault
+ // Get the Fault
Fault faultEx = (Fault) message.getContent(Exception.class);
if (e instanceof Document) {
createFaultDetail((Document)e, fault, faultEx);
@@ -137,9 +137,9 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
Document faultDoc = DOMUtils.createDocument();
Element faultElement = faultDoc.createElement("detail");
faultDoc.appendChild(faultElement);
- Element partElement =
+ Element partElement =
faultDoc.createElementNS(partInfoName.getNamespaceURI(), partInfoName.getLocalPart());
-
+
Element faultDataElement = (Element) faultData.getFirstChild();
Node node = faultDataElement.getFirstChild();
while (node != null) {
@@ -151,7 +151,7 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
faultEx.setDetail(faultElement);
}
-
+
protected FaultInfo getFaultInfo(OperationInfo opInfo, QName faultName) {
Iterator<FaultInfo> faults = opInfo.getFaults().iterator();
while (faults.hasNext()) {
@@ -169,7 +169,7 @@ public class CorbaStreamFaultInInterceptor extends AbstractPhaseInterceptor<Mess
protected DataReader<XMLStreamReader> getDataReader(CorbaMessage message) {
Service serviceModel = ServiceModelUtil.getService(message.getExchange());
- DataReader<XMLStreamReader> dataReader =
+ DataReader<XMLStreamReader> dataReader =
serviceModel.getDataBinding().createReader(XMLStreamReader.class);
if (dataReader == null) {
throw new CorbaBindingException("Couldn't create data reader for incoming fault message");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
index 4bfcef5..451d35e 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamFaultOutInterceptor.java
@@ -88,13 +88,13 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
orb = (ORB) message.get(CorbaConstants.ORB);
if (orb == null) {
- orb = exchange.get(ORB.class);
+ orb = exchange.get(ORB.class);
}
-
+
DataWriter<XMLStreamWriter> writer = getDataWriter(message);
Throwable ex = message.getContent(Exception.class);
- // JCGS. If the cause is not available I can only continue if the exception
+ // JCGS. If the cause is not available I can only continue if the exception
// is a Fault instance and contains a detail object.
if (ex.getCause() == null) {
if ((ex instanceof Fault) && (((Fault)ex).getDetail() != null)) {
@@ -105,7 +105,7 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
} else {
ex = ex.getCause();
}
-
+
if (ex instanceof InvocationTargetException) {
ex = ex.getCause();
}
@@ -114,7 +114,7 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
setSystemException(message, ex, destination);
return;
}
-
+
String exClassName = null;
if (faultEx == null) {
//REVISIT, we should not have to depend on WebFault annotation
@@ -134,14 +134,14 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
// definition.
// We need this to marshal data correctly
- BindingInfo bInfo = destination.getBindingInfo();
-
+ BindingInfo bInfo = destination.getBindingInfo();
+
String opName = message.getExchange().get(String.class);
-
+
Iterator<BindingOperationInfo> iter = bInfo.getOperations().iterator();
BindingOperationInfo bopInfo = null;
- OperationType opType = null;
+ OperationType opType = null;
while (iter.hasNext()) {
bopInfo = iter.next();
if (bopInfo.getName().getLocalPart().equals(opName)) {
@@ -154,13 +154,13 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
}
OperationInfo opInfo = bopInfo.getOperationInfo();
-
+
if (faultEx != null) {
MessagePartInfo partInfo = getFaultMessagePartInfo(opInfo, new QName("", exClassName));
if (partInfo != null) {
exClassName = partInfo.getTypeQName().getLocalPart();
}
-
+
}
RaisesType exType = getRaisesType(opType, exClassName, ex);
@@ -168,8 +168,8 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
try {
if (exType != null) {
if (faultEx != null) {
- setUserExceptionFromFaultDetail(message,
- faultEx.getDetail(),
+ setUserExceptionFromFaultDetail(message,
+ faultEx.getDetail(),
exType, opInfo, writer,
exchange.getEndpoint().getEndpointInfo().getService());
} else {
@@ -255,12 +255,12 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
Class<?> faultClass = faultMethod.getReturnType();
fault = faultClass.newInstance();
}
-
- CorbaFaultStreamWriter faultWriter = new CorbaFaultStreamWriter(orb, exType,
+
+ CorbaFaultStreamWriter faultWriter = new CorbaFaultStreamWriter(orb, exType,
message.getCorbaTypeMap(), service);
writer.write(fault, faultPart, faultWriter);
- CorbaObjectHandler[] objs = faultWriter.getCorbaObjects();
+ CorbaObjectHandler[] objs = faultWriter.getCorbaObjects();
CorbaStreamable streamable = message.createStreamableObject(objs[0], elName);
message.setStreamableException(streamable);
}
@@ -275,42 +275,42 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
QName exIdlType = exType.getException();
QName elName = new QName("", exIdlType.getLocalPart());
MessagePartInfo faultPart = getFaultMessagePartInfo(opInfo, elName);
-
+
// faultDetailt.getFirstChild() skips the "detail" element
Object fault = extractPartsInfoFromDetail((Element) faultDetail.getFirstChild(), exType);
-
- CorbaFaultStreamWriter faultWriter = new CorbaFaultStreamWriter(orb, exType,
+
+ CorbaFaultStreamWriter faultWriter = new CorbaFaultStreamWriter(orb, exType,
message.getCorbaTypeMap(), service);
writer.write(fault, faultPart, faultWriter);
- CorbaObjectHandler[] objs = faultWriter.getCorbaObjects();
+ CorbaObjectHandler[] objs = faultWriter.getCorbaObjects();
CorbaStreamable streamable = message.createStreamableObject(objs[0], elName);
message.setStreamableException(streamable);
}
-
+
private Object extractPartsInfoFromDetail(Element faultDetail, RaisesType exType) {
Document faultDoc = DOMUtils.createDocument();
Element faultElement = faultDoc.createElement(exType.getException().getLocalPart());
faultDoc.appendChild(faultElement);
-
+
Node node = faultDetail.getFirstChild();
while (node != null) {
Node importedFaultData = faultDoc.importNode(node, true);
faultElement.appendChild(importedFaultData);
- node = node.getNextSibling();
+ node = node.getNextSibling();
}
-
+
if (LOG.isLoggable(Level.FINE)) {
LOG.fine("Exception DOM: " + StaxUtils.toString(faultElement));
}
return faultDoc;
}
-
+
protected DataWriter<XMLStreamWriter> getDataWriter(CorbaMessage message) {
Service serviceModel = ServiceModelUtil.getService(message.getExchange());
- DataWriter<XMLStreamWriter> dataWriter =
+ DataWriter<XMLStreamWriter> dataWriter =
serviceModel.getDataBinding().createWriter(XMLStreamWriter.class);
if (dataWriter == null) {
throw new CorbaBindingException("Couldn't create data writer for outgoing fault message");
@@ -332,6 +332,6 @@ public class CorbaStreamFaultOutInterceptor extends AbstractPhaseInterceptor<Mes
}
return null;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
index 606d9fc..96532cd 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamInInterceptor.java
@@ -68,7 +68,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
public CorbaStreamInInterceptor() {
super(Phase.PRE_STREAM);
- }
+ }
public void handleMessage(Message message) throws Fault {
if (ContextUtils.isRequestor(message)) {
@@ -91,7 +91,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
CorbaMessage message = (CorbaMessage)msg;
if (message.getStreamableException() != null || message.getSystemException() != null) {
- message.setContent(Exception.class,
+ message.setContent(Exception.class,
message.getExchange().getOutMessage().getContent(Exception.class));
Endpoint ep = message.getExchange().getEndpoint();
@@ -108,7 +108,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
CorbaTypeEventProducer eventProducer = null;
Exchange exchange = message.getExchange();
- BindingOperationInfo bindingOpInfo = exchange.getBindingOperationInfo();
+ BindingOperationInfo bindingOpInfo = exchange.getBindingOperationInfo();
BindingMessageInfo msgInfo = bindingOpInfo.getOutput();
boolean wrap = false;
@@ -150,7 +150,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
CorbaTypeMap typeMap = message.getCorbaTypeMap();
- BindingInfo bInfo = destination.getBindingInfo();
+ BindingInfo bInfo = destination.getBindingInfo();
InterfaceInfo info = bInfo.getInterface();
String opName = exchange.get(String.class);
Iterator<BindingOperationInfo> i = bInfo.getOperations().iterator();
@@ -173,7 +173,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
orb = exchange.get(ORB.class);
ServerRequest request = exchange.get(ServerRequest.class);
- NVList list = prepareArguments(message, info, opType,
+ NVList list = prepareArguments(message, info, opType,
opQName, typeMap,
destination, service);
request.arguments(list);
@@ -210,51 +210,51 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
QName opQName,
CorbaTypeMap typeMap,
CorbaDestination destination,
- ServiceInfo service) {
- BindingInfo bInfo = destination.getBindingInfo();
+ ServiceInfo service) {
+ BindingInfo bInfo = destination.getBindingInfo();
EndpointInfo eptInfo = destination.getEndPointInfo();
BindingOperationInfo bOpInfo = bInfo.getOperation(opQName);
- OperationInfo opInfo = bOpInfo.getOperationInfo();
+ OperationInfo opInfo = bOpInfo.getOperationInfo();
Exchange exg = corbaMsg.getExchange();
exg.put(BindingInfo.class, bInfo);
exg.put(InterfaceInfo.class, info);
exg.put(EndpointInfo.class, eptInfo);
exg.put(EndpointReferenceType.class, destination.getAddress());
exg.put(ServiceInfo.class, service);
- exg.put(BindingOperationInfo.class, bOpInfo);
+ exg.put(BindingOperationInfo.class, bOpInfo);
exg.put(OperationInfo.class, opInfo);
exg.put(MessageInfo.class, opInfo.getInput());
- exg.put(String.class, opQName.getLocalPart());
+ exg.put(String.class, opQName.getLocalPart());
exg.setInMessage(corbaMsg);
corbaMsg.put(MessageInfo.class, opInfo.getInput());
-
- List<ParamType> paramTypes = opType.getParam();
- CorbaStreamable[] arguments = new CorbaStreamable[paramTypes.size()];
- NVList list = prepareDIIArgsList(corbaMsg, bOpInfo,
- arguments, paramTypes,
+
+ List<ParamType> paramTypes = opType.getParam();
+ CorbaStreamable[] arguments = new CorbaStreamable[paramTypes.size()];
+ NVList list = prepareDIIArgsList(corbaMsg, bOpInfo,
+ arguments, paramTypes,
typeMap,
- exg.get(ORB.class), service);
-
+ exg.get(ORB.class), service);
+
return list;
-
+
}
-
+
protected NVList prepareDIIArgsList(CorbaMessage corbaMsg,
BindingOperationInfo boi,
- CorbaStreamable[] streamables,
+ CorbaStreamable[] streamables,
List<ParamType> paramTypes,
CorbaTypeMap map,
ORB orb,
ServiceInfo service) {
try {
- // Build the list of DII arguments, returns, and exceptions
- NVList list = orb.create_list(streamables.length);
+ // Build the list of DII arguments, returns, and exceptions
+ NVList list = orb.create_list(streamables.length);
OperationInfo opInfo = boi.getOperationInfo();
- MessageInfo input = opInfo.getInput();
+ MessageInfo input = opInfo.getInput();
MessageInfo output = opInfo.getOutput();
-
+
String inWrapNSUri = null;
String outWrapNSUri = null;
@@ -297,7 +297,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
outMsgIndex++;
}
}
- CorbaObjectHandler obj =
+ CorbaObjectHandler obj =
CorbaHandlerUtils.initializeObjectHandler(orb, paramName, paramIdlType, map, service);
streamables[i] = corbaMsg.createStreamableObject(obj, paramName);
@@ -313,7 +313,7 @@ public class CorbaStreamInInterceptor extends AbstractPhaseInterceptor<Message>
streamables[i].getObject().setIntoAny(value, streamables[i], false);
}
- list.add_value(streamables[i].getName(), value, streamables[i].getMode());
+ list.add_value(streamables[i].getName(), value, streamables[i].getMode());
corbaMsg.addStreamableArgument(streamables[i]);
}
return list;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
index 407fad1..0de7dc0 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutEndingInterceptor.java
@@ -117,7 +117,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
for (Iterator<ParamType> iter = paramTypes.iterator(); iter.hasNext();) {
ParamType param = iter.next();
QName idlType = param.getIdltype();
-
+
QName paramName;
CorbaObjectHandler obj = null;
if (param.getMode().equals(ModeType.OUT)) {
@@ -207,7 +207,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
}
message.addStreamableArgument(streamable);
}
-
+
}
protected QName getMessageParamQName(MessageInfo msgInfo,
@@ -223,7 +223,7 @@ public class CorbaStreamOutEndingInterceptor extends AbstractPhaseInterceptor<Me
return paramQName;
}
- protected String getWrappedParamNamespace(MessageInfo msgInfo) {
+ protected String getWrappedParamNamespace(MessageInfo msgInfo) {
MessagePartInfo part = msgInfo.getMessageParts().get(0);
if (part.isElement()) {
return part.getElementQName().getNamespaceURI();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
index c544ef4..7ec3265 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/CorbaStreamOutInterceptor.java
@@ -105,9 +105,9 @@ public class CorbaStreamOutInterceptor extends AbstractPhaseInterceptor<Message>
}
}
CorbaStreamWriter writer = new CorbaStreamWriter(orb, params, typeMap, service, wrap);
- message.setContent(XMLStreamWriter.class, writer);
+ message.setContent(XMLStreamWriter.class, writer);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
index 35b4e8f..c3e04d9 100755
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
@@ -27,9 +27,9 @@ import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.InputStream;
import org.omg.CORBA.portable.OutputStream;
-public final class SystemExceptionHelper
+public final class SystemExceptionHelper
implements org.omg.CORBA.portable.Streamable {
-
+
private static final int BAD_CONTEXT = 0;
private static final int BAD_INV_ORDER = 1;
private static final int BAD_OPERATION = 2;
@@ -66,7 +66,7 @@ public final class SystemExceptionHelper
private static final int TRANSACTION_UNAVAILABLE = 33;
private static final int TRANSIENT = 34;
private static final int UNKNOWN = 35;
-
+
private static final String[] IDS = {
"IDL:omg.org/CORBA/BAD_CONTEXT:1.0",
"IDL:omg.org/CORBA/BAD_INV_ORDER:1.0",
@@ -98,14 +98,14 @@ public final class SystemExceptionHelper
SystemException value;
TypeCode typeCode;
-
+
private SystemExceptionHelper() {
}
private SystemExceptionHelper(SystemException ex) {
value = ex;
}
-
-
+
+
private static int binarySearch(String[] arr, String value) {
int left = 0;
@@ -133,9 +133,9 @@ public final class SystemExceptionHelper
any.insert_Streamable(new SystemExceptionHelper(val));
}
-
-
- //CHECKSTYLE:OFF
+
+
+ //CHECKSTYLE:OFF
//NCSS is to high for this due to the massive switch statement
public static SystemException read(org.omg.CORBA.portable.InputStream in) {
@@ -258,13 +258,13 @@ public final class SystemExceptionHelper
return ex;
}
//CHECKSTYLE:ON
-
-
-
+
+
+
public void _read(InputStream instream) {
value = read(instream);
}
-
+
public TypeCode _type() {
if (typeCode == null) {
ORB orb = ORB.init();
@@ -288,7 +288,7 @@ public final class SystemExceptionHelper
name = className.substring(className.lastIndexOf('.') + 1);
id = "IDL:omg.org/CORBA/" + name + ":1.0";
}
-
+
typeCode = orb.create_exception_tc(id, name, smBuf);
}
return typeCode;
@@ -300,7 +300,7 @@ public final class SystemExceptionHelper
id = "IDL:omg.org/CORBA/UNKNOWN";
} else {
String className = value.getClass().getName();
- id = "IDL:omg.org/CORBA/"
+ id = "IDL:omg.org/CORBA/"
+ className.substring(className.lastIndexOf('.') + 1) + ":1.0";
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
index 663d41b..93a08a7 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaDSIServant.java
@@ -51,17 +51,17 @@ public class CorbaDSIServant extends DynamicImplementation {
private static final Logger LOG = LogUtils.getL7dLogger(CorbaDSIServant.class);
private ORB orb;
- private POA servantPOA;
+ private POA servantPOA;
private List<String> interfaces;
private MessageObserver incomingObserver;
private CorbaDestination destination;
private Map<String, QName> operationMap;
private CorbaTypeMap typeMap;
-
+
public CorbaDSIServant() {
//Complete
}
-
+
public void init(ORB theOrb,
POA poa,
CorbaDestination dest,
@@ -79,10 +79,10 @@ public class CorbaDSIServant extends DynamicImplementation {
destination = dest;
incomingObserver = observer;
typeMap = map;
-
+
// Get the list of interfaces that this servant will support
- try {
- BindingType bindType = destination.getBindingInfo().getExtensor(BindingType.class);
+ try {
+ BindingType bindType = destination.getBindingInfo().getExtensor(BindingType.class);
if (bindType == null) {
throw new CorbaBindingException("Unable to determine corba binding information");
}
@@ -102,7 +102,7 @@ public class CorbaDSIServant extends DynamicImplementation {
// the WSDL operation name may not always match the CORBA operation name.
BindingInfo bInfo = destination.getBindingInfo();
Iterator<BindingOperationInfo> i = bInfo.getOperations().iterator();
-
+
operationMap = new HashMap<String, QName>(bInfo.getOperations().size());
while (i.hasNext()) {
@@ -117,11 +117,11 @@ public class CorbaDSIServant extends DynamicImplementation {
public MessageObserver getObserver() {
return incomingObserver;
}
-
+
public void setObserver(MessageObserver observer) {
incomingObserver = observer;
}
-
+
public ORB getOrb() {
return orb;
}
@@ -141,11 +141,11 @@ public class CorbaDSIServant extends DynamicImplementation {
public void setCorbaTypeMap(CorbaTypeMap map) {
typeMap = map;
}
-
+
public void invoke(ServerRequest request) throws CorbaBindingException {
String opName = request.operation();
QName requestOperation = operationMap.get(opName);
-
+
MessageImpl msgImpl = new MessageImpl();
msgImpl.setDestination(getDestination());
Exchange exg = new ExchangeImpl();
@@ -155,7 +155,7 @@ public class CorbaDSIServant extends DynamicImplementation {
msgImpl.setExchange(exg);
CorbaMessage msg = new CorbaMessage(msgImpl);
msg.setCorbaTypeMap(typeMap);
-
+
// If there's no output message part in our operation then it's a oneway op
BindingMessageInfo bindingMsgOutputInfo = null;
BindingOperationInfo bindingOpInfo = null;
@@ -168,13 +168,13 @@ public class CorbaDSIServant extends DynamicImplementation {
bindingMsgOutputInfo = bindingOpInfo.getOutput();
if (bindingMsgOutputInfo == null) {
exg.setOneWay(true);
- }
+ }
}
-
+
// invokes the interceptors
getObserver().onMessage(msg);
}
-
+
public String[] _all_interfaces(POA poa, byte[] objectId) {
return interfaces.toArray(new String[interfaces.size()]);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
index 182024f..328de06 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReader.java
@@ -116,7 +116,7 @@ public class CorbaObjectReader {
case TCKind._tk_any:
((CorbaAnyHandler)obj).setValue(this.readAny());
break;
-
+
// Now for the complex types
case TCKind._tk_array:
this.readArray((CorbaArrayHandler)obj);
@@ -141,7 +141,7 @@ public class CorbaObjectReader {
break;
case TCKind._tk_objref:
this.readObjectReference((CorbaObjectReferenceHandler)obj);
- break;
+ break;
default:
// TODO: Provide Implementation. Do we throw an exception.
}
@@ -372,7 +372,7 @@ public class CorbaObjectReader {
discLabel = disc.getValue();
} else {
read(discriminator);
- discLabel = ((CorbaPrimitiveHandler)discriminator).getDataFromValue();
+ discLabel = ((CorbaPrimitiveHandler)discriminator).getDataFromValue();
}
// Now find the label in the union to get the right case
Unionbranch defaultBranch = null;
@@ -397,7 +397,7 @@ public class CorbaObjectReader {
break;
}
}
-
+
// If we never find a case that matches the value of the discriminiator, then we must have
// found the default case.
if (!caseFound && defaultBranch != null) {
@@ -418,7 +418,7 @@ public class CorbaObjectReader {
switch(arrayElements.get(0).getTypeCodeKind().value()) {
case TCKind._tk_boolean: {
boolean[] values = new boolean[arraySize];
- stream.read_boolean_array(values, 0, arraySize);
+ stream.read_boolean_array(values, 0, arraySize);
val = values;
break;
}
@@ -523,7 +523,7 @@ public class CorbaObjectReader {
List<CorbaObjectHandler> seqElements = sequenceObj.getElements();
int length = stream.read_ulong();
List<CorbaObjectHandler> elements = new ArrayList<>(length);
-
+
// Simply checking the bound won't handle our recursive types. We need to check for the
// existance of template, which will be present for all unbounded sequences and for bound
// sequences with recursive type elements. Use the template element to construct each
@@ -560,7 +560,7 @@ public class CorbaObjectReader {
private CorbaObjectHandler initializeCorbaObjectHandler(CorbaObjectHandler template) {
Constructor<?> templateConstructor = template.getClass().getDeclaredConstructors()[0];
Object[] params = new Object[4];
-
+
// Check to see if the template type is a recursive type. If so, it means that it is part
// of a sequence and needs to have the name "item" in order
if (template.isRecursive()) {
@@ -572,7 +572,7 @@ public class CorbaObjectReader {
params[1] = template.getIdlType();
params[2] = template.getTypeCode();
params[3] = template.getType();
-
+
CorbaObjectHandler handler = null;
try {
handler = (CorbaObjectHandler) templateConstructor.newInstance(params);
@@ -598,7 +598,7 @@ public class CorbaObjectReader {
for (int i = 0; i < members.size(); i++) {
CorbaObjectHandler member = initializeCorbaObjectHandler(members.get(i));
struct.addMember(member);
- }
+ }
} else if (template instanceof CorbaArrayHandler) {
CorbaArrayHandler templateArray = (CorbaArrayHandler) template;
CorbaArrayHandler array = (CorbaArrayHandler) handler;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
index fdc99f0..a6af129 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriter.java
@@ -126,7 +126,7 @@ public class CorbaObjectWriter {
break;
case TCKind._tk_objref:
this.writeObjectReference((CorbaObjectReferenceHandler)obj);
- break;
+ break;
default:
// TODO: Provide Implementation. Do we throw an exception.
}
@@ -265,14 +265,14 @@ public class CorbaObjectWriter {
Enum enumType = (Enum)enumHandler.getType();
String enumLabel = enumHandler.getValue();
List<Enumerator> enumerators = enumType.getEnumerator();
-
+
for (int i = 0; i < enumerators.size(); ++i) {
if (enumerators.get(i).getValue().equals(enumLabel)) {
stream.write_long(i);
return;
}
}
-
+
throw new CorbaBindingException("CorbaObjectWriter: unable to find enumeration label");
}
@@ -309,9 +309,9 @@ public class CorbaObjectWriter {
}
public void writeUnion(CorbaObjectHandler obj) throws CorbaBindingException {
- Union unionType = (Union) obj.getType();
+ Union unionType = (Union) obj.getType();
List<Unionbranch> branches = unionType.getUnionbranch();
- if (branches.size() > 0) {
+ if (branches.size() > 0) {
CorbaObjectHandler discriminator = ((CorbaUnionHandler)obj).getDiscriminator();
this.write(discriminator);
CorbaObjectHandler unionValue = ((CorbaUnionHandler)obj).getValue();
@@ -344,8 +344,8 @@ public class CorbaObjectWriter {
}
}
}
-
+
public void writeObjectReference(CorbaObjectReferenceHandler objHandler) throws CorbaBindingException {
stream.write_Object(objHandler.getReference());
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
index 6825d89..de0a1a9 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamReader.java
@@ -32,10 +32,10 @@ import javax.xml.stream.events.Namespace;
import org.apache.cxf.binding.corba.types.CorbaTypeEventProducer;
public class CorbaStreamReader implements XMLStreamReader {
-
+
private CorbaTypeEventProducer eventProducer;
private int currentState;
-
+
public CorbaStreamReader(CorbaTypeEventProducer evProducer) {
eventProducer = evProducer;
currentState = XMLStreamReader.START_DOCUMENT;
@@ -138,7 +138,7 @@ public class CorbaStreamReader implements XMLStreamReader {
return ret;
}
-
+
public String getAttributeNamespace(int arg0) {
String ret = null;
List<Attribute> currentAttributes = eventProducer.getAttributes();
@@ -217,7 +217,7 @@ public class CorbaStreamReader implements XMLStreamReader {
// TODO Auto-generated method stub
return null;
}
-
+
};
}
@@ -333,7 +333,7 @@ public class CorbaStreamReader implements XMLStreamReader {
}
public void require(int arg0, String arg1, String arg2) throws XMLStreamException {
- // TODO Auto-generated method stub
+ // TODO Auto-generated method stub
}
public boolean standaloneSet() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
index ede89cd..24703f5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/CorbaStreamWriter.java
@@ -57,10 +57,10 @@ public class CorbaStreamWriter implements XMLStreamWriter {
private Stack<QName> elements = new Stack<QName>();
private QName paramElement;
- private QName wrapElementName;
+ private QName wrapElementName;
private boolean skipWrap;
-
+
public CorbaStreamWriter(ORB orbRef,
CorbaTypeMap map,
@@ -180,7 +180,7 @@ public class CorbaStreamWriter implements XMLStreamWriter {
writeStartElement(localName);
writeEndElement();
}
-
+
public void writeEndDocument()
throws XMLStreamException {
}
@@ -309,9 +309,9 @@ public class CorbaStreamWriter implements XMLStreamWriter {
throws java.lang.IllegalArgumentException {
return null;
}
-
-
-
+
+
+
public class CorbaNamespaceContext implements NamespaceContext {
private Map<String, String> map;
@@ -325,7 +325,7 @@ public class CorbaStreamWriter implements XMLStreamWriter {
this.map = map;
this.parent = p;
}
-
+
public void push() {
parent = new CorbaNamespaceContext(map, parent);
map = new HashMap<String, String>();
@@ -336,7 +336,7 @@ public class CorbaStreamWriter implements XMLStreamWriter {
parent = parent.parent;
}
}
-
+
public void setPrefix(String pfx, String ns) {
map.put(pfx, ns);
}
@@ -377,5 +377,5 @@ public class CorbaStreamWriter implements XMLStreamWriter {
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
index cd860ce..c9a21bc 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/runtime/OrbConfigurer.java
@@ -40,7 +40,7 @@ public class OrbConfigurer {
public void setOrbArgs(List<String> args) {
orbArgs = args;
}
-
+
public List<String> getOrbArgs() {
return orbArgs;
}
@@ -48,7 +48,7 @@ public class OrbConfigurer {
public Properties getOrbProperties() {
return orbProperties;
}
-
+
public void setOrbProperties(Properties props) {
orbProperties = props;
}
@@ -67,7 +67,7 @@ public class OrbConfigurer {
factory = b.getExtension(CorbaBindingFactory.class);
}
}
-
+
@PostConstruct
public void register() {
if (factory != null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java
index 56bfc09..e8bd3a4 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractCorbaTypeListener.java
@@ -27,7 +27,7 @@ public abstract class AbstractCorbaTypeListener implements CorbaTypeListener {
protected QName currentElement;
protected CorbaObjectHandler handler;
protected NamespaceContext ctx;
-
+
public AbstractCorbaTypeListener(CorbaObjectHandler h) {
handler = h;
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
index 3c4e4a4..8d6ed4f 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractNoStartEndEventProducer.java
@@ -30,7 +30,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.omg.CORBA.ORB;
public abstract class AbstractNoStartEndEventProducer implements CorbaTypeEventProducer {
-
+
protected CorbaTypeEventProducer currentEventProducer;
protected Iterator<CorbaObjectHandler> iterator;
protected ServiceInfo serviceInfo;
@@ -51,7 +51,7 @@ public abstract class AbstractNoStartEndEventProducer implements CorbaTypeEventP
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/AbstractStartEndEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
index 4dd3829..686f954 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/AbstractStartEndEventProducer.java
@@ -35,7 +35,7 @@ public abstract class AbstractStartEndEventProducer implements
protected int state;
protected final int[] states = {XMLStreamReader.START_ELEMENT, 0, XMLStreamReader.END_ELEMENT};
-
+
protected CorbaTypeEventProducer currentEventProducer;
protected QName name;
protected Iterator<CorbaObjectHandler> iterator;
@@ -63,9 +63,9 @@ public abstract class AbstractStartEndEventProducer implements
return state < states.length;
}
- public int next() {
+ public int next() {
int event = states[state];
- if (event != 0) {
+ if (event != 0) {
state++;
} else if (currentEventProducer != null && currentEventProducer.hasNext()) {
event = currentEventProducer.next();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
index 8032fb6..5a021db 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnonStructEventProducer.java
@@ -23,7 +23,7 @@ import org.apache.cxf.service.model.ServiceInfo;
import org.omg.CORBA.ORB;
public class CorbaAnonStructEventProducer extends AbstractNoStartEndEventProducer {
-
+
// No start and end elements for the sequence
public CorbaAnonStructEventProducer(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/CorbaAnyEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
index f6c57fe..b947ea3 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyEventProducer.java
@@ -67,21 +67,21 @@ public class CorbaAnyEventProducer extends AbstractStartEndEventProducer {
XMLEventFactory factory = XMLEventFactory.newInstance();
attributes = new ArrayList<>();
- attributes.add(factory.createAttribute(new QName(W3CConstants.NU_SCHEMA_XSI, "type"),
- ANY_TYPE_PREFIX + ":"
- + containedSchemaType.getLocalPart()));
+ attributes.add(factory.createAttribute(new QName(W3CConstants.NU_SCHEMA_XSI, "type"),
+ ANY_TYPE_PREFIX + ":"
+ + containedSchemaType.getLocalPart()));
namespaces = new ArrayList<>();
namespaces.add(factory.createNamespace(ANY_TYPE_PREFIX,
containedSchemaType.getNamespaceURI()));
}
- CorbaTypeEventProducer containedProducer =
+ CorbaTypeEventProducer containedProducer =
CorbaHandlerUtils.getTypeEventProducer(containedType, serviceInfo, orb);
if (containedProducer instanceof AbstractStartEndEventProducer) {
iterator = ((AbstractStartEndEventProducer)containedProducer).getNestedTypes();
} else {
List<CorbaTypeEventProducer> prods = new ArrayList<>();
- CorbaSimpleAnyContainedTypeEventProducer simpleProducer =
+ CorbaSimpleAnyContainedTypeEventProducer simpleProducer =
new CorbaSimpleAnyContainedTypeEventProducer(containedProducer.getText());
prods.add(simpleProducer);
producers = prods.iterator();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
index bf2cc59..42f90be 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyHandler.java
@@ -32,16 +32,16 @@ public class CorbaAnyHandler extends CorbaObjectHandler {
private Any value;
private CorbaObjectHandler containedType;
private CorbaTypeMap typeMap;
-
- public CorbaAnyHandler(QName anyName,
- QName anyIdlType,
- TypeCode anyTC,
+
+ public CorbaAnyHandler(QName anyName,
+ QName anyIdlType,
+ TypeCode anyTC,
Object anyType) {
super(anyName, anyIdlType, anyTC, anyType);
-
+
value = null;
}
-
+
public Any getValue() {
return value;
}
@@ -65,7 +65,7 @@ public class CorbaAnyHandler extends CorbaObjectHandler {
public CorbaTypeMap getTypeMap() {
return typeMap;
}
-
+
public void setValue(Any v) throws CorbaBindingException {
value = v;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java
index 9c7cce0..b7824d1 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaAnyListener.java
@@ -93,7 +93,7 @@ public class CorbaAnyListener extends AbstractCorbaTypeListener {
CorbaObjectHandler obj = primitiveListener.getCorbaObject();
Any a = orb.create_any();
-
+
CorbaAnyHandler anyHandler = (CorbaAnyHandler)handler;
anyHandler.setValue(a);
anyHandler.setAnyContainedType(obj);
@@ -125,7 +125,7 @@ public class CorbaAnyListener extends AbstractCorbaTypeListener {
// typemap.
idlType = new QName(typeMap.getTargetNamespace(), schemaType.getLocalPart());
}
-
+
return idlType;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java
index 1e856c1..0a67141 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayHandler.java
@@ -28,23 +28,23 @@ import org.omg.CORBA.TypeCode;
public class CorbaArrayHandler extends CorbaObjectHandler {
private List<CorbaObjectHandler> elements = new ArrayList<>();
-
+
public CorbaArrayHandler(QName arrayName, QName arrayIdlType, TypeCode arrayTC, Object arrayType) {
super(arrayName, arrayIdlType, arrayTC, arrayType);
}
-
+
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);
}
@@ -53,5 +53,5 @@ public class CorbaArrayHandler extends CorbaObjectHandler {
for (int i = 0; i < elements.size(); i++) {
elements.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/CorbaArrayListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java
index d9fa878..121a943 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaArrayListener.java
@@ -35,7 +35,7 @@ public class CorbaArrayListener extends AbstractCorbaTypeListener {
private QName currentElName;
private CorbaTypeListener currentTypeListener;
private ServiceInfo serviceInfo;
-
+
public CorbaArrayListener(CorbaObjectHandler handler,
CorbaTypeMap map,
ORB orbRef, ServiceInfo sInfo) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
index e9b4332..1a5c5c1 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumEventProducer.java
@@ -37,7 +37,7 @@ public class CorbaEnumEventProducer 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/CorbaEnumHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java
index d0ae4d5..d8298fb 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumHandler.java
@@ -30,18 +30,18 @@ public class CorbaEnumHandler extends CorbaObjectHandler {
private String value;
private long index;
-
+
public CorbaEnumHandler(QName enumName, QName enumIdlType, TypeCode enumTC, Object enumType) {
super(enumName, enumIdlType, enumTC, enumType);
}
-
+
public String getValue() {
return value;
}
-
+
public void setValue(String val) {
value = val;
-
+
Enum enumType = (Enum)this.type;
List<Enumerator> enumerators = enumType.getEnumerator();
index = -1;
@@ -53,7 +53,7 @@ public class CorbaEnumHandler extends CorbaObjectHandler {
}
}
}
-
+
public long getIndex() {
return index;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java
index 6b81a1c..6550d9a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaEnumListener.java
@@ -26,5 +26,5 @@ public class CorbaEnumListener extends AbstractCorbaTypeListener {
public void processCharacters(String text) {
((CorbaEnumHandler) handler).setValue(text);
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java
index 7220b9b..f3922f5 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionHandler.java
@@ -31,29 +31,29 @@ public class CorbaExceptionHandler extends CorbaObjectHandler {
List<CorbaObjectHandler> members = new ArrayList<>();
String id;
-
+
public CorbaExceptionHandler(QName exName, QName exIdlType, TypeCode exTC, Object exType) {
name = exName;
idlType = exIdlType;
typeCode = exTC;
type = (NamedType)exType;
}
-
+
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)) {
@@ -61,14 +61,14 @@ public class CorbaExceptionHandler extends CorbaObjectHandler {
break;
}
}
-
+
return member;
}
-
+
public String getId() {
return id;
}
-
+
public void setId(String eid) {
id = eid;
}
@@ -77,7 +77,7 @@ public class CorbaExceptionHandler extends CorbaObjectHandler {
for (int i = 0; i < members.size(); i++) {
members.get(i).clear();
}
- }
-
+ }
+
// TODO: Can we add the features that exist in the main package here?
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java
index 4e13aa8..aaec46a 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaExceptionListener.java
@@ -41,7 +41,7 @@ public class CorbaExceptionListener extends AbstractCorbaTypeListener {
public CorbaExceptionListener(CorbaObjectHandler handler,
CorbaTypeMap map,
- ORB orbRef,
+ ORB orbRef,
ServiceInfo serviceInfo) {
super(handler);
orb = orbRef;
@@ -58,7 +58,7 @@ public class CorbaExceptionListener extends AbstractCorbaTypeListener {
CorbaHandlerUtils.getTypeListener(name,
exMembers.get(memberCount).getIdltype(),
typeMap,
- orb,
+ orb,
sInfo);
currentTypeListener.setNamespaceContext(ctx);
((CorbaExceptionHandler)handler).addMember(currentTypeListener.getCorbaObject());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
index bd0b652..f0d8810 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedEventProducer.java
@@ -38,7 +38,7 @@ public class CorbaFixedEventProducer implements CorbaTypeEventProducer {
name = handler.getName();
}
- public String getLocalName() {
+ public String getLocalName() {
return handler.getSimpleName();
}
@@ -57,7 +57,7 @@ public class CorbaFixedEventProducer implements CorbaTypeEventProducer {
public boolean hasNext() {
return state < states.length;
}
-
+
public List<Attribute> getAttributes() {
return null;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
index 2d3e0b5..c628e6c 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedHandler.java
@@ -32,10 +32,10 @@ public final class CorbaFixedHandler extends CorbaObjectHandler {
private final long digits;
private final long scale;
private BigDecimal value;
-
+
public CorbaFixedHandler(QName fixedName, QName fixedIdlType, TypeCode fixedTC, Object fixedType) {
super(fixedName, fixedIdlType, fixedTC, fixedType);
-
+
if (fixedType instanceof Fixed) {
digits = ((Fixed)fixedType).getDigits();
scale = ((Fixed)fixedType).getScale();
@@ -48,32 +48,32 @@ public final class CorbaFixedHandler extends CorbaObjectHandler {
scale = 0;
}
}
-
+
public long getDigits() {
return digits;
}
-
+
public long getScale() {
return scale;
}
-
+
public BigDecimal getValue() {
return value;
}
-
+
public String getValueData() {
return value.toString();
}
-
+
public void setValue(BigDecimal val) {
value = val;
}
-
+
public void setValueFromData(String data) {
value = new BigDecimal(data);
}
public void clear() {
value = null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java
index 4728d95..ca940a2 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaFixedListener.java
@@ -26,5 +26,5 @@ public class CorbaFixedListener extends AbstractCorbaTypeListener {
public void processCharacters(String text) {
((CorbaFixedHandler) 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/CorbaObjectHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
index 3c348bb..0e79543 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectHandler.java
@@ -27,7 +27,7 @@ import org.omg.CORBA.Any;
import org.omg.CORBA.TCKind;
import org.omg.CORBA.TypeCode;
-// This class serves as a base for all other specific object type handlers and
+// This class serves as a base for all other specific object type handlers and
// provides basic functionality that is common for all objects.
public class CorbaObjectHandler {
@@ -40,34 +40,34 @@ public class CorbaObjectHandler {
public CorbaObjectHandler() {
}
-
+
public CorbaObjectHandler(QName objName, QName objIdlType, TypeCode objTC, Object objType) {
name = objName;
idlType = objIdlType;
typeCode = objTC;
type = (CorbaType)objType;
}
-
+
public QName getName() {
return name;
}
-
+
public String getSimpleName() {
return name.getLocalPart();
}
-
+
public QName getIdlType() {
return idlType;
}
-
+
public TypeCode getTypeCode() {
return typeCode;
}
-
+
public TCKind getTypeCodeKind() {
return typeCode.kind();
}
-
+
public CorbaType getType() {
return type;
}
@@ -88,9 +88,9 @@ public class CorbaObjectHandler {
return isRecursive;
}
- public void clear() {
+ public void clear() {
}
-
+
public void setIntoAny(Any value, CorbaStreamable stream, boolean output) {
value.insert_Streamable(stream);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
index 840bd0f..8b042aa 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceEventProducer.java
@@ -57,8 +57,8 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
private static final String INFER_FROM_TYPE_ID = "InferFromTypeId";
private static final Logger LOG = LogUtils.getL7dLogger(CorbaObjectReferenceEventProducer.class);
- List<Attribute> refAttrs;
-
+ List<Attribute> refAttrs;
+
public CorbaObjectReferenceEventProducer(CorbaObjectHandler h, ServiceInfo service, ORB orbRef) {
CorbaObjectReferenceHandler handler = (CorbaObjectReferenceHandler) h;
name = CorbaUtils.processQName(handler.getName(), service);
@@ -72,12 +72,12 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
}
List<CorbaTypeEventProducer> objRefProducers = new ArrayList<>();
-
+
String address = orb.object_to_string(handler.getReference());
objRefProducers.add(new CorbaAddressEventProducer(address));
Definition wsdlDef = (Definition)serviceInfo.getProperty(WSDLServiceBuilder.WSDL_DEFINITION);
-
+
// Get the TypeImpl of the object reference so that we can determine the binding
// needed for this object reference
org.apache.cxf.binding.corba.wsdl.Object objType =
@@ -85,7 +85,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
QName bindingName = objType.getBinding();
if (bindingName != null) {
EprMetaData eprInfo = null;
- if (INFER_FROM_TYPE_ID.equalsIgnoreCase(bindingName.getLocalPart())) {
+ if (INFER_FROM_TYPE_ID.equalsIgnoreCase(bindingName.getLocalPart())) {
String typeId = CorbaObjectReferenceHelper.extractTypeIdFromIOR(address);
if (!StringUtils.isEmpty(typeId)) {
eprInfo = getEprMetadataForTypeId(wsdlDef, typeId);
@@ -93,12 +93,12 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
LOG.log(Level.SEVERE, "For binding with value \"" + INFER_FROM_TYPE_ID
+ "\" the type_id of the object reference IOR must be set to its most"
+ " derived type. It is currently null indicating CORBA:Object."
- + " Address Url=" + address);
+ + " Address Url=" + address);
}
- } else {
+ } else {
eprInfo = getEprMetadataForBindingName(wsdlDef, bindingName);
}
-
+
if (eprInfo.isValid()) {
LOG.log(Level.FINE, "Epr metadata " + eprInfo);
// Create the meta data producer and add its child producers.
@@ -109,20 +109,20 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
CorbaInterfaceNameEventProducer interfaceProducer =
new CorbaInterfaceNameEventProducer(interfaceName);
CorbaMetaDataEventProducer metaProducer =
- new CorbaMetaDataEventProducer(wsdlLoc, nameProducer, interfaceProducer);
+ new CorbaMetaDataEventProducer(wsdlLoc, nameProducer, interfaceProducer);
objRefProducers.add(metaProducer);
}
}
producers = objRefProducers.iterator();
}
-
+
private EprMetaData getEprMetadataForBindingName(Definition wsdlDef, QName bindingName) {
- EprMetaData info = getObjectReferenceBinding(wsdlDef, bindingName);
+ EprMetaData info = getObjectReferenceBinding(wsdlDef, bindingName);
CorbaObjectReferenceHelper.populateEprInfo(info);
return info;
}
- private EprMetaData getEprMetadataForTypeId(Definition wsdlDef, String typeId) {
+ private EprMetaData getEprMetadataForTypeId(Definition wsdlDef, String typeId) {
EprMetaData info = CorbaObjectReferenceHelper.getBindingForTypeId(typeId, wsdlDef);
CorbaObjectReferenceHelper.populateEprInfo(info);
return info;
@@ -134,12 +134,12 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
}
return refAttrs;
}
-
+
protected EprMetaData getObjectReferenceBinding(Definition wsdlDef, QName bindingName) {
EprMetaData info = new EprMetaData();
Binding wsdlBinding = wsdlDef.getBinding(bindingName);
-
- // If the binding name does not have a namespace associated with it, then we'll need to
+
+ // If the binding name does not have a namespace associated with it, then we'll need to
// get the list of all bindings and compare their local parts against our name.
if (wsdlBinding == null && bindingName.getNamespaceURI().equals("")
&& !bindingName.getLocalPart().equals("")) {
@@ -151,12 +151,12 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
}
}
}
-
+
if (wsdlBinding != null) {
info.setBinding(wsdlBinding);
info.setCandidateWsdlDef(wsdlDef);
}
-
+
return info;
}
@@ -164,8 +164,8 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
class CorbaAddressEventProducer implements CorbaTypeEventProducer {
int state;
- int[] states = {XMLStreamReader.START_ELEMENT,
- XMLStreamReader.CHARACTERS,
+ int[] states = {XMLStreamReader.START_ELEMENT,
+ XMLStreamReader.CHARACTERS,
XMLStreamReader.END_ELEMENT};
final String address;
@@ -213,7 +213,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
CorbaMetaDataEventProducer(CorbaServiceNameEventProducer svc) {
this(null, svc, null);
}
-
+
CorbaMetaDataEventProducer(String location,
CorbaServiceNameEventProducer svc,
CorbaInterfaceNameEventProducer intf) {
@@ -227,7 +227,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
}
producers = metaDataProducers.iterator();
-
+
if (location != null) {
XMLEventFactory factory = XMLEventFactory.newInstance();
metaAttrs = new ArrayList<>();
@@ -244,7 +244,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
return metaAttrs;
}
}
-
+
}
// An event producer to handle the production of the ServiceName XML data.
@@ -264,7 +264,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
name = new QName(CorbaObjectReferenceHelper.ADDRESSING_WSDL_NAMESPACE_URI,
"ServiceName");
-
+
XMLEventFactory factory = XMLEventFactory.newInstance();
attributes = new ArrayList<>();
@@ -318,7 +318,7 @@ public final class CorbaObjectReferenceEventProducer extends AbstractStartEndEve
name = new QName(CorbaObjectReferenceHelper.ADDRESSING_WSDL_NAMESPACE_URI,
"InterfaceName");
-
+
XMLEventFactory factory = XMLEventFactory.newInstance();
namespaces = new ArrayList<>();
namespaces.add(factory.createNamespace("objrefns2", intf.getNamespaceURI()));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java
index 3500a22..b85c49f 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaObjectReferenceHandler.java
@@ -42,5 +42,5 @@ public class CorbaObjectReferenceHandler extends CorbaObjectHandler {
public void clear() {
value = null;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
index 6d34f1d..501ff49 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceEventProducer.java
@@ -30,7 +30,7 @@ public class CorbaOctetSequenceEventProducer implements CorbaTypeEventProducer {
int state;
final int[] states = {XMLStreamReader.START_ELEMENT,
XMLStreamReader.CHARACTERS,
- XMLStreamReader.END_ELEMENT};
+ XMLStreamReader.END_ELEMENT};
final CorbaOctetSequenceHandler seqHandler;
final QName name;
@@ -39,7 +39,7 @@ public class CorbaOctetSequenceEventProducer implements CorbaTypeEventProducer {
name = seqHandler.getName();
}
- public String getLocalName() {
+ public String getLocalName() {
return seqHandler.getSimpleName();
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
----------------------------------------------------------------------
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
index 009ed7d..3251ec9 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaOctetSequenceHandler.java
@@ -29,7 +29,7 @@ public class CorbaOctetSequenceHandler extends CorbaObjectHandler {
private byte[] value;
private boolean isBase64Octets;
-
+
public CorbaOctetSequenceHandler(QName primName,
QName primIdlType,
TypeCode primTC,
@@ -37,11 +37,11 @@ public class CorbaOctetSequenceHandler extends CorbaObjectHandler {
super(primName, primIdlType, primTC, primType);
isBase64Octets = getType().getType().equals(W3CConstants.NT_SCHEMA_BASE64);
}
-
+
public byte[] getValue() {
return value;
- }
-
+ }
+
public void setValue(byte[] obj) {
value = obj;
}
@@ -55,7 +55,7 @@ public class CorbaOctetSequenceHandler extends CorbaObjectHandler {
}
return result;
}
-
+
public void setValueFromData(String data) {
try {
if (isBase64Octets) {
@@ -67,7 +67,7 @@ public class CorbaOctetSequenceHandler extends CorbaObjectHandler {
throw new CorbaBindingException("Not able to parse the octet sequence", ex);
}
}
-
+
public void clear() {
value = null;
}