summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main
diff options
context:
space:
mode:
authoraribeiro <anderson.ribeiro@est.tech>2019-09-30 11:04:00 +0100
committerOfir Sonsino <ofir.sonsino@intl.att.com>2019-10-03 15:12:39 +0000
commite7dfc47fc893cc6aef80f795bd675f8443864550 (patch)
tree58ef2edf0c7f68639a1c386bc1b5fcfab7af203d /catalog-be/src/main
parent968cd1f0e8a4b5487933d1e7c2d0049720464d8c (diff)
Fix for error message.
Fixing error message for invalid values across SDC backend API. Issue-ID: SDC-2324 Change-Id: If01307138baf7692e398abf20eb75bbe9a8aa394 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
Diffstat (limited to 'catalog-be/src/main')
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java4
-rw-r--r--catalog-be/src/main/resources/config/error-configuration.yaml8
2 files changed, 6 insertions, 6 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
index c40c845718..5a997205ea 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ResourceBusinessLogic.java
@@ -4695,7 +4695,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
log.info("vendor release is not valid.");
ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.INVALID_VENDOR_RELEASE);
componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
- throw new ByActionStatusComponentException(ActionStatus.INVALID_VENDOR_RELEASE);
+ throw new ByActionStatusComponentException(ActionStatus.INVALID_VENDOR_RELEASE, vendorRelease);
}
}
}
@@ -4728,7 +4728,7 @@ public class ResourceBusinessLogic extends ComponentBusinessLogic {
log.info("vendor name is not valid.");
ResponseFormat errorResponse = componentsUtils.getResponseFormat(ActionStatus.INVALID_VENDOR_NAME);
componentsUtils.auditResource(errorResponse, user, resource, actionEnum);
- throw new ByActionStatusComponentException(ActionStatus.INVALID_VENDOR_NAME);
+ throw new ByActionStatusComponentException(ActionStatus.INVALID_VENDOR_NAME, vendorName);
}
}
}
diff --git a/catalog-be/src/main/resources/config/error-configuration.yaml b/catalog-be/src/main/resources/config/error-configuration.yaml
index adc467c913..3045e9ec97 100644
--- a/catalog-be/src/main/resources/config/error-configuration.yaml
+++ b/catalog-be/src/main/resources/config/error-configuration.yaml
@@ -152,7 +152,7 @@ errors:
# %1 - resource/service
COMPONENT_INVALID_CATEGORY: {
code: 400,
- message: "Error: Invalid Content. Invalid %1 category.",
+ message: "Error: Invalid Content. Value %1 for the field Category is invalid.",
messageId: "SVC4054"
}
#---------SVC4055------------------------------
@@ -265,20 +265,20 @@ errors:
# %1 - Service/Resource
INVALID_COMPONENT_NAME: {
code: 400,
- message: 'Error: Invalid Content. %1 name is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
+ message: 'Error: Invalid Content. Value %1 for Component name is invalid. Only alphanumeric characters and regular spaces are allowed.',
messageId: "SVC4070"
}
#---------SVC4071------------------------------
INVALID_VENDOR_NAME: {
code: 400,
- message: 'Error: Invalid Content. Vendor name is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
+ message: 'Error: Invalid Content. Value %1 for the field Vendor name is invalid. Only alphanumeric characters and regular spaces are allowed.',
messageId: "SVC4071"
}
#---------SVC4072------------------------------
INVALID_VENDOR_RELEASE: {
code: 400,
- message: 'Error: Invalid Content. Vendor release is not allowed to contain characters like <>:"\/|?* and space characters other than regular space.',
+ message: 'Error: Invalid Content. Value %1 for the field Vendor release is invalid. Only alphanumeric characters and regular spaces are allowed.',
messageId: "SVC4072"
}
#---------SVC4073------------------------------