You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/02/18 07:09:01 UTC
[syncope] branch 2_1_X updated (0be73eb -> 61b312f)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git.
from 0be73eb Upgrading maven-checkstyle-plugin
new 1b7f74e Upgrading Groovy
new 61b312f Error message improvements
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/data/AnyObjectDataBinderImpl.java | 26 ++++++++++++----------
.../provisioning/java/data/UserDataBinderImpl.java | 26 ++++++++++++----------
.../java/pushpull/AbstractPullResultHandler.java | 1 +
.../pushpull/DefaultUserPullResultHandler.java | 3 ++-
pom.xml | 2 +-
5 files changed, 32 insertions(+), 26 deletions(-)
[syncope] 02/02: Error message improvements
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 61b312f4a5312543a9eaa3733c0e30514f313b11
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Feb 18 08:08:19 2020 +0100
Error message improvements
---
.../java/data/AnyObjectDataBinderImpl.java | 26 ++++++++++++----------
.../provisioning/java/data/UserDataBinderImpl.java | 26 ++++++++++++----------
.../java/pushpull/AbstractPullResultHandler.java | 1 +
.../pushpull/DefaultUserPullResultHandler.java | 3 ++-
4 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
index 5b63b9b..bf058df 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/AnyObjectDataBinderImpl.java
@@ -192,12 +192,13 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An
anyObject.add(relationship);
}
} else {
- LOG.error("{} cannot be assigned to {}", otherEnd, anyObject);
+ LOG.error("{} cannot be related to {}", otherEnd, anyObject);
- SyncopeClientException unassignabled =
+ SyncopeClientException unrelatable =
SyncopeClientException.build(ClientExceptionType.InvalidRelationship);
- unassignabled.getElements().add("Cannot be assigned: " + otherEnd);
- scce.addException(unassignabled);
+ unrelatable.getElements().add(otherEnd.getType().getKey() + " " + otherEnd.getName()
+ + " cannot be related");
+ scce.addException(unrelatable);
}
}
});
@@ -224,7 +225,7 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An
SyncopeClientException unassignable =
SyncopeClientException.build(ClientExceptionType.InvalidMembership);
- unassignable.getElements().add("Cannot be assigned: " + group);
+ unassignable.getElements().add("Group " + group.getName() + " cannot be assigned");
scce.addException(unassignable);
}
});
@@ -303,12 +304,13 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An
anyObject.add(newRelationship);
} else {
- LOG.error("{} cannot be assigned to {}", otherEnd, anyObject);
+ LOG.error("{} cannot be related to {}", otherEnd, anyObject);
- SyncopeClientException unassignable =
+ SyncopeClientException unrelatable =
SyncopeClientException.build(ClientExceptionType.InvalidRelationship);
- unassignable.getElements().add("Cannot be assigned: " + otherEnd);
- scce.addException(unassignable);
+ unrelatable.getElements().add(otherEnd.getType().getKey() + " " + otherEnd.getName()
+ + " cannot be related");
+ scce.addException(unrelatable);
}
}
}
@@ -406,10 +408,10 @@ public class AnyObjectDataBinderImpl extends AbstractAnyDataBinder implements An
} else {
LOG.error("{} cannot be assigned to {}", group, anyObject);
- SyncopeClientException unassignabled =
+ SyncopeClientException unassignable =
SyncopeClientException.build(ClientExceptionType.InvalidMembership);
- unassignabled.getElements().add("Cannot be assigned: " + group);
- scce.addException(unassignabled);
+ unassignable.getElements().add("Group " + group.getName() + " cannot be assigned");
+ scce.addException(unassignable);
}
}
});
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index 6d06c73..c04495a 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -282,12 +282,13 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
user.add(relationship);
}
} else {
- LOG.error("{} cannot be assigned to {}", otherEnd, user);
+ LOG.error("{} cannot be related to {}", otherEnd, user);
- SyncopeClientException unassignabled =
+ SyncopeClientException unrelatable =
SyncopeClientException.build(ClientExceptionType.InvalidRelationship);
- unassignabled.getElements().add("Cannot be assigned: " + otherEnd);
- scce.addException(unassignabled);
+ unrelatable.getElements().add(otherEnd.getType().getKey() + " " + otherEnd.getName()
+ + " cannot be related");
+ scce.addException(unrelatable);
}
});
@@ -313,7 +314,7 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
SyncopeClientException unassignable =
SyncopeClientException.build(ClientExceptionType.InvalidMembership);
- unassignable.getElements().add("Cannot be assigned: " + group);
+ unassignable.getElements().add("Group " + group.getName() + " cannot be assigned");
scce.addException(unassignable);
}
});
@@ -465,12 +466,13 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
user.add(newRelationship);
} else {
- LOG.error("{} cannot be assigned to {}", otherEnd, user);
+ LOG.error("{} cannot be related to {}", otherEnd, user);
- SyncopeClientException unassignable =
+ SyncopeClientException unrelatable =
SyncopeClientException.build(ClientExceptionType.InvalidRelationship);
- unassignable.getElements().add("Cannot be assigned: " + otherEnd);
- scce.addException(unassignable);
+ unrelatable.getElements().add(otherEnd.getType().getKey() + " " + otherEnd.getName()
+ + " cannot be related");
+ scce.addException(unrelatable);
}
}
}
@@ -578,10 +580,10 @@ public class UserDataBinderImpl extends AbstractAnyDataBinder implements UserDat
} else {
LOG.error("{} cannot be assigned to {}", group, user);
- SyncopeClientException unassignabled =
+ SyncopeClientException unassignable =
SyncopeClientException.build(ClientExceptionType.InvalidMembership);
- unassignabled.getElements().add("Cannot be assigned: " + group);
- scce.addException(unassignabled);
+ unassignable.getElements().add("Group " + group.getName() + " cannot be assigned");
+ scce.addException(unassignable);
}
}
});
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
index 300e554..de5b2c9 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
@@ -211,6 +211,7 @@ public abstract class AbstractPullResultHandler extends AbstractSyncopeResultHan
action.beforeProvision(profile, delta, anyTO);
}
}
+ result.setName(getName(anyTO));
Object output;
Result resultStatus;
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
index bb860f1..40ddc53 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
@@ -346,6 +346,7 @@ public class DefaultUserPullResultHandler extends AbstractPullResultHandler impl
action.beforeProvision(profile, delta, accountTO);
}
}
+ report.setName(accountTO.getConnObjectKeyValue());
UserPatch patch = new UserPatch();
patch.setKey(user.getKey());
@@ -362,12 +363,12 @@ public class DefaultUserPullResultHandler extends AbstractPullResultHandler impl
null,
Collections.singleton(profile.getTask().getResource().getKey()),
true);
- resultStatus = Result.SUCCESS;
LinkedAccountTO created = userDAO.find(patch.getKey()).
getLinkedAccount(accountTO.getResource(), accountTO.getConnObjectKeyValue()).
map(acct -> userDataBinder.getLinkedAccountTO(acct)).
orElse(null);
+
output = created;
resultStatus = Result.SUCCESS;
[syncope] 01/02: Upgrading Groovy
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 1b7f74e76b937f66ac34c23413178ec7f9af9dec
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Feb 18 08:08:04 2020 +0100
Upgrading Groovy
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 634242e..2597287 100644
--- a/pom.xml
+++ b/pom.xml
@@ -421,7 +421,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <groovy.version>3.0.0</groovy.version>
+ <groovy.version>3.0.1</groovy.version>
<flowable.version>6.4.2</flowable.version>