This commit adds the annotation parsing to ModelGroup, and tests to check it

core/src/main/groovy/com/predic8/schema/ModelGroup.groovy

@@ -21,7 +21,8 @@ import groovy.xml.QName
 import javax.xml.namespace.QName as JQName
 
 abstract class ModelGroup extends SchemaComponent{
-
+
+  Annotation annotation
   List<SchemaComponent> particles = []
   def minOccurs = 1
   def maxOccurs = 1
@@ -33,6 +34,10 @@ abstract class ModelGroup extends SchemaComponent{
 
   protected parseChildren(token, child, params) {
     switch (child ){
+      case 'annotation' :
+        annotation = new Annotation(schema: schema)
+        annotation.parse(token, params) ; break
+
       case 'element' : def element = new Element(schema:schema)
       element.parse(token, params)
       particles << element ; break

core/src/test/groovy/com/predic8/schema/AllTest.groovy

@@ -75,4 +75,16 @@ class AllTest extends GroovyTestCase{
     assertEquals('?XXX?', emp.city.toString())
     assertEquals('', emp.person.isHuman.toString())
   }
+
+  void testAllAnnotation() {
+    def employee = schema.getType(EMPLOYEE_TYPE)
+    def all = employee.model
+    assertNotNull(all)
+    def annotation = all.getAnnotation()
+    assertNotNull( annotation );
+    def documentation = annotation.getDocumentations().first();
+    assertNotNull( documentation );
+    def documentationContent = documentation.content;
+    assertEquals( "Hello world", documentationContent );
+  }
 }

core/src/test/groovy/com/predic8/schema/ChoiceTest.groovy

@@ -59,6 +59,18 @@ class ChoiceTest extends GroovyTestCase{
   assertEquals('+49 228 2402099', inf.phone.toString())
   }
 
+  void testChoiceAnnotation() {
+    def employee = schema.getType(CONT_INF)
+    def contactInfo = employee.model
+    assertNotNull(contactInfo)
+    def annotation = contactInfo.getAnnotation()
+    assertNotNull( annotation );
+    def documentation = annotation.getDocumentations().first();
+    assertNotNull( documentation );
+    def documentationContent = documentation.content;
+    assertEquals( "Hello world", documentationContent );
+  }
+
   /*void testRequestTemplateCreator() {
   def strWriter = new StringWriter()
   def creator = new RequestTemplateCreator(builder : new MarkupBuilder(strWriter))
@@ -68,4 +80,3 @@ class ChoiceTest extends GroovyTestCase{
   assertEquals('?XXX?', emp.person.lastName.toString())
   }*/
 }
-

core/src/test/resources/schema/all/all.xsd

@@ -14,6 +14,9 @@
 
   <xsd:complexType name="EmployeeType">
     <xsd:all minOccurs="1">
+      <xsd:annotation>
+        <xsd:documentation>Hello world</xsd:documentation>
+      </xsd:annotation>
       <xsd:element name="person">
         <xsd:complexType>
           <xsd:group ref="tns:PersonGroup" />
@@ -25,4 +28,4 @@
 
   <xsd:element name="employee" type="tns:EmployeeType" />
 
-</xsd:schema>
+</xsd:schema>

core/src/test/resources/schema/choice/choice.xsd

@@ -15,7 +15,11 @@
 
   <xsd:complexType name="ContactInfoType">
     <xsd:choice>
-      <xsd:sequence>
+        <xsd:annotation>
+            <xsd:documentation>Hello world</xsd:documentation>
+        </xsd:annotation>
+
+        <xsd:sequence>
         <xsd:element name="city" type="xsd:string" />
         <xsd:element name="zip" type="xsd:string" />
       </xsd:sequence>