X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-tosca%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fmodels%2Ftosca%2Fsimple%2Fconcepts%2FJpaToscaEntityType.java;h=e23ac42c22f38d7f533aa6b9043aeeffb05018ff;hb=938005505883cf7a636a8840e20e3dc8a0ad9176;hp=169d7f244c9c03aaa5a32d77a6ee046b2490916c;hpb=6345dce40405740dc09176c45dae03baeb939b8e;p=policy%2Fmodels.git

diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
index 169d7f244..e23ac42c2 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaEntityType.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2020 Nordix Foundation.
- *  Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+ *  Copyright (C) 2019-2020, 2022-2023 Nordix Foundation.
+ *  Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,27 +21,33 @@
 
 package org.onap.policy.models.tosca.simple.concepts;
 
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Lob;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.ws.rs.core.Response;
+import java.io.Serial;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.EmbeddedId;
-import javax.persistence.MappedSuperclass;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NonNull;
 import org.apache.commons.lang3.ObjectUtils;
-import org.onap.policy.common.parameters.BeanValidationResult;
+import org.onap.policy.common.parameters.annotations.NotBlank;
+import org.onap.policy.common.parameters.annotations.NotNull;
+import org.onap.policy.common.utils.coder.CoderException;
+import org.onap.policy.common.utils.coder.StandardCoder;
 import org.onap.policy.models.base.PfAuthorative;
 import org.onap.policy.models.base.PfConcept;
 import org.onap.policy.models.base.PfConceptKey;
 import org.onap.policy.models.base.PfKey;
+import org.onap.policy.models.base.PfModelRuntimeException;
 import org.onap.policy.models.base.PfUtils;
-import org.onap.policy.models.base.Validated;
+import org.onap.policy.models.base.validation.annotations.VerifyKey;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
 
 /**
@@ -51,25 +57,29 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaEntity;
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept implements PfAuthorative<T> {
+    @Serial
     private static final long serialVersionUID = -1330661834220739393L;
 
+    private static final StandardCoder STANDARD_CODER = new StandardCoder();
+
     @EmbeddedId
+    @VerifyKey
+    @NotNull
     private PfConceptKey key;
 
     // @formatter:off
     @Column
-    @AttributeOverrides({
-        @AttributeOverride(name = "name",
-                           column = @Column(name = "derived_from_name")),
-        @AttributeOverride(name = "version",
-                           column = @Column(name = "derived_from_version"))
-        })
+    @AttributeOverride(name = "name", column = @Column(name = "derived_from_name"))
+    @AttributeOverride(name = "version", column = @Column(name = "derived_from_version"))
+    @VerifyKey
     private PfConceptKey derivedFrom;
 
     @ElementCollection
-    private Map<String, String> metadata;
+    @Lob
+    private Map<@NotNull @NotBlank String, @NotNull @NotBlank String> metadata;
 
     @Column
+    @NotBlank
     private String description;
 
     private transient T toscaEntity;
@@ -126,7 +136,7 @@ public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept impleme
             toscaEntity.setDescription(description);
         }
 
-        toscaEntity.setMetadata(PfUtils.mapMap(metadata, item -> item));
+        toscaEntity.setMetadata(PfUtils.mapMap(metadata, this::deserializeMetadataValue));
 
         return toscaEntity;
     }
@@ -156,7 +166,7 @@ public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept impleme
             description = toscaEntity.getDescription();
         }
 
-        metadata = PfUtils.mapMap(toscaEntity.getMetadata(), item -> item);
+        metadata = PfUtils.mapMap(toscaEntity.getMetadata(), this::serializeMetadataValue);
     }
 
     @Override
@@ -185,22 +195,6 @@ public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept impleme
         description = (description != null ? description.trim() : null);
     }
 
-    @Override
-    public BeanValidationResult validate(@NonNull String fieldName) {
-        BeanValidationResult result = new BeanValidationResult(fieldName, this);
-
-        result.addResult(validateKeyNotNull("key", key));
-
-        if (derivedFrom != null) {
-            result.addResult(validateKeyNotNull("derivedFrom", derivedFrom));
-        }
-
-        validateMap(result, "metadata", metadata, Validated::validateEntryNotBlankNotBlank);
-        result.addResult(validateNotBlank("description", description, false));
-
-        return result;
-    }
-
     @Override
     public int compareTo(final PfConcept otherConcept) {
         if (otherConcept == null) {
@@ -233,4 +227,22 @@ public class JpaToscaEntityType<T extends ToscaEntity> extends PfConcept impleme
 
         return ObjectUtils.compare(description, other.description);
     }
+
+    protected Object deserializeMetadataValue(String metadataValue) {
+        try {
+            return STANDARD_CODER.decode(metadataValue, Object.class);
+        } catch (CoderException ce) {
+            String errorMessage = "error decoding metadata JSON value read from database: " + metadataValue;
+            throw new PfModelRuntimeException(Response.Status.INTERNAL_SERVER_ERROR, errorMessage, ce);
+        }
+    }
+
+    protected String serializeMetadataValue(Object metadataValue) {
+        try {
+            return STANDARD_CODER.encode(metadataValue);
+        } catch (CoderException ce) {
+            String errorMessage = "error encoding metadata JSON value for database: " + metadataValue;
+            throw new PfModelRuntimeException(Response.Status.INTERNAL_SERVER_ERROR, errorMessage, ce);
+        }
+    }
 }