diff options
| author |   Jim Hahn <jrh3@att.com> | 2021-01-15 14:38:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-01-15 14:38:15 +0000 |
| commit | 3d4e98fae4bdd46bf860d574ebc76ac32b9b13c2 (patch) | |
| tree | 8f3f3cba5c75765608bff1e698230ee26fd13e79 /models-tosca/src/main | |
| parent | 63e651c2931c251742e3055f26a209a9640ed006 (diff) | |
| parent | 5eefae0a2021bb3b3fcc10223d26a9b31784edee (diff) | |
Merge "Rename keywords used as column names in API and PAP JPA"
Diffstat (limited to 'models-tosca/src/main')
2 files changed, 5 insertions, 5 deletions
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaProperty.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaProperty.java index 442063933..cd2961637 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaProperty.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaProperty.java @@ -3,7 +3,7 @@ * ONAP Policy Model * ================================================================================ * Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -83,7 +83,7 @@ public class JpaToscaProperty extends PfConcept implements PfAuthorative<ToscaPr @Column private boolean required = false; - @Column(name = "default") + @Column @NotBlank private String defaultValue; diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTrigger.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTrigger.java index 677354d8a..546ea073f 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTrigger.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/JpaToscaTrigger.java @@ -3,7 +3,7 @@ * ONAP Policy Model * ================================================================================ * Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019-2020 Nordix Foundation. + * Modifications Copyright (C) 2019-2021 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -84,11 +84,11 @@ public class JpaToscaTrigger extends PfConcept { @Valid private JpaToscaEventFilter targetFilter; - @Column + @Column(name = "toscaCondition") @Valid private JpaToscaConstraint condition; - @Column + @Column(name = "toscaConstraint") @Valid private JpaToscaConstraint constraint; |