TUSCANY-3300, Update @Service annotation to match the latest SCA-J CAA spec

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

3 files changed, 57 insertions, 11 deletions

diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index a163652ead..6cc8b1777b 100644
--- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
@@ -304,7 +304,6 @@ public class HeuristicPojoProcessorTestCase extends AbstractProcessorTest {
         void operation1(String param1);
     }
 
-    @Service
     private interface PropertyNonRemotableInterface {
         void operation1(String param1);
     }
@@ -568,7 +567,7 @@ public class HeuristicPojoProcessorTestCase extends AbstractProcessorTest {
         void serviceOperation1();
     }
     
-    @Service
+    @Service(SomeWebService.class)
     private static class SomeWebServiceImpl implements SomeWebService {
         public SomeWebServiceImpl() {
             
diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index 1a7889366e..286b0d70d1 100644
--- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
@@ -288,7 +288,7 @@ public class PolicyProcessorTestCase {
         int method6();
     }
 
-    @Service(interfaces = {Interface1.class, Interface2.class})
+    @Service({Interface1.class, Interface2.class})
     private class Service2 implements Interface1, Interface2 {
         public int method1() {
             return 0;
@@ -353,7 +353,7 @@ public class PolicyProcessorTestCase {
         int method6();
     }
 
-    @Service(interfaces = {Interface3.class, Interface4.class})
+    @Service({Interface3.class, Interface4.class})
     @Requires( {"transaction.local"})
     private class Service4 implements Interface3, Interface4 {
         public int method1() {
diff --git a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index 528639a008..14eadfe6a2 100644
--- a/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/java/sca/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
@@ -20,12 +20,14 @@ package org.apache.tuscany.sca.implementation.java.introspect.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import javax.jws.WebService;
 
 import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
+import org.apache.tuscany.sca.implementation.java.IntrospectionException;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
 import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
@@ -96,12 +98,44 @@ public class ServiceProcessorTestCase {
     }
 
     @Test
-    public void testNoInterfaces() throws Exception {
+    public void testMultiplenamedInterfaces() throws Exception {
+        processor.visitClass(FooMultipleNamed.class, type);
+        assertEquals(2, type.getServices().size());
+        org.apache.tuscany.sca.assembly.Service sbaz = type.getService("BazName");
+        assertNotNull(sbaz);
+        assertEquals(Baz.class, ((JavaInterface)sbaz.getInterfaceContract().getInterface()).getJavaClass());
+        org.apache.tuscany.sca.assembly.Service sbar = type.getService("BarName");
+        assertNotNull(sbar);
+        assertEquals(Bar.class, ((JavaInterface)sbar.getInterfaceContract().getInterface()).getJavaClass());
+    }
+
+    @Test
+    public void testBadService() throws Exception {
+        try {
+            processor.visitClass(BadService.class, type);
+            fail();
+        } catch (IntrospectionException e) {
+            assertTrue(e.getMessage().startsWith("JCA90059"));
+        }
+    }
+
+    @Test
+    public void testBadServiceNames() throws Exception {
         try {
-            processor.visitClass(BadDefinition.class, type);
-        } catch (IllegalServiceDefinitionException e) {
-            //not expected
+            processor.visitClass(BadServiceNames.class, type);
             fail();
+        } catch (IntrospectionException e) {
+            assertTrue(e.getMessage().startsWith("JCA90050"));
+        }
+    }
+
+    @Test
+    public void testBadServiceDuplicateNames() throws Exception {
+        try {
+            processor.visitClass(BadServiceDuplicateNames.class, type);
+            fail();
+        } catch (IntrospectionException e) {
+            assertTrue(e.getMessage().startsWith("JCA90060"));
         }
     }
 
@@ -130,7 +164,7 @@ public class ServiceProcessorTestCase {
     private interface BazRemotable {
     }
 
-    @Service(interfaces = {Baz.class, Bar.class})
+    @Service({Baz.class, Bar.class})
     private class FooMultiple implements Baz, Bar {
 
     }
@@ -160,10 +194,23 @@ public class ServiceProcessorTestCase {
 
     }
 
+    @Service(value={Baz.class, Bar.class}, names={"BazName", "BarName"})
+    private class FooMultipleNamed implements Baz, Bar {
+
+    }
 
-    @Service()
-    private class BadDefinition extends FooSingle {
+    @Service(value={})
+    private class BadService implements Baz {
 
     }
 
+    @Service(value={Baz.class, Bar.class}, names={"BazName"})
+    private class BadServiceNames implements Baz, Bar {
+
+    }
+
+    @Service(value={Baz.class, Bar.class}, names={"BazName", "BazName"})
+    private class BadServiceDuplicateNames implements Baz, Bar {
+
+    }
 }