From 8fca84b390bf781d70e0d14b2b4ac5d86a9164c0 Mon Sep 17 00:00:00 2001 From: Dan Halperin Date: Thu, 27 Apr 2017 15:35:10 -0700 Subject: [PATCH 1/2] [BEAM-59] LocalResources: helper utility to create LocalResourceId Primarily for testing. --- .../apache/beam/sdk/io/LocalResources.java | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 sdks/java/core/src/main/java/org/apache/beam/sdk/io/LocalResources.java diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/LocalResources.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/LocalResources.java new file mode 100644 index 000000000000..732f9ea41bac --- /dev/null +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/LocalResources.java @@ -0,0 +1,56 @@ +/* + * 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.beam.sdk.io; + +import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; +import org.apache.beam.sdk.io.fs.ResourceId; +import org.apache.beam.sdk.options.ValueProvider; +import org.apache.beam.sdk.options.ValueProvider.NestedValueProvider; +import org.apache.beam.sdk.transforms.SerializableFunction; + +/** + * Helper functions for producing a {@link ResourceId} that references a local file or directory. + */ +public final class LocalResources { + + public static ResourceId fromFile(File file, boolean isDirectory) { + return LocalResourceId.fromPath(Paths.get(file.getPath()), isDirectory); + } + + public static ResourceId fromPath(Path path, boolean isDirectory) { + return LocalResourceId.fromPath(path, isDirectory); + } + + public static ResourceId fromString(String filename, boolean isDirectory) { + return LocalResourceId.fromPath(Paths.get(filename), isDirectory); + } + + public static ValueProvider + fromString(ValueProvider resourceProvider, final boolean isDirectory) { + return NestedValueProvider.of(resourceProvider, new SerializableFunction() { + @Override + public ResourceId apply(String input) { + return fromString(input, isDirectory); + } + }); + } + + private LocalResources() {} // prevent instantiation +} From fd11e393b36fe3f25157119e8382de205c229bba Mon Sep 17 00:00:00 2001 From: Dan Halperin Date: Thu, 27 Apr 2017 16:14:07 -0700 Subject: [PATCH 2/2] fixup! [BEAM-59] LocalResources: helper utility to create LocalResourceId --- .../src/main/java/org/apache/beam/sdk/io/LocalResources.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/LocalResources.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/LocalResources.java index 732f9ea41bac..817829b1056d 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/LocalResources.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/LocalResources.java @@ -31,7 +31,7 @@ public final class LocalResources { public static ResourceId fromFile(File file, boolean isDirectory) { - return LocalResourceId.fromPath(Paths.get(file.getPath()), isDirectory); + return LocalResourceId.fromPath(file.toPath(), isDirectory); } public static ResourceId fromPath(Path path, boolean isDirectory) {