From 4c360a11ad2b60a6c4d881e6f8efca8f6e0d95d2 Mon Sep 17 00:00:00 2001
From: Alinga Yeung <Alinga.Yeung@nrc-cnrc.gc.ca>
Date: Tue, 11 Aug 2015 14:50:04 -0700
Subject: [PATCH] Story ac2 rework. Changed getMember() to getX500User().
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java | 8 ++++----
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 2 +-
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
index 77c635c5..4e588eb5 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
@@ -472,7 +472,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
User<X500Principal> owner;
try
{
- owner = userPersist.getMember(groupOwner);
+ owner = userPersist.getX500User(groupOwner);
}
catch (UserNotFoundException e)
{
@@ -504,7 +504,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
User<X500Principal> user;
try
{
- user = userPersist.getMember(memberDN);
+ user = userPersist.getX500User(memberDN);
}
catch (UserNotFoundException e)
{
@@ -972,7 +972,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
}
Group group = new Group(searchResult.getAttributeValue("cn"),
- userPersist.getMember(
+ userPersist.getX500User(
new DN(searchResult.getAttributeValue(
"owner"))));
group.description = searchResult.getAttributeValue("description");
@@ -1076,7 +1076,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
try
{
User<X500Principal> subjectUser =
- userPersist.getMember(getSubjectDN());
+ userPersist.getX500User(getSubjectDN());
if (subjectUser.equals(owner))
{
return true;
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index e7bf2dc9..3150e276 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -831,7 +831,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
* @throws UserNotFoundException
* @throws LDAPException
*/
- User<X500Principal> getMember(DN userDN)
+ User<X500Principal> getX500User(DN userDN)
throws UserNotFoundException, LDAPException
{
Filter filter =
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
index 68c0c646..647af875 100644
--- a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
+++ b/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
@@ -311,7 +311,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
{
try
{
- User<X500Principal> actual = getUserDAO().getMember(new DN(testUserDN));
+ User<X500Principal> actual = getUserDAO().getX500User(new DN(testUserDN));
check(testUser, actual);
return null;
}
@@ -334,7 +334,7 @@ public class LdapUserDAOTest extends AbstractLdapDAOTest
{
try
{
- User<X500Principal> actual = getUserDAO().getMember(new DN(testUserDN));
+ User<X500Principal> actual = getUserDAO().getX500User(new DN(testUserDN));
check(testUser, actual);
return null;
}
--
GitLab