fixci

Author: hdygxsj

flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/GravitinoJdbcCatalog.java

@@ -38,15 +38,12 @@ public class GravitinoJdbcCatalog extends BaseCatalog {
 
   private final JdbcCatalog jdbcCatalog;
 
-  private final CatalogFactory.Context context;
-
   protected GravitinoJdbcCatalog(
       CatalogFactory.Context context,
       String defaultDatabase,
       PropertiesConverter propertiesConverter,
       PartitionConverter partitionConverter) {
     super(context.getName(), defaultDatabase, propertiesConverter, partitionConverter);
-    this.context = context;
     JdbcCatalogFactory jdbcCatalogFactory = new JdbcCatalogFactory();
     this.jdbcCatalog = (JdbcCatalog) jdbcCatalogFactory.createCatalog(context);
   }

flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/jdbc/MysqlPropertiesConverter.java

@@ -23,8 +23,6 @@
 
 public class MysqlPropertiesConverter extends JdbcPropertiesConverter {
 
-
-
   protected MysqlPropertiesConverter(Map<String, String> catalogOptions) {
     super(catalogOptions);
   }

flink-connector/flink/src/main/java/org/apache/gravitino/flink/connector/store/GravitinoCatalogStore.java

@@ -57,7 +57,7 @@ public void storeCatalog(String catalogName, CatalogDescriptor descriptor)
     Map<String, String> gravitino = configuration.toMap();
     BaseCatalogFactory catalogFactory = getCatalogFactory(gravitino);
     Map<String, String> gravitinoProperties =
-        catalogFactory.propertiesConverter().toGravitinoCatalogProperties(configuration);
+        catalogFactory.propertiesConverter(gravitino).toGravitinoCatalogProperties(configuration);
     gravitinoCatalogManager.createCatalog(
         catalogName,
         catalogFactory.gravitinoCatalogType(),
@@ -80,7 +80,8 @@ public Optional<CatalogDescriptor> getCatalog(String catalogName) throws Catalog
     try {
       Catalog catalog = gravitinoCatalogManager.getGravitinoCatalogInfo(catalogName);
       BaseCatalogFactory catalogFactory = getCatalogFactory(catalog.provider());
-      PropertiesConverter propertiesConverter = catalogFactory.propertiesConverter();
+      PropertiesConverter propertiesConverter =
+          catalogFactory.propertiesConverter(catalog.properties());
       Map<String, String> flinkCatalogProperties =
           propertiesConverter.toFlinkCatalogProperties(catalog.properties());
       CatalogDescriptor descriptor =

flink-connector/flink/src/test/java/org/apache/gravitino/flink/connector/integration/test/jdbc/FlinkJdbcMysqlCatalogIT.java

@@ -27,7 +27,6 @@
 import org.apache.gravitino.Catalog;
 import org.apache.gravitino.flink.connector.integration.test.FlinkCommonIT;
 import org.apache.gravitino.flink.connector.jdbc.JdbcPropertiesConstants;
-import org.apache.gravitino.flink.connector.jdbc.MysqlPropertiesConverter;
 import org.apache.gravitino.integration.test.container.ContainerSuite;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
@@ -166,7 +165,6 @@ public void testCreateGravitinoJdbcCatalogUsingSQL() {
         mysqlDefaultDatabase,
         properties.get(JdbcPropertiesConstants.GRAVITINO_JDBC_DEFAULT_DATABASE));
     Assertions.assertEquals(
-        "com.mysql.jdbc.Driver",
-        properties.get(JdbcPropertiesConstants.GRAVITINO_JDBC_DRIVER));
+        "com.mysql.jdbc.Driver", properties.get(JdbcPropertiesConstants.GRAVITINO_JDBC_DRIVER));
   }
 }