[FLINK-12713][table] deprecate descriptor, validator, and factory of …

…ExternalCatalog This closes apache#8601.
maplebeats · Jun 3, 2019 · 61d8916 · 61d8916
1 parent 7682248
commit 61d8916
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/...flink-table-api-java/src/main/java/org/apache/flink/table/factories/TableFactoryUtil.java b/...flink-table-api-java/src/main/java/org/apache/flink/table/factories/TableFactoryUtil.java
@@ -34,6 +34,7 @@ public class TableFactoryUtil {
 	/**
 	 * Returns an external catalog.
 	 */
+	@Deprecated
 	public static ExternalCatalog findAndCreateExternalCatalog(Descriptor descriptor) {
 		Map<String, String> properties = descriptor.toProperties();
 		return TableFactoryService

diff --git a/...le-common/src/main/java/org/apache/flink/table/descriptors/ExternalCatalogDescriptor.java b/...le-common/src/main/java/org/apache/flink/table/descriptors/ExternalCatalogDescriptor.java
@@ -18,17 +18,17 @@
 
 package org.apache.flink.table.descriptors;
 
-import org.apache.flink.annotation.PublicEvolving;
-
 import java.util.Map;
 
 import static org.apache.flink.table.descriptors.ExternalCatalogDescriptorValidator.CATALOG_PROPERTY_VERSION;
 import static org.apache.flink.table.descriptors.ExternalCatalogDescriptorValidator.CATALOG_TYPE;
 
 /**
  * Describes an external catalog of tables, views, and functions.
+ *
+ * @deprecated use {@link CatalogDescriptor} instead.
  */
-@PublicEvolving
+@Deprecated
 public abstract class ExternalCatalogDescriptor extends DescriptorBase implements Descriptor {
 
 	private final String type;

diff --git a/.../src/main/java/org/apache/flink/table/descriptors/ExternalCatalogDescriptorValidator.java b/.../src/main/java/org/apache/flink/table/descriptors/ExternalCatalogDescriptorValidator.java
@@ -22,7 +22,10 @@
 
 /**
  * Validator for {@link ExternalCatalogDescriptor}.
+ *
+ * @deprecated use {@link CatalogDescriptorValidator} instead.
  */
+@Deprecated
 @Internal
 public abstract class ExternalCatalogDescriptorValidator implements DescriptorValidator {
 

diff --git a/...k-table-common/src/main/java/org/apache/flink/table/factories/ExternalCatalogFactory.java b/...k-table-common/src/main/java/org/apache/flink/table/factories/ExternalCatalogFactory.java
@@ -18,16 +18,17 @@
 
 package org.apache.flink.table.factories;
 
-import org.apache.flink.annotation.PublicEvolving;
 import org.apache.flink.table.catalog.ExternalCatalog;
 
 import java.util.Map;
 
 /**
  * A factory to create configured external catalog instances based on string-based properties. See
  * also {@link TableFactory} for more information.
+ *
+ * @deprecated use {@link CatalogFactory} instead.
  */
-@PublicEvolving
+@Deprecated
 public interface ExternalCatalogFactory extends TableFactory {
 
 	/**