pnowojski commented on a change in pull request #8038: [FLINK-11953] Introduce Plugin/Loading system and integrate it with FileSystem URL: https://github.com/apache/flink/pull/8038#discussion_r272922309
########## File path: flink-core/src/main/java/org/apache/flink/core/plugin/DirectoryBasedPluginDescriptorsFactory.java ########## @@ -0,0 +1,108 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.core.plugin; + +import org.apache.flink.util.function.FunctionUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.net.URL; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.PathMatcher; +import java.util.Arrays; +import java.util.Collection; +import java.util.Comparator; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * This class is used to create a collection of {@link PluginDescriptor} based on directory structure for a given plugin + * root folder. + * + * <p>The expected structure is as follows: the given plugins root folder, containing the plugins folder. One plugin folder + * contains all resources (jar files) belonging to a plugin. The name of the plugin folder becomes the plugin id. + * <pre> + * plugins-root-folder/ + * |------------plugin-a/ (folder of plugin a) + * | |-plugin-a-1.jar (the jars containing the classes of plugin a) + * | |-plugin-a-2.jar + * | |-... + * | + * |------------plugin-b/ + * | |-plugin-b-1.jar + * ... |-... + * </pre> + */ +public class DirectoryBasedPluginDescriptorsFactory { + + private static final Logger log = LoggerFactory.getLogger(DirectoryBasedPluginDescriptorsFactory.class); + + private static final PathMatcher JAR_FILE_MATCHER = + FileSystems.getDefault().getPathMatcher("glob:**.jar"); + + private final Path pluginsRootDir; + + public DirectoryBasedPluginDescriptorsFactory(Path pluginsRootDir) { + this.pluginsRootDir = pluginsRootDir; + } + + //TODO this can go into an interface if there would be more strategies in the future. + public Collection<PluginDescriptor> createPluginDescriptors() throws IOException { + return Files.list(pluginsRootDir) + .filter((Path path) -> Files.isDirectory(path)) + .map(FunctionUtils.uncheckedFunction(this::createPluginDescriptorForSubDirectory)) + .filter(Optional::isPresent) + .map(Optional::get) + .collect(Collectors.toList()); + } + + private Optional<PluginDescriptor> createPluginDescriptorForSubDirectory(Path subDirectory) { + Optional<URL[]> jarURLsFromDirectory = createJarURLsFromDirectory(subDirectory); + if (jarURLsFromDirectory.isPresent()) { Review comment: nit: inverse if/else conditions or maybe use `Optional#map` method (`jarURLsFromDirectory.map(...)`)? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
