Author: antelder
Date: Sat May 10 00:27:53 2008
New Revision: 655019
URL: http://svn.apache.org/viewvc?rev=655019&view=rev
Log:
TUSCANY-2308: Apply patch from Gilbert Kwan to test Reference annotation vtest
for required=false
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.java
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java?rev=655019&r1=655018&r2=655019&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/AService.java
Sat May 10 00:27:53 2008
@@ -46,5 +46,6 @@
public int getB15Size();
public boolean isB7SetterCalled();
-
+ public boolean isB16Null();
+ public boolean isB17Null();
}
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java?rev=655019&r1=655018&r2=655019&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AServiceImpl.java
Sat May 10 00:27:53 2008
@@ -66,6 +66,12 @@
@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")
@@ -186,5 +192,13 @@
public boolean isB7SetterCalled() {
return b7SetterCalled;
}
+
+ public boolean isB16Null() {
+ return b16 == null;
+ }
+
+ public boolean isB17Null() {
+ return b17 == null;
+ }
}
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.java?rev=655019&r1=655018&r2=655019&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/main/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/impl/AnotherAServiceImpl.java
Sat May 10 00:27:53 2008
@@ -118,4 +118,12 @@
public int getB15Size() {
return 0;
}
+
+ public boolean isB16Null() {
+ return true;
+ }
+
+ public boolean isB17Null() {
+ return true;
+ }
}
Modified:
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java?rev=655019&r1=655018&r2=655019&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/annotations/reference/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/reference/ReferenceAnnotationTestCase.java
Sat May 10 00:27:53 2008
@@ -196,4 +196,18 @@
Assert.assertEquals("BService", a.getB15Name(1));
Assert.assertEquals(2, a.getB15Size());
}
+
+ /**
+ * Lines 1415 <br>
+ * required (optional) - whether injection of service or services is
+ * required. Defaults to true.
+ * <p>
+ * 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());
+ }
}
