Adjusting entity validation messages
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyObjectValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyObjectValidator.java
index f63cb82..08f5023 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyObjectValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyObjectValidator.java
@@ -32,7 +32,7 @@
if (!isValid) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidName, "Invalid any object name")).
+ getTemplate(EntityViolationType.InvalidName, anyObject.getName())).
addPropertyNode("name").addConstraintViolation();
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyTypeClassValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyTypeClassValidator.java
index baf8d71..ed93fb5 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyTypeClassValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyTypeClassValidator.java
@@ -32,7 +32,7 @@
if (isHtml(anyTypeClass.getKey())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid key")).
+ getTemplate(EntityViolationType.InvalidKey, anyTypeClass.getKey())).
addPropertyNode("key").addConstraintViolation();
isValid = false;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyTypeValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyTypeValidator.java
index 6fb7078..78209df 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyTypeValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/AnyTypeValidator.java
@@ -34,7 +34,7 @@
if (isHtml(anyType.getKey())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid key")).
+ getTemplate(EntityViolationType.InvalidKey, anyType.getKey())).
addPropertyNode("key").addConstraintViolation();
isValid = false;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ApplicationValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ApplicationValidator.java
index 7360021..65ee56c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ApplicationValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ApplicationValidator.java
@@ -30,7 +30,7 @@
if (application.getKey() == null || !KEY_PATTERN.matcher(application.getKey()).matches()) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid application key")).
+ getTemplate(EntityViolationType.InvalidKey, application.getKey())).
addPropertyNode("key").addConstraintViolation();
return false;
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ConnInstanceValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ConnInstanceValidator.java
index ffbe438..decda4c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ConnInstanceValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ConnInstanceValidator.java
@@ -34,7 +34,7 @@
if (isHtml(connInstance.getDisplayName())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidName, "Invalid display name")).
+ getTemplate(EntityViolationType.InvalidName, connInstance.getDisplayName())).
addPropertyNode("displayName").addConstraintViolation();
isValid = false;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ExternalResourceValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ExternalResourceValidator.java
index 46f931e..23570fc 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ExternalResourceValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ExternalResourceValidator.java
@@ -77,7 +77,7 @@
if (resource.getKey() == null || !KEY_PATTERN.matcher(resource.getKey()).matches()) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid resource key")).
+ getTemplate(EntityViolationType.InvalidKey, resource.getKey())).
addPropertyNode("key").addConstraintViolation();
return false;
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/GroupValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/GroupValidator.java
index 65fcac7..282f72b 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/GroupValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/GroupValidator.java
@@ -48,7 +48,7 @@
isValid = false;
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidName, "Invalid group name")).
+ getTemplate(EntityViolationType.InvalidName, group.getName())).
addPropertyNode("name").addConstraintViolation();
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ImplementationValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ImplementationValidator.java
index 095a97d..fd88ea5 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ImplementationValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ImplementationValidator.java
@@ -30,7 +30,7 @@
if (resource.getKey() == null || !KEY_PATTERN.matcher(resource.getKey()).matches()) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid implementation key")).
+ getTemplate(EntityViolationType.InvalidKey, resource.getKey())).
addPropertyNode("key").addConstraintViolation();
return false;
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PolicyValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PolicyValidator.java
index ed9445d..3c8d00a 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PolicyValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PolicyValidator.java
@@ -30,7 +30,7 @@
if (isHtml(policy.getDescription())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidName, "Invalid description")).
+ getTemplate(EntityViolationType.InvalidName, policy.getDescription())).
addPropertyNode("description").addConstraintViolation();
return false;
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PrivilegeValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PrivilegeValidator.java
index 6f035d8..acdbf01 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PrivilegeValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PrivilegeValidator.java
@@ -30,7 +30,7 @@
if (privilege.getKey() == null || !KEY_PATTERN.matcher(privilege.getKey()).matches()) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid privilege key")).
+ getTemplate(EntityViolationType.InvalidKey, privilege.getKey())).
addPropertyNode("key").addConstraintViolation();
return false;
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/RelationshipTypeValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/RelationshipTypeValidator.java
index 550b153..1db933d 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/RelationshipTypeValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/RelationshipTypeValidator.java
@@ -33,7 +33,7 @@
if (isHtml(relationShipType.getKey())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid key")).
+ getTemplate(EntityViolationType.InvalidKey, relationShipType.getKey())).
addPropertyNode("key").addConstraintViolation();
isValid = false;
@@ -41,7 +41,7 @@
if (MembershipType.getInstance().getKey().equalsIgnoreCase(relationShipType.getKey())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid relationshipType name")).
+ getTemplate(EntityViolationType.InvalidKey, relationShipType.getKey())).
addPropertyNode("key").addConstraintViolation();
isValid = false;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ReportValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ReportValidator.java
index 09b6368..a755b1c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ReportValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/ReportValidator.java
@@ -38,7 +38,7 @@
if (isHtml(report.getName())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidName, "Invalid name")).
+ getTemplate(EntityViolationType.InvalidName, report.getName())).
addPropertyNode("name").addConstraintViolation();
isValid = false;
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/RoleValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/RoleValidator.java
index c1de34d..16c8458 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/RoleValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/RoleValidator.java
@@ -30,7 +30,7 @@
if (role.getKey() == null || !KEY_PATTERN.matcher(role.getKey()).matches()) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid role key")).
+ getTemplate(EntityViolationType.InvalidKey, role.getKey())).
addPropertyNode("key").addConstraintViolation();
return false;
}
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/SchemaKeyValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/SchemaKeyValidator.java
index 2139723..13f649c 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/SchemaKeyValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/SchemaKeyValidator.java
@@ -44,7 +44,7 @@
if (!isValid) {
context.disableDefaultConstraintViolation();
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid schema key")).
+ getTemplate(EntityViolationType.InvalidKey, key)).
addPropertyNode("key").addConstraintViolation();
} else if (JPAAnyUtils.matchesFieldName(key)) {
context.disableDefaultConstraintViolation();
diff --git a/ext/oidcclient/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/OIDCProviderValidator.java b/ext/oidcclient/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/OIDCProviderValidator.java
index ee6223f..63eb75b 100644
--- a/ext/oidcclient/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/OIDCProviderValidator.java
+++ b/ext/oidcclient/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/OIDCProviderValidator.java
@@ -33,7 +33,7 @@
if (isHtml(oidcProvider.getKey())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid key")).
+ getTemplate(EntityViolationType.InvalidKey, oidcProvider.getKey())).
addPropertyNode("key").addConstraintViolation();
return false;
diff --git a/ext/saml2sp/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/SAML2IdPValidator.java b/ext/saml2sp/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/SAML2IdPValidator.java
index 132eb11..d4ecec8 100644
--- a/ext/saml2sp/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/SAML2IdPValidator.java
+++ b/ext/saml2sp/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/SAML2IdPValidator.java
@@ -33,7 +33,7 @@
if (isHtml(saml2IdP.getKey())) {
context.buildConstraintViolationWithTemplate(
- getTemplate(EntityViolationType.InvalidKey, "Invalid key")).
+ getTemplate(EntityViolationType.InvalidKey, saml2IdP.getKey())).
addPropertyNode("key").addConstraintViolation();
return false;
