TUSCANY-3950 - Catch up with some differences in the OASIS SCA API classes. Tuscany now matches OASIS svn r286

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1174086 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 30 insertions, 32 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 52a3fbd89a..2017a9d75e 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
@@ -76,11 +76,6 @@ public class ConstructorProcessor extends BaseJavaClassVisitor {
             type.setConstructor(definition);
         }
         JavaParameterImpl[] parameters = definition.getParameters();
-        String[] value = annotation.value();
-        boolean isDefault = value.length == 0 || (value.length == 1 && "".equals(value[0]));
-        if (!isDefault && value.length != parameters.length) {
-            throw new InvalidConstructorException("Invalid Number of names in @Constructor");
-        }
         
         for (JavaParameterImpl p : parameters) {
             if (!hasAnnotation(p)) {
@@ -88,9 +83,6 @@ public class ConstructorProcessor extends BaseJavaClassVisitor {
             }
         }
 
-        for (int i = 0; i < parameters.length; i++) {
-            parameters[i].setName(i < value.length ? value[i] : "");
-        }
         type.setConstructor(definition);
     }
 
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index 512e34a0fa..c5ef426860 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
@@ -42,6 +42,7 @@ import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaParameterImpl;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.oasisopen.sca.annotation.Property;
 import org.oasisopen.sca.annotation.Reference;
@@ -65,6 +66,7 @@ public class ConstructorProcessorTestCase {
         }
     }
 
+    @Ignore("TUSCANY-3950") // no names in constructor annotation now
     @Test
     public void testConstructorAnnotation() throws Exception {
         JavaImplementation type = javaImplementationFactory.createJavaImplementation();
@@ -117,19 +119,19 @@ public class ConstructorProcessorTestCase {
 
     private static class BadFoo {
 
-        @org.oasisopen.sca.annotation.Constructor("foo")
+        @org.oasisopen.sca.annotation.Constructor()
         public BadFoo(String foo) {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor( {"foo", "bar"})
-        public BadFoo(String foo, String bar) {
+        @org.oasisopen.sca.annotation.Constructor()
+        public BadFoo(@Property String foo, @Property String bar) {
 
         }
     }
 
     private static class Foo {
-        @org.oasisopen.sca.annotation.Constructor("foo")
+        @org.oasisopen.sca.annotation.Constructor()
         public Foo(@Property String foo) {
 
         }
@@ -141,8 +143,8 @@ public class ConstructorProcessorTestCase {
     }
 
     private static class BadAnnotation {
-        @org.oasisopen.sca.annotation.Constructor("foo")
-        public BadAnnotation(String foo, Foo ref) {
+        @org.oasisopen.sca.annotation.Constructor()
+        public BadAnnotation(@Property String foo, Foo ref) {
         }
     }
 
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 83e26dff84..cf0943a0d3 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
@@ -31,6 +31,7 @@ import java.util.List;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.oasisopen.sca.annotation.Property;
 
@@ -99,11 +100,12 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest {
         try {
             visitConstructor(ctor, type);
             fail();
-        } catch (InvalidConstructorException e) {
+        } catch (InvalidPropertyException e) {
             // expected
         }
     }
 
+    @Ignore("TUSCANY-3950") // no names in constructor annotation now
     @Test
     public void testNoMatchingNames() throws Exception {
         JavaImplementation type = javaImplementationFactory.createJavaImplementation();
@@ -129,8 +131,8 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor("myProp")
-        public Foo(@Property Integer prop) {
+        @org.oasisopen.sca.annotation.Constructor()
+        public Foo(@Property(name = "myProp") Integer prop) {
 
         }
 
@@ -157,13 +159,13 @@ public class ConstructorPropertyTestCase extends AbstractProcessorTest {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor("myProp")
-        public BadFoo(@Property Integer prop, @Property Integer prop2) {
+        @org.oasisopen.sca.annotation.Constructor()
+        public BadFoo(@Property(name = "myProp") Integer prop, @Property Integer prop2) {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor({"myRef", "myRef2"})
-        public BadFoo(@Property List ref, @Property(name = "myOtherRef")List ref2) {
+        @org.oasisopen.sca.annotation.Constructor()
+        public BadFoo(@Property(name = "myRef") List ref, @Property(name = "myOtherRef")List ref2) {
 
         }
 
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index eeeee851e4..dda8049d6d 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
@@ -105,7 +105,7 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest {
         try {
             visitConstructor(ctor, type);
             fail();
-        } catch (InvalidConstructorException e) {
+        } catch (InvalidReferenceException e) {
             // expected
         }
     }
@@ -139,7 +139,7 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor("myRef2")
+        @org.oasisopen.sca.annotation.Constructor()
         public Foo(@Reference(name = "myRef2") Integer prop) {
 
         }
@@ -170,12 +170,12 @@ public class ConstructorReferenceTestCase extends AbstractProcessorTest {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor("myRef")
+        @org.oasisopen.sca.annotation.Constructor()
         public BadFoo(@Reference Integer ref, @Reference Integer ref2) {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor({"myRef", "myRef2"})
+        @org.oasisopen.sca.annotation.Constructor()
         public BadFoo(@Reference List ref, @Reference(name = "myOtherRef")List ref2) {
 
         }
diff --git a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index e8d26f6103..b73dc6cf76 100644
--- a/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-2.x/trunk/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
@@ -28,6 +28,7 @@ import java.util.List;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -96,11 +97,12 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest {
         try {
             visitConstructor(ctor, type);
             fail();
-        } catch (InvalidConstructorException e) {
+        } catch (InvalidResourceException e) {
             // expected
         }
     }
 
+    @Ignore("TUSCANY-3950") // no names in constructor annotation now
     @Test
     public void testNoMatchingNames() throws Exception {
         JavaImplementation type = javaImplementationFactory.createJavaImplementation();
@@ -121,8 +123,8 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor("myResource")
-        public Foo(@Resource Integer resource) {
+        @org.oasisopen.sca.annotation.Constructor()
+        public Foo(@Resource(name = "myResource") Integer resource) {
 
         }
 
@@ -149,13 +151,13 @@ public class ConstructorResourceTestCase extends AbstractProcessorTest {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor("myProp")
-        public BadFoo(@Resource Integer res, @Resource Integer res2) {
+        @org.oasisopen.sca.annotation.Constructor()
+        public BadFoo(@Resource(name = "myResource") Integer res, @Resource Integer res2) {
 
         }
 
-        @org.oasisopen.sca.annotation.Constructor({"myRes", "myRes2"})
-        public BadFoo(@Resource List res, @Resource(name = "myOtherRes") List res2) {
+        @org.oasisopen.sca.annotation.Constructor()
+        public BadFoo(@Resource(name = "myResource") List res, @Resource(name = "myOtherRes") List res2) {
 
         }