Fixed an issue with the DID serialization

- Updated tests
nevermined-io · Sep 25, 2020 · 8fed4d0 · 8fed4d0
1 parent a123775
commit 8fed4d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/io/keyko/nevermined/models/DID.java b/src/main/java/io/keyko/nevermined/models/DID.java
@@ -1,7 +1,7 @@
 package io.keyko.nevermined.models;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
 import io.keyko.common.helpers.CryptoHelper;
 import io.keyko.common.helpers.EthereumHelper;
 import io.keyko.nevermined.exceptions.DIDFormatException;
@@ -11,7 +11,6 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class DID {
 
-    @JsonProperty
     public String did;
 
     public static final String PREFIX = "did:nv:";
@@ -42,6 +41,7 @@ public static DID getFromHash(String hash) throws DIDFormatException {
         return new DID(PREFIX + hash);
     }
 
+    @JsonValue
     public String getDid() {
         return did;
     }

diff --git a/src/test/java/io/keyko/nevermined/models/DDOTest.java b/src/test/java/io/keyko/nevermined/models/DDOTest.java
@@ -124,7 +124,11 @@ public void checkDateFormat() throws Exception {
 
     @Test
     public void testWorkflow() throws Exception {
+        // This tests both serialization and deserialization
         DDO ddo = DDO.fromJSON(new TypeReference<DDO>() {}, DDO_JSON_WORKFLOW_CONTENT);
+        String ddoJson = ddo.toJson(ddo);
+        ddo = DDO.fromJSON(new TypeReference<DDO>() {
+        }, ddoJson);
 
         Service metadataService = ddo.getMetadataService();