This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/master by this push:
new e65411f Squashed commit of the following: This closes #243
e65411f is described below
commit e65411f5cce2d58588fbb96a366560f6e6803dab
Author: Daniel Kulp <[email protected]>
AuthorDate: Mon Dec 10 16:53:29 2018 -0500
Squashed commit of the following:
This closes #243
commit b2a5607578652f203e117c5b80d228618dd101f1
Merge: 500c28c2 54fc3f53
Author: Daniel Kulp <[email protected]>
Date: Mon Dec 3 14:46:47 2018 -0500
Merge branch 'master' into master
commit 500c28c212d20e40fe48b6229cfc7764631f56e8
Author: Daniil Guitelson <[email protected]>
Date: Fri Sep 1 17:37:10 2017 +0300
AVRO-2069: Use primitive fields in generated getters & setters in Java
code
Fix broken unit tests in TestSpecificCompilerTool after migrating to
org.junit.Test
commit 35b891ebf868cea12f278641229807c1e2a35db2
Merge: c642adaf 189368ed
Author: Daniil Gitelson <[email protected]>
Date: Fri Sep 1 17:33:13 2017 +0300
Merge pull request #1 from apache/master
Sync up with origin repository
commit c642adaf3d29183049cd4ad2e0012b002d95d7c6
Author: Daniil Guitelson <[email protected]>
Date: Wed Aug 30 18:37:41 2017 +0300
AVRO-2069: Use primitive fields in generated getters & setters in Java
code
Fix broken unit tests in TestSpecificCompilerTool
commit 3414eae643517591015e3a6154c726c31f2d3095
Author: Daniil Guitelson <[email protected]>
Date: Tue Aug 29 12:13:42 2017 +0300
AVRO-2069: Use primitive fields in generated getters & setters in Java
code
---
.../compiler/specific/templates/java/classic/record.vm | 6 +++---
.../org/apache/avro/message/TestCustomSchemaStore.java | 2 +-
.../apache/avro/specific/TestSpecificRecordBuilder.java | 14 +++++++-------
.../output-string/avro/examples/baseball/Player.java | 6 +++---
lang/java/tools/src/test/compiler/output/Player.java | 6 +++---
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm
b/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm
index 25b4101..f2e3bcf 100644
---
a/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm
+++
b/lang/java/compiler/src/main/velocity/org/apache/avro/compiler/specific/templates/java/classic/record.vm
@@ -228,7 +228,7 @@ public class ${this.mangle($schema.getName())}#if
($schema.isError()) extends or
#else * @return The value of the '${this.mangle($field.name(),
$schema.isError())}' field.
#end
*/
- public ${this.javaType($field.schema())} ${this.generateGetMethod($schema,
$field)}() {
+ public ${this.javaUnbox($field.schema())} ${this.generateGetMethod($schema,
$field)}() {
return ${this.mangle($field.name(), $schema.isError())};
}
#end
@@ -252,7 +252,7 @@ public class ${this.mangle($schema.getName())}#if
($schema.isError()) extends or
#end
* @param value the value to set.
*/
- public void ${this.generateSetMethod($schema,
$field)}(${this.javaType($field.schema())} value) {
+ public void ${this.generateSetMethod($schema,
$field)}(${this.javaUnbox($field.schema())} value) {
this.${this.mangle($field.name(), $schema.isError())} = value;
}
#end
@@ -384,7 +384,7 @@ public class ${this.mangle($schema.getName())}#if
($schema.isError()) extends or
#end
* @return The value.
*/
- public ${this.javaType($field.schema())} ${this.generateGetMethod($schema,
$field)}() {
+ public ${this.javaUnbox($field.schema())}
${this.generateGetMethod($schema, $field)}() {
return ${this.mangle($field.name(), $schema.isError())};
}
diff --git
a/lang/java/ipc/src/test/java/org/apache/avro/message/TestCustomSchemaStore.java
b/lang/java/ipc/src/test/java/org/apache/avro/message/TestCustomSchemaStore.java
index ba96044..5de9d6a 100644
---
a/lang/java/ipc/src/test/java/org/apache/avro/message/TestCustomSchemaStore.java
+++
b/lang/java/ipc/src/test/java/org/apache/avro/message/TestCustomSchemaStore.java
@@ -62,7 +62,7 @@ public class TestCustomSchemaStore {
// Should work
assertEquals(nestedEvolve1.getRootName(), "RootName");
assertEquals(nestedEvolve1.getNested().getName(), "Name");
- assertEquals(nestedEvolve1.getNested().getValue(), Long.valueOf(1));
+ assertEquals(nestedEvolve1.getNested().getValue(), 1);
}
@Test(expected = MissingSchemaException.class)
diff --git
a/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java
b/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java
index 4fa6fe0..4d19b7e 100644
---
a/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java
+++
b/lang/java/ipc/src/test/java/org/apache/avro/specific/TestSpecificRecordBuilder.java
@@ -47,7 +47,7 @@ public class TestSpecificRecordBuilder {
Assert.assertTrue(builder.hasName());
Assert.assertEquals("James Gosling", builder.getName());
Assert.assertTrue(builder.hasYearOfBirth());
- Assert.assertEquals(new Integer(1955), builder.getYearOfBirth());
+ Assert.assertEquals(1955, builder.getYearOfBirth());
Assert.assertFalse(builder.hasCountry());
Assert.assertNull(builder.getCountry());
Assert.assertTrue(builder.hasState());
@@ -59,7 +59,7 @@ public class TestSpecificRecordBuilder {
Person person = builder.build();
Assert.assertEquals("James Gosling", person.getName());
- Assert.assertEquals(new Integer(1955), person.getYearOfBirth());
+ Assert.assertEquals(1955, person.getYearOfBirth());
Assert.assertEquals("US", person.getCountry()); // country should default
to "US"
Assert.assertEquals("CA", person.getState());
Assert.assertNotNull(person.getFriends()); // friends should default to
an empty list
@@ -75,7 +75,7 @@ public class TestSpecificRecordBuilder {
Person.Builder builderCopy = Person.newBuilder(person);
Assert.assertEquals("James Gosling", builderCopy.getName());
- Assert.assertEquals(new Integer(1955), builderCopy.getYearOfBirth());
+ Assert.assertEquals(1955, builderCopy.getYearOfBirth());
Assert.assertEquals("US", builderCopy.getCountry()); // country should
default to "US"
Assert.assertEquals("CA", builderCopy.getState());
Assert.assertNotNull(builderCopy.getFriends()); // friends should default
to an empty list
@@ -102,13 +102,13 @@ public class TestSpecificRecordBuilder {
.setProduct(product)
.build())
.build();
- Assert.assertEquals(datetime, p.getDatetime().longValue());
+ Assert.assertEquals(datetime, p.getDatetime());
Assert.assertEquals(ProductPage.class, p.getPageContext().getClass());
Assert.assertEquals(product,
((ProductPage)p.getPageContext()).getProduct());
PageView p2 = PageView.newBuilder(p).build();
- Assert.assertEquals(datetime, p2.getDatetime().longValue());
+ Assert.assertEquals(datetime, p2.getDatetime());
Assert.assertEquals(ProductPage.class, p2.getPageContext().getClass());
Assert.assertEquals(product,
((ProductPage)p2.getPageContext()).getProduct());
@@ -141,10 +141,10 @@ public class TestSpecificRecordBuilder {
Assert.assertEquals(interop.getArrayField(), copy.getArrayField());
Assert.assertEquals(interop.getBoolField(), copy.getBoolField());
Assert.assertEquals(interop.getBytesField(), copy.getBytesField());
- Assert.assertEquals(interop.getDoubleField(), copy.getDoubleField());
+ Assert.assertEquals(interop.getDoubleField(), copy.getDoubleField(),
0.001);
Assert.assertEquals(interop.getEnumField(), copy.getEnumField());
Assert.assertEquals(interop.getFixedField(), copy.getFixedField());
- Assert.assertEquals(interop.getFloatField(), copy.getFloatField());
+ Assert.assertEquals(interop.getFloatField(), copy.getFloatField(), 0.001);
Assert.assertEquals(interop.getIntField(), copy.getIntField());
Assert.assertEquals(interop.getLongField(), copy.getLongField());
Assert.assertEquals(interop.getMapField(), copy.getMapField());
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 531cc6f..8f8a9a4 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
@@ -127,7 +127,7 @@ public class Player extends
org.apache.avro.specific.SpecificRecordBase implemen
* Gets the value of the 'number' field.
* @return The number of the player
*/
- public java.lang.Integer getNumber() {
+ public int getNumber() {
return number;
}
@@ -136,7 +136,7 @@ public class Player extends
org.apache.avro.specific.SpecificRecordBase implemen
* The number of the player
* @param value the value to set.
*/
- public void setNumber(java.lang.Integer value) {
+ public void setNumber(int value) {
this.number = value;
}
@@ -292,7 +292,7 @@ public class Player extends
org.apache.avro.specific.SpecificRecordBase implemen
* The number of the player
* @return The value.
*/
- public java.lang.Integer getNumber() {
+ public int getNumber() {
return number;
}
diff --git a/lang/java/tools/src/test/compiler/output/Player.java
b/lang/java/tools/src/test/compiler/output/Player.java
index 94fc7d0..f20af1d 100644
--- a/lang/java/tools/src/test/compiler/output/Player.java
+++ b/lang/java/tools/src/test/compiler/output/Player.java
@@ -127,7 +127,7 @@ public class Player extends
org.apache.avro.specific.SpecificRecordBase implemen
* Gets the value of the 'number' field.
* @return The number of the player
*/
- public java.lang.Integer getNumber() {
+ public int getNumber() {
return number;
}
@@ -136,7 +136,7 @@ public class Player extends
org.apache.avro.specific.SpecificRecordBase implemen
* The number of the player
* @param value the value to set.
*/
- public void setNumber(java.lang.Integer value) {
+ public void setNumber(int value) {
this.number = value;
}
@@ -292,7 +292,7 @@ public class Player extends
org.apache.avro.specific.SpecificRecordBase implemen
* The number of the player
* @return The value.
*/
- public java.lang.Integer getNumber() {
+ public int getNumber() {
return number;
}
