refactore move last parts of mdx

stbischof · stbischof · commit 9e07502f8bd6 · 2025-05-17T15:19:18.000+02:00
Signed-off-by: Stefan Bischof &lt;stbischof@bipolis.org&gt;
diff --git a/mondrian/src/main/java/mondrian/mdx/QueryPrintWriter.java b/mondrian/src/main/java/mondrian/mdx/QueryPrintWriter.java
diff --git a/mondrian/src/main/java/mondrian/mdx/package.html b/mondrian/src/main/java/mondrian/mdx/package.html
diff --git a/mondrian/src/main/java/mondrian/olap/IdentifierVisitor.java b/mondrian/src/main/java/mondrian/olap/IdentifierVisitor.java
@@ -12,8 +12,7 @@
 import java.util.Set;
 
 import org.eclipse.daanse.olap.api.query.component.Id;
-
-import mondrian.mdx.MdxVisitorImpl;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 
 public class IdentifierVisitor extends MdxVisitorImpl {
     private final Set<Id> identifiers;
diff --git a/mondrian/src/main/java/mondrian/olap/Util.java b/mondrian/src/main/java/mondrian/olap/Util.java
@@ -123,12 +123,12 @@
 import org.eclipse.daanse.olap.query.component.LevelExpressionImpl;
 import org.eclipse.daanse.olap.query.component.MemberExpressionImpl;
 import org.eclipse.daanse.olap.query.component.NamedSetExpressionImpl;
+import org.eclipse.daanse.olap.query.component.QueryPrintWriter;
 import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
 import org.eclipse.daanse.olap.query.component.UnresolvedFunCallImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import mondrian.mdx.QueryPrintWriter;
 import mondrian.olap.exceptions.MdxCantFindMemberException;
 import mondrian.olap.exceptions.MdxChildObjectNotFoundException;
 import mondrian.olap.exceptions.MemberNotFoundException;
diff --git a/mondrian/src/main/java/mondrian/olap/fun/MemberExtractingVisitor.java b/mondrian/src/main/java/mondrian/olap/fun/MemberExtractingVisitor.java
@@ -25,8 +25,7 @@
 import org.eclipse.daanse.olap.api.query.component.ParameterExpression;
 import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
 import org.eclipse.daanse.olap.api.type.Type;
-
-import mondrian.mdx.MdxVisitorImpl;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 
 /**
  * Visitor which collects any non-measure base members encountered while
diff --git a/mondrian/src/main/java/mondrian/olap/fun/ResolvedFunCallFinder.java b/mondrian/src/main/java/mondrian/olap/fun/ResolvedFunCallFinder.java
@@ -15,8 +15,7 @@
 import org.eclipse.daanse.olap.api.query.component.Expression;
 import org.eclipse.daanse.olap.api.query.component.MemberExpression;
 import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
-
-import mondrian.mdx.MdxVisitorImpl;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 
 /**
  * Visitor class used to locate a resolved function call within an
diff --git a/mondrian/src/main/java/mondrian/rolap/MeasureFinder.java b/mondrian/src/main/java/mondrian/rolap/MeasureFinder.java
@@ -21,10 +21,10 @@
 import org.eclipse.daanse.olap.api.query.component.Formula;
 import org.eclipse.daanse.olap.api.query.component.MemberExpression;
 import org.eclipse.daanse.olap.element.OlapMetaData;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 import org.eclipse.daanse.rolap.mapping.api.model.CalculatedMemberMapping;
 import org.eclipse.daanse.rolap.mapping.api.model.NamedSetMapping;
 
-import mondrian.mdx.MdxVisitorImpl;
 import mondrian.olap.Util;
 
 /**
diff --git a/mondrian/src/main/java/mondrian/rolap/RolapCell.java b/mondrian/src/main/java/mondrian/rolap/RolapCell.java
@@ -56,10 +56,10 @@
 import org.eclipse.daanse.olap.function.def.aggregate.AggregateFunDef;
 import org.eclipse.daanse.olap.function.def.set.SetFunDef;
 import org.eclipse.daanse.olap.impl.ScenarioImpl;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
 import org.slf4j.Logger;
 
-import mondrian.mdx.MdxVisitorImpl;
 import mondrian.olap.ExecuteDurationUtil;
 import mondrian.olap.StandardProperty;
 import mondrian.olap.SystemWideProperties;
diff --git a/mondrian/src/main/java/mondrian/rolap/RolapNativeFilter.java b/mondrian/src/main/java/mondrian/rolap/RolapNativeFilter.java
@@ -26,8 +26,8 @@
 import org.eclipse.daanse.olap.api.function.FunctionDefinition;
 import org.eclipse.daanse.olap.api.query.component.Expression;
 import org.eclipse.daanse.olap.api.query.component.MemberExpression;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 
-import mondrian.mdx.MdxVisitorImpl;
 import mondrian.olap.Util;
 import mondrian.rolap.TupleReader.MemberBuilder;
 import mondrian.rolap.aggmatcher.AggStar;
diff --git a/mondrian/src/main/java/mondrian/rolap/RolapResult.java b/mondrian/src/main/java/mondrian/rolap/RolapResult.java
@@ -77,13 +77,13 @@
 import org.eclipse.daanse.olap.function.def.aggregate.AbstractAggregateFunDef;
 import org.eclipse.daanse.olap.function.def.aggregate.AggregateCalc;
 import org.eclipse.daanse.olap.function.def.visualtotals.VisualTotalMember;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
 import org.eclipse.daanse.olap.util.type.TypeWrapperExp;
 import org.eclipse.daanse.rolap.aggregator.DistinctCountAggregator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import mondrian.mdx.MdxVisitorImpl;
 import mondrian.olap.ExpCacheDescriptorImpl;
 import mondrian.olap.MemberBase;
 import mondrian.olap.ResourceLimitExceededException;
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MeasureVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/crossjoin/MeasureVisitor.java
@@ -23,8 +23,8 @@
 import org.eclipse.daanse.olap.api.query.component.ParameterExpression;
 import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
 import org.eclipse.daanse.olap.api.type.Type;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 
-import mondrian.mdx.MdxVisitorImpl;
 import mondrian.olap.fun.ResolvedFunCallFinder;
 
 /**
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/AddFormulasVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/AddFormulasVisitor.java
@@ -27,10 +27,9 @@
 import org.eclipse.daanse.olap.api.query.component.Query;
 import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
 import org.eclipse.daanse.olap.query.component.FormulaImpl;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 import org.eclipse.daanse.olap.query.component.UnresolvedFunCallImpl;
 
-import mondrian.mdx.MdxVisitorImpl;
-
 public class AddFormulasVisitor extends MdxVisitorImpl {
     private final Query query;
     private final Collection<Level> levels;
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/FindLevelsVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/FindLevelsVisitor.java
@@ -24,8 +24,7 @@
 import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
 import org.eclipse.daanse.olap.function.def.set.level.LevelMembersFunDef;
 import org.eclipse.daanse.olap.query.component.LevelExpressionImpl;
-
-import mondrian.mdx.MdxVisitorImpl;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 
 public class FindLevelsVisitor  extends MdxVisitorImpl {
     private final SubstitutionMap substitutionMap;
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformFromFormulasVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformFromFormulasVisitor.java
@@ -18,8 +18,7 @@
 import org.eclipse.daanse.olap.api.query.component.NamedSetExpression;
 import org.eclipse.daanse.olap.api.query.component.Query;
 import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
-
-import mondrian.mdx.MdxVisitorImpl;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 
 public class TransformFromFormulasVisitor  extends MdxVisitorImpl {
     private final Query query;
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformToFormulasVisitor.java b/mondrian/src/main/java/org/eclipse/daanse/olap/function/def/nativizeset/TransformToFormulasVisitor.java
@@ -28,9 +28,9 @@
 import org.eclipse.daanse.olap.api.query.component.ResolvedFunCall;
 import org.eclipse.daanse.olap.function.def.set.SetFunDef;
 import org.eclipse.daanse.olap.function.def.set.level.LevelMembersFunDef;
+import org.eclipse.daanse.olap.query.component.MdxVisitorImpl;
 import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
 
-import mondrian.mdx.MdxVisitorImpl;
 import mondrian.olap.Util;
 
 public class TransformToFormulasVisitor extends MdxVisitorImpl {
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/FormulaImpl.java
@@ -45,7 +45,6 @@
 import org.eclipse.daanse.olap.element.OlapMetaData;
 import org.eclipse.daanse.olap.util.type.TypeUtil;
 
-import mondrian.mdx.MdxVisitorImpl;
 import mondrian.olap.AbstractQueryPart;
 import mondrian.olap.SetBase;
 import mondrian.olap.StandardProperty;
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/MdxVisitorImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/MdxVisitorImpl.java
@@ -1,13 +1,27 @@
 /*
-* This software is subject to the terms of the Eclipse Public License v1.0
-* Agreement, available at the following URL:
-* http://www.eclipse.org/legal/epl-v10.html.
-* You must accept the terms of that agreement to use this software.
-*
-* Copyright (c) 2002-2017 Hitachi Vantara..  All rights reserved.
-*/
-
-package mondrian.mdx;
+ * This software is subject to the terms of the Eclipse Public License v1.0
+ * Agreement, available at the following URL:
+ * http://www.eclipse.org/legal/epl-v10.html.
+ * You must accept the terms of that agreement to use this software.
+ *
+ * Copyright (c) 2002-2017 Hitachi Vantara..  All rights reserved.
+ *
+ * ---- All changes after Fork in 2023 ------------------------
+ *
+ * Project: Eclipse daanse
+ *
+ * Copyright (c) 2023 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 after Fork in 2023:
+ *   SmartCity Jena - initial
+ */
+package org.eclipse.daanse.olap.query.component;
 
 import org.eclipse.daanse.olap.api.query.component.DimensionExpression;
 import org.eclipse.daanse.olap.api.query.component.Expression;
@@ -26,19 +40,22 @@
 import org.eclipse.daanse.olap.api.query.component.visit.QueryComponentVisitor;
 
 /**
- * Default implementation of the visitor interface, {@link QueryComponentVisitor}.
+ * Default implementation of the visitor interface,
+ * {@link QueryComponentVisitor}.
  *
- * <p>The method implementations just ask the child nodes to
+ * <p>
+ * The method implementations just ask the child nodes to
  * {@link Expression#accept(QueryComponentVisitor)} this visitor.
  *
  * @author jhyde
  * @since Jul 21, 2006
  */
 public class MdxVisitorImpl implements QueryComponentVisitor {
+
     private boolean shouldVisitChildren = true;
 
     @Override
-	public boolean visitChildren() {
+    public boolean visitChildren() {
         boolean returnValue = shouldVisitChildren;
         turnOnVisitChildren();
         return returnValue;
@@ -53,73 +70,67 @@ public void turnOffVisitChildren() {
     }
 
     @Override
-	public Object visitQuery(Query query) {
+    public Object visitQuery(Query query) {
         return null;
     }
 
     @Override
-	public Object visitQueryAxis(QueryAxis queryAxis) {
+    public Object visitQueryAxis(QueryAxis queryAxis) {
         return null;
     }
 
     @Override
-	public Object visitFormula(Formula formula) {
+    public Object visitFormula(Formula formula) {
         return null;
     }
 
     @Override
-	public Object visitUnresolvedFunCall(UnresolvedFunCall call) {
+    public Object visitUnresolvedFunCall(UnresolvedFunCall call) {
         return null;
     }
 
     @Override
-	public Object visitResolvedFunCall(ResolvedFunCall call) {
+    public Object visitResolvedFunCall(ResolvedFunCall call) {
         return null;
     }
 
     @Override
-	public Object visitId(Id id) {
+    public Object visitId(Id id) {
         return null;
     }
 
     @Override
-	public Object visitParameterExpression(ParameterExpression parameterExpr) {
+    public Object visitParameterExpression(ParameterExpression parameterExpr) {
         return null;
     }
 
     @Override
-	public Object visitDimensionExpression(DimensionExpression dimensionExpr) {
-        // do nothing
+    public Object visitDimensionExpression(DimensionExpression dimensionExpr) {
         return null;
     }
 
     @Override
-	public Object visitHierarchyExpression(HierarchyExpression hierarchyExpr) {
-        // do nothing
+    public Object visitHierarchyExpression(HierarchyExpression hierarchyExpr) {
         return null;
     }
 
     @Override
-	public Object visitLevelExpression(LevelExpression levelExpr) {
-        // do nothing
+    public Object visitLevelExpression(LevelExpression levelExpr) {
         return null;
     }
 
     @Override
-	public Object visitMemberExpression(MemberExpression memberExpr) {
-        // do nothing
+    public Object visitMemberExpression(MemberExpression memberExpr) {
         return null;
     }
 
     @Override
-	public Object visitNamedSetExpression(NamedSetExpression namedSetExpr) {
-        // do nothing
+    public Object visitNamedSetExpression(NamedSetExpression namedSetExpr) {
         return null;
     }
 
     @Override
-	public Object visitLiteral(Literal<?> literal) {
-        // do nothing
+    public Object visitLiteral(Literal<?> literal) {
         return null;
     }
 
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/ParameterExpressionImpl.java
@@ -27,7 +27,6 @@
 import org.eclipse.daanse.olap.query.component.expression.AbstractExpression;
 import org.eclipse.daanse.olap.util.type.TypeUtil;
 
-import mondrian.mdx.QueryPrintWriter;
 import mondrian.olap.Util;
 
 /**
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryImpl.java
@@ -93,7 +93,6 @@
 import org.eclipse.daanse.olap.impl.IdentifierParser;
 import org.eclipse.daanse.olap.util.type.TypeUtil;
 
-import mondrian.mdx.MdxVisitorImpl;
 import mondrian.olap.AbstractQueryPart;
 import mondrian.olap.DelegatingCatalogReader;
 import mondrian.olap.ExecuteDurationUtil;
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryPrintWriter.java b/mondrian/src/main/java/org/eclipse/daanse/olap/query/component/QueryPrintWriter.java
diff --git a/olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/OlapExecuteService.java b/olap/xmla/bridge/src/main/java/org/eclipse/daanse/olap/xmla/bridge/execute/OlapExecuteService.java
