Added the core authorization classes - code review changes (d6c8a952) · Commits · OATS-CADC / ac

projects/cadcUtil/doc/uml/UserAuth.png

−1.55 KiB (16 KiB)

Loading image diff...

projects/cadcUtil/src/ca/nrc/cadc/auth/model/Group.java

+2 −79

Original line number	Diff line number	Diff line
		@@ -170,88 +170,11 @@ public class Group
		return false;
		}
		Group other = (Group) obj;
		if (description == null)
		{
		if (other.description != null)
		{
		return false;
		}
		}
		else if (!description.equals(other.description))
		{
		return false;
		}
		if (groupRead == null)
		{
		if (other.groupRead != null)
		{
		return false;
		}
		}
		else if (!groupRead.equals(other.groupRead))
		{
		return false;
		}
		if (groupWrite == null)
		{
		if (other.groupWrite != null)
		{
		return false;
		}
		}
		else if (!groupWrite.equals(other.groupWrite))
		{
		return false;
		}
		if (groupID == null)
		{
		if (other.groupID != null)
		{
		return false;
		}
		}
		else if (!groupID.equals(other.groupID))
		{
		return false;
		}
		if (groupMembers == null)
		{
		if (other.groupMembers != null)
		if (!groupID.equals(other.groupID))
		{
		return false;
		}
		}
		else if (!groupMembers.equals(other.groupMembers))
		{
		return false;
		}
		if (!owner.equals(other.owner))
		{
		return false;
		}
		if (properties == null)
		{
		if (other.properties != null)
		{
		return false;
		}
		}
		else if (!properties.equals(other.properties))
		{
		return false;
		}
		if (userMembers == null)
		{
		if (other.userMembers != null)
		{
		return false;
		}
		}
		else if (!userMembers.equals(other.userMembers))
		{
		return false;
		}
		return (publicRead == other.publicRead);
		return true;
		}

		@Override

projects/cadcUtil/src/ca/nrc/cadc/auth/model/PosixDetails.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -139,21 +139,6 @@ public class PosixDetails
		{
		return false;
		}
		if (loginShell == null)
		{
		if (other.loginShell != null)
		{
		return false;
		}
		}
		else if (!loginShell.equals(other.loginShell))
		{
		return false;
		}
		if (uid != other.uid)
		{
		return false;
		}
		return true;
		}

projects/cadcUtil/src/ca/nrc/cadc/auth/model/User.java

+1 −24

Original line number	Diff line number	Diff line
		@@ -108,30 +108,7 @@ public class User<T extends Principal>
		{
		return false;
		}
		if (userDetails == null)
		{
		if (other.userDetails != null)
		{
		return false;
		}
		}
		else if (!userDetails.equals(other.userDetails))
		{
		return false;
		}
		if (posixDetails == null)
		{
		if (other.posixDetails != null)
		{
		return false;
		}
		}
		else if (!posixDetails.equals(other.posixDetails))
		{
		return false;
		}
		return this.getPrincipals().equals(other.getPrincipals());

		return true;
		}

		@Override

projects/cadcUtil/test/src/ca/nrc/cadc/auth/model/GroupTest.java

+35 −28

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ public class GroupTest

		group2 = new Group("TestGroup", owner);
		assertEquals(group1.hashCode(), group2.hashCode());
		assertFalse(group1.equals(group2));
		assertEquals(group1,group2);

		group2.getUserMembers().add(user);
		assertEquals(group1.hashCode(), group2.hashCode());
		@@ -72,44 +72,24 @@ public class GroupTest

		group1.getGroupMembers().add(group2);
		assertEquals(group1.hashCode(), group2.hashCode());
		assertFalse(group1.equals(group2));

		group2.getGroupMembers().add(group2);
		assertEquals(group1.hashCode(), group2.hashCode());
		assertEquals(group1,group2);

		group1.description = "Test group";
		assertEquals(group1.hashCode(), group2.hashCode());
		assertFalse(group1.equals(group2));

		group2.description = "Test group";
		assertEquals(group1.hashCode(), group2.hashCode());
		assertEquals(group1,group2);

		// group read and write equality tests
		group1.groupRead = group2;
		assertEquals(group1.hashCode(), group2.hashCode());
		assertFalse(group1.equals(group2));

		group2.groupRead = group2;
		assertEquals(group1.hashCode(), group2.hashCode());
		assertEquals(group1,group2);

		// group write equality tests
		group1.groupWrite = group2;
		assertEquals(group1.hashCode(), group2.hashCode());
		assertFalse(group1.equals(group2));

		group2.groupWrite = group2;
		assertEquals(group1.hashCode(), group2.hashCode());
		assertEquals(group1,group2);

		group1.publicRead = true;
		assertEquals(group1.hashCode(), group2.hashCode());
		assertFalse(group1.equals(group2));

		group2.publicRead = true;
		assertEquals(group1.hashCode(), group2.hashCode());
		assertEquals(group1,group2);

		group2 = new Group("NewTestGroup", owner);
		@@ -119,4 +99,31 @@ public class GroupTest
		// test toString
		System.out.println(group1);
		}

		@Test
		public void exceptionTests()
		{
		boolean thrown = false;
		try
		{
		new Group(null, new User<HttpPrincipal>(new HttpPrincipal("owner")));
		}
		catch(IllegalArgumentException e)
		{
		thrown = true;
		}
		assertTrue(thrown);


		thrown = false;
		try
		{
		new Group("NewTestGroup", null);
		}
		catch(IllegalArgumentException e)
		{
		thrown = true;
		}
		assertTrue(thrown);
		}
		}