Unverified Commit 1ba9edf5 authored by Kerwin's avatar Kerwin Committed by GitHub

Added dlink-catalog module code style. (#895)

parent 4eb1afc1
...@@ -17,11 +17,16 @@ ...@@ -17,11 +17,16 @@
* *
*/ */
package com.dlink.flink.catalog.factory;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.PASSWORD;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.URL;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.USERNAME;
package com.dlink.flink.catalog.factory; import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
import com.dlink.flink.catalog.DlinkMysqlCatalog; import com.dlink.flink.catalog.DlinkMysqlCatalog;
import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.table.catalog.Catalog; import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.factories.CatalogFactory; import org.apache.flink.table.factories.CatalogFactory;
...@@ -30,9 +35,6 @@ import org.apache.flink.table.factories.FactoryUtil; ...@@ -30,9 +35,6 @@ import org.apache.flink.table.factories.FactoryUtil;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.*;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
/** /**
* Factory for {@link DlinkMysqlCatalog}. * Factory for {@link DlinkMysqlCatalog}.
*/ */
......
...@@ -17,11 +17,10 @@ ...@@ -17,11 +17,10 @@
* *
*/ */
package com.dlink.flink.catalog.factory; package com.dlink.flink.catalog.factory;
import com.dlink.flink.catalog.DlinkMysqlCatalog; import com.dlink.flink.catalog.DlinkMysqlCatalog;
import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.ConfigOptions;
......
...@@ -19,7 +19,14 @@ ...@@ -19,7 +19,14 @@
package com.dlink.flink.catalog.factory; package com.dlink.flink.catalog.factory;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.PASSWORD;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.URL;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.USERNAME;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
import com.dlink.flink.catalog.DlinkMysqlCatalog; import com.dlink.flink.catalog.DlinkMysqlCatalog;
import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.table.catalog.Catalog; import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.factories.CatalogFactory; import org.apache.flink.table.factories.CatalogFactory;
...@@ -28,9 +35,6 @@ import org.apache.flink.table.factories.FactoryUtil; ...@@ -28,9 +35,6 @@ import org.apache.flink.table.factories.FactoryUtil;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.*;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
/** /**
* Factory for {@link DlinkMysqlCatalog}. * Factory for {@link DlinkMysqlCatalog}.
*/ */
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* *
*/ */
package com.dlink.flink.catalog.factory; package com.dlink.flink.catalog.factory;
import com.dlink.flink.catalog.DlinkMysqlCatalog; import com.dlink.flink.catalog.DlinkMysqlCatalog;
import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.ConfigOptions;
......
...@@ -17,16 +17,16 @@ ...@@ -17,16 +17,16 @@
* *
*/ */
package com.dlink.flink.catalog; package com.dlink.flink.catalog;
import static org.apache.flink.table.api.config.ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM;
import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.EnvironmentSettings;
import org.apache.flink.table.api.TableEnvironment; import org.apache.flink.table.api.TableEnvironment;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.apache.flink.table.api.config.ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM;
public class DlinkMysqlCatalogTest { public class DlinkMysqlCatalogTest {
protected static String url; protected static String url;
...@@ -56,12 +56,12 @@ public class DlinkMysqlCatalogTest { ...@@ -56,12 +56,12 @@ public class DlinkMysqlCatalogTest {
@Test @Test
public void testSqlCatalog() { public void testSqlCatalog() {
String createSql = "create catalog myCatalog \n" + String createSql = "create catalog myCatalog \n"
" with('type'='dlink_mysql',\n" + + " with('type'='dlink_mysql',\n"
" 'username'='dlink',\n" + + " 'username'='dlink',\n"
" 'password'='dlink',\n" + + " 'password'='dlink',\n"
" 'url'='jdbc:mysql://127.0.0.1:3306/" + + " 'url'='jdbc:mysql://127.0.0.1:3306/"
"dlink?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC')"; + "dlink?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC')";
tableEnv.executeSql(createSql); tableEnv.executeSql(createSql);
tableEnv.executeSql("use catalog myCatalog"); tableEnv.executeSql("use catalog myCatalog");
} }
......
...@@ -17,23 +17,24 @@ ...@@ -17,23 +17,24 @@
* *
*/ */
package com.dlink.flink.catalog.com.dlink.flink.catalog.factory; package com.dlink.flink.catalog.com.dlink.flink.catalog.factory;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import com.dlink.flink.catalog.DlinkMysqlCatalog; import com.dlink.flink.catalog.DlinkMysqlCatalog;
import com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions; import com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions;
import org.apache.flink.table.catalog.Catalog; import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.catalog.CommonCatalogOptions; import org.apache.flink.table.catalog.CommonCatalogOptions;
import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.factories.FactoryUtil;
import org.junit.BeforeClass;
import org.junit.Test;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static org.junit.Assert.assertEquals; import org.junit.BeforeClass;
import static org.junit.Assert.assertTrue; import org.junit.Test;
public class DlinkMysqlCatalogFactoryTest { public class DlinkMysqlCatalogFactoryTest {
......
...@@ -17,10 +17,16 @@ ...@@ -17,10 +17,16 @@
* *
*/ */
package com.dlink.flink.catalog.factory; package com.dlink.flink.catalog.factory;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.PASSWORD;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.URL;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.USERNAME;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
import com.dlink.flink.catalog.DlinkMysqlCatalog; import com.dlink.flink.catalog.DlinkMysqlCatalog;
import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.table.catalog.Catalog; import org.apache.flink.table.catalog.Catalog;
import org.apache.flink.table.factories.CatalogFactory; import org.apache.flink.table.factories.CatalogFactory;
...@@ -29,9 +35,6 @@ import org.apache.flink.table.factories.FactoryUtil; ...@@ -29,9 +35,6 @@ import org.apache.flink.table.factories.FactoryUtil;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import static com.dlink.flink.catalog.factory.DlinkMysqlCatalogFactoryOptions.*;
import static org.apache.flink.table.factories.FactoryUtil.PROPERTY_VERSION;
/** /**
* Factory for {@link DlinkMysqlCatalog}. * Factory for {@link DlinkMysqlCatalog}.
*/ */
......
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
* *
*/ */
package com.dlink.flink.catalog.factory; package com.dlink.flink.catalog.factory;
import com.dlink.flink.catalog.DlinkMysqlCatalog; import com.dlink.flink.catalog.DlinkMysqlCatalog;
import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.Internal;
import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions; import org.apache.flink.configuration.ConfigOptions;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment