add rowset schema definitions based on MS-SSAS v20251031 and fix old

dbulahov · dbulahov · commit cef7caa2ed2a · 2026-03-09T18:40:50.000+03:00
Signed-off-by: dbulahov &lt;bulahovdenis@gmail.com&gt;
diff --git a/.markdownlint.json b/.markdownlint.json
@@ -0,0 +1,3 @@
+{
+  "MD024": false
+}
diff --git a/api/src/main/java/org/eclipse/daanse/xmla/api/discover/mdschema/actions/MdSchemaActionsResponseRow.java b/api/src/main/java/org/eclipse/daanse/xmla/api/discover/mdschema/actions/MdSchemaActionsResponseRow.java
@@ -37,7 +37,7 @@ public interface MdSchemaActionsResponseRow {
     /**
      * @return The name of the cube.
      */
-    String cubeName();
+    Optional<String> cubeName();
 
     /**
      * @return The name of this action.
@@ -58,7 +58,7 @@ public interface MdSchemaActionsResponseRow {
      *         in which the action is performed. The COORDINATE MUST resolve to the object specified in
      *         COORDINATE_TYPE.
      */
-    String coordinate();
+    Optional<String> coordinate();
 
     /**
      * @return An enumeration that specifies how the COORDINATE restriction column is interpreted. The
@@ -67,7 +67,7 @@ public interface MdSchemaActionsResponseRow {
      *         coordinate refers to a member. 5 - Action coordinate refers to a set. 6 - Action
      *         coordinate refers to a cell.
      */
-    CoordinateTypeEnum coordinateType();
+    Optional<CoordinateTypeEnum> coordinateType();
 
     /**
      * @return The caption for the action. The action name is used if no caption was specified and no
diff --git a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/Convertor.java b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/Convertor.java
@@ -845,9 +845,9 @@ static List<MdSchemaActionsResponseRow> convertToMdSchemaActionsResponseRow(SOAP
         return l.stream()
                 .map(m -> (MdSchemaActionsResponseRow) new MdSchemaActionsResponseRowR(
                         Optional.ofNullable(m.get(CATALOG_NAME)), Optional.ofNullable(m.get(SCHEMA_NAME)),
-                        m.get(CUBE_NAME), Optional.ofNullable(m.get(ACTION_NAME)),
-                        Optional.ofNullable(ActionTypeEnum.fromValue(m.get(ACTION_TYPE))), m.get(COORDINATE),
-                        CoordinateTypeEnum.fromValue(m.get(COORDINATE_TYPE)),
+                        Optional.ofNullable(m.get(CUBE_NAME)), Optional.ofNullable(m.get(ACTION_NAME)),
+                        Optional.ofNullable(ActionTypeEnum.fromValue(m.get(ACTION_TYPE))), Optional.ofNullable(m.get(COORDINATE)),
+                        Optional.ofNullable(CoordinateTypeEnum.fromValue(m.get(COORDINATE_TYPE))),
                         Optional.ofNullable(m.get(ACTION_CAPTION)), Optional.ofNullable(m.get(DESCRIPTION_UC)),
                         Optional.ofNullable(m.get(CONTENT_UC)), Optional.ofNullable(m.get(APPLICATION)),
                         Optional.ofNullable(InvocationEnum.fromValue(m.get(INVOCATION)))))
diff --git a/definition/README.md b/definition/README.md
diff --git a/definition/rowset-dbschema-catalogs.xsd b/definition/rowset-dbschema-catalogs.xsd
@@ -8,7 +8,7 @@
   <!-- DBSCHEMA_CATALOGS row definition (MS-SSAS v20251031) -->
   <xsd:complexType name="dbschema-catalogs-row">
     <xsd:sequence>
-      <xsd:element name="CATALOG_NAME" type="xsd:string" />
+      <xsd:element name="CATALOG_NAME" type="xsd:string" minOccurs="0"/>
       <xsd:element name="DESCRIPTION" type="xsd:string" minOccurs="0" />
       <xsd:element name="ROLES" type="xsd:string" minOccurs="0" />
       <xsd:element name="DATE_MODIFIED" type="xsd:dateTime" minOccurs="0" />
diff --git a/definition/rowset-discover-enumerators.xsd b/definition/rowset-discover-enumerators.xsd
@@ -10,8 +10,8 @@
     <xsd:sequence>
       <xsd:element name="EnumName" type="xsd:string" />
       <xsd:element name="EnumDescription" type="xsd:string" minOccurs="0" />
-      <xsd:element name="EnumType" type="xsd:string" minOccurs="0" />
-      <xsd:element name="ElementName" type="xsd:string" minOccurs="0" />
+      <xsd:element name="EnumType" type="xsd:string" />
+      <xsd:element name="ElementName" type="xsd:string"  />
       <xsd:element name="ElementDescription" type="xsd:string" minOccurs="0" />
       <xsd:element name="ElementValue" type="xsd:string" minOccurs="0" />
     </xsd:sequence>
diff --git a/definition/rowset-discover-literals.xsd b/definition/rowset-discover-literals.xsd
@@ -9,7 +9,7 @@
   <xsd:complexType name="discover-literals-row">
     <xsd:sequence>
       <xsd:element name="LiteralName" type="xsd:string" />
-      <xsd:element name="LiteralValue" type="xsd:string" minOccurs="0" />
+      <xsd:element name="LiteralValue" type="xsd:string" />
       <xsd:element name="LiteralInvalidChars" type="xsd:string" minOccurs="0" />
       <xsd:element name="LiteralInvalidStartingChars" type="xsd:string" minOccurs="0" />
       <xsd:element name="LiteralMaxLength" type="xsd:int" minOccurs="0" />
diff --git a/definition/rowset-discover-properties.xsd b/definition/rowset-discover-properties.xsd
@@ -11,7 +11,7 @@
       <xsd:element name="PropertyName" type="xsd:string" />
       <xsd:element name="PropertyDescription" type="xsd:string" minOccurs="0" />
       <xsd:element name="PropertyType" type="xsd:string" minOccurs="0" />
-      <xsd:element name="PropertyAccessType" type="xsd:string" minOccurs="0" />
+      <xsd:element name="PropertyAccessType" type="xsd:string"  />
       <xsd:element name="IsRequired" type="xsd:boolean" minOccurs="0" />
       <xsd:element name="Value" type="xsd:string" minOccurs="0" />
     </xsd:sequence>
diff --git a/definition/rowset-mdschema-actions.xsd b/definition/rowset-mdschema-actions.xsd
@@ -10,11 +10,11 @@
     <xsd:sequence>
       <xsd:element name="CATALOG_NAME" type="xsd:string" minOccurs="0" />
       <xsd:element name="SCHEMA_NAME" type="xsd:string" minOccurs="0" />
-      <xsd:element name="CUBE_NAME" type="xsd:string" />
+      <xsd:element name="CUBE_NAME" type="xsd:string" minOccurs="0" />
       <xsd:element name="ACTION_NAME" type="xsd:string" minOccurs="0" />
       <xsd:element name="ACTION_TYPE" type="xsd:int" minOccurs="0" />
-      <xsd:element name="COORDINATE" type="xsd:string" />
-      <xsd:element name="COORDINATE_TYPE" type="xsd:int" />
+      <xsd:element name="COORDINATE" type="xsd:string" minOccurs="0" />
+      <xsd:element name="COORDINATE_TYPE" type="xsd:int" minOccurs="0" />
       <xsd:element name="ACTION_CAPTION" type="xsd:string" minOccurs="0" />
       <xsd:element name="DESCRIPTION" type="xsd:string" minOccurs="0" />
       <xsd:element name="CONTENT" type="xsd:string" minOccurs="0" />
diff --git a/model.record/src/main/java/org/eclipse/daanse/xmla/model/record/discover/mdschema/actions/MdSchemaActionsResponseRowR.java b/model.record/src/main/java/org/eclipse/daanse/xmla/model/record/discover/mdschema/actions/MdSchemaActionsResponseRowR.java
@@ -20,9 +20,9 @@
 import org.eclipse.daanse.xmla.api.common.enums.InvocationEnum;
 import org.eclipse.daanse.xmla.api.discover.mdschema.actions.MdSchemaActionsResponseRow;
 
-public record MdSchemaActionsResponseRowR(Optional<String> catalogName, Optional<String> schemaName, String cubeName,
-        Optional<String> actionName, Optional<ActionTypeEnum> actionType, String coordinate,
-        CoordinateTypeEnum coordinateType, Optional<String> actionCaption, Optional<String> description,
+public record MdSchemaActionsResponseRowR(Optional<String> catalogName, Optional<String> schemaName, Optional<String> cubeName,
+        Optional<String> actionName, Optional<ActionTypeEnum> actionType, Optional<String> coordinate,
+        Optional<CoordinateTypeEnum> coordinateType, Optional<String> actionCaption, Optional<String> description,
         Optional<String> content, Optional<String> application, Optional<InvocationEnum> invocation)
         implements MdSchemaActionsResponseRow {
 
diff --git a/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/discover/MdSchemaActionsHandler.java b/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/discover/MdSchemaActionsHandler.java
@@ -97,11 +97,11 @@ private void addResponseRow(SOAPElement root, MdSchemaActionsResponseRow r) thro
 
         r.catalogName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_CATALOG_NAME, v));
         r.schemaName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_SCHEMA_NAME, v));
-        SoapUtil.addChildElement(row, ROW.QN_CUBE_NAME, r.cubeName());
+        r.cubeName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_CUBE_NAME, v));
         r.actionName().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_ACTION_NAME, v));
         r.actionType().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_ACTION_TYPE, String.valueOf(v.getValue())));
-        SoapUtil.addChildElement(row, ROW.QN_COORDINATE, r.coordinate());
-        SoapUtil.addChildElement(row, ROW.QN_COORDINATE_TYPE, String.valueOf(r.coordinateType().getValue()));
+        r.coordinate().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_COORDINATE, v));
+        r.coordinateType().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_COORDINATE_TYPE, String.valueOf(v.getValue())));
         r.actionCaption().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_ACTION_CAPTION, v));
         r.description().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_DESCRIPTION, v));
         r.content().ifPresent(v -> SoapUtil.addChildElement(row, ROW.QN_CONTENT, v));
diff --git a/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/Convert.java b/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/Convert.java
@@ -723,14 +723,14 @@ public static DiscoverResponse toDiscoverMdSchemaActions(List<MdSchemaActionsRes
     private static Row convertDiscoverMdSchemaActionsResponseRow(MdSchemaActionsResponseRow apiRow) {
         MdSchemaActionsResponseRowXml row = new MdSchemaActionsResponseRowXml();
 
-        // Mandatory
-        row.setCubeName(apiRow.cubeName());
-        row.setCoordinate(apiRow.coordinate());
-        row.setCoordinateType(
-            org.eclipse.daanse.xmla.model.jakarta.xml.bind.enums.CoordinateTypeEnum
-                .fromValue(apiRow.coordinateType().getValue()));
-
         // Optional
+        apiRow.cubeName()
+        .ifPresent(row::setCubeName);
+        apiRow.coordinate()
+        .ifPresent(row::setCoordinate);
+        apiRow.coordinateType()
+        .ifPresent(i -> row.setCoordinateType(
+            org.eclipse.daanse.xmla.model.jakarta.xml.bind.enums.CoordinateTypeEnum.fromValue(i.getValue())));
         apiRow.catalogName()
             .ifPresent(row::setCatalogName);
         apiRow.schemaName()
diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/DiscoverResponseTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/integration/DiscoverResponseTest.java
@@ -816,11 +816,11 @@ void testMdSchemaActions(@InjectService XmlaService xmlaService) throws SOAPExce
         MdSchemaActionsResponseRowR row = new MdSchemaActionsResponseRowR(
             Optional.of(CATALOG_NAME_LOW),
             Optional.of(SCHEMA_NAME_LOW),
-            CUBE_NAME_LOW,
+            Optional.of(CUBE_NAME_LOW),
             Optional.of("actionName"),
             Optional.of(ActionTypeEnum.URL),
-            "coordinate",
-            CoordinateTypeEnum.CUBE,
+            Optional.of("coordinate"),
+            Optional.of(CoordinateTypeEnum.CUBE),
             Optional.of("actionCaption"),
             Optional.of(DESCRIPTION_LOW),
             Optional.of("content"),
