migrate olap element to olap.element package #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

stbischof merged 1 commit into eclipse-daanse:main from dbulahov:main211125_1

Nov 21, 2025

common/src/main/java/org/eclipse/daanse/olap/access/RoleImpl.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down @@

common/src/main/java/org/eclipse/daanse/olap/common/StandardProperty.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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 {
@@ Expand Down @@

.../daanse/olap/common/AbstractProperty.java → ...daanse/olap/element/AbstractProperty.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down @@

.../eclipse/daanse/olap/common/CubeBase.java → ...eclipse/daanse/olap/element/CubeBase.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand All / @@ -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}.
      *
@@ Expand Down @@

...pse/daanse/olap/common/DimensionBase.java → ...se/daanse/olap/element/DimensionBase.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ @@
      */
-    package org.eclipse.daanse.olap.common;
+    package org.eclipse.daanse.olap.element;
     import java.text.MessageFormat;
     import java.util.List;
@@ Expand All / @@ -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}.
      *
@@ Expand Down @@

...pse/daanse/olap/common/HierarchyBase.java → ...se/daanse/olap/element/HierarchyBase.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ @@
      */
-    package org.eclipse.daanse.olap.common;
+    package org.eclipse.daanse.olap.element;
     import java.text.MessageFormat;
     import java.util.ArrayList;
@@ Expand All / @@ -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}.
@@ Expand Down @@

common/src/main/java/org/eclipse/daanse/olap/element/LevelBase.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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}.
@@ Expand Down @@

...clipse/daanse/olap/common/MemberBase.java → ...lipse/daanse/olap/element/MemberBase.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand All / @@ -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;
@@ Expand Down @@

...e/daanse/olap/common/OlapElementBase.java → .../daanse/olap/element/OlapElementBase.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
     /**
@@ Expand Down @@

...g/eclipse/daanse/olap/common/SetBase.java → .../eclipse/daanse/olap/element/SetBase.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ @@
      *   SmartCity Jena - initial
      */
-    package org.eclipse.daanse.olap.common;
+    package org.eclipse.daanse.olap.element;
     import java.util.List;
@@ Expand Down @@

common/src/main/java/org/eclipse/daanse/olap/fun/FunUtil.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down @@

common/src/main/java/org/eclipse/daanse/olap/impl/PropertyImpl.java

-Original file line number
+Diff line change
@@ Expand Up @@
                 : 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()))
                 {
@@ Expand Down @@

common/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down @@

format/src/main/java/org/eclipse/daanse/olap/format/DefaultRolapMemberFormatter.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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}.
@@ Expand Down @@

...src/main/java/org/eclipse/daanse/olap/xmla/bridge/discover/DelegatingDiscoverService.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -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;
@@ Expand Down Expand Up @@
             return otherSchemaService.xmlMetaData(request, metaData);
         }
+        @Override
+        public List<DiscoverCsdlMetaDataResponseRow> csdlMetaData(DiscoverCsdlMetaDataRequest request,
+                RequestMetaData metaData) {
+            //return otherSchemaService.csdlMetaData(request, metaData);
+            //TODO
+            return null;
+        }
     }

...c/test/java/org/eclipse/daanse/olap/xmla/bridge/discover/MDSchemaDiscoverServiceTest.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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"));

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

migrate olap element to olap.element package #47

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!