diff --git a/api/src/main/java/org/eclipse/daanse/xmla/api/discover/DiscoverService.java b/api/src/main/java/org/eclipse/daanse/xmla/api/discover/DiscoverService.java index 5e31350..1b0ae0b 100644 --- a/api/src/main/java/org/eclipse/daanse/xmla/api/discover/DiscoverService.java +++ b/api/src/main/java/org/eclipse/daanse/xmla/api/discover/DiscoverService.java @@ -16,7 +16,6 @@ import java.util.List; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.XmlaService; import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsRequest; import org.eclipse.daanse.xmla.api.discover.dbschema.catalogs.DbSchemaCatalogsResponseRow; @@ -88,8 +87,7 @@ public interface DiscoverService { * @param request the request * @return the list */ - List dataSources(DiscoverDataSourcesRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List dataSources(DiscoverDataSourcesRequest request, RequestMetaData metaData); /** * returns the catalogs that are accessible on the server. @@ -97,8 +95,7 @@ List dataSources(DiscoverDataSourcesRequest requ * @param request the request * @return the list */ - List dbSchemaCatalogs(DbSchemaCatalogsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List dbSchemaCatalogs(DbSchemaCatalogsRequest request, RequestMetaData metaData); /** * describes the structure of cubes within a database. Perspectives are also returned in this @@ -107,8 +104,7 @@ List dbSchemaCatalogs(DbSchemaCatalogsRequest reque * @param request the request * @return the list */ - List dbSchemaColumns(DbSchemaColumnsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List dbSchemaColumns(DbSchemaColumnsRequest request, RequestMetaData metaData); /** * describes the properties of members and cell properties. @@ -117,7 +113,7 @@ List dbSchemaColumns(DbSchemaColumnsRequest request, * @return the list */ List dbSchemaProviderTypes(DbSchemaProviderTypesRequest request, - RequestMetaData metaData, UserRolePrincipal userPrincipal); + RequestMetaData metaData); /** * identifies the (base) data types supported by the server. @@ -125,8 +121,7 @@ List dbSchemaProviderTypes(DbSchemaProviderTyp * @param request the request * @return the list */ - List dbSchemaSchemata(DbSchemaSchemataRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List dbSchemaSchemata(DbSchemaSchemataRequest request, RequestMetaData metaData); /** * @@ -134,8 +129,7 @@ List dbSchemaSchemata(DbSchemaSchemataRequest reque * @param request the request * @return the list */ - List dbSchemaSourceTables(DbSchemaSourceTablesRequest request, - RequestMetaData metaData, UserRolePrincipal userPrincipal); + List dbSchemaSourceTables(DbSchemaSourceTablesRequest request, RequestMetaData metaData); /** * returns dimensions, measure groups, or schema rowsets exposed as tables. @@ -143,8 +137,7 @@ List dbSchemaSourceTables(DbSchemaSourceTablesR * @param request the request * @return the list */ - List dbSchemaTables(DbSchemaTablesRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List dbSchemaTables(DbSchemaTablesRequest request, RequestMetaData metaData); /** * @@ -152,8 +145,7 @@ List dbSchemaTables(DbSchemaTablesRequest request, Re * @param request the request * @return the list */ - List dbSchemaTablesInfo(DbSchemaTablesInfoRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List dbSchemaTablesInfo(DbSchemaTablesInfoRequest request, RequestMetaData metaData); /** * returns a row for each measure, each cube dimension attribute, and each schema rowset column, @@ -164,7 +156,7 @@ List dbSchemaTablesInfo(DbSchemaTablesInfoRequest */ // discover List discoverEnumerators(DiscoverEnumeratorsRequest request, - RequestMetaData metaData, UserRolePrincipal userPrincipal); + RequestMetaData metaData); /** * returns information about keywords that are reserved by the XMLA server. @@ -172,8 +164,7 @@ List discoverEnumerators(DiscoverEnumeratorsRequ * @param request the request * @return the list */ - List discoverKeywords(DiscoverKeywordsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List discoverKeywords(DiscoverKeywordsRequest request, RequestMetaData metaData); /** * returns information about literals supported by the server. @@ -181,8 +172,7 @@ List discoverKeywords(DiscoverKeywordsRequest reque * @param request the request * @return the list */ - List discoverLiterals(DiscoverLiteralsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List discoverLiterals(DiscoverLiteralsRequest request, RequestMetaData metaData); /** * returns a list of information and values about the properties that are supported by the server @@ -191,8 +181,7 @@ List discoverLiterals(DiscoverLiteralsRequest reque * @param request the request * @return the list */ - List discoverProperties(DiscoverPropertiesRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List discoverProperties(DiscoverPropertiesRequest request, RequestMetaData metaData); /** * returns the names, restrictions, description, and other information for all Discover requests. @@ -201,7 +190,7 @@ List discoverProperties(DiscoverPropertiesRequest * @return the list */ List discoverSchemaRowsets(DiscoverSchemaRowsetsRequest request, - RequestMetaData metaData, UserRolePrincipal userPrincipal); + RequestMetaData metaData); /** * describes the actions that can be available to the client application. @@ -210,8 +199,7 @@ List discoverSchemaRowsets(DiscoverSchemaRowse * @return the list */ // md - List mdSchemaActions(MdSchemaActionsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaActions(MdSchemaActionsRequest request, RequestMetaData metaData); /** * describes the structure of cubes within a database. Perspectives are also returned in this @@ -220,8 +208,7 @@ List mdSchemaActions(MdSchemaActionsRequest request, * @param request the request * @return the list */ - List mdSchemaCubes(MdSchemaCubesRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaCubes(MdSchemaCubesRequest request, RequestMetaData metaData); /** * describes the dimensions within a database. @@ -229,8 +216,7 @@ List mdSchemaCubes(MdSchemaCubesRequest request, Reque * @param request the request * @return the list */ - List mdSchemaDimensions(MdSchemaDimensionsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaDimensions(MdSchemaDimensionsRequest request, RequestMetaData metaData); /** * returns information about the functions that are currently available for use in the DAX and MDX @@ -239,8 +225,7 @@ List mdSchemaDimensions(MdSchemaDimensionsRequest * @param request the request * @return the list */ - List mdSchemaFunctions(MdSchemaFunctionsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaFunctions(MdSchemaFunctionsRequest request, RequestMetaData metaData); /** * describes each hierarchy within a particular dimension. @@ -248,8 +233,7 @@ List mdSchemaFunctions(MdSchemaFunctionsRequest re * @param request the request * @return the list */ - List mdSchemaHierarchies(MdSchemaHierarchiesRequest request, - RequestMetaData metaData, UserRolePrincipal userPrincipal); + List mdSchemaHierarchies(MdSchemaHierarchiesRequest request, RequestMetaData metaData); /** * describes the KPIs within a database @@ -257,8 +241,7 @@ List mdSchemaHierarchies(MdSchemaHierarchiesRequ * @param request the request * @return the list */ - List mdSchemaKpis(MdSchemaKpisRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaKpis(MdSchemaKpisRequest request, RequestMetaData metaData); /** * describes each level within a particular hierarchy. @@ -266,8 +249,7 @@ List mdSchemaKpis(MdSchemaKpisRequest request, RequestM * @param request the request * @return the list */ - List mdSchemaLevels(MdSchemaLevelsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaLevels(MdSchemaLevelsRequest request, RequestMetaData metaData); /** * enumerates the dimensions of measure groups. @@ -276,7 +258,7 @@ List mdSchemaLevels(MdSchemaLevelsRequest request, Re * @return the list */ List mdSchemaMeasureGroupDimensions( - MdSchemaMeasureGroupDimensionsRequest request, RequestMetaData metaData, UserRolePrincipal userPrincipal); + MdSchemaMeasureGroupDimensionsRequest request, RequestMetaData metaData); /** * describes the MeasureGroups within a database @@ -284,8 +266,7 @@ List mdSchemaMeasureGroupDimensions( * @param request the request * @return the list */ - List mdSchemaMeasureGroups(MdSchemaMeasureGroupsRequest request, - RequestMetaData metaData, UserRolePrincipal userPrincipal); + List mdSchemaMeasureGroups(MdSchemaMeasureGroupsRequest request, RequestMetaData metaData); /** * describes the members within a database @@ -293,8 +274,7 @@ List mdSchemaMeasureGroups(MdSchemaMeasureGrou * @param request the request * @return the list */ - List mdSchemaMeasures(MdSchemaMeasuresRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaMeasures(MdSchemaMeasuresRequest request, RequestMetaData metaData); /** * describes the members within a database @@ -302,8 +282,7 @@ List mdSchemaMeasures(MdSchemaMeasuresRequest reque * @param request the request * @return the list */ - List mdSchemaMembers(MdSchemaMembersRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaMembers(MdSchemaMembersRequest request, RequestMetaData metaData); /** * describes the properties of members and cell properties. @@ -311,8 +290,7 @@ List mdSchemaMembers(MdSchemaMembersRequest request, * @param request the request * @return the list */ - List mdSchemaProperties(MdSchemaPropertiesRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaProperties(MdSchemaPropertiesRequest request, RequestMetaData metaData); /** * describes any sets that are currently defined in a database, including session- scoped sets. @@ -320,8 +298,7 @@ List mdSchemaProperties(MdSchemaPropertiesRequest * @param request the request * @return the list */ - List mdSchemaSets(MdSchemaSetsRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List mdSchemaSets(MdSchemaSetsRequest request, RequestMetaData metaData); /** * returns a rowset with one row and one column. The single cell in the rowset contains an XML @@ -330,6 +307,5 @@ List mdSchemaSets(MdSchemaSetsRequest request, RequestM * @param request the request * @return the list */ - List xmlMetaData(DiscoverXmlMetaDataRequest request, RequestMetaData metaData, - UserRolePrincipal userPrincipal); + List xmlMetaData(DiscoverXmlMetaDataRequest request, RequestMetaData metaData); } diff --git a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverServiceImpl.java b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverServiceImpl.java index e0c28a2..3cce168 100644 --- a/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverServiceImpl.java +++ b/client/soapmessage/src/main/java/org/eclipse/daanse/xmla/client/soapmessage/DiscoverServiceImpl.java @@ -121,7 +121,7 @@ public DiscoverServiceImpl(SoapClient soapClient) { @Override public List dbSchemaCatalogs(DbSchemaCatalogsRequest dbSchemaCatalogsRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers @@ -136,7 +136,7 @@ public List dbSchemaCatalogs(DbSchemaCatalogsReques @Override public List dbSchemaTables(DbSchemaTablesRequest dbSchemaTablesRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createDbSchemaTablesRequestConsumer(dbSchemaTablesRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -149,8 +149,7 @@ public List dbSchemaTables(DbSchemaTablesRequest dbSc @Override public List discoverEnumerators( - DiscoverEnumeratorsRequest discoverEnumeratorsRequest, RequestMetaData metaData, - UserRolePrincipal userPrincipal) { + DiscoverEnumeratorsRequest discoverEnumeratorsRequest, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers .createDiscoverEnumeratorsRequestConsumer(discoverEnumeratorsRequest); @@ -164,7 +163,7 @@ public List discoverEnumerators( @Override public List discoverKeywords(DiscoverKeywordsRequest discoverKeywordsRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers .createDiscoverKeywordsRequestConsumer(discoverKeywordsRequest); @@ -178,7 +177,7 @@ public List discoverKeywords(DiscoverKeywordsReques @Override public List discoverLiterals(DiscoverLiteralsRequest discoverLiteralsRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers .createDiscoverLiteralsRequestConsumer(discoverLiteralsRequest); @@ -192,7 +191,7 @@ public List discoverLiterals(DiscoverLiteralsReques @Override public List discoverProperties(DiscoverPropertiesRequest discoverPropertiesRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers .createDiscoverPropertiesRequestConsumer(discoverPropertiesRequest); @@ -206,8 +205,7 @@ public List discoverProperties(DiscoverProperties @Override public List discoverSchemaRowsets( - DiscoverSchemaRowsetsRequest discoverSchemaRowsetsRequest, RequestMetaData metaData, - UserRolePrincipal userPrincipal) { + DiscoverSchemaRowsetsRequest discoverSchemaRowsetsRequest, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers .createDiscoverSchemaRowsetsRequestConsumer(discoverSchemaRowsetsRequest); @@ -221,7 +219,7 @@ public List discoverSchemaRowsets( @Override public List mdSchemaActions(MdSchemaActionsRequest mdSchemaActionsRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaActionsRequestConsumer(mdSchemaActionsRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -234,7 +232,7 @@ public List mdSchemaActions(MdSchemaActionsRequest m @Override public List mdSchemaCubes(MdSchemaCubesRequest mdSchemaCubesRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaCubesRequestConsumer(mdSchemaCubesRequest); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -247,7 +245,7 @@ public List mdSchemaCubes(MdSchemaCubesRequest mdSchem @Override public List mdSchemaDimensions(MdSchemaDimensionsRequest mdSchemaDimensionsRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers .createMdSchemaDimensionsRequestConsumer(mdSchemaDimensionsRequest); @@ -261,7 +259,7 @@ public List mdSchemaDimensions(MdSchemaDimensions @Override public List mdSchemaFunctions(MdSchemaFunctionsRequest mdSchemaFunctionsRequest, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers .createMdSchemaFunctionsRequestConsumer(mdSchemaFunctionsRequest); @@ -275,7 +273,7 @@ public List mdSchemaFunctions(MdSchemaFunctionsReq @Override public List mdSchemaHierarchies(MdSchemaHierarchiesRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaHierarchiesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -288,7 +286,7 @@ public List mdSchemaHierarchies(MdSchemaHierarch @Override public List dataSources(DiscoverDataSourcesRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = createDiscoverDataSourcesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -301,7 +299,7 @@ public List dataSources(DiscoverDataSourcesReque @Override public List xmlMetaData(DiscoverXmlMetaDataRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createDiscoverXmlMetaDataRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -313,8 +311,7 @@ public List xmlMetaData(DiscoverXmlMetaDataReque } @Override - public List dbSchemaColumns(DbSchemaColumnsRequest requestApi, RequestMetaData metaData, - UserRolePrincipal userPrincipal) { + public List dbSchemaColumns(DbSchemaColumnsRequest requestApi, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createDbSchemaColumnsRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -327,7 +324,7 @@ public List dbSchemaColumns(DbSchemaColumnsRequest r @Override public List dbSchemaProviderTypes(DbSchemaProviderTypesRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createDbSchemaProviderTypesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -340,7 +337,7 @@ public List dbSchemaProviderTypes(DbSchemaProv @Override public List dbSchemaSchemata(DbSchemaSchemataRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createDbSchemaSchemataRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -352,8 +349,7 @@ public List dbSchemaSchemata(DbSchemaSchemataReques } @Override - public List mdSchemaLevels(MdSchemaLevelsRequest requestApi, RequestMetaData metaData, - UserRolePrincipal userPrincipal) { + public List mdSchemaLevels(MdSchemaLevelsRequest requestApi, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaLevelsRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -366,7 +362,7 @@ public List mdSchemaLevels(MdSchemaLevelsRequest requ @Override public List mdSchemaMeasureGroupDimensions( - MdSchemaMeasureGroupDimensionsRequest requestApi, RequestMetaData metaData, UserRolePrincipal userPrincipal) { + MdSchemaMeasureGroupDimensionsRequest requestApi, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers .createMdSchemaMeasureGroupDimensionsRequestConsumer(requestApi); @@ -380,7 +376,7 @@ public List mdSchemaMeasureGroupDimen @Override public List mdSchemaMeasures(MdSchemaMeasuresRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaMeasuresRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -392,8 +388,7 @@ public List mdSchemaMeasures(MdSchemaMeasuresReques } @Override - public List mdSchemaMembers(MdSchemaMembersRequest requestApi, RequestMetaData metaData, - UserRolePrincipal userPrincipal) { + public List mdSchemaMembers(MdSchemaMembersRequest requestApi, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaMembersRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -406,7 +401,7 @@ public List mdSchemaMembers(MdSchemaMembersRequest r @Override public List mdSchemaProperties(MdSchemaPropertiesRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaPropertiesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -418,8 +413,7 @@ public List mdSchemaProperties(MdSchemaProperties } @Override - public List mdSchemaSets(MdSchemaSetsRequest requestApi, RequestMetaData metaData, - UserRolePrincipal userPrincipal) { + public List mdSchemaSets(MdSchemaSetsRequest requestApi, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaSetsRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -431,8 +425,7 @@ public List mdSchemaSets(MdSchemaSetsRequest requestApi } @Override - public List mdSchemaKpis(MdSchemaKpisRequest requestApi, RequestMetaData metaData, - UserRolePrincipal userPrincipal) { + public List mdSchemaKpis(MdSchemaKpisRequest requestApi, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaKpisRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -444,8 +437,7 @@ public List mdSchemaKpis(MdSchemaKpisRequest requestApi } @Override - public List mdSchemaMeasureGroups(MdSchemaMeasureGroupsRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + public List mdSchemaMeasureGroups(MdSchemaMeasureGroupsRequest requestApi, RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createMdSchemaMeasureGroupsRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -458,7 +450,7 @@ public List mdSchemaMeasureGroups(MdSchemaMeas @Override public List dbSchemaSourceTables(DbSchemaSourceTablesRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createDbSchemaSourceTablesRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); @@ -472,7 +464,7 @@ public List dbSchemaSourceTables(DbSchemaSource @Override public List dbSchemaTablesInfo(DbSchemaTablesInfoRequest requestApi, - RequestMetaData metaData, UserRolePrincipal userPrincipal) { + RequestMetaData metaData) { try { Consumer msg = DiscoverConsumers.createDbSchemaTablesInfoRequestConsumer(requestApi); SOAPMessage message = soapClient.callSoapWebService(Optional.of(SOAP_ACTION_DISCOVER), msg); diff --git a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java index 816fbaa..5429f5b 100644 --- a/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java +++ b/client/soapmessage/src/test/java/org/eclipse/daanse/xmla/client/soapmessage/ClientDiscoverTest.java @@ -247,11 +247,10 @@ void testDataSources() throws Exception { Optional.of(ProviderTypeEnum.DMP), Optional.of(AuthenticationModeEnum.AUTHENTICATED)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DiscoverDataSourcesRequest dataSourcesRequest = new DiscoverDataSourcesRequestR(properties, restrictions); - List rows = client.discover().dataSources(dataSourcesRequest, requestMetaData, - userPrincipal); + List rows = client.discover().dataSources(dataSourcesRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -319,12 +318,12 @@ void testDiscoverEnumerators() throws Exception { DiscoverEnumeratorsRestrictionsR restrictions = new DiscoverEnumeratorsRestrictionsR(Optional.of("FoodMart")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DiscoverEnumeratorsRequest discoverEnumeratorsRequest = new DiscoverEnumeratorsRequestR(properties, restrictions); List rows = client.discover().discoverEnumerators(discoverEnumeratorsRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -374,11 +373,11 @@ void testDiscoverKeywords() throws Exception { DiscoverKeywordsRestrictionsR restrictions = new DiscoverKeywordsRestrictionsR(Optional.of("Keyword")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DiscoverKeywordsRequest discoverKeywordsRequest = new DiscoverKeywordsRequestR(properties, restrictions); List rows = client.discover().discoverKeywords(discoverKeywordsRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -423,11 +422,11 @@ void testDiscoverLiterals() throws Exception { DiscoverLiteralsRestrictionsR restrictions = new DiscoverLiteralsRestrictionsR(Optional.of("LiteralName")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DiscoverLiteralsRequest discoverLiteralsRequest = new DiscoverLiteralsRequestR(properties, restrictions); List rows = client.discover().discoverLiterals(discoverLiteralsRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -477,11 +476,11 @@ void testDiscoverProperties() throws Exception { DiscoverPropertiesRestrictionsR restrictions = new DiscoverPropertiesRestrictionsR(List.of("PropertyName")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DiscoverPropertiesRequest discoverPropertiesRequest = new DiscoverPropertiesRequestR(properties, restrictions); List rows = client.discover().discoverProperties(discoverPropertiesRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -533,12 +532,12 @@ void testSchemaRowSets() throws Exception { Optional.of("SchemaName")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DiscoverSchemaRowsetsRequest discoverSchemaRowsetsRequest = new DiscoverSchemaRowsetsRequestR(properties, restrictions); List rows = client.discover() - .discoverSchemaRowsets(discoverSchemaRowsetsRequest, requestMetaData, userPrincipal); + .discoverSchemaRowsets(discoverSchemaRowsetsRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -601,12 +600,12 @@ void testXmlMetaData() throws Exception { Optional.of(ObjectExpansionEnum.EXPAND_OBJECT)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DiscoverXmlMetaDataRequest discoverXmlMetaDataRequest = new DiscoverXmlMetaDataRequestR(properties, restrictions); List rows = client.discover().xmlMetaData(discoverXmlMetaDataRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -719,11 +718,10 @@ void testCatalogs() throws Exception { properties.addProperty(PropertyListElementDefinition.CONTENT, "SchemaData"); DbSchemaCatalogsRestrictionsR restrictions = new DbSchemaCatalogsRestrictionsR(Optional.of("CatalogName")); - UserRolePrincipal userPrincipal = null; + DbSchemaCatalogsRequest dbSchemaCatalogsRequest = new DbSchemaCatalogsRequestR(properties, restrictions); - List rows = client.discover().dbSchemaCatalogs(dbSchemaCatalogsRequest, metaData, - userPrincipal); + List rows = client.discover().dbSchemaCatalogs(dbSchemaCatalogsRequest, metaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -784,11 +782,11 @@ void testColumns() throws Exception { Optional.of(ColumnOlapTypeEnum.ATTRIBUTE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DbSchemaColumnsRequest dbSchemaColumnsRequest = new DbSchemaColumnsRequestR(properties, restrictions); List rows = client.discover().dbSchemaColumns(dbSchemaColumnsRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -876,12 +874,12 @@ void testProviderTypes() throws Exception { Optional.of(LevelDbTypeEnum.DBTYPE_EMPTY), Optional.of(true)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DbSchemaProviderTypesRequest dbSchemaProviderTypesRequest = new DbSchemaProviderTypesRequestR(properties, restrictions); List rows = client.discover() - .dbSchemaProviderTypes(dbSchemaProviderTypesRequest, requestMetaData, userPrincipal); + .dbSchemaProviderTypes(dbSchemaProviderTypesRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -952,11 +950,11 @@ void testSchemata() throws Exception { "SchemaOwner"); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DbSchemaSchemataRequest dbSchemaSchemataRequest = new DbSchemaSchemataRequestR(properties, restrictions); List rows = client.discover().dbSchemaSchemata(dbSchemaSchemataRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1012,12 +1010,12 @@ void testSourceTables() throws Exception { Optional.of("CatalogName"), Optional.of("SchemaName"), "TableName", TableTypeEnum.TABLE); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DbSchemaSourceTablesRequest dbSchemaSourceTablesRequest = new DbSchemaSourceTablesRequestR(properties, restrictions); List rows = client.discover().dbSchemaSourceTables(dbSchemaSourceTablesRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1077,11 +1075,10 @@ void testTables() throws Exception { Optional.of("TableSchema"), Optional.of("TableName"), Optional.of("TableType")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DbSchemaTablesRequest dbSchemaTablesRequest = new DbSchemaTablesRequestR(properties, restrictions); - List rows = client.discover().dbSchemaTables(dbSchemaTablesRequest, requestMetaData, - userPrincipal); + List rows = client.discover().dbSchemaTables(dbSchemaTablesRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1147,11 +1144,11 @@ void testTablesInfo() throws Exception { Optional.of("TableSchema"), "TableName", TableTypeEnum.TABLE); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + DbSchemaTablesInfoRequest dbSchemaTablesInfoRequest = new DbSchemaTablesInfoRequestR(properties, restrictions); List rows = client.discover().dbSchemaTablesInfo(dbSchemaTablesInfoRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1224,11 +1221,11 @@ void testActions() throws Exception { Optional.of(CubeSourceEnum.CUBE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaActionsRequest mdSchemaActionsRequest = new MdSchemaActionsRequestR(properties, restrictions); List rows = client.discover().mdSchemaActions(mdSchemaActionsRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1313,11 +1310,10 @@ void testCubes() throws Exception { Optional.of("BaseCubeName"), Optional.of(CubeSourceEnum.CUBE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaCubesRequest mdSchemaCubesRequest = new MdSchemaCubesRequestR(properties, restrictions); - List rows = client.discover().mdSchemaCubes(mdSchemaCubesRequest, requestMetaData, - userPrincipal); + List rows = client.discover().mdSchemaCubes(mdSchemaCubesRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1399,11 +1395,11 @@ void testDimensions() throws Exception { Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaDimensionsRequest mdSchemaDimensionsRequest = new MdSchemaDimensionsRequestR(properties, restrictions); List rows = client.discover().mdSchemaDimensions(mdSchemaDimensionsRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1487,11 +1483,11 @@ void testFunctions() throws Exception { Optional.of(OriginEnum.MSOLAP), Optional.of(InterfaceNameEnum.FILTER), Optional.of("LibraryName")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaFunctionsRequest mdSchemaFunctionsRequest = new MdSchemaFunctionsRequestR(properties, restrictions); List rows = client.discover().mdSchemaFunctions(mdSchemaFunctionsRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1569,12 +1565,12 @@ void testHierarchies() throws Exception { Optional.of(CubeSourceEnum.CUBE), Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaHierarchiesRequest mdSchemaHierarchiesRequest = new MdSchemaHierarchiesRequestR(properties, restrictions); List rows = client.discover().mdSchemaHierarchies(mdSchemaHierarchiesRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1674,11 +1670,10 @@ void testKpis() throws Exception { Optional.of(CubeSourceEnum.CUBE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaKpisRequest mdSchemaKpisRequest = new MdSchemaKpisRequestR(properties, restrictions); - List rows = client.discover().mdSchemaKpis(mdSchemaKpisRequest, requestMetaData, - userPrincipal); + List rows = client.discover().mdSchemaKpis(mdSchemaKpisRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1760,11 +1755,10 @@ void testLevels() throws Exception { Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaLevelsRequest mdSchemaLevelsRequest = new MdSchemaLevelsRequestR(properties, restrictions); - List rows = client.discover().mdSchemaLevels(mdSchemaLevelsRequest, requestMetaData, - userPrincipal); + List rows = client.discover().mdSchemaLevels(mdSchemaLevelsRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1864,12 +1858,12 @@ void testMeasureGroupDimensions() throws Exception { Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaMeasureGroupDimensionsRequest mdSchemaMeasureGroupDimensionsRequest = new MdSchemaMeasureGroupDimensionsRequestR( properties, restrictions); List rows = client.discover() - .mdSchemaMeasureGroupDimensions(mdSchemaMeasureGroupDimensionsRequest, requestMetaData, userPrincipal); + .mdSchemaMeasureGroupDimensions(mdSchemaMeasureGroupDimensionsRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -1947,12 +1941,12 @@ void testMeasureGroups() throws Exception { Optional.of("MeasureGroupName")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaMeasureGroupsRequest mdSchemaMeasureGroupsRequest = new MdSchemaMeasureGroupsRequestR(properties, restrictions); List rows = client.discover() - .mdSchemaMeasureGroups(mdSchemaMeasureGroupsRequest, requestMetaData, userPrincipal); + .mdSchemaMeasureGroups(mdSchemaMeasureGroupsRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -2018,11 +2012,11 @@ void testMeasures() throws Exception { Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaMeasuresRequest mdSchemaMeasuresRequest = new MdSchemaMeasuresRequestR(properties, restrictions); List rows = client.discover().mdSchemaMeasures(mdSchemaMeasuresRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -2114,11 +2108,11 @@ void testMembers() throws Exception { Optional.of("MemberCaption"), Optional.of(CubeSourceEnum.CUBE), Optional.of(TreeOpEnum.CHILDREN)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaMembersRequest mdSchemaMembersRequest = new MdSchemaMembersRequestR(properties, restrictions); List rows = client.discover().mdSchemaMembers(mdSchemaMembersRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -2228,11 +2222,11 @@ void testMdProperties() throws Exception { Optional.of(CubeSourceEnum.CUBE), Optional.of(VisibilityEnum.VISIBLE)); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaPropertiesRequest mdSchemaPropertiesRequest = new MdSchemaPropertiesRequestR(properties, restrictions); List rows = client.discover().mdSchemaProperties(mdSchemaPropertiesRequest, - requestMetaData, userPrincipal); + requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); @@ -2339,11 +2333,10 @@ void testSets() throws Exception { Optional.of("HierarchyUniqueName")); RequestMetaData requestMetaData = null; - UserRolePrincipal userPrincipal = null; + MdSchemaSetsRequest mdSchemaSetsRequest = new MdSchemaSetsRequestR(properties, restrictions); - List rows = client.discover().mdSchemaSets(mdSchemaSetsRequest, requestMetaData, - userPrincipal); + List rows = client.discover().mdSchemaSets(mdSchemaSetsRequest, requestMetaData); assertThat(rows).isNotNull().hasSize(1); assertThat(rows.get(0)).isNotNull(); diff --git a/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java b/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java index 48535fc..45a267f 100644 --- a/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java +++ b/server/adapter.soapmessage/src/main/java/org/eclipse/daanse/xmla/server/adapter/soapmessage/XmlaApiAdapter.java @@ -310,7 +310,7 @@ private void handleBody(SOAPBody body, SOAPBody responseBody, RequestMetaData me if (node != null && Constants.MSXMLA.QN_DISCOVER.equals(node.getElementQName())) { - discover(node, responseBody, metaData, userPrincipal); + discover(node, responseBody, metaData); } if (node != null && Constants.MSXMLA.QN_EXECUTE.equals(node.getElementQName())) { @@ -319,8 +319,7 @@ private void handleBody(SOAPBody body, SOAPBody responseBody, RequestMetaData me } - private void discover(SOAPElement discover, SOAPBody responseBody, RequestMetaData metaData, - UserRolePrincipal userPrincipal) throws SOAPException { + private void discover(SOAPElement discover, SOAPBody responseBody, RequestMetaData metaData) throws SOAPException { String requestType = null; PropertiesR properties = null; @@ -344,7 +343,7 @@ private void discover(SOAPElement discover, SOAPBody responseBody, RequestMetaDa } } - discover(requestType, metaData, userPrincipal, properties, restictions, responseBody); + discover(requestType, metaData, properties, restictions, responseBody); } private void execute(SOAPElement discover, SOAPBody responseBody, RequestMetaData metaData, @@ -403,358 +402,337 @@ private void execute(Command command, PropertiesR properties, List - handleMdSchemaFunctions(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaFunctions(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_DIMENSIONS -> - handleMdSchemaDimensions(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaDimensions(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_CUBES -> - handleMdSchemaCubes(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaCubes(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_ACTIONS -> - handleMdSchemaActions(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaActions(metaData, properties, restrictionElement, responseBody); case DBSCHEMA_TABLES -> - handleDbSchemaTables(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDbSchemaTables(metaData, properties, restrictionElement, responseBody); case DISCOVER_LITERALS -> - handleDiscoverLiterals(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDiscoverLiterals(metaData, properties, restrictionElement, responseBody); case DISCOVER_KEYWORDS -> - handleDiscoverKeywords(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDiscoverKeywords(metaData, properties, restrictionElement, responseBody); case DISCOVER_ENUMERATORS -> - handleDiscoverEnumerators(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDiscoverEnumerators(metaData, properties, restrictionElement, responseBody); case DISCOVER_SCHEMA_ROWSETS -> - handleDiscoverSchemaRowsets(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDiscoverSchemaRowsets(metaData, properties, restrictionElement, responseBody); case DISCOVER_PROPERTIES -> - handleDiscoverProperties(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDiscoverProperties(metaData, properties, restrictionElement, responseBody); case DBSCHEMA_CATALOGS -> - handleDbSchemaCatalogs(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDbSchemaCatalogs(metaData, properties, restrictionElement, responseBody); case DISCOVER_DATASOURCES -> - handleDiscoverDataSources(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDiscoverDataSources(metaData, properties, restrictionElement, responseBody); case DISCOVER_XML_METADATA -> - handleDiscoverXmlMetaData(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDiscoverXmlMetaData(metaData, properties, restrictionElement, responseBody); case DBSCHEMA_COLUMNS -> - handleDbSchemaColumns(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDbSchemaColumns(metaData, properties, restrictionElement, responseBody); case DBSCHEMA_PROVIDER_TYPES -> - handleDbSchemaProviderTypes(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDbSchemaProviderTypes(metaData, properties, restrictionElement, responseBody); case DBSCHEMA_SCHEMATA -> - handleDbSchemaSchemata(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDbSchemaSchemata(metaData, properties, restrictionElement, responseBody); case DBSCHEMA_SOURCE_TABLES -> - handleDbSchemaSourceTables(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDbSchemaSourceTables(metaData, properties, restrictionElement, responseBody); case DBSCHEMA_TABLES_INFO -> - handleDbSchemaTablesInfo(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleDbSchemaTablesInfo(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_HIERARCHIES -> - handleMdSchemaHierarchies(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaHierarchies(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_LEVELS -> - handleMdSchemaLevels(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaLevels(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_MEASUREGROUP_DIMENSIONS -> - handleMdSchemaMeasureGroupDimensions(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaMeasureGroupDimensions(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_MEASURES -> - handleMdSchemaMeasures(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaMeasures(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_MEMBERS -> - handleMdSchemaMembers(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaMembers(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_PROPERTIES -> - handleMdSchemaProperties(metaData, userPrincipal, properties, restrictionElement, responseBody); - case MDSCHEMA_SETS -> handleMdSchemaSets(metaData, userPrincipal, properties, restrictionElement, responseBody); - case MDSCHEMA_KPIS -> handleMdSchemaKpis(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaProperties(metaData, properties, restrictionElement, responseBody); + case MDSCHEMA_SETS -> handleMdSchemaSets(metaData, properties, restrictionElement, responseBody); + case MDSCHEMA_KPIS -> handleMdSchemaKpis(metaData, properties, restrictionElement, responseBody); case MDSCHEMA_MEASUREGROUPS -> - handleMdSchemaMeasureGroups(metaData, userPrincipal, properties, restrictionElement, responseBody); + handleMdSchemaMeasureGroups(metaData, properties, restrictionElement, responseBody); default -> throw new IllegalArgumentException("Unexpected value: " + requestType); } } - private void handleMdSchemaMeasureGroups(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleMdSchemaMeasureGroups(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaMeasureGroupsRestrictionsR restrictionsR = Convert.discoverMdSchemaMeasureGroups(restrictionElement); MdSchemaMeasureGroupsRequest request = new MdSchemaMeasureGroupsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaMeasureGroups(request, metaData, - userPrincipal); + List rows = xmlaService.discover().mdSchemaMeasureGroups(request, metaData); SoapUtil.toMdSchemaMeasureGroups(rows, body); } - private void handleMdSchemaKpis(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleMdSchemaKpis(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaKpisRestrictionsR restrictionsR = Convert.discoverMdSchemaKpisRestrictions(restrictionElement); MdSchemaKpisRequest request = new MdSchemaKpisRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaKpis(request, metaData, userPrincipal); + List rows = xmlaService.discover().mdSchemaKpis(request, metaData); SoapUtil.toMdSchemaKpis(rows, body); } - private void handleMdSchemaSets(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleMdSchemaSets(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaSetsRestrictionsR restrictionsR = Convert.discoverMdSchemaSetsRestrictions(restrictionElement); MdSchemaSetsRequest request = new MdSchemaSetsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaSets(request, metaData, userPrincipal); + List rows = xmlaService.discover().mdSchemaSets(request, metaData); SoapUtil.toMdSchemaSets(rows, body); } - private void handleMdSchemaProperties(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleMdSchemaProperties(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaPropertiesRestrictionsR restrictionsR = Convert .discoverMdSchemaPropertiesRestrictions(restrictionElement); MdSchemaPropertiesRequest request = new MdSchemaPropertiesRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaProperties(request, metaData, - userPrincipal); + List rows = xmlaService.discover().mdSchemaProperties(request, metaData); SoapUtil.toMdSchemaProperties(rows, body); } - private void handleMdSchemaMembers(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleMdSchemaMembers(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaMembersRestrictionsR restrictionsR = Convert.discoverMdSchemaMembersRestrictions(restrictionElement); MdSchemaMembersRequest request = new MdSchemaMembersRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaMembers(request, metaData, - userPrincipal); + List rows = xmlaService.discover().mdSchemaMembers(request, metaData); SoapUtil.toMdSchemaMembers(rows, body); } - private void handleMdSchemaMeasures(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleMdSchemaMeasures(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaMeasuresRestrictionsR restrictionsR = Convert.discoverMdSchemaMeasuresRestrictions(restrictionElement); MdSchemaMeasuresRequest request = new MdSchemaMeasuresRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaMeasures(request, metaData, - userPrincipal); + List rows = xmlaService.discover().mdSchemaMeasures(request, metaData); SoapUtil.toMdSchemaMeasures(rows, body); } - private void handleMdSchemaMeasureGroupDimensions(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleMdSchemaMeasureGroupDimensions(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaMeasureGroupDimensionsRestrictionsR restrictionsR = Convert .discoverMdSchemaMeasureGroupDimensionsRestrictions(restrictionElement); MdSchemaMeasureGroupDimensionsRequest request = new MdSchemaMeasureGroupDimensionsRequestR(propertiesR, restrictionsR); List rows = xmlaService.discover() - .mdSchemaMeasureGroupDimensions(request, metaData, userPrincipal); + .mdSchemaMeasureGroupDimensions(request, metaData); SoapUtil.toMdSchemaMeasureGroupDimensions(rows, body); } - private void handleMdSchemaLevels(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleMdSchemaLevels(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaLevelsRestrictionsR restrictionsR = Convert.discoverMdSchemaLevelsRestrictions(restrictionElement); MdSchemaLevelsRequest request = new MdSchemaLevelsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaLevels(request, metaData, userPrincipal); + List rows = xmlaService.discover().mdSchemaLevels(request, metaData); SoapUtil.toMdSchemaLevels(rows, body); } - private void handleMdSchemaHierarchies(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleMdSchemaHierarchies(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaHierarchiesRestrictionsR restrictionsR = Convert .discoverMdSchemaHierarchiesRestrictions(restrictionElement); MdSchemaHierarchiesRequest request = new MdSchemaHierarchiesRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaHierarchies(request, metaData, - userPrincipal); + List rows = xmlaService.discover().mdSchemaHierarchies(request, metaData); SoapUtil.toMdSchemaHierarchies(rows, body); } - private void handleDbSchemaTablesInfo(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleDbSchemaTablesInfo(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DbSchemaTablesInfoRestrictionsR restrictionsR = Convert.discoverDbSchemaTablesInfo(restrictionElement); DbSchemaTablesInfoRequest request = new DbSchemaTablesInfoRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().dbSchemaTablesInfo(request, metaData, - userPrincipal); + List rows = xmlaService.discover().dbSchemaTablesInfo(request, metaData); SoapUtil.toDbSchemaTablesInfo(rows, body); } - private void handleDbSchemaSourceTables(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleDbSchemaSourceTables(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DbSchemaSourceTablesRestrictionsR restrictionsR = Convert .discoverDbSchemaSourceTablesRestrictions(restrictionElement); DbSchemaSourceTablesRequest request = new DbSchemaSourceTablesRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().dbSchemaSourceTables(request, metaData, - userPrincipal); + List rows = xmlaService.discover().dbSchemaSourceTables(request, metaData); SoapUtil.toDbSchemaSourceTables(rows, body); } - private void handleDbSchemaSchemata(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleDbSchemaSchemata(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DbSchemaSchemataRestrictionsR restrictionsR = Convert.discoverDbSchemaSchemataRestrictions(restrictionElement); DbSchemaSchemataRequest request = new DbSchemaSchemataRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().dbSchemaSchemata(request, metaData, - userPrincipal); + List rows = xmlaService.discover().dbSchemaSchemata(request, metaData); SoapUtil.toDbSchemaSchemata(rows, body); } - private void handleDbSchemaProviderTypes(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleDbSchemaProviderTypes(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DbSchemaProviderTypesRestrictionsR restrictionsR = Convert .discoverDbSchemaProviderTypesRestrictions(restrictionElement); DbSchemaProviderTypesRequest request = new DbSchemaProviderTypesRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().dbSchemaProviderTypes(request, metaData, - userPrincipal); + List rows = xmlaService.discover().dbSchemaProviderTypes(request, metaData); SoapUtil.toDbSchemaProviderTypes(rows, body); } - private void handleDbSchemaColumns(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleDbSchemaColumns(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DbSchemaColumnsRestrictionsR restrictionsR = Convert.discoverDbSchemaColumnsRestrictions(restrictionElement); DbSchemaColumnsRequest request = new DbSchemaColumnsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().dbSchemaColumns(request, metaData, - userPrincipal); + List rows = xmlaService.discover().dbSchemaColumns(request, metaData); SoapUtil.toDbSchemaColumns(rows, body); } - private void handleDiscoverXmlMetaData(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleDiscoverXmlMetaData(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DiscoverXmlMetaDataRestrictionsR restrictionsR = Convert .discoverDiscoverXmlMetaDataRestrictions(restrictionElement); DiscoverXmlMetaDataRequest request = new DiscoverXmlMetaDataRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().xmlMetaData(request, metaData, - userPrincipal); + List rows = xmlaService.discover().xmlMetaData(request, metaData); SoapUtil.toDiscoverXmlMetaData(rows, body); } - private void handleDiscoverDataSources(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleDiscoverDataSources(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DiscoverDataSourcesRestrictionsR restrictionsR = Convert .discoverDiscoverDataSourcesRestrictions(restrictionElement); DiscoverDataSourcesRequest request = new DiscoverDataSourcesRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().dataSources(request, metaData, - userPrincipal); + List rows = xmlaService.discover().dataSources(request, metaData); SoapUtil.toDiscoverDataSources(rows, body); } - private void handleDbSchemaCatalogs(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleDbSchemaCatalogs(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DbSchemaCatalogsRestrictionsR restrictionsR = Convert.discoverDbSchemaCatalogsRestrictions(restrictionElement); DbSchemaCatalogsRequest request = new DbSchemaCatalogsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().dbSchemaCatalogs(request, metaData, - userPrincipal); + List rows = xmlaService.discover().dbSchemaCatalogs(request, metaData); SoapUtil.toDbSchemaCatalogs(rows, body); } - private void handleDiscoverSchemaRowsets(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleDiscoverSchemaRowsets(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DiscoverSchemaRowsetsRestrictionsR restrictionsR = Convert .discoverSchemaRowsetsRestrictions(restrictionElement); DiscoverSchemaRowsetsRequest request = new DiscoverSchemaRowsetsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().discoverSchemaRowsets(request, metaData, - userPrincipal); + List rows = xmlaService.discover().discoverSchemaRowsets(request, metaData); SoapUtil.toDiscoverSchemaRowsets(rows, body); } - private void handleDiscoverEnumerators(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleDiscoverEnumerators(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DiscoverEnumeratorsRestrictionsR restrictionsR = Convert.discoverDiscoverEnumerators(restrictionElement); DiscoverEnumeratorsRequest request = new DiscoverEnumeratorsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().discoverEnumerators(request, metaData, - userPrincipal); + List rows = xmlaService.discover().discoverEnumerators(request, metaData); SoapUtil.toDiscoverEnumerators(rows, body); } - private void handleDiscoverKeywords(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleDiscoverKeywords(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DiscoverKeywordsRestrictionsR restrictionsR = Convert.discoverKeywordsRestrictions(restrictionElement); DiscoverKeywordsRequest request = new DiscoverKeywordsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().discoverKeywords(request, metaData, - userPrincipal); + List rows = xmlaService.discover().discoverKeywords(request, metaData); SoapUtil.toDiscoverKeywords(rows, body); } - private void handleDiscoverLiterals(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleDiscoverLiterals(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DiscoverLiteralsRestrictionsR restrictionsR = Convert.discoverLiteralsRestrictions(restrictionElement); DiscoverLiteralsRequest request = new DiscoverLiteralsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().discoverLiterals(request, metaData, - userPrincipal); + List rows = xmlaService.discover().discoverLiterals(request, metaData); SoapUtil.toDiscoverLiterals(rows, body); } - private void handleDbSchemaTables(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleDbSchemaTables(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DbSchemaTablesRestrictionsR restrictionsR = Convert.discoverDbSchemaTablesRestrictions(restrictionElement); DbSchemaTablesRequest request = new DbSchemaTablesRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().dbSchemaTables(request, metaData, userPrincipal); + List rows = xmlaService.discover().dbSchemaTables(request, metaData); SoapUtil.toDbSchemaTables(rows, body); } - private void handleMdSchemaActions(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleMdSchemaActions(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaActionsRestrictionsR restrictionsR = Convert.discoverMdSchemaActionsRestrictions(restrictionElement); MdSchemaActionsRequest request = new MdSchemaActionsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaActions(request, metaData, - userPrincipal); + List rows = xmlaService.discover().mdSchemaActions(request, metaData); SoapUtil.toMdSchemaActions(rows, body); } - private void handleMdSchemaCubes(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleMdSchemaCubes(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaCubesRestrictionsR restrictionsR = Convert.discoverMdSchemaCubesRestrictions(restrictionElement); MdSchemaCubesRequest request = new MdSchemaCubesRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaCubes(request, metaData, userPrincipal); + List rows = xmlaService.discover().mdSchemaCubes(request, metaData); SoapUtil.toMdSchemaCubes(rows, body); } - private void handleMdSchemaDimensions(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleMdSchemaDimensions(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaDimensionsRestrictionsR restrictionsR = Convert .discoverMdSchemaDimensionsRestrictions(restrictionElement); MdSchemaDimensionsRequest request = new MdSchemaDimensionsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaDimensions(request, metaData, - userPrincipal); + List rows = xmlaService.discover().mdSchemaDimensions(request, metaData); SoapUtil.toMdSchemaDimensions(rows, body); } - private void handleDiscoverProperties(RequestMetaData metaData, UserRolePrincipal userPrincipal, + private void handleDiscoverProperties(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { DiscoverPropertiesRestrictionsR restrictionsR = Convert.discoverPropertiesRestrictions(restrictionElement); DiscoverPropertiesRequest request = new DiscoverPropertiesRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().discoverProperties(request, metaData, - userPrincipal); + List rows = xmlaService.discover().discoverProperties(request, metaData); SoapUtil.toDiscoverProperties(rows, body); } - private void handleMdSchemaFunctions(RequestMetaData metaData, UserRolePrincipal userPrincipal, PropertiesR propertiesR, + private void handleMdSchemaFunctions(RequestMetaData metaData, PropertiesR propertiesR, SOAPElement restrictionElement, SOAPBody body) throws SOAPException { MdSchemaFunctionsRestrictionsR restrictionsR = Convert .discoverMdSchemaFunctionsRestrictions(restrictionElement); MdSchemaFunctionsRequest request = new MdSchemaFunctionsRequestR(propertiesR, restrictionsR); - List rows = xmlaService.discover().mdSchemaFunctions(request, metaData, - userPrincipal); + List rows = xmlaService.discover().mdSchemaFunctions(request, metaData); SoapUtil.toMdSchemaFunctions(rows, body); } diff --git a/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/ApiXmlaWsAdapter.java b/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/ApiXmlaWsAdapter.java index 61387e5..faa3de1 100644 --- a/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/ApiXmlaWsAdapter.java +++ b/server/jakarta.jws/src/main/java/org/eclipse/daanse/xmla/server/jakarta/jws/ApiXmlaWsAdapter.java @@ -227,126 +227,126 @@ public Optional sessionId() { }; DbSchemaCatalogsRequest requestApi = Convert.fromDiscoverDbSchemaCatalogs(requestWs); - List responseApi = xmlaService.discover().dbSchemaCatalogs(requestApi,metaData, null); + List responseApi = xmlaService.discover().dbSchemaCatalogs(requestApi,metaData); return Convert.toDiscoverDbSchemaCatalogs(responseApi); } private DiscoverResponse handleDiscoverProperties(Discover requestWs) throws JAXBException, IOException { DiscoverPropertiesRequest requestApi = Convert.fromDiscoverProperties(requestWs); - List responseApi = xmlaService.discover().discoverProperties(requestApi, null, null); + List responseApi = xmlaService.discover().discoverProperties(requestApi, null); return Convert.toDiscoverProperties(responseApi); } private DiscoverResponse handleDiscoverSchemaRowsets(Discover requestWs) throws JAXBException, IOException { DiscoverSchemaRowsetsRequest requestApi = Convert.fromDiscoverSchemaRowsets(requestWs); - List responseApi = xmlaService.discover().discoverSchemaRowsets(requestApi, null, null); + List responseApi = xmlaService.discover().discoverSchemaRowsets(requestApi, null); return Convert.toDiscoverSchemaRowsets(responseApi); } private DiscoverResponse handleDiscoverEnumerators(Discover requestWs) throws JAXBException, IOException { DiscoverEnumeratorsRequest requestApi = Convert.fromDiscoverEnumerators(requestWs); - List responseApi = xmlaService.discover().discoverEnumerators(requestApi, null, null); + List responseApi = xmlaService.discover().discoverEnumerators(requestApi, null); return Convert.toDiscoverEnumerators(responseApi); } private DiscoverResponse handleDiscoverKeywords(Discover requestWs) throws JAXBException, IOException { DiscoverKeywordsRequest requestApi = Convert.fromDiscoverKeywords(requestWs); - List responseApi = xmlaService.discover().discoverKeywords(requestApi, null, null); + List responseApi = xmlaService.discover().discoverKeywords(requestApi, null); return Convert.toDiscoverKeywords(responseApi); } private DiscoverResponse handleDiscoverLiterals(Discover requestWs) throws JAXBException, IOException { DiscoverLiteralsRequest requestApi = Convert.fromDiscoverLiterals(requestWs); - List responseApi = xmlaService.discover().discoverLiterals(requestApi, null, null); + List responseApi = xmlaService.discover().discoverLiterals(requestApi, null); return Convert.toDiscoverLiterals(responseApi); } private DiscoverResponse handleDiscoverDbSchemaTables(Discover requestWs) throws JAXBException, IOException { DbSchemaTablesRequest requestApi = Convert.fromDiscoverDbSchemaTables(requestWs); - List responseApi = xmlaService.discover().dbSchemaTables(requestApi, null, null); + List responseApi = xmlaService.discover().dbSchemaTables(requestApi, null); return Convert.toDiscoverDbSchemaTables(responseApi); } private DiscoverResponse handleDiscoverMdSchemaActions(Discover requestWs) throws JAXBException, IOException { MdSchemaActionsRequest requestApi = Convert.fromDiscoverMdSchemaActions(requestWs); - List responseApi = xmlaService.discover().mdSchemaActions(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaActions(requestApi, null); return Convert.toDiscoverMdSchemaActions(responseApi); } private DiscoverResponse handleDiscoverMdSchemaCubes(Discover requestWs) throws JAXBException, IOException { MdSchemaCubesRequest requestApi = Convert.fromDiscoverMdSchemaCubes(requestWs); - List responseApi = xmlaService.discover().mdSchemaCubes(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaCubes(requestApi, null); return Convert.toDiscoverMdSchemaCubes(responseApi); } private DiscoverResponse handleDiscoverMdSchemaDimensions(Discover requestWs) throws JAXBException, IOException { MdSchemaDimensionsRequest requestApi = Convert.fromDiscoverMdSchemaDimensions(requestWs); - List responseApi = xmlaService.discover().mdSchemaDimensions(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaDimensions(requestApi, null); return Convert.toDiscoverMdSchemaDimensions(responseApi); } private DiscoverResponse handleDiscoverMdSchemaFunctions(Discover requestWs) throws JAXBException, IOException { MdSchemaFunctionsRequest requestApi = Convert.fromDiscoverMdSchemaFunctions(requestWs); - List responseApi = xmlaService.discover().mdSchemaFunctions(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaFunctions(requestApi, null); return Convert.toDiscoverMdSchemaFunctions(responseApi); } private DiscoverResponse handleDiscoverMdSchemaHierarchies(Discover requestWs) throws JAXBException, IOException { MdSchemaHierarchiesRequest requestApi = Convert.fromDiscoverMdSchemaHierarchies(requestWs); - List responseApi = xmlaService.discover().mdSchemaHierarchies(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaHierarchies(requestApi, null); return Convert.toDiscoverMdSchemaHierarchies(responseApi); } private DiscoverResponse handleDiscoverDataSources(Discover requestWs) throws JAXBException, IOException { DiscoverDataSourcesRequest requestApi = Convert.fromDiscoverDataSources(requestWs); - List responseApi = xmlaService.discover().dataSources(requestApi, null, null); + List responseApi = xmlaService.discover().dataSources(requestApi, null); return Convert.toDiscoverDataSources(responseApi); } private DiscoverResponse handleDiscoverXmlMetaData(Discover requestWs) throws JAXBException, IOException { DiscoverXmlMetaDataRequest requestApi = Convert.fromDiscoverXmlMetaData(requestWs); - List responseApi = xmlaService.discover().xmlMetaData(requestApi, null, null); + List responseApi = xmlaService.discover().xmlMetaData(requestApi, null); return Convert.toDiscoverXmlMetaData(responseApi); } private DiscoverResponse handleDiscoverDbSchemaColumns(Discover requestWs) throws JAXBException, IOException { DbSchemaColumnsRequest requestApi = Convert.fromDiscoverDbSchemaColumns(requestWs); - List responseApi = xmlaService.discover().dbSchemaColumns(requestApi, null, null); + List responseApi = xmlaService.discover().dbSchemaColumns(requestApi, null); return Convert.toDiscoverDbSchemaColumns(responseApi); } private DiscoverResponse handleDiscoverDbSchemaProviderTypes(Discover requestWs) throws JAXBException, IOException { DbSchemaProviderTypesRequest requestApi = Convert.fromDiscoverDbSchemaProviderTypes(requestWs); - List responseApi = xmlaService.discover().dbSchemaProviderTypes(requestApi, null, null); + List responseApi = xmlaService.discover().dbSchemaProviderTypes(requestApi, null); return Convert.toDiscoverDbSchemaProviderTypes(responseApi); } private DiscoverResponse handleDiscoverDbSchemaSchemata(Discover requestWs) throws JAXBException, IOException { DbSchemaSchemataRequest requestApi = Convert.fromDiscoverDbSchemaSchemata(requestWs); - List responseApi = xmlaService.discover().dbSchemaSchemata(requestApi, null, null); + List responseApi = xmlaService.discover().dbSchemaSchemata(requestApi, null); return Convert.toDiscoverDbSchemaSchemata(responseApi); } private DiscoverResponse handleDiscoverMdSchemaLevels(Discover requestWs) throws JAXBException, IOException { MdSchemaLevelsRequest requestApi = Convert.fromDiscoverMdSchemaLevels(requestWs); - List responseApi = xmlaService.discover().mdSchemaLevels(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaLevels(requestApi, null); return Convert.toDiscoverMdSchemaLevels(responseApi); } @@ -356,63 +356,63 @@ private DiscoverResponse handleDiscoverMdSchemaMeasureGroupDimensions(Discover r MdSchemaMeasureGroupDimensionsRequest requestApi = Convert .fromDiscoverMdSchemaMeasureGroupDimensions(requestWs); List responseApi = xmlaService.discover() - .mdSchemaMeasureGroupDimensions(requestApi, null, null); + .mdSchemaMeasureGroupDimensions(requestApi, null); return Convert.toDiscoverMdSchemaMeasureGroupDimensions(responseApi); } private DiscoverResponse handleDiscoverMdSchemaMeasures(Discover requestWs) throws JAXBException, IOException { MdSchemaMeasuresRequest requestApi = Convert.fromDiscoverMdSchemaMeasures(requestWs); - List responseApi = xmlaService.discover().mdSchemaMeasures(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaMeasures(requestApi, null); return Convert.toDiscoverMdSchemaMeasures(responseApi); } private DiscoverResponse handleDiscoverMdSchemaMembers(Discover requestWs) throws JAXBException, IOException { MdSchemaMembersRequest requestApi = Convert.fromDiscoverMdSchemaMembers(requestWs); - List responseApi = xmlaService.discover().mdSchemaMembers(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaMembers(requestApi, null); return Convert.toDiscoverMdSchemaMembers(responseApi); } private DiscoverResponse handleDiscoverMdSchemaProperties(Discover requestWs) throws JAXBException, IOException { MdSchemaPropertiesRequest requestApi = Convert.fromDiscoverMdSchemaProperties(requestWs); - List responseApi = xmlaService.discover().mdSchemaProperties(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaProperties(requestApi, null); return Convert.toDiscoverMdSchemaProperties(responseApi); } private DiscoverResponse handleDiscoverMdSchemaSets(Discover requestWs) throws JAXBException, IOException { MdSchemaSetsRequest requestApi = Convert.fromDiscoverMdSchemaSets(requestWs); - List responseApi = xmlaService.discover().mdSchemaSets(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaSets(requestApi, null); return Convert.toDiscoverMdSchemaSets(responseApi); } private DiscoverResponse handleDiscoverMdSchemaKpis(Discover requestWs) throws JAXBException, IOException { MdSchemaKpisRequest requestApi = Convert.fromDiscoverMdSchemaKpis(requestWs); - List responseApi = xmlaService.discover().mdSchemaKpis(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaKpis(requestApi, null); return Convert.toDiscoverMdSchemaKpis(responseApi); } private DiscoverResponse handleDiscoverMdSchemaMeasureGroups(Discover requestWs) throws JAXBException, IOException { MdSchemaMeasureGroupsRequest requestApi = Convert.fromDiscoverMdSchemaMeasureGroups(requestWs); - List responseApi = xmlaService.discover().mdSchemaMeasureGroups(requestApi, null, null); + List responseApi = xmlaService.discover().mdSchemaMeasureGroups(requestApi, null); return Convert.toDiscoverMdSchemaMeasureGroups(responseApi); } private DiscoverResponse handleDiscoverDbSchemaSourceTables(Discover requestWs) throws JAXBException, IOException { DbSchemaSourceTablesRequest requestApi = Convert.fromDiscoverDbSchemaSourceTables(requestWs); - List responseApi = xmlaService.discover().dbSchemaSourceTables(requestApi, null, null); + List responseApi = xmlaService.discover().dbSchemaSourceTables(requestApi, null); return Convert.toDiscoverDbSchemaSourceTables(responseApi); } private DiscoverResponse handleDiscoverDbSchemaTablesInfo(Discover requestWs) throws JAXBException, IOException { DbSchemaTablesInfoRequest requestApi = Convert.fromDiscoverDbSchemaTablesInfo(requestWs); - List responseApi = xmlaService.discover().dbSchemaTablesInfo(requestApi, null, null); + List responseApi = xmlaService.discover().dbSchemaTablesInfo(requestApi, null); return Convert.toDiscoverDbSchemaTablesInfo(responseApi); } diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java index 7e117c4..f0e700e 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverRequestTest.java @@ -14,7 +14,6 @@ package org.eclipse.daanse.xmla.server.tck; import org.eclipse.daanse.xmla.api.RequestMetaData; -import org.eclipse.daanse.xmla.api.UserRolePrincipal; import org.eclipse.daanse.xmla.api.XmlaService; import org.eclipse.daanse.xmla.api.common.enums.AuthenticationModeEnum; import org.eclipse.daanse.xmla.api.common.enums.ColumnOlapTypeEnum; @@ -128,7 +127,7 @@ void beforaEach() { void testDiscoverPropertiesLocaleIdentifier(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverPropertiesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ @@ -149,7 +148,7 @@ void testDiscoverPropertiesLocaleIdentifier(@InjectService XmlaService xmlaServi SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).discoverProperties(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).discoverProperties(captor.capture(), rm.capture()); DiscoverPropertiesRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -168,7 +167,7 @@ void testDiscoverPropertiesLocaleIdentifier(@InjectService XmlaService xmlaServi void testDiscoverPropertiesRestricted(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverPropertiesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ @@ -193,7 +192,7 @@ void testDiscoverPropertiesRestricted(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).discoverProperties(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).discoverProperties(captor.capture(), rm.capture()); DiscoverPropertiesRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -213,7 +212,7 @@ void testDiscoverSchemaRowSets(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor .forClass(DiscoverSchemaRowsetsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DISCOVER_SCHEMA_ROWSETS @@ -236,7 +235,7 @@ void testDiscoverSchemaRowSets(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).discoverSchemaRowsets(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).discoverSchemaRowsets(captor.capture(), rm.capture()); DiscoverSchemaRowsetsRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -258,7 +257,7 @@ void testDiscoverSchemaRowSets(@InjectService XmlaService xmlaService) { void testDiscoverEnumerators(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverEnumeratorsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ @@ -281,7 +280,7 @@ void testDiscoverEnumerators(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).discoverEnumerators(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).discoverEnumerators(captor.capture(), rm.capture()); DiscoverEnumeratorsRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -302,7 +301,7 @@ void testDiscoverEnumerators(@InjectService XmlaService xmlaService) { void testDiscoverKeywords(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverKeywordsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DISCOVER_KEYWORDS @@ -324,7 +323,7 @@ void testDiscoverKeywords(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).discoverKeywords(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).discoverKeywords(captor.capture(), rm.capture()); DiscoverKeywordsRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -345,7 +344,7 @@ void testDiscoverKeywords(@InjectService XmlaService xmlaService) { void testDiscoverLiterals(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverLiteralsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DISCOVER_LITERALS @@ -367,7 +366,7 @@ void testDiscoverLiterals(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).discoverLiterals(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).discoverLiterals(captor.capture(), rm.capture()); DiscoverLiteralsRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -388,7 +387,7 @@ void testDiscoverLiterals(@InjectService XmlaService xmlaService) { void testDbSchemaTables(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaTablesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DBSCHEMA_TABLES @@ -412,7 +411,7 @@ void testDbSchemaTables(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).dbSchemaTables(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).dbSchemaTables(captor.capture(), rm.capture()); DbSchemaTablesRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -438,7 +437,7 @@ void testMdSchemaActions(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaActionsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_ACTIONS @@ -469,7 +468,7 @@ void testMdSchemaActions(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaActions(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaActions(captor.capture(), rm.capture()); MdSchemaActionsRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -503,7 +502,7 @@ void testMdSchemaCubes(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaCubesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_CUBES @@ -530,7 +529,7 @@ void testMdSchemaCubes(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaCubes(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaCubes(captor.capture(), rm.capture()); MdSchemaCubesRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -557,7 +556,7 @@ void testMdSchemaDimensions(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaDimensionsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_DIMENSIONS @@ -587,7 +586,7 @@ void testMdSchemaDimensions(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaDimensions(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaDimensions(captor.capture(), rm.capture()); MdSchemaDimensionsRequest request = captor.getValue(); assertThat(request).isNotNull().satisfies(d -> { @@ -617,7 +616,7 @@ void testMdSchemaFunctions(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaFunctionsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_FUNCTIONS @@ -639,7 +638,7 @@ void testMdSchemaFunctions(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaFunctions(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaFunctions(captor.capture(), rm.capture()); MdSchemaFunctionsRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -664,7 +663,7 @@ void testMdSchemaHierarchies(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaHierarchiesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_HIERARCHIES @@ -694,7 +693,7 @@ void testMdSchemaHierarchies(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaHierarchies(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaHierarchies(captor.capture(), rm.capture()); MdSchemaHierarchiesRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -728,7 +727,7 @@ void testDiscoverDataSources(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverDataSourcesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DISCOVER_DATASOURCES @@ -756,7 +755,7 @@ void testDiscoverDataSources(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).dataSources(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).dataSources(captor.capture(), rm.capture()); DiscoverDataSourcesRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -790,7 +789,7 @@ void testDiscoverXmlMetadata(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DiscoverXmlMetaDataRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DISCOVER_XML_METADATA @@ -833,7 +832,7 @@ void testDiscoverXmlMetadata(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).xmlMetaData(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).xmlMetaData(captor.capture(), rm.capture()); DiscoverXmlMetaDataRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -885,7 +884,7 @@ void testDbSchemaColumns(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaColumnsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DBSCHEMA_COLUMNS @@ -911,7 +910,7 @@ void testDbSchemaColumns(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).dbSchemaColumns(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).dbSchemaColumns(captor.capture(), rm.capture()); DbSchemaColumnsRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -942,7 +941,7 @@ void testDbSchemaProviderTypes(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor .forClass(DbSchemaProviderTypesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DBSCHEMA_PROVIDER_TYPES @@ -965,7 +964,7 @@ void testDbSchemaProviderTypes(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).dbSchemaProviderTypes(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).dbSchemaProviderTypes(captor.capture(), rm.capture()); DbSchemaProviderTypesRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -992,7 +991,7 @@ void testMdSchemaLevels(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaLevelsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_LEVELS @@ -1024,7 +1023,7 @@ void testMdSchemaLevels(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaLevels(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaLevels(captor.capture(), rm.capture()); MdSchemaLevelsRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1061,7 +1060,7 @@ void testMdSchemaMeasureGroupDimensions(@InjectService XmlaService xmlaService) ArgumentCaptor captor = ArgumentCaptor .forClass(MdSchemaMeasureGroupDimensionsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_MEASUREGROUP_DIMENSIONS @@ -1090,8 +1089,7 @@ void testMdSchemaMeasureGroupDimensions(@InjectService XmlaService xmlaService) SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaMeasureGroupDimensions(captor.capture(), rm.capture(), - up.capture()); + verify(discoverService, (times(1))).mdSchemaMeasureGroupDimensions(captor.capture(), rm.capture()); MdSchemaMeasureGroupDimensionsRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1122,7 +1120,7 @@ void testMdSchemaMeasures(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaMeasuresRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_MEASURES @@ -1153,7 +1151,7 @@ void testMdSchemaMeasures(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaMeasures(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaMeasures(captor.capture(), rm.capture()); MdSchemaMeasuresRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1186,7 +1184,7 @@ void testMdSchemaMembers(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaMembersRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ @@ -1223,7 +1221,7 @@ void testMdSchemaMembers(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaMembers(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaMembers(captor.capture(), rm.capture()); MdSchemaMembersRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1261,7 +1259,7 @@ void testMdSchemaProperties(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaPropertiesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_PROPERTIES @@ -1296,7 +1294,7 @@ void testMdSchemaProperties(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaProperties(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaProperties(captor.capture(), rm.capture()); MdSchemaPropertiesRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1334,7 +1332,7 @@ void testMdSchemaSets(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaSetsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_SETS @@ -1364,7 +1362,7 @@ void testMdSchemaSets(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaSets(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaSets(captor.capture(), rm.capture()); MdSchemaSetsRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1396,7 +1394,7 @@ void testMdSchemaKpis(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(MdSchemaKpisRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_KPIS @@ -1424,7 +1422,7 @@ void testMdSchemaKpis(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaKpis(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaKpis(captor.capture(), rm.capture()); MdSchemaKpisRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1455,7 +1453,7 @@ void testMdSchemaMeasureGroups(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor .forClass(MdSchemaMeasureGroupsRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ MDSCHEMA_MEASUREGROUPS @@ -1482,7 +1480,7 @@ void testMdSchemaMeasureGroups(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).mdSchemaMeasureGroups(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).mdSchemaMeasureGroups(captor.capture(), rm.capture()); MdSchemaMeasureGroupsRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1511,7 +1509,7 @@ void testDbSchemaTablesInfo(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaTablesInfoRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DBSCHEMA_TABLES_INFO @@ -1538,7 +1536,7 @@ void testDbSchemaTablesInfo(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).dbSchemaTablesInfo(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).dbSchemaTablesInfo(captor.capture(), rm.capture()); DbSchemaTablesInfoRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1567,7 +1565,7 @@ void testDbschemaSourceTables(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaSourceTablesRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DBSCHEMA_SOURCE_TABLES @@ -1594,7 +1592,7 @@ void testDbschemaSourceTables(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).dbSchemaSourceTables(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).dbSchemaSourceTables(captor.capture(), rm.capture()); DbSchemaSourceTablesRequest request = captor.getValue(); assertThat(request).isNotNull() @@ -1623,7 +1621,7 @@ void testDbschemaSchemata(@InjectService XmlaService xmlaService) { ArgumentCaptor captor = ArgumentCaptor.forClass(DbSchemaSchemataRequest.class); ArgumentCaptor rm = ArgumentCaptor.forClass(RequestMetaData.class); - ArgumentCaptor up = ArgumentCaptor.forClass(UserRolePrincipal.class); + final String sRequest = """ DBSCHEMA_SCHEMATA @@ -1649,7 +1647,7 @@ void testDbschemaSchemata(@InjectService XmlaService xmlaService) { SOAPUtil.envelop(sRequest)); DiscoverService discoverService = xmlaService.discover(); - verify(discoverService, (times(1))).dbSchemaSchemata(captor.capture(), rm.capture(), up.capture()); + verify(discoverService, (times(1))).dbSchemaSchemata(captor.capture(), rm.capture()); DbSchemaSchemataRequest request = captor.getValue(); assertThat(request).isNotNull() diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverResponseTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverResponseTest.java index 5296dec..9ab24bd 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverResponseTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/DiscoverResponseTest.java @@ -255,7 +255,7 @@ void testDiscoverDataSources(@InjectService XmlaService xmlaService) throws SOAP Optional.of(MDP), Optional.of(UNAUTHENTICATED)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.dataSources(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.dataSources(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -287,7 +287,7 @@ void testDiscoverEnumerators(@InjectService XmlaService xmlaService) throws SOAP Optional.of("elementDescription"), Optional.of("elementValue")); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.discoverEnumerators(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.discoverEnumerators(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -317,7 +317,7 @@ void testDiscoverKeywords(@InjectService XmlaService xmlaService) throws SOAPExc DiscoverKeywordsResponseRowR row = new DiscoverKeywordsResponseRowR("keyword"); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.discoverKeywords(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.discoverKeywords(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "DISCOVER_KEYWORDS"))); @@ -342,7 +342,7 @@ void testDiscoverLiterals(@InjectService XmlaService xmlaService) throws SOAPExc 10, LiteralNameEnumValueEnum.DBLITERAL_BINARY_LITERAL); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.discoverLiterals(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.discoverLiterals(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "DISCOVER_LITERALS"))); @@ -372,7 +372,7 @@ void testDiscoverProperties(@InjectService XmlaService xmlaService) throws SOAPE AccessEnum.READ_WRITE, Optional.of(false), Optional.of("1")); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.discoverProperties(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.discoverProperties(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "DISCOVER_PROPERTIES" @@ -417,7 +417,7 @@ void testDiscoverSchemaRowSets(@InjectService XmlaService xmlaService) throws SO , Optional.of(DESCRIPTION_LOW), Optional.of(10l)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.discoverSchemaRowsets(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.discoverSchemaRowsets(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -440,7 +440,7 @@ void testDiscoverXmlMetadata(@InjectService XmlaService xmlaService) throws SOAP DiscoverXmlMetaDataResponseRowR row = new DiscoverXmlMetaDataResponseRowR(""); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.xmlMetaData(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.xmlMetaData(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -472,7 +472,7 @@ void testDbschemaCatalogs(@InjectService XmlaService xmlaService) throws SOAPExc Optional.of(ClientCacheRefreshPolicyEnum.REFRESH_NEWER_DATA)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.dbSchemaCatalogs(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.dbSchemaCatalogs(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "DBSCHEMA_CATALOGS"))); @@ -536,7 +536,7 @@ void testDbschemaColumns(@InjectService XmlaService xmlaService) throws SOAPExce ); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.dbSchemaColumns(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.dbSchemaColumns(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "DBSCHEMA_COLUMNS"))); @@ -610,7 +610,7 @@ void testDbschemaProviderTypes(@InjectService XmlaService xmlaService) throws SO Optional.of(false)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.dbSchemaProviderTypes(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.dbSchemaProviderTypes(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -658,7 +658,7 @@ void testDbschemaSchemata(@InjectService XmlaService xmlaService) throws SOAPExc "schemaOwner"); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.dbSchemaSchemata(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.dbSchemaSchemata(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "DBSCHEMA_SCHEMATA"))); @@ -687,7 +687,7 @@ void testDbschemaSourceTables(@InjectService XmlaService xmlaService) throws SOA TableTypeEnum.ALIAS); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.dbSchemaSourceTables(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.dbSchemaSourceTables(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -723,7 +723,7 @@ void testDbSchemaTables(@InjectService XmlaService xmlaService) throws SOAPExcep Optional.of(LocalDateTime.of(2023, 2, 16, 10, 10))); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.dbSchemaTables(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.dbSchemaTables(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "DBSCHEMA_TABLES"))); @@ -768,7 +768,7 @@ void testDbSchemaTablesInfo(@InjectService XmlaService xmlaService) throws SOAPE Optional.of(8)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.dbSchemaTablesInfo(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.dbSchemaTablesInfo(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -817,7 +817,7 @@ void testMdSchemaActions(@InjectService XmlaService xmlaService) throws SOAPExce Optional.of(InvocationEnum.NORMAL_OPERATION)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaActions(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaActions(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "MDSCHEMA_ACTIONS"))); @@ -872,7 +872,7 @@ void testMdSchemaCubes(@InjectService XmlaService xmlaService) throws SOAPExcept Optional.of(PreferredQueryPatternsEnum.CROSS_JOIN)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaCubes(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaCubes(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "MDSCHEMA_CUBES"))); @@ -935,7 +935,7 @@ void testMdSchemaDimensions(@InjectService XmlaService xmlaService) throws SOAPE Optional.of(true)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaDimensions(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaDimensions(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, "MDSCHEMA_DIMENSIONS" @@ -998,7 +998,7 @@ void testMdSchemaFunctions(@InjectService XmlaService xmlaService) throws SOAPEx Optional.of(DirectQueryPushableEnum.MEASURE)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaFunctions(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaFunctions(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1067,7 +1067,7 @@ void testMdSchemaHierarchies(@InjectService XmlaService xmlaService) throws SOAP Optional.of(StructureTypeEnum.NATURAL)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaHierarchies(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaHierarchies(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1141,7 +1141,7 @@ void testMdSchemaKpis(@InjectService XmlaService xmlaService) throws SOAPExcepti Optional.of(ScopeEnum.GLOBAL)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaKpis(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaKpis(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1209,7 +1209,7 @@ void testMdSchemaLevels(@InjectService XmlaService xmlaService) throws SOAPExcep Optional.of(LevelOriginEnum.USER_DEFINED)); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaLevels(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaLevels(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1277,7 +1277,7 @@ void testMdSchemaMeasuregroupDimensions(@InjectService XmlaService xmlaService) Optional.of("dimensionGranularity")); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaMeasureGroupDimensions(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaMeasureGroupDimensions(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1320,7 +1320,7 @@ void testMdSchemaMeasuregroups(@InjectService XmlaService xmlaService) throws SO ); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaMeasureGroups(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaMeasureGroups(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1375,7 +1375,7 @@ void testMdSchemaMeasures(@InjectService XmlaService xmlaService) throws SOAPExc ); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaMeasures(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaMeasures(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1444,7 +1444,7 @@ void testMdSchemaMembers(@InjectService XmlaService xmlaService) throws SOAPExce ); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaMembers(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaMembers(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1517,7 +1517,7 @@ void testMdSchemaProperties(@InjectService XmlaService xmlaService) throws SOAPE ); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaProperties(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaProperties(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, @@ -1579,7 +1579,7 @@ void testMdSchemaSets(@InjectService XmlaService xmlaService) throws SOAPExcepti ); DiscoverService discoverService = xmlaService.discover(); - when(discoverService.mdSchemaSets(any(), any(), any())).thenReturn(List.of(row)); + when(discoverService.mdSchemaSets(any(), any())).thenReturn(List.of(row)); SOAPMessage response = SOAPUtil.callSoapWebService(Constants.SOAP_ENDPOINT_URL, Optional.of(Constants.SOAP_ACTION_DISCOVER), SOAPUtil.envelop(String.format(REQUEST, diff --git a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/MsClientTest.java b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/MsClientTest.java index 306d22b..ae05ff6 100644 --- a/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/MsClientTest.java +++ b/server/tck/src/main/java/org/eclipse/daanse/xmla/server/tck/MsClientTest.java @@ -94,7 +94,7 @@ void testRequest1(@InjectService XmlaService xmlaService) throws IOException, In DiscoverService discoverService = xmlaService.discover(); - when(discoverService.discoverProperties(any(), any(), any())).thenReturn(result); + when(discoverService.discoverProperties(any(), any())).thenReturn(result); // call test