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:32 UTC
[johnzon] 02/03: JOHNZON-199 skip attribute fix
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
};
}