You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by rm...@apache.org on 2019/02/09 15:50:30 UTC
[johnzon] branch master updated (693ae6b -> ae137cc)
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git.
from 693ae6b drop jdk we dont support anymore from travis.yml
new 2cf6233 JOHNZON-199 split unit test to get better feedback for each assert
new aa42112 JOHNZON-199 skip attribute fix
new ae137cc Merge branch 'JOHNZON-199/JohnzonIgnore-minVersion'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../johnzon/mapper/MappingGeneratorImpl.java | 2 +-
.../apache/johnzon/mapper/MapperVersionTest.java | 61 ++++++++++++----------
2 files changed, 33 insertions(+), 30 deletions(-)
[johnzon] 01/03: JOHNZON-199 split unit test to get better feedback
for each assert
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 2cf62333dd3877ed014085bcc4c1fb9acc3c7150
Author: Alexander Falb <el...@apache.org>
AuthorDate: Sat Feb 9 13:33:25 2019 +0100
JOHNZON-199 split unit test to get better feedback for each assert
---
.../apache/johnzon/mapper/MapperVersionTest.java | 61 ++++++++++++----------
1 file changed, 32 insertions(+), 29 deletions(-)
diff --git a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
index aab6355..15c75e3 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
@@ -19,42 +19,45 @@
package org.apache.johnzon.mapper;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import java.io.StringWriter;
import static org.junit.Assert.assertEquals;
+@RunWith(Parameterized.class)
public class MapperVersionTest {
+
+ private final int mapperVersion;
+ private final String name;
+ private final String expectedJson;
+
+ public MapperVersionTest(int mapperVersion, String name, String expectedJson) {
+ this.mapperVersion = mapperVersion;
+ this.name = name;
+ this.expectedJson = expectedJson;
+ }
+
+ @Parameterized.Parameters(name = "Run {index}: mapperVersion={0}, name={1}, expectedJson={2}")
+ public static Object[][] data() {
+ return new Object[][] {
+ { -1, "foo", "{\"name\":\"foo\"}"},
+ { 0, "foo", "{\"name\":\"foo\"}"},
+ { 1, "foo", "{\"name\":\"foo\"}"},
+ { 2, "foo", "{}"},
+ { 3, "foo", "{}"}
+ };
+ }
+
@Test
- public void version() {
- { // no version
- final Mapper mapper = new MapperBuilder().build();
- final Versioned versioned = new Versioned();
- versioned.name = "foo";
- final StringWriter writer = new StringWriter();
- mapper.writeObject(versioned, writer);
- assertEquals("{\"name\":\"foo\"}", writer.toString());
- }
- { // version ko
- for (int i = 0; i < 2; i++) {
- final Mapper mapper = new MapperBuilder().setVersion(i).build();
- final Versioned versioned = new Versioned();
- versioned.name = "foo";
- final StringWriter writer = new StringWriter();
- mapper.writeObject(versioned, writer);
- assertEquals("{\"name\":\"foo\"}", writer.toString());
- }
- }
- { // version ok
- for (int i = 2; i < 4; i++) {
- final Mapper mapper = new MapperBuilder().setVersion(i).build();
- final Versioned versioned = new Versioned();
- versioned.name = "foo";
- final StringWriter writer = new StringWriter();
- mapper.writeObject(versioned, writer);
- assertEquals("{}", writer.toString());
- }
- }
+ public void test() {
+ final Mapper mapper = new MapperBuilder().setVersion(mapperVersion).build();
+ final Versioned versioned = new Versioned();
+ versioned.name = name;
+ final StringWriter writer = new StringWriter();
+ mapper.writeObject(versioned, writer);
+ assertEquals(expectedJson, writer.toString());
}
public static class Versioned {
[johnzon] 03/03: Merge branch 'JOHNZON-199/JohnzonIgnore-minVersion'
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit ae137cc3d37739a148bf435d0026188e8737debc
Merge: 693ae6b aa42112
Author: Romain Manni-Bucau <rm...@apache.org>
AuthorDate: Sat Feb 9 16:48:55 2019 +0100
Merge branch 'JOHNZON-199/JohnzonIgnore-minVersion'
.../johnzon/mapper/MappingGeneratorImpl.java | 2 +-
.../apache/johnzon/mapper/MapperVersionTest.java | 61 ++++++++++++----------
2 files changed, 33 insertions(+), 30 deletions(-)
[johnzon] 02/03: JOHNZON-199 skip attribute fix
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit aa421120dcf4a3ad8fa3636f6ace74c08c194bce
Author: Alexander Falb <el...@apache.org>
AuthorDate: Sat Feb 9 13:33:40 2019 +0100
JOHNZON-199 skip attribute fix
skip attribute only if both minVersion and mapper.setVersion are set and if mapper.setVersion is less than minVersion (eg minVersion is not jet reached)
---
.../java/org/apache/johnzon/mapper/MappingGeneratorImpl.java | 2 +-
.../test/java/org/apache/johnzon/mapper/MapperVersionTest.java | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingGeneratorImpl.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingGeneratorImpl.java
index b4b9cef..bb1d2f3 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingGeneratorImpl.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MappingGeneratorImpl.java
@@ -256,7 +256,7 @@ public class MappingGeneratorImpl implements MappingGenerator {
if (ignored != null && ignored.contains(getterEntry.getKey())) {
continue;
}
- if (getter.version >= 0 && config.getVersion() >= getter.version) {
+ if (getter.version >= 0 && config.getVersion() >= 0 && config.getVersion() < getter.version) {
continue;
}
diff --git a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
index 15c75e3..6d67426 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/MapperVersionTest.java
@@ -42,11 +42,11 @@ public class MapperVersionTest {
@Parameterized.Parameters(name = "Run {index}: mapperVersion={0}, name={1}, expectedJson={2}")
public static Object[][] data() {
return new Object[][] {
- { -1, "foo", "{\"name\":\"foo\"}"},
- { 0, "foo", "{\"name\":\"foo\"}"},
- { 1, "foo", "{\"name\":\"foo\"}"},
- { 2, "foo", "{}"},
- { 3, "foo", "{}"}
+ { -1, "foo", "{\"name\":\"foo\"}"}, // no version eg version of -1
+ { 0, "foo", "{}"}, // version 0 < minVersion 2 -- dont serialize it
+ { 1, "foo", "{}"}, // version 1 < minVersion 2 -- dont serialize it
+ { 2, "foo", "{\"name\":\"foo\"}"}, // version 2 >= minVersion 2 -- serialize it
+ { 3, "foo", "{\"name\":\"foo\"}"} // version 2 >= minVersion 2 -- serialize it
};
}