Author: wjaniszewski
Date: Fri Aug 15 12:33:17 2008
New Revision: 686344
URL: http://svn.apache.org/viewvc?rev=686344&view=rev
Log:
binding-corba-runtime and binding-sca-corba modules cleanup
Modified:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
Modified:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java?rev=686344&r1=686343&r2=686344&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
(original)
+++
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java
Fri Aug 15 12:33:17 2008
@@ -39,13 +39,11 @@
private Object remoteObject;
private Class<?> referenceClass;
private Map<Method, String> operationsMap;
- private boolean scaBindingRules;
- public CorbaInvoker(Object remoteObject, Class<?> referenceClass,
Map<Method, String> operationsMap, boolean scaBindingRules) {
+ public CorbaInvoker(Object remoteObject, Class<?> referenceClass,
Map<Method, String> operationsMap) {
this.remoteObject = remoteObject;
this.referenceClass = referenceClass;
this.operationsMap = operationsMap;
- this.scaBindingRules = scaBindingRules;
}
/**
@@ -53,7 +51,7 @@
*/
public Message invoke(Message msg) {
try {
- DynaCorbaRequest request = new DynaCorbaRequest(remoteObject,
msg.getOperation().getName(), scaBindingRules);
+ DynaCorbaRequest request = new DynaCorbaRequest(remoteObject,
msg.getOperation().getName());
request.setReferenceClass(referenceClass);
request.setOperationsMap(operationsMap);
if (msg.getOperation().getOutputType() != null) {
Modified:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java?rev=686344&r1=686343&r2=686344&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
(original)
+++
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java
Fri Aug 15 12:33:17 2008
@@ -61,7 +61,7 @@
if (remoteObject == null) {
remoteObject = host.lookup(binding.getCorbaname());
}
- return new CorbaInvoker(remoteObject, referenceClass,
operationsMap, false);
+ return new CorbaInvoker(remoteObject, referenceClass,
operationsMap);
} catch (Exception e) {
}
return null;
Modified:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java?rev=686344&r1=686343&r2=686344&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
(original)
+++
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java
Fri Aug 15 12:33:17 2008
@@ -55,18 +55,6 @@
private List<TypeTree> argumentsTypes = new ArrayList<TypeTree>();
private Class<?> referenceClass;
private Map<Method, String> operationsMap;
- private boolean scaBindingRules;
-
- /**
- * Creates request with CORBA binding mapping rules in default
- *
- * @param remoteObject object reference
- * @param operation operation to invoke
- */
- public DynaCorbaRequest(Object remoteObject, String operation) {
- // use CORBA binding rules by default
- this(remoteObject, operation, false);
- }
/**
* Creates request.
@@ -75,8 +63,7 @@
* @param operation operation to invoke
* @param scaBindingRules apply SCA default binding mapping rules
*/
- public DynaCorbaRequest(Object remoteObject, String operation, boolean
scaBindingRules) {
- this.scaBindingRules = scaBindingRules;
+ public DynaCorbaRequest(Object remoteObject, String operation) {
this.remoteObject = (ObjectImpl)remoteObject;
this.operation = operation;
}
@@ -103,7 +90,7 @@
* @param argument
*/
public void addArgument(java.lang.Object argument) throws
RequestConfigurationException {
- TypeTree tree = TypeTreeCreator.createTypeTree(argument.getClass(),
scaBindingRules);
+ TypeTree tree = TypeTreeCreator.createTypeTree(argument.getClass());
argumentsTypes.add(tree);
arguments.add(argument);
}
@@ -127,7 +114,7 @@
* @param forClass
*/
public void setOutputType(Class<?> forClass) throws
RequestConfigurationException {
- returnTree = TypeTreeCreator.createTypeTree(forClass, scaBindingRules);
+ returnTree = TypeTreeCreator.createTypeTree(forClass);
}
/**
@@ -136,7 +123,7 @@
* @param forClass
*/
public void addExceptionType(Class<?> forClass) throws
RequestConfigurationException {
- TypeTree tree = TypeTreeCreator.createTypeTree(forClass,
scaBindingRules);
+ TypeTree tree = TypeTreeCreator.createTypeTree(forClass);
String exceptionId = Utils.getTypeId(forClass);
exceptions.put(exceptionId, tree);
}
Modified:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java?rev=686344&r1=686343&r2=686344&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
(original)
+++
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java
Fri Aug 15 12:33:17 2008
@@ -108,14 +108,14 @@
if (operation.getOutputType() != null &&
operation.getOutputType().getPhysical() != null
&&
!operation.getOutputType().getPhysical().equals(void.class)) {
TypeTree outputType =
-
TypeTreeCreator.createTypeTree(operation.getOutputType().getPhysical(), false);
+
TypeTreeCreator.createTypeTree(operation.getOutputType().getPhysical());
operationTypes.setOutputType(outputType);
}
// cache input types trees
if (operation.getInputType() != null) {
for (DataType<List<DataType<?>>> type :
operation.getInputType().getLogical()) {
Class<?> forClass = type.getPhysical();
- TypeTree inputType =
TypeTreeCreator.createTypeTree(forClass, false);
+ TypeTree inputType =
TypeTreeCreator.createTypeTree(forClass);
inputInstances.add(inputType);
}
Modified:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java?rev=686344&r1=686343&r2=686344&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
(original)
+++
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java
Fri Aug 15 12:33:17 2008
@@ -103,7 +103,7 @@
try {
OutputStream out = rh.createExceptionReply();
Class<?> exceptionClass =
ie.getTargetException().getClass();
- TypeTree tree =
TypeTreeCreator.createTypeTree(exceptionClass, false);
+ TypeTree tree =
TypeTreeCreator.createTypeTree(exceptionClass);
String exceptionId = Utils.getTypeId(exceptionClass);
out.write_string(exceptionId);
TypeHelpersProxy.write(tree.getRootNode(), out,
ie.getTargetException());
Modified:
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java?rev=686344&r1=686343&r2=686344&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
(original)
+++
tuscany/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java
Fri Aug 15 12:33:17 2008
@@ -139,11 +139,11 @@
* @param forClass
* @return type tree
*/
- public static TypeTree createTypeTree(Class<?> forClass, boolean
scaBindingRules)
+ public static TypeTree createTypeTree(Class<?> forClass)
throws RequestConfigurationException {
TypeTree tree = new TypeTree();
TypeTreeNode rootNode = null;
- rootNode = inspectClassHierarchy(forClass, tree, scaBindingRules);
+ rootNode = inspectClassHierarchy(forClass, tree);
tree.setRootNode(rootNode);
return tree;
@@ -156,16 +156,12 @@
* @param tree
* @return
*/
- private static TypeTreeNode inspectClassHierarchy(Class<?> forClass,
TypeTree tree, boolean scaBindingRules)
+ private static TypeTreeNode inspectClassHierarchy(Class<?> forClass,
TypeTree tree)
throws RequestConfigurationException {
TypeTreeNode node = null;
- if (scaBindingRules) {
- node = createTypeNode4ScaBinding(forClass);
- } else {
- node = createTypeNode4CorbaBinding(forClass);
- }
-
+ node = createTypeNode(forClass);
+
NodeType nodeType = node.getNodeType();
TypeTreeNode[] children = null;
@@ -178,14 +174,14 @@
// reducing sequence dimension
Class<?> reduced = reduceArrayDimension(node.getJavaClass());
children = new TypeTreeNode[1];
- children[0] = inspectClassHierarchy(reduced, tree,
scaBindingRules);
+ children[0] = inspectClassHierarchy(reduced, tree);
} else if (nodeType.equals(NodeType.struct) ||
nodeType.equals(NodeType.exception)) {
// inspect types for every structure member
Field[] fields = node.getJavaClass().getFields();
children = new TypeTreeNode[fields.length];
for (int i = 0; i < fields.length; i++) {
Class<?> field = fields[i].getType();
- TypeTreeNode child = inspectClassHierarchy(field, tree,
scaBindingRules);
+ TypeTreeNode child = inspectClassHierarchy(field, tree);
child.setName(fields[i].getName());
children[i] = child;
}
@@ -208,7 +204,7 @@
* @return node
* @throws RequestConfigurationException
*/
- private static TypeTreeNode createTypeNode4CorbaBinding(Class<?> forClass)
throws RequestConfigurationException {
+ private static TypeTreeNode createTypeNode(Class<?> forClass) throws
RequestConfigurationException {
TypeTreeNode node = new TypeTreeNode();
if (forClass.isArray()) {
node.setNodeType(NodeType.sequence);
@@ -238,23 +234,7 @@
}
return node;
}
-
- private static TypeTreeNode createTypeNode4ScaBinding(Class<?> forClass)
throws RequestConfigurationException {
- TypeTreeNode node = new TypeTreeNode();
- if (forClass.isArray()) {
- node.setNodeType(NodeType.sequence);
- node.setJavaClass(forClass);
- } else if (primitives.contains(forClass)) {
- node.setNodeType(NodeType.primitive);
- node.setJavaClass(forClass);
- node.setChildren(null);
- } else {
- node.setNodeType(NodeType.struct);
- node.setJavaClass(forClass);
- }
- return node;
- }
-
+
/**
* Tells whether given class is structure
*
Modified:
tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java?rev=686344&r1=686343&r2=686344&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
(original)
+++
tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java
Fri Aug 15 12:33:17 2008
@@ -56,9 +56,9 @@
this.messageFactory = messageFactory;
try {
List<TypeTree> inputType = new ArrayList<TypeTree>();
- inputType.add(TypeTreeCreator.createTypeTree(String.class, false));
+ inputType.add(TypeTreeCreator.createTypeTree(String.class));
types.setInputType(inputType);
- types.setOutputType(TypeTreeCreator.createTypeTree(String.class,
false));
+ types.setOutputType(TypeTreeCreator.createTypeTree(String.class));
} catch (RequestConfigurationException e) {
// ignore - string type should not cause this exception
}
Modified:
tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java?rev=686344&r1=686343&r2=686344&view=diff
==============================================================================
---
tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
(original)
+++
tuscany/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java
Fri Aug 15 12:33:17 2008
@@ -54,7 +54,7 @@
*/
public Message invoke(Message msg) {
try {
- DynaCorbaRequest request = new DynaCorbaRequest(remoteObject,
"scaService", false);
+ DynaCorbaRequest request = new DynaCorbaRequest(remoteObject,
"scaService");
request.setReferenceClass(referenceClass);
request.setOutputType(String.class);
request.addExceptionType(WrappedSCAException.class);
