remove mondrian from code

api/src/main/java/org/eclipse/daanse/olap/api/Execution.java

@@ -34,7 +34,7 @@ public interface Execution {
 
     void cancelSqlStatements();
 
-    Statement getMondrianStatement();
+    Statement getDaanseStatement();
 
     void setOutOfMemory(String string);
 

api/src/main/java/org/eclipse/daanse/olap/api/IAggregationManager.java

@@ -21,7 +21,7 @@ public interface IAggregationManager {
 
     void shutdown();
 
-    ISegmentCacheManager getCacheMgr(Connection mondrianConnection);
+    ISegmentCacheManager getCacheMgr(Connection connection);
 
     CacheControl getCacheControl(Connection rolapConnection, PrintWriter pw);
 

api/src/main/java/org/eclipse/daanse/olap/api/Statement.java

@@ -74,7 +74,7 @@ public interface Statement  {
      *
      * @return connection
      */
-    Connection getMondrianConnection();
+    Connection getDaanseConnection();
 
 
     void setQuery(Query query);

api/src/main/java/org/eclipse/daanse/olap/api/result/IMondrianOlap4jProperty.java → api/src/main/java/org/eclipse/daanse/olap/api/result/IDaanseOlap4jProperty.java

@@ -15,7 +15,7 @@
 
 import org.eclipse.daanse.olap.api.element.Level;
 
-public interface IMondrianOlap4jProperty extends Property{
+public interface IDaanseOlap4jProperty extends Property{
     /**
      * @return Level
      */

common/src/main/java/org/eclipse/daanse/olap/common/MondrianPropertiesBase.java → common/src/main/java/org/eclipse/daanse/olap/common/DaansePropertiesBase.java

@@ -75,17 +75,17 @@
  * @author jhyde
  * @since 22 December, 2002
  */
-public abstract class MondrianPropertiesBase extends Properties {
+public abstract class DaansePropertiesBase extends Properties {
 
     private final transient PropertySource propertySource;
     private int populateCount;
 
     private static final Logger LOGGER =
-        LoggerFactory.getLogger(MondrianPropertiesBase.class);
+        LoggerFactory.getLogger(DaansePropertiesBase.class);
 
-    protected static final String MONDRIAN_DOT_PROPERTIES = "mondrian.properties";
+    protected static final String MONDRIAN_DOT_PROPERTIES = "daanse.properties";
 
-    protected MondrianPropertiesBase(PropertySource propertySource) {
+    protected DaansePropertiesBase(PropertySource propertySource) {
         this.propertySource = propertySource;
     }
 
@@ -254,15 +254,15 @@ public void populate() {
         } else {
             // Then try load it from classloader
             url =
-                MondrianPropertiesBase.class.getClassLoader().getResource(
+                DaansePropertiesBase.class.getClassLoader().getResource(
                     MONDRIAN_DOT_PROPERTIES);
         }
 
         if (url != null) {
             load(new UrlPropertySource(url));
         } else {
             LOGGER.warn(
-                "mondrian.properties can't be found under '{}' or classloader",
+                "daanse.properties can't be found under '{}' or classloader",
                 new File(".").getAbsolutePath());
         }
 
@@ -273,7 +273,7 @@ public void populate() {
         {
             String key = (String) keys.nextElement();
             String value = System.getProperty(key);
-            if (key.startsWith("mondrian.")) {
+            if (key.startsWith("daanse.")) {
                 // NOTE: the super allows us to bybase calling triggers
                 // Is this the correct behavior?
                 if (LOGGER.isDebugEnabled()) {

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

@@ -56,7 +56,7 @@ public abstract class ResultBase implements Result {
 
     protected ResultBase(Execution execution, Axis[] axes) {
         this.execution = execution;
-        this.statement = execution.getMondrianStatement();
+        this.statement = execution.getDaanseStatement();
         this.query = statement.getQuery();
         assert query != null;
         this.axes =

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

@@ -23,7 +23,7 @@
  * properties using the inherited {@link java.util.Properties#getProperty(String)}
  * method, we recommend that you use methods in this class.
  */
-public class SystemWideProperties extends MondrianPropertiesBase {
+public class SystemWideProperties extends DaansePropertiesBase {
     /**
      * Properties, drawn from {@link System#getProperties},
      * plus the contents of "mondrian.properties" if it
@@ -42,29 +42,29 @@ private SystemWideProperties() {
 
     public void populateInitial() {
         CaseSensitive =
-            this.getBoolean("mondrian.olap.case.sensitive", false);
+            this.getBoolean("daanse.olap.case.sensitive", false);
         CaseSensitiveMdxInstr =
-            this.getBoolean("mondrian.olap.case.sensitive.CaseSensitiveMdxInstr", false);
+            this.getBoolean("daanse.olap.case.sensitive.CaseSensitiveMdxInstr", false);
         CompareSiblingsByOrderKey =
-            this.getBoolean("mondrian.rolap.compareSiblingsByOrderKey", false);
+            this.getBoolean("daanse.rolap.compareSiblingsByOrderKey", false);
         EnableExpCache =
-            this.getBoolean("mondrian.expCache.enable", true);
+            this.getBoolean("daanse.expCache.enable", true);
         EnableNativeNonEmpty =
-            this.getBoolean("mondrian.native.nonempty.enable", true);
+            this.getBoolean("daanse.native.nonempty.enable", true);
         EnableNonEmptyOnAllAxis =
-            this.getBoolean("mondrian.rolap.nonempty", false);
+            this.getBoolean("daanse.rolap.nonempty", false);
         EnableRolapCubeMemberCache =
-            this.getBoolean("mondrian.rolap.EnableRolapCubeMemberCache", true);
+            this.getBoolean("daanse.rolap.EnableRolapCubeMemberCache", true);
         EnableTriggers =
-            this.getBoolean("mondrian.olap.triggers.enable", true);
+            this.getBoolean("daanse.olap.triggers.enable", true);
         FilterChildlessSnowflakeMembers =
-            this.getBoolean("mondrian.rolap.FilterChildlessSnowflakeMembers", true);
+            this.getBoolean("daanse.rolap.FilterChildlessSnowflakeMembers", true);
         MaxConstraints =
-            this.getInteger("mondrian.rolap.maxConstraints", 1000);
+            this.getInteger("daanse.rolap.maxConstraints", 1000);
         NullMemberRepresentation =
-            getProperty("mondrian.olap.NullMemberRepresentation", "#null");
+            getProperty("daanse.olap.NullMemberRepresentation", "#null");
         ResultLimit =
-            this.getInteger("mondrian.result.limit", 0);
+            this.getInteger("daanse.result.limit", 0);
 
     }
 
@@ -87,7 +87,7 @@ public static SystemWideProperties instance() {
      * case-sensitive matching when looking up identifiers. The default is
      * false.
      */
-    @PropertyAnnotation(path = "mondrian.olap.case.sensitive")
+    @PropertyAnnotation(path = "daanse.olap.case.sensitive")
     public transient Boolean CaseSensitive;
 
 
@@ -97,7 +97,7 @@ public static SystemWideProperties instance() {
      *                 Default value is false.
      *
      */
-    @PropertyAnnotation(path = "mondrian.olap.case.sensitive.CaseSensitiveMdxInstr")
+    @PropertyAnnotation(path = "daanse.olap.case.sensitive.CaseSensitiveMdxInstr")
     public transient Boolean CaseSensitiveMdxInstr;
 
 
@@ -106,7 +106,7 @@ public static SystemWideProperties instance() {
      * compared according to order key value fetched from their ordinal
      * expression.  The default is false (only database ORDER BY is used).
      */
-    @PropertyAnnotation(path = "mondrian.rolap.compareSiblingsByOrderKey")
+    @PropertyAnnotation(path = "daanse.rolap.compareSiblingsByOrderKey")
     public transient Boolean CompareSiblingsByOrderKey;
 
 
@@ -117,14 +117,14 @@ public static SystemWideProperties instance() {
      * Order([Product].MEMBERS, [Measures].[Unit Sales])) would perform
      * many redundant sorts. The default is true.
      */
-    @PropertyAnnotation(path = "mondrian.expCache.enable")
+    @PropertyAnnotation(path = "daanse.expCache.enable")
     public transient Boolean EnableExpCache;
 
     /**
      * If enabled some NON EMPTY set operations like member.children,
      * level.members and member descendants will be computed in SQL.
      */
-    @PropertyAnnotation(path = "mondrian.native.nonempty.enable")
+    @PropertyAnnotation(path = "daanse.native.nonempty.enable")
     public transient Boolean EnableNativeNonEmpty;
     /**
      * Boolean property that controls whether each query axis implicit has the
@@ -146,7 +146,7 @@ public static SystemWideProperties instance() {
      * construct, and we may obsolete this cache and this
      * property.
      */
-    @PropertyAnnotation(path = "mondrian.rolap.EnableRolapCubeMemberCache")
+    @PropertyAnnotation(path = "daanse.rolap.EnableRolapCubeMemberCache")
     public transient Boolean EnableRolapCubeMemberCache;
 
 
@@ -159,7 +159,7 @@ public static SystemWideProperties instance() {
      * MondrianProperties.instance().populate(null) or
      * MondrianProperties.instance().QueryLimit.set(50).
      */
-    @PropertyAnnotation(path = "mondrian.olap.triggers.enable")
+    @PropertyAnnotation(path = "daanse.olap.triggers.enable")
     public transient Boolean EnableTriggers;
 
 
@@ -180,7 +180,7 @@ public static SystemWideProperties instance() {
      * table, during your ETL process, and to set this property to
      * {@code false}.
      */
-    @PropertyAnnotation(path = "mondrian.rolap.FilterChildlessSnowflakeMembers")
+    @PropertyAnnotation(path = "daanse.rolap.FilterChildlessSnowflakeMembers")
     public transient Boolean FilterChildlessSnowflakeMembers;
 
     /**
@@ -197,7 +197,7 @@ public static SystemWideProperties instance() {
      * Other: 10,000
      *
      */
-    @PropertyAnnotation(path = "mondrian.rolap.maxConstraints")
+    @PropertyAnnotation(path = "daanse.rolap.maxConstraints")
     public transient Integer MaxConstraints;
 
 
@@ -216,7 +216,7 @@ public static SystemWideProperties instance() {
      * Integer property that, if set to a value greater than zero, limits the
      * maximum size of a result set.
      */
-    @PropertyAnnotation(path = "mondrian.result.limit")
+    @PropertyAnnotation(path = "daanse.result.limit")
     public transient Integer ResultLimit;
 
 }

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

@@ -167,7 +167,7 @@ public class Util {
     private static final Logger LOGGER = LoggerFactory.getLogger(Util.class);
 
     public static final Logger PROFILE_LOGGER =
-            LoggerFactory.getLogger("mondrian.profile");
+            LoggerFactory.getLogger("daanse.profile");
 
     /**
      * Special value which indicates that a {@code double} computation has returned the MDX null value. See {@link
@@ -2501,7 +2501,7 @@ public static String convertOlap4jConnectStringToNativeMondrian(
     {
         if (url.startsWith("jdbc:mondrian:")) {
             return "Provider=Mondrian; "
-                + url.substring("jdbc:mondrian:".length());
+                + url.substring("jdbc:daanse:".length());
         }
         return null;
     }

common/src/main/java/org/eclipse/daanse/olap/core/AbstractBasicContext.java

@@ -176,7 +176,7 @@ public synchronized void addStatement(Statement statement) {
 					connections.size());
 		}
 		statements.add( statement);
-		final Connection connection = statement.getMondrianConnection();
+		final Connection connection = statement.getDaanseConnection();
 
 		MdxStatementStartEvent mdxStatementStartEvent = new MdxStatementStartEvent(new MdxStatementEventCommon(
 				new ConnectionEventCommon(
@@ -198,7 +198,7 @@ public synchronized void removeStatement(Statement statement) {
 			throw new OlapRuntimeException("Server already shutdown.");
 		}
 		statements.remove(statement);
-		final Connection connection = statement.getMondrianConnection();
+		final Connection connection = statement.getDaanseConnection();
 
 
 		MdxStatementEndEvent mdxStatementEndEvent = new MdxStatementEndEvent(
@@ -223,7 +223,7 @@ public EventBus getMonitor() {
 
 	@Override
 	public List<Statement> getStatements(org.eclipse.daanse.olap.api.connection.Connection connection) {
-		return statements.stream().filter(stmnt -> stmnt.getMondrianConnection().equals(connection))
+		return statements.stream().filter(stmnt -> stmnt.getDaanseConnection().equals(connection))
 				.toList();
 	}
 

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

@@ -43,7 +43,6 @@
 import org.eclipse.daanse.olap.common.StandardProperty;
 import org.eclipse.daanse.olap.fun.FunUtil;
 
-//import mondrian.util.Bug;
 /**
  * MemberBase is a partial implementation of {@link Member}.
  *

common/src/main/java/org/eclipse/daanse/olap/fun/MondrianEvaluationException.java → common/src/main/java/org/eclipse/daanse/olap/fun/DaanseEvaluationException.java

@@ -32,10 +32,10 @@
  *
  * @author jhyde, 14 June, 2002
  */
-public class MondrianEvaluationException extends RuntimeException {
-    public MondrianEvaluationException() {
+public class DaanseEvaluationException extends RuntimeException {
+    public DaanseEvaluationException() {
     }
-    public MondrianEvaluationException(String s) {
+    public DaanseEvaluationException(String s) {
         super(s);
     }
 }

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

@@ -132,7 +132,7 @@ public class FunUtil extends Util {
   public static RuntimeException newEvalException(
 		  FunctionMetaData functionMetaData ,
     String message ) {
-    return new MondrianEvaluationException( message );
+    return new DaanseEvaluationException( message );
   }
 
   /**
@@ -142,7 +142,7 @@ public static RuntimeException newEvalException(
    * @return Exception that can be used as a cell result
    */
   public static RuntimeException newEvalException( Throwable throwable ) {
-    return new MondrianEvaluationException(
+    return new DaanseEvaluationException(
       new StringBuilder(throwable.getClass().getName()).append(": ").append(throwable.getMessage()).toString() );
   }
 
@@ -156,7 +156,7 @@ public static RuntimeException newEvalException( Throwable throwable ) {
   public static RuntimeException newEvalException(
     String message,
     Throwable throwable ) {
-    return new MondrianEvaluationException(
+    return new DaanseEvaluationException(
       new StringBuilder(message)
         .append(": ").append(Util.getErrorMessage( throwable )).toString() );
   }
@@ -273,7 +273,7 @@ public static <E extends Enum<E>> E getLiteralArg(
   /**
    * Throws an error if the expressions don't have the same hierarchy.
    *
-   * @throws MondrianEvaluationException if expressions don't have the same hierarchy
+   * @throws DaanseEvaluationException if expressions don't have the same hierarchy
    */
   public static void checkCompatible( Expression left, Expression right, FunctionDefinition funDef ) {
     final Type leftType = TypeUtil.stripSetType( left.getType() );

common/src/main/java/org/eclipse/daanse/olap/function/def/properties/PropertiesCalc.java

@@ -22,7 +22,7 @@
 import org.eclipse.daanse.olap.calc.base.nested.AbstractProfilingNestedUnknownCalc;
 import org.eclipse.daanse.olap.common.SystemWideProperties;
 import org.eclipse.daanse.olap.common.Util;
-import org.eclipse.daanse.olap.fun.MondrianEvaluationException;
+import org.eclipse.daanse.olap.fun.DaanseEvaluationException;
 
 public class PropertiesCalc extends AbstractProfilingNestedUnknownCalc {
 
@@ -47,7 +47,7 @@ private static Object properties(Member member, String s) {
         Object o = member.getPropertyValue(s, matchCase);
         if (o == null) {
             if (!Util.isValidProperty(s, member.getLevel())) {
-                throw new MondrianEvaluationException(new StringBuilder("Property '").append(s)
+                throw new DaanseEvaluationException(new StringBuilder("Property '").append(s)
                         .append("' is not valid for member '").append(member).append("'").toString());
             }
         }

common/src/main/java/org/eclipse/daanse/olap/function/def/set/addcalculatedmembers/AddCalculatedMembersCalc.java

@@ -29,7 +29,7 @@
 import org.eclipse.daanse.olap.calc.base.type.tuplebase.AbstractProfilingNestedTupleListCalc;
 import org.eclipse.daanse.olap.calc.base.type.tuplebase.TupleCollections;
 import org.eclipse.daanse.olap.calc.base.type.tuplebase.UnaryTupleList;
-import org.eclipse.daanse.olap.fun.MondrianEvaluationException;
+import org.eclipse.daanse.olap.fun.DaanseEvaluationException;
 import org.eclipse.daanse.olap.function.def.drilldownlevel.DrilldownLevelCalc;
 import org.eclipse.daanse.olap.function.def.drilldownmember.DrilldownMemberCalc;
 import org.eclipse.daanse.olap.function.def.set.level.LevelMembersCalc;
@@ -81,7 +81,7 @@ private List<Member> addCalculatedMembers(List<Member> memberList, Evaluator eva
             if (hierarchy == null) {
                 hierarchy = member.getHierarchy();
             } else if (hierarchy != member.getHierarchy()) {
-                throw new MondrianEvaluationException(
+                throw new DaanseEvaluationException(
                         new StringBuilder("Only members from the same hierarchy are allowed in the ")
                                 .append("AddCalculatedMembers set: ").append(hierarchy).append(" vs ")
                                 .append(member.getHierarchy()).toString());

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

@@ -21,11 +21,11 @@
 
 import org.eclipse.daanse.olap.api.element.Level;
 import org.eclipse.daanse.olap.api.result.Datatype;
-import org.eclipse.daanse.olap.api.result.IMondrianOlap4jProperty;
+import org.eclipse.daanse.olap.api.result.IDaanseOlap4jProperty;
 import org.eclipse.daanse.olap.api.result.Property;
 import org.eclipse.daanse.olap.common.StandardProperty;
 
-public class PropertyImpl implements IMondrianOlap4jProperty {
+public class PropertyImpl implements IDaanseOlap4jProperty {
 
     /**
      * Map of member properties that are built into Mondrian but are not in the