flink-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tillrohrmann <...@git.apache.org>
Subject [GitHub] flink pull request #6178: [FLINK-9599][rest] Implement generic mechanism to ...
Date Wed, 20 Jun 2018 11:36:24 GMT
Github user tillrohrmann commented on a diff in the pull request:

    https://github.com/apache/flink/pull/6178#discussion_r196739865
  
    --- Diff: flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/FileUploads.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.runtime.rest.handler;
    +
    +import org.apache.flink.util.FileUtils;
    +import org.apache.flink.util.Preconditions;
    +
    +import java.io.FileNotFoundException;
    +import java.io.IOException;
    +import java.nio.file.FileVisitResult;
    +import java.nio.file.Files;
    +import java.nio.file.Path;
    +import java.nio.file.SimpleFileVisitor;
    +import java.nio.file.attribute.BasicFileAttributes;
    +import java.util.ArrayList;
    +import java.util.Collection;
    +import java.util.Collections;
    +
    +/**
    + * A container for uploaded files.
    + *
    + * <p>Implementation note: The constructor also accepts directories to ensure that
the upload directories are cleaned up.
    + * For convenience during testing it also accepts files directly.
    + */
    +public final class FileUploads implements AutoCloseable {
    +	private final Collection<Path> directoriesToClean;
    +	private final Collection<Path> uploadedFiles;
    +
    +	@SuppressWarnings("resource")
    +	public static final FileUploads EMPTY = new FileUploads();
    +
    +	private FileUploads() {
    +		this.directoriesToClean = Collections.emptyList();
    +		this.uploadedFiles = Collections.emptyList();
    +	}
    +
    +	public FileUploads(Collection<Path> uploadedFilesOrDirectory) throws IOException
{
    +		final Collection<Path> files = new ArrayList<>(4);
    +		final Collection<Path> directories = new ArrayList<>(1);
    +		for (Path fileOrDirectory : uploadedFilesOrDirectory) {
    +			Preconditions.checkArgument(fileOrDirectory.isAbsolute(), "Path must be absolute.");
    +			if (Files.isDirectory(fileOrDirectory)) {
    +				directories.add(fileOrDirectory);
    +				FileAdderVisitor visitor = new FileAdderVisitor();
    +				Files.walkFileTree(fileOrDirectory, visitor);
    +				files.addAll(visitor.getContainedFiles());
    +			} else {
    +				files.add(fileOrDirectory);
    +			}
    +		}
    +		directoriesToClean = Collections.unmodifiableCollection(directories);
    +		uploadedFiles = Collections.unmodifiableCollection(files);
    --- End diff --
    
    I think it is better to move this logic out of the constructor. Adding logic to a constructor
makes testing always difficult.


---

Mime
View raw message