migrate olap.element implementation to rolap.element package

dbulahov · stbischof · commit fcc628103a1d · 2025-07-24T14:33:36.000+02:00
Signed-off-by: dbulahov &lt;bulahovdenis@gmail.com&gt;
diff --git a/mondrian/src/test/java/mondrian/olap/fun/CrossJoinTest.java b/mondrian/src/test/java/mondrian/olap/fun/CrossJoinTest.java
@@ -71,7 +71,7 @@
 import  org.eclipse.daanse.olap.server.ExecutionImpl;
 import  org.eclipse.daanse.olap.server.LocusImpl;
 import org.eclipse.daanse.rolap.common.RolapConnection;
-import org.eclipse.daanse.rolap.common.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCube;
 
 
 /**
diff --git a/mondrian/src/test/java/mondrian/olap/fun/UnionFunDefTest.java b/mondrian/src/test/java/mondrian/olap/fun/UnionFunDefTest.java
@@ -33,7 +33,7 @@
 import org.eclipse.daanse.olap.function.def.crossjoin.ImmutableListCalc;
 import org.eclipse.daanse.olap.function.def.union.UnionCalc;
 import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
-import org.eclipse.daanse.rolap.common.RolapMemberBase;
+import org.eclipse.daanse.rolap.element.RolapMemberBase;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.mockito.Mockito;
diff --git a/mondrian/src/test/java/mondrian/rolap/BatchTestCase.java b/mondrian/src/test/java/mondrian/rolap/BatchTestCase.java
@@ -52,10 +52,10 @@
 import org.eclipse.daanse.rolap.common.MemberCacheHelper;
 import org.eclipse.daanse.rolap.common.RolapCatalogReader;
 import org.eclipse.daanse.rolap.common.RolapConnection;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapHierarchy;
-import org.eclipse.daanse.rolap.common.RolapLevel;
-import org.eclipse.daanse.rolap.common.RolapMember;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapHierarchy;
+import org.eclipse.daanse.rolap.element.RolapLevel;
+import org.eclipse.daanse.rolap.element.RolapMember;
 import org.eclipse.daanse.rolap.common.RolapNativeRegistry;
 import org.eclipse.daanse.rolap.common.RolapStar;
 import org.eclipse.daanse.rolap.common.RolapUtil;
diff --git a/mondrian/src/test/java/mondrian/rolap/CancellationTest.java b/mondrian/src/test/java/mondrian/rolap/CancellationTest.java
@@ -22,7 +22,6 @@
 import org.eclipse.daanse.olap.api.CatalogReader;
 import org.eclipse.daanse.olap.api.exception.OlapRuntimeException;
 import org.eclipse.daanse.olap.api.function.FunctionMetaData;
-import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
 import org.eclipse.daanse.olap.api.result.Position;
 import org.eclipse.daanse.olap.api.result.Result;
 import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList;
@@ -39,7 +38,7 @@
 import mondrian.olap.fun.CrossJoinTest;
 import  org.eclipse.daanse.olap.server.ExecutionImpl;
 import  org.eclipse.daanse.olap.server.LocusImpl;
-import org.eclipse.daanse.rolap.common.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCube;
 import org.eclipse.daanse.rolap.common.RolapResult;
 
 import java.util.Optional;
diff --git a/mondrian/src/test/java/mondrian/rolap/FastBatchingCellReaderTest.java b/mondrian/src/test/java/mondrian/rolap/FastBatchingCellReaderTest.java
@@ -59,7 +59,7 @@
 import org.eclipse.daanse.rolap.aggregator.SumAggregator;
 import org.eclipse.daanse.rolap.common.BatchLoader;
 import org.eclipse.daanse.rolap.common.FastBatchingCellReader;
-import org.eclipse.daanse.rolap.common.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCube;
 import org.eclipse.daanse.rolap.common.agg.AggregationKey;
 import org.eclipse.daanse.rolap.common.agg.AggregationManager;
 import org.eclipse.daanse.rolap.common.agg.Segment;
diff --git a/mondrian/src/test/java/mondrian/rolap/MemberCacheControlTest.java b/mondrian/src/test/java/mondrian/rolap/MemberCacheControlTest.java
@@ -79,11 +79,11 @@
 import  org.eclipse.daanse.olap.server.LocusImpl;
 import org.eclipse.daanse.rolap.common.MemberCache;
 import org.eclipse.daanse.rolap.common.MemberReader;
-import org.eclipse.daanse.rolap.common.RolapBaseCubeMeasure;
+import org.eclipse.daanse.rolap.element.RolapBaseCubeMeasure;
 import org.eclipse.daanse.rolap.common.RolapConnection;
-import org.eclipse.daanse.rolap.common.RolapCubeMember;
-import org.eclipse.daanse.rolap.common.RolapHierarchy;
-import org.eclipse.daanse.rolap.common.RolapMember;
+import org.eclipse.daanse.rolap.element.RolapCubeMember;
+import org.eclipse.daanse.rolap.element.RolapHierarchy;
+import org.eclipse.daanse.rolap.element.RolapMember;
 import org.eclipse.daanse.rolap.common.RolapUtil;
 import org.eclipse.daanse.rolap.common.SmartMemberReader;
 import org.eclipse.daanse.rolap.common.agg.AggregationManager;
diff --git a/mondrian/src/test/java/mondrian/rolap/MemberCacheHelperTest.java b/mondrian/src/test/java/mondrian/rolap/MemberCacheHelperTest.java
@@ -21,8 +21,8 @@
 import org.eclipse.daanse.rolap.common.DefaultMemberChildrenConstraint;
 import org.eclipse.daanse.rolap.common.MemberCacheHelper;
 import org.eclipse.daanse.rolap.common.MemberKey;
-import org.eclipse.daanse.rolap.common.RolapLevel;
-import org.eclipse.daanse.rolap.common.RolapMember;
+import org.eclipse.daanse.rolap.element.RolapLevel;
+import org.eclipse.daanse.rolap.element.RolapMember;
 import org.eclipse.daanse.rolap.common.sql.MemberChildrenConstraint;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -207,4 +207,4 @@ public Object answer(InvocationOnMock invocation)
         }
         return names;
     }
-}
+}
diff --git a/mondrian/src/test/java/mondrian/rolap/NonEmptyTest.java b/mondrian/src/test/java/mondrian/rolap/NonEmptyTest.java
@@ -43,13 +43,13 @@
 import org.eclipse.daanse.rolap.api.RolapContext;
 import org.eclipse.daanse.rolap.common.MemberCacheHelper;
 import org.eclipse.daanse.rolap.common.RolapCatalogReader;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapCubeHierarchy;
-import org.eclipse.daanse.rolap.common.RolapCubeMember;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCubeHierarchy;
+import org.eclipse.daanse.rolap.element.RolapCubeMember;
 import org.eclipse.daanse.rolap.common.RolapEvaluator;
-import org.eclipse.daanse.rolap.common.RolapHierarchy;
-import org.eclipse.daanse.rolap.common.RolapLevel;
-import org.eclipse.daanse.rolap.common.RolapMember;
+import org.eclipse.daanse.rolap.element.RolapHierarchy;
+import org.eclipse.daanse.rolap.element.RolapLevel;
+import org.eclipse.daanse.rolap.element.RolapMember;
 import org.eclipse.daanse.rolap.common.RolapNativeRegistry;
 import org.eclipse.daanse.rolap.common.RolapResult;
 import org.eclipse.daanse.rolap.common.SmartMemberReader;
diff --git a/mondrian/src/test/java/mondrian/rolap/RestrictedMemberReaderTest.java b/mondrian/src/test/java/mondrian/rolap/RestrictedMemberReaderTest.java
@@ -27,9 +27,9 @@
 import org.eclipse.daanse.olap.api.element.Level;
 import org.eclipse.daanse.rolap.common.MemberReader;
 import org.eclipse.daanse.rolap.common.RestrictedMemberReader;
-import org.eclipse.daanse.rolap.common.RolapHierarchy;
-import org.eclipse.daanse.rolap.common.RolapMember;
-import org.eclipse.daanse.rolap.common.RestrictedMemberReader.MultiCardinalityDefaultMember;
+import org.eclipse.daanse.rolap.element.RolapHierarchy;
+import org.eclipse.daanse.rolap.element.RolapMember;
+import org.eclipse.daanse.rolap.element.MultiCardinalityDefaultMember;
 import org.eclipse.daanse.rolap.common.sql.MemberChildrenConstraint;
 import org.eclipse.daanse.olap.api.element.Catalog;
 import org.junit.jupiter.api.Test;
diff --git a/mondrian/src/test/java/mondrian/rolap/RolapCubeHierarchyTest.java b/mondrian/src/test/java/mondrian/rolap/RolapCubeHierarchyTest.java
@@ -25,13 +25,13 @@
 import org.eclipse.daanse.olap.api.Context;
 import org.eclipse.daanse.olap.api.element.Hierarchy;
 import org.eclipse.daanse.olap.api.element.Level;
-import org.eclipse.daanse.rolap.common.RolapCatalog;
+import org.eclipse.daanse.rolap.element.RolapCatalog;
 import org.eclipse.daanse.rolap.common.RolapConnection;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapCubeDimension;
-import org.eclipse.daanse.rolap.common.RolapCubeHierarchy;
-import org.eclipse.daanse.rolap.common.RolapHierarchy;
-import org.eclipse.daanse.rolap.common.RolapVirtualCube;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCubeDimension;
+import org.eclipse.daanse.rolap.element.RolapCubeHierarchy;
+import org.eclipse.daanse.rolap.element.RolapHierarchy;
+import org.eclipse.daanse.rolap.element.RolapVirtualCube;
 import org.eclipse.daanse.rolap.mapping.api.model.DimensionConnectorMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.QueryMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.TableQueryMapping;
diff --git a/mondrian/src/test/java/mondrian/rolap/RolapCubeTest.java b/mondrian/src/test/java/mondrian/rolap/RolapCubeTest.java
@@ -37,11 +37,10 @@
 import org.eclipse.daanse.olap.common.SystemWideProperties;
 import org.eclipse.daanse.olap.common.Util;
 import org.eclipse.daanse.olap.query.component.IdImpl;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapVirtualCube;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapVirtualCube;
 import org.eclipse.daanse.rolap.mapping.pojo.CalculatedMemberMappingImpl;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.opencube.junit5.ContextSource;
 import org.opencube.junit5.context.TestContext;
diff --git a/mondrian/src/test/java/mondrian/rolap/RolapDimensionTest.java b/mondrian/src/test/java/mondrian/rolap/RolapDimensionTest.java
@@ -15,17 +15,16 @@
 import java.util.List;
 
 import org.eclipse.daanse.olap.common.SystemWideProperties;
-import org.eclipse.daanse.rolap.common.RolapCatalog;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapDimension;
+import org.eclipse.daanse.rolap.element.RolapCatalog;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapDimension;
 import org.eclipse.daanse.rolap.mapping.api.model.RelationalQueryMapping;
 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.InternalDataType;
 import org.eclipse.daanse.rolap.mapping.pojo.DimensionConnectorMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.DimensionMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.ExplicitHierarchyMappingImpl;
-import org.eclipse.daanse.rolap.mapping.pojo.HierarchyMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.LevelMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.QueryMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.StandardDimensionMappingImpl;
diff --git a/mondrian/src/test/java/mondrian/rolap/RolapSchemaTest.java b/mondrian/src/test/java/mondrian/rolap/RolapSchemaTest.java
@@ -49,9 +49,9 @@
 import org.eclipse.daanse.rolap.common.CacheKey;
 import org.eclipse.daanse.rolap.common.CatalogContentKey;
 import org.eclipse.daanse.rolap.common.ConnectionKey;
-import org.eclipse.daanse.rolap.common.RolapCatalog;
+import org.eclipse.daanse.rolap.element.RolapCatalog;
 import org.eclipse.daanse.rolap.common.RolapConnection;
-import org.eclipse.daanse.rolap.common.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCube;
 import org.eclipse.daanse.rolap.common.RolapStar;
 import org.eclipse.daanse.rolap.common.RolapStarRegistry;
 import org.eclipse.daanse.rolap.common.RolapUtil;
diff --git a/mondrian/src/test/java/mondrian/rolap/RolapStarTest.java b/mondrian/src/test/java/mondrian/rolap/RolapStarTest.java
@@ -19,8 +19,8 @@
 
 import org.eclipse.daanse.olap.api.Connection;
 import org.eclipse.daanse.olap.api.Context;
-import org.eclipse.daanse.rolap.common.RolapCatalog;
-import org.eclipse.daanse.rolap.common.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCatalog;
+import org.eclipse.daanse.rolap.element.RolapCube;
 import org.eclipse.daanse.rolap.common.RolapStar;
 import org.eclipse.daanse.rolap.common.RolapStar.Column;
 import org.eclipse.daanse.rolap.common.util.RelationUtil;
diff --git a/mondrian/src/test/java/mondrian/rolap/SqlConstraintUtilsTest.java b/mondrian/src/test/java/mondrian/rolap/SqlConstraintUtilsTest.java
@@ -87,8 +87,9 @@
 import mondrian.olap.fun.TestMember;
 
 import  org.eclipse.daanse.olap.server.ExecutionImpl;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapCubeLevel;
+import org.eclipse.daanse.rolap.element.CompoundSlicerRolapMember;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCubeLevel;
 import org.eclipse.daanse.rolap.common.RolapEvaluator;
 import org.eclipse.daanse.rolap.common.RolapEvaluatorRoot;
 import org.eclipse.daanse.rolap.common.RolapResult;
@@ -449,8 +450,8 @@ void testReplaceCompoundSlicerPlaceholder(Context<?> context) {
         final Member expectedMember = slicerMember;
         setSlicerContext(rolapEvaluator, expectedMember);
 
-        RolapResult.CompoundSlicerRolapMember placeHolderMember =
-            Mockito.mock(RolapResult.CompoundSlicerRolapMember.class);
+        CompoundSlicerRolapMember placeHolderMember =
+            Mockito.mock(CompoundSlicerRolapMember.class);
         Mockito.doReturn(slicerHierarchy)
         .when(placeHolderMember).getHierarchy();
         // tested call
@@ -671,8 +672,8 @@ void testExpandSupportedCalculatedMembers2(Context<?> context) {
       final Member expectedMember = slicerMember;
       setSlicerContext(rolapEvaluator, expectedMember);
 
-      RolapResult.CompoundSlicerRolapMember placeHolderMember =
-          Mockito.mock(RolapResult.CompoundSlicerRolapMember.class);
+      CompoundSlicerRolapMember placeHolderMember =
+          Mockito.mock(CompoundSlicerRolapMember.class);
       Mockito.doReturn(slicerHierarchy)
       .when(placeHolderMember).getHierarchy();
 
diff --git a/mondrian/src/test/java/mondrian/rolap/TestAggregationManager.java b/mondrian/src/test/java/mondrian/rolap/TestAggregationManager.java
@@ -48,7 +48,6 @@
 import org.eclipse.daanse.olap.api.ConfigConstants;
 import org.eclipse.daanse.olap.api.Connection;
 import org.eclipse.daanse.olap.api.Context;
-import org.eclipse.daanse.olap.api.IAggregationManager;
 import org.eclipse.daanse.olap.api.Locus;
 import org.eclipse.daanse.olap.api.Statement;
 import org.eclipse.daanse.olap.api.element.Cube;
@@ -59,7 +58,7 @@
 import org.eclipse.daanse.olap.core.AbstractBasicContext;
 import org.eclipse.daanse.rolap.api.RolapContext;
 import org.eclipse.daanse.rolap.common.FastBatchingCellReader;
-import org.eclipse.daanse.rolap.common.RolapCatalog;
+import org.eclipse.daanse.rolap.element.RolapCatalog;
 import org.eclipse.daanse.rolap.common.RolapStar;
 import org.eclipse.daanse.rolap.common.agg.AggregationManager;
 import org.eclipse.daanse.rolap.common.agg.CellRequest;
@@ -78,7 +77,6 @@
 import org.eclipse.daanse.rolap.mapping.pojo.PhysicalColumnMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.DimensionConnectorMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.ExplicitHierarchyMappingImpl;
-import org.eclipse.daanse.rolap.mapping.pojo.HierarchyMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.JoinQueryMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.JoinedQueryElementMappingImpl;
 import org.eclipse.daanse.rolap.mapping.pojo.LevelMappingImpl;
diff --git a/mondrian/src/test/java/mondrian/rolap/TestPublicMemberKey.java b/mondrian/src/test/java/mondrian/rolap/TestPublicMemberKey.java
@@ -20,7 +20,7 @@
 package mondrian.rolap;
 
 import org.eclipse.daanse.rolap.common.MemberKey;
-import org.eclipse.daanse.rolap.common.RolapMember;
+import org.eclipse.daanse.rolap.element.RolapMember;
 
 public class TestPublicMemberKey extends MemberKey{
 
diff --git a/mondrian/src/test/java/mondrian/rolap/agg/AggregationOnDistinctCountMeasuresTest.java b/mondrian/src/test/java/mondrian/rolap/agg/AggregationOnDistinctCountMeasuresTest.java
@@ -49,7 +49,7 @@
 import org.eclipse.daanse.olap.function.def.aggregate.AggregateCalc;
 import org.eclipse.daanse.olap.function.def.crossjoin.CrossJoinFunDef;
 import org.eclipse.daanse.olap.query.component.IdImpl;
-import org.eclipse.daanse.rolap.common.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCube;
 import org.eclipse.daanse.rolap.mapping.api.model.AccessRoleMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.CubeMapping;
diff --git a/mondrian/src/test/java/mondrian/rolap/agg/GroupingSetsListTest.java b/mondrian/src/test/java/mondrian/rolap/agg/GroupingSetsListTest.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 import org.eclipse.daanse.olap.key.BitKey;
-import org.eclipse.daanse.rolap.common.RolapCatalog;
+import org.eclipse.daanse.rolap.element.RolapCatalog;
 import org.eclipse.daanse.rolap.common.RolapStar;
 import org.eclipse.daanse.rolap.common.StarColumnPredicate;
 import org.eclipse.daanse.rolap.common.StarPredicate;
diff --git a/mondrian/src/test/java/mondrian/test/AccessControlTest.java b/mondrian/src/test/java/mondrian/test/AccessControlTest.java
@@ -68,7 +68,7 @@
 import org.eclipse.daanse.olap.query.component.IdImpl;
 import org.eclipse.daanse.rolap.api.RolapContext;
 import org.eclipse.daanse.rolap.common.RolapConnectionPropsR;
-import org.eclipse.daanse.rolap.common.RolapHierarchy.LimitedRollupMember;
+import org.eclipse.daanse.rolap.element.RolapHierarchy.LimitedRollupMember;
 import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.enums.RollupPolicyType;
 import org.eclipse.daanse.rolap.mapping.instance.rec.complex.foodmart.FoodmartMappingSupplier;
diff --git a/mondrian/src/test/java/mondrian/test/BasicQueryTest.java b/mondrian/src/test/java/mondrian/test/BasicQueryTest.java
@@ -85,7 +85,7 @@
 import org.eclipse.daanse.olap.spi.StatisticsProvider;
 import  org.eclipse.daanse.olap.util.Bug;
 import org.eclipse.daanse.rolap.api.RolapContext;
-import org.eclipse.daanse.rolap.common.RolapCatalog;
+import org.eclipse.daanse.rolap.element.RolapCatalog;
 import org.eclipse.daanse.rolap.common.RolapConnection;
 import org.eclipse.daanse.rolap.common.RolapUtil;
 import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
diff --git a/mondrian/src/test/java/mondrian/test/DialectTest.java b/mondrian/src/test/java/mondrian/test/DialectTest.java
@@ -41,7 +41,7 @@
 import org.eclipse.daanse.olap.api.Context;
 import org.eclipse.daanse.olap.api.result.Result;
 import org.eclipse.daanse.olap.common.Util;
-import org.eclipse.daanse.rolap.common.RolapMember;
+import org.eclipse.daanse.rolap.element.RolapMember;
 import org.eclipse.daanse.rolap.common.sql.SqlQuery;
 import org.eclipse.daanse.rolap.util.DelegatingInvocationHandler;
 import org.junit.jupiter.api.AfterEach;
diff --git a/mondrian/src/test/java/mondrian/test/DrillThroughTest.java b/mondrian/src/test/java/mondrian/test/DrillThroughTest.java
@@ -67,10 +67,8 @@
 import org.eclipse.daanse.olap.api.result.Result;
 import org.eclipse.daanse.olap.common.SystemWideProperties;
 import org.eclipse.daanse.olap.query.component.IdImpl;
-import org.eclipse.daanse.rolap.common.RolapCatalogCache;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapLevel;
-import org.eclipse.daanse.rolap.common.RolapSqlExpression;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapLevel;
 import org.eclipse.daanse.rolap.common.RolapStar;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Disabled;
diff --git a/mondrian/src/test/java/mondrian/test/NativeSetEvaluationTest.java b/mondrian/src/test/java/mondrian/test/NativeSetEvaluationTest.java
@@ -32,7 +32,7 @@
 import org.eclipse.daanse.olap.common.NativeEvaluationUnsupportedException;
 import org.eclipse.daanse.olap.common.SystemWideProperties;
 import org.eclipse.daanse.rolap.common.RolapConnection;
-import org.eclipse.daanse.rolap.common.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCube;
 import org.eclipse.daanse.rolap.mapping.api.model.AccessRoleMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.CubeMapping;
diff --git a/mondrian/src/test/java/org/opencube/junit5/TestUtil.java b/mondrian/src/test/java/org/opencube/junit5/TestUtil.java
@@ -82,15 +82,14 @@
 import org.eclipse.daanse.olap.query.component.IdImpl;
 import org.eclipse.daanse.rolap.api.RolapContext;
 import org.eclipse.daanse.rolap.common.MemberCacheHelper;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapHierarchy;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapHierarchy;
 import org.eclipse.daanse.rolap.common.RolapUtil;
 import org.eclipse.daanse.rolap.common.SmartMemberReader;
 import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
 import org.eclipse.daanse.rolap.util.DelegatingInvocationHandler;
 import org.opencube.junit5.context.TestContextImpl;
 import org.opencube.junit5.context.TestContext;
-import org.opencube.junit5.context.TestContextImpl;
 
 import mondrian.enums.DatabaseProduct;
 
diff --git a/olap/documentation/common/src/main/java/org/eclipse/daanse/olap/documentation/common/MarkdownDocumentationProvider.java b/olap/documentation/common/src/main/java/org/eclipse/daanse/olap/documentation/common/MarkdownDocumentationProvider.java
@@ -62,12 +62,10 @@
 import org.eclipse.daanse.rolap.api.RolapContext;
 import org.eclipse.daanse.rolap.common.RolapColumn;
 import org.eclipse.daanse.rolap.common.RolapConnection;
-import org.eclipse.daanse.rolap.common.RolapCube;
-import org.eclipse.daanse.rolap.common.RolapCubeDimension;
-import org.eclipse.daanse.rolap.common.RolapHierarchy;
-import org.eclipse.daanse.rolap.common.RolapLevel;
-import org.eclipse.daanse.rolap.common.RolapSqlExpression;
-import org.eclipse.daanse.rolap.common.RolapSqlStatement;
+import org.eclipse.daanse.rolap.element.RolapCube;
+import org.eclipse.daanse.rolap.element.RolapCubeDimension;
+import org.eclipse.daanse.rolap.element.RolapHierarchy;
+import org.eclipse.daanse.rolap.element.RolapLevel;
 import org.eclipse.daanse.rolap.mapping.api.model.AggregationExcludeMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.AggregationForeignKeyMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.AggregationMeasureFactCountMapping;
