fix Power BI xml response changing

Signed-off-by: dbulahov <[email protected]>

Author: dbulahov

api/src/main/java/org/eclipse/daanse/xmla/api/common/enums/ItemTypeEnum.java

@@ -25,13 +25,13 @@ public enum ItemTypeEnum {
 
     STRING("xsd:string"),
 
-	DATETIME("xsd:dateTime"),
+    DATETIME("xsd:dateTime"),
 
-	UNSIGNEDSHOT("xsd:unsignedShort"),
+    UNSIGNEDSHOT("xsd:unsignedShort"),
 
-	UNSIGNEDINT("xsd:xsd:unsignedInt"),
+    UNSIGNEDINT("xsd:unsignedInt"),
 
-	BOOLEAN("xsd:boolean");
+    BOOLEAN("xsd:boolean");
 
     private final String value;
 

api/src/main/java/org/eclipse/daanse/xmla/api/discover/discover/csdlmetadata/DiscoverCsdlMetaDataRestrictions.java

@@ -27,6 +27,6 @@ public interface DiscoverCsdlMetaDataRestrictions {
     @Restriction(name = "PERSPECTIVE_NAME", type = XSD_STRING, order = 1)
     Optional<String> perspectiveName();
 
-    @Restriction(name = "VERSION", type = XSD_STRING)
+    @Restriction(name = "VERSION", type = XSD_STRING, order = 2)
     Optional<String> version();
 }

api/src/main/java/org/eclipse/daanse/xmla/api/mddataset/RowSetRowItem.java

@@ -21,6 +21,8 @@ public interface RowSetRowItem {
 
     String tagName();
 
+    String fieldName();
+
     String value();
 
     Optional<ItemTypeEnum> type();

model.record/src/main/java/org/eclipse/daanse/xmla/model/record/mddataset/RowSetRowItemR.java

@@ -18,6 +18,9 @@
 
 import java.util.Optional;
 
-public record RowSetRowItemR(String tagName, String value, Optional<ItemTypeEnum> type) implements RowSetRowItem {
+public record RowSetRowItemR(String tagName, String fieldName, String value, Optional<ItemTypeEnum> type) implements RowSetRowItem {
 
+    public RowSetRowItemR(String tagName, String value, Optional<ItemTypeEnum> type) {
+        this(tagName, tagName, value, type);
+    }
 }

server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/Convert.java

@@ -138,7 +138,7 @@ public static PropertiesR propertiestoProperties(SOAPElement propertiesElement)
 
     public static List<ExecuteParameter> parametersToParameters(SOAPElement parametersElement) {
 
-    	List<ExecuteParameter> parameters = new ArrayList<ExecuteParameter>();
+        List<ExecuteParameter> parameters = new ArrayList<ExecuteParameter>();
 
         Iterator<Node> nodeIteratorParameterList = parametersElement.getChildElements();
         while (nodeIteratorParameterList.hasNext()) {

server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/SoapUtil.java

@@ -430,7 +430,7 @@ private static void addRowSetRowItem(SOAPElement e, RowSetRowItem it) {
         if (it != null) {
             SOAPElement el = addChildElement(e, it.tagName(), Constants.ROWSET.PREFIX);
             el.setTextContent(it.value());
-            //it.type().ifPresent(v -> setAttribute(el, "type", v.getValue()));
+            it.type().ifPresent(v -> setAttribute(el, "type", v.getValue()));
         }
     }
 
@@ -2477,7 +2477,7 @@ private static void addRowsetSchema(SOAPElement root, RowSet rowSet) {
                 ItemTypeEnum type = item.type().orElse(ItemTypeEnum.STRING);
                 ctSequenceEl1.setAttribute("minOccurs", "0");
                 ctSequenceEl1.setAttribute("name", item.tagName());
-                ctSequenceEl1.setAttribute("sql:field", item.tagName());
+                ctSequenceEl1.setAttribute("sql:field", item.fieldName());
                 ctSequenceEl1.setAttribute("type", type.getValue());
             }
         }
@@ -2851,8 +2851,10 @@ private static SOAPElement addChildElementTextNode(SOAPElement element, QName qN
             createdChild.setAttribute("xmlns:ddl300_300", "http://schemas.microsoft.com/analysisservices/2011/engine/300/300");
             createdChild.setAttribute("xmlns:ddl400", "http://schemas.microsoft.com/analysisservices/2012/engine/400");
             createdChild.setAttribute("xmlns:ddl400_400", "http://schemas.microsoft.com/analysisservices/2012/engine/400/400");
-            SOAPElement se = xmlStringToSoapElement(valueOfChild, createdChild);
-            createdChild.addChildElement(se);
+            if (valueOfChild != null && !valueOfChild.isEmpty()) {
+                SOAPElement se = xmlStringToSoapElement(valueOfChild, createdChild);
+                createdChild.addChildElement(se);
+            }
             return createdChild;
 
         } catch (SOAPException | SAXException | IOException | ParserConfigurationException e) {

server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java

@@ -354,7 +354,7 @@ private void execute(SOAPElement discover, SOAPBody responseBody, RequestMetaDat
                     properties = Convert.propertiestoProperties(element);
                 }
                 if (parameters == null && Constants.MSXMLA.QN_PARAMETERS.equals(element.getElementQName())) {
-                	parameters = Convert.parametersToParameters(element);
+                    parameters = Convert.parametersToParameters(element);
                 }
                 if (command == null && Constants.MSXMLA.QN_COMMAND.equals(element.getElementQName())) {
                     command = Convert.commandtoCommand(element);

server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverResponseTest.java

@@ -437,7 +437,7 @@ void testDiscoverSchemaRowSets(@InjectService XmlaService xmlaService) throws SO
     void testDiscoverXmlMetadata(@InjectService XmlaService xmlaService) throws SOAPException, IOException,
         TransformerException {
 
-        DiscoverXmlMetaDataResponseRowR row = new DiscoverXmlMetaDataResponseRowR("metaData");
+        DiscoverXmlMetaDataResponseRowR row = new DiscoverXmlMetaDataResponseRowR("");
 
         DiscoverService discoverService = xmlaService.discover();
         when(discoverService.xmlMetaData(any(), any(), any())).thenReturn(List.of(row));
@@ -453,7 +453,7 @@ void testDiscoverXmlMetadata(@InjectService XmlaService xmlaService) throws SOAP
         XmlAssert xmlAssert = XMLUtil.createAssert(response);
         checkRow(xmlAssert);
         checkRowValues(xmlAssert, Map.of(
-            "MetaData", "metaData"
+            "MetaData", ""
         ));
     }