Updated Branches: refs/heads/master f69aa5d2a -> f26a7c731
CRUNCH-122: Reduce visibility of impl classes. Make implementation classes package-private, where possible. Make inner DoFns private where we have static factory methods. Fix inconsistency in From.sequenceFile(). Project: http://git-wip-us.apache.org/repos/asf/incubator-crunch/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-crunch/commit/f26a7c73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-crunch/tree/f26a7c73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-crunch/diff/f26a7c73 Branch: refs/heads/master Commit: f26a7c73102aee8dd9a398b12a2dca546bdc1362 Parents: f69aa5d Author: Matthias Friedrich <[email protected]> Authored: Sun Dec 2 15:33:57 2012 +0100 Committer: Matthias Friedrich <[email protected]> Committed: Mon Dec 3 18:37:16 2012 +0100 ---------------------------------------------------------------------- .../apache/crunch/lib/SpecificAvroGroupByIT.java | 3 +- .../apache/crunch/impl/mr/collect/PTableBase.java | 2 +- .../java/org/apache/crunch/impl/mr/plan/Edge.java | 2 +- .../java/org/apache/crunch/impl/mr/plan/Graph.java | 2 +- .../apache/crunch/impl/mr/plan/GraphBuilder.java | 2 +- .../apache/crunch/impl/mr/plan/JobNameBuilder.java | 2 +- .../apache/crunch/impl/mr/plan/JobPrototype.java | 2 +- .../org/apache/crunch/impl/mr/plan/Vertex.java | 2 +- .../crunch/impl/mr/run/CrunchInputSplit.java | 2 +- .../crunch/impl/mr/run/CrunchTaskContext.java | 2 +- .../src/main/java/org/apache/crunch/io/From.java | 4 +- .../crunch/io/avro/AvroFileReaderFactory.java | 2 +- .../apache/crunch/io/impl/SourceTargetImpl.java | 2 +- .../org/apache/crunch/io/seq/SeqFileHelper.java | 2 +- .../apache/crunch/io/seq/SeqFileReaderFactory.java | 2 +- .../crunch/io/seq/SeqFileTableReaderFactory.java | 2 +- .../crunch/io/text/BZip2TextInputFormat.java | 2 +- .../apache/crunch/io/text/CBZip2InputStream.java | 2 +- .../main/java/org/apache/crunch/lib/Sample.java | 2 +- .../main/java/org/apache/crunch/types/PTypes.java | 16 +++++++------- .../main/java/org/apache/crunch/types/Protos.java | 4 +- .../apache/crunch/types/avro/AvroDeepCopier.java | 2 +- .../crunch/types/avro/AvroGroupedTableType.java | 2 +- .../apache/crunch/types/avro/AvroKeyConverter.java | 2 +- .../crunch/types/avro/AvroPairConverter.java | 2 +- .../apache/crunch/types/avro/AvroRecordReader.java | 2 +- .../apache/crunch/types/avro/AvroTableType.java | 2 +- .../crunch/types/avro/SafeAvroSerialization.java | 2 +- .../types/writable/GenericArrayWritable.java | 2 +- .../crunch/types/writable/TextMapWritable.java | 2 +- .../types/writable/WritableGroupedTableType.java | 2 +- .../types/writable/WritablePairConverter.java | 2 +- 32 files changed, 41 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/it/java/org/apache/crunch/lib/SpecificAvroGroupByIT.java ---------------------------------------------------------------------- diff --git a/crunch/src/it/java/org/apache/crunch/lib/SpecificAvroGroupByIT.java b/crunch/src/it/java/org/apache/crunch/lib/SpecificAvroGroupByIT.java index 5167dec..5292353 100644 --- a/crunch/src/it/java/org/apache/crunch/lib/SpecificAvroGroupByIT.java +++ b/crunch/src/it/java/org/apache/crunch/lib/SpecificAvroGroupByIT.java @@ -37,7 +37,6 @@ import org.apache.crunch.test.Person; import org.apache.crunch.test.TemporaryPath; import org.apache.crunch.test.TemporaryPaths; import org.apache.crunch.types.avro.Avros; -import org.apache.crunch.types.avro.SafeAvroSerialization; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -46,7 +45,7 @@ import org.junit.Test; import com.google.common.collect.Lists; /** - * Test {@link SafeAvroSerialization} with Specific Avro types + * Test {@link org.apache.crunch.types.avro.SafeAvroSerialization} with Specific Avro types */ public class SpecificAvroGroupByIT implements Serializable { http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/collect/PTableBase.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/collect/PTableBase.java b/crunch/src/main/java/org/apache/crunch/impl/mr/collect/PTableBase.java index cd77606..9183784 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/collect/PTableBase.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/collect/PTableBase.java @@ -37,7 +37,7 @@ import org.apache.crunch.types.PType; import com.google.common.collect.Lists; -public abstract class PTableBase<K, V> extends PCollectionImpl<Pair<K, V>> implements PTable<K, V> { +abstract class PTableBase<K, V> extends PCollectionImpl<Pair<K, V>> implements PTable<K, V> { public PTableBase(String name) { super(name); http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Edge.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Edge.java b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Edge.java index 5aceb8b..cf6fc37 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Edge.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Edge.java @@ -33,7 +33,7 @@ import com.google.common.collect.Sets; /** * */ -public class Edge { +class Edge { private final Vertex head; private final Vertex tail; private final Set<NodePath> paths; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Graph.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Graph.java b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Graph.java index 0f976ed..ce0a847 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Graph.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Graph.java @@ -33,7 +33,7 @@ import com.google.common.collect.Sets; /** * */ -public class Graph implements Iterable<Vertex> { +class Graph implements Iterable<Vertex> { private final Map<PCollectionImpl, Vertex> vertices; private final Map<Pair<Vertex, Vertex>, Edge> edges; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/plan/GraphBuilder.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/GraphBuilder.java b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/GraphBuilder.java index 7fb942f..925c39a 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/GraphBuilder.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/GraphBuilder.java @@ -27,7 +27,7 @@ import org.apache.crunch.impl.mr.collect.UnionCollection; /** * */ -public class GraphBuilder implements PCollectionImpl.Visitor { +class GraphBuilder implements PCollectionImpl.Visitor { private Graph graph = new Graph(); private Vertex workingVertex; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobNameBuilder.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobNameBuilder.java b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobNameBuilder.java index 2645ada..9ad7300 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobNameBuilder.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobNameBuilder.java @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; * Visitor that traverses the {@code DoNode} instances in a job and builds a * String that identifies the stages of the pipeline that belong to this job. */ -public class JobNameBuilder { +class JobNameBuilder { private static final Joiner JOINER = Joiner.on("+"); private static final Joiner CHILD_JOINER = Joiner.on("/"); http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobPrototype.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobPrototype.java b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobPrototype.java index 0ad1d00..181468f 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobPrototype.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/JobPrototype.java @@ -47,7 +47,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -public class JobPrototype { +class JobPrototype { public static JobPrototype createMapReduceJob(PGroupedTableImpl<?, ?> group, Set<NodePath> inputs, Path workingPath) { return new JobPrototype(inputs, group, workingPath); http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Vertex.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Vertex.java b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Vertex.java index 3404a03..99fc8ba 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Vertex.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/plan/Vertex.java @@ -32,7 +32,7 @@ import com.google.common.collect.Sets; /** * */ -public class Vertex { +class Vertex { private final PCollectionImpl impl; private boolean output; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java b/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java index 5882180..6dc99b6 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchInputSplit.java @@ -35,7 +35,7 @@ import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.util.ReflectionUtils; -public class CrunchInputSplit extends InputSplit implements Configurable, Writable { +class CrunchInputSplit extends InputSplit implements Configurable, Writable { private InputSplit inputSplit; private Class<? extends InputFormat> inputFormatClass; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchTaskContext.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchTaskContext.java b/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchTaskContext.java index 5d501a2..4ba8bad 100644 --- a/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchTaskContext.java +++ b/crunch/src/main/java/org/apache/crunch/impl/mr/run/CrunchTaskContext.java @@ -27,7 +27,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.TaskInputOutputContext; import org.apache.crunch.hadoop.mapreduce.lib.output.CrunchMultipleOutputs; -public class CrunchTaskContext { +class CrunchTaskContext { private final TaskInputOutputContext<Object, Object, Object, Object> taskContext; private final NodeContext nodeContext; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/io/From.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/io/From.java b/crunch/src/main/java/org/apache/crunch/io/From.java index 706be23..a59e869 100644 --- a/crunch/src/main/java/org/apache/crunch/io/From.java +++ b/crunch/src/main/java/org/apache/crunch/io/From.java @@ -22,7 +22,7 @@ import org.apache.crunch.TableSource; import org.apache.crunch.io.avro.AvroFileSource; import org.apache.crunch.io.impl.FileTableSourceImpl; import org.apache.crunch.io.seq.SeqFileSource; -import org.apache.crunch.io.seq.SeqFileTableSourceTarget; +import org.apache.crunch.io.seq.SeqFileTableSource; import org.apache.crunch.io.text.TextFileSource; import org.apache.crunch.types.PTableType; import org.apache.crunch.types.PType; @@ -71,7 +71,7 @@ public class From { public static <K, V> TableSource<K, V> sequenceFile(Path path, PType<K> keyType, PType<V> valueType) { PTypeFamily ptf = keyType.getFamily(); - return new SeqFileTableSourceTarget<K, V>(path, ptf.tableOf(keyType, valueType)); + return new SeqFileTableSource<K, V>(path, ptf.tableOf(keyType, valueType)); } public static Source<String> textFile(String pathName) { http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/io/avro/AvroFileReaderFactory.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/io/avro/AvroFileReaderFactory.java b/crunch/src/main/java/org/apache/crunch/io/avro/AvroFileReaderFactory.java index 6f21dd2..c8ab8b8 100644 --- a/crunch/src/main/java/org/apache/crunch/io/avro/AvroFileReaderFactory.java +++ b/crunch/src/main/java/org/apache/crunch/io/avro/AvroFileReaderFactory.java @@ -40,7 +40,7 @@ import org.apache.hadoop.fs.Path; import com.google.common.collect.Iterators; import com.google.common.collect.UnmodifiableIterator; -public class AvroFileReaderFactory<T> implements FileReaderFactory<T> { +class AvroFileReaderFactory<T> implements FileReaderFactory<T> { private static final Log LOG = LogFactory.getLog(AvroFileReaderFactory.class); http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/io/impl/SourceTargetImpl.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/io/impl/SourceTargetImpl.java b/crunch/src/main/java/org/apache/crunch/io/impl/SourceTargetImpl.java index 27a2d9c..9626b26 100644 --- a/crunch/src/main/java/org/apache/crunch/io/impl/SourceTargetImpl.java +++ b/crunch/src/main/java/org/apache/crunch/io/impl/SourceTargetImpl.java @@ -28,7 +28,7 @@ import org.apache.crunch.types.PType; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; -public class SourceTargetImpl<T> implements SourceTarget<T> { +class SourceTargetImpl<T> implements SourceTarget<T> { protected final Source<T> source; protected final Target target; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileHelper.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileHelper.java b/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileHelper.java index 6f598f0..ba07506 100644 --- a/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileHelper.java +++ b/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileHelper.java @@ -24,7 +24,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Writable; import org.apache.hadoop.util.ReflectionUtils; -public class SeqFileHelper { +class SeqFileHelper { static <T> Writable newInstance(PType<T> ptype, Configuration conf) { return (Writable) ReflectionUtils.newInstance(((WritableType) ptype).getSerializationClass(), conf); } http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileReaderFactory.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileReaderFactory.java b/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileReaderFactory.java index ad1b81b..aa5a00a 100644 --- a/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileReaderFactory.java +++ b/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileReaderFactory.java @@ -36,7 +36,7 @@ import org.apache.hadoop.io.Writable; import com.google.common.collect.Iterators; import com.google.common.collect.UnmodifiableIterator; -public class SeqFileReaderFactory<T> implements FileReaderFactory<T> { +class SeqFileReaderFactory<T> implements FileReaderFactory<T> { private static final Log LOG = LogFactory.getLog(SeqFileReaderFactory.class); http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileTableReaderFactory.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileTableReaderFactory.java b/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileTableReaderFactory.java index 20c749a..67259fb 100644 --- a/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileTableReaderFactory.java +++ b/crunch/src/main/java/org/apache/crunch/io/seq/SeqFileTableReaderFactory.java @@ -37,7 +37,7 @@ import org.apache.hadoop.io.Writable; import com.google.common.collect.Iterators; import com.google.common.collect.UnmodifiableIterator; -public class SeqFileTableReaderFactory<K, V> implements FileReaderFactory<Pair<K, V>> { +class SeqFileTableReaderFactory<K, V> implements FileReaderFactory<Pair<K, V>> { private static final Log LOG = LogFactory.getLog(SeqFileTableReaderFactory.class); http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/io/text/BZip2TextInputFormat.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/io/text/BZip2TextInputFormat.java b/crunch/src/main/java/org/apache/crunch/io/text/BZip2TextInputFormat.java index 1618c5a..67a8870 100644 --- a/crunch/src/main/java/org/apache/crunch/io/text/BZip2TextInputFormat.java +++ b/crunch/src/main/java/org/apache/crunch/io/text/BZip2TextInputFormat.java @@ -35,7 +35,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.input.FileSplit; -public class BZip2TextInputFormat extends FileInputFormat<LongWritable, Text> { +class BZip2TextInputFormat extends FileInputFormat<LongWritable, Text> { /** * Treats keys as offset in file and value as line. Since the input file is * compressed, the offset for a particular line is not well-defined. This http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/io/text/CBZip2InputStream.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/io/text/CBZip2InputStream.java b/crunch/src/main/java/org/apache/crunch/io/text/CBZip2InputStream.java index c4a9078..92bb787 100644 --- a/crunch/src/main/java/org/apache/crunch/io/text/CBZip2InputStream.java +++ b/crunch/src/main/java/org/apache/crunch/io/text/CBZip2InputStream.java @@ -30,7 +30,7 @@ import org.apache.hadoop.mapreduce.InputSplit; * * @author <a href="mailto:[email protected]";>Keiron Liddle</a> */ -public class CBZip2InputStream extends InputStream implements BZip2Constants { +class CBZip2InputStream extends InputStream implements BZip2Constants { private static void cadvise(String reason) throws IOException { throw new IOException(reason); } http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/lib/Sample.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/lib/Sample.java b/crunch/src/main/java/org/apache/crunch/lib/Sample.java index 1abc33f..54f8731 100644 --- a/crunch/src/main/java/org/apache/crunch/lib/Sample.java +++ b/crunch/src/main/java/org/apache/crunch/lib/Sample.java @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; public class Sample { - public static class SamplerFn<S> extends DoFn<S, S> { + private static class SamplerFn<S> extends DoFn<S, S> { private final long seed; private final double acceptanceProbability; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/PTypes.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/PTypes.java b/crunch/src/main/java/org/apache/crunch/types/PTypes.java index ea9450e..9533872 100644 --- a/crunch/src/main/java/org/apache/crunch/types/PTypes.java +++ b/crunch/src/main/java/org/apache/crunch/types/PTypes.java @@ -73,7 +73,7 @@ public class PTypes { } }; - public static class JacksonInputMapFn<T> extends MapFn<String, T> { + private static class JacksonInputMapFn<T> extends MapFn<String, T> { private final Class<T> clazz; private transient ObjectMapper mapper; @@ -97,7 +97,7 @@ public class PTypes { } } - public static class JacksonOutputMapFn<T> extends MapFn<T, String> { + private static class JacksonOutputMapFn<T> extends MapFn<T, String> { private transient ObjectMapper mapper; @@ -116,7 +116,7 @@ public class PTypes { } } - public static class ProtoInputMapFn<T extends Message> extends MapFn<ByteBuffer, T> { + private static class ProtoInputMapFn<T extends Message> extends MapFn<ByteBuffer, T> { private final Class<T> clazz; private transient T instance; @@ -140,7 +140,7 @@ public class PTypes { } } - public static class ProtoOutputMapFn<T extends Message> extends MapFn<T, ByteBuffer> { + private static class ProtoOutputMapFn<T extends Message> extends MapFn<T, ByteBuffer> { public ProtoOutputMapFn() { } @@ -151,7 +151,7 @@ public class PTypes { } } - public static class ThriftInputMapFn<T extends TBase> extends MapFn<ByteBuffer, T> { + private static class ThriftInputMapFn<T extends TBase> extends MapFn<ByteBuffer, T> { private final Class<T> clazz; private transient T instance; @@ -186,7 +186,7 @@ public class PTypes { } } - public static class ThriftOutputMapFn<T extends TBase> extends MapFn<T, ByteBuffer> { + private static class ThriftOutputMapFn<T extends TBase> extends MapFn<T, ByteBuffer> { private transient TSerializer serializer; @@ -208,7 +208,7 @@ public class PTypes { } } - public static class EnumInputMapper<T extends Enum> extends MapFn<String, T> { + private static class EnumInputMapper<T extends Enum> extends MapFn<String, T> { private final Class<T> type; public EnumInputMapper(Class<T> type) { @@ -221,7 +221,7 @@ public class PTypes { } }; - public static class EnumOutputMapper<T extends Enum> extends MapFn<T, String> { + private static class EnumOutputMapper<T extends Enum> extends MapFn<T, String> { @Override public String map(T input) { http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/Protos.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/Protos.java b/crunch/src/main/java/org/apache/crunch/types/Protos.java index 1672209..2de1c11 100644 --- a/crunch/src/main/java/org/apache/crunch/types/Protos.java +++ b/crunch/src/main/java/org/apache/crunch/types/Protos.java @@ -65,7 +65,7 @@ public class Protos { return new TextToProtoFn<M>(sep, msgClass); } - public static class ExtractKeyFn<M extends Message, K> extends MapFn<M, K> { + private static class ExtractKeyFn<M extends Message, K> extends MapFn<M, K> { private final String fieldName; @@ -90,7 +90,7 @@ public class Protos { } - public static class TextToProtoFn<M extends Message> extends DoFn<String, M> { + private static class TextToProtoFn<M extends Message> extends DoFn<String, M> { private final String sep; private final Class<M> msgClass; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/avro/AvroDeepCopier.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/avro/AvroDeepCopier.java b/crunch/src/main/java/org/apache/crunch/types/avro/AvroDeepCopier.java index b431123..4b02fc6 100644 --- a/crunch/src/main/java/org/apache/crunch/types/avro/AvroDeepCopier.java +++ b/crunch/src/main/java/org/apache/crunch/types/avro/AvroDeepCopier.java @@ -44,7 +44,7 @@ import org.apache.hadoop.conf.Configuration; * running in a map-reduce context where each mapper/reducer is running in its own JVM, but it may * well be a problem in any other kind of multi-threaded context. */ -public abstract class AvroDeepCopier<T> implements DeepCopier<T>, Serializable { +abstract class AvroDeepCopier<T> implements DeepCopier<T>, Serializable { private String jsonSchema; private transient Configuration conf; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java b/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java index 2b4def5..598868f 100644 --- a/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java +++ b/crunch/src/main/java/org/apache/crunch/types/avro/AvroGroupedTableType.java @@ -37,7 +37,7 @@ import org.apache.hadoop.mapreduce.Job; * * */ -public class AvroGroupedTableType<K, V> extends PGroupedTableType<K, V> { +class AvroGroupedTableType<K, V> extends PGroupedTableType<K, V> { private static final AvroPairConverter CONVERTER = new AvroPairConverter(); private final MapFn inputFn; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/avro/AvroKeyConverter.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/avro/AvroKeyConverter.java b/crunch/src/main/java/org/apache/crunch/types/avro/AvroKeyConverter.java index fb03c1f..68b717d 100644 --- a/crunch/src/main/java/org/apache/crunch/types/avro/AvroKeyConverter.java +++ b/crunch/src/main/java/org/apache/crunch/types/avro/AvroKeyConverter.java @@ -21,7 +21,7 @@ import org.apache.avro.mapred.AvroWrapper; import org.apache.crunch.types.Converter; import org.apache.hadoop.io.NullWritable; -public class AvroKeyConverter<K> implements Converter<AvroWrapper<K>, NullWritable, K, Iterable<K>> { +class AvroKeyConverter<K> implements Converter<AvroWrapper<K>, NullWritable, K, Iterable<K>> { private transient AvroWrapper<K> wrapper = null; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/avro/AvroPairConverter.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/avro/AvroPairConverter.java b/crunch/src/main/java/org/apache/crunch/types/avro/AvroPairConverter.java index b4dca51..d1d2627 100644 --- a/crunch/src/main/java/org/apache/crunch/types/avro/AvroPairConverter.java +++ b/crunch/src/main/java/org/apache/crunch/types/avro/AvroPairConverter.java @@ -24,7 +24,7 @@ import org.apache.avro.mapred.AvroValue; import org.apache.crunch.Pair; import org.apache.crunch.types.Converter; -public class AvroPairConverter<K, V> implements Converter<AvroKey<K>, AvroValue<V>, Pair<K, V>, Pair<K, Iterable<V>>> { +class AvroPairConverter<K, V> implements Converter<AvroKey<K>, AvroValue<V>, Pair<K, V>, Pair<K, Iterable<V>>> { private transient AvroKey<K> keyWrapper = null; private transient AvroValue<V> valueWrapper = null; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/avro/AvroRecordReader.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/avro/AvroRecordReader.java b/crunch/src/main/java/org/apache/crunch/types/avro/AvroRecordReader.java index 00bd995..9c7578c 100644 --- a/crunch/src/main/java/org/apache/crunch/types/avro/AvroRecordReader.java +++ b/crunch/src/main/java/org/apache/crunch/types/avro/AvroRecordReader.java @@ -36,7 +36,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.lib.input.FileSplit; /** An {@link RecordReader} for Avro data files. */ -public class AvroRecordReader<T> extends RecordReader<AvroWrapper<T>, NullWritable> { +class AvroRecordReader<T> extends RecordReader<AvroWrapper<T>, NullWritable> { private FileReader<T> reader; private long start; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/avro/AvroTableType.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/avro/AvroTableType.java b/crunch/src/main/java/org/apache/crunch/types/avro/AvroTableType.java index 5416c4f..31dbd74 100644 --- a/crunch/src/main/java/org/apache/crunch/types/avro/AvroTableType.java +++ b/crunch/src/main/java/org/apache/crunch/types/avro/AvroTableType.java @@ -32,7 +32,7 @@ import org.apache.hadoop.conf.Configuration; * The implementation of the PTableType interface for Avro-based serialization. * */ -public class AvroTableType<K, V> extends AvroType<Pair<K, V>> implements PTableType<K, V> { +class AvroTableType<K, V> extends AvroType<Pair<K, V>> implements PTableType<K, V> { private static class PairToAvroPair extends MapFn<Pair, org.apache.avro.mapred.Pair> { private final MapFn keyMapFn; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/avro/SafeAvroSerialization.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/avro/SafeAvroSerialization.java b/crunch/src/main/java/org/apache/crunch/types/avro/SafeAvroSerialization.java index 438976c..8bd18b0 100644 --- a/crunch/src/main/java/org/apache/crunch/types/avro/SafeAvroSerialization.java +++ b/crunch/src/main/java/org/apache/crunch/types/avro/SafeAvroSerialization.java @@ -43,7 +43,7 @@ import org.apache.hadoop.io.serializer.Serializer; import org.apache.hadoop.util.ReflectionUtils; /** The {@link Serialization} used by jobs configured with {@link AvroJob}. */ -public class SafeAvroSerialization<T> extends Configured implements Serialization<AvroWrapper<T>> { +class SafeAvroSerialization<T> extends Configured implements Serialization<AvroWrapper<T>> { public boolean accept(Class<?> c) { return AvroWrapper.class.isAssignableFrom(c); http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/writable/GenericArrayWritable.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/writable/GenericArrayWritable.java b/crunch/src/main/java/org/apache/crunch/types/writable/GenericArrayWritable.java index 1178e8f..8e2ec6d 100644 --- a/crunch/src/main/java/org/apache/crunch/types/writable/GenericArrayWritable.java +++ b/crunch/src/main/java/org/apache/crunch/types/writable/GenericArrayWritable.java @@ -29,7 +29,7 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableFactories; import org.apache.hadoop.io.WritableUtils; -public class GenericArrayWritable<T> implements Writable { +class GenericArrayWritable<T> implements Writable { private Writable[] values; private Class<? extends Writable> valueClass; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/writable/TextMapWritable.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/writable/TextMapWritable.java b/crunch/src/main/java/org/apache/crunch/types/writable/TextMapWritable.java index 303fc41..1ab51df 100644 --- a/crunch/src/main/java/org/apache/crunch/types/writable/TextMapWritable.java +++ b/crunch/src/main/java/org/apache/crunch/types/writable/TextMapWritable.java @@ -29,7 +29,7 @@ import org.apache.hadoop.io.WritableUtils; import com.google.common.collect.Maps; -public class TextMapWritable<T extends Writable> implements Writable { +class TextMapWritable<T extends Writable> implements Writable { private Class<T> valueClazz; private final Map<Text, T> instance; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/writable/WritableGroupedTableType.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/writable/WritableGroupedTableType.java b/crunch/src/main/java/org/apache/crunch/types/writable/WritableGroupedTableType.java index 32c9111..84318d3 100644 --- a/crunch/src/main/java/org/apache/crunch/types/writable/WritableGroupedTableType.java +++ b/crunch/src/main/java/org/apache/crunch/types/writable/WritableGroupedTableType.java @@ -26,7 +26,7 @@ import org.apache.crunch.types.PGroupedTableType; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; -public class WritableGroupedTableType<K, V> extends PGroupedTableType<K, V> { +class WritableGroupedTableType<K, V> extends PGroupedTableType<K, V> { private final MapFn inputFn; private final MapFn outputFn; http://git-wip-us.apache.org/repos/asf/incubator-crunch/blob/f26a7c73/crunch/src/main/java/org/apache/crunch/types/writable/WritablePairConverter.java ---------------------------------------------------------------------- diff --git a/crunch/src/main/java/org/apache/crunch/types/writable/WritablePairConverter.java b/crunch/src/main/java/org/apache/crunch/types/writable/WritablePairConverter.java index 750f2c6..2db0238 100644 --- a/crunch/src/main/java/org/apache/crunch/types/writable/WritablePairConverter.java +++ b/crunch/src/main/java/org/apache/crunch/types/writable/WritablePairConverter.java @@ -20,7 +20,7 @@ package org.apache.crunch.types.writable; import org.apache.crunch.Pair; import org.apache.crunch.types.Converter; -public class WritablePairConverter<K, V> implements Converter<K, V, Pair<K, V>, Pair<K, Iterable<V>>> { +class WritablePairConverter<K, V> implements Converter<K, V, Pair<K, V>, Pair<K, Iterable<V>>> { private final Class<K> keyClass; private final Class<V> valueClass;
