From 1c22b82f37a62e40036cd8fdf70918fd7fc93bd0 Mon Sep 17 00:00:00 2001 From: wjaniszewski Date: Fri, 15 Aug 2008 19:33:17 +0000 Subject: binding-corba-runtime and binding-sca-corba modules cleanup git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@686344 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/binding/corba/impl/CorbaInvoker.java | 6 ++-- .../corba/impl/CorbaReferenceBindingProvider.java | 2 +- .../corba/impl/reference/DynaCorbaRequest.java | 21 +++--------- .../impl/service/ComponentInvocationProxy.java | 4 +-- .../corba/impl/service/DynaCorbaServant.java | 2 +- .../binding/corba/impl/types/TypeTreeCreator.java | 38 +++++----------------- .../sca/corba/impl/CorbaSCAInvocationProxy.java | 4 +-- .../binding/sca/corba/impl/CorbaSCAInvoker.java | 2 +- 8 files changed, 22 insertions(+), 57 deletions(-) (limited to 'java/sca/modules') diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java index 4af0f68856..1d56c62c3a 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java @@ -39,13 +39,11 @@ public class CorbaInvoker implements Invoker { private Object remoteObject; private Class referenceClass; private Map operationsMap; - private boolean scaBindingRules; - public CorbaInvoker(Object remoteObject, Class referenceClass, Map operationsMap, boolean scaBindingRules) { + public CorbaInvoker(Object remoteObject, Class referenceClass, Map operationsMap) { this.remoteObject = remoteObject; this.referenceClass = referenceClass; this.operationsMap = operationsMap; - this.scaBindingRules = scaBindingRules; } /** @@ -53,7 +51,7 @@ public class CorbaInvoker implements Invoker { */ 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) { diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java index e04eb290fd..3eb665d599 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java @@ -61,7 +61,7 @@ public class CorbaReferenceBindingProvider implements ReferenceBindingProvider { 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; diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java index dba3dd7b1e..73b9bb8895 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java @@ -55,18 +55,6 @@ public class DynaCorbaRequest { private List argumentsTypes = new ArrayList(); private Class referenceClass; private Map 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 @@ public class DynaCorbaRequest { * @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 @@ public class DynaCorbaRequest { * @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 @@ public class DynaCorbaRequest { * @param forClass */ public void setOutputType(Class forClass) throws RequestConfigurationException { - returnTree = TypeTreeCreator.createTypeTree(forClass, scaBindingRules); + returnTree = TypeTreeCreator.createTypeTree(forClass); } /** @@ -136,7 +123,7 @@ public class DynaCorbaRequest { * @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); } diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java index c1cd3abe77..48bedf2be3 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/ComponentInvocationProxy.java @@ -108,14 +108,14 @@ public class ComponentInvocationProxy implements InvocationProxy { 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>> type : operation.getInputType().getLogical()) { Class forClass = type.getPhysical(); - TypeTree inputType = TypeTreeCreator.createTypeTree(forClass, false); + TypeTree inputType = TypeTreeCreator.createTypeTree(forClass); inputInstances.add(inputType); } diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java index 21de319e00..955596bb64 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java @@ -103,7 +103,7 @@ public class DynaCorbaServant extends ObjectImpl implements InvokeHandler { 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()); diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java index 4e591eebb1..3cd783e6e4 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java @@ -139,11 +139,11 @@ public class TypeTreeCreator { * @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 @@ public class TypeTreeCreator { * @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 @@ public class TypeTreeCreator { // 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 @@ public class TypeTreeCreator { * @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 @@ public class TypeTreeCreator { } 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 * diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java index 69b0954d03..da8d65d8d2 100644 --- a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java @@ -56,9 +56,9 @@ public class CorbaSCAInvocationProxy implements InvocationProxy { this.messageFactory = messageFactory; try { List inputType = new ArrayList(); - 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 } diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java index 9fee0636e1..f2ab5e94a0 100644 --- a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java @@ -54,7 +54,7 @@ public class CorbaSCAInvoker implements Invoker { */ 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); -- cgit v1.2.3