You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2017/04/27 23:30:54 UTC

[1/2] beam git commit: [BEAM-59] LocalResources: helper utility to create LocalResourceId

Repository: beam
Updated Branches:
  refs/heads/master a46eb1a80 -> f71395bfd


[BEAM-59] LocalResources: helper utility to create LocalResourceId

Primarily for testing.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/9a3b830c
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/9a3b830c
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/9a3b830c

Branch: refs/heads/master
Commit: 9a3b830c8737859c6afaa6e6e1922b037a78741f
Parents: a46eb1a
Author: Dan Halperin <dh...@google.com>
Authored: Thu Apr 27 15:35:10 2017 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Apr 27 16:30:41 2017 -0700

----------------------------------------------------------------------
 .../org/apache/beam/sdk/io/LocalResources.java  | 56 ++++++++++++++++++++
 1 file changed, 56 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/9a3b830c/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 0000000..817829b
--- /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(file.toPath(), 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<ResourceId>
+  fromString(ValueProvider<String> resourceProvider, final boolean isDirectory) {
+    return NestedValueProvider.of(resourceProvider, new SerializableFunction<String, ResourceId>() {
+      @Override
+      public ResourceId apply(String input) {
+        return fromString(input, isDirectory);
+      }
+    });
+  }
+
+  private LocalResources() {} // prevent instantiation
+}


[2/2] beam git commit: This closes #2751

Posted by dh...@apache.org.
This closes #2751


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/f71395bf
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/f71395bf
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/f71395bf

Branch: refs/heads/master
Commit: f71395bfd8f94cbe8d78098f5bb66a1dce65e74b
Parents: a46eb1a 9a3b830
Author: Dan Halperin <dh...@google.com>
Authored: Thu Apr 27 16:30:50 2017 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Apr 27 16:30:50 2017 -0700

----------------------------------------------------------------------
 .../org/apache/beam/sdk/io/LocalResources.java  | 56 ++++++++++++++++++++
 1 file changed, 56 insertions(+)
----------------------------------------------------------------------