Refactor Gson examples

Grzegorz Piwowarek · Grzegorz Piwowarek · commit fa6f482f2a7a · 2016-08-10T18:56:51.000+02:00
diff --git a/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java b/gson/src/main/java/org/baeldung/gson/entities/ActorGson.java
@@ -16,6 +16,10 @@ public ActorGson(String imdbId, Date dateOfBirth, List<String> filmography) {
         this.filmography = filmography;
     }
 
+    @Override
+    public String toString() {
+        return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]";
+    }
 
     public String getImdbId() {
         return imdbId;
@@ -41,8 +45,5 @@ public void setFilmography(List<String> filmography) {
         this.filmography = filmography;
     }
 
-    @Override
-    public String toString() {
-        return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]";
-    }
+
 }
diff --git a/gson/src/main/java/org/baeldung/gson/entities/Movie.java b/gson/src/main/java/org/baeldung/gson/entities/Movie.java
@@ -4,11 +4,6 @@
 
 public class Movie {
 
-    @Override
-    public String toString() {
-        return "Movie [imdbId=" + imdbId + ", director=" + director + ", actors=" + actors + "]";
-    }
-
     private String imdbId;
     private String director;
     private List<ActorGson> actors;
@@ -20,6 +15,11 @@ public Movie(String imdbID, String director, List<ActorGson> actors) {
         this.actors = actors;
     }
 
+    @Override
+    public String toString() {
+        return "Movie [imdbId=" + imdbId + ", director=" + director + ", actors=" + actors + "]";
+    }
+
     public String getImdbID() {
         return imdbId;
     }
@@ -43,4 +43,6 @@ public List<ActorGson> getActors() {
     public void setActors(List<ActorGson> actors) {
         this.actors = actors;
     }
+
+
 }
diff --git a/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java b/gson/src/main/java/org/baeldung/gson/entities/MovieWithNullValue.java
@@ -1,14 +1,15 @@
 package org.baeldung.gson.entities;
 
-import java.util.List;
-
 import com.google.gson.annotations.Expose;
 
+import java.util.List;
+
 public class MovieWithNullValue {
 
     @Expose
     private String imdbId;
     private String director;
+
     @Expose
     private List<ActorGson> actors;
 
diff --git a/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonDeserializer.java
@@ -1,24 +1,12 @@
 package org.baeldung.gson.serialization;
 
+import com.google.gson.*;
+import org.baeldung.gson.entities.ActorGson;
+
 import java.lang.reflect.Type;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-import java.util.stream.Collectors;
-
-import org.baeldung.gson.entities.ActorGson;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
 
 public class ActorGsonDeserializer implements JsonDeserializer<ActorGson> {
 
diff --git a/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java b/gson/src/main/java/org/baeldung/gson/serialization/ActorGsonSerializer.java
@@ -1,16 +1,15 @@
 package org.baeldung.gson.serialization;
 
-import java.lang.reflect.Type;
-import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.baeldung.gson.entities.ActorGson;
-
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import org.baeldung.gson.entities.ActorGson;
+
+import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class ActorGsonSerializer implements JsonSerializer<ActorGson> {
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@ public ActorGson(String imdbId, Date dateOfBirth, List<String> filmography) {`
`16`	`16`	`this.filmography = filmography;`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ @Override`
	`20`	`+ public String toString() {`
	`21`	`+ return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]";`
	`22`	`+ }`
`19`	`23`
`20`	`24`	`public String getImdbId() {`
`21`	`25`	`return imdbId;`
`@@ -41,8 +45,5 @@ public void setFilmography(List<String> filmography) {`
`41`	`45`	`this.filmography = filmography;`
`42`	`46`	`}`
`43`	`47`
`44`		`- @Override`
`45`		`- public String toString() {`
`46`		`- return "ActorGson [imdbId=" + imdbId + ", dateOfBirth=" + dateOfBirth + ", filmography=" + filmography + "]";`
`47`		`- }`
	`48`	`+`
`48`	`49`	`}`