chore: add lower-level type definitions table to annex (#126)

* chore: refactor EndpointProperty schema

* chore: add lower-level annex table

Author: arnoweiss

artifacts/buildSrc/src/main/java/org/eclipse/dsp/generation/transformer/HtmlTableTransformer.java

@@ -40,7 +40,7 @@ public class HtmlTableTransformer implements SchemaTypeTransformer<String> {
     @NotNull
     public String transform(SchemaType schemaType) {
         var builder = new StringBuilder(CSS).append("<table class=\"message-table\">");
-        builder.append(format("<tr><td class=\"message-class\" colspan=\"4\">%s</td></tr>", schemaType.getName()));
+        builder.append(format("<tr><td class=\"message-class\" colspan=\"4\" id=\"%s-table\">%s</td></tr>", schemaType.getName(), schemaType.getName()));
         transformProperties(schemaType.getTransitiveRequiredProperties(), true, builder);
         transformProperties(schemaType.getTransitiveOptionalProperties(), false, builder);
         return builder.append("</table>").toString();
@@ -100,12 +100,23 @@ private String parseResolvedTypes(SchemaProperty property) {
 
     private @NotNull String getArrayTypeName(SchemaProperty resolvedProperty) {
         var itemTypes = resolvedProperty.getItemTypes().stream()
-                .flatMap(t -> t.getResolvedTypes().stream()).map(this::getTypeName)
+                .flatMap(t -> t.getResolvedTypes().stream())
+                .map(e -> {
+                    if (e.isJsonBaseType()) {
+                        return String.format("%s", getTypeName(e));
+                    }
+                    return String.format("<a href=#%s-table>%s</a>", getTypeName(e), getTypeName(e));
+                })
                 .collect(joining(", "));
         if (itemTypes.isEmpty()) {
             itemTypes = resolvedProperty.getResolvedTypes().stream()
-                    .map(SchemaType::getItemType)
-                    .filter(Objects::nonNull)
+                    .filter(e->getTypeName(e)!=null)
+                    .map(e->{
+                        if (e.isJsonBaseType()) {
+                            return String.format("%s", getTypeName(e));
+                        }
+                        return String.format("<a href=#%s-table>%s</a>", getTypeName(e), getTypeName(e));
+                    })
                     .collect(joining(", "));
             if (itemTypes.isEmpty()) {
                 return "array";

artifacts/src/main/resources/transfer/data-address-schema.json

@@ -25,24 +25,7 @@
         "endpointProperties": {
           "type": "array",
           "items": {
-            "type": "object",
-            "properties": {
-              "@type": {
-                "type": "string",
-                "const": "EndpointProperty"
-              },
-              "name": {
-                "type": "string"
-              },
-              "value": {
-                "type": "string"
-              }
-            },
-            "required": [
-              "@type",
-              "name",
-              "value"
-            ]
+            "$ref": "#/definitions/EndpointProperty"
           },
           "minItems": 1
         }
@@ -52,6 +35,26 @@
         "endpointType",
         "endpoint"
       ]
+    },
+    "EndpointProperty": {
+      "type": "object",
+      "properties": {
+        "@type": {
+          "type": "string",
+          "const": "EndpointProperty"
+        },
+        "name": {
+          "type": "string"
+        },
+        "value": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "@type",
+        "name",
+        "value"
+      ]
     }
   }
 }

index.html

@@ -124,6 +124,10 @@ <h1 id="title">Dataspace Protocol</h1>
 
 <section id='conformance'></section>
 
+<section id="lower-level-types" class="appendix" data-include="specifications/common/type-definitions.md" data-include-format="markdown">
+    <h1>Lower-level type definitions</h1>
+</section>
+
 <section id="tof" class="appendix">
     <h1>Notes</h1>
 </section>

specifications/common/type-definitions.md

@@ -0,0 +1,41 @@
+# Lower Level Type Definitions
+
+<p data-include="message/table/action.html" data-include-format="html">
+</p>
+
+
+<p data-include="message/table/constraint.html" data-include-format="html">
+</p>
+
+
+<p data-include="message/table/dataaddress.html" data-include-format="html">
+</p>
+
+<p data-include="message/table/distribution.html" data-include-format="html">
+</p>
+
+
+<p data-include="message/table/duty.html" data-include-format="html">
+</p>
+
+
+<p data-include="message/table/dataservice.html" data-include-format="html">
+</p>
+
+
+<p data-include="message/table/endpointproperty.html" data-include-format="html">
+</p>
+
+
+<p data-include="message/table/messageoffer.html" data-include-format="html">
+</p>
+
+
+<p data-include="message/table/offer.html" data-include-format="html">
+</p>
+
+
+<p data-include="message/table/permission.html" data-include-format="html">
+</p>
+
+