iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32 from rachelshu/master 

A few changes to resolve repository conflicts.
This commit is contained in:
Eugen 2014-07-22 21:02:20 +03:00
parent 52a134d5c0 0bda908598
commit b5ed631612
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jackson/src/test/java/org/baeldung/jackson/field/MyDtoGetter.java
View File

@ -9,7 +9,7 @@ public class MyDtoGetter {
super(); super();
} }
public MyDtoGetter(final String stringValue, final int intValue, final boolean booleanValue) { public MyDtoGetter(final String stringValue, final int intValue) {
super(); super();
this.stringValue = stringValue; this.stringValue = stringValue;

4
jackson/src/test/java/org/baeldung/jackson/field/MyDtoGetterImplicitDeserialization.java
View File

@ -3,17 +3,15 @@ package org.baeldung.jackson.field;
public class MyDtoGetterImplicitDeserialization { public class MyDtoGetterImplicitDeserialization {
private String stringValue; private String stringValue;
public boolean booleanValue;
public MyDtoGetterImplicitDeserialization() { public MyDtoGetterImplicitDeserialization() {
super(); super();
} }
public MyDtoGetterImplicitDeserialization(final String stringValue, final int intValue, final boolean booleanValue) { public MyDtoGetterImplicitDeserialization(final String stringValue) {
super(); super();
this.stringValue = stringValue; this.stringValue = stringValue;
this.booleanValue = booleanValue;
} }
// API // API

12
jackson/src/test/java/org/baeldung/jackson/field/MyDtoSetter.java
View File

@ -2,26 +2,22 @@ package org.baeldung.jackson.field;
public class MyDtoSetter { public class MyDtoSetter {
private String stringValue; private int intValue;
int intValue; public boolean booleanValue;
public MyDtoSetter() { public MyDtoSetter() {
super(); super();
} }
public MyDtoSetter(final String stringValue, final int intValue, final boolean booleanValue) { public MyDtoSetter(final int intValue, final boolean booleanValue) {
super(); super();
this.stringValue = stringValue;
this.intValue = intValue; this.intValue = intValue;
this.booleanValue = booleanValue;
} }
// API // API
public String getStringValue() {
return stringValue;
}
public void setIntValue(final int intValue) { public void setIntValue(final int intValue) {
this.intValue = intValue; this.intValue = intValue;
} }

9
jackson/src/test/java/org/baeldung/jackson/test/JacksonFieldUnitTest.java
View File

@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class JacksonFieldUnitTest { public class JacksonFieldUnitTest {
@Test @Test
public final void givenDifferentAccessLevels_whenSerializing_thenPublicFieldsAreSerialized() throws JsonProcessingException { public final void givenDifferentAccessLevels_whenPublic_thenSerializable() throws JsonProcessingException {
final ObjectMapper mapper = new ObjectMapper(); final ObjectMapper mapper = new ObjectMapper();
final MyDtoAccessLevel dtoObject = new MyDtoAccessLevel(); final MyDtoAccessLevel dtoObject = new MyDtoAccessLevel();
@ -48,25 +48,23 @@ public class JacksonFieldUnitTest {
@Test @Test
public final void givenDifferentAccessLevels_whenGetterAdded_thenDeserializable() throws IOException { public final void givenDifferentAccessLevels_whenGetterAdded_thenDeserializable() throws IOException {
final String jsonAsString = "{\"stringValue\":\"dtoString\",\"booleanValue\":\"true\"}"; final String jsonAsString = "{\"stringValue\":\"dtoString\"}";
final ObjectMapper mapper = new ObjectMapper(); final ObjectMapper mapper = new ObjectMapper();
final MyDtoGetterImplicitDeserialization dtoObject = mapper.readValue(jsonAsString, MyDtoGetterImplicitDeserialization.class); final MyDtoGetterImplicitDeserialization dtoObject = mapper.readValue(jsonAsString, MyDtoGetterImplicitDeserialization.class);
assertNotNull(dtoObject); assertNotNull(dtoObject);
assertThat(dtoObject.getStringValue(), equalTo("dtoString")); assertThat(dtoObject.getStringValue(), equalTo("dtoString"));
assertThat(dtoObject.booleanValue, equalTo(true));
} }
@Test @Test
public final void givenDifferentAccessLevels_whenSetterAdded_thenDeserializable() throws IOException { public final void givenDifferentAccessLevels_whenSetterAdded_thenDeserializable() throws IOException {
final String jsonAsString = "{\"stringValue\":\"dtoString\",\"intValue\":1}"; final String jsonAsString = "{\"intValue\":1}";
final ObjectMapper mapper = new ObjectMapper(); final ObjectMapper mapper = new ObjectMapper();
final MyDtoSetter dtoObject = mapper.readValue(jsonAsString, MyDtoSetter.class); final MyDtoSetter dtoObject = mapper.readValue(jsonAsString, MyDtoSetter.class);
assertNotNull(dtoObject); assertNotNull(dtoObject);
assertThat(dtoObject.getStringValue(), equalTo("dtoString"));
assertThat(dtoObject.anotherGetIntValue(), equalTo(1)); assertThat(dtoObject.anotherGetIntValue(), equalTo(1));
} }
@ -77,7 +75,6 @@ public class JacksonFieldUnitTest {
final MyDtoSetter dtoObject = new MyDtoSetter(); final MyDtoSetter dtoObject = new MyDtoSetter();
final String dtoAsString = mapper.writeValueAsString(dtoObject); final String dtoAsString = mapper.writeValueAsString(dtoObject);
assertThat(dtoAsString, containsString("stringValue"));
assertThat(dtoAsString, not(containsString("intValue"))); assertThat(dtoAsString, not(containsString("intValue")));
System.out.println(dtoAsString); System.out.println(dtoAsString);
} }