diff --git a/api/src/main/java/org/eclipse/daanse/rolap/mapping/api/model/MeasureMapping.java b/api/src/main/java/org/eclipse/daanse/rolap/mapping/api/model/MeasureMapping.java
index b2fc76e62..af0a50e40 100644
--- a/api/src/main/java/org/eclipse/daanse/rolap/mapping/api/model/MeasureMapping.java
+++ b/api/src/main/java/org/eclipse/daanse/rolap/mapping/api/model/MeasureMapping.java
@@ -13,7 +13,6 @@
package org.eclipse.daanse.rolap.mapping.api.model;
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
public interface MeasureMapping extends MemberMapping{
@@ -23,7 +22,7 @@ public interface MeasureMapping extends MemberMapping{
InternalDataType getDatatype();
- MeasureAggregatorType getAggregatorType();
+ String getAggregatorType();
MeasureGroupMapping getMeasureGroup();
diff --git a/api/src/main/java/org/eclipse/daanse/rolap/mapping/api/model/enums/MeasureAggregatorType.java b/api/src/main/java/org/eclipse/daanse/rolap/mapping/api/model/enums/MeasureAggregatorType.java
deleted file mode 100644
index 4d91e287b..000000000
--- a/api/src/main/java/org/eclipse/daanse/rolap/mapping/api/model/enums/MeasureAggregatorType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2024 Contributors to the Eclipse Foundation.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * SmartCity Jena, Stefan Bischof - initial
- *
- */
-package org.eclipse.daanse.rolap.mapping.api.model.enums;
-
-public enum MeasureAggregatorType {
-
- SUM("sum"), COUNT("count"), MIN("min"), MAX("max"), AVG("avg"), DICTINCT_COUNT("distinct-count");
-
- private final String value;
-
- MeasureAggregatorType(String v) {
- value = v;
- }
-
- public String getValue() {
- return value;
- }
-
- public static MeasureAggregatorType fromValue(String v) {
- for (MeasureAggregatorType c : MeasureAggregatorType.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.ecore b/emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.ecore
index 13a4fccda..98ff796f5 100644
--- a/emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.ecore
+++ b/emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.ecore
@@ -144,17 +144,12 @@
-
-
-
-
-
-
+
@@ -866,15 +861,6 @@
-
-
-
-
-
-
-
-
-
@@ -1104,6 +1090,5 @@
-
diff --git a/emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.genmodel b/emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.genmodel
index eebcc27ad..9e31a1f4b 100644
--- a/emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.genmodel
+++ b/emf/src/main/resources/model/org.eclipse.daanse.rolap.mapping.genmodel
@@ -69,15 +69,6 @@
-
-
-
-
-
-
-
-
-
@@ -156,7 +147,6 @@
-
@@ -243,12 +233,10 @@
-
+
-
diff --git a/emf/src/test/java/org/eclipse/daanse/rolap/mapping/emf/rolapmapping/ResourceSetWriteReadTest.java b/emf/src/test/java/org/eclipse/daanse/rolap/mapping/emf/rolapmapping/ResourceSetWriteReadTest.java
index ebf66152a..62d8cac9d 100644
--- a/emf/src/test/java/org/eclipse/daanse/rolap/mapping/emf/rolapmapping/ResourceSetWriteReadTest.java
+++ b/emf/src/test/java/org/eclipse/daanse/rolap/mapping/emf/rolapmapping/ResourceSetWriteReadTest.java
@@ -684,7 +684,7 @@ public void writePopulation(@InjectBundleContext BundleContext bc,
MeasureGroup measureGroup = RolapMappingFactory.eINSTANCE.createMeasureGroup();
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Einwohnerzahl");
measure.setColumn(columnEinwohnerAnzahl);
measureGroup.getMeasures().add(measure);
diff --git a/instance/emf/complex/school/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/complex/school/CatalogSupplier.java b/instance/emf/complex/school/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/complex/school/CatalogSupplier.java
index 3a8b4e092..8aa137c94 100644
--- a/instance/emf/complex/school/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/complex/school/CatalogSupplier.java
+++ b/instance/emf/complex/school/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/complex/school/CatalogSupplier.java
@@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -1031,25 +1030,25 @@ public CatalogMapping get() {
measure1.setName("Anzahl Schulen");
measure1.setId("M_Anzahl_Schulen");
measure1.setColumn(ANZAHL_SCHULEN_COLUMN_IN_FACT_SCHULEN);
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
measure2.setName("Anzahl Klassen");
measure2.setId("M_Anzahl_Klassen");
measure2.setColumn(ANZAHL_KLASSEN_COLUMN_IN_FACT_SCHULEN);
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
Measure measure3 = RolapMappingFactory.eINSTANCE.createMeasure();
measure3.setName("Anzahl Personen");
measure3.setId("M_Anzahl_Personen");
measure3.setColumn(ANZAHL_PERSONEN_COLUMN_IN_FACT_PERSONAL);
- measure3.setAggregator(MeasureAggregator.SUM);
+ measure3.setAggregatorType("sum");
Measure measure4 = RolapMappingFactory.eINSTANCE.createMeasure();
measure4.setName("Anzahl Schüler:innen");
measure4.setId("M_Anzahl_Schuler_innen");
measure4.setColumn(ANZAHL_SCHUELER_COLUMN_IN_FACT_SCHUELER);
- measure4.setAggregator(MeasureAggregator.SUM);
+ measure4.setAggregatorType("sum");
MeasureGroup CUBE1_MEASURE_GROUP = RolapMappingFactory.eINSTANCE.createMeasureGroup();
CUBE1_MEASURE_GROUP.getMeasures().addAll(List.of(measure1, measure2));
diff --git a/instance/emf/tutorial/accessallnonecustom/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessallnonecustom/CatalogSupplier.java b/instance/emf/tutorial/accessallnonecustom/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessallnonecustom/CatalogSupplier.java
index e3394c895..d8012017b 100644
--- a/instance/emf/tutorial/accessallnonecustom/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessallnonecustom/CatalogSupplier.java
+++ b/instance/emf/tutorial/accessallnonecustom/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessallnonecustom/CatalogSupplier.java
@@ -34,7 +34,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.HierarchyAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
@@ -88,7 +87,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/accesscubegrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesscubegrand/CatalogSupplier.java b/instance/emf/tutorial/accesscubegrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesscubegrand/CatalogSupplier.java
index 76921c258..460c03c51 100644
--- a/instance/emf/tutorial/accesscubegrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesscubegrand/CatalogSupplier.java
+++ b/instance/emf/tutorial/accesscubegrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesscubegrand/CatalogSupplier.java
@@ -31,7 +31,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -80,7 +79,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/accessdbschemagrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessdbschemagrand/CatalogSupplier.java b/instance/emf/tutorial/accessdbschemagrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessdbschemagrand/CatalogSupplier.java
index 7b8f3124b..83f573072 100644
--- a/instance/emf/tutorial/accessdbschemagrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessdbschemagrand/CatalogSupplier.java
+++ b/instance/emf/tutorial/accessdbschemagrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessdbschemagrand/CatalogSupplier.java
@@ -32,7 +32,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchemaAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -96,7 +95,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/accesshierarchygrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesshierarchygrand/CatalogSupplier.java b/instance/emf/tutorial/accesshierarchygrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesshierarchygrand/CatalogSupplier.java
index 25219c130..3421c2439 100644
--- a/instance/emf/tutorial/accesshierarchygrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesshierarchygrand/CatalogSupplier.java
+++ b/instance/emf/tutorial/accesshierarchygrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accesshierarchygrand/CatalogSupplier.java
@@ -36,7 +36,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.HierarchyAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
@@ -86,7 +85,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/accessschemagrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessschemagrand/CatalogSupplier.java b/instance/emf/tutorial/accessschemagrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessschemagrand/CatalogSupplier.java
index 0a23ee012..2968c32e7 100644
--- a/instance/emf/tutorial/accessschemagrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessschemagrand/CatalogSupplier.java
+++ b/instance/emf/tutorial/accessschemagrand/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/accessschemagrand/CatalogSupplier.java
@@ -29,7 +29,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -78,7 +77,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/aggexclude/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggexclude/CatalogSupplier.java b/instance/emf/tutorial/aggexclude/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggexclude/CatalogSupplier.java
index dd4542c32..cbde17c53 100644
--- a/instance/emf/tutorial/aggexclude/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggexclude/CatalogSupplier.java
+++ b/instance/emf/tutorial/aggexclude/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggexclude/CatalogSupplier.java
@@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -91,7 +90,7 @@ public CatalogMapping get() {
query.getAggregationExcludes().add(aggregationExclude);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure");
measure.setId("Measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/aggregatetables/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggregatetables/CatalogSupplier.java b/instance/emf/tutorial/aggregatetables/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggregatetables/CatalogSupplier.java
index 32db1c2d4..17f65094c 100644
--- a/instance/emf/tutorial/aggregatetables/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggregatetables/CatalogSupplier.java
+++ b/instance/emf/tutorial/aggregatetables/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/aggregatetables/CatalogSupplier.java
@@ -32,7 +32,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -214,7 +213,7 @@ public CatalogMapping get() {
joinQuery.setRight(right);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Store Cost");
measure.setId("Store Cost");
measure.setColumn(storeCostColumn);
diff --git a/instance/emf/tutorial/cellformatter/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cellformatter/CatalogSupplier.java b/instance/emf/tutorial/cellformatter/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cellformatter/CatalogSupplier.java
index 0685a4906..933f9e29a 100644
--- a/instance/emf/tutorial/cellformatter/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cellformatter/CatalogSupplier.java
+++ b/instance/emf/tutorial/cellformatter/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cellformatter/CatalogSupplier.java
@@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -71,7 +70,7 @@ public CatalogMapping get() {
cellFormatter.setRef("mondrian.rolap.format.CellFormatterImpl");
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/calculatedmember.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/calculatedmember/intro/CatalogSupplier.java b/instance/emf/tutorial/cube/calculatedmember.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/calculatedmember/intro/CatalogSupplier.java
index 7684a1f36..4cea120e4 100644
--- a/instance/emf/tutorial/cube/calculatedmember.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/calculatedmember/intro/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/calculatedmember.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/calculatedmember/intro/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -122,13 +121,13 @@ public CatalogMapping get() {
dimensionConnector.setDimension(dimension);
Measure measureSum = RolapMappingFactory.eINSTANCE.createMeasure();
- measureSum.setAggregator(MeasureAggregator.SUM);
+ measureSum.setAggregatorType("sum");
measureSum.setName("Measure1-Sum");
measureSum.setId("Measure1-Sum");
measureSum.setColumn(valueColumn);
Measure measureCount = RolapMappingFactory.eINSTANCE.createMeasure();
- measureCount.setAggregator(MeasureAggregator.COUNT);
+ measureCount.setAggregatorType("count");
measureCount.setName("Measure2-Count");
measureCount.setId("Measure2-Count");
measureCount.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/dimension.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/dimension/intro/CatalogSupplier.java b/instance/emf/tutorial/cube/dimension.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/dimension/intro/CatalogSupplier.java
index 6a26ec005..ec1d258bf 100644
--- a/instance/emf/tutorial/cube/dimension.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/dimension/intro/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/dimension.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/dimension/intro/CatalogSupplier.java
@@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -104,7 +103,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/hierarchy.hasall/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/hasall/CatalogSupplier.java b/instance/emf/tutorial/cube/hierarchy.hasall/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/hasall/CatalogSupplier.java
index 8e9bdaba9..a6eb61c01 100644
--- a/instance/emf/tutorial/cube/hierarchy.hasall/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/hasall/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/hierarchy.hasall/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/hasall/CatalogSupplier.java
@@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -118,7 +117,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/hierarchy.query.join.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/join/base/CatalogSupplier.java b/instance/emf/tutorial/cube/hierarchy.query.join.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/join/base/CatalogSupplier.java
index 565dccd13..c71b701a5 100644
--- a/instance/emf/tutorial/cube/hierarchy.query.join.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/join/base/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/hierarchy.query.join.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/join/base/CatalogSupplier.java
@@ -28,7 +28,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -190,7 +189,7 @@ public CatalogMapping get() {
queryJoinTownToCountry.setRight(joinQueryElementCountry);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/hierarchy.query.join.multi/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/join/multi/CatalogSupplier.java b/instance/emf/tutorial/cube/hierarchy.query.join.multi/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/join/multi/CatalogSupplier.java
index cce2a27c1..1e80ac20c 100644
--- a/instance/emf/tutorial/cube/hierarchy.query.join.multi/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/join/multi/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/hierarchy.query.join.multi/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/join/multi/CatalogSupplier.java
@@ -28,7 +28,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -246,7 +245,7 @@ public CatalogMapping get() {
queryJoinTownToCountry.setRight(joinQueryCCElementJoinCountry);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/hierarchy.query.table.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/base/CatalogSupplier.java b/instance/emf/tutorial/cube/hierarchy.query.table.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/base/CatalogSupplier.java
index fb68d64d9..218526ad6 100644
--- a/instance/emf/tutorial/cube/hierarchy.query.table.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/base/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/hierarchy.query.table.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/base/CatalogSupplier.java
@@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -122,7 +121,7 @@ public CatalogMapping get() {
queryHier.setTable(tableTown);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(columnFactValue);
diff --git a/instance/emf/tutorial/cube/hierarchy.query.table.multilevel.multitable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/multilevel/multitable/CatalogSupplier.java b/instance/emf/tutorial/cube/hierarchy.query.table.multilevel.multitable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/multilevel/multitable/CatalogSupplier.java
index 41d1b46e2..fd2ecf84e 100644
--- a/instance/emf/tutorial/cube/hierarchy.query.table.multilevel.multitable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/multilevel/multitable/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/hierarchy.query.table.multilevel.multitable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/multilevel/multitable/CatalogSupplier.java
@@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -137,7 +136,7 @@ public CatalogMapping get() {
queryHier.setTable(tableTown);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/hierarchy.query.table.multilevel.singletable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/multilevel/singletable/CatalogSupplier.java b/instance/emf/tutorial/cube/hierarchy.query.table.multilevel.singletable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/multilevel/singletable/CatalogSupplier.java
index 98831c3b5..2147003d6 100644
--- a/instance/emf/tutorial/cube/hierarchy.query.table.multilevel.singletable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/multilevel/singletable/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/hierarchy.query.table.multilevel.singletable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/hierarchy/query/table/multilevel/singletable/CatalogSupplier.java
@@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -109,7 +108,7 @@ public CatalogMapping get() {
query.setTable(tableFact);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(columnValue);
diff --git a/instance/emf/tutorial/cube/kpi.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/kpi/intro/CatalogSupplier.java b/instance/emf/tutorial/cube/kpi.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/kpi/intro/CatalogSupplier.java
index 55e2a1b11..9b8f9c09f 100644
--- a/instance/emf/tutorial/cube/kpi.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/kpi/intro/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/kpi.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/kpi/intro/CatalogSupplier.java
@@ -24,7 +24,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Kpi;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -88,7 +87,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure1-Sum");
measure.setId("Measure1-Sum");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/kpi.parent.ring/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/kpi/parent/ring/CatalogSupplier.java b/instance/emf/tutorial/cube/kpi.parent.ring/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/kpi/parent/ring/CatalogSupplier.java
index b436cfffe..0bb6ecb0f 100644
--- a/instance/emf/tutorial/cube/kpi.parent.ring/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/kpi/parent/ring/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/kpi.parent.ring/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/kpi/parent/ring/CatalogSupplier.java
@@ -24,7 +24,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Kpi;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -90,7 +89,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure1-Sum");
measure.setId("Measure1-Sum");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/level.member.property.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/level/member/property/intro/CatalogSupplier.java b/instance/emf/tutorial/cube/level.member.property.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/level/member/property/intro/CatalogSupplier.java
index d7c64004b..570b0e2a0 100644
--- a/instance/emf/tutorial/cube/level.member.property.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/level/member/property/intro/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/level.member.property.intro/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/level/member/property/intro/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberProperty;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
@@ -135,7 +134,7 @@ public CatalogMapping get() {
queryHier.setTable(tableTown);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("theMeasure");
measure.setId("_measure");
measure.setColumn(columnFactValue);
diff --git a/instance/emf/tutorial/cube/measure.aggregator.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/aggregator/base/CatalogSupplier.java b/instance/emf/tutorial/cube/measure.aggregator.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/aggregator/base/CatalogSupplier.java
index b94beda43..09efdef4f 100644
--- a/instance/emf/tutorial/cube/measure.aggregator.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/aggregator/base/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/measure.aggregator.base/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/aggregator/base/CatalogSupplier.java
@@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.ColumnType;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -84,25 +83,25 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Sum of Value");
measure1.setId("_measure1");
measure1.setColumn(valueColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.MAX);
+ measure2.setAggregatorType("max");
measure2.setName("Max of Value");
measure2.setId("_measure2");
measure2.setColumn(valueColumn);
Measure measure3 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure3.setAggregator(MeasureAggregator.MIN);
+ measure3.setAggregatorType("min");
measure3.setName("Min of Value");
measure3.setId("_measure3");
measure3.setColumn(valueColumn);
Measure measure4 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure4.setAggregator(MeasureAggregator.AVG);
+ measure4.setAggregatorType("avg");
measure4.setName("Avg of Value");
measure4.setId("_measure4");
measure4.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/measure.datatype/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/datatype/CatalogSupplier.java b/instance/emf/tutorial/cube/measure.datatype/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/datatype/CatalogSupplier.java
index 4fdbf81a9..fd8c413a9 100644
--- a/instance/emf/tutorial/cube/measure.datatype/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/datatype/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/measure.datatype/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/datatype/CatalogSupplier.java
@@ -24,7 +24,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.ColumnType;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -96,14 +95,14 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure - Datatype Integer");
measure1.setId("_measure1");
measure1.setColumn(valueColumn);
measure1.setDataType(ColumnInternalDataType.INTEGER);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Measure - Datatype Numeric");
measure2.setId("_measure2");
measure2.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/measure.format/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/format/CatalogSupplier.java b/instance/emf/tutorial/cube/measure.format/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/format/CatalogSupplier.java
index efee02cd1..d190570ad 100644
--- a/instance/emf/tutorial/cube/measure.format/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/format/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/measure.format/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/format/CatalogSupplier.java
@@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.ColumnType;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -116,21 +115,21 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Format #,##0.00");
measure1.setId("_measure1");
measure1.setColumn(valueColumn);
measure1.setFormatString("#,##0.00");
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Format #,##0");
measure2.setId("_measure2");
measure2.setColumn(valueColumn);
measure2.setFormatString("#,##0");
Measure measure3 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure3.setAggregator(MeasureAggregator.SUM);
+ measure3.setAggregatorType("sum");
measure3.setName("Format #,##0.");
measure3.setId("_measure3");
measure3.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/measure.group/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/group/CatalogSupplier.java b/instance/emf/tutorial/cube/measure.group/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/group/CatalogSupplier.java
index 3a9e2b532..61bc4a0c9 100644
--- a/instance/emf/tutorial/cube/measure.group/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/group/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/measure.group/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/group/CatalogSupplier.java
@@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.ColumnType;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -80,19 +79,19 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure A");
measure1.setId("_measure1");
measure1.setColumn(valueColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Measure B");
measure2.setId("_measure2");
measure2.setColumn(valueColumn);
Measure measure3 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure3.setAggregator(MeasureAggregator.SUM);
+ measure3.setAggregatorType("sum");
measure3.setName("Measure 1");
measure3.setId("_measure3");
measure3.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/cube/measure.multiple/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/multiple/CatalogSupplier.java b/instance/emf/tutorial/cube/measure.multiple/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/multiple/CatalogSupplier.java
index 6ddf6f9a7..afb8a99f6 100644
--- a/instance/emf/tutorial/cube/measure.multiple/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/multiple/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/measure.multiple/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/measure/multiple/CatalogSupplier.java
@@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.ColumnType;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -98,19 +97,19 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Sum of Value1");
measure1.setId("_measure1");
measure1.setColumn(value1Column);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Sum of Value2");
measure2.setId("_measure2");
measure2.setColumn(value2Column);
Measure measure3 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure3.setAggregator(MeasureAggregator.SUM);
+ measure3.setAggregatorType("sum");
measure3.setName("Sum of Value3");
measure3.setId("_measure3");
measure3.setColumn(value3Column);
diff --git a/instance/emf/tutorial/cube/minimal/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/minimal/CatalogSupplier.java b/instance/emf/tutorial/cube/minimal/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/minimal/CatalogSupplier.java
index d9c2b52e6..29bda69a5 100644
--- a/instance/emf/tutorial/cube/minimal/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/minimal/CatalogSupplier.java
+++ b/instance/emf/tutorial/cube/minimal/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/cube/minimal/CatalogSupplier.java
@@ -23,7 +23,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.ColumnType;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -80,7 +79,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure-Sum");
measure.setId("_measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/dimensionwithfunctionaldependencyoptimization/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithfunctionaldependencyoptimization/CatalogSupplier.java b/instance/emf/tutorial/dimensionwithfunctionaldependencyoptimization/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithfunctionaldependencyoptimization/CatalogSupplier.java
index f82ccc2b5..8cbe4006d 100644
--- a/instance/emf/tutorial/dimensionwithfunctionaldependencyoptimization/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithfunctionaldependencyoptimization/CatalogSupplier.java
+++ b/instance/emf/tutorial/dimensionwithfunctionaldependencyoptimization/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithfunctionaldependencyoptimization/CatalogSupplier.java
@@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberProperty;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
@@ -164,7 +163,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure");
measure.setId("Measure");
measure.setColumn(priceColumn);
diff --git a/instance/emf/tutorial/dimensionwithlevelattribute/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelattribute/CatalogSupplier.java b/instance/emf/tutorial/dimensionwithlevelattribute/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelattribute/CatalogSupplier.java
index def662c25..414afb4b4 100644
--- a/instance/emf/tutorial/dimensionwithlevelattribute/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelattribute/CatalogSupplier.java
+++ b/instance/emf/tutorial/dimensionwithlevelattribute/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelattribute/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -139,7 +138,7 @@ public CatalogMapping get() {
joinQuery.setRight(right);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure");
measure.setId("Measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/dimensionwithlevelclosure/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelclosure/CatalogSupplier.java b/instance/emf/tutorial/dimensionwithlevelclosure/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelclosure/CatalogSupplier.java
index ba9f0ce4b..0336b9d73 100644
--- a/instance/emf/tutorial/dimensionwithlevelclosure/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelclosure/CatalogSupplier.java
+++ b/instance/emf/tutorial/dimensionwithlevelclosure/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelclosure/CatalogSupplier.java
@@ -25,7 +25,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.ParentChildLink;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
@@ -121,7 +120,7 @@ public CatalogMapping get() {
queryHierarchy.setTable(hierarchyTable);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure");
measure.setId("Measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/dimensionwithlevelexpressions/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelexpressions/CatalogSupplier.java b/instance/emf/tutorial/dimensionwithlevelexpressions/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelexpressions/CatalogSupplier.java
index 1ff544ca1..ff0164219 100644
--- a/instance/emf/tutorial/dimensionwithlevelexpressions/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelexpressions/CatalogSupplier.java
+++ b/instance/emf/tutorial/dimensionwithlevelexpressions/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelexpressions/CatalogSupplier.java
@@ -25,7 +25,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -124,7 +123,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure");
measure.setId("Measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/dimensionwithlevelparentcolumn/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelparentcolumn/CatalogSupplier.java b/instance/emf/tutorial/dimensionwithlevelparentcolumn/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelparentcolumn/CatalogSupplier.java
index deec4a3e0..a0bc0c90e 100644
--- a/instance/emf/tutorial/dimensionwithlevelparentcolumn/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelparentcolumn/CatalogSupplier.java
+++ b/instance/emf/tutorial/dimensionwithlevelparentcolumn/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelparentcolumn/CatalogSupplier.java
@@ -25,7 +25,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -109,7 +108,7 @@ public CatalogMapping get() {
query1.setTable(table1);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure1");
measure.setId("Measure1");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/dimensionwithlevelwithparentchild/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelwithparentchild/CatalogSupplier.java b/instance/emf/tutorial/dimensionwithlevelwithparentchild/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelwithparentchild/CatalogSupplier.java
index 674d937f0..fafaec008 100644
--- a/instance/emf/tutorial/dimensionwithlevelwithparentchild/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelwithparentchild/CatalogSupplier.java
+++ b/instance/emf/tutorial/dimensionwithlevelwithparentchild/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithlevelwithparentchild/CatalogSupplier.java
@@ -25,7 +25,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberProperty;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.ParentChildLink;
@@ -143,7 +142,7 @@ public CatalogMapping get() {
employeeClosureQuery.setTable(employeeClosureTable);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure");
measure.setId("Measure");
measure.setColumn(salaryColumn);
diff --git a/instance/emf/tutorial/dimensionwithsmallintbooleanlevel/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithsmallintbooleanlevel/CatalogSupplier.java b/instance/emf/tutorial/dimensionwithsmallintbooleanlevel/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithsmallintbooleanlevel/CatalogSupplier.java
index 9fe15a589..170570a56 100644
--- a/instance/emf/tutorial/dimensionwithsmallintbooleanlevel/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithsmallintbooleanlevel/CatalogSupplier.java
+++ b/instance/emf/tutorial/dimensionwithsmallintbooleanlevel/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/dimensionwithsmallintbooleanlevel/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -82,7 +81,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure");
measure.setId("Measure");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/drillthroughaction/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/drillthroughaction/CatalogSupplier.java b/instance/emf/tutorial/drillthroughaction/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/drillthroughaction/CatalogSupplier.java
index 6bea90e63..f5e666af7 100644
--- a/instance/emf/tutorial/drillthroughaction/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/drillthroughaction/CatalogSupplier.java
+++ b/instance/emf/tutorial/drillthroughaction/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/drillthroughaction/CatalogSupplier.java
@@ -29,7 +29,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -187,7 +186,7 @@ public CatalogMapping get() {
join2.setRight(join2Right);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure1");
measure.setId("Measure1");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/hierarchywithinnertable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/hierarchywithinnertable/CatalogSupplier.java b/instance/emf/tutorial/hierarchywithinnertable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/hierarchywithinnertable/CatalogSupplier.java
index de58e4a66..8e441c8dc 100644
--- a/instance/emf/tutorial/hierarchywithinnertable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/hierarchywithinnertable/CatalogSupplier.java
+++ b/instance/emf/tutorial/hierarchywithinnertable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/hierarchywithinnertable/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.InlineTableQuery;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -145,7 +144,7 @@ public CatalogMapping get() {
inlineTableQuery.setAlias("HT");
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure1");
measure.setId("Measure1");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/hierarchywithview/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/hierarchywithview/CatalogSupplier.java b/instance/emf/tutorial/hierarchywithview/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/hierarchywithview/CatalogSupplier.java
index 455b6f53e..67c677f21 100644
--- a/instance/emf/tutorial/hierarchywithview/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/hierarchywithview/CatalogSupplier.java
+++ b/instance/emf/tutorial/hierarchywithview/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/hierarchywithview/CatalogSupplier.java
@@ -25,7 +25,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -142,7 +141,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure1");
measure.setId("Measure1");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/inlinetable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/inlinetable/CatalogSupplier.java b/instance/emf/tutorial/inlinetable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/inlinetable/CatalogSupplier.java
index f41b38c56..62a646807 100644
--- a/instance/emf/tutorial/inlinetable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/inlinetable/CatalogSupplier.java
+++ b/instance/emf/tutorial/inlinetable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/inlinetable/CatalogSupplier.java
@@ -24,7 +24,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.InlineTable;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.InlineTableQuery;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.RolapMappingFactory;
@@ -96,7 +95,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure-Sum");
measure.setId("Measure-Sum");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/kpiall/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/kpiall/CatalogSupplier.java b/instance/emf/tutorial/kpiall/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/kpiall/CatalogSupplier.java
index 4686f85ab..4f470131d 100644
--- a/instance/emf/tutorial/kpiall/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/kpiall/CatalogSupplier.java
+++ b/instance/emf/tutorial/kpiall/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/kpiall/CatalogSupplier.java
@@ -24,7 +24,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Kpi;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -105,13 +104,13 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure1-Sum");
measure.setId("Measure1-Sum");
measure.setColumn(valueColumn);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.COUNT);
+ measure1.setAggregatorType("count");
measure1.setName("Measure2-Count");
measure1.setId("Measure2-Count");
measure1.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/kpivirtualcube/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/kpivirtualcube/CatalogSupplier.java b/instance/emf/tutorial/kpivirtualcube/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/kpivirtualcube/CatalogSupplier.java
index 164c503f1..df73698c9 100644
--- a/instance/emf/tutorial/kpivirtualcube/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/kpivirtualcube/CatalogSupplier.java
+++ b/instance/emf/tutorial/kpivirtualcube/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/kpivirtualcube/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Kpi;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -111,13 +110,13 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("MeasureCube1");
measure1.setId("MeasureCube1");
measure1.setColumn(valueColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("MeasureCube2");
measure2.setId("MeasureCube2");
measure2.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/levelifblankname/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/levelifblankname/CatalogSupplier.java b/instance/emf/tutorial/levelifblankname/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/levelifblankname/CatalogSupplier.java
index 09fdd2838..a4cfd9754 100644
--- a/instance/emf/tutorial/levelifblankname/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/levelifblankname/CatalogSupplier.java
+++ b/instance/emf/tutorial/levelifblankname/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/levelifblankname/CatalogSupplier.java
@@ -28,7 +28,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -261,13 +260,13 @@ public CatalogMapping get() {
queryJoin2.setRight(queryJoin2RightElement);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Measure1");
measure2.setId("Measure1");
measure2.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/levelifparentsname/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/levelifparentsname/CatalogSupplier.java b/instance/emf/tutorial/levelifparentsname/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/levelifparentsname/CatalogSupplier.java
index 9b3e65276..36e91f099 100644
--- a/instance/emf/tutorial/levelifparentsname/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/levelifparentsname/CatalogSupplier.java
+++ b/instance/emf/tutorial/levelifparentsname/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/levelifparentsname/CatalogSupplier.java
@@ -28,7 +28,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -131,7 +130,7 @@ public CatalogMapping get() {
queryJoin1.setRight(queryJoin1Right);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/measureexpression/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/measureexpression/CatalogSupplier.java b/instance/emf/tutorial/measureexpression/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/measureexpression/CatalogSupplier.java
index 82dac63ff..6c793767b 100644
--- a/instance/emf/tutorial/measureexpression/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/measureexpression/CatalogSupplier.java
+++ b/instance/emf/tutorial/measureexpression/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/measureexpression/CatalogSupplier.java
@@ -22,7 +22,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -111,13 +110,13 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1-Sum");
measure1.setId("Measure1-Sum");
measure1.setColumn(measureExpression1);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Measure2-Sum");
measure2.setId("Measure2-Sum");
measure2.setColumn(measureExpression2);
diff --git a/instance/emf/tutorial/namedset.all/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/namedset/CatalogSupplier.java b/instance/emf/tutorial/namedset.all/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/namedset/CatalogSupplier.java
index 60bd45a98..6f81a9d2f 100644
--- a/instance/emf/tutorial/namedset.all/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/namedset/CatalogSupplier.java
+++ b/instance/emf/tutorial/namedset.all/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/namedset/CatalogSupplier.java
@@ -25,7 +25,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.NamedSet;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
@@ -73,7 +72,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure1");
measure.setId("Measure1");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/timedimension/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/timedimension/CatalogSupplier.java b/instance/emf/tutorial/timedimension/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/timedimension/CatalogSupplier.java
index c4e9092ee..d71d8b648 100644
--- a/instance/emf/tutorial/timedimension/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/timedimension/CatalogSupplier.java
+++ b/instance/emf/tutorial/timedimension/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/timedimension/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.LevelDefinition;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -124,7 +123,7 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
- measure.setAggregator(MeasureAggregator.SUM);
+ measure.setAggregatorType("sum");
measure.setName("Measure-Sum");
measure.setId("Measure-Sum");
measure.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/virtualcube.min/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcube/CatalogSupplier.java b/instance/emf/tutorial/virtualcube.min/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcube/CatalogSupplier.java
index 0c69d4b07..faaff8ce1 100644
--- a/instance/emf/tutorial/virtualcube.min/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcube/CatalogSupplier.java
+++ b/instance/emf/tutorial/virtualcube.min/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcube/CatalogSupplier.java
@@ -24,7 +24,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -92,13 +91,13 @@ public CatalogMapping get() {
query2.setTable(c2Table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("C1-Measure-Sum");
measure1.setId("C1-Measure-Sum");
measure1.setColumn(value1Column);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("C2-Measure-Sum");
measure2.setId("C2-Measure-Sum");
measure2.setColumn(value2Column);
diff --git a/instance/emf/tutorial/virtualcubecalculatedmember/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubecalculatedmember/CatalogSupplier.java b/instance/emf/tutorial/virtualcubecalculatedmember/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubecalculatedmember/CatalogSupplier.java
index 24b38dee0..e7d63cd61 100644
--- a/instance/emf/tutorial/virtualcubecalculatedmember/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubecalculatedmember/CatalogSupplier.java
+++ b/instance/emf/tutorial/virtualcubecalculatedmember/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubecalculatedmember/CatalogSupplier.java
@@ -26,7 +26,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -74,13 +73,13 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("MeasureCube1");
measure1.setId("MeasureCube1");
measure1.setColumn(valueColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("MeasureCube2");
measure2.setId("MeasureCube2");
measure2.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/virtualcubedimensions/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubedimensions/CatalogSupplier.java b/instance/emf/tutorial/virtualcubedimensions/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubedimensions/CatalogSupplier.java
index b731f0800..ee163e0cb 100644
--- a/instance/emf/tutorial/virtualcubedimensions/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubedimensions/CatalogSupplier.java
+++ b/instance/emf/tutorial/virtualcubedimensions/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubedimensions/CatalogSupplier.java
@@ -25,7 +25,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -73,13 +72,13 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("MeasureCube1");
measure1.setId("MeasureCube1");
measure1.setColumn(valueColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("MeasureCube2");
measure2.setId("MeasureCube2");
measure2.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/virtualcubemeasureonly/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubemeasureonly/CatalogSupplier.java b/instance/emf/tutorial/virtualcubemeasureonly/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubemeasureonly/CatalogSupplier.java
index 670967a7f..cfee180e7 100644
--- a/instance/emf/tutorial/virtualcubemeasureonly/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubemeasureonly/CatalogSupplier.java
+++ b/instance/emf/tutorial/virtualcubemeasureonly/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubemeasureonly/CatalogSupplier.java
@@ -24,7 +24,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -92,13 +91,13 @@ public CatalogMapping get() {
query2.setTable(c2Table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("C1-Measure-Sum");
measure1.setId("C1-Measure-Sum");
measure1.setColumn(value1Column);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("C2-Measure-Sum");
measure2.setId("C2-Measure-Sum");
measure2.setColumn(value2Column);
diff --git a/instance/emf/tutorial/virtualcubevisiblereferencecubes/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubevisiblereferencecubes/CatalogSupplier.java b/instance/emf/tutorial/virtualcubevisiblereferencecubes/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubevisiblereferencecubes/CatalogSupplier.java
index 30eca2ccb..16fd19ad4 100644
--- a/instance/emf/tutorial/virtualcubevisiblereferencecubes/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubevisiblereferencecubes/CatalogSupplier.java
+++ b/instance/emf/tutorial/virtualcubevisiblereferencecubes/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/virtualcubevisiblereferencecubes/CatalogSupplier.java
@@ -25,7 +25,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Hierarchy;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -100,13 +99,13 @@ public CatalogMapping get() {
dimensionConnector2.setDimension(dimension1);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("MeasureCube1");
measure1.setId("MeasureCube1");
measure1.setColumn(valueColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("MeasureCube2");
measure2.setId("MeasureCube2");
measure2.setColumn(valueColumn);
diff --git a/instance/emf/tutorial/writebackinlinetable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackinlinetable/CatalogSupplier.java b/instance/emf/tutorial/writebackinlinetable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackinlinetable/CatalogSupplier.java
index 1b2025522..ec9410a07 100644
--- a/instance/emf/tutorial/writebackinlinetable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackinlinetable/CatalogSupplier.java
+++ b/instance/emf/tutorial/writebackinlinetable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackinlinetable/CatalogSupplier.java
@@ -29,7 +29,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -232,13 +231,13 @@ public CatalogMapping get() {
join.setRight(joinRight);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Measure2");
measure2.setId("Measure2");
measure2.setColumn(val1Column);
diff --git a/instance/emf/tutorial/writebacktable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebacktable/CatalogSupplier.java b/instance/emf/tutorial/writebacktable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebacktable/CatalogSupplier.java
index 0883fffbf..4360c4935 100644
--- a/instance/emf/tutorial/writebacktable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebacktable/CatalogSupplier.java
+++ b/instance/emf/tutorial/writebacktable/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebacktable/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -167,13 +166,13 @@ public CatalogMapping get() {
join.setRight(joinRight);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Measure2");
measure2.setId("Measure2");
measure2.setColumn(val1Column);
diff --git a/instance/emf/tutorial/writebackview/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackview/CatalogSupplier.java b/instance/emf/tutorial/writebackview/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackview/CatalogSupplier.java
index fb6fcdd65..8d1a226a3 100644
--- a/instance/emf/tutorial/writebackview/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackview/CatalogSupplier.java
+++ b/instance/emf/tutorial/writebackview/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackview/CatalogSupplier.java
@@ -27,7 +27,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.JoinedQueryElement;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Level;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -175,13 +174,13 @@ public CatalogMapping get() {
joinQuery.setRight(joinRight);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Measure2");
measure2.setId("Measure2");
measure2.setColumn(val1Column);
diff --git a/instance/emf/tutorial/writebackwithoutdimension/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackwithoutdimension/CatalogSupplier.java b/instance/emf/tutorial/writebackwithoutdimension/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackwithoutdimension/CatalogSupplier.java
index 64c53c416..b0fca5a81 100644
--- a/instance/emf/tutorial/writebackwithoutdimension/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackwithoutdimension/CatalogSupplier.java
+++ b/instance/emf/tutorial/writebackwithoutdimension/src/main/java/org/eclipse/daanse/rolap/mapping/instance/emf/tutorial/writebackwithoutdimension/CatalogSupplier.java
@@ -22,7 +22,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.DatabaseSchema;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Documentation;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalCube;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.PhysicalTable;
@@ -110,13 +109,13 @@ public CatalogMapping get() {
query.setTable(table);
Measure measure1 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure1.setAggregator(MeasureAggregator.SUM);
+ measure1.setAggregatorType("sum");
measure1.setName("Measure1");
measure1.setId("Measure1");
measure1.setColumn(valColumn);
Measure measure2 = RolapMappingFactory.eINSTANCE.createMeasure();
- measure2.setAggregator(MeasureAggregator.SUM);
+ measure2.setAggregatorType("sum");
measure2.setName("Measure2");
measure2.setId("Measure2");
measure2.setColumn(val1Column);
diff --git a/instance/rec/complex/expressivenames/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/expressivenames/ExpressivenamesMappingSupplier.java b/instance/rec/complex/expressivenames/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/expressivenames/ExpressivenamesMappingSupplier.java
index 7f4dc5747..32326d2d9 100644
--- a/instance/rec/complex/expressivenames/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/expressivenames/ExpressivenamesMappingSupplier.java
+++ b/instance/rec/complex/expressivenames/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/expressivenames/ExpressivenamesMappingSupplier.java
@@ -18,7 +18,6 @@
import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
import org.eclipse.daanse.rolap.mapping.api.model.enums.ColumnDataType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.instance.api.Kind;
import org.eclipse.daanse.rolap.mapping.instance.api.MappingInstance;
import org.eclipse.daanse.rolap.mapping.instance.api.Source;
@@ -390,7 +389,7 @@ public class ExpressivenamesMappingSupplier implements CatalogMappingSupplier {
.builder()
.withName("Measure1")
.withColumn(M1_COLUMN)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.withFormatString("Standard")
.build();
diff --git a/instance/rec/complex/foodmart/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/foodmart/FoodmartMappingSupplier.java b/instance/rec/complex/foodmart/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/foodmart/FoodmartMappingSupplier.java
index 5e29f5558..e4f0f048e 100644
--- a/instance/rec/complex/foodmart/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/foodmart/FoodmartMappingSupplier.java
+++ b/instance/rec/complex/foodmart/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/foodmart/FoodmartMappingSupplier.java
@@ -24,7 +24,6 @@
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.HideMemberIfType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.LevelType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.instance.api.Kind;
import org.eclipse.daanse.rolap.mapping.instance.api.MappingInstance;
import org.eclipse.daanse.rolap.mapping.instance.api.Source;
@@ -2043,21 +2042,21 @@ public class FoodmartMappingSupplier implements CatalogMappingSupplier {
.withName(UNIT_SALES)
.withColumn(UNIT_SALES_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STANDARD)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_UNIT_SALES_RAGGED = MeasureMappingImpl.builder()
.withName(UNIT_SALES)
.withColumn(UNIT_SALES_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STANDARD)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_UNIT_SALES_MEMBER_ORDINAL = MeasureMappingImpl.builder()
.withName(UNIT_SALES)
.withColumn(UNIT_SALES_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STANDARD)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.withCalculatedMemberProperty(List.of(
CalculatedMemberPropertyMappingImpl.builder().withName(MEMBER_ORDINAL).withValue("2").build()
))
@@ -2067,21 +2066,21 @@ public class FoodmartMappingSupplier implements CatalogMappingSupplier {
.withName(STORE_COST)
.withColumn(STORE_COST_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITH_COMMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_STORE_COST_RAGGED = MeasureMappingImpl.builder()
.withName(STORE_COST)
.withColumn(STORE_COST_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITH_COMMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_STORE_COST_WITH_PROPERTY = MeasureMappingImpl.builder()
.withName(STORE_COST)
.withColumn(STORE_COST_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITH_COMMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.withCalculatedMemberProperty(List.of(
CalculatedMemberPropertyMappingImpl.builder().withName(MEMBER_ORDINAL).withValue("6").build()
))
@@ -2091,21 +2090,21 @@ public class FoodmartMappingSupplier implements CatalogMappingSupplier {
.withName(STORE_SALES)
.withColumn(STORE_SALES_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITH_COMMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_STORE_SALES_RAGGED = MeasureMappingImpl.builder()
.withName(STORE_SALES)
.withColumn(STORE_SALES_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITH_COMMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_STORE_SALES_WITH_PROPERTY = MeasureMappingImpl.builder()
.withName(STORE_SALES)
.withColumn(STORE_SALES_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITH_COMMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.withCalculatedMemberProperty(List.of(
CalculatedMemberPropertyMappingImpl.builder().withName(MEMBER_ORDINAL).withValue("3").build()
))
@@ -2115,21 +2114,21 @@ public class FoodmartMappingSupplier implements CatalogMappingSupplier {
.withName(SALES_COUNT)
.withColumn(PRODUCT_ID_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITHOUT_COMMA)
- .withAggregatorType(MeasureAggregatorType.COUNT)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_SALES_COUNT_RAGGED = MeasureMappingImpl.builder()
.withName(SALES_COUNT)
.withColumn(PRODUCT_ID_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITHOUT_COMMA)
- .withAggregatorType(MeasureAggregatorType.COUNT)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_SALES_COUNT_WITH_PROPERTY = MeasureMappingImpl.builder()
.withName(SALES_COUNT)
.withColumn(PRODUCT_ID_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITHOUT_COMMA)
- .withAggregatorType(MeasureAggregatorType.COUNT)
+ .withAggregatorType("sum")
.withCalculatedMemberProperty(List.of(
CalculatedMemberPropertyMappingImpl.builder().withName(MEMBER_ORDINAL).withValue("1").build()
))
@@ -2139,21 +2138,21 @@ public class FoodmartMappingSupplier implements CatalogMappingSupplier {
.withName(CUSTOMER_COUNT)
.withColumn(CUSTOMER_ID_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITHOUT_COMMA)
- .withAggregatorType(MeasureAggregatorType.DICTINCT_COUNT)
+ .withAggregatorType("distinct-count")
.build();
public static final MeasureMappingImpl MEASURE_CUSTOMER_COUNT_RAGGED = MeasureMappingImpl.builder()
.withName(CUSTOMER_COUNT)
.withColumn(CUSTOMER_ID_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITHOUT_COMMA)
- .withAggregatorType(MeasureAggregatorType.DICTINCT_COUNT)
+ .withAggregatorType("distinct-count")
.build();
public static final MeasureMappingImpl MEASURE_CUSTOMER_COUNT_WITH_PROPERTY = MeasureMappingImpl.builder()
.withName(CUSTOMER_COUNT)
.withColumn(CUSTOMER_ID_COLUMN_IN_SALES_FACT_1997)
.withFormatString(FORMAT_STRING_WITHOUT_COMMA)
- .withAggregatorType(MeasureAggregatorType.DICTINCT_COUNT)
+ .withAggregatorType("distinct-count")
.withCalculatedMemberProperty(List.of(
CalculatedMemberPropertyMappingImpl.builder().withName(MEMBER_ORDINAL).withValue("7").build()
))
@@ -2163,51 +2162,51 @@ public class FoodmartMappingSupplier implements CatalogMappingSupplier {
public static final MeasureMappingImpl MEASURE_PROMOTION_SALES = MeasureMappingImpl.builder()
.withName("Promotion Sales")
.withFormatString(FORMAT_STRING_WITH_COMMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.withColumn(MEASURE_PROMOTION_SALES_COL)
.build();
public static final MeasureMappingImpl MEASURE_STORE_INVOICE = MeasureMappingImpl.builder()
.withName("Store Invoice")
.withColumn(STORE_INVOICE_COLUMN_IN_INVENTORY_FACKT_1997)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_SUPPLY_TIME = MeasureMappingImpl.builder()
.withName("Supply Time")
.withColumn(SUPPLY_TIME_COLUMN_IN_INVENTORY_FACKT_1997)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_WAREHOUSE_COST = MeasureMappingImpl.builder()
.withName("Warehouse Cost")
.withColumn(WAREHOUSE_COST_COLUMN_IN_INVENTORY_FACKT_1997)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_WAREHOUSE_SALES = MeasureMappingImpl.builder()
.withName("Warehouse Sales")
.withColumn(WAREHOUSE_SALES_COLUMN_IN_INVENTORY_FACKT_1997)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_UNITS_SHIPPED = MeasureMappingImpl.builder()
.withName("Units Shipped")
.withColumn(UNITS_SHIPPED_COLUMN_IN_INVENTORY_FACKT_1997)
.withFormatString("#.0")
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_UNITS_ORDERED = MeasureMappingImpl.builder()
.withName("Units Ordered")
.withColumn(UNITS_ORDERED_COLUMN_IN_INVENTORY_FACKT_1997)
.withFormatString("#.0")
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_WAREHOUSE_PROFIT = MeasureMappingImpl.builder()
.withName("Warehouse Profit")
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.withColumn(
MEASURE_WAREHOUSE_PROFIT_COL
)
@@ -2217,35 +2216,35 @@ public class FoodmartMappingSupplier implements CatalogMappingSupplier {
.withName(STORE_SQFT)
.withColumn(STORE_SQFT_COLUMN_IN_STORE)
.withFormatString(FORMAT_STRING_WITHOUT_COMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_GROCERY_SQFT = MeasureMappingImpl.builder()
.withName(GROCERY_SQFT)
.withColumn(GROCERY_SQFT_COLUMN_IN_STORE)
.withFormatString(FORMAT_STRING_WITHOUT_COMMA)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_ORG_SALARY = MeasureMappingImpl.builder()
.withName("Org Salary")
.withColumn(SALARY_PAID_COLUMN_IN_SALARY)
.withFormatString(CURRENCY)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_COUNT = MeasureMappingImpl.builder()
.withName("Count")
.withColumn(EMPLOYEE_ID_COLUMN_IN_SALARY)
.withFormatString("#,#")
- .withAggregatorType(MeasureAggregatorType.COUNT)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl MEASURE_NUMBER_OF_EMPLOYEES = MeasureMappingImpl.builder()
.withName("Number of Employees")
.withColumn(EMPLOYEE_ID_COLUMN_IN_SALARY)
.withFormatString("#,#")
- .withAggregatorType(MeasureAggregatorType.DICTINCT_COUNT)
+ .withAggregatorType("distinct-count")
.build();
public static final MeasureGroupMappingImpl MEASURE_GROUP_FOR_CUBE_SALES = MeasureGroupMappingImpl.builder()
diff --git a/instance/rec/complex/school/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/school/SchoolMappingSupplier.java b/instance/rec/complex/school/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/school/SchoolMappingSupplier.java
index 276fb5346..749239c9c 100644
--- a/instance/rec/complex/school/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/school/SchoolMappingSupplier.java
+++ b/instance/rec/complex/school/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/school/SchoolMappingSupplier.java
@@ -17,7 +17,6 @@
import org.eclipse.daanse.rolap.mapping.api.CatalogMappingSupplier;
import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
import org.eclipse.daanse.rolap.mapping.api.model.enums.ColumnDataType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.instance.api.Kind;
import org.eclipse.daanse.rolap.mapping.instance.api.MappingInstance;
import org.eclipse.daanse.rolap.mapping.instance.api.Source;
@@ -772,25 +771,25 @@ public class SchoolMappingSupplier implements CatalogMappingSupplier {
private static final MeasureMappingImpl measure1 = MeasureMappingImpl.builder()
.withName("Anzahl Schulen")
.withColumn(ANZAHL_SCHULEN_COLUMN_IN_FACT_SCHUELER)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
private static final MeasureMappingImpl measure2 = MeasureMappingImpl.builder()
.withName("Anzahl Klassen")
.withColumn(KLASSEN_WDH_COLUMN_IN_FACT_SCHUELER)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
private static final MeasureMappingImpl measure3 = MeasureMappingImpl.builder()
.withName("Anzahl Personen")
.withColumn(ANZAHL_PERSONEN_COLUMN_IN_FACT_PERSONAL)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
private static final MeasureMappingImpl measure4 = MeasureMappingImpl.builder()
.withName("Anzahl Schüler:innen")
.withColumn(ANZAHL_SCHUELER_COLUMN_IN_FACT_SCHUELER)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
private static final MeasureGroupMappingImpl CUBE1_MEASURE_GROUP = MeasureGroupMappingImpl.builder()
diff --git a/instance/rec/complex/steelwheels/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/steelwheels/SteelwheelsSupplier.java b/instance/rec/complex/steelwheels/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/steelwheels/SteelwheelsSupplier.java
index dc4e57813..e9909af6d 100644
--- a/instance/rec/complex/steelwheels/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/steelwheels/SteelwheelsSupplier.java
+++ b/instance/rec/complex/steelwheels/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/complex/steelwheels/SteelwheelsSupplier.java
@@ -20,7 +20,6 @@
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.HideMemberIfType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.LevelType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.instance.api.Kind;
import org.eclipse.daanse.rolap.mapping.instance.api.MappingInstance;
import org.eclipse.daanse.rolap.mapping.instance.api.Source;
@@ -340,14 +339,14 @@ public class SteelwheelsSupplier implements CatalogMappingSupplier {
.withName("Quantity")
.withColumn(QUANTITYORDERED_COLUMN_IN_ORDER_FACT)
.withFormatString("#,###")
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureMappingImpl salesMeasure = MeasureMappingImpl.builder()
.withName("Sales")
.withColumn(TOTALPRICE_COLUMN_IN_ORDER_FACT)
.withFormatString("#,###")
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
public static final MeasureGroupMappingImpl steelWheelsSalesMeasureGroup = MeasureGroupMappingImpl.builder()
diff --git a/instance/rec/tutorial/basic.cube.minimal/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/tutorial/basic/cube/minimal/TutorialMappingSupplierSupplier.java b/instance/rec/tutorial/basic.cube.minimal/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/tutorial/basic/cube/minimal/TutorialMappingSupplierSupplier.java
index 8cc2f00e4..f9f27838a 100644
--- a/instance/rec/tutorial/basic.cube.minimal/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/tutorial/basic/cube/minimal/TutorialMappingSupplierSupplier.java
+++ b/instance/rec/tutorial/basic.cube.minimal/src/main/java/org/eclipse/daanse/rolap/mapping/instance/rec/tutorial/basic/cube/minimal/TutorialMappingSupplierSupplier.java
@@ -17,7 +17,6 @@
import org.eclipse.daanse.rolap.mapping.api.CatalogMappingSupplier;
import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
import org.eclipse.daanse.rolap.mapping.api.model.enums.ColumnDataType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.instance.api.Kind;
import org.eclipse.daanse.rolap.mapping.instance.api.MappingInstance;
import org.eclipse.daanse.rolap.mapping.instance.api.Source;
@@ -48,7 +47,7 @@ public class TutorialMappingSupplierSupplier implements CatalogMappingSupplier {
private final static MeasureMappingImpl measure = MeasureMappingImpl.builder()
.withName("Measure-Sum")
.withColumn(VALUE_COLUMN)
- .withAggregatorType(MeasureAggregatorType.SUM)
+ .withAggregatorType("sum")
.build();
private final static MeasureGroupMappingImpl measureGroup = MeasureGroupMappingImpl.builder()
diff --git a/modifier.common/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/common/AbstractMappingModifier.java b/modifier.common/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/common/AbstractMappingModifier.java
index 772b722e8..6778a8ffa 100644
--- a/modifier.common/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/common/AbstractMappingModifier.java
+++ b/modifier.common/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/common/AbstractMappingModifier.java
@@ -98,7 +98,6 @@
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.HideMemberIfType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.LevelType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.RollupPolicyType;
import org.eclipse.daanse.rolap.mapping.pojo.CalculatedMemberMappingImpl;
import org.eclipse.daanse.rolap.mapping.pojo.MeasureGroupMappingImpl;
@@ -2484,7 +2483,7 @@ protected MeasureMapping measure(MeasureMapping measure) {
boolean visible = measureVisible(measure);
String name = measureName(measure);
String id = measureId(measure);
- MeasureAggregatorType aggregatorType = aggregatorType(measure);
+ String aggregatorType = aggregatorType(measure);
MeasureMapping m = createMeasure( calculatedMemberProperty, cellFormatter, backColor,
column, datatype, displayFolder, formatString, formatter, visible, name, id, aggregatorType);
measureMap.put(measure, m);
@@ -2499,10 +2498,10 @@ protected MeasureMapping measure(MeasureMapping measure) {
protected abstract MeasureMapping createMeasure(
List extends CalculatedMemberPropertyMapping> calculatedMemberProperty,
CellFormatterMapping cellFormatter, String backColor, ColumnMapping column, InternalDataType datatype, String displayFolder,
- String formatString, String formatter, boolean visible, String name, String id, MeasureAggregatorType type
+ String formatString, String formatter, boolean visible, String name, String id, String type
);
- protected MeasureAggregatorType aggregatorType(MeasureMapping measure) {
+ protected String aggregatorType(MeasureMapping measure) {
return measure.getAggregatorType();
}
diff --git a/modifier.emf/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/emf/EmfMappingModifier.java b/modifier.emf/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/emf/EmfMappingModifier.java
index f130108c4..2b9906cb7 100644
--- a/modifier.emf/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/emf/EmfMappingModifier.java
+++ b/modifier.emf/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/emf/EmfMappingModifier.java
@@ -85,7 +85,6 @@
import org.eclipse.daanse.rolap.mapping.api.model.enums.HideMemberIfType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.LevelType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.RollupPolicyType;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.AccessCatalogGrant;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.AccessCubeGrant;
@@ -135,7 +134,6 @@
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.LevelDefinition;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Link;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.Measure;
-import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureAggregator;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MeasureGroup;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberAccess;
import org.eclipse.daanse.rolap.mapping.emf.rolapmapping.MemberFormatter;
@@ -820,7 +818,7 @@ protected MeasureMapping createMeasure(
List extends CalculatedMemberPropertyMapping> calculatedMemberProperties,
CellFormatterMapping cellFormatter, String backColor, ColumnMapping column, InternalDataType datatype,
String displayFolder, String formatString, String formatter, boolean visible, String name, String id,
- MeasureAggregatorType type) {
+ String type) {
Measure measure = RolapMappingFactory.eINSTANCE.createMeasure();
measure.getCalculatedMemberProperties()
.addAll((Collection extends CalculatedMemberProperty>) calculatedMemberProperties);
@@ -834,7 +832,7 @@ protected MeasureMapping createMeasure(
measure.setVisible(visible);
measure.setName(name);
measure.setId(id);
- measure.setAggregator(toEmf(type));
+ measure.setAggregatorType(type);
return measure;
}
@@ -996,10 +994,6 @@ private CatalogAccess toEmf(AccessCatalog access) {
return null;
}
- private MeasureAggregator toEmf(MeasureAggregatorType type) {
- return null;
- }
-
private ColumnInternalDataType toEmf(InternalDataType datatype) {
return null;
}
diff --git a/modifier.pojo/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/pojo/PojoMappingModifier.java b/modifier.pojo/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/pojo/PojoMappingModifier.java
index 7e1225d90..e7fa4b6d2 100644
--- a/modifier.pojo/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/pojo/PojoMappingModifier.java
+++ b/modifier.pojo/src/main/java/org/eclipse/daanse/rolap/mapping/modifier/pojo/PojoMappingModifier.java
@@ -86,7 +86,6 @@
import org.eclipse.daanse.rolap.mapping.api.model.enums.HideMemberIfType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.LevelType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.RollupPolicyType;
import org.eclipse.daanse.rolap.mapping.modifier.common.AbstractMappingModifier;
import org.eclipse.daanse.rolap.mapping.pojo.AbstractTableMappingImpl;
@@ -672,7 +671,7 @@ protected MeasureGroupMapping createMeasureGroup(List extends MeasureMapping>
protected MeasureMapping createMeasure(
List extends CalculatedMemberPropertyMapping> calculatedMemberProperty,
CellFormatterMapping cellFormatter, String backColor, ColumnMapping column, InternalDataType datatype, String displayFolder,
- String formatString, String formatter, boolean visible, String name, String id, MeasureAggregatorType type
+ String formatString, String formatter, boolean visible, String name, String id, String type
) {
return MeasureMappingImpl.builder()
.withCalculatedMemberProperty((List) calculatedMemberProperty)
diff --git a/mondrian.jaxb/src/main/java/org/eclipse/daanse/rolap/mapping/mondrian/util/TransformTask.java b/mondrian.jaxb/src/main/java/org/eclipse/daanse/rolap/mapping/mondrian/util/TransformTask.java
index 792c4622e..b5a4896c7 100644
--- a/mondrian.jaxb/src/main/java/org/eclipse/daanse/rolap/mapping/mondrian/util/TransformTask.java
+++ b/mondrian.jaxb/src/main/java/org/eclipse/daanse/rolap/mapping/mondrian/util/TransformTask.java
@@ -33,7 +33,6 @@
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.HideMemberIfType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.LevelType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
import org.eclipse.daanse.rolap.mapping.api.model.enums.RollupPolicyType;
import org.eclipse.daanse.rolap.mapping.mondrian.model.AggColumnName;
import org.eclipse.daanse.rolap.mapping.mondrian.model.AggExclude;
@@ -722,7 +721,7 @@ private List transformLevels(List levels) {
private MeasureMappingImpl transformMeasure(Measure measure) {
MeasureMappingImpl m = MeasureMappingImpl.builder().build();
- m.setAggregatorType(MeasureAggregatorType.fromValue(measure.aggregator()));
+ m.setAggregatorType(measure.aggregator());
m.setId("m_" + counterMeasure.incrementAndGet());
m.setBackColor(measure.backColor());
m.setCellFormatter(transformCellFormatter(measure.cellFormatter()));
diff --git a/pojo/src/main/java/org/eclipse/daanse/rolap/mapping/pojo/MeasureMappingImpl.java b/pojo/src/main/java/org/eclipse/daanse/rolap/mapping/pojo/MeasureMappingImpl.java
index 108745cbd..2d423a24e 100644
--- a/pojo/src/main/java/org/eclipse/daanse/rolap/mapping/pojo/MeasureMappingImpl.java
+++ b/pojo/src/main/java/org/eclipse/daanse/rolap/mapping/pojo/MeasureMappingImpl.java
@@ -19,7 +19,6 @@
import org.eclipse.daanse.rolap.mapping.api.model.MeasureGroupMapping;
import org.eclipse.daanse.rolap.mapping.api.model.MeasureMapping;
import org.eclipse.daanse.rolap.mapping.api.model.enums.InternalDataType;
-import org.eclipse.daanse.rolap.mapping.api.model.enums.MeasureAggregatorType;
public class MeasureMappingImpl extends MemberMappingImpl implements MeasureMapping {
@@ -31,7 +30,7 @@ public class MeasureMappingImpl extends MemberMappingImpl implements MeasureMapp
private String formatter;
- private MeasureAggregatorType aggregatorType;
+ private String aggregatorType;
private MeasureGroupMapping measureGroup;
@@ -86,11 +85,11 @@ public void setFormatter(String formatter) {
this.formatter = formatter;
}
- public MeasureAggregatorType getAggregatorType() {
+ public String getAggregatorType() {
return aggregatorType;
}
- public void setAggregatorType(MeasureAggregatorType type) {
+ public void setAggregatorType(String type) {
this.aggregatorType = type;
}
@@ -119,7 +118,7 @@ public static final class Builder {
private boolean visible = true;
private String name;
private String id;
- private MeasureAggregatorType aggregatorType;
+ private String aggregatorType;
private List annotations = new ArrayList<>();
private String description;
private MeasureGroupMapping measureGroup;
@@ -183,7 +182,7 @@ public Builder withId(String id) {
return this;
}
- public Builder withAggregatorType(MeasureAggregatorType type) {
+ public Builder withAggregatorType(String type) {
this.aggregatorType = type;
return this;
}