From f3740c95c333c5b01c1f8c59f494a1cd43c67eae Mon Sep 17 00:00:00 2001 From: mdhtr Date: Wed, 5 Aug 2020 18:53:22 +0200 Subject: [PATCH] Make fields private and use getters/setters/constructors instead --- .../JacksonDeserializationUnitTest.java | 12 ++-- .../jsonldjava/jackson/Person.java | 56 +++++++++++++++++-- .../HydraJsonldSerializationUnitTest.java | 4 +- .../serialization/hydrajsonld/Person.java | 17 +++++- .../JacksonJsonLdSerializationUnitTest.java | 2 +- .../serialization/jacksonjsonld/Person.java | 17 +++++- 6 files changed, 88 insertions(+), 20 deletions(-) diff --git a/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java b/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java index 9c6b6f976a..24968f3847 100644 --- a/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java +++ b/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/JacksonDeserializationUnitTest.java @@ -42,14 +42,10 @@ public class JacksonDeserializationUnitTest { ObjectMapper objectMapper = new ObjectMapper(); Person person = objectMapper.readValue(compactContent, Person.class); - Person expectedPerson = new Person(); - expectedPerson.id = "http://example.com/person/1234"; - expectedPerson.name = "Example Name"; - expectedPerson.knows = new Link(); - expectedPerson.knows.id = "http://example.com/person/2345"; + Person expectedPerson = new Person("http://example.com/person/1234", "Example Name", new Link("http://example.com/person/2345")); - assertEquals(expectedPerson.id, person.id); - assertEquals(expectedPerson.name, person.name); - assertEquals(expectedPerson.knows.id, person.knows.id); + assertEquals(expectedPerson.getId(), person.getId()); + assertEquals(expectedPerson.getName(), person.getName()); + assertEquals(expectedPerson.getKnows().getId(), person.getKnows().getId()); } } diff --git a/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java b/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java index 0cb6d43336..fefa676817 100644 --- a/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java +++ b/json-2/src/test/java/com/baeldung/jsonld/deserialization/jsonldjava/jackson/Person.java @@ -6,14 +6,62 @@ import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class Person { @JsonProperty("@id") - public String id; + private String id; @JsonProperty("http://schema.org/name") - public String name; + private String name; @JsonProperty("http://schema.org/knows") - public Link knows; + private Link knows; + + public Person() { + } + + public Person(String id, String name, Link knows) { + this.id = id; + this.name = name; + this.knows = knows; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Link getKnows() { + return knows; + } + + public void setKnows(Link knows) { + this.knows = knows; + } public static class Link { @JsonProperty("@id") - public String id; + private String id; + + public Link() { + } + + public Link(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } } diff --git a/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java b/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java index 06105d579e..33395cc438 100644 --- a/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java +++ b/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/HydraJsonldSerializationUnitTest.java @@ -23,9 +23,7 @@ public class HydraJsonldSerializationUnitTest { objectMapper.registerModule(getJacksonHydraSerializerModule()); objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - Person person = new Person(); - person.id = "http://example.com/person/1234"; - person.name = "Example Name"; + Person person = new Person("http://example.com/person/1234", "Example Name"); String personJsonLd = objectMapper.writeValueAsString(person); diff --git a/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java b/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java index 87587d02ac..3d8573c965 100644 --- a/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java +++ b/json-2/src/test/java/com/baeldung/jsonld/serialization/hydrajsonld/Person.java @@ -8,8 +8,21 @@ import de.escalon.hypermedia.hydra.mapping.Vocab; @Vocab("http://example.com/vocab/") @Expose("person") public class Person { + private String id; + private String name; + + public Person(String id, String name) { + this.id = id; + this.name = name; + } + @JsonProperty("@id") - public String id; + public String getId() { + return id; + } + @Expose("fullName") - public String name; + public String getName() { + return name; + } } diff --git a/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java b/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java index cd41989a53..9679426acb 100644 --- a/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java +++ b/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/JacksonJsonLdSerializationUnitTest.java @@ -15,7 +15,7 @@ public class JacksonJsonLdSerializationUnitTest { ObjectMapper objectMapper = new ObjectMapper(); objectMapper.registerModule(new JsonldModule()); - Person person = new Person(); + Person person = new Person("http://example.com/person/1234", "Example Name"); String personJsonLd = objectMapper.writeValueAsString(person); assertEquals("{" diff --git a/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java b/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java index d0c9e4f111..b63f49840c 100644 --- a/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java +++ b/json-2/src/test/java/com/baeldung/jsonld/serialization/jacksonjsonld/Person.java @@ -13,7 +13,20 @@ import ioinformarics.oss.jackson.module.jsonld.annotation.JsonldType; @JsonldLink(rel = "s:knows", name = "knows", href = "http://example.com/person/2345") public class Person { @JsonldId - public String id = "http://example.com/person/1234"; + private String id; @JsonldProperty("s:name") - public String name = "Example Name"; + private String name; + + public Person(String id, String name) { + this.id = id; + this.name = name; + } + + public String getId() { + return id; + } + + public String getName() { + return name; + } }