migrate olap element to olap.element package

dbulahov · stbischof · commit 13d23bb1420f · 2025-11-21T15:16:13.000+01:00
Signed-off-by: dbulahov &lt;bulahovdenis@gmail.com&gt;
diff --git a/common/src/main/java/org/eclipse/daanse/olap/access/RoleImpl.java b/common/src/main/java/org/eclipse/daanse/olap/access/RoleImpl.java
@@ -56,7 +56,7 @@
 import org.eclipse.daanse.olap.api.element.NamedSet;
 import org.eclipse.daanse.olap.api.element.OlapElement;
 import org.eclipse.daanse.olap.api.element.VirtualCube;
-import org.eclipse.daanse.olap.common.OlapElementBase;
+import org.eclipse.daanse.olap.element.OlapElementBase;
 import org.eclipse.daanse.olap.common.SystemWideProperties;
 import org.eclipse.daanse.olap.common.Util;
 import org.eclipse.daanse.olap.api.element.Catalog;
diff --git a/common/src/main/java/org/eclipse/daanse/olap/common/StandardProperty.java b/common/src/main/java/org/eclipse/daanse/olap/common/StandardProperty.java
@@ -37,6 +37,7 @@
 import org.eclipse.daanse.olap.api.element.Property;
 import org.eclipse.daanse.olap.api.formatter.MemberPropertyFormatter;
 import org.eclipse.daanse.olap.api.query.component.Expression;
+import org.eclipse.daanse.olap.element.AbstractProperty;
 import org.eclipse.daanse.olap.query.component.FormulaImpl;
 
 public final class StandardProperty extends AbstractProperty {
diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/AbstractProperty.java b/common/src/main/java/org/eclipse/daanse/olap/element/AbstractProperty.java
@@ -10,7 +10,7 @@
 * Contributors:
 *   SmartCity Jena - initial
 */
-package org.eclipse.daanse.olap.common;
+package org.eclipse.daanse.olap.element;
 
 import org.eclipse.daanse.olap.api.element.Property;
 import org.eclipse.daanse.olap.api.formatter.MemberPropertyFormatter;
diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/CubeBase.java b/common/src/main/java/org/eclipse/daanse/olap/element/CubeBase.java
@@ -23,7 +23,7 @@
  *   SmartCity Jena - initial
  */
 
-package org.eclipse.daanse.olap.common;
+package org.eclipse.daanse.olap.element;
 
 import java.text.MessageFormat;
 import java.util.List;
@@ -36,6 +36,7 @@
 import org.eclipse.daanse.olap.api.element.Dimension;
 import org.eclipse.daanse.olap.api.element.Hierarchy;
 import org.eclipse.daanse.olap.api.element.OlapElement;
+import org.eclipse.daanse.olap.common.Util;
 /**
  * CubeBase is an abstract implementation of {@link Cube}.
  *
diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/DimensionBase.java b/common/src/main/java/org/eclipse/daanse/olap/element/DimensionBase.java
@@ -25,7 +25,7 @@
  */
 
 
-package org.eclipse.daanse.olap.common;
+package org.eclipse.daanse.olap.element;
 
 import java.text.MessageFormat;
 import java.util.List;
@@ -38,6 +38,7 @@
 import org.eclipse.daanse.olap.api.element.DimensionType;
 import org.eclipse.daanse.olap.api.element.Hierarchy;
 import org.eclipse.daanse.olap.api.element.OlapElement;
+import org.eclipse.daanse.olap.common.Util;
 /**
  * Abstract implementation for a {@link Dimension}.
  *
diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/HierarchyBase.java b/common/src/main/java/org/eclipse/daanse/olap/element/HierarchyBase.java
@@ -26,7 +26,7 @@
  */
 
 
-package org.eclipse.daanse.olap.common;
+package org.eclipse.daanse.olap.element;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -42,6 +42,7 @@
 import org.eclipse.daanse.olap.api.element.Level;
 import org.eclipse.daanse.olap.api.element.Member;
 import org.eclipse.daanse.olap.api.element.OlapElement;
+import org.eclipse.daanse.olap.common.Util;
 import org.eclipse.daanse.olap.query.component.IdImpl;
 /**
  * Skeleton implementation for {@link Hierarchy}.
diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/LevelBase.java b/common/src/main/java/org/eclipse/daanse/olap/element/LevelBase.java
@@ -41,7 +41,6 @@
 import org.eclipse.daanse.olap.api.element.Member;
 import org.eclipse.daanse.olap.api.element.OlapElement;
 import org.eclipse.daanse.olap.api.formatter.MemberFormatter;
-import org.eclipse.daanse.olap.common.OlapElementBase;
 import org.eclipse.daanse.olap.common.Util;
 /**
  * Skeleton implementation of {@link Level}.
diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/MemberBase.java b/common/src/main/java/org/eclipse/daanse/olap/element/MemberBase.java
@@ -24,7 +24,7 @@
  *   SmartCity Jena - initial
  */
 
-package org.eclipse.daanse.olap.common;
+package org.eclipse.daanse.olap.element;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -40,6 +40,7 @@
 import org.eclipse.daanse.olap.api.element.OlapElement;
 import org.eclipse.daanse.olap.api.formatter.MemberFormatter;
 import org.eclipse.daanse.olap.api.query.component.Expression;
+import org.eclipse.daanse.olap.common.StandardProperty;
 import org.eclipse.daanse.olap.fun.FunUtil;
 
 //import mondrian.util.Bug;
diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/OlapElementBase.java b/common/src/main/java/org/eclipse/daanse/olap/element/OlapElementBase.java
@@ -25,13 +25,14 @@
  */
 
 
-package org.eclipse.daanse.olap.common;
+package org.eclipse.daanse.olap.element;
 
 import java.util.Locale;
 import java.util.Optional;
 
 import org.eclipse.daanse.olap.api.element.MetaElement;
 import org.eclipse.daanse.olap.api.element.OlapElement;
+import org.eclipse.daanse.olap.common.Util;
 import org.slf4j.Logger;
 
 /**
diff --git a/common/src/main/java/org/eclipse/daanse/olap/element/SetBase.java b/common/src/main/java/org/eclipse/daanse/olap/element/SetBase.java
@@ -25,7 +25,7 @@
  *   SmartCity Jena - initial
  */
 
-package org.eclipse.daanse.olap.common;
+package org.eclipse.daanse.olap.element;
 
 import java.util.List;
 
diff --git a/common/src/main/java/org/eclipse/daanse/olap/fun/FunUtil.java b/common/src/main/java/org/eclipse/daanse/olap/fun/FunUtil.java
@@ -75,7 +75,7 @@
 import org.eclipse.daanse.olap.api.type.TupleType;
 import org.eclipse.daanse.olap.api.type.Type;
 import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList;
-import org.eclipse.daanse.olap.common.AbstractProperty;
+import org.eclipse.daanse.olap.element.AbstractProperty;
 import org.eclipse.daanse.olap.common.ResultStyleException;
 import org.eclipse.daanse.olap.common.Util;
 import org.eclipse.daanse.olap.function.def.hierarchy.member.HierarchyCurrentMemberFunDef;
diff --git a/common/src/main/java/org/eclipse/daanse/olap/impl/PropertyImpl.java b/common/src/main/java/org/eclipse/daanse/olap/impl/PropertyImpl.java
@@ -60,7 +60,7 @@ public class PropertyImpl implements IMondrianOlap4jProperty {
             : map.entrySet()
             )
         {
-            org.eclipse.daanse.olap.common.AbstractProperty o = e.getValue();
+            org.eclipse.daanse.olap.element.AbstractProperty o = e.getValue();
             if (o.isMemberProperty()
                 && !memberNames.contains(o.getName()))
             {
diff --git a/common/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java b/common/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java
@@ -60,7 +60,7 @@
 import org.eclipse.daanse.olap.api.type.NumericType;
 import org.eclipse.daanse.olap.api.type.Type;
 import org.eclipse.daanse.olap.common.AbstractQueryPart;
-import org.eclipse.daanse.olap.common.SetBase;
+import org.eclipse.daanse.olap.element.SetBase;
 import org.eclipse.daanse.olap.common.StandardProperty;
 import org.eclipse.daanse.olap.common.Util;
 import org.eclipse.daanse.olap.element.OlapMetaData;
diff --git a/format/src/main/java/org/eclipse/daanse/olap/format/DefaultRolapMemberFormatter.java b/format/src/main/java/org/eclipse/daanse/olap/format/DefaultRolapMemberFormatter.java
@@ -27,7 +27,7 @@
 
 import org.eclipse.daanse.olap.api.element.Member;
 import org.eclipse.daanse.olap.api.formatter.MemberFormatter;
-import org.eclipse.daanse.olap.common.MemberBase;
+import org.eclipse.daanse.olap.element.MemberBase;
 
 /**
  * Default implementation of SPI {@link MemberFormatter}.
diff --git a/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/DelegatingDiscoverService.java b/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/DelegatingDiscoverService.java
@@ -35,6 +35,8 @@
 import org.eclipse.daanse.xmla.api.discover.dbschema.tables.DbSchemaTablesResponseRow;
 import org.eclipse.daanse.xmla.api.discover.dbschema.tablesinfo.DbSchemaTablesInfoRequest;
 import org.eclipse.daanse.xmla.api.discover.dbschema.tablesinfo.DbSchemaTablesInfoResponseRow;
+import org.eclipse.daanse.xmla.api.discover.discover.csdlmetadata.DiscoverCsdlMetaDataRequest;
+import org.eclipse.daanse.xmla.api.discover.discover.csdlmetadata.DiscoverCsdlMetaDataResponseRow;
 import org.eclipse.daanse.xmla.api.discover.discover.datasources.DiscoverDataSourcesRequest;
 import org.eclipse.daanse.xmla.api.discover.discover.datasources.DiscoverDataSourcesResponseRow;
 import org.eclipse.daanse.xmla.api.discover.discover.enumerators.DiscoverEnumeratorsRequest;
@@ -268,4 +270,13 @@ public List<DiscoverXmlMetaDataResponseRow> xmlMetaData(DiscoverXmlMetaDataReque
         return otherSchemaService.xmlMetaData(request, metaData);
     }
 
+    @Override
+    public List<DiscoverCsdlMetaDataResponseRow> csdlMetaData(DiscoverCsdlMetaDataRequest request,
+            RequestMetaData metaData) {
+        //return otherSchemaService.csdlMetaData(request, metaData);
+        //TODO
+
+        return null;
+    }
+
 }
diff --git a/xmla/bridge/src/test/java/org/eclipse/daanse/olap/xmla/bridge/discover/MDSchemaDiscoverServiceTest.java b/xmla/bridge/src/test/java/org/eclipse/daanse/olap/xmla/bridge/discover/MDSchemaDiscoverServiceTest.java
@@ -726,10 +726,10 @@ void mdSchemaProperties() {
 
         MdSchemaPropertiesRequest request = mock(MdSchemaPropertiesRequest.class);
         MdSchemaPropertiesRestrictions restrictions = mock(MdSchemaPropertiesRestrictions.class);
-        org.eclipse.daanse.olap.common.AbstractProperty property1 = mock(
-                org.eclipse.daanse.olap.common.AbstractProperty.class);
-        org.eclipse.daanse.olap.common.AbstractProperty property2 = mock(
-                org.eclipse.daanse.olap.common.AbstractProperty.class);
+        org.eclipse.daanse.olap.element.AbstractProperty property1 = mock(
+                org.eclipse.daanse.olap.element.AbstractProperty.class);
+        org.eclipse.daanse.olap.element.AbstractProperty property2 = mock(
+                org.eclipse.daanse.olap.element.AbstractProperty.class);
 
         when(request.restrictions()).thenReturn(restrictions);
         when(restrictions.catalogName()).thenReturn(Optional.of("foo"));
