You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/07/06 17:20:25 UTC
[19/50] [abbrv] incubator-beam git commit: Static import
Preconditions.checkX everywhere
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/runners/spark/src/main/java/org/apache/beam/runners/spark/io/hadoop/HadoopIO.java
----------------------------------------------------------------------
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/io/hadoop/HadoopIO.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/io/hadoop/HadoopIO.java
index 00c10d4..1177a57 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/io/hadoop/HadoopIO.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/io/hadoop/HadoopIO.java
@@ -17,6 +17,9 @@
*/
package org.apache.beam.runners.spark.io.hadoop;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.io.ShardNameTemplate;
import org.apache.beam.sdk.transforms.PTransform;
import org.apache.beam.sdk.util.WindowingStrategy;
@@ -25,8 +28,6 @@ import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PDone;
import org.apache.beam.sdk.values.PInput;
-import com.google.common.base.Preconditions;
-
import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
@@ -68,14 +69,10 @@ public final class HadoopIO {
Bound(String filepattern, Class<? extends FileInputFormat<K, V>> format, Class<K> key,
Class<V> value) {
- Preconditions.checkNotNull(filepattern,
- "need to set the filepattern of an HadoopIO.Read transform");
- Preconditions.checkNotNull(format,
- "need to set the format class of an HadoopIO.Read transform");
- Preconditions.checkNotNull(key,
- "need to set the key class of an HadoopIO.Read transform");
- Preconditions.checkNotNull(value,
- "need to set the value class of an HadoopIO.Read transform");
+ checkNotNull(filepattern, "need to set the filepattern of an HadoopIO.Read transform");
+ checkNotNull(format, "need to set the format class of an HadoopIO.Read transform");
+ checkNotNull(key, "need to set the key class of an HadoopIO.Read transform");
+ checkNotNull(value, "need to set the value class of an HadoopIO.Read transform");
this.filepattern = filepattern;
this.formatClass = format;
this.keyClass = key;
@@ -203,17 +200,16 @@ public final class HadoopIO {
@Override
public PDone apply(PCollection<KV<K, V>> input) {
- Preconditions.checkNotNull(filenamePrefix,
- "need to set the filename prefix of an HadoopIO.Write transform");
- Preconditions.checkNotNull(formatClass,
- "need to set the format class of an HadoopIO.Write transform");
- Preconditions.checkNotNull(keyClass,
- "need to set the key class of an HadoopIO.Write transform");
- Preconditions.checkNotNull(valueClass,
- "need to set the value class of an HadoopIO.Write transform");
-
- Preconditions.checkArgument(ShardNameTemplateAware.class.isAssignableFrom(formatClass),
- "Format class must implement " + ShardNameTemplateAware.class.getName());
+ checkNotNull(
+ filenamePrefix, "need to set the filename prefix of an HadoopIO.Write transform");
+ checkNotNull(formatClass, "need to set the format class of an HadoopIO.Write transform");
+ checkNotNull(keyClass, "need to set the key class of an HadoopIO.Write transform");
+ checkNotNull(valueClass, "need to set the value class of an HadoopIO.Write transform");
+
+ checkArgument(
+ ShardNameTemplateAware.class.isAssignableFrom(formatClass),
+ "Format class must implement %s",
+ ShardNameTemplateAware.class.getName());
return PDone.in(input.getPipeline());
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java
index e264bc6..31ae2dc 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/Pipeline.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk;
+import static com.google.common.base.Preconditions.checkState;
+
import org.apache.beam.sdk.coders.CoderRegistry;
import org.apache.beam.sdk.io.Read;
import org.apache.beam.sdk.options.PipelineOptions;
@@ -34,7 +36,6 @@ import org.apache.beam.sdk.values.PInput;
import org.apache.beam.sdk.values.POutput;
import org.apache.beam.sdk.values.PValue;
-import com.google.common.base.Preconditions;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
@@ -492,8 +493,8 @@ public class Pipeline {
public String getFullNameForTesting(PTransform<?, ?> transform) {
Collection<AppliedPTransform<?, ?, ?>> uses =
transformApplicationsForTesting.get(transform);
- Preconditions.checkState(uses.size() > 0, "Unknown transform: " + transform);
- Preconditions.checkState(uses.size() <= 1, "Transform used multiple times: " + transform);
+ checkState(uses.size() > 0, "Unknown transform: " + transform);
+ checkState(uses.size() <= 1, "Transform used multiple times: " + transform);
return Iterables.getOnlyElement(uses).getFullName();
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
index 71e99f7..d2666f0 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/Coder.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.coders;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.annotations.Experimental.Kind;
import org.apache.beam.sdk.util.CloudObject;
@@ -25,7 +27,6 @@ import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
import com.google.common.base.Joiner;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
import java.io.IOException;
import java.io.InputStream;
@@ -281,8 +282,7 @@ public interface Coder<T> extends Serializable {
List<String> reasons,
@Nullable NonDeterministicException cause) {
super(cause);
- Preconditions.checkArgument(reasons.size() > 0,
- "Reasons must not be empty.");
+ checkArgument(reasons.size() > 0, "Reasons must not be empty.");
this.reasons = reasons;
this.coder = coder;
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java
index 3e4c6d2..9c3fabe 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CoderRegistry.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.coders;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.coders.CannotProvideCoderException.ReasonCode;
import org.apache.beam.sdk.coders.protobuf.ProtoCoder;
import org.apache.beam.sdk.transforms.SerializableFunction;
@@ -27,7 +29,6 @@ import org.apache.beam.sdk.values.TypeDescriptor;
import com.google.api.services.bigquery.model.TableRow;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.protobuf.ByteString;
@@ -161,7 +162,7 @@ public class CoderRegistry implements CoderProvider {
* appropriate static methods and register it directly via {@link #registerCoder(Class, Class)}.
*/
public <T> void registerCoder(Class<T> rawClazz, Coder<T> coder) {
- Preconditions.checkArgument(
+ checkArgument(
rawClazz.getTypeParameters().length == 0,
"CoderRegistry.registerCoder(Class<T>, Coder<T>) may not be used "
+ "with unspecialized generic classes");
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CollectionCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CollectionCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CollectionCoder.java
index 9f997c0..f40d5f0 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CollectionCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/CollectionCoder.java
@@ -17,9 +17,9 @@
*/
package org.apache.beam.sdk.coders;
-import org.apache.beam.sdk.util.PropertyNames;
+import static com.google.common.base.Preconditions.checkArgument;
-import com.google.common.base.Preconditions;
+import org.apache.beam.sdk.util.PropertyNames;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -55,8 +55,7 @@ public class CollectionCoder<T> extends IterableLikeCoder<T, Collection<T>> {
public static CollectionCoder<?> of(
@JsonProperty(PropertyNames.COMPONENT_ENCODINGS)
List<Object> components) {
- Preconditions.checkArgument(components.size() == 1,
- "Expecting 1 component, got " + components.size());
+ checkArgument(components.size() == 1, "Expecting 1 component, got %s", components.size());
return of((Coder<?>) components.get(0));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableCoder.java
index 546a240..2e5a8cc 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableCoder.java
@@ -19,11 +19,11 @@ package org.apache.beam.sdk.coders;
import static org.apache.beam.sdk.util.Structs.addBoolean;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.util.CloudObject;
import org.apache.beam.sdk.util.PropertyNames;
-import com.google.common.base.Preconditions;
-
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -53,8 +53,7 @@ public class IterableCoder<T> extends IterableLikeCoder<T, Iterable<T>> {
public static IterableCoder<?> of(
@JsonProperty(PropertyNames.COMPONENT_ENCODINGS)
List<Coder<?>> components) {
- Preconditions.checkArgument(components.size() == 1,
- "Expecting 1 component, got " + components.size());
+ checkArgument(components.size() == 1, "Expecting 1 component, got %s", components.size());
return of(components.get(0));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableLikeCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableLikeCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableLikeCoder.java
index 74e3dd3..9417d85 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableLikeCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/IterableLikeCoder.java
@@ -17,13 +17,13 @@
*/
package org.apache.beam.sdk.coders;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.util.BufferedElementCountingOutputStream;
import org.apache.beam.sdk.util.VarInt;
import org.apache.beam.sdk.util.common.ElementByteSizeObservableIterable;
import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
-import com.google.common.base.Preconditions;
-
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -89,10 +89,8 @@ public abstract class IterableLikeCoder<T, IterableT extends Iterable<T>>
}
protected IterableLikeCoder(Coder<T> elementCoder, String iterableName) {
- Preconditions.checkArgument(elementCoder != null,
- "element Coder for IterableLikeCoder must not be null");
- Preconditions.checkArgument(iterableName != null,
- "iterable name for IterableLikeCoder must not be null");
+ checkArgument(elementCoder != null, "element Coder for IterableLikeCoder must not be null");
+ checkArgument(iterableName != null, "iterable name for IterableLikeCoder must not be null");
this.elementCoder = elementCoder;
this.iterableName = iterableName;
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/KvCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/KvCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/KvCoder.java
index 1dd28c9..beeb9c5 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/KvCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/KvCoder.java
@@ -19,13 +19,13 @@ package org.apache.beam.sdk.coders;
import static org.apache.beam.sdk.util.Structs.addBoolean;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.util.CloudObject;
import org.apache.beam.sdk.util.PropertyNames;
import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
import org.apache.beam.sdk.values.KV;
-import com.google.common.base.Preconditions;
-
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -51,8 +51,7 @@ public class KvCoder<K, V> extends StandardCoder<KV<K, V>> {
public static KvCoder<?, ?> of(
@JsonProperty(PropertyNames.COMPONENT_ENCODINGS)
List<Coder<?>> components) {
- Preconditions.checkArgument(components.size() == 2,
- "Expecting 2 components, got " + components.size());
+ checkArgument(components.size() == 2, "Expecting 2 components, got %s", components.size());
return of(components.get(0), components.get(1));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ListCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ListCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ListCoder.java
index c45559a..f8437a4 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ListCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/ListCoder.java
@@ -17,9 +17,9 @@
*/
package org.apache.beam.sdk.coders;
-import org.apache.beam.sdk.util.PropertyNames;
+import static com.google.common.base.Preconditions.checkArgument;
-import com.google.common.base.Preconditions;
+import org.apache.beam.sdk.util.PropertyNames;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -49,8 +49,7 @@ public class ListCoder<T> extends IterableLikeCoder<T, List<T>> {
public static ListCoder<?> of(
@JsonProperty(PropertyNames.COMPONENT_ENCODINGS)
List<Coder<?>> components) {
- Preconditions.checkArgument(components.size() == 1,
- "Expecting 1 component, got " + components.size());
+ checkArgument(components.size() == 1, "Expecting 1 component, got %s", components.size());
return of((Coder<?>) components.get(0));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java
index b77a39f..044fff1 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/MapCoder.java
@@ -17,10 +17,11 @@
*/
package org.apache.beam.sdk.coders;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.util.PropertyNames;
import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.fasterxml.jackson.annotation.JsonCreator;
@@ -57,8 +58,7 @@ public class MapCoder<K, V> extends StandardCoder<Map<K, V>> {
public static MapCoder<?, ?> of(
@JsonProperty(PropertyNames.COMPONENT_ENCODINGS)
List<Coder<?>> components) {
- Preconditions.checkArgument(components.size() == 2,
- "Expecting 2 components, got " + components.size());
+ checkArgument(components.size() == 2, "Expecting 2 components, got %s", components.size());
return of((Coder<?>) components.get(0), (Coder<?>) components.get(1));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java
index 6fa7305..a8ce873 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/NullableCoder.java
@@ -17,11 +17,12 @@
*/
package org.apache.beam.sdk.coders;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.util.PropertyNames;
import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.fasterxml.jackson.annotation.JsonCreator;
@@ -54,8 +55,7 @@ public class NullableCoder<T> extends StandardCoder<T> {
public static NullableCoder<?> of(
@JsonProperty(PropertyNames.COMPONENT_ENCODINGS)
List<Coder<?>> components) {
- Preconditions.checkArgument(components.size() == 1,
- "Expecting 1 components, got " + components.size());
+ checkArgument(components.size() == 1, "Expecting 1 components, got %s", components.size());
return of(components.get(0));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SetCoder.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SetCoder.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SetCoder.java
index d194a53..fcbb379 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SetCoder.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/coders/SetCoder.java
@@ -17,9 +17,9 @@
*/
package org.apache.beam.sdk.coders;
-import org.apache.beam.sdk.util.PropertyNames;
+import static com.google.common.base.Preconditions.checkArgument;
-import com.google.common.base.Preconditions;
+import org.apache.beam.sdk.util.PropertyNames;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -50,8 +50,7 @@ public class SetCoder<T> extends IterableLikeCoder<T, Set<T>> {
public static SetCoder<?> of(
@JsonProperty(PropertyNames.COMPONENT_ENCODINGS)
List<Object> components) {
- Preconditions.checkArgument(components.size() == 1,
- "Expecting 1 component, got " + components.size());
+ checkArgument(components.size() == 1, "Expecting 1 component, got %s", components.size());
return of((Coder<?>) components.get(0));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java
index 604051b..280cd12 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroIO.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.io;
+import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import org.apache.beam.sdk.coders.AvroCoder;
@@ -34,7 +35,6 @@ import org.apache.beam.sdk.values.PDone;
import org.apache.beam.sdk.values.PInput;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import org.apache.avro.Schema;
import org.apache.avro.file.DataFileWriter;
@@ -540,7 +540,7 @@ public class AvroIO {
* @see ShardNameTemplate
*/
public Bound<T> withNumShards(int numShards) {
- Preconditions.checkArgument(numShards >= 0);
+ checkArgument(numShards >= 0);
return new Bound<>(
name, filenamePrefix, filenameSuffix, numShards, shardTemplate, type, schema, validate);
}
@@ -729,7 +729,7 @@ public class AvroIO {
private static final Pattern SHARD_OUTPUT_PATTERN = Pattern.compile("@([0-9]+|\\*)");
private static void validateOutputComponent(String partialFilePattern) {
- Preconditions.checkArgument(
+ checkArgument(
!SHARD_OUTPUT_PATTERN.matcher(partialFilePattern).find(),
"Output name components are not allowed to contain @* or @N patterns: "
+ partialFilePattern);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java
index 9cc0b98..22e9dfe 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/AvroSource.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.io;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import org.apache.beam.sdk.annotations.Experimental;
@@ -27,8 +29,6 @@ import org.apache.beam.sdk.util.AvroUtils;
import org.apache.beam.sdk.util.AvroUtils.AvroMetadata;
import org.apache.beam.sdk.values.PCollection;
-import com.google.common.base.Preconditions;
-
import org.apache.avro.Schema;
import org.apache.avro.file.CodecFactory;
import org.apache.avro.file.DataFileConstants;
@@ -265,7 +265,7 @@ public class AvroSource<T> extends BlockBasedSource<T> {
AvroMetadata metadata;
try {
Collection<String> files = FileBasedSource.expandFilePattern(fileName);
- Preconditions.checkArgument(files.size() <= 1, "More than 1 file matched %s");
+ checkArgument(files.size() <= 1, "More than 1 file matched %s");
metadata = AvroUtils.readMetadataFromFile(fileName);
} catch (IOException e) {
throw new RuntimeException("Error reading metadata from file " + fileName, e);
@@ -343,10 +343,8 @@ public class AvroSource<T> extends BlockBasedSource<T> {
private DatumReader<T> createDatumReader() {
Schema readSchema = getReadSchema();
Schema fileSchema = getFileSchema();
- Preconditions.checkNotNull(
- readSchema, "No read schema has been initialized for source %s", this);
- Preconditions.checkNotNull(
- fileSchema, "No file schema has been initialized for source %s", this);
+ checkNotNull(readSchema, "No read schema has been initialized for source %s", this);
+ checkNotNull(fileSchema, "No file schema has been initialized for source %s", this);
if (type == GenericRecord.class) {
return new GenericDatumReader<>(fileSchema, readSchema);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java
index 48e0b7a..ee4b84b 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/CompressedSource.java
@@ -17,12 +17,14 @@
*/
package org.apache.beam.sdk.io;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.transforms.display.DisplayData;
-import com.google.common.base.Preconditions;
import com.google.common.io.ByteStreams;
import com.google.common.primitives.Ints;
@@ -316,7 +318,7 @@ public class CompressedSource<T> extends FileBasedSource<T> {
DecompressingChannelFactory channelFactory, String filePatternOrSpec, long minBundleSize,
long startOffset, long endOffset) {
super(filePatternOrSpec, minBundleSize, startOffset, endOffset);
- Preconditions.checkArgument(
+ checkArgument(
startOffset == 0,
"CompressedSources must start reading at offset 0. Requested offset: " + startOffset);
this.sourceDelegate = sourceDelegate;
@@ -329,9 +331,9 @@ public class CompressedSource<T> extends FileBasedSource<T> {
@Override
public void validate() {
super.validate();
- Preconditions.checkNotNull(sourceDelegate);
+ checkNotNull(sourceDelegate);
sourceDelegate.validate();
- Preconditions.checkNotNull(channelFactory);
+ checkNotNull(channelFactory);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java
index 7fab79d..7abda71 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/DatastoreIO.java
@@ -47,7 +47,6 @@ import com.google.api.client.util.BackOff;
import com.google.api.client.util.BackOffUtils;
import com.google.api.client.util.Sleeper;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.primitives.Ints;
import com.google.datastore.v1beta3.CommitRequest;
@@ -307,8 +306,8 @@ public class DatastoreIO {
@Override
public void validate() {
- Preconditions.checkNotNull(query, "query");
- Preconditions.checkNotNull(projectId, "projectId");
+ checkNotNull(query, "query");
+ checkNotNull(projectId, "projectId");
}
@Override
@@ -548,7 +547,7 @@ public class DatastoreIO {
*/
@Override
public void validate(PipelineOptions options) {
- Preconditions.checkNotNull(
+ checkNotNull(
projectId,
"Project ID is a required parameter. Please use withProject to to set the projectId.");
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java
index 521f54b..02fc63a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/FileBasedSink.java
@@ -17,6 +17,10 @@
*/
package org.apache.beam.sdk.io;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.SerializableCoder;
import org.apache.beam.sdk.options.PipelineOptions;
@@ -29,7 +33,6 @@ import org.apache.beam.sdk.util.IOChannelFactory;
import org.apache.beam.sdk.util.IOChannelUtils;
import org.apache.beam.sdk.util.MimeTypes;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Ordering;
import org.slf4j.Logger;
@@ -112,7 +115,7 @@ public abstract class FileBasedSink<T> extends Sink<T> {
/**
* Perform pipeline-construction-time validation. The default implementation is a no-op.
* Subclasses should override to ensure the sink is valid and can be written to. It is recommended
- * to use {@link Preconditions} in the implementation of this method.
+ * to use {@link Preconditions#checkState(boolean)} in the implementation of this method.
*/
@Override
public void validate(PipelineOptions options) {}
@@ -366,7 +369,7 @@ public abstract class FileBasedSink<T> extends Sink<T> {
}
int numDistinctShards = new HashSet<String>(destFilenames).size();
- Preconditions.checkState(numDistinctShards == numFiles,
+ checkState(numDistinctShards == numFiles,
"Shard name template '%s' only generated %s distinct file names for %s files.",
fileNamingTemplate, numDistinctShards, numFiles);
@@ -458,7 +461,7 @@ public abstract class FileBasedSink<T> extends Sink<T> {
* Construct a new FileBasedWriter with a base filename.
*/
public FileBasedWriter(FileBasedWriteOperation<T> writeOperation) {
- Preconditions.checkNotNull(writeOperation);
+ checkNotNull(writeOperation);
this.writeOperation = writeOperation;
}
@@ -628,7 +631,7 @@ public abstract class FileBasedSink<T> extends Sink<T> {
@Override
public void copy(List<String> srcFilenames, List<String> destFilenames) throws IOException {
- Preconditions.checkArgument(
+ checkArgument(
srcFilenames.size() == destFilenames.size(),
"Number of source files %s must equal number of destination files %s",
srcFilenames.size(),
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/OffsetBasedSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/OffsetBasedSource.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/OffsetBasedSource.java
index 295eab9..d5a6801 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/OffsetBasedSource.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/OffsetBasedSource.java
@@ -17,13 +17,13 @@
*/
package org.apache.beam.sdk.io;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.io.range.OffsetRangeTracker;
import org.apache.beam.sdk.io.range.RangeTracker;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.transforms.display.DisplayData;
-import com.google.common.base.Preconditions;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -141,17 +141,17 @@ public abstract class OffsetBasedSource<T> extends BoundedSource<T> {
@Override
public void validate() {
- Preconditions.checkArgument(
+ checkArgument(
this.startOffset >= 0,
"Start offset has value %s, must be non-negative", this.startOffset);
- Preconditions.checkArgument(
+ checkArgument(
this.endOffset >= 0,
"End offset has value %s, must be non-negative", this.endOffset);
- Preconditions.checkArgument(
+ checkArgument(
this.startOffset < this.endOffset,
"Start offset %s must be before end offset %s",
this.startOffset, this.endOffset);
- Preconditions.checkArgument(
+ checkArgument(
this.minBundleSize >= 0,
"minBundleSize has value %s, must be non-negative",
this.minBundleSize);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
index 7e7a3e6..9dd3679 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/TextIO.java
@@ -17,6 +17,7 @@
*/
package org.apache.beam.sdk.io;
+import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import org.apache.beam.sdk.coders.Coder;
@@ -34,7 +35,6 @@ import org.apache.beam.sdk.values.PDone;
import org.apache.beam.sdk.values.PInput;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.protobuf.ByteString;
import java.io.IOException;
@@ -538,7 +538,7 @@ public class TextIO {
* @see ShardNameTemplate
*/
public Bound<T> withNumShards(int numShards) {
- Preconditions.checkArgument(numShards >= 0);
+ checkArgument(numShards >= 0);
return new Bound<>(name, filenamePrefix, filenameSuffix, coder, numShards,
shardTemplate, validate);
}
@@ -718,7 +718,7 @@ public class TextIO {
private static final Pattern SHARD_OUTPUT_PATTERN = Pattern.compile("@([0-9]+|\\*)");
private static void validateOutputComponent(String partialFilePattern) {
- Preconditions.checkArgument(
+ checkArgument(
!SHARD_OUTPUT_PATTERN.matcher(partialFilePattern).find(),
"Output name components are not allowed to contain @* or @N patterns: "
+ partialFilePattern);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSink.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSink.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSink.java
index bbe68d9..ef50a1c 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSink.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSink.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.io;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.coders.StringUtf8Coder;
import org.apache.beam.sdk.io.FileBasedSink.FileBasedWriteOperation;
import org.apache.beam.sdk.io.FileBasedSink.FileBasedWriter;
@@ -25,8 +27,6 @@ import org.apache.beam.sdk.transforms.display.DisplayData;
import org.apache.beam.sdk.util.CoderUtils;
import org.apache.beam.sdk.values.PCollection;
-import com.google.common.base.Preconditions;
-
import java.io.OutputStream;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
@@ -205,9 +205,9 @@ public class XmlSink {
*/
@Override
public void validate(PipelineOptions options) {
- Preconditions.checkNotNull(classToBind, "Missing a class to bind to a JAXB context.");
- Preconditions.checkNotNull(rootElementName, "Missing a root element name.");
- Preconditions.checkNotNull(baseOutputFilename, "Missing a filename to write to.");
+ checkNotNull(classToBind, "Missing a class to bind to a JAXB context.");
+ checkNotNull(rootElementName, "Missing a root element name.");
+ checkNotNull(baseOutputFilename, "Missing a filename to write to.");
try {
JAXBContext.newInstance(classToBind);
} catch (JAXBException e) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSource.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSource.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSource.java
index 56651e8..83443a3 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSource.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/io/XmlSource.java
@@ -17,14 +17,14 @@
*/
package org.apache.beam.sdk.io;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.JAXBCoder;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.runners.PipelineRunner;
import org.apache.beam.sdk.transforms.display.DisplayData;
-import com.google.common.base.Preconditions;
-
import org.codehaus.stax2.XMLInputFactory2;
import java.io.ByteArrayInputStream;
@@ -39,6 +39,7 @@ import java.nio.channels.Channels;
import java.nio.channels.ReadableByteChannel;
import java.nio.charset.StandardCharsets;
import java.util.NoSuchElementException;
+
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
@@ -209,12 +210,12 @@ public class XmlSource<T> extends FileBasedSource<T> {
@Override
public void validate() {
super.validate();
- Preconditions.checkNotNull(
+ checkNotNull(
rootElement, "rootElement is null. Use builder method withRootElement() to set this.");
- Preconditions.checkNotNull(
+ checkNotNull(
recordElement,
"recordElement is null. Use builder method withRecordElement() to set this.");
- Preconditions.checkNotNull(
+ checkNotNull(
recordClass, "recordClass is null. Use builder method withRecordClass() to set this.");
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java
index 5f2dd11..3cb1377 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsFactory.java
@@ -18,6 +18,7 @@
package org.apache.beam.sdk.options;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
import org.apache.beam.sdk.options.Validation.Required;
import org.apache.beam.sdk.runners.PipelineRunner;
@@ -30,7 +31,6 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.collect.Collections2;
@@ -239,7 +239,7 @@ public class PipelineOptionsFactory {
* {@link PipelineOptionsFactory#printHelp(PrintStream, Class)}.
*/
public Builder fromArgs(String[] args) {
- Preconditions.checkNotNull(args, "Arguments should not be null.");
+ checkNotNull(args, "Arguments should not be null.");
return new Builder(args, validation, strictParsing);
}
@@ -549,8 +549,8 @@ public class PipelineOptionsFactory {
* @param iface The interface object to manually register.
*/
public static synchronized void register(Class<? extends PipelineOptions> iface) {
- Preconditions.checkNotNull(iface);
- Preconditions.checkArgument(iface.isInterface(), "Only interface types are supported.");
+ checkNotNull(iface);
+ checkArgument(iface.isInterface(), "Only interface types are supported.");
if (REGISTERED_OPTIONS.contains(iface)) {
return;
@@ -608,7 +608,7 @@ public class PipelineOptionsFactory {
*/
static synchronized <T extends PipelineOptions> Registration<T> validateWellFormed(
Class<T> iface, Set<Class<? extends PipelineOptions>> validatedPipelineOptionsInterfaces) {
- Preconditions.checkArgument(iface.isInterface(), "Only interface types are supported.");
+ checkArgument(iface.isInterface(), "Only interface types are supported.");
@SuppressWarnings("unchecked")
Set<Class<? extends PipelineOptions>> combinedPipelineOptionsInterfaces =
@@ -659,7 +659,7 @@ public class PipelineOptionsFactory {
* format its output to be compatible with a terminal window.
*/
public static void printHelp(PrintStream out) {
- Preconditions.checkNotNull(out);
+ checkNotNull(out);
out.println("The set of registered options are:");
Set<Class<? extends PipelineOptions>> sortedOptions =
new TreeSet<>(ClassNameComparator.INSTANCE);
@@ -691,8 +691,8 @@ public class PipelineOptionsFactory {
* This method will attempt to format its output to be compatible with a terminal window.
*/
public static void printHelp(PrintStream out, Class<? extends PipelineOptions> iface) {
- Preconditions.checkNotNull(out);
- Preconditions.checkNotNull(iface);
+ checkNotNull(out);
+ checkNotNull(iface);
validateWellFormed(iface, REGISTERED_OPTIONS);
Set<PipelineOptionSpec> properties =
@@ -1116,7 +1116,7 @@ public class PipelineOptionsFactory {
Sets.filter(
Sets.difference(Sets.newHashSet(klass.getMethods()), methods),
NOT_SYNTHETIC_PREDICATE));
- Preconditions.checkArgument(unknownMethods.isEmpty(),
+ checkArgument(unknownMethods.isEmpty(),
"Methods %s on [%s] do not conform to being bean properties.",
FluentIterable.from(unknownMethods).transform(ReflectHelpers.METHOD_FORMATTER),
iface.getName());
@@ -1329,11 +1329,11 @@ public class PipelineOptionsFactory {
continue;
}
try {
- Preconditions.checkArgument(arg.startsWith("--"),
+ checkArgument(arg.startsWith("--"),
"Argument '%s' does not begin with '--'", arg);
int index = arg.indexOf("=");
// Make sure that '=' isn't the first character after '--' or the last character
- Preconditions.checkArgument(index != 2,
+ checkArgument(index != 2,
"Argument '%s' starts with '--=', empty argument name not allowed", arg);
if (index > 0) {
builder.put(arg.substring(2, index), arg.substring(index + 1, arg.length()));
@@ -1448,7 +1448,7 @@ public class PipelineOptionsFactory {
if (returnType.isArray() && !returnType.getComponentType().equals(String.class)) {
for (String value : values) {
- Preconditions.checkArgument(!value.isEmpty(),
+ checkArgument(!value.isEmpty(),
"Empty argument value is only allowed for String, String Array, and Collection,"
+ " but received: " + returnType);
}
@@ -1456,13 +1456,13 @@ public class PipelineOptionsFactory {
convertedOptions.put(entry.getKey(), MAPPER.convertValue(values, type));
} else if (SIMPLE_TYPES.contains(returnType) || returnType.isEnum()) {
String value = Iterables.getOnlyElement(entry.getValue());
- Preconditions.checkArgument(returnType.equals(String.class) || !value.isEmpty(),
+ checkArgument(returnType.equals(String.class) || !value.isEmpty(),
"Empty argument value is only allowed for String, String Array, and Collection,"
+ " but received: " + returnType);
convertedOptions.put(entry.getKey(), MAPPER.convertValue(value, type));
} else {
String value = Iterables.getOnlyElement(entry.getValue());
- Preconditions.checkArgument(returnType.equals(String.class) || !value.isEmpty(),
+ checkArgument(returnType.equals(String.class) || !value.isEmpty(),
"Empty argument value is only allowed for String, String Array, and Collection,"
+ " but received: " + returnType);
try {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsValidator.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsValidator.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsValidator.java
index 4946c59..70be65f 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsValidator.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/PipelineOptionsValidator.java
@@ -17,10 +17,12 @@
*/
package org.apache.beam.sdk.options;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.options.Validation.Required;
import org.apache.beam.sdk.util.common.ReflectHelpers;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Collections2;
import com.google.common.collect.Ordering;
import com.google.common.collect.SortedSetMultimap;
@@ -46,11 +48,10 @@ public class PipelineOptionsValidator {
* @return The type
*/
public static <T extends PipelineOptions> T validate(Class<T> klass, PipelineOptions options) {
- Preconditions.checkNotNull(klass);
- Preconditions.checkNotNull(options);
- Preconditions.checkArgument(Proxy.isProxyClass(options.getClass()));
- Preconditions.checkArgument(Proxy.getInvocationHandler(options)
- instanceof ProxyInvocationHandler);
+ checkNotNull(klass);
+ checkNotNull(options);
+ checkArgument(Proxy.isProxyClass(options.getClass()));
+ checkArgument(Proxy.getInvocationHandler(options) instanceof ProxyInvocationHandler);
// Ensure the methods for T are registered on the ProxyInvocationHandler
T asClassOptions = options.as(klass);
@@ -68,8 +69,9 @@ public class PipelineOptionsValidator {
requiredGroups.put(requiredGroup, method);
}
} else {
- Preconditions.checkArgument(handler.invoke(asClassOptions, method, null) != null,
- "Missing required value for [" + method + ", \"" + getDescription(method) + "\"]. ");
+ checkArgument(handler.invoke(asClassOptions, method, null) != null,
+ "Missing required value for [%s, \"%s\"]. ",
+ method, getDescription(method));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/options/ProxyInvocationHandler.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/ProxyInvocationHandler.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/ProxyInvocationHandler.java
index a0c4ea3..e3d763b 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/options/ProxyInvocationHandler.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/options/ProxyInvocationHandler.java
@@ -17,6 +17,9 @@
*/
package org.apache.beam.sdk.options;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.options.PipelineOptionsFactory.JsonIgnorePredicate;
import org.apache.beam.sdk.options.PipelineOptionsFactory.Registration;
import org.apache.beam.sdk.transforms.display.DisplayData;
@@ -27,7 +30,6 @@ import org.apache.beam.sdk.util.common.ReflectHelpers;
import com.google.auto.value.AutoValue;
import com.google.common.base.Defaults;
import com.google.common.base.Function;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ClassToInstanceMap;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.HashMultimap;
@@ -67,6 +69,7 @@ import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
+
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
@@ -202,8 +205,8 @@ class ProxyInvocationHandler implements InvocationHandler, HasDisplayData {
* @return An object that implements the interface <T>.
*/
synchronized <T extends PipelineOptions> T as(Class<T> iface) {
- Preconditions.checkNotNull(iface);
- Preconditions.checkArgument(iface.isInterface());
+ checkNotNull(iface);
+ checkArgument(iface.isInterface());
if (!interfaceToProxyCache.containsKey(iface)) {
Registration<T> registration =
PipelineOptionsFactory.validateWellFormed(iface, knownInterfaces);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/PipelineRunner.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/PipelineRunner.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/PipelineRunner.java
index 941debb..ede1507 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/PipelineRunner.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/PipelineRunner.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.runners;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.PipelineResult;
import org.apache.beam.sdk.options.GcsOptions;
@@ -28,8 +30,6 @@ import org.apache.beam.sdk.util.InstanceBuilder;
import org.apache.beam.sdk.values.PInput;
import org.apache.beam.sdk.values.POutput;
-import com.google.common.base.Preconditions;
-
/**
* A {@link PipelineRunner} can execute, translate, or otherwise process a
* {@link Pipeline}.
@@ -45,7 +45,7 @@ public abstract class PipelineRunner<ResultT extends PipelineResult> {
*/
public static PipelineRunner<? extends PipelineResult> fromOptions(PipelineOptions options) {
GcsOptions gcsOptions = PipelineOptionsValidator.validate(GcsOptions.class, options);
- Preconditions.checkNotNull(options);
+ checkNotNull(options);
// (Re-)register standard IO factories. Clobbers any prior credentials.
IOChannelUtils.registerStandardIOFactories(gcsOptions);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java
index 6aeaf5f..6b93bbd 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformHierarchy.java
@@ -17,13 +17,13 @@
*/
package org.apache.beam.sdk.runners;
+import static com.google.common.base.Preconditions.checkState;
+
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.values.PInput;
import org.apache.beam.sdk.values.POutput;
import org.apache.beam.sdk.values.PValue;
-import com.google.common.base.Preconditions;
-
import java.util.Deque;
import java.util.HashMap;
import java.util.LinkedList;
@@ -65,7 +65,7 @@ public class TransformHierarchy {
*/
public void popNode() {
transformStack.pop();
- Preconditions.checkState(!transformStack.isEmpty());
+ checkState(!transformStack.isEmpty());
}
/**
@@ -76,9 +76,7 @@ public class TransformHierarchy {
public void addInput(TransformTreeNode node, PInput input) {
for (PValue i : input.expand()) {
TransformTreeNode producer = producingTransformNode.get(i);
- if (producer == null) {
- throw new IllegalStateException("Producer unknown for input: " + i);
- }
+ checkState(producer != null, "Producer unknown for input: %s", i);
producer.finishSpecifying();
node.addInputProducer(i, producer);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformTreeNode.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformTreeNode.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformTreeNode.java
index 59edd52..b5a250b 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformTreeNode.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/TransformTreeNode.java
@@ -17,6 +17,9 @@
*/
package org.apache.beam.sdk.runners;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+
import org.apache.beam.sdk.Pipeline.PipelineVisitor;
import org.apache.beam.sdk.Pipeline.PipelineVisitor.CompositeBehavior;
import org.apache.beam.sdk.transforms.PTransform;
@@ -24,8 +27,6 @@ import org.apache.beam.sdk.values.PInput;
import org.apache.beam.sdk.values.POutput;
import org.apache.beam.sdk.values.PValue;
-import com.google.common.base.Preconditions;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -82,7 +83,7 @@ public class TransformTreeNode {
@Nullable PInput input) {
this.enclosingNode = enclosingNode;
this.transform = transform;
- Preconditions.checkArgument((enclosingNode == null && transform == null)
+ checkArgument((enclosingNode == null && transform == null)
|| (enclosingNode != null && transform != null),
"EnclosingNode and transform must both be specified, or both be null");
this.fullName = fullName;
@@ -146,7 +147,7 @@ public class TransformTreeNode {
* Adds an input to the transform node.
*/
public void addInputProducer(PValue expandedInput, TransformTreeNode producer) {
- Preconditions.checkState(!finishedSpecifying);
+ checkState(!finishedSpecifying);
inputs.put(expandedInput, producer);
}
@@ -169,8 +170,8 @@ public class TransformTreeNode {
* Adds an output to the transform node.
*/
public void setOutput(POutput output) {
- Preconditions.checkState(!finishedSpecifying);
- Preconditions.checkState(this.output == null);
+ checkState(!finishedSpecifying);
+ checkState(this.output == null);
this.output = output;
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java
index b056830..fa87ed8 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/ApproximateQuantiles.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.transforms;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
@@ -31,7 +33,6 @@ import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import com.google.common.collect.UnmodifiableIterator;
@@ -254,9 +255,9 @@ public class ApproximateQuantiles {
int bufferSize,
int numBuffers,
long maxNumElements) {
- Preconditions.checkArgument(numQuantiles >= 2);
- Preconditions.checkArgument(bufferSize >= 2);
- Preconditions.checkArgument(numBuffers >= 2);
+ checkArgument(numQuantiles >= 2);
+ checkArgument(bufferSize >= 2);
+ checkArgument(numBuffers >= 2);
this.numQuantiles = numQuantiles;
this.compareFn = compareFn;
this.bufferSize = bufferSize;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
index 7871672..5faf4e3 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Combine.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.transforms;
+import static com.google.common.base.Preconditions.checkState;
+
import org.apache.beam.sdk.coders.CannotProvideCoderException;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
@@ -28,7 +30,6 @@ import org.apache.beam.sdk.coders.KvCoder;
import org.apache.beam.sdk.coders.StandardCoder;
import org.apache.beam.sdk.coders.VarIntCoder;
import org.apache.beam.sdk.coders.VoidCoder;
-import org.apache.beam.sdk.transforms.Combine.AccumulatingCombineFn;
import org.apache.beam.sdk.transforms.CombineFnBase.AbstractGlobalCombineFn;
import org.apache.beam.sdk.transforms.CombineFnBase.AbstractPerKeyCombineFn;
import org.apache.beam.sdk.transforms.CombineFnBase.GlobalCombineFn;
@@ -58,7 +59,6 @@ import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.TupleTagList;
import org.apache.beam.sdk.values.TypeDescriptor;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -1349,7 +1349,7 @@ public class Combine {
*/
public Globally<InputT, OutputT> withSideInputs(
Iterable<? extends PCollectionView<?>> sideInputs) {
- Preconditions.checkState(fn instanceof RequiresContextInternal);
+ checkState(fn instanceof RequiresContextInternal);
return new Globally<>(name, fn, fnDisplayData, insertDefault, fanout,
ImmutableList.copyOf(sideInputs));
}
@@ -1733,7 +1733,7 @@ public class Combine {
*/
public PerKey<K, InputT, OutputT> withSideInputs(
Iterable<? extends PCollectionView<?>> sideInputs) {
- Preconditions.checkState(fn instanceof RequiresContextInternal);
+ checkState(fn instanceof RequiresContextInternal);
return new PerKey<>(name, fn, fnDisplayData, fewKeys,
ImmutableList.copyOf(sideInputs));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Create.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Create.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Create.java
index 538966d..fa645ab 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Create.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Create.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.transforms;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.coders.CannotProvideCoderException;
import org.apache.beam.sdk.coders.Coder;
@@ -39,7 +41,6 @@ import org.apache.beam.sdk.values.TypeDescriptor;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -210,7 +211,7 @@ public class Create<T> {
while (valueIter.hasNext() && timestampIter.hasNext()) {
elems.add(TimestampedValue.of(valueIter.next(), new Instant(timestampIter.next())));
}
- Preconditions.checkArgument(
+ checkArgument(
!valueIter.hasNext() && !timestampIter.hasNext(),
"Expect sizes of values and timestamps are same.");
return timestamped(elems);
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java
index 3cb8415..ef1e3c6 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/IntraBundleParallelization.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.transforms;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.options.GcsOptions;
import org.apache.beam.sdk.options.PipelineOptions;
import org.apache.beam.sdk.transforms.Combine.CombineFn;
@@ -29,7 +31,6 @@ import org.apache.beam.sdk.values.PCollectionView;
import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.TypeDescriptor;
-import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
import org.joda.time.Instant;
@@ -102,7 +103,7 @@ public class IntraBundleParallelization {
}
Unbound(int maxParallelism) {
- Preconditions.checkArgument(maxParallelism > 0,
+ checkArgument(maxParallelism > 0,
"Expected parallelism factor greater than zero, received %s.", maxParallelism);
this.maxParallelism = maxParallelism;
}
@@ -143,7 +144,7 @@ public class IntraBundleParallelization {
private final int maxParallelism;
Bound(DoFn<InputT, OutputT> doFn, int maxParallelism) {
- Preconditions.checkArgument(maxParallelism > 0,
+ checkArgument(maxParallelism > 0,
"Expected parallelism factor greater than zero, received %s.", maxParallelism);
this.doFn = doFn;
this.maxParallelism = maxParallelism;
@@ -198,7 +199,7 @@ public class IntraBundleParallelization {
extends DoFn<InputT, OutputT> {
public MultiThreadedIntraBundleProcessingDoFn(DoFn<InputT, OutputT> doFn, int maxParallelism) {
- Preconditions.checkArgument(maxParallelism > 0,
+ checkArgument(maxParallelism > 0,
"Expected parallelism factor greater than zero, received %s.", maxParallelism);
this.doFn = doFn;
this.maxParallelism = maxParallelism;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
index 1d98668..1495c01 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Sample.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.transforms;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderRegistry;
@@ -29,8 +31,6 @@ import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.PCollectionView;
-import com.google.common.base.Preconditions;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
@@ -139,7 +139,7 @@ public class Sample {
* elements of its input {@code PCollection}.
*/
private SampleAny(long limit) {
- Preconditions.checkArgument(limit >= 0, "Expected non-negative limit, received %s.", limit);
+ checkArgument(limit >= 0, "Expected non-negative limit, received %s.", limit);
this.limit = limit;
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
index 257f77b..04cf9e3 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/Top.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.transforms;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
import org.apache.beam.sdk.coders.CoderRegistry;
@@ -32,7 +34,6 @@ import org.apache.beam.sdk.util.common.ElementByteSizeObserver;
import org.apache.beam.sdk.values.KV;
import org.apache.beam.sdk.values.PCollection;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import java.io.IOException;
@@ -375,9 +376,7 @@ new TopCombineFn<>(count, new Largest<V>()).<K>asKeyedFn())
private final ComparatorT compareFn;
public TopCombineFn(int count, ComparatorT compareFn) {
- Preconditions.checkArgument(
- count >= 0,
- "count must be >= 0");
+ checkArgument(count >= 0, "count must be >= 0 (not %s)", count);
this.count = count;
this.compareFn = compareFn;
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
index 59a2cf4..6180dbf 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/display/DisplayData.java
@@ -17,12 +17,12 @@
*/
package org.apache.beam.sdk.transforms.display;
+import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import org.apache.beam.sdk.transforms.PTransform;
import com.google.auto.value.AutoValue;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -657,7 +657,7 @@ public class DisplayData implements Serializable {
}
Identifier id = Identifier.of(item.getNamespace(), item.getKey());
- Preconditions.checkArgument(!entries.containsKey(id),
+ checkArgument(!entries.containsKey(id),
"Display data key (%s) is not unique within the specified namespace (%s).",
item.getKey(), item.getNamespace());
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java
index f868b9c..f4cf84d 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/join/CoGbkResult.java
@@ -19,6 +19,8 @@ package org.apache.beam.sdk.transforms.join;
import static org.apache.beam.sdk.util.Structs.addObject;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
import org.apache.beam.sdk.coders.IterableCoder;
@@ -30,7 +32,6 @@ import org.apache.beam.sdk.values.PCollection;
import org.apache.beam.sdk.values.TupleTag;
import org.apache.beam.sdk.values.TupleTagList;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Iterators;
import com.google.common.collect.PeekingIterator;
@@ -233,8 +234,7 @@ public class CoGbkResult {
@JsonProperty(PropertyNames.COMPONENT_ENCODINGS)
List<Coder<?>> components,
@JsonProperty(PropertyNames.CO_GBK_RESULT_SCHEMA) CoGbkResultSchema schema) {
- Preconditions.checkArgument(components.size() == 1,
- "Expecting 1 component, got " + components.size());
+ checkArgument(components.size() == 1, "Expecting 1 component, got %s", components.size());
return new CoGbkResultCoder(schema, (UnionCoder) components.get(0));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java
index e6d8e84..27dd129 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterAll.java
@@ -17,12 +17,13 @@
*/
package org.apache.beam.sdk.transforms.windowing;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.transforms.windowing.Trigger.OnceTrigger;
import org.apache.beam.sdk.util.ExecutableTrigger;
import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
import org.joda.time.Instant;
@@ -37,13 +38,12 @@ public class AfterAll extends OnceTrigger {
private AfterAll(List<Trigger> subTriggers) {
super(subTriggers);
- Preconditions.checkArgument(subTriggers.size() > 1);
+ checkArgument(subTriggers.size() > 1);
}
/**
* Returns an {@code AfterAll} {@code Trigger} with the given subtriggers.
*/
- @SafeVarargs
public static OnceTrigger of(OnceTrigger... triggers) {
return new AfterAll(Arrays.<Trigger>asList(triggers));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java
index a43d9ac..1034cac 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/AfterFirst.java
@@ -17,12 +17,13 @@
*/
package org.apache.beam.sdk.transforms.windowing;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.transforms.windowing.Trigger.OnceTrigger;
import org.apache.beam.sdk.util.ExecutableTrigger;
import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
import org.joda.time.Instant;
@@ -38,15 +39,13 @@ public class AfterFirst extends OnceTrigger {
AfterFirst(List<Trigger> subTriggers) {
super(subTriggers);
- Preconditions.checkArgument(subTriggers.size() > 1);
+ checkArgument(subTriggers.size() > 1);
}
/**
* Returns an {@code AfterFirst} {@code Trigger} with the given subtriggers.
*/
- @SafeVarargs
- public static OnceTrigger of(
- OnceTrigger... triggers) {
+ public static OnceTrigger of(OnceTrigger... triggers) {
return new AfterFirst(Arrays.<Trigger>asList(triggers));
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java
index fff5001..77c857c 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/PaneInfo.java
@@ -17,6 +17,9 @@
*/
package org.apache.beam.sdk.transforms.windowing;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.coders.AtomicCoder;
import org.apache.beam.sdk.coders.Coder;
import org.apache.beam.sdk.coders.CoderException;
@@ -25,7 +28,6 @@ import org.apache.beam.sdk.transforms.GroupByKey;
import org.apache.beam.sdk.util.VarInt;
import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import java.io.IOException;
@@ -191,7 +193,7 @@ public final class PaneInfo {
}
public static PaneInfo createPane(boolean isFirst, boolean isLast, Timing timing) {
- Preconditions.checkArgument(isFirst, "Indices must be provided for non-first pane info.");
+ checkArgument(isFirst, "Indices must be provided for non-first pane info.");
return createPane(isFirst, isLast, timing, 0, timing == Timing.EARLY ? -1 : 0);
}
@@ -201,15 +203,14 @@ public final class PaneInfo {
public static PaneInfo createPane(
boolean isFirst, boolean isLast, Timing timing, long index, long onTimeIndex) {
if (isFirst || timing == Timing.UNKNOWN) {
- return Preconditions.checkNotNull(
- BYTE_TO_PANE_INFO.get(encodedByte(isFirst, isLast, timing)));
+ return checkNotNull(BYTE_TO_PANE_INFO.get(encodedByte(isFirst, isLast, timing)));
} else {
return new PaneInfo(isFirst, isLast, timing, index, onTimeIndex);
}
}
public static PaneInfo decodePane(byte encodedPane) {
- return Preconditions.checkNotNull(BYTE_TO_PANE_INFO.get(encodedPane));
+ return checkNotNull(BYTE_TO_PANE_INFO.get(encodedPane));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java
index 833e9b3..e26b7bd 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptAndTimeBoundedExponentialBackOff.java
@@ -17,9 +17,10 @@
*/
package org.apache.beam.sdk.util;
+import static com.google.common.base.Preconditions.checkArgument;
+
import com.google.api.client.util.BackOff;
import com.google.api.client.util.NanoClock;
-import com.google.common.base.Preconditions;
import java.util.concurrent.TimeUnit;
@@ -112,13 +113,13 @@ public class AttemptAndTimeBoundedExponentialBackOff extends AttemptBoundedExpon
ResetPolicy resetPolicy,
NanoClock nanoClock) {
super(maximumNumberOfAttempts, initialIntervalMillis);
- Preconditions.checkArgument(
+ checkArgument(
maximumTotalWaitTimeMillis > 0, "Maximum total wait time must be greater than zero.");
- Preconditions.checkArgument(
+ checkArgument(
maximumTotalWaitTimeMillis < MAX_ELAPSED_TIME_MILLIS,
"Maximum total wait time must be less than " + MAX_ELAPSED_TIME_MILLIS + " milliseconds");
- Preconditions.checkArgument(resetPolicy != null, "resetPolicy may not be null");
- Preconditions.checkArgument(nanoClock != null, "nanoClock may not be null");
+ checkArgument(resetPolicy != null, "resetPolicy may not be null");
+ checkArgument(nanoClock != null, "nanoClock may not be null");
this.maximumTotalWaitTimeMillis = maximumTotalWaitTimeMillis;
this.resetPolicy = resetPolicy;
this.nanoClock = nanoClock;
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptBoundedExponentialBackOff.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptBoundedExponentialBackOff.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptBoundedExponentialBackOff.java
index cfc53f0..5707293 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptBoundedExponentialBackOff.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/AttemptBoundedExponentialBackOff.java
@@ -17,8 +17,10 @@
*/
package org.apache.beam.sdk.util;
+import static com.google.common.base.Preconditions.checkArgument;
+
import com.google.api.client.util.BackOff;
-import com.google.common.base.Preconditions;
+
/**
* Implementation of {@link BackOff} that increases the back off period for each retry attempt
@@ -51,10 +53,9 @@ public class AttemptBoundedExponentialBackOff implements BackOff {
private int currentAttempt;
public AttemptBoundedExponentialBackOff(int maximumNumberOfAttempts, long initialIntervalMillis) {
- Preconditions.checkArgument(maximumNumberOfAttempts > 0,
+ checkArgument(maximumNumberOfAttempts > 0,
"Maximum number of attempts must be greater than zero.");
- Preconditions.checkArgument(initialIntervalMillis > 0,
- "Initial interval must be greater than zero.");
+ checkArgument(initialIntervalMillis > 0, "Initial interval must be greater than zero.");
this.maximumNumberOfAttempts = maximumNumberOfAttempts;
this.initialIntervalMillis = initialIntervalMillis;
reset();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BigQueryTableInserter.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BigQueryTableInserter.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BigQueryTableInserter.java
index bcb4137..f87a3c4 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BigQueryTableInserter.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/BigQueryTableInserter.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.util;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.io.BigQueryIO;
import org.apache.beam.sdk.io.BigQueryIO.Write.CreateDisposition;
import org.apache.beam.sdk.io.BigQueryIO.Write.WriteDisposition;
@@ -36,7 +38,6 @@ import com.google.api.services.bigquery.model.TableRow;
import com.google.api.services.bigquery.model.TableSchema;
import com.google.cloud.hadoop.util.ApiErrorExtractor;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.MoreExecutors;
import org.slf4j.Logger;
@@ -170,7 +171,7 @@ public class BigQueryTableInserter {
public void insertAll(TableReference ref, List<TableRow> rowList,
@Nullable List<String> insertIdList, Aggregator<Long, Long> byteCountAggregator)
throws IOException {
- Preconditions.checkNotNull(ref, "ref");
+ checkNotNull(ref, "ref");
if (insertIdList != null && rowList.size() != insertIdList.size()) {
throw new AssertionError("If insertIdList is not null it needs to have at least "
+ "as many elements as rowList");
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Credentials.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Credentials.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Credentials.java
index 6fbbcb5..41065cd 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Credentials.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/Credentials.java
@@ -17,6 +17,8 @@
*/
package org.apache.beam.sdk.util;
+import static com.google.common.base.Preconditions.checkArgument;
+
import org.apache.beam.sdk.options.GcpOptions;
import com.google.api.client.auth.oauth2.Credential;
@@ -32,7 +34,6 @@ import com.google.api.client.http.HttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.api.client.util.store.FileDataStoreFactory;
-import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -157,7 +158,7 @@ public class Credentials {
throws IOException, GeneralSecurityException {
String clientSecretsFile = options.getSecretsFile();
- Preconditions.checkArgument(clientSecretsFile != null);
+ checkArgument(clientSecretsFile != null);
HttpTransport httpTransport = GoogleNetHttpTransport.newTrustedTransport();
JsonFactory jsonFactory = JacksonFactory.getDefaultInstance();
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ExecutableTrigger.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ExecutableTrigger.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ExecutableTrigger.java
index 9fcd21b..bb71fcc 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ExecutableTrigger.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/ExecutableTrigger.java
@@ -17,12 +17,13 @@
*/
package org.apache.beam.sdk.util;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
import org.apache.beam.sdk.transforms.windowing.Trigger;
import org.apache.beam.sdk.transforms.windowing.Trigger.OnceTrigger;
-import com.google.common.base.Preconditions;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -59,7 +60,7 @@ public class ExecutableTrigger implements Serializable {
}
private ExecutableTrigger(Trigger trigger, int nextUnusedIndex) {
- this.trigger = Preconditions.checkNotNull(trigger, "trigger must not be null");
+ this.trigger = checkNotNull(trigger, "trigger must not be null");
this.triggerIndex = nextUnusedIndex++;
if (trigger.subTriggers() != null) {
@@ -101,8 +102,8 @@ public class ExecutableTrigger implements Serializable {
}
public ExecutableTrigger getSubTriggerContaining(int index) {
- Preconditions.checkNotNull(subTriggers);
- Preconditions.checkState(index > triggerIndex && index < firstIndexAfterSubtree,
+ checkNotNull(subTriggers);
+ checkState(index > triggerIndex && index < firstIndexAfterSubtree,
"Cannot find sub-trigger containing index not in this tree.");
ExecutableTrigger previous = null;
for (ExecutableTrigger subTrigger : subTriggers) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/8b8615ea/sdks/java/core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java
index 9e8d175..4e9ee6e 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/GcsUtil.java
@@ -17,6 +17,9 @@
*/
package org.apache.beam.sdk.util;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import org.apache.beam.sdk.options.DefaultValueFactory;
import org.apache.beam.sdk.options.GcsOptions;
import org.apache.beam.sdk.options.PipelineOptions;
@@ -43,7 +46,6 @@ import com.google.cloud.hadoop.util.ClientRequestHelper;
import com.google.cloud.hadoop.util.ResilientOperation;
import com.google.cloud.hadoop.util.RetryDeterminer;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import org.slf4j.Logger;
@@ -158,7 +160,7 @@ public class GcsUtil {
* exists.
*/
public List<GcsPath> expand(GcsPath gcsPattern) throws IOException {
- Preconditions.checkArgument(isGcsPatternSupported(gcsPattern.getObject()));
+ checkArgument(isGcsPatternSupported(gcsPattern.getObject()));
Matcher m = GLOB_PREFIX.matcher(gcsPattern.getObject());
Pattern p = null;
String prefix = null;
@@ -218,7 +220,7 @@ public class GcsUtil {
+ ", prefix " + prefix + " against pattern " + p.toString(), e);
}
//Objects objects = listObject.execute();
- Preconditions.checkNotNull(objects);
+ checkNotNull(objects);
if (objects.getItems() == null) {
break;
@@ -371,7 +373,7 @@ public class GcsUtil {
}
public void copy(List<String> srcFilenames, List<String> destFilenames) throws IOException {
- Preconditions.checkArgument(
+ checkArgument(
srcFilenames.size() == destFilenames.size(),
"Number of source files %s must equal number of destination files %s",
srcFilenames.size(),