fix build after dialects refactoring

Signed-off-by: dbulahov <[email protected]>

Author: dbulahov

mondrian/src/test/java/mondrian/rolap/sql/CodeSetTest.java

@@ -13,11 +13,12 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+
 import org.eclipse.daanse.jdbc.db.dialect.db.postgresql.PostgreSqlDialect;
 import org.eclipse.daanse.olap.api.exception.OlapRuntimeException;
-import org.eclipse.daanse.jdbc.db.api.meta.DatabaseInfo;
-import org.eclipse.daanse.jdbc.db.api.meta.IdentifierInfo;
-import org.eclipse.daanse.jdbc.db.api.meta.MetaInfo;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -55,7 +56,7 @@ void testSucces_CodeSetContainsOnlyCodeForPostgresDialect()
     throws Exception
     {
     PostgreSqlDialect postgreSqlDialect = new PostgreSqlDialect(
-        mockMetaInfo(
+        mockConnection(
             POSTGRESQL_PRODUCT_NAME,
             POSTGRESQL_PRODUCT_VERSION));
     codeSet = new SqlQuery.CodeSet();
@@ -82,7 +83,7 @@ void testSucces_CodeSetContainsCodeForBothPostgresAndGenericDialects()
     throws Exception
     {
 	    PostgreSqlDialect postgreSqlDialect = new PostgreSqlDialect(
-        mockMetaInfo(
+        mockConnection(
             POSTGRESQL_PRODUCT_NAME,
             POSTGRESQL_PRODUCT_VERSION));
     codeSet = new SqlQuery.CodeSet();
@@ -111,7 +112,7 @@ void testSucces_CodeSetContainsCodeForBothPostgresAndGenericDialects()
       throws Exception
       {
 	    PostgreSqlDialect postgreSqlDialect = new PostgreSqlDialect(
-        mockMetaInfo(
+        mockConnection(
             POSTGRESQL_PRODUCT_NAME,
             POSTGRESQL_PRODUCT_VERSION));
     codeSet = new SqlQuery.CodeSet();
@@ -138,7 +139,7 @@ void testSucces_CodeSetContainsOnlyCodeForGenericlDialect()
     throws Exception
     {
 	    PostgreSqlDialect postgreSqlDialect = new PostgreSqlDialect(
-        mockMetaInfo(
+        mockConnection(
             POSTGRESQL_PRODUCT_NAME,
             POSTGRESQL_PRODUCT_VERSION));
     codeSet = new SqlQuery.CodeSet();
@@ -164,7 +165,7 @@ void testMondrianExceptionThrown_WhenCodeSetContainsNOCodeForDialect()
     throws Exception
     {
 	    PostgreSqlDialect postgreSqlDialect = new PostgreSqlDialect(
-        mockMetaInfo(
+        mockConnection(
             POSTGRESQL_PRODUCT_NAME,
             POSTGRESQL_PRODUCT_VERSION));
     codeSet = new SqlQuery.CodeSet();
@@ -180,19 +181,17 @@ void testMondrianExceptionThrown_WhenCodeSetContainsNOCodeForDialect()
     }
   }
 
-  private MetaInfo mockMetaInfo(
+  private Connection mockConnection(
       String dbProductName, String dbProductVersion) throws Exception
       {
-	MetaInfo metaInfoMock = mock(MetaInfo.class);
-	DatabaseInfo databaseInfo = mock(DatabaseInfo.class);
-	IdentifierInfo identifierInfo = mock(IdentifierInfo.class);
-	when(metaInfoMock.databaseInfo()).thenReturn(databaseInfo);
-	when(metaInfoMock.identifierInfo()).thenReturn(identifierInfo);
-    when(databaseInfo.databaseProductName()).thenReturn(
+    Connection connection = mock(Connection.class);
+	DatabaseMetaData metaData = mock(DatabaseMetaData.class);
+	when(connection.getMetaData()).thenReturn(metaData);
+    when(metaData.getDatabaseProductName()).thenReturn(
         dbProductName != null ? dbProductName : EMPTY_NAME);
-    when(databaseInfo.databaseProductVersion()).thenReturn(
+    when(metaData.getDatabaseProductVersion()).thenReturn(
         dbProductVersion != null ? dbProductVersion : EMPTY_NAME);
-    return metaInfoMock;
+    return connection;
   }
 
 }

mondrian/src/test/java/org/opencube/junit5/dbprovider/H2DatabaseProvider.java

@@ -27,15 +27,12 @@
 
 import javax.sql.DataSource;
 
-import org.eclipse.daanse.jdbc.db.dialect.db.h2.H2Dialect;
 import org.eclipse.daanse.jdbc.db.api.meta.MetaInfo;
 import org.eclipse.daanse.jdbc.db.core.DatabaseServiceImpl;
 import org.eclipse.daanse.jdbc.db.dialect.api.Dialect;
+import org.eclipse.daanse.jdbc.db.dialect.db.h2.H2Dialect;
 import org.h2.jdbcx.JdbcDataSource;
 
-import aQute.bnd.annotation.spi.ServiceProvider;
-import mondrian.rolap.RolapCatalogCache;
-
 //@ServiceProvider(value = DatabaseProvider.class)
 public class H2DatabaseProvider implements DatabaseProvider {
 
@@ -85,9 +82,7 @@ public Entry<DataSource, Dialect> activate() {
 		cpDataSource.setPassword("sa");
 		try {
 			connection = cpDataSource.getConnection();
-			DatabaseServiceImpl databaseServiceImpl = new DatabaseServiceImpl();
-			MetaInfo metaInfo = databaseServiceImpl.createMetaInfo(connection);
-			Dialect dialect = new H2Dialect(metaInfo);
+			Dialect dialect = new H2Dialect(connection);
 
 			connection.close();
 			return new SimpleEntry<>(cpDataSource, dialect);

mondrian/src/test/java/org/opencube/junit5/dbprovider/MySqlDatabaseProvider.java

@@ -27,8 +27,6 @@
 
 import javax.sql.DataSource;
 
-import org.eclipse.daanse.jdbc.db.api.meta.MetaInfo;
-import org.eclipse.daanse.jdbc.db.core.DatabaseServiceImpl;
 import org.eclipse.daanse.jdbc.db.dialect.api.Dialect;
 import org.eclipse.daanse.jdbc.db.dialect.db.mysql.MySqlDialect;
 
@@ -91,9 +89,7 @@ protected Entry<DataSource, Dialect> createDataSource() {
 
 				Connection connection = dataSource.getConnection(MYSQL_USER, MYSQL_PASSWORD);
 				// wait until connection is possible
-				DatabaseServiceImpl databaseServiceImpl = new DatabaseServiceImpl();
-				MetaInfo metaInfo = databaseServiceImpl.createMetaInfo(connection);
-				Dialect dialect = new MySqlDialect(metaInfo);
+				Dialect dialect = new MySqlDialect(connection);
 				connection.close();
 				return new SimpleEntry<>(dataSource, dialect);
 

mondrian/src/test/java/org/opencube/junit5/dbprovider/SQLiteDatabaseProvider.java

@@ -28,10 +28,8 @@
 
 import javax.sql.DataSource;
 
-import org.eclipse.daanse.jdbc.db.dialect.db.mysql.MySqlDialect;
-import org.eclipse.daanse.jdbc.db.api.meta.MetaInfo;
-import org.eclipse.daanse.jdbc.db.core.DatabaseServiceImpl;
 import org.eclipse.daanse.jdbc.db.dialect.api.Dialect;
+import org.eclipse.daanse.jdbc.db.dialect.db.mysql.MySqlDialect;
 import org.sqlite.SQLiteConfig;
 import org.sqlite.SQLiteDataSource;
 
@@ -66,9 +64,7 @@ public Entry<DataSource, Dialect> activate() {
 		dataSource.setUrl(JDBC_SQLITE_MEMORY);
 		try {
 			Connection connection = dataSource.getConnection();
-			DatabaseServiceImpl databaseServiceImpl = new DatabaseServiceImpl();
-			MetaInfo metaInfo = databaseServiceImpl.createMetaInfo(connection);
-			Dialect dialect = new MySqlDialect(metaInfo);
+			Dialect dialect = new MySqlDialect(connection);
 			connection.close();
 			return new SimpleEntry<>(dataSource, dialect);
 		} catch (SQLException e) {