Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.eclipse.daanse.xmla.api;

import java.util.EnumSet;
import java.util.Enumeration;
import java.util.Set;

/**
Expand Down Expand Up @@ -197,13 +196,13 @@ public enum PropertyDefinition {
"DBMSVersion");

final RowsetDefinitionType type;
final Set<? extends Enum> enumSet;
final Set<? extends Enum<?>> enumSet;
final XmlaConstants.Access access;
final XmlaConstants.Method usage;
final String value;
final String description;

PropertyDefinition(RowsetDefinitionType type, Set<? extends Enum> enumSet, XmlaConstants.Access access,
PropertyDefinition(RowsetDefinitionType type, Set<? extends Enum<?>> enumSet, XmlaConstants.Access access,
String value, XmlaConstants.Method usage, String description) {
// Line endings must be UNIX style (LF) not Windows style (LF+CR).
// Thus the client will receive the same XML, regardless
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*
* @author <a>Richard M. Emberson</a>
*/
@SuppressWarnings("serial")
public class XmlaException extends RuntimeException {

public static String formatFaultCode(XmlaException xex) {
Expand Down
16 changes: 1 addition & 15 deletions api/src/main/java/org/eclipse/daanse/xmla/api/XmlaUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import static org.eclipse.daanse.xmla.api.XmlaConstants.CLIENT_FAULT_FC;
import static org.eclipse.daanse.xmla.api.XmlaConstants.USM_DOM_PARSE_CODE;
import static org.eclipse.daanse.xmla.api.XmlaConstants.USM_DOM_PARSE_FAULT_FS;

import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -231,21 +232,6 @@ public static String normalizeNumericString(String numericStr) {
return numericStr;
}


private static <T> String toString(List<T> list) {
StringBuilder buf = new StringBuilder();
int k = -1;
for (T t : list) {
if (++k > 0) {
buf.append(", ");
}
buf.append(t);
}
return buf.toString();
}



/**
* Result of a metadata query.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
*/
package org.eclipse.daanse.xmla.api.common.enums;

import org.eclipse.daanse.xmla.api.annotation.Enumerator;

import java.util.stream.Stream;

import org.eclipse.daanse.xmla.api.annotation.Enumerator;

@Enumerator(name = "Access")
public enum AccessEnum {
READ("Read"), WRITE("Write"), READ_WRITE("ReadWrite");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
*/
package org.eclipse.daanse.xmla.api.common.enums;

import org.eclipse.daanse.xmla.api.annotation.Enumerator;

import java.util.stream.Stream;

import org.eclipse.daanse.xmla.api.annotation.Enumerator;

@Enumerator(name = "AuthenticationMode")
public enum AuthenticationModeEnum {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
*/
package org.eclipse.daanse.xmla.api.common.enums;

import org.eclipse.daanse.xmla.api.annotation.Enumerator;

import java.util.stream.Stream;

import org.eclipse.daanse.xmla.api.annotation.Enumerator;

@Enumerator(name = "ProviderType")
public enum ProviderTypeEnum {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
*/
package org.eclipse.daanse.xmla.api.common.enums;

import org.eclipse.daanse.xmla.api.annotation.Enumerator;

import java.util.stream.Stream;

import org.eclipse.daanse.xmla.api.annotation.Enumerator;

/**
* Applies only to a single member:
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ public enum PropertyListElementDefinition {
LOCALE_IDENTIFIER("LocaleIdentifier", Type.UNSIGNED_INTEGER, null, Access.READ_WRITE, null, true, true);

final Type type;
final Set<? extends Enum> enumSet;
final Set<? extends Enum<?>> enumSet;
final Access access;
final boolean discover;
final boolean execute;
final String value;
final String nameValue;

PropertyListElementDefinition(String nameValue, Type type, Set<? extends Enum> enumSet, Access access, String value,
PropertyListElementDefinition(String nameValue, Type type, Set<? extends Enum<?>> enumSet, Access access, String value,
boolean discover, boolean execute) {

assert (enumSet != null) == type.isEnum();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.catalogs;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_CATALOGS;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_CATALOGS;

@Operation(name = DBSCHEMA_CATALOGS, guid = "C8B52211-5CF3-11CE-ADE5-00AA0044773D")
public interface DbSchemaCatalogsRequest {
Properties properties();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.catalogs;

import org.eclipse.daanse.xmla.api.annotation.Restriction;
import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

import java.util.Optional;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;
import org.eclipse.daanse.xmla.api.annotation.Restriction;

public interface DbSchemaCatalogsRestrictions {
String RESTRICTIONS_CATALOG_NAME = "CATALOG_NAME";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.columns;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_COLUMNS;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_COLUMNS;

@Operation(name = DBSCHEMA_COLUMNS, guid = "C8B52214-5CF3-11CE-ADE5-00AA0044773D")
public interface DbSchemaColumnsRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.providertypes;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_PROVIDER_TYPES;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_PROVIDER_TYPES;

@Operation(name = DBSCHEMA_PROVIDER_TYPES, guid = "C8B5222C-5CF3-11CE-ADE5-00AA0044773D")
public interface DbSchemaProviderTypesRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.schemata;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_SCHEMATA;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_SCHEMATA;

@Operation(name = DBSCHEMA_SCHEMATA, guid = "c8b52225-5cf3-11ce-ade5-00aa0044773d")
public interface DbSchemaSchemataRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.schemata;

import org.eclipse.daanse.xmla.api.annotation.Restriction;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

import org.eclipse.daanse.xmla.api.annotation.Restriction;

public interface DbSchemaSchemataRestrictions {

String RESTRICTIONS_CATALOG_NAME = "CATALOG_NAME";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.sourcetables;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_SOURCE_TABLES;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_SOURCE_TABLES;

@Operation(name = DBSCHEMA_SOURCE_TABLES, guid = "8c3f5858-2742-4976-9d65-eb4d493c693e")
public interface DbSchemaSourceTablesRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.sourcetables;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

import java.util.Optional;

import org.eclipse.daanse.xmla.api.annotation.Restriction;
import org.eclipse.daanse.xmla.api.common.enums.TableTypeEnum;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

public interface DbSchemaSourceTablesRestrictions {

String RESTRICTIONS_TABLE_CATALOG = "TABLE_CATALOG";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.tables;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_TABLES;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_TABLES;

@Operation(name = DBSCHEMA_TABLES, guid = "C8B52229-5CF3-11CE-ADE5-00AA0044773D")
public interface DbSchemaTablesRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.tables;

import org.eclipse.daanse.xmla.api.annotation.Restriction;
import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

import java.util.Optional;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;
import org.eclipse.daanse.xmla.api.annotation.Restriction;

public interface DbSchemaTablesRestrictions {
String RESTRICTIONS_TABLE_CATALOG = "TABLE_CATALOG";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.tablesinfo;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_TABLES_INFO;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DBSCHEMA_TABLES_INFO;

@Operation(name = DBSCHEMA_TABLES_INFO, guid = "c8b522e0-5cf3-11ce-ade5-00aa0044773d")
public interface DbSchemaTablesInfoRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
*/
package org.eclipse.daanse.xmla.api.discover.dbschema.tablesinfo;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

import java.util.Optional;

import org.eclipse.daanse.xmla.api.annotation.Restriction;
import org.eclipse.daanse.xmla.api.common.enums.TableTypeEnum;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

public interface DbSchemaTablesInfoRestrictions {

String RESTRICTIONS_TABLE_CATALOG = "TABLE_CATALOG";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.discover.csdlmetadata;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DISCOVER_CSDL_METADATA;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DISCOVER_CSDL_METADATA;

@Operation(name = DISCOVER_CSDL_METADATA, guid = "87B86062-21C3-460F-B4F8-5BE98394F13B")
public interface DiscoverCsdlMetaDataRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.discover.datasources;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DISCOVER_DATASOURCES;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DISCOVER_DATASOURCES;

@Operation(name = DISCOVER_DATASOURCES, guid = "06C03D41-F66D-49F3-B1B8-987F7AF4CF18")
public interface DiscoverDataSourcesRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
*/
package org.eclipse.daanse.xmla.api.discover.discover.datasources;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

import java.util.Optional;

import org.eclipse.daanse.xmla.api.annotation.Restriction;
import org.eclipse.daanse.xmla.api.common.enums.AuthenticationModeEnum;
import org.eclipse.daanse.xmla.api.common.enums.ProviderTypeEnum;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

public interface DiscoverDataSourcesRestrictions {
String RESTRICTIONS_DATA_SOURCE_NAME = "DataSourceName";
String RESTRICTIONS_DATA_SOURCE_DESCRIPTION = "DataSourceDescription";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.discover.enumerators;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DISCOVER_ENUMERATORS;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DISCOVER_ENUMERATORS;

@Operation(name = DISCOVER_ENUMERATORS, guid = "55A9E78B-ACCB-45B4-95A6-94C5065617A7")
public interface DiscoverEnumeratorsRequest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.discover.enumerators;

import org.eclipse.daanse.xmla.api.annotation.Restriction;
import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;

import java.util.Optional;

import static org.eclipse.daanse.xmla.api.common.properties.XsdType.XSD_STRING;
import org.eclipse.daanse.xmla.api.annotation.Restriction;

public interface DiscoverEnumeratorsRestrictions {
String RESTRICTIONS_ENUM_NAME = "EnumName";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/
package org.eclipse.daanse.xmla.api.discover.discover.keywords;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DISCOVER_KEYWORDS;

import org.eclipse.daanse.xmla.api.annotation.Operation;
import org.eclipse.daanse.xmla.api.discover.Properties;

import static org.eclipse.daanse.xmla.api.common.properties.OperationNames.DISCOVER_KEYWORDS;

@Operation(name = DISCOVER_KEYWORDS, guid = "1426C443-4CDD-4A40-8F45-572FAB9BBAA1")
public interface DiscoverKeywordsRequest {

Expand Down
Loading
Loading