You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2015/12/04 18:27:35 UTC
syncope git commit: missing JsonProperty annotation + AnyType for
membership
Repository: syncope
Updated Branches:
refs/heads/master da596533f -> 3fa2dce9d
missing JsonProperty annotation + AnyType for membership
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3fa2dce9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3fa2dce9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3fa2dce9
Branch: refs/heads/master
Commit: 3fa2dce9d910ab58067ef08ab451218b0899c2e3
Parents: da59653
Author: fmartelli <fa...@gmail.com>
Authored: Fri Dec 4 18:19:39 2015 +0100
Committer: fmartelli <fa...@gmail.com>
Committed: Fri Dec 4 18:19:39 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/syncope/common/lib/to/GroupTO.java | 2 +-
.../syncope/core/provisioning/java/data/GroupDataBinderImpl.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3fa2dce9/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java
index 45b0220..ef62280 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/GroupTO.java
@@ -96,7 +96,7 @@ public class GroupTO extends AnyTO {
this.udynMembershipCond = uDynMembershipCond;
}
- @JsonIgnore
+ @JsonProperty
public Map<String, String> getADynMembershipConds() {
return adynMembershipConds;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/3fa2dce9/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java
index 5ddb8bc..dad26f8 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/GroupDataBinderImpl.java
@@ -72,6 +72,7 @@ public class GroupDataBinderImpl extends AbstractAnyDataBinder implements GroupD
if (anyType.getKind() == AnyTypeKind.ANY_OBJECT && group.getADynMembership(anyType) == null) {
dynMembership = entityFactory.newEntity(ADynGroupMembership.class);
dynMembership.setGroup(group);
+ ADynGroupMembership.class.cast(dynMembership).setAnyType(anyType);
group.add((ADynGroupMembership) dynMembership);
} else if (anyType.getKind() == AnyTypeKind.USER && group.getUDynMembership() == null) {
dynMembership = entityFactory.newEntity(UDynGroupMembership.class);