migrate propertyName restriction from string to list

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

Author: dbulahov

api/src/main/java/org/eclipse/daanse/xmla/api/discover/discover/properties/DiscoverPropertiesRestrictions.java

@@ -15,13 +15,13 @@
 
 import org.eclipse.daanse.xmla.api.annotation.Restriction;
 
-import java.util.Optional;
+import java.util.List;
 
 import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;
 
 public interface DiscoverPropertiesRestrictions {
     String RESTRICTIONS_PROPERTY_NAME = "PropertyName";
 
     @Restriction(name = RESTRICTIONS_PROPERTY_NAME, type = XSD_STRING)
-    Optional<String> propertyName();
+    List<String> propertyName();
 }

client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverConsumers.java

@@ -75,6 +75,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import static org.eclipse.daanse.xmla.api.discover.discover.datasources.DiscoverDataSourcesRestrictions.RESTRICTIONS_AUTHENTICATION_MODE;
 import static org.eclipse.daanse.xmla.api.discover.discover.datasources.DiscoverDataSourcesRestrictions.RESTRICTIONS_DATA_SOURCE_DESCRIPTION;
@@ -673,7 +674,10 @@ static Consumer<SOAPMessage> createDiscoverPropertiesRequestConsumer(DiscoverPro
                 discover.addChildElement(REQUEST_TYPE).setTextContent(DISCOVER_PROPERTIES);
                 SOAPElement restrictionList = discover.addChildElement(RESTRICTIONS).addChildElement(RESTRICTION_LIST);
 
-                dr.propertyName().ifPresent(v -> addChildElement(restrictionList, RESTRICTIONS_PROPERTY_NAME, v));
+                if (dr.propertyName().size() > 0) {
+                    String joinedStr = dr.propertyName().stream().collect(Collectors.joining("\n", "", ""));
+                    addChildElement(restrictionList, RESTRICTIONS_PROPERTY_NAME, joinedStr);
+                }
 
                 SOAPElement propertyList = discover.addChildElement(PROPERTIES).addChildElement(PROPERTY_LIST);
                 addChildElementPropertyList(propertyList, properties);

client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java

@@ -474,7 +474,7 @@ void testDiscoverProperties() throws Exception {
         PropertiesR properties = new PropertiesR();
         properties.addProperty(PropertyListElementDefinition.DATA_SOURCE_INFO, "FoodMart");
         properties.addProperty(PropertyListElementDefinition.CONTENT, "SchemaData");
-        DiscoverPropertiesRestrictionsR restrictions = new DiscoverPropertiesRestrictionsR(Optional.of("PropertyName"));
+        DiscoverPropertiesRestrictionsR restrictions = new DiscoverPropertiesRestrictionsR(List.of("PropertyName"));
 
         RequestMetaData requestMetaData = null;
         UserPrincipal userPrincipal = null;

model.record/src/main/java/org/eclipse/daanse/xmla/model/record/discover/discover/properties/DiscoverPropertiesRestrictionsR.java

@@ -13,10 +13,11 @@
 */
 package org.eclipse.daanse.xmla.model.record.discover.discover.properties;
 
+import java.util.List;
 import java.util.Optional;
 
 import org.eclipse.daanse.xmla.api.discover.discover.properties.DiscoverPropertiesRestrictions;
 
-public record DiscoverPropertiesRestrictionsR(Optional<String> propertyName) implements DiscoverPropertiesRestrictions {
+public record DiscoverPropertiesRestrictionsR(List<String> propertyName) implements DiscoverPropertiesRestrictions {
 
 }

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

@@ -19,6 +19,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -114,9 +115,12 @@ private Convert() {
 
     public static DiscoverPropertiesRestrictionsR discoverPropertiesRestrictions(SOAPElement restriction) {
         Map<String, String> m = getMapValuesByTag(restriction, RESTRICTION_LIST);
-        return new DiscoverPropertiesRestrictionsR(
-            Optional.ofNullable(m.get(PROPERTY_NAME))
-        );
+        String propertyName = m.get(PROPERTY_NAME);
+        if (propertyName != null) {
+            String[] properties = propertyName.split("\\n");
+            return new DiscoverPropertiesRestrictionsR(Arrays.stream(properties).map(s -> s.trim()).filter(s -> s.length() > 0).toList());
+        }
+        return new DiscoverPropertiesRestrictionsR(List.of());
     }
 
     public static PropertiesR propertiestoProperties(SOAPElement propertiesElement) {

server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/Convert.java

@@ -19,6 +19,7 @@
 import static org.eclipse.daanse.xmla.server.jakarta.jws.ConvertorUtil.convertMessages;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -324,8 +325,11 @@ private static DiscoverPropertiesRestrictionsR discoverPropertiesRestrictions(Di
         Map<String, String> map = restrictionsMap(requestWs);
 
         String propertyName = map.get(DiscoverPropertiesRestrictions.RESTRICTIONS_PROPERTY_NAME);
-
-        return new DiscoverPropertiesRestrictionsR(Optional.ofNullable(propertyName));
+        if (propertyName != null) {
+            String[] properties = propertyName.split("\\n");
+            return new DiscoverPropertiesRestrictionsR(Arrays.stream(properties).map(s -> s.trim()).filter(s -> s.length() > 0).toList());
+        }
+        return new DiscoverPropertiesRestrictionsR(List.of());
     }
 
     public static DiscoverPropertiesRequest fromDiscoverProperties(Discover requestWs) {

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

@@ -16,7 +16,6 @@
 import org.eclipse.daanse.xmla.api.RequestMetaData;
 import org.eclipse.daanse.xmla.api.UserPrincipal;
 import org.eclipse.daanse.xmla.api.XmlaService;
-import org.eclipse.daanse.xmla.api.common.enums.ActionTypeEnum;
 import org.eclipse.daanse.xmla.api.common.enums.AuthenticationModeEnum;
 import org.eclipse.daanse.xmla.api.common.enums.ColumnOlapTypeEnum;
 import org.eclipse.daanse.xmla.api.common.enums.CubeSourceEnum;
@@ -161,7 +160,7 @@ void testDiscoverPropertiesLocaleIdentifier(@InjectService XmlaService xmlaServi
                 assertThat(p.format()).isNotNull().isNotPresent();
             });
             assertThat(d.restrictions()).isNotNull()
-                    .satisfies(r -> assertThat(r.propertyName()).isNotNull().isNotPresent());
+                    .satisfies(r -> assertThat(r.propertyName()).isNotNull());
         });
     }
 
@@ -205,7 +204,7 @@ void testDiscoverPropertiesRestricted(@InjectService XmlaService xmlaService) {
                 assertThat(p.format()).isNotNull().isPresent().contains(TABULAR);
             });
             assertThat(d.restrictions()).isNotNull()
-                    .satisfies(r -> assertThat(r.propertyName()).isNotNull().isPresent().contains("ProviderVersion"));
+                    .satisfies(r -> assertThat(r.propertyName()).isNotNull().contains("ProviderVersion"));
         });
     }