tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r1161519 - /tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
Date Thu, 25 Aug 2011 11:45:53 GMT
Author: slaws
Date: Thu Aug 25 11:45:53 2011
New Revision: 1161519

URL: http://svn.apache.org/viewvc?rev=1161519&view=rev
Log:
Add auditing to callback compatibility testing

Modified:
    tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java

Modified: tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java?rev=1161519&r1=1161518&r2=1161519&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
Thu Aug 25 11:45:53 2011
@@ -388,7 +388,7 @@ public class InterfaceContractMapperImpl
 
         if (source.getInterface() == target.getInterface()) {
             return ignoreCallback
-            || isCallbackCompatible(source, target, silent);
+            || isCallbackCompatible(source, target, silent, audit);
         }
 
         if (source.getInterface() == null || target.getInterface() == null) {
@@ -398,7 +398,7 @@ public class InterfaceContractMapperImpl
         if (source.getInterface().isDynamic()
             || target.getInterface().isDynamic()) {
             return ignoreCallback
-            || isCallbackCompatible(source, target, silent);
+            || isCallbackCompatible(source, target, silent, audit);
         }
 
         if (source.getInterface().isRemotable() != target.getInterface()
@@ -448,7 +448,7 @@ public class InterfaceContractMapperImpl
             }
         }
 
-        return ignoreCallback || isCallbackCompatible(source, target, silent);
+        return ignoreCallback || isCallbackCompatible(source, target, silent, audit);
     }
 
     /*
@@ -476,13 +476,15 @@ public class InterfaceContractMapperImpl
 
 
 
-    protected boolean isCallbackCompatible(InterfaceContract source, InterfaceContract target,
boolean silent)
+    protected boolean isCallbackCompatible(InterfaceContract source, InterfaceContract target,
boolean silent, Audit audit)
         throws IncompatibleInterfaceContractException {
         if (source.getCallbackInterface() == null && target.getCallbackInterface()
== null) {
             return true;
         }
         if (source.getCallbackInterface() == null || target.getCallbackInterface() == null)
{
             if (!silent) {
+                audit.append("Callback interface doesn't match as one of the callback interfaces
is null");
+                audit.appendSeperator();
                 throw new IncompatibleInterfaceContractException("Callback interface doesn't
match as one of the callback interfaces is null", source, target);
             } else {
                 return false;
@@ -494,6 +496,8 @@ public class InterfaceContractMapperImpl
                 getOperation(target.getCallbackInterface().getOperations(), operation.getName());
             if (targetOperation == null) {
                 if (!silent) {
+                    audit.append("Callback operation not found on target " + operation.getName());
+                    audit.appendSeperator();
                     throw new IncompatibleInterfaceContractException("Callback operation
not found on target", source,
                                                                      target, null, targetOperation);
                 } else {
@@ -504,6 +508,8 @@ public class InterfaceContractMapperImpl
                 // FIXME: for remotable operation, only compare name for now
                 if (!operation.equals(targetOperation)) {
                     if (!silent) {
+                        audit.append("Target callback operation is not compatible " + operation.getName());
+                        audit.appendSeperator();
                         throw new IncompatibleInterfaceContractException("Target callback
operation is not compatible",
                                                                          source, target,
operation, targetOperation);
                     } else {



Mime
View raw message