From 4e13586bc791d71c41760cf4d0a5cc908973de3e Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:09:18 +0000 Subject: Moving 2.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835134 13f79535-47bb-0310-9956-ffa450edef68 --- .../javaapi/annotations/reference/AService.java | 55 ----- .../javaapi/annotations/reference/BService.java | 31 --- .../annotations/reference/impl/AServiceImpl.java | 215 ------------------- .../reference/impl/AUnannotatedServiceImpl.java | 141 ------------- .../annotations/reference/impl/BServiceImpl.java | 32 --- .../reference/src/main/resources/ab.composite | 51 ----- .../reference/ReferenceAnnotationTestCase.java | 229 --------------------- 7 files changed, 754 deletions(-) delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/resources/ab.composite delete mode 100644 branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java (limited to 'branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src') diff --git a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java b/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java deleted file mode 100644 index b28704a3b4..0000000000 --- a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.vtest.javaapi.annotations.reference; - - -/** - * Simple Service that uses another Service - */ -public interface AService { - - public String getName(); - public String getB1Name(); - public String getB2Name(); - public String getB3Name(); - public String getB4Name(); - public String getB5Name(); - public String getB6Name(); - public String getB7Name(); - public String getB8Name(); - public String getB9Name(); - public String getB10Name(); - public String getB11Name(); - public String getB12Name(); - public String getB13Name(int i); - public String getB14Name(int i); - public String getB15Name(int i); - - public int getB13Size(); - public int getB14Size(); - public int getB15Size(); - - public boolean isB7SetterCalled(); - public boolean isB16Null(); - public boolean isB17Null(); - - public boolean isB4Null(); - public boolean isB5Null(); - public boolean isB6Null(); -} diff --git a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java b/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java deleted file mode 100644 index 04c0bc377e..0000000000 --- a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/BService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.vtest.javaapi.annotations.reference; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * Simple Service used by another service - */ -@Remotable -public interface BService { - - String getName(); - -} diff --git a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java b/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java deleted file mode 100644 index 60e2b2408c..0000000000 --- a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl; - -import java.util.List; - -import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.AService; -import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(AService.class) -public class AServiceImpl implements AService { - - @Reference - protected BService b1; // field injection - - protected BService b2; // injected via constructor parameter - - protected BService b3; // setter injection - - public BService b4; // field injection (public, un-annotated) - - protected BService b5; // field injection (non-public, un-annotated) - - public BService b6; // setter injection (public, un-annotated) - - @Reference - protected BService b7; // setter injection (field and setter annotated) - - @Reference(name="b8", required=false) - protected BService bEight; // field injection (different reference and field name) - - protected BService bNine; // setter injection (different reference and field name) - - @Reference(required=false) - protected BService b10; // multiplicity="0..1" and required=false - - @Reference(required=false) - protected BService b11; // multiplicity="1..1" and required=false - - protected BService b12; // multiplicity="1..1" and required=true at setter - - @Reference(required=false) - protected List b13; // multiplicity="0..n" and required=false - - protected List b14; // multiplicity="1..n" and required=false at setter - - @Reference(name="b15", required=true) - protected BService[] b15s; // multiplicity="1..n" and required=true - - @Reference(required=false) - protected BService b16; - - @Reference(required=false) - public BService b17; - - protected boolean b7SetterCalled; - - public AServiceImpl(@Reference(name = "b2") - BService b2) { - super(); - this.b2 = b2; - b7SetterCalled = false; - } - - @Reference - public void setB3(BService b3) { - this.b3 = b3; - } - - public void setB6(BService b6) { - this.b6 = b6; - } - - @Reference - public void setB7(BService b7) { - b7SetterCalled = true; - this.b7 = b7; - } - - @Reference(name="b9", required=false) - public void setB9(BService bNine) { - this.bNine = bNine; - } - - @Reference(required=true) - public void setB12(BService b12) { - this.b12 = b12; - } - - @Reference(required=true) - public void setB14(List b14) { - this.b14 = b14; - } - - public String getName() { - return "AService"; - } - - public String getB1Name() { - return b1.getName(); - } - - public String getB2Name() { - return b2.getName(); - } - - public String getB3Name() { - return b3.getName(); - } - - public String getB4Name() { - return b4.getName(); - } - - public String getB5Name() { - return b5.getName(); - } - - public String getB6Name() { - return b6.getName(); - } - - public String getB7Name() { - return b7.getName(); - } - - public String getB8Name() { - return bEight.getName(); - } - - public String getB9Name() { - return bNine.getName(); - } - - public String getB10Name() { - return b10.getName(); - } - - public String getB11Name() { - return b11.getName(); - } - - public String getB12Name() { - return b12.getName(); - } - - public String getB13Name(int i) { - BService b = (BService) b13.get(i); - return b.getName(); - } - - public String getB14Name(int i) { - BService b = (BService) b14.get(i); - return b.getName(); - } - - public String getB15Name(int i) { - return b15s[i].getName(); - } - - public int getB13Size() { - return b13.size(); - } - - public int getB14Size() { - return b14.size(); - } - - public int getB15Size() { - return b15s.length; - } - - public boolean isB7SetterCalled() { - return b7SetterCalled; - } - - public boolean isB16Null() { - return b16 == null; - } - - public boolean isB17Null() { - return b17 == null; - } - - public boolean isB4Null() { - return b4 == null; - } - - public boolean isB5Null() { - return b5 == null; - } - - public boolean isB6Null() { - return b6 == null; - } -} diff --git a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java b/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java deleted file mode 100644 index 20fccf807f..0000000000 --- a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AUnannotatedServiceImpl.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl; - -import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.AService; -import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService; -import org.oasisopen.sca.annotation.Service; - -@Service(AService.class) -public class AUnannotatedServiceImpl implements AService { - - public BService b4; // field injection (public, un-annotated) - - protected BService b5; // field injection (non-public, un-annotated) - - public BService b6; // setter injection (public, un-annotated) - - public AUnannotatedServiceImpl() { - } - - public String getName() { - return "AService"; - } - - public String getB4Name() { - return b4.getName(); - } - - public String getB5Name() { - return b5.getName(); - } - - public void setB6(BService b6) { - this.b6 = b6; - } - - public String getB6Name() { - return b6.getName(); - } - - public String getB1Name() { - return null; - } - - public String getB2Name() { - return null; - } - - public String getB3Name() { - return null; - } - - public String getB7Name() { - return null; - } - - public String getB8Name() { - return null; - } - - public String getB9Name() { - return null; - } - - public boolean isB7SetterCalled() { - return false; - } - - public String getB10Name() { - return null; - } - - public String getB11Name() { - return null; - } - - public String getB12Name() { - return null; - } - - public String getB13Name(int i) { - return null; - } - - public int getB13Size() { - return 0; - } - - public String getB14Name(int i) { - return null; - } - - public int getB14Size() { - return 0; - } - - public String getB15Name(int i) { - return null; - } - - public int getB15Size() { - return 0; - } - - public boolean isB16Null() { - return true; - } - - public boolean isB17Null() { - return true; - } - - public boolean isB4Null() { - return b4 == null; - } - - public boolean isB5Null() { - return b5 == null; - } - - public boolean isB6Null() { - return b6 == null; - } -} diff --git a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java b/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java deleted file mode 100644 index c7fc91e65f..0000000000 --- a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/BServiceImpl.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.javaapi.annotations.reference.impl; - -import org.apache.tuscany.sca.vtest.javaapi.annotations.reference.BService; -import org.oasisopen.sca.annotation.Service; - -@Service(BService.class) -public class BServiceImpl implements BService { - - public String getName() { - return "BService"; - } - -} diff --git a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/resources/ab.composite b/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/resources/ab.composite deleted file mode 100644 index b4ad1e77d5..0000000000 --- a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/main/resources/ab.composite +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java b/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java deleted file mode 100644 index 1fe50b4ea7..0000000000 --- a/branches/sca-java-2.0-M2/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java +++ /dev/null @@ -1,229 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.vtest.javaapi.annotations.reference; - -import static org.junit.Assert.fail; -import junit.framework.Assert; - -import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -/** - * This test class tests the "@Reference" annotation described in section 1.8.14 - */ -public class ReferenceAnnotationTestCase { - - protected static String compositeName = "ab.composite"; - protected static AService a; - - @BeforeClass - public static void init() throws Exception { - try { - System.out.println("Setting up"); - ServiceFinder.init(compositeName); - a = ServiceFinder.getService(AService.class, "AComponent"); - - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - @AfterClass - public static void destroy() throws Exception { - - System.out.println("Cleaning up"); - ServiceFinder.cleanup(); - } - - /** - * Temporary test unrelated to spec test effort. Remove after resolution of - */ - @Test - @Ignore - // JIRA T-2145 - public void bogusComponentName() throws Exception { - ServiceFinder.init(compositeName); - try { - AService a = ServiceFinder.getService(AService.class, "AReallyBogusComponentName"); - if (a == null) - fail("Should have thrown an exception rather than return null"); - else - fail("Should have thrown an exception rather than return a proxy"); - } finally { - ServiceFinder.cleanup(); - } - - } - - /** - * Lines 1404, 1405, 1406
- * The "@Reference" annotation type is used to annotate a Java class field - * or a setter method that is used to inject a service that resolves the - * reference. The interface of the service injected is defined by the type - * of the Java class field or the type of the setter method input argument. - *

- * This tests the use of the three usages of the "@Reference" annotation
- * B1 is injected via field injection
- * B2 is injected via constructor parameter
- * B3 is injected via setter method - */ - @Test - public void atReference1() throws Exception { - - Assert.assertEquals("BService", a.getB1Name()); - Assert.assertEquals("BService", a.getB2Name()); - Assert.assertEquals("BService", a.getB3Name()); - - } - - /** - * Lines 1407, 1408, 1409, 1410
- * References may also be injected via public setter methods even when the - * "@Reference" annotation is not present. However, the "@Reference" - * annotation must be used in order to inject a reference onto a non public - * field. In the case where there is no "@Reference" annotation, the name of - * the reference is the same as the name of the field or setter. - *

- * B4 is injected via field injection. Public, Non-annotated
- * B5 is expected to fail field injection. Non-Public, Non-Annotated
- * B6 is injected via setter injection. Public, Non-Annotated - */ - @Test - public void atReference2() throws Exception { - AService anotherA = ServiceFinder.getService(AService.class, "AUnannotatedComponent"); - - Assert.assertFalse(anotherA.isB4Null()); - Assert.assertTrue(anotherA.isB5Null()); - Assert.assertFalse(anotherA.isB6Null()); - - Assert.assertEquals("BService", anotherA.getB4Name()); - try { - anotherA.getB5Name(); - fail("getB5Name expected to fail with NPE"); - } catch (NullPointerException e) { - } - Assert.assertEquals("BService", anotherA.getB6Name()); - - } - - /** - * Lines 1411
- * Where there is both a setter method and a field for a reference, the - * setter method is used. - *

- * B7 has both field and setter annotated. The setter must be called - */ - @Test - public void atReference3() throws Exception { - Assert.assertTrue(a.isB7SetterCalled()); - } - - /** - * Lines 1413, 1414, 1415
- * The "@Reference" annotation has the following attributes:
• name - * (optional) – the name of the reference, defaults to the name of the field - * of the Java class
- * required (optional) – whether injection of service or services is - * required. Defaults to true. - *

- * Reference and field have different names
- * B8 is field injected
- * B9 is setter injected - */ - @Test - public void atReference4() throws Exception { - Assert.assertEquals("BService", a.getB8Name()); - Assert.assertEquals("BService", a.getB9Name()); - } - - /** - * Lines 1457 to 1459
- * If the reference is not an array or collection, then the implied - * component type has a reference with a multiplicity of either 0..1 or 1..1 - * depending on the value of the - * - * @Reference required attribute – 1..1 applies if required=true.
- *

- * B10 is field injected, required=false, and multiplicity="0..1"
- * B11 is field injected, required=false, and multiplicity="1..1"
- * B12 is setter injected, required=true, and multiplicity="1..1" - */ - @Test - public void atReference5() throws Exception { - Assert.assertEquals("BService", a.getB10Name()); - Assert.assertEquals("BService", a.getB11Name()); - Assert.assertEquals("BService", a.getB12Name()); - } - - /** - * Lines 1461 to 1463
- * If the reference is defined as an array or as a java.util.Collection, - * then the implied component type has a reference with a multiplicity of - * either 1..n or 0..n, depending on whether the required attribute of the - * "@Reference" annotation is set to true or false – 1..n applies if - * required=true.
- *

- * B13 is a java.util.List, field injected, required=false, - * multiplicity="0..n", and no target
- * B14 is a java.util.List, setter injected, required=true, - * multiplicity="1..n", and one target
- * B15 is an array, field injected, required=true, multiplicity="1..n", and - * two targets - */ - @Test - public void atReference6() throws Exception { - Assert.assertEquals(0, a.getB13Size()); - Assert.assertEquals("BService", a.getB14Name(0)); - Assert.assertEquals(1, a.getB14Size()); - Assert.assertEquals("BService", a.getB15Name(0)); - Assert.assertEquals("BService", a.getB15Name(1)); - Assert.assertEquals(2, a.getB15Size()); - } - - /** - * Lines 1415
- * required (optional) - whether injection of service or services is - * required. Defaults to true. - *

- * b16 and b17 is defined as "@Reference(required=false)" and AComponent - * does not define reference for them - */ - @Test - public void atReference7() throws Exception { - Assert.assertTrue(a.isB16Null()); - Assert.assertTrue(a.isB17Null()); - } - - /** - * Java Component Implementation Spec - * Section 1.2.7 - * Line 361 when @Property and @Reference annotations are present - * then unannotated fields are ignored - */ - @Test - public void atReference8() throws Exception { - Assert.assertTrue(a.isB4Null()); - Assert.assertTrue(a.isB5Null()); - Assert.assertTrue(a.isB6Null()); - } -} -- cgit v1.2.3