[ https://issues.apache.org/jira/browse/FLINK-8558?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16543248#comment-16543248 ]
ASF GitHub Bot commented on FLINK-8558: --------------------------------------- Github user pnowojski commented on a diff in the pull request: https://github.com/apache/flink/pull/6323#discussion_r202334688 --- Diff: flink-libraries/flink-table/src/main/scala/org/apache/flink/table/factories/TableFactoryService.scala --- @@ -18,143 +18,358 @@ package org.apache.flink.table.factories -import java.util.{ServiceConfigurationError, ServiceLoader} +import java.util.{ServiceConfigurationError, ServiceLoader, Map => JMap} import org.apache.flink.table.api._ import org.apache.flink.table.descriptors.ConnectorDescriptorValidator._ import org.apache.flink.table.descriptors.FormatDescriptorValidator._ import org.apache.flink.table.descriptors.MetadataValidator._ import org.apache.flink.table.descriptors.StatisticsValidator._ -import org.apache.flink.table.descriptors.{DescriptorProperties, TableDescriptor, TableDescriptorValidator} +import org.apache.flink.table.descriptors._ import org.apache.flink.table.util.Logging +import org.apache.flink.util.Preconditions import _root_.scala.collection.JavaConverters._ import _root_.scala.collection.mutable /** - * Unified interface to search for TableFactoryDiscoverable of provided type and properties. + * Unified interface to search for a [[TableFactory]] of provided type and properties. */ object TableFactoryService extends Logging { private lazy val defaultLoader = ServiceLoader.load(classOf[TableFactory]) - def find(clz: Class[_], descriptor: TableDescriptor): TableFactory = { - find(clz, descriptor, null) + /** + * Finds a table factory of the given class and descriptor. + * + * @param factoryClass desired factory class + * @param descriptor descriptor describing the factory configuration + * @tparam T factory class type + * @return the matching factory + */ + def find[T](factoryClass: Class[T], descriptor: Descriptor): T = { + Preconditions.checkNotNull(factoryClass) + Preconditions.checkNotNull(descriptor) + + val descriptorProperties = new DescriptorProperties() + descriptor.addProperties(descriptorProperties) + findInternal(factoryClass, descriptorProperties.asMap, None) } - def find(clz: Class[_], descriptor: TableDescriptor, classLoader: ClassLoader) - : TableFactory = { + /** + * Finds a table factory of the given class, descriptor, and classloader. + * + * @param factoryClass desired factory class + * @param descriptor descriptor describing the factory configuration + * @param classLoader classloader for service loading + * @tparam T factory class type + * @return the matching factory + */ + def find[T](factoryClass: Class[T], descriptor: Descriptor, classLoader: ClassLoader): T = { + Preconditions.checkNotNull(factoryClass) + Preconditions.checkNotNull(descriptor) + Preconditions.checkNotNull(classLoader) - val properties = new DescriptorProperties() - descriptor.addProperties(properties) - find(clz, properties.asMap.asScala.toMap, classLoader) + val descriptorProperties = new DescriptorProperties() + descriptor.addProperties(descriptorProperties) + findInternal(factoryClass, descriptorProperties.asMap, None) } - def find(clz: Class[_], properties: Map[String, String]): TableFactory = { - find(clz: Class[_], properties, null) + /** + * Finds a table factory of the given class and property map. + * + * @param factoryClass desired factory class + * @param propertyMap properties that describe the factory configuration + * @tparam T factory class type + * @return the matching factory + */ + def find[T](factoryClass: Class[T], propertyMap: JMap[String, String]): T = { + Preconditions.checkNotNull(factoryClass) + Preconditions.checkNotNull(propertyMap) + + findInternal(factoryClass, propertyMap, None) } - def find(clz: Class[_], properties: Map[String, String], - classLoader: ClassLoader): TableFactory = { + /** + * Finds a table factory of the given class, property map, and classloader. + * + * @param factoryClass desired factory class + * @param propertyMap properties that describe the factory configuration + * @param classLoader classloader for service loading + * @tparam T factory class type + * @return the matching factory + */ + def find[T]( + factoryClass: Class[T], + propertyMap: JMap[String, String], + classLoader: ClassLoader) + : T = { + Preconditions.checkNotNull(factoryClass) + Preconditions.checkNotNull(propertyMap) + Preconditions.checkNotNull(classLoader) + + findInternal(factoryClass, propertyMap, Some(classLoader)) + } + + /** + * Finds a table factory of the given class, property map, and classloader. + * + * @param factoryClass desired factory class + * @param propertyMap properties that describe the factory configuration + * @param classLoader classloader for service loading + * @tparam T factory class type + * @return the matching factory + */ + private def findInternal[T]( + factoryClass: Class[T], + propertyMap: JMap[String, String], + classLoader: Option[ClassLoader]) + : T = { + + val properties = propertyMap.asScala.toMap + + // discover table factories --- End diff -- drop the comments? > Add unified format interfaces and format discovery > -------------------------------------------------- > > Key: FLINK-8558 > URL: https://issues.apache.org/jira/browse/FLINK-8558 > Project: Flink > Issue Type: New Feature > Components: Streaming Connectors > Reporter: Timo Walther > Assignee: Timo Walther > Priority: Major > Labels: pull-request-available > > In the last release, we introduced a new module {{flink-formats}}. Currently > only {{flink-avro}} is located there but we will add more formats such as > {{flink-json}}, {{flink-protobuf}}, and so on. For better separation of > concerns we want decouple connectors from formats: e.g., remove > {{KafkaAvroTableSource}} and {{KafkaJsonTableSource}}. > A newly introduced {{FormatFactory}} will use Java service loaders to > discovery available formats in the classpath (similar to how file systems are > discovered now). A {{Format}} will provide a method for converting {{byte[]}} > to target record type. -- This message was sent by Atlassian JIRA (v7.6.3#76005)