add url in RequestMetaData

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

Author: dbulahov

api/src/main/java/org/eclipse/daanse/xmla/api/RequestMetaData.java

@@ -19,4 +19,6 @@ public interface RequestMetaData {
     Optional<String> userAgent();
 
     Optional<String> sessionId();
+
+    Optional<String> url();
 }

client/soapmessage/test.bndrun.deactivated

@@ -116,6 +116,7 @@ port                              :   17290
 	org.mockito.mockito-core;version='[4.9.0,4.9.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
 	org.osgi.test.junit5;version='[1.3.0,1.3.1)',\

model.record/src/main/java/org/eclipse/daanse/xmla/model/record/RequestMetaDataR.java

@@ -16,6 +16,6 @@
 
 import org.eclipse.daanse.xmla.api.RequestMetaData;
 
-public record RequestMetaDataR(Optional<String> userAgent, Optional<String> sessionId) implements RequestMetaData {
+public record RequestMetaDataR(Optional<String> userAgent, Optional<String> sessionId, Optional<String> url) implements RequestMetaData {
 
 }

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

@@ -25,10 +25,11 @@ public class RequestMetaDataUtils {
 
     public static final String USER_AGENT = "User-agent";
 
-    public static RequestMetaData getRequestMetaData(Map<String, Object> headers, Optional<Session> oSession) {
+    public static RequestMetaData getRequestMetaData(Map<String, Object> headers, Optional<Session> oSession, String url) {
         Optional<String> oUserAgent = getUserAgent(headers.get(USER_AGENT));
         return new RequestMetaDataR(oUserAgent,
-                oSession.isPresent() ? Optional.of(oSession.get().sessionId()) : Optional.empty());
+                oSession.isPresent() ? Optional.of(oSession.get().sessionId()) : Optional.empty(),
+                Optional.ofNullable(url));
     }
 
     private static Optional<String> getUserAgent(Object o) {

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

@@ -208,7 +208,7 @@ public XmlaApiAdapter(XmlaService xmlaService) {
     private static final QName QN_SESSION = new QName("urn:schemas-microsoft-com:xml-analysis", "Session");
 
     public SOAPMessage handleRequest(SOAPMessage messageRequest, Map<String, Object> headers, Principal principal,
-            Function<String, Boolean> isUserInRoleFunction) {
+            Function<String, Boolean> isUserInRoleFunction, String url) {
         try {
             SOAPMessage messageResponse = MessageFactory.newInstance().createMessage();
             messageResponse.setProperty(SOAPMessage.WRITE_XML_DECLARATION, "true");
@@ -257,7 +257,7 @@ public boolean hasRole(String role) {
                 SOAPHeader header = envelopeResponse.getHeader();
                 header.setValue("\n");
             }
-            RequestMetaData metaData = RequestMetaDataUtils.getRequestMetaData(headers, oSession);
+            RequestMetaData metaData = RequestMetaDataUtils.getRequestMetaData(headers, oSession, url);
             SOAPBody bodyResponse = envelopeResponse.getBody();
             handleBody(messageRequest.getSOAPBody(), bodyResponse, metaData, userPrincipal);
             return messageResponse;

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

@@ -224,6 +224,12 @@ public Optional<String> sessionId() {
                 return Optional.empty();
             }
 
+            @Override
+            public Optional<String> url() {
+
+                return Optional.empty();
+            }
+
         };
 
         DbSchemaCatalogsRequest requestApi = Convert.fromDiscoverDbSchemaCatalogs(requestWs);

server/jakarta.jws/test.bndrun.deactivated

@@ -115,6 +115,7 @@ org.slf4j.simpleLogger.defaultLogLevel=debug,\
 	org.mockito.mockito-core;version='[4.9.0,4.9.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
 	org.osgi.test.junit5;version='[1.3.0,1.3.1)',\

server/jakarta.saaj/src/main/java/org/eclipse/daanse/xmla/server/jakarta/saaj/impl/XmlaServlet.java

@@ -57,7 +57,7 @@ public void activate() {
     }
 
     @Override
-    public SOAPMessage onMessage(SOAPMessage soapMessage,Principal principal, Function<String, Boolean> isUserInRoleFunction) {
+    public SOAPMessage onMessage(SOAPMessage soapMessage,Principal principal, Function<String, Boolean> isUserInRoleFunction, String url) {
         try {
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("SoapMessage in:", prettyPrint(soapMessage).toString());
@@ -66,7 +66,7 @@ public SOAPMessage onMessage(SOAPMessage soapMessage,Principal principal, Functi
             Map<String, Object> map = StreamSupport.stream(iterable.spliterator(), true).collect(
                     Collectors.toMap(MimeHeader::getName, MimeHeader::getValue, (oldValue, newValue) -> oldValue));
 
-            SOAPMessage returnMessage = xmlaAdapter.handleRequest(soapMessage, map, principal,  isUserInRoleFunction);
+            SOAPMessage returnMessage = xmlaAdapter.handleRequest(soapMessage, map, principal,  isUserInRoleFunction, url);
 
             LOGGER.debug("SoapMessage out:", prettyPrint(returnMessage).toString());
 

server/jakarta.saaj/test.bndrun

@@ -98,6 +98,7 @@ port                              :   17290
 	org.mockito.mockito-core;version='[4.9.0,4.9.1)',\
 	org.objenesis;version='[3.3.0,3.3.1)',\
 	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.osgi.service.cm;version='[1.6.1,1.6.2)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.test.common;version='[1.3.0,1.3.1)',\
 	org.osgi.test.junit5;version='[1.3.0,1.3.1)',\

server/jakarta.xml.ws.provider.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/jakarta/xml/ws/provider/soapmessage/XmlaWebserviceProvider.java

@@ -76,7 +76,7 @@ public SOAPMessage invoke(SOAPMessage request) {
                 .get(MessageContext.HTTP_REQUEST_HEADERS);
 
         LOGGER.debug("===== The provider got a request =====");
-        return wsAdapter.handleRequest(request, headers,null,null);
+        return wsAdapter.handleRequest(request, headers,null,null, null);
     }
 
     private SOAPFault getFault(Exception ex) {