From 2a4f059db71f8d1d00af5cb86296dca555d50b38 Mon Sep 17 00:00:00 2001
From: edwardsmj <edwardsmj@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 21 Jan 2011 12:04:42 +0000
Subject: Fixes to the JavaInterface code dealing with the type of the response
 parameter for an async service method - needed fixup after changes caused by
 the new Holders code.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1061775 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java    | 9 ++++++---
 .../interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java    | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/interface-java/src/main/java')

diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
index 0b0a6cdee6..4a2d9a5dd5 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
@@ -38,6 +38,9 @@ import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
 import org.apache.tuscany.sca.interfacedef.util.XMLType;
 import org.apache.tuscany.sca.policy.Intent;
 
+import static org.apache.tuscany.sca.interfacedef.Operation.IDL_INPUT;
+import static org.apache.tuscany.sca.interfacedef.Operation.IDL_OUTPUT;
+
 import org.oasisopen.sca.ResponseDispatch;
 
 /**
@@ -246,7 +249,8 @@ public class JavaInterfaceImpl extends InterfaceImpl implements JavaInterface {
      * @param requestParams - - async method input parameters
      * @return - the sync method return parameter
      */
-    private DataType<List<DataType>> prepareSyncReturnParam( DataType<List<DataType>> requestParams ) {
+    @SuppressWarnings("rawtypes")
+	private DataType<List<DataType>> prepareSyncReturnParam( DataType<List<DataType>> requestParams ) {
     	List<DataType> requestLogical = requestParams.getLogical();
     	int paramCount = requestLogical.size();
     	
@@ -275,8 +279,7 @@ public class JavaInterfaceImpl extends InterfaceImpl implements JavaInterface {
         returnTypes.add(returnDataType);
         
         DataType<List<DataType>> outputType =
-            new DataTypeImpl<List<DataType>>(requestParams.getDataBinding(),
-            		                         requestParams.getPhysical(), returnTypes);
+            new DataTypeImpl<List<DataType>>(IDL_OUTPUT, requestParams.getPhysical(), returnTypes);
     
         return outputType;
     } // end method prepareSyncReturnParam
diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
index 6979e1d6cd..0d1325e6a8 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
@@ -192,7 +192,8 @@ public class JavaInterfaceIntrospectorImpl {
         return rawType;
     }
 
-    private <T> List<Operation> getOperations(Class<T> clazz,
+    @SuppressWarnings("rawtypes")
+	private <T> List<Operation> getOperations(Class<T> clazz,
                                               boolean remotable,
                                               String ns) throws InvalidInterfaceException {
 
-- 
cgit v1.2.3