You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by bl...@apache.org on 2016/05/14 23:43:59 UTC
[26/43] avro git commit: AVRO-1828: Add EditorConfig file and cleanup
of whitespace violations
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/Test.java
----------------------------------------------------------------------
diff --git a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/Test.java b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/Test.java
index 806b5dc..e8e7a29 100644
--- a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/Test.java
+++ b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/Test.java
@@ -309,7 +309,7 @@ public final class Test {
/**
* <code>repeated .org.apache.avro.protobuf.Foo fooArray = 20;</code>
*/
- java.util.List<org.apache.avro.protobuf.Test.Foo>
+ java.util.List<org.apache.avro.protobuf.Test.Foo>
getFooArrayList();
/**
* <code>repeated .org.apache.avro.protobuf.Foo fooArray = 20;</code>
@@ -322,7 +322,7 @@ public final class Test {
/**
* <code>repeated .org.apache.avro.protobuf.Foo fooArray = 20;</code>
*/
- java.util.List<? extends org.apache.avro.protobuf.Test.FooOrBuilder>
+ java.util.List<? extends org.apache.avro.protobuf.Test.FooOrBuilder>
getFooArrayOrBuilderList();
/**
* <code>repeated .org.apache.avro.protobuf.Foo fooArray = 20;</code>
@@ -864,7 +864,7 @@ public final class Test {
if (ref instanceof java.lang.String) {
return (java.lang.String) ref;
} else {
- com.google.protobuf.ByteString bs =
+ com.google.protobuf.ByteString bs =
(com.google.protobuf.ByteString) ref;
java.lang.String s = bs.toStringUtf8();
if (bs.isValidUtf8()) {
@@ -880,7 +880,7 @@ public final class Test {
getStringBytes() {
java.lang.Object ref = string_;
if (ref instanceof java.lang.String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
string_ = b;
@@ -969,7 +969,7 @@ public final class Test {
/**
* <code>repeated .org.apache.avro.protobuf.Foo fooArray = 20;</code>
*/
- public java.util.List<? extends org.apache.avro.protobuf.Test.FooOrBuilder>
+ public java.util.List<? extends org.apache.avro.protobuf.Test.FooOrBuilder>
getFooArrayOrBuilderList() {
return fooArray_;
}
@@ -1637,7 +1637,7 @@ public final class Test {
fooArrayBuilder_ = null;
fooArray_ = other.fooArray_;
bitField0_ = (bitField0_ & ~0x00020000);
- fooArrayBuilder_ =
+ fooArrayBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getFooArrayFieldBuilder() : null;
} else {
@@ -1664,18 +1664,18 @@ public final class Test {
public final boolean isInitialized() {
if (!hasInt32()) {
-
+
return false;
}
for (int i = 0; i < getFooArrayCount(); i++) {
if (!getFooArray(i).isInitialized()) {
-
+
return false;
}
}
if (hasFoo()) {
if (!getFoo().isInitialized()) {
-
+
return false;
}
}
@@ -2175,7 +2175,7 @@ public final class Test {
getStringBytes() {
java.lang.Object ref = string_;
if (ref instanceof String) {
- com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString b =
com.google.protobuf.ByteString.copyFromUtf8(
(java.lang.String) ref);
string_ = b;
@@ -2581,7 +2581,7 @@ public final class Test {
/**
* <code>repeated .org.apache.avro.protobuf.Foo fooArray = 20;</code>
*/
- public java.util.List<? extends org.apache.avro.protobuf.Test.FooOrBuilder>
+ public java.util.List<? extends org.apache.avro.protobuf.Test.FooOrBuilder>
getFooArrayOrBuilderList() {
if (fooArrayBuilder_ != null) {
return fooArrayBuilder_.getMessageOrBuilderList();
@@ -2607,12 +2607,12 @@ public final class Test {
/**
* <code>repeated .org.apache.avro.protobuf.Foo fooArray = 20;</code>
*/
- public java.util.List<org.apache.avro.protobuf.Test.Foo.Builder>
+ public java.util.List<org.apache.avro.protobuf.Test.Foo.Builder>
getFooArrayBuilderList() {
return getFooArrayFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilder<
- org.apache.avro.protobuf.Test.Foo, org.apache.avro.protobuf.Test.Foo.Builder, org.apache.avro.protobuf.Test.FooOrBuilder>
+ org.apache.avro.protobuf.Test.Foo, org.apache.avro.protobuf.Test.Foo.Builder, org.apache.avro.protobuf.Test.FooOrBuilder>
getFooArrayFieldBuilder() {
if (fooArrayBuilder_ == null) {
fooArrayBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
@@ -2838,7 +2838,7 @@ public final class Test {
* </pre>
*/
private com.google.protobuf.SingleFieldBuilder<
- org.apache.avro.protobuf.Test.Foo, org.apache.avro.protobuf.Test.Foo.Builder, org.apache.avro.protobuf.Test.FooOrBuilder>
+ org.apache.avro.protobuf.Test.Foo, org.apache.avro.protobuf.Test.Foo.Builder, org.apache.avro.protobuf.Test.FooOrBuilder>
getFooFieldBuilder() {
if (fooBuilder_ == null) {
fooBuilder_ = new com.google.protobuf.SingleFieldBuilder<
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/TestProtobuf.java
----------------------------------------------------------------------
diff --git a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/TestProtobuf.java b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/TestProtobuf.java
index 8cdfb81..f7d5436 100644
--- a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/TestProtobuf.java
+++ b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/TestProtobuf.java
@@ -75,7 +75,7 @@ public class TestProtobuf {
Encoder e = EncoderFactory.get().binaryEncoder(bao, null);
w.write(foo, e);
e.flush();
-
+
Object o = new ProtobufDatumReader<Foo>(Foo.class).read
(null,
DecoderFactory.get().createBinaryDecoder
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java
----------------------------------------------------------------------
diff --git a/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java b/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java
index c78e25f..16047ac 100644
--- a/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java
+++ b/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java
@@ -55,7 +55,7 @@ public class ThriftData extends GenericData {
private static final ThriftData INSTANCE = new ThriftData();
protected ThriftData() {}
-
+
/** Return the singleton instance. */
public static ThriftData get() { return INSTANCE; }
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftDatumWriter.java
----------------------------------------------------------------------
diff --git a/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftDatumWriter.java b/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftDatumWriter.java
index 9ef3aed..dd01c41 100644
--- a/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftDatumWriter.java
+++ b/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftDatumWriter.java
@@ -34,15 +34,15 @@ public class ThriftDatumWriter<T> extends GenericDatumWriter<T> {
public ThriftDatumWriter(Class<T> c) {
super(ThriftData.get().getSchema(c), ThriftData.get());
}
-
+
public ThriftDatumWriter(Schema schema) {
super(schema, ThriftData.get());
}
-
+
protected ThriftDatumWriter(Schema root, ThriftData thriftData) {
super(root, thriftData);
}
-
+
protected ThriftDatumWriter(ThriftData thriftData) {
super(thriftData);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/E.java
----------------------------------------------------------------------
diff --git a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/E.java b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/E.java
index b9dbd78..899d113 100644
--- a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/E.java
+++ b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/E.java
@@ -33,7 +33,7 @@ public enum E implements org.apache.thrift.TEnum {
* Find a the enum type by its integer value, as defined in the Thrift IDL.
* @return null if the value is not found.
*/
- public static E findByValue(int value) {
+ public static E findByValue(int value) {
switch (value) {
case 1:
return X;
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Error.java
----------------------------------------------------------------------
diff --git a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Error.java b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Error.java
index 4dfd46d..1a23f0c 100644
--- a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Error.java
+++ b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Error.java
@@ -107,7 +107,7 @@ public class Error extends TException implements org.apache.thrift.TBase<Error,
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Error.class, metaDataMap);
@@ -313,7 +313,7 @@ public class Error extends TException implements org.apache.thrift.TBase<Error,
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -321,7 +321,7 @@ public class Error extends TException implements org.apache.thrift.TBase<Error,
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.message = iprot.readString();
struct.setMessageIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java
----------------------------------------------------------------------
diff --git a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java
index f731ccf..68adeb5 100644
--- a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java
+++ b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Foo.java
@@ -347,7 +347,7 @@ public class Foo {
public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Void>() {
+ return new AsyncMethodCallback<Void>() {
public void onComplete(Void o) {
ping_result result = new ping_result();
try {
@@ -397,7 +397,7 @@ public class Foo {
public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Integer>() {
+ return new AsyncMethodCallback<Integer>() {
public void onComplete(Integer o) {
add_result result = new add_result();
result.success = o;
@@ -449,7 +449,7 @@ public class Foo {
public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
final org.apache.thrift.AsyncProcessFunction fcall = this;
- return new AsyncMethodCallback<Void>() {
+ return new AsyncMethodCallback<Void>() {
public void onComplete(Void o) {
}
public void onError(Exception e) {
@@ -668,7 +668,7 @@ public class Foo {
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -912,7 +912,7 @@ public class Foo {
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -1039,9 +1039,9 @@ public class Foo {
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.NUM1, new org.apache.thrift.meta_data.FieldMetaData("num1", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.NUM1, new org.apache.thrift.meta_data.FieldMetaData("num1", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.NUM2, new org.apache.thrift.meta_data.FieldMetaData("num2", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.NUM2, new org.apache.thrift.meta_data.FieldMetaData("num2", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_args.class, metaDataMap);
@@ -1309,7 +1309,7 @@ public class Foo {
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -1317,7 +1317,7 @@ public class Foo {
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.num1 = iprot.readI32();
struct.setNum1IsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1325,7 +1325,7 @@ public class Foo {
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.num2 = iprot.readI32();
struct.setNum2IsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1475,7 +1475,7 @@ public class Foo {
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(add_result.class, metaDataMap);
@@ -1679,7 +1679,7 @@ public class Foo {
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -1687,7 +1687,7 @@ public class Foo {
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.success = iprot.readI32();
struct.setSuccessIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1949,7 +1949,7 @@ public class Foo {
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/FooOrBar.java
----------------------------------------------------------------------
diff --git a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/FooOrBar.java b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/FooOrBar.java
index 308ee45..7c56e6f 100644
--- a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/FooOrBar.java
+++ b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/FooOrBar.java
@@ -101,9 +101,9 @@ public class FooOrBar extends org.apache.thrift.TUnion<FooOrBar, FooOrBar._Field
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.FOO, new org.apache.thrift.meta_data.FieldMetaData("foo", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.FOO, new org.apache.thrift.meta_data.FieldMetaData("foo", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.BAR, new org.apache.thrift.meta_data.FieldMetaData("bar", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.BAR, new org.apache.thrift.meta_data.FieldMetaData("bar", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FooOrBar.class, metaDataMap);
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Nested.java
----------------------------------------------------------------------
diff --git a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Nested.java b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Nested.java
index 482e4cc..fc10893 100644
--- a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Nested.java
+++ b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Nested.java
@@ -109,7 +109,7 @@ public class Nested implements org.apache.thrift.TBase<Nested, Nested._Fields>,
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.X, new org.apache.thrift.meta_data.FieldMetaData("x", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.X, new org.apache.thrift.meta_data.FieldMetaData("x", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Nested.class, metaDataMap);
@@ -313,7 +313,7 @@ public class Nested implements org.apache.thrift.TBase<Nested, Nested._Fields>,
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -321,7 +321,7 @@ public class Nested implements org.apache.thrift.TBase<Nested, Nested._Fields>,
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.x = iprot.readI32();
struct.setXIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Test.java
----------------------------------------------------------------------
diff --git a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Test.java b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Test.java
index 65c1b3f..2ee2efc 100644
--- a/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Test.java
+++ b/lang/java/thrift/src/test/java/org/apache/avro/thrift/test/Test.java
@@ -91,7 +91,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
LIST_FIELD((short)10, "listField"),
SET_FIELD((short)11, "setField"),
/**
- *
+ *
* @see E
*/
ENUM_FIELD((short)12, "enumField"),
@@ -196,41 +196,41 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.BOOL_FIELD, new org.apache.thrift.meta_data.FieldMetaData("boolField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.BOOL_FIELD, new org.apache.thrift.meta_data.FieldMetaData("boolField", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
- tmpMap.put(_Fields.BYTE_FIELD, new org.apache.thrift.meta_data.FieldMetaData("byteField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.BYTE_FIELD, new org.apache.thrift.meta_data.FieldMetaData("byteField", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)));
- tmpMap.put(_Fields.BYTE_OPTIONAL_FIELD, new org.apache.thrift.meta_data.FieldMetaData("byteOptionalField", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.BYTE_OPTIONAL_FIELD, new org.apache.thrift.meta_data.FieldMetaData("byteOptionalField", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)));
- tmpMap.put(_Fields.I16_FIELD, new org.apache.thrift.meta_data.FieldMetaData("i16Field", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.I16_FIELD, new org.apache.thrift.meta_data.FieldMetaData("i16Field", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
- tmpMap.put(_Fields.I16_OPTIONAL_FIELD, new org.apache.thrift.meta_data.FieldMetaData("i16OptionalField", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.I16_OPTIONAL_FIELD, new org.apache.thrift.meta_data.FieldMetaData("i16OptionalField", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16)));
- tmpMap.put(_Fields.I32_FIELD, new org.apache.thrift.meta_data.FieldMetaData("i32Field", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.I32_FIELD, new org.apache.thrift.meta_data.FieldMetaData("i32Field", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.I64_FIELD, new org.apache.thrift.meta_data.FieldMetaData("i64Field", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.I64_FIELD, new org.apache.thrift.meta_data.FieldMetaData("i64Field", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
- tmpMap.put(_Fields.DOUBLE_FIELD, new org.apache.thrift.meta_data.FieldMetaData("doubleField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.DOUBLE_FIELD, new org.apache.thrift.meta_data.FieldMetaData("doubleField", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
- tmpMap.put(_Fields.STRING_FIELD, new org.apache.thrift.meta_data.FieldMetaData("stringField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.STRING_FIELD, new org.apache.thrift.meta_data.FieldMetaData("stringField", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.BINARY_FIELD, new org.apache.thrift.meta_data.FieldMetaData("binaryField", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.BINARY_FIELD, new org.apache.thrift.meta_data.FieldMetaData("binaryField", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
- tmpMap.put(_Fields.MAP_FIELD, new org.apache.thrift.meta_data.FieldMetaData("mapField", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
+ tmpMap.put(_Fields.MAP_FIELD, new org.apache.thrift.meta_data.FieldMetaData("mapField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
- tmpMap.put(_Fields.LIST_FIELD, new org.apache.thrift.meta_data.FieldMetaData("listField", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ tmpMap.put(_Fields.LIST_FIELD, new org.apache.thrift.meta_data.FieldMetaData("listField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
- tmpMap.put(_Fields.SET_FIELD, new org.apache.thrift.meta_data.FieldMetaData("setField", org.apache.thrift.TFieldRequirementType.DEFAULT,
- new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
+ tmpMap.put(_Fields.SET_FIELD, new org.apache.thrift.meta_data.FieldMetaData("setField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
- tmpMap.put(_Fields.ENUM_FIELD, new org.apache.thrift.meta_data.FieldMetaData("enumField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.ENUM_FIELD, new org.apache.thrift.meta_data.FieldMetaData("enumField", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, E.class)));
- tmpMap.put(_Fields.STRUCT_FIELD, new org.apache.thrift.meta_data.FieldMetaData("structField", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.STRUCT_FIELD, new org.apache.thrift.meta_data.FieldMetaData("structField", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Nested.class)));
- tmpMap.put(_Fields.FOO_OR_BAR, new org.apache.thrift.meta_data.FieldMetaData("fooOrBar", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ tmpMap.put(_Fields.FOO_OR_BAR, new org.apache.thrift.meta_data.FieldMetaData("fooOrBar", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, FooOrBar.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Test.class, metaDataMap);
@@ -690,7 +690,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
}
/**
- *
+ *
* @see E
*/
public E getEnumField() {
@@ -698,7 +698,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
}
/**
- *
+ *
* @see E
*/
public void setEnumField(E enumField) {
@@ -1496,7 +1496,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
while (true)
{
schemeField = iprot.readFieldBegin();
- if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (schemeField.id) {
@@ -1504,7 +1504,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.boolField = iprot.readBool();
struct.setBoolFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1512,7 +1512,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
struct.byteField = iprot.readByte();
struct.setByteFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1520,7 +1520,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
struct.byteOptionalField = iprot.readByte();
struct.setByteOptionalFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1528,7 +1528,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
struct.i16Field = iprot.readI16();
struct.setI16FieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1536,7 +1536,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.I16) {
struct.i16OptionalField = iprot.readI16();
struct.setI16OptionalFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1544,7 +1544,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.i32Field = iprot.readI32();
struct.setI32FieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1552,7 +1552,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.i64Field = iprot.readI64();
struct.setI64FieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1560,7 +1560,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
struct.doubleField = iprot.readDouble();
struct.setDoubleFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1568,7 +1568,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.stringField = iprot.readString();
struct.setStringFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1576,7 +1576,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.binaryField = iprot.readBinary();
struct.setBinaryFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1596,7 +1596,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
iprot.readMapEnd();
}
struct.setMapFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1614,7 +1614,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
iprot.readListEnd();
}
struct.setListFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1632,7 +1632,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
iprot.readSetEnd();
}
struct.setSetFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1640,7 +1640,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
struct.enumField = E.findByValue(iprot.readI32());
struct.setEnumFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1649,7 +1649,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
struct.structField = new Nested();
struct.structField.read(iprot);
struct.setStructFieldIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
@@ -1658,7 +1658,7 @@ public class Test implements org.apache.thrift.TBase<Test, Test._Fields>, java.i
struct.fooOrBar = new FooOrBar();
struct.fooOrBar.read(iprot);
struct.setFooOrBarIsSet(true);
- } else {
+ } else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/tools/pom.xml b/lang/java/tools/pom.xml
index 4190fab..378855e 100644
--- a/lang/java/tools/pom.xml
+++ b/lang/java/tools/pom.xml
@@ -202,7 +202,7 @@
</dependency>
<!--For testing TetherTool we need the mapred test jar
- because that contains the word count example.-->
+ because that contains the word count example.-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>avro-mapred</artifactId>
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/BinaryFragmentToJsonTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/BinaryFragmentToJsonTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/BinaryFragmentToJsonTool.java
index 14372e0..32e7999 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/BinaryFragmentToJsonTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/BinaryFragmentToJsonTool.java
@@ -47,12 +47,12 @@ public class BinaryFragmentToJsonTool implements Tool {
.accepts("schema-file", "File containing schema, must not occur with inline schema.")
.withOptionalArg()
.ofType(String.class);
-
+
OptionSet optionSet = optionParser.parse(args.toArray(new String[0]));
Boolean noPretty = optionSet.has(noPrettyOption);
List<String> nargs = (List<String>)optionSet.nonOptionArguments();
String schemaFile = schemaFileOption.value(optionSet);
-
+
if (nargs.size() != (schemaFile == null ? 2 : 1)) {
err.println("fragtojson --no-pretty --schema-file <file> [inline-schema] input-file");
err.println(" converts Avro fragments to JSON.");
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/CatTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/CatTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/CatTool.java
index 1fd1087..162a6de 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/CatTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/CatTool.java
@@ -40,17 +40,17 @@ import org.apache.hadoop.fs.Path;
/** Tool to extract samples from an Avro data file. */
public class CatTool implements Tool {
-
+
private long totalCopied;
private double sampleCounter;
-
+
private GenericRecord reuse;
private DataFileStream<GenericRecord> reader;
private DataFileWriter<GenericRecord> writer;
private Schema schema;
private List<Path> inFiles;
private int currentInput;
-
+
@Override
public int run(InputStream in, PrintStream out, PrintStream err,
List<String> args) throws Exception {
@@ -64,12 +64,12 @@ public class CatTool implements Tool {
.accepts("limit", "maximum number of records in the outputfile")
.withRequiredArg()
.ofType(Long.class)
- .defaultsTo(Long.MAX_VALUE);
+ .defaultsTo(Long.MAX_VALUE);
OptionSpec<Double> fracOpt = optParser
.accepts("samplerate", "rate at which records will be collected")
.withRequiredArg()
.ofType(Double.class)
- .defaultsTo(new Double(1));
+ .defaultsTo(new Double(1));
OptionSet opts = optParser.parse(args.toArray(new String[0]));
List<String> nargs = (List<String>)opts.nonOptionArguments();
@@ -77,7 +77,7 @@ public class CatTool implements Tool {
printHelp(out);
return 0;
}
-
+
inFiles = Util.getFiles(nargs.subList(0, nargs.size()-1));
System.out.println("List of input files:");
@@ -86,7 +86,7 @@ public class CatTool implements Tool {
}
currentInput = -1;
nextInput();
-
+
OutputStream output = out;
String lastArg = nargs.get(nargs.size()-1);
if (nargs.size() > 1 && !lastArg.equals("-")) {
@@ -94,7 +94,7 @@ public class CatTool implements Tool {
}
writer = new DataFileWriter<GenericRecord>(
new GenericDatumWriter<GenericRecord>());
-
+
String codecName = reader.getMetaString(DataFileConstants.CODEC);
CodecFactory codec = (codecName == null)
? CodecFactory.fromString(DataFileConstants.NULL_CODEC)
@@ -106,14 +106,14 @@ public class CatTool implements Tool {
}
}
writer.create(schema, output);
-
+
long offset = opts.valueOf(offsetOpt);
long limit = opts.valueOf(limitOpt);
double samplerate = opts.valueOf(fracOpt);
sampleCounter = 1;
totalCopied = 0;
reuse = null;
-
+
if (limit < 0) {
System.out.println("limit has to be non-negative");
this.printHelp(out);
@@ -133,16 +133,16 @@ public class CatTool implements Tool {
skip(offset);
writeRecords(limit, samplerate);
System.out.println(totalCopied + " records written.");
-
+
writer.flush();
writer.close();
Util.close(out);
return 0;
}
-
+
private void nextInput() throws IOException{
currentInput++;
- Path path = inFiles.get(currentInput);
+ Path path = inFiles.get(currentInput);
FSDataInputStream input = new FSDataInputStream(Util.openFromFS(path));
reader = new DataFileStream<GenericRecord>(input, new GenericDatumReader<GenericRecord>());
if (schema == null) { // if this is the first file, the schema gets saved
@@ -152,11 +152,11 @@ public class CatTool implements Tool {
throw new IOException("schemas dont match");
}
}
-
+
private boolean hasNextInput() {
return inFiles.size() > (currentInput + 1);
}
-
+
/**skips a number of records from the input*/
private long skip(long skip) throws IOException {
long skipped = 0;
@@ -171,7 +171,7 @@ public class CatTool implements Tool {
}
return skipped;
}
-
+
/** writes records with the given samplerate
* The record at position offset is guaranteed to be taken*/
private long writeRecords(long count, double samplerate) throws IOException {
@@ -188,11 +188,11 @@ public class CatTool implements Tool {
totalCopied = totalCopied + written;
if (written < count && hasNextInput()) { // goto next file
nextInput();
- written = written + writeRecords(count - written, samplerate);
+ written = written + writeRecords(count - written, samplerate);
}
return written;
}
-
+
private void printHelp(PrintStream out) {
out.println("cat --offset <offset> --limit <limit> --samplerate <samplerate> [input-files...] output-file");
out.println();
@@ -212,5 +212,5 @@ public class CatTool implements Tool {
public String getShortDescription() {
return "extracts samples from files";
}
-
+
}
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileGetMetaTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileGetMetaTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileGetMetaTool.java
index bc9c6f3..4711d8f 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileGetMetaTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileGetMetaTool.java
@@ -45,7 +45,7 @@ public class DataFileGetMetaTool implements Tool {
@Override
public int run(InputStream stdin, PrintStream out, PrintStream err,
List<String> args) throws Exception {
-
+
OptionParser p = new OptionParser();
OptionSpec<String> keyOption =
p.accepts("key", "Metadata key")
@@ -53,7 +53,7 @@ public class DataFileGetMetaTool implements Tool {
.ofType(String.class);
OptionSet opts = p.parse(args.toArray(new String[0]));
String keyName = keyOption.value(opts);
-
+
List<String> nargs = (List<String>)opts.nonOptionArguments();
if (nargs.size() != 1) {
err.println("Expected 1 arg: input_file");
@@ -81,7 +81,7 @@ public class DataFileGetMetaTool implements Tool {
}
return 0;
}
-
+
// escape TAB, NL and CR in keys, so that output can be reliably parsed
static String escapeKey(String key) {
key = key.replace("\\","\\\\"); // escape backslashes first
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileRepairTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileRepairTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileRepairTool.java
index 0fdd8e5..c3d31bc 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileRepairTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileRepairTool.java
@@ -45,7 +45,7 @@ public class DataFileRepairTool implements Tool {
public String getShortDescription() {
return "Recovers data from a corrupt Avro Data file";
}
-
+
private void printInfo(PrintStream output) {
output.println("Insufficient arguments. Arguments: [-o option] "
+ "input_file output_file \n"
@@ -101,7 +101,7 @@ public class DataFileRepairTool implements Tool {
if (args.size() - index < 1) {
printInfo(err);
return 1;
- }
+ }
}
if (ALL.equals(option)) {
return recoverAll(input, args.get(index), out, err);
@@ -151,7 +151,7 @@ public class DataFileRepairTool implements Tool {
} catch (Exception e) {
e.printStackTrace(err);
return 1;
- }
+ }
} else {
return innerRecover(fileReader, null, out, err, recoverPrior,
recoverAfter, null, null);
@@ -236,7 +236,7 @@ public class DataFileRepairTool implements Tool {
+ (pos));
if (lastRecordWasBad) {
// consecutive bad record
- err.println("Second consecutive bad record in block: " + numBlocks
+ err.println("Second consecutive bad record in block: " + numBlocks
+ ". Skipping remainder of block. ");
numCorruptRecords += blockRemaining;
badRecordsInBlock += blockRemaining;
@@ -272,7 +272,7 @@ public class DataFileRepairTool implements Tool {
e2.printStackTrace(err);
return 1;
}
- }
+ }
}
} finally {
if (fileWritten) {
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileWriteTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileWriteTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileWriteTool.java
index a8c85e0..bce948e 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileWriteTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/DataFileWriteTool.java
@@ -82,7 +82,7 @@ public class DataFileWriteTool implements Tool {
Schema schema = (schemafile != null)
? Util.parseSchemaFromFS(schemafile)
: new Schema.Parser().parse(schemastr);
-
+
DatumReader<Object> reader = new GenericDatumReader<Object>(schema);
InputStream input = Util.fileOrStdin(nargs.get(0), stdin);
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/FromTextTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/FromTextTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/FromTextTool.java
index 115155e..0026a24 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/FromTextTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/FromTextTool.java
@@ -34,13 +34,13 @@ import org.apache.avro.file.DataFileWriter;
import org.apache.avro.generic.GenericDatumWriter;
/** Reads a text file into an Avro data file.
- *
+ *
* Can accept a file name, and HDFS file URI, or stdin. Can write to a file
* name, an HDFS URI, or stdout.*/
public class FromTextTool implements Tool {
- private static final String TEXT_FILE_SCHEMA =
+ private static final String TEXT_FILE_SCHEMA =
"\"bytes\"";
-
+
@Override
public String getName() {
return "fromtext";
@@ -54,7 +54,7 @@ public class FromTextTool implements Tool {
@Override
public int run(InputStream stdin, PrintStream out, PrintStream err,
List<String> args) throws Exception {
-
+
OptionParser p = new OptionParser();
OptionSpec<Integer> level = Util.compressionLevelOption(p);
OptionSpec<String> codec = Util.compressionCodecOption(p);
@@ -68,12 +68,12 @@ public class FromTextTool implements Tool {
p.printHelpOn(err);
return 1;
}
-
+
CodecFactory codecFactory = Util.codecFactory(opts, codec, level);
-
+
BufferedInputStream inStream = Util.fileOrStdin(nargs.get(0), stdin);
BufferedOutputStream outStream = Util.fileOrStdout(nargs.get(1), out);
-
+
DataFileWriter<ByteBuffer> writer =
new DataFileWriter<ByteBuffer>(new GenericDatumWriter<ByteBuffer>());
writer.setCodec(codecFactory);
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java
index 48352e3..f3cfe24 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/IdlTool.java
@@ -57,7 +57,7 @@ public class IdlTool implements Tool {
} else {
parser = new Idl(in);
}
-
+
if (args.size() == 2 && ! "-".equals(args.get(1))) {
parseOut = new PrintStream(new FileOutputStream(args.get(1)));
}
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java
index ba56cea..1232d2a 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/JsonToBinaryFragmentTool.java
@@ -44,11 +44,11 @@ public class JsonToBinaryFragmentTool implements Tool {
.accepts("schema-file", "File containing schema, must not occur with inline schema.")
.withOptionalArg()
.ofType(String.class);
-
+
OptionSet optionSet = optionParser.parse(args.toArray(new String[0]));
List<String> nargs = (List<String>)optionSet.nonOptionArguments();
String schemaFile = schemaFileOption.value(optionSet);
-
+
if (nargs.size() != (schemaFile == null ? 2 : 1)) {
err.println("jsontofrag --schema-file <file> [inline-schema] input-file");
err.println(" converts JSON to Avro fragments.");
@@ -68,12 +68,12 @@ public class JsonToBinaryFragmentTool implements Tool {
InputStream input = Util.fileOrStdin(inputFile, stdin);
try {
- GenericDatumReader<Object> reader =
+ GenericDatumReader<Object> reader =
new GenericDatumReader<Object>(schema);
-
- JsonDecoder jsonDecoder =
+
+ JsonDecoder jsonDecoder =
DecoderFactory.get().jsonDecoder(schema, input);
- GenericDatumWriter<Object> writer =
+ GenericDatumWriter<Object> writer =
new GenericDatumWriter<Object>(schema);
Encoder e = EncoderFactory.get().binaryEncoder(out, null);
Object datum = null;
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/RpcReceiveTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/RpcReceiveTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/RpcReceiveTool.java
index 29eb738..aebca55 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/RpcReceiveTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/RpcReceiveTool.java
@@ -60,7 +60,7 @@ public class RpcReceiveTool implements Tool {
public String getShortDescription() {
return "Opens an RPC Server and listens for one message.";
}
-
+
private class SinkResponder extends GenericResponder {
public SinkResponder(Protocol local) {
@@ -71,7 +71,7 @@ public class RpcReceiveTool implements Tool {
public Object respond(Message message, Object request)
throws AvroRemoteException {
if (!message.equals(expectedMessage)) {
- out.println(String.format("Expected message '%s' but received '%s'.",
+ out.println(String.format("Expected message '%s' but received '%s'.",
expectedMessage.getName(), message.getName()));
latch.countDown();
throw new IllegalArgumentException("Unexpected message.");
@@ -102,7 +102,7 @@ public class RpcReceiveTool implements Tool {
return response;
}
}
-
+
@Override
public int run(InputStream in, PrintStream out, PrintStream err,
List<String> args) throws Exception {
@@ -154,16 +154,16 @@ public class RpcReceiveTool implements Tool {
err.println("One of -data or -file must be specified.");
return 1;
}
-
+
this.out = out;
-
+
latch = new CountDownLatch(1);
server = Ipc.createServer(new SinkResponder(protocol), uri);
server.start();
out.println("Port: " + server.getPort());
return 0;
}
-
+
int run2(PrintStream err) throws InterruptedException {
latch.await();
err.println("Closing server.");
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/RpcSendTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/RpcSendTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/RpcSendTool.java
index 04e729c..20a6801 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/RpcSendTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/RpcSendTool.java
@@ -85,7 +85,7 @@ public class RpcSendTool implements Tool {
messageName, protocol));
return 1;
}
-
+
Object datum;
if (data.value(opts) != null) {
datum = Util.jsonToGenericDatum(message.getRequest(), data.value(opts));
@@ -103,7 +103,7 @@ public class RpcSendTool implements Tool {
return 0;
}
- private void dumpJson(PrintStream out, Schema schema, Object datum)
+ private void dumpJson(PrintStream out, Schema schema, Object datum)
throws IOException {
DatumWriter<Object> writer = new GenericDatumWriter<Object>(schema);
JsonGenerator g =
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/ToTextTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/ToTextTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/ToTextTool.java
index 3eebf3b..a36d54c 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/ToTextTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/ToTextTool.java
@@ -33,11 +33,11 @@ import org.apache.avro.generic.GenericDatumReader;
/** Reads an avro data file into a plain text file. */
public class ToTextTool implements Tool {
- private static final String TEXT_FILE_SCHEMA =
+ private static final String TEXT_FILE_SCHEMA =
"\"bytes\"";
- private static final byte[] LINE_SEPARATOR =
+ private static final byte[] LINE_SEPARATOR =
System.getProperty("line.separator").getBytes();
-
+
@Override
public String getName() {
return "totext";
@@ -51,7 +51,7 @@ public class ToTextTool implements Tool {
@Override
public int run(InputStream stdin, PrintStream out, PrintStream err,
List<String> args) throws Exception {
-
+
OptionParser p = new OptionParser();
OptionSet opts = p.parse(args.toArray(new String[0]));
if (opts.nonOptionArguments().size() != 2) {
@@ -73,7 +73,7 @@ public class ToTextTool implements Tool {
fileReader.close();
return 1;
}
-
+
while (fileReader.hasNext()) {
ByteBuffer outBuff = (ByteBuffer) fileReader.next();
outStream.write(outBuff.array());
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniMetadataTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniMetadataTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniMetadataTool.java
index 361e6f6..bbd6fe5 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniMetadataTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniMetadataTool.java
@@ -64,7 +64,7 @@ public class TrevniMetadataTool implements Tool {
err.println("Usage: [-pretty] input");
return 1;
}
-
+
dump(TrevniUtil.input(filename), out, pretty);
return 0;
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniToJsonTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniToJsonTool.java b/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniToJsonTool.java
index 7ae815a..ae629a2 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniToJsonTool.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniToJsonTool.java
@@ -68,7 +68,7 @@ public class TrevniToJsonTool implements Tool {
err.println("Usage: [-pretty] input");
return 1;
}
-
+
toJson(TrevniUtil.input(filename), out, pretty);
return 0;
@@ -109,7 +109,7 @@ public class TrevniToJsonTool implements Tool {
out.println();
reader.close();
}
-
+
private void valueToJson(ColumnMetaData column) throws IOException {
generator.writeFieldName(shortNames[column.getNumber()]);
ColumnValues in = values[column.getNumber()];
@@ -138,7 +138,7 @@ public class TrevniToJsonTool implements Tool {
}
}
- private void primitiveToJson(ColumnMetaData column, Object value)
+ private void primitiveToJson(ColumnMetaData column, Object value)
throws IOException {
switch (column.getType()) {
case NULL:
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniUtil.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniUtil.java b/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniUtil.java
index 9b49957..0158d1b 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniUtil.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/TrevniUtil.java
@@ -45,11 +45,11 @@ class TrevniUtil {
return new InputFile(new File(filename));
}
}
-
+
/**
* Returns stdin if filename is "-", else opens the local or HDFS file
* and returns an InputStream for it.
- * @throws IOException
+ * @throws IOException
*/
static InputStream input(String filename, InputStream stdin)
throws IOException {
@@ -62,13 +62,13 @@ class TrevniUtil {
return new BufferedInputStream(new FileInputStream(new File(filename)));
}
}
-
+
/**
* Returns stdout if filename is "-", else opens the local or HDFS file
* and returns an OutputStream for it.
- * @throws IOException
+ * @throws IOException
*/
- static OutputStream output(String filename, OutputStream stdout)
+ static OutputStream output(String filename, OutputStream stdout)
throws IOException {
if (filename.equals("-"))
return new BufferedOutputStream(stdout);
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/main/java/org/apache/avro/tool/Util.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/main/java/org/apache/avro/tool/Util.java b/lang/java/tools/src/main/java/org/apache/avro/tool/Util.java
index 22213af..708bb41 100644
--- a/lang/java/tools/src/main/java/org/apache/avro/tool/Util.java
+++ b/lang/java/tools/src/main/java/org/apache/avro/tool/Util.java
@@ -51,65 +51,65 @@ class Util {
/**
* Returns stdin if filename is "-", else opens the File in the owning filesystem
* and returns an InputStream for it.
- * Relative paths will be opened in the default filesystem.
+ * Relative paths will be opened in the default filesystem.
* @param filename The filename to be opened
- * @throws IOException
+ * @throws IOException
*/
- static BufferedInputStream fileOrStdin(String filename, InputStream stdin)
+ static BufferedInputStream fileOrStdin(String filename, InputStream stdin)
throws IOException {
return new BufferedInputStream(filename.equals("-")
? stdin
- : openFromFS(filename));
+ : openFromFS(filename));
}
-
+
/**
* Returns stdout if filename is "-", else opens the file from the owning filesystem
* and returns an OutputStream for it.
- * Relative paths will be opened in the default filesystem.
+ * Relative paths will be opened in the default filesystem.
* @param filename The filename to be opened
- * @throws IOException
+ * @throws IOException
*/
- static BufferedOutputStream fileOrStdout(String filename, OutputStream stdout)
+ static BufferedOutputStream fileOrStdout(String filename, OutputStream stdout)
throws IOException {
return new BufferedOutputStream(filename.equals("-")
? stdout
: createFromFS(filename));
}
-
+
/**
* Returns an InputStream for the file using the owning filesystem,
* or the default if none is given.
* @param filename The filename to be opened
- * @throws IOException
+ * @throws IOException
*/
- static InputStream openFromFS(String filename)
+ static InputStream openFromFS(String filename)
throws IOException {
Path p = new Path(filename);
return p.getFileSystem(new Configuration()).open(p);
}
-
+
/**
* Returns an InputStream for the file using the owning filesystem,
* or the default if none is given.
* @param filename The filename to be opened
- * @throws IOException
+ * @throws IOException
*/
- static InputStream openFromFS(Path filename)
+ static InputStream openFromFS(Path filename)
throws IOException {
return filename.getFileSystem(new Configuration()).open(filename);
}
-
+
/**
- * Returns a seekable FsInput using the owning filesystem,
+ * Returns a seekable FsInput using the owning filesystem,
* or the default if none is given.
* @param filename The filename to be opened
- * @throws IOException
+ * @throws IOException
*/
- static FsInput openSeekableFromFS(String filename)
- throws IOException {
+ static FsInput openSeekableFromFS(String filename)
+ throws IOException {
return new FsInput(new Path(filename), new Configuration());
}
-
+
/**
* Opens the file for writing in the owning filesystem,
* or the default if none is given.
@@ -117,14 +117,14 @@ class Util {
* @return An OutputStream to the specified file.
* @throws IOException
*/
- static OutputStream createFromFS(String filename)
+ static OutputStream createFromFS(String filename)
throws IOException {
Path p = new Path(filename);
return new BufferedOutputStream(p.getFileSystem(new Configuration()).create(p));
}
-
+
/**
- * Closes the inputstream created from {@link Util.fileOrStdin}
+ * Closes the inputstream created from {@link Util.fileOrStdin}
* unless it is System.in.
* @param in The inputstream to be closed.
*/
@@ -137,7 +137,7 @@ class Util {
}
}
}
-
+
/**
* Closes the outputstream created from {@link Util.fileOrStdout}
* unless it is System.out.
@@ -152,7 +152,7 @@ class Util {
}
}
}
-
+
/**
* Parses a schema from the specified file.
* @param filename The file name to parse
@@ -172,18 +172,18 @@ class Util {
* if pathname is a directory, this method returns a list of Pathes to all the files within
* this directory.
* Only files inside that directory are included, no subdirectories or files in subdirectories
- * will be added.
+ * will be added.
* The List is sorted alphabetically.
* @param fileOrDirName filename or directoryname
- * @return A Path List
+ * @return A Path List
* @throws IOException
*/
- static List<Path> getFiles(String fileOrDirName)
+ static List<Path> getFiles(String fileOrDirName)
throws IOException {
- List<Path> pathList = new ArrayList<Path>();
+ List<Path> pathList = new ArrayList<Path>();
Path path = new Path(fileOrDirName);
FileSystem fs = path.getFileSystem(new Configuration());
-
+
if (fs.isFile(path)) {
pathList.add(path);
}
@@ -197,16 +197,16 @@ class Util {
Collections.sort(pathList);
return pathList;
}
-
+
/**
* This method returns a list which contains a path to every given file
* in the input and a path to every file inside a given directory.
* The list is sorted alphabetically and contains no subdirectories or files within those.
* @param fileOrDirNames A list of filenames and directorynames
- * @return A list of Pathes, one for each file
+ * @return A list of Pathes, one for each file
* @throws IOException
*/
- static List<Path> getFiles(List<String> fileOrDirNames)
+ static List<Path> getFiles(List<String> fileOrDirNames)
throws IOException {
ArrayList<Path> pathList = new ArrayList<Path>();
for(String name : fileOrDirNames) {
@@ -215,11 +215,11 @@ class Util {
Collections.sort(pathList);
return pathList;
}
-
- /**
+
+ /**
* Converts a String JSON object into a generic datum.
- *
- * This is inefficient (creates extra objects), so should be used
+ *
+ * This is inefficient (creates extra objects), so should be used
* sparingly.
*/
static Object jsonToGenericDatum(Schema schema, String jsonData)
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java
index 9d7fbc8..07a3483 100644
--- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java
+++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java
@@ -1,9 +1,9 @@
/**
* Autogenerated by Avro
- *
+ *
* DO NOT EDIT DIRECTLY
*/
-package avro.examples.baseball;
+package avro.examples.baseball;
import org.apache.avro.specific.SpecificData;
@@ -23,7 +23,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
/**
* Default constructor. Note that this does not initialize fields
* to their default values from the schema. If that is desired then
- * one should use <code>newBuilder()</code>.
+ * one should use <code>newBuilder()</code>.
*/
public Player() {}
@@ -42,7 +42,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
}
public org.apache.avro.Schema getSchema() { return SCHEMA$; }
- // Used by DatumWriter. Applications should not call.
+ // Used by DatumWriter. Applications should not call.
public java.lang.Object get(int field$) {
switch (field$) {
case 0: return number;
@@ -52,7 +52,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
default: throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
- // Used by DatumReader. Applications should not call.
+ // Used by DatumReader. Applications should not call.
@SuppressWarnings(value="unchecked")
public void put(int field$, java.lang.Object value$) {
switch (field$) {
@@ -136,7 +136,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
public static avro.examples.baseball.Player.Builder newBuilder() {
return new avro.examples.baseball.Player.Builder();
}
-
+
/**
* Creates a new Player RecordBuilder by copying an existing Builder.
* @param other The existing builder to copy.
@@ -145,7 +145,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
public static avro.examples.baseball.Player.Builder newBuilder(avro.examples.baseball.Player.Builder other) {
return new avro.examples.baseball.Player.Builder(other);
}
-
+
/**
* Creates a new Player RecordBuilder by copying an existing Player instance.
* @param other The existing instance to copy.
@@ -154,7 +154,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
public static avro.examples.baseball.Player.Builder newBuilder(avro.examples.baseball.Player other) {
return new avro.examples.baseball.Player.Builder(other);
}
-
+
/**
* RecordBuilder for Player instances.
*/
@@ -171,7 +171,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
private Builder() {
super(SCHEMA$);
}
-
+
/**
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
@@ -195,7 +195,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
fieldSetFlags()[3] = true;
}
}
-
+
/**
* Creates a Builder by copying an existing Player instance
* @param other The existing instance to copy.
@@ -239,7 +239,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
validate(fields()[0], value);
this.number = value;
fieldSetFlags()[0] = true;
- return this;
+ return this;
}
/**
@@ -279,7 +279,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
validate(fields()[1], value);
this.first_name = value;
fieldSetFlags()[1] = true;
- return this;
+ return this;
}
/**
@@ -318,7 +318,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
validate(fields()[2], value);
this.last_name = value;
fieldSetFlags()[2] = true;
- return this;
+ return this;
}
/**
@@ -357,7 +357,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
validate(fields()[3], value);
this.position = value;
fieldSetFlags()[3] = true;
- return this;
+ return this;
}
/**
@@ -395,7 +395,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
}
private static final org.apache.avro.io.DatumWriter
- WRITER$ = new org.apache.avro.specific.SpecificDatumWriter(SCHEMA$);
+ WRITER$ = new org.apache.avro.specific.SpecificDatumWriter(SCHEMA$);
@Override public void writeExternal(java.io.ObjectOutput out)
throws java.io.IOException {
@@ -403,7 +403,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
}
private static final org.apache.avro.io.DatumReader
- READER$ = new org.apache.avro.specific.SpecificDatumReader(SCHEMA$);
+ READER$ = new org.apache.avro.specific.SpecificDatumReader(SCHEMA$);
@Override public void readExternal(java.io.ObjectInput in)
throws java.io.IOException {
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java
index 2d17900..4effedd 100644
--- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java
+++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java
@@ -1,12 +1,12 @@
/**
* Autogenerated by Avro
- *
+ *
* DO NOT EDIT DIRECTLY
*/
-package avro.examples.baseball;
+package avro.examples.baseball;
@SuppressWarnings("all")
@org.apache.avro.specific.AvroGenerated
-public enum Position {
+public enum Position {
P, C, B1, B2, B3, SS, LF, CF, RF, DH ;
public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"enum\",\"name\":\"Position\",\"namespace\":\"avro.examples.baseball\",\"symbols\":[\"P\",\"C\",\"B1\",\"B2\",\"B3\",\"SS\",\"LF\",\"CF\",\"RF\",\"DH\"]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/test/compiler/output/Player.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/test/compiler/output/Player.java b/lang/java/tools/src/test/compiler/output/Player.java
index bf0ed62..252eaab 100644
--- a/lang/java/tools/src/test/compiler/output/Player.java
+++ b/lang/java/tools/src/test/compiler/output/Player.java
@@ -1,9 +1,9 @@
/**
* Autogenerated by Avro
- *
+ *
* DO NOT EDIT DIRECTLY
*/
-package avro.examples.baseball;
+package avro.examples.baseball;
import org.apache.avro.specific.SpecificData;
@@ -23,7 +23,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
/**
* Default constructor. Note that this does not initialize fields
* to their default values from the schema. If that is desired then
- * one should use <code>newBuilder()</code>.
+ * one should use <code>newBuilder()</code>.
*/
public Player() {}
@@ -42,7 +42,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
}
public org.apache.avro.Schema getSchema() { return SCHEMA$; }
- // Used by DatumWriter. Applications should not call.
+ // Used by DatumWriter. Applications should not call.
public java.lang.Object get(int field$) {
switch (field$) {
case 0: return number;
@@ -52,7 +52,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
default: throw new org.apache.avro.AvroRuntimeException("Bad index");
}
}
- // Used by DatumReader. Applications should not call.
+ // Used by DatumReader. Applications should not call.
@SuppressWarnings(value="unchecked")
public void put(int field$, java.lang.Object value$) {
switch (field$) {
@@ -136,7 +136,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
public static avro.examples.baseball.Player.Builder newBuilder() {
return new avro.examples.baseball.Player.Builder();
}
-
+
/**
* Creates a new Player RecordBuilder by copying an existing Builder.
* @param other The existing builder to copy.
@@ -145,7 +145,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
public static avro.examples.baseball.Player.Builder newBuilder(avro.examples.baseball.Player.Builder other) {
return new avro.examples.baseball.Player.Builder(other);
}
-
+
/**
* Creates a new Player RecordBuilder by copying an existing Player instance.
* @param other The existing instance to copy.
@@ -154,7 +154,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
public static avro.examples.baseball.Player.Builder newBuilder(avro.examples.baseball.Player other) {
return new avro.examples.baseball.Player.Builder(other);
}
-
+
/**
* RecordBuilder for Player instances.
*/
@@ -171,7 +171,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
private Builder() {
super(SCHEMA$);
}
-
+
/**
* Creates a Builder by copying an existing Builder.
* @param other The existing Builder to copy.
@@ -195,7 +195,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
fieldSetFlags()[3] = true;
}
}
-
+
/**
* Creates a Builder by copying an existing Player instance
* @param other The existing instance to copy.
@@ -239,7 +239,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
validate(fields()[0], value);
this.number = value;
fieldSetFlags()[0] = true;
- return this;
+ return this;
}
/**
@@ -279,7 +279,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
validate(fields()[1], value);
this.first_name = value;
fieldSetFlags()[1] = true;
- return this;
+ return this;
}
/**
@@ -318,7 +318,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
validate(fields()[2], value);
this.last_name = value;
fieldSetFlags()[2] = true;
- return this;
+ return this;
}
/**
@@ -357,7 +357,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
validate(fields()[3], value);
this.position = value;
fieldSetFlags()[3] = true;
- return this;
+ return this;
}
/**
@@ -395,7 +395,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
}
private static final org.apache.avro.io.DatumWriter
- WRITER$ = new org.apache.avro.specific.SpecificDatumWriter(SCHEMA$);
+ WRITER$ = new org.apache.avro.specific.SpecificDatumWriter(SCHEMA$);
@Override public void writeExternal(java.io.ObjectOutput out)
throws java.io.IOException {
@@ -403,7 +403,7 @@ public class Player extends org.apache.avro.specific.SpecificRecordBase implemen
}
private static final org.apache.avro.io.DatumReader
- READER$ = new org.apache.avro.specific.SpecificDatumReader(SCHEMA$);
+ READER$ = new org.apache.avro.specific.SpecificDatumReader(SCHEMA$);
@Override public void readExternal(java.io.ObjectInput in)
throws java.io.IOException {
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/test/compiler/output/Position.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/test/compiler/output/Position.java b/lang/java/tools/src/test/compiler/output/Position.java
index 2d17900..4effedd 100644
--- a/lang/java/tools/src/test/compiler/output/Position.java
+++ b/lang/java/tools/src/test/compiler/output/Position.java
@@ -1,12 +1,12 @@
/**
* Autogenerated by Avro
- *
+ *
* DO NOT EDIT DIRECTLY
*/
-package avro.examples.baseball;
+package avro.examples.baseball;
@SuppressWarnings("all")
@org.apache.avro.specific.AvroGenerated
-public enum Position {
+public enum Position {
P, C, B1, B2, B3, SS, LF, CF, RF, DH ;
public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"enum\",\"name\":\"Position\",\"namespace\":\"avro.examples.baseball\",\"symbols\":[\"P\",\"C\",\"B1\",\"B2\",\"B3\",\"SS\",\"LF\",\"CF\",\"RF\",\"DH\"]}");
public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; }
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java
index d0c6d65..312bd76 100644
--- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java
+++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestCatTool.java
@@ -52,7 +52,7 @@ public class TestCatTool {
private static final int LIMIT_OUT_OF_INPUT_BOUNDS = 100001;
private static final double SAMPLERATE = .01;
private static final double SAMPLERATE_TOO_SMALL = .00000001;
-
+
private final Schema INTSCHEMA = new Schema.Parser().parse(
"{\"type\":\"record\", " +
"\"name\":\"myRecord\", " +
@@ -66,7 +66,7 @@ public class TestCatTool {
"]}");
private static final CodecFactory DEFLATE = CodecFactory.deflateCodec(9);
private static final CodecFactory SNAPPY = CodecFactory.snappyCodec();
-
+
private GenericRecord aDatum(Type ofType, int forRow) {
GenericRecord record = null;
@@ -78,7 +78,7 @@ public class TestCatTool {
case INT:
record = new GenericData.Record(INTSCHEMA);
record.put("value", forRow);
- return record;
+ return record;
default:
throw new AssertionError("I can't generate data for this type");
}
@@ -95,7 +95,7 @@ public class TestCatTool {
if(type.equals(Schema.Type.STRING)) {
schema = STRINGSCHEMA;
}
-
+
DataFileWriter<Object> writer = new DataFileWriter<Object>(
new GenericDatumWriter<Object>(schema));
for(Entry<String, String> metadatum : metadata.entrySet()) {
@@ -111,10 +111,10 @@ public class TestCatTool {
return inputFile;
}
-
-
+
+
private int getFirstIntDatum(File file) throws Exception {
- DataFileStream<GenericRecord> reader = new DataFileStream<GenericRecord>( new FileInputStream(file) ,
+ DataFileStream<GenericRecord> reader = new DataFileStream<GenericRecord>( new FileInputStream(file) ,
new GenericDatumReader<GenericRecord>());
int result = (Integer) reader.next().get(0);
@@ -166,7 +166,7 @@ public class TestCatTool {
assertEquals(0, returnCode);
assertEquals(LIMIT_WITHIN_INPUT_BOUNDS, numRowsInFile(output));
-
+
// folder input
args = asList(
input1.getParentFile().getAbsolutePath(),
@@ -182,7 +182,7 @@ public class TestCatTool {
assertEquals(LIMIT_WITHIN_INPUT_BOUNDS, numRowsInFile(output));
}
-
+
@Test
public void testLimitOutOfBounds() throws Exception {
Map<String, String> metadata = new HashMap<String, String>();
@@ -203,9 +203,9 @@ public class TestCatTool {
System.err,
args);
assertEquals(0, returnCode);
- assertEquals(ROWS_IN_INPUT_FILES - OFFSET, numRowsInFile(output));
+ assertEquals(ROWS_IN_INPUT_FILES - OFFSET, numRowsInFile(output));
}
-
+
@Test
public void testSamplerateAccuracy() throws Exception {
Map<String, String> metadata = new HashMap<String, String>();
@@ -226,9 +226,9 @@ public class TestCatTool {
System.err,
args);
assertEquals(0, returnCode);
-
+
assertTrue("Outputsize is not roughly (Inputsize - Offset) * samplerate",
- (ROWS_IN_INPUT_FILES - OFFSET)*SAMPLERATE - numRowsInFile(output) < 2);
+ (ROWS_IN_INPUT_FILES - OFFSET)*SAMPLERATE - numRowsInFile(output) < 2);
assertTrue("", (ROWS_IN_INPUT_FILES - OFFSET)*SAMPLERATE - numRowsInFile(output) > -2);
}
@@ -256,7 +256,7 @@ public class TestCatTool {
assertEquals("output does not start at offset",
OFFSET, getFirstIntDatum(output));
}
-
+
@Test
public void testOffsetBiggerThanInput() throws Exception{
Map<String, String> metadata = new HashMap<String, String>();
@@ -279,7 +279,7 @@ public class TestCatTool {
assertEquals("output is not empty",
0, numRowsInFile(output));
}
-
+
@Test
public void testSamplerateSmallerThanInput() throws Exception{
Map<String, String> metadata = new HashMap<String, String>();
@@ -300,12 +300,12 @@ public class TestCatTool {
System.err,
args);
assertEquals(0, returnCode);
-
+
assertEquals("output should only contain the record at offset",
(int) OFFSET, getFirstIntDatum(output));
}
-
-
+
+
@Test(expected = IOException.class)
public void testDifferentSchemasFail() throws Exception {
Map<String, String> metadata = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/avro/blob/ade55151/lang/java/tools/src/test/java/org/apache/avro/tool/TestCreateRandomFileTool.java
----------------------------------------------------------------------
diff --git a/lang/java/tools/src/test/java/org/apache/avro/tool/TestCreateRandomFileTool.java b/lang/java/tools/src/test/java/org/apache/avro/tool/TestCreateRandomFileTool.java
index f5c6056..e752961 100644
--- a/lang/java/tools/src/test/java/org/apache/avro/tool/TestCreateRandomFileTool.java
+++ b/lang/java/tools/src/test/java/org/apache/avro/tool/TestCreateRandomFileTool.java
@@ -56,7 +56,7 @@ public class TestCreateRandomFileTool {
}
return baos.toByteArray();
}
-
+
public void check(String... extraArgs) throws Exception {
ArrayList<String> args = new ArrayList<String>();
args.addAll(Arrays.asList(new String[] {
@@ -69,7 +69,7 @@ public class TestCreateRandomFileTool {
DataFileReader<Object> reader =
new DataFileReader(OUT_FILE, new GenericDatumReader<Object>());
-
+
Iterator<Object> found = reader.iterator();
for (Object expected :
new RandomData(Schema.parse(SCHEMA_FILE), Integer.parseInt(COUNT)))
@@ -94,11 +94,11 @@ public class TestCreateRandomFileTool {
byte[] file =
run(Arrays.asList(new String[]
{ "-", "--count", COUNT, "--schema-file", SCHEMA_FILE.toString() }));
-
+
DataFileStream<Object> reader =
new DataFileStream(new ByteArrayInputStream(file),
new GenericDatumReader<Object>());
-
+
Iterator<Object> found = reader.iterator();
for (Object expected :
new RandomData(Schema.parse(SCHEMA_FILE), Integer.parseInt(COUNT)))