Merge pull request #7818 from afishbeck/espJavaServiceSimpleArray

HPCC-14256 Add DynamicESDL java services support for simple arrays Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
hpcc-systems · Sep 23, 2015 · e5fd96f · e5fd96f
2 parents 9220744 + 65f64ae
commit e5fd96f
Show file tree

Hide file tree

Showing 6 changed files with 172 additions and 71 deletions.
diff --git a/esp/xslt/esdl2ecl.xslt b/esp/xslt/esdl2ecl.xslt
@@ -28,6 +28,8 @@
 /*** ECL Interface generated by esdl2ecl version 1.0 from </xsl:text><xsl:copy-of select="$sourceFileName"/> <xsl:text>.xml. ***/
 /*===================================================*/
 
+import $.share;
+
 </xsl:text>
 	</xsl:template>
 	<xsl:template match="expesdl">

diff --git a/initfiles/examples/EsdlExample/esdl_example.esdl b/initfiles/examples/EsdlExample/esdl_example.esdl
@@ -28,6 +28,7 @@ ESPStruct NameInfo
 {
     string First("Joe");
     string Last("Doe");
+    ESParray<string, Alias> Aliases;
 };
 
 ESPStruct AddressInfo

diff --git a/initfiles/examples/EsdlExample/javarequest.xml b/initfiles/examples/EsdlExample/javarequest.xml
@@ -5,6 +5,12 @@
    <Name>
     <First>Joe</First>
     <Last>Doe</Last>
+    <Aliases>
+      <Alias>John</Alias>
+      <Alias>James</Alias>
+      <Alias>Joseph</Alias>
+      <Alias>Jessy</Alias>
+    </Aliases>
    </Name>
    <Addresses>
     <Address>

diff --git a/initfiles/examples/EsdlExample/roxierequest.xml b/initfiles/examples/EsdlExample/roxierequest.xml
@@ -5,6 +5,12 @@
    <Name>
     <First>Joe</First>
     <Last>Doe</Last>
+    <Aliases>
+     <Alias>John</Alias>
+     <Alias>James</Alias>
+     <Alias>Joseph</Alias>
+     <Alias>Jessy</Alias>
+    </Aliases>
    </Name>
    <Addresses>
     <Address>

diff --git a/initfiles/examples/EsdlExample/share.ecl b/initfiles/examples/EsdlExample/share.ecl
@@ -0,0 +1,11 @@
+export share := module
+
+export t_IntegerArrayItem := record
+    integer value { xpath('')};
+end;
+
+export t_StringArrayItem := record
+    string value { xpath(''), MAXLENGTH(8192) };
+end;
+
+end;