You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ed...@apache.org on 2011/01/21 13:04:43 UTC

svn commit: r1061775 - in /tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl: JavaInterfaceImpl.java JavaInterfaceIntrospectorImpl.java

Author: edwardsmj
Date: Fri Jan 21 12:04:42 2011
New Revision: 1061775

URL: http://svn.apache.org/viewvc?rev=1061775&view=rev
Log:
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.

Modified:
    tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
    tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java

Modified: tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java?rev=1061775&r1=1061774&r2=1061775&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java Fri Jan 21 12:04:42 2011
@@ -38,6 +38,9 @@ import org.apache.tuscany.sca.interfaced
 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 I
      * @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 I
         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

Modified: tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java?rev=1061775&r1=1061774&r2=1061775&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java Fri Jan 21 12:04:42 2011
@@ -192,7 +192,8 @@ public class JavaInterfaceIntrospectorIm
         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 {