diff options
Diffstat (limited to 'base/common/src/com/netscape/certsrv/group')
-rw-r--r-- | base/common/src/com/netscape/certsrv/group/GroupMemberCollection.java | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/certsrv/group/GroupMemberData.java | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/certsrv/group/GroupMemberCollection.java b/base/common/src/com/netscape/certsrv/group/GroupMemberCollection.java index d19d939ad..6ec013bca 100644 --- a/base/common/src/com/netscape/certsrv/group/GroupMemberCollection.java +++ b/base/common/src/com/netscape/certsrv/group/GroupMemberCollection.java @@ -69,10 +69,12 @@ public class GroupMemberCollection { GroupMemberData member1 = new GroupMemberData(); member1.setID("User 1"); + member1.setGroupID("Group 1"); response.addMember(member1); GroupMemberData member2 = new GroupMemberData(); member2.setID("User 2"); + member2.setGroupID("Group 1"); response.addMember(member2); JAXBContext context = JAXBContext.newInstance(GroupMemberCollection.class); diff --git a/base/common/src/com/netscape/certsrv/group/GroupMemberData.java b/base/common/src/com/netscape/certsrv/group/GroupMemberData.java index 11f3a2147..8502f3e8f 100644 --- a/base/common/src/com/netscape/certsrv/group/GroupMemberData.java +++ b/base/common/src/com/netscape/certsrv/group/GroupMemberData.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.common.Constants; public class GroupMemberData { String id; + String groupID; Link link; @@ -47,6 +48,15 @@ public class GroupMemberData { this.id = id; } + @XmlAttribute(name="GroupID") + public String getGroupID() { + return groupID; + } + + public void setGroupID(String groupID) { + this.groupID = groupID; + } + @XmlElement(name="Link") public Link getLink() { return link; @@ -60,6 +70,7 @@ public class GroupMemberData { public int hashCode() { final int prime = 31; int result = 1; + result = prime * result + ((groupID == null) ? 0 : groupID.hashCode()); result = prime * result + ((id == null) ? 0 : id.hashCode()); return result; } @@ -73,6 +84,11 @@ public class GroupMemberData { if (getClass() != obj.getClass()) return false; GroupMemberData other = (GroupMemberData) obj; + if (groupID == null) { + if (other.groupID != null) + return false; + } else if (!groupID.equals(other.groupID)) + return false; if (id == null) { if (other.id != null) return false; |