You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by ni...@apache.org on 2017/12/29 17:10:12 UTC
[02/19] avro git commit: AVRO-2117: Cleanup Java - Remove trailing
spaces
AVRO-2117: Cleanup Java - Remove trailing spaces
Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/706d8ce0
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/706d8ce0
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/706d8ce0
Branch: refs/heads/master
Commit: 706d8ce0da8aa595061e880288682385cc77a0d0
Parents: 4b69cb2
Author: Niels Basjes <nb...@bol.com>
Authored: Wed Dec 13 15:24:49 2017 +0100
Committer: Niels Basjes <nb...@bol.com>
Committed: Fri Dec 29 14:42:45 2017 +0100
----------------------------------------------------------------------
.../apache/avro/TestSchemaCompatibility.java | 2 +-
.../avro/generic/TestGenericLogicalTypes.java | 8 +-
.../avro/io/TestResolvingIOResolving.java | 2 +-
.../specific/TestRecordWithLogicalTypes.java | 36 ++++----
.../specific/TestRecordWithoutLogicalTypes.java | 90 ++++++++++----------
.../java/org/apache/avro/TestProtocolHttps.java | 2 +-
6 files changed, 70 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/avro/blob/706d8ce0/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java
index 591fe94..f271a9d 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaCompatibility.java
@@ -548,7 +548,7 @@ public class TestSchemaCompatibility {
expectedDecodedDatum, decodedDatum);
}
}
-
+
Deque<String> asDeqeue(String... args) {
Deque<String> dq = new ArrayDeque<String>();
List<String> x = Arrays.asList(args);
http://git-wip-us.apache.org/repos/asf/avro/blob/706d8ce0/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
index dc3c6f6..70cab88 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericLogicalTypes.java
@@ -246,21 +246,21 @@ public class TestGenericLogicalTypes {
UUID.randomUUID().toString(), // use raw type
GenericData.get()); // with no conversions
}
-
+
@Test
public void testCopyDecimal() {
testCopy(LogicalTypes.decimal(9, 2).addToSchema(Schema.create(Schema.Type.BYTES)),
new BigDecimal("-34.34"),
GENERIC);
}
-
+
@Test
public void testCopyDecimalRaw() {
testCopy(LogicalTypes.decimal(9, 2).addToSchema(Schema.create(Schema.Type.BYTES)),
ByteBuffer.wrap(new BigDecimal("-34.34").unscaledValue().toByteArray()),
GenericData.get()); // no conversions
}
-
+
private void testCopy(Schema schema, Object value, GenericData model) {
// test direct copy of instance
checkCopy(value, model.deepCopy(schema, value), false);
@@ -288,7 +288,7 @@ public class TestGenericLogicalTypes {
}
private void checkCopy(Object original, Object copy, boolean notSame) {
- if (notSame)
+ if (notSame)
Assert.assertNotSame(original, copy);
Assert.assertEquals(original, copy);
}
http://git-wip-us.apache.org/repos/asf/avro/blob/706d8ce0/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java b/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java
index b722e76..213f2f7 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/io/TestResolvingIOResolving.java
@@ -190,7 +190,7 @@ public class TestResolvingIOResolving {
+ "{\"name\":\"f3\", \"type\":\"double\"}]}", "BLD",
new Object[] { true, 100L, 10.75d } },
// Array of record with arrays.
- { "{ \"type\": \"array\", \"items\":" +
+ { "{ \"type\": \"array\", \"items\":" +
"{\"type\":\"record\",\"name\":\"r\",\"fields\":["
+ "{\"name\":\"f0\", \"type\":\"boolean\"},"
+ "{\"name\":\"f1\", \"type\": {\"type\":\"array\", \"items\": \"boolean\" }}"
http://git-wip-us.apache.org/repos/asf/avro/blob/706d8ce0/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithLogicalTypes.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithLogicalTypes.java b/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithLogicalTypes.java
index da3f878..493a8e6 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithLogicalTypes.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithLogicalTypes.java
@@ -1,6 +1,6 @@
/**
* Autogenerated by Avro
- *
+ *
* DO NOT EDIT DIRECTLY
*/
package org.apache.avro.specific;
@@ -50,7 +50,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
/**
* 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 TestRecordWithLogicalTypes() {}
@@ -80,7 +80,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
}
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 b;
@@ -96,7 +96,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
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$) {
@@ -292,17 +292,17 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
public static TestRecordWithLogicalTypes.Builder newBuilder() {
return new TestRecordWithLogicalTypes.Builder();
}
-
+
/** Creates a new TestRecordWithLogicalTypes RecordBuilder by copying an existing Builder */
public static TestRecordWithLogicalTypes.Builder newBuilder(TestRecordWithLogicalTypes.Builder other) {
return new TestRecordWithLogicalTypes.Builder(other);
}
-
+
/** Creates a new TestRecordWithLogicalTypes RecordBuilder by copying an existing TestRecordWithLogicalTypes instance */
public static TestRecordWithLogicalTypes.Builder newBuilder(TestRecordWithLogicalTypes other) {
return new TestRecordWithLogicalTypes.Builder(other);
}
-
+
/**
* RecordBuilder for TestRecordWithLogicalTypes instances.
*/
@@ -324,7 +324,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
private Builder() {
super(TestRecordWithLogicalTypes.SCHEMA$);
}
-
+
/** Creates a Builder by copying an existing Builder */
private Builder(TestRecordWithLogicalTypes.Builder other) {
super(other);
@@ -369,7 +369,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
fieldSetFlags()[9] = true;
}
}
-
+
/** Creates a Builder by copying an existing TestRecordWithLogicalTypes instance */
private Builder(TestRecordWithLogicalTypes other) {
super(TestRecordWithLogicalTypes.SCHEMA$);
@@ -430,7 +430,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[0], value);
this.b = value;
fieldSetFlags()[0] = true;
- return this;
+ return this;
}
/**
@@ -464,7 +464,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[1], value);
this.i32 = value;
fieldSetFlags()[1] = true;
- return this;
+ return this;
}
/**
@@ -498,7 +498,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[2], value);
this.i64 = value;
fieldSetFlags()[2] = true;
- return this;
+ return this;
}
/**
@@ -532,7 +532,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[3], value);
this.f32 = value;
fieldSetFlags()[3] = true;
- return this;
+ return this;
}
/**
@@ -566,7 +566,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[4], value);
this.f64 = value;
fieldSetFlags()[4] = true;
- return this;
+ return this;
}
/**
@@ -600,7 +600,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[5], value);
this.s = value;
fieldSetFlags()[5] = true;
- return this;
+ return this;
}
/**
@@ -635,7 +635,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[6], value);
this.d = value;
fieldSetFlags()[6] = true;
- return this;
+ return this;
}
/**
@@ -669,7 +669,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[7], value);
this.t = value;
fieldSetFlags()[7] = true;
- return this;
+ return this;
}
/**
@@ -703,7 +703,7 @@ public class TestRecordWithLogicalTypes extends org.apache.avro.specific.Specifi
validate(fields()[8], value);
this.ts = value;
fieldSetFlags()[8] = true;
- return this;
+ return this;
}
/**
http://git-wip-us.apache.org/repos/asf/avro/blob/706d8ce0/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java
----------------------------------------------------------------------
diff --git a/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java b/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java
index 92a5e60..21d2d6f 100644
--- a/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java
+++ b/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java
@@ -1,6 +1,6 @@
/**
* Autogenerated by Avro
- *
+ *
* DO NOT EDIT DIRECTLY
*/
package org.apache.avro.specific;
@@ -48,7 +48,7 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
/**
* Default constructor. Note that this does not initialize fields
* to their default values from the schema. If that is desired then
- * one should use {@link \#newBuilder()}.
+ * one should use {@link \#newBuilder()}.
*/
public TestRecordWithoutLogicalTypes() {}
@@ -69,7 +69,7 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
}
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 b;
@@ -85,7 +85,7 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
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$) {
@@ -185,17 +185,17 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public static TestRecordWithoutLogicalTypes.Builder newBuilder() {
return new TestRecordWithoutLogicalTypes.Builder();
}
-
+
/** Creates a new TestRecordWithoutLogicalTypes RecordBuilder by copying an existing Builder */
public static TestRecordWithoutLogicalTypes.Builder newBuilder(TestRecordWithoutLogicalTypes.Builder other) {
return new TestRecordWithoutLogicalTypes.Builder(other);
}
-
+
/** Creates a new TestRecordWithoutLogicalTypes RecordBuilder by copying an existing TestRecordWithoutLogicalTypes instance */
public static TestRecordWithoutLogicalTypes.Builder newBuilder(TestRecordWithoutLogicalTypes other) {
return new TestRecordWithoutLogicalTypes.Builder(other);
}
-
+
/**
* RecordBuilder for TestRecordWithoutLogicalTypes instances.
*/
@@ -217,7 +217,7 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
private Builder() {
super(TestRecordWithoutLogicalTypes.SCHEMA$);
}
-
+
/** Creates a Builder by copying an existing Builder */
private Builder(TestRecordWithoutLogicalTypes.Builder other) {
super(other);
@@ -262,7 +262,7 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
fieldSetFlags()[9] = true;
}
}
-
+
/** Creates a Builder by copying an existing TestRecordWithoutLogicalTypes instance */
private Builder(TestRecordWithoutLogicalTypes other) {
super(TestRecordWithoutLogicalTypes.SCHEMA$);
@@ -312,20 +312,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.Boolean getB() {
return b;
}
-
+
/** Sets the value of the 'b' field */
public TestRecordWithoutLogicalTypes.Builder setB(boolean value) {
validate(fields()[0], value);
this.b = value;
fieldSetFlags()[0] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 'b' field has been set */
public boolean hasB() {
return fieldSetFlags()[0];
}
-
+
/** Clears the value of the 'b' field */
public TestRecordWithoutLogicalTypes.Builder clearB() {
fieldSetFlags()[0] = false;
@@ -336,20 +336,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.Integer getI32() {
return i32;
}
-
+
/** Sets the value of the 'i32' field */
public TestRecordWithoutLogicalTypes.Builder setI32(int value) {
validate(fields()[1], value);
this.i32 = value;
fieldSetFlags()[1] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 'i32' field has been set */
public boolean hasI32() {
return fieldSetFlags()[1];
}
-
+
/** Clears the value of the 'i32' field */
public TestRecordWithoutLogicalTypes.Builder clearI32() {
fieldSetFlags()[1] = false;
@@ -360,20 +360,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.Long getI64() {
return i64;
}
-
+
/** Sets the value of the 'i64' field */
public TestRecordWithoutLogicalTypes.Builder setI64(long value) {
validate(fields()[2], value);
this.i64 = value;
fieldSetFlags()[2] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 'i64' field has been set */
public boolean hasI64() {
return fieldSetFlags()[2];
}
-
+
/** Clears the value of the 'i64' field */
public TestRecordWithoutLogicalTypes.Builder clearI64() {
fieldSetFlags()[2] = false;
@@ -384,20 +384,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.Float getF32() {
return f32;
}
-
+
/** Sets the value of the 'f32' field */
public TestRecordWithoutLogicalTypes.Builder setF32(float value) {
validate(fields()[3], value);
this.f32 = value;
fieldSetFlags()[3] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 'f32' field has been set */
public boolean hasF32() {
return fieldSetFlags()[3];
}
-
+
/** Clears the value of the 'f32' field */
public TestRecordWithoutLogicalTypes.Builder clearF32() {
fieldSetFlags()[3] = false;
@@ -408,20 +408,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.Double getF64() {
return f64;
}
-
+
/** Sets the value of the 'f64' field */
public TestRecordWithoutLogicalTypes.Builder setF64(double value) {
validate(fields()[4], value);
this.f64 = value;
fieldSetFlags()[4] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 'f64' field has been set */
public boolean hasF64() {
return fieldSetFlags()[4];
}
-
+
/** Clears the value of the 'f64' field */
public TestRecordWithoutLogicalTypes.Builder clearF64() {
fieldSetFlags()[4] = false;
@@ -432,20 +432,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.String getS() {
return s;
}
-
+
/** Sets the value of the 's' field */
public TestRecordWithoutLogicalTypes.Builder setS(java.lang.String value) {
validate(fields()[5], value);
this.s = value;
fieldSetFlags()[5] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 's' field has been set */
public boolean hasS() {
return fieldSetFlags()[5];
}
-
+
/** Clears the value of the 's' field */
public TestRecordWithoutLogicalTypes.Builder clearS() {
s = null;
@@ -457,20 +457,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.Integer getD() {
return d;
}
-
+
/** Sets the value of the 'd' field */
public TestRecordWithoutLogicalTypes.Builder setD(int value) {
validate(fields()[6], value);
this.d = value;
fieldSetFlags()[6] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 'd' field has been set */
public boolean hasD() {
return fieldSetFlags()[6];
}
-
+
/** Clears the value of the 'd' field */
public TestRecordWithoutLogicalTypes.Builder clearD() {
fieldSetFlags()[6] = false;
@@ -481,20 +481,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.Integer getT() {
return t;
}
-
+
/** Sets the value of the 't' field */
public TestRecordWithoutLogicalTypes.Builder setT(int value) {
validate(fields()[7], value);
this.t = value;
fieldSetFlags()[7] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 't' field has been set */
public boolean hasT() {
return fieldSetFlags()[7];
}
-
+
/** Clears the value of the 't' field */
public TestRecordWithoutLogicalTypes.Builder clearT() {
fieldSetFlags()[7] = false;
@@ -505,20 +505,20 @@ public class TestRecordWithoutLogicalTypes extends org.apache.avro.specific.Spec
public java.lang.Long getTs() {
return ts;
}
-
+
/** Sets the value of the 'ts' field */
public TestRecordWithoutLogicalTypes.Builder setTs(long value) {
validate(fields()[8], value);
this.ts = value;
fieldSetFlags()[8] = true;
- return this;
+ return this;
}
-
+
/** Checks whether the 'ts' field has been set */
public boolean hasTs() {
return fieldSetFlags()[8];
}
-
+
/** Clears the value of the 'ts' field */
public TestRecordWithoutLogicalTypes.Builder clearTs() {
fieldSetFlags()[8] = false;
http://git-wip-us.apache.org/repos/asf/avro/blob/706d8ce0/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttps.java
----------------------------------------------------------------------
diff --git a/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttps.java b/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttps.java
index 4f001a6..c9e5662 100644
--- a/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttps.java
+++ b/lang/java/ipc/src/test/java/org/apache/avro/TestProtocolHttps.java
@@ -40,7 +40,7 @@ public class TestProtocolHttps extends TestProtocolSpecific {
System.setProperty("javax.net.ssl.trustStorePassword", "avrotest");
SslConnectionFactory connectionFactory = new SslConnectionFactory("HTTP/1.1");
SslContextFactory sslContextFactory = connectionFactory.getSslContextFactory();
-
+
sslContextFactory.setKeyStorePath(System.getProperty("javax.net.ssl.keyStore"));
sslContextFactory.setKeyManagerPassword(System.getProperty("javax.net.ssl.password"));
sslContextFactory.setKeyStorePassword(System.getProperty("javax.net.ssl.keyStorePassword"));