eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

fixed ownership merge routine, "greening" test

Browse Source
This commit is contained in:
Axel Uhl
2019-12-03 10:12:59 +01:00
parent 7cb5062e31
commit 93fdd1502f
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.security.storemerging/src/com/sap/sse/security/storemerging/SecurityStoreMerger.java
+7 -2
View File
@@ -257,7 +257,7 @@ public class SecurityStoreMerger {
final UserGroup targetGroupOwnership = userGroupMap.get(groupOwnership);
final User targetUserOwnership = userMap.get(userOwnership);
// FIXME && seems wrong; should be || instead
if (targetGroupOwnership != null && targetUserOwnership != null) {
if (targetGroupOwnership != null || targetUserOwnership != null) {
if (targetGroupOwnership != groupOwnership || targetUserOwnership != userOwnership) {
// something changed, and at least one ownership component is not null; create new annotation:
logger.info("User/group of ownership for object "+sourceOwnership.getIdOfAnnotatedObject()+" changed. Ownership updated");
@@ -410,7 +410,12 @@ public class SecurityStoreMerger {
private void mergeOwnerships(AccessControlStore sourceAccessControlStore,
Set<OwnershipAnnotation> ownershipsToTryToImport) {
// TODO Implement SecurityStoreMerger.mergeOwnerships(...)
for (final OwnershipAnnotation o : ownershipsToTryToImport) {
if (targetAccessControlStore.getOwnership(o.getIdOfAnnotatedObject()) == null) {
targetAccessControlStore.setOwnership(o.getIdOfAnnotatedObject(), o.getAnnotation().getUserOwner(),
o.getAnnotation().getTenantOwner(), o.getDisplayNameOfAnnotatedObject());
}
}
}
private void mergeAccessControlLists(AccessControlStore sourceAccessControlStore, Map<UserGroup, UserGroup> userGroupMap) {