fix: ST5AS-207 Project PUT

Author: ivan-gomes

app/jackson/JpaIdentityDeserializer.java

@@ -52,16 +52,18 @@ public T deserialize(JsonParser p, DeserializationContext ctxt) throws IOExcepti
         if (p.currentToken() != JsonToken.START_OBJECT) {
             throw new JsonParseException(p, "Expected START_OBJECT. Received " + p.getCurrentName() + ".");
         }
+        T t = null;
         JsonToken token;
         while ((token = p.nextToken()) != null && token != JsonToken.END_OBJECT) {
-            if (token == JsonToken.FIELD_NAME && isIdentityField(p.getCurrentName())) {
-                if (p.nextToken() == null) {
+            if (t == null && token == JsonToken.FIELD_NAME && isIdentityField(p.getCurrentName())) {
+                token = p.nextToken();
+                if (token == null) {
                     throw new JsonParseException(p, "No value for identity field.");
                 }
-                return deserializeFromIdentity(p);
+                t = deserializeFromIdentity(p);
             }
         }
-        return null;
+        return t;
     }
 
     @Override

app/jackson/RecordSerialization.java

@@ -66,14 +66,13 @@ protected boolean isIdentityField(String field) {
         }
 
         @Override
-        @SuppressWarnings("unchecked")
         protected R deserializeFromIdentity(JsonParser parser) throws IOException {
             UUID id = UUID.fromString(parser.getText());
-            Record record = getEntityManager().find(getRecordClass(), id);
+            R record = getEntityManager().find(getRecordClass(), id);
             if (record == null) {
                 throw new IOException(new EntityNotFoundException("Record " + id + " not found."));
             }
-            return (R) record;
+            return record;
         }
     }