diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2018-11-27 00:30:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-27 00:30:31 +0000 |
| commit | ec8f2db3846b949fc6f2ef9c1c0ff0999078b90c (patch) | |
| tree | 48ffd13f393d1da5d371cdf2272d63b8f6d94ca4 | |
| parent | 35b1883d7c0f06c42fbad8da9d835828cdb2013d (diff) | |
| parent | 53af118db25d8ae931c8a50c283e8c7caf1038f3 (diff) | |
Merge "Fix model vnfresource bean annotation" into casablanca
| -rw-r--r-- | bpmn/MSOCommonBPMN/pom.xml | 2 | ||||
| -rw-r--r-- | mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml index 926e09c498..ee4dab4d8c 100644 --- a/bpmn/MSOCommonBPMN/pom.xml +++ b/bpmn/MSOCommonBPMN/pom.xml @@ -326,7 +326,7 @@ <dependency> <groupId>org.onap.sdc.jtosca</groupId> <artifactId>jtosca</artifactId> - <version>1.4.1</version> + <version>1.4.4</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java index 764d2b7c39..83fe051233 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/VnfResource.java @@ -43,6 +43,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import com.openpojo.business.annotation.BusinessKey; +import org.hibernate.annotations.NotFound; +import org.hibernate.annotations.NotFoundAction; import uk.co.blackpepper.bowman.annotation.LinkedResource; @Entity @@ -91,6 +93,7 @@ public class VnfResource implements Serializable { private Date created; @ManyToOne(fetch = FetchType.LAZY) + @NotFound(action = NotFoundAction.IGNORE) @JoinColumn(name = "HEAT_TEMPLATE_ARTIFACT_UUID") private HeatTemplate heatTemplates; |