use api not impl

stbischof · stbischof · commit b80d5cc53107 · 2025-05-18T18:27:29.000+02:00
Signed-off-by: Stefan Bischof &lt;stbischof@bipolis.org&gt;
diff --git a/mondrian/src/main/java/mondrian/olap/ConnectionBase.java b/mondrian/src/main/java/mondrian/olap/ConnectionBase.java
@@ -1,13 +1,26 @@
 /*
-// 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) 2001-2005 Julian Hyde
-// Copyright (C) 2005-2017 Hitachi Vantara and others
-// All Rights Reserved.
-*/
+ * 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 mondrian.olap;
 
@@ -25,13 +38,12 @@
 import org.eclipse.daanse.olap.api.function.FunctionService;
 import org.eclipse.daanse.olap.api.query.ExpressionProvider;
 import org.eclipse.daanse.olap.api.query.QueryProvider;
+import org.eclipse.daanse.olap.api.query.component.Query;
 import org.eclipse.daanse.olap.api.query.component.QueryComponent;
 import org.eclipse.daanse.olap.query.base.ExpressionProviderImpl;
 import org.eclipse.daanse.olap.query.base.QueryProviderImpl;
-import org.eclipse.daanse.olap.query.component.QueryImpl;
 import org.eclipse.daanse.sql.guard.api.SqlGuard;
 import org.eclipse.daanse.sql.guard.api.SqlGuardFactory;
-import org.eclipse.daanse.sql.guard.api.elements.DatabaseCatalog;
 import org.eclipse.daanse.sql.guard.api.exception.GuardException;
 import org.eclipse.daanse.sql.guard.api.exception.UnparsableStatementGuardException;
 import org.slf4j.Logger;
@@ -63,8 +75,8 @@ protected ConnectionBase() {
 
 
     @Override
-	public QueryImpl parseQuery(String query) {
-        return (QueryImpl) parseStatement(query);
+	public Query parseQuery(String query) {
+        return (Query) parseStatement(query);
     }
 
     /**
diff --git a/mondrian/src/main/java/mondrian/olap/IdBatchResolver.java b/mondrian/src/main/java/mondrian/olap/IdBatchResolver.java
@@ -1,12 +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) 2006-2017 Hitachi Vantara and others
-// All Rights Reserved.
+ * 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 mondrian.olap;
 
 import java.util.ArrayList;
@@ -34,14 +49,14 @@
 import org.eclipse.daanse.olap.api.query.component.DimensionExpression;
 import org.eclipse.daanse.olap.api.query.component.Expression;
 import org.eclipse.daanse.olap.api.query.component.Formula;
+import org.eclipse.daanse.olap.api.query.component.HierarchyExpression;
 import org.eclipse.daanse.olap.api.query.component.Id;
 import org.eclipse.daanse.olap.api.query.component.MemberExpression;
+import org.eclipse.daanse.olap.api.query.component.Query;
 import org.eclipse.daanse.olap.api.query.component.QueryAxis;
 import org.eclipse.daanse.olap.api.query.component.QueryComponent;
 import org.eclipse.daanse.olap.api.query.component.visit.QueryComponentVisitor;
-import org.eclipse.daanse.olap.query.component.HierarchyExpressionImpl;
 import org.eclipse.daanse.olap.query.component.IdImpl;
-import org.eclipse.daanse.olap.query.component.QueryImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,7 +82,7 @@
 public final class IdBatchResolver {
     static final Logger LOGGER = LoggerFactory.getLogger(IdBatchResolver.class);
 
-    private final QueryImpl query;
+    private final Query query;
     private final Formula[] formulas;
     private final QueryAxis[] axes;
     private final Cube cube;
@@ -87,7 +102,7 @@ public final class IdBatchResolver {
     // first on segment length (shortest to longest), then alphabetically.
     private  SortedSet<Id> identifiers = new TreeSet<>(new IdComparator());
 
-    public IdBatchResolver(QueryImpl query) {
+    public IdBatchResolver(Query query) {
         this.query = query;
         formulas = query.getFormulas();
         axes = query.getAxes();
@@ -323,7 +338,7 @@ private Member getMemberFromExp(Expression exp) {
             if (hier.hasAll()) {
                 return hier.getAllMember();
             }
-        } else if (exp instanceof HierarchyExpressionImpl hierarchyExpr) {
+        } else if (exp instanceof HierarchyExpression hierarchyExpr) {
             Hierarchy hier = hierarchyExpr
                 .getHierarchy();
             if (hier.hasAll()) {
diff --git a/mondrian/src/main/java/mondrian/rolap/RolapCube.java b/mondrian/src/main/java/mondrian/rolap/RolapCube.java
@@ -591,8 +591,8 @@ protected Query resolveCalcMembers(
                 "RolapCube.resolveCalcMembers",
                 new LocusImpl.Action<Query>() {
                     @Override
-					public QueryImpl execute() {
-                        final QueryImpl queryExp =
+					public Query execute() {
+                        final Query queryExp =
                             conn.parseQuery(queryString);
                         queryExp.resolve();
                         return queryExp;
diff --git a/mondrian/src/main/java/org/eclipse/daanse/olap/impl/ScenarioImpl.java b/mondrian/src/main/java/org/eclipse/daanse/olap/impl/ScenarioImpl.java
@@ -11,13 +11,13 @@
 import org.eclipse.daanse.olap.api.element.Hierarchy;
 import org.eclipse.daanse.olap.api.element.Member;
 import org.eclipse.daanse.olap.api.query.component.Formula;
+import org.eclipse.daanse.olap.api.query.component.Query;
 import org.eclipse.daanse.olap.api.result.AllocationPolicy;
 import org.eclipse.daanse.olap.api.result.Result;
 import org.eclipse.daanse.olap.api.result.Scenario;
 import org.eclipse.daanse.olap.api.result.WritebackCell;
 import org.eclipse.daanse.olap.api.type.ScalarType;
 import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc;
-import org.eclipse.daanse.olap.query.component.QueryImpl;
 import org.eclipse.daanse.olap.query.component.ResolvedFunCallImpl;
 
 import mondrian.olap.Util;
@@ -321,7 +321,7 @@ private static double computeAtomicCellCount(
         final String mdx = buf.toString();
         final RolapConnection connection =
             cube.getCatalog().getInternalConnection();
-        final QueryImpl query = connection.parseQuery(mdx);
+        final Query query = connection.parseQuery(mdx);
         final Result result = connection.execute(query);
         final Object o = result.getCell(new int[0]).getValue();
         return o instanceof Number
diff --git a/mondrian/src/test/java/mondrian/olap/IdBatchResolverTest.java b/mondrian/src/test/java/mondrian/olap/IdBatchResolverTest.java
@@ -67,7 +67,7 @@
 class IdBatchResolverTest  {
 
 	@Mock
-     QueryImpl query;
+     Query query;
 
     @Captor
      ArgumentCaptor<List<NameSegment>> childNames;
diff --git a/mondrian/src/test/java/mondrian/rolap/aggmatcher/AggGenTest.java b/mondrian/src/test/java/mondrian/rolap/aggmatcher/AggGenTest.java
@@ -23,6 +23,7 @@
 import javax.sql.DataSource;
 
 import org.eclipse.daanse.olap.api.Context;
+import org.eclipse.daanse.olap.api.query.component.Query;
 import org.eclipse.daanse.olap.query.component.QueryImpl;
 import org.eclipse.daanse.olap.rolap.api.RolapContext;
 import org.eclipse.daanse.rolap.mapping.api.model.CatalogMapping;
@@ -72,7 +73,7 @@ void testCallingLoadColumnsInAddCollapsedColumnOrAddzSpecialCollapsedColumn(Cont
         ((TestContextImpl)context).setGenerateAggregateSql(true);
 
         final RolapConnection rolapConn = (RolapConnection) context.getConnectionWithDefaultRole();
-        QueryImpl query =
+        Query query =
             rolapConn.parseQuery(
                 "select {[Measures].[Count]} on columns from [HR]");
         rolapConn.execute(query);
