From b2dfd524e1b650115120a9c716eb3f4d306ac72a Mon Sep 17 00:00:00 2001
From: LSmyrnaios <lsmyrnaios@gmail.com>
Date: Sat, 24 Apr 2021 21:08:02 +0300
Subject: [PATCH] Update "Task" and "Error" classes.

---
 .../java/eu/openaire/urls_worker/models/Error.java   | 11 +++++++++--
 .../java/eu/openaire/urls_worker/models/Task.java    | 12 ++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/openaire/urls_worker/models/Error.java b/src/main/java/eu/openaire/urls_worker/models/Error.java
index a4d36d1..f01830a 100644
--- a/src/main/java/eu/openaire/urls_worker/models/Error.java
+++ b/src/main/java/eu/openaire/urls_worker/models/Error.java
@@ -1,14 +1,21 @@
 package eu.openaire.urls_worker.models;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "type",
+        "message"
+})
 public class Error {
 
     @JsonProperty("type")
-    String type;
+    private String type;
 
     @JsonProperty("message")
-    String message;
+    private String message;
 
     public String getType() {
         return type;
diff --git a/src/main/java/eu/openaire/urls_worker/models/Task.java b/src/main/java/eu/openaire/urls_worker/models/Task.java
index 52ef01b..a4414be 100644
--- a/src/main/java/eu/openaire/urls_worker/models/Task.java
+++ b/src/main/java/eu/openaire/urls_worker/models/Task.java
@@ -1,14 +1,22 @@
 package eu.openaire.urls_worker.models;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+        "id",
+        "url"
+})
 public class Task {
 
     @JsonProperty("id")
-    String id;
+    private String id;
 
     @JsonProperty("url")
-    String url;
+    private String url;
 
     public String getId() {
         return id;