From f41d69753b0b6988c26c59902ee442e5a5c8511d Mon Sep 17 00:00:00 2001 From: j2blake Date: Wed, 11 May 2011 21:19:57 +0000 Subject: [PATCH] NIHVIVO-2299 Continue converting from older Identifiers to newer Identifiers. --- .../webapp/edit/n3editing/EditN3Utils.java | 26 +++++++++---------- .../auth/policy/SelfEditingPolicyTest.java | 21 +++++---------- .../setup/SelfEditingPolicySetupTest.java | 19 ++++---------- 3 files changed, 24 insertions(+), 42 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java index 9733c809c..dd74eab29 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/EditN3Utils.java @@ -2,31 +2,31 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing; +import java.util.ArrayList; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import org.apache.xerces.util.XMLChar; +import edu.cornell.mannlib.vitro.webapp.auth.identifier.HasAssociatedIndividual; +import edu.cornell.mannlib.vitro.webapp.auth.identifier.HasRoleLevel; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; +import edu.cornell.mannlib.vitro.webapp.auth.identifier.IsUser; import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers; -import edu.cornell.mannlib.vitro.webapp.auth.identifier.RoleIdentifier; -import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory; public class EditN3Utils { + /** Several places could give an editor URI. Return the first one. */ public static String getEditorUri(HttpServletRequest request) { IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(request); - String editorUri = SelfEditingIdentifierFactory.getSelfEditingUri(ids); - - if (editorUri == null) { - editorUri = RoleIdentifier.getUri(ids); - } - - if (editorUri == null) { - editorUri = "Unknown N3 Editor"; - } - - return editorUri; + List uris = new ArrayList(); + uris.addAll(IsUser.getUserUris(ids)); + uris.addAll(HasAssociatedIndividual.getIndividualUris(ids)); + uris.addAll(HasRoleLevel.getRoleLevelUris(ids)); + uris.add("Unknown N3 Editor"); + return uris.get(0); } /** diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java index 852d7d8d6..49d41e304 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicyTest.java @@ -15,8 +15,8 @@ import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestricti import stubs.javax.servlet.ServletContextStub; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle; +import edu.cornell.mannlib.vitro.webapp.auth.identifier.HasAssociatedIndividual; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; -import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision; @@ -69,14 +69,11 @@ public class SelfEditingPolicyTest extends AbstractTestClass { policy = new SelfEditingPolicy(ctx); - ids = new ArrayIdentifierBundle(); - ids.add(new SelfEditingIdentifierFactory.NetId("test223")); - IndividualImpl ind = new IndividualImpl(); ind.setURI(SELFEDITOR_URI); - ids.add(new SelfEditingIdentifierFactory.SelfEditing(ind, - SelfEditingIdentifierFactory.NOT_BLACKLISTED)); - + + ids = new ArrayIdentifierBundle(); + ids.add(new HasAssociatedIndividual(SELFEDITOR_URI)); } @Test @@ -323,19 +320,13 @@ public class SelfEditingPolicyTest extends AbstractTestClass { private void setUpTwoSEIs() { ids = new ArrayIdentifierBundle(); - ids.add(new SelfEditingIdentifierFactory.NetId("bozoUser")); - IndividualImpl ind1 = new IndividualImpl(); ind1.setURI(SAFE_NS + "bozoUri"); - ids.add(new SelfEditingIdentifierFactory.SelfEditing(ind1, - SelfEditingIdentifierFactory.NOT_BLACKLISTED)); - - ids.add(new SelfEditingIdentifierFactory.NetId("test223")); + ids.add(new HasAssociatedIndividual(ind1.getURI())); IndividualImpl ind2 = new IndividualImpl(); ind2.setURI(SELFEDITOR_URI); - ids.add(new SelfEditingIdentifierFactory.SelfEditing(ind2, - SelfEditingIdentifierFactory.NOT_BLACKLISTED)); + ids.add(new HasAssociatedIndividual(ind2.getURI())); } // ---------------------------------------------------------------------- diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetupTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetupTest.java index 4b833c6b0..2df6dee75 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetupTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/SelfEditingPolicySetupTest.java @@ -20,9 +20,9 @@ import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle; +import edu.cornell.mannlib.vitro.webapp.auth.identifier.HasAssociatedIndividual; import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier; import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle; -import edu.cornell.mannlib.vitro.webapp.auth.identifier.SelfEditingIdentifierFactory; import edu.cornell.mannlib.vitro.webapp.auth.policy.SelfEditingPolicy; import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper; import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization; @@ -88,7 +88,7 @@ public class SelfEditingPolicySetupTest extends AbstractTestClass { PropertyRestrictionPolicyHelper.setBean(ctx, PropertyRestrictionPolicyHelperStub .getInstance(new String[] { ADMIN_NS })); - + policy = new SelfEditingPolicy(ctx); Assert.assertNotNull(policy); @@ -96,8 +96,7 @@ public class SelfEditingPolicySetupTest extends AbstractTestClass { seIndividual.setURI(SELFEDITOR_URI); ids = new ArrayIdentifierBundle(); - ids.add(new SelfEditingIdentifierFactory.SelfEditing(seIndividual, - SelfEditingIdentifierFactory.NOT_BLACKLISTED)); + ids.add(new HasAssociatedIndividual(SELFEDITOR_URI)); // setLoggerLevel(SelfEditingPolicySetupTest.class, Level.DEBUG); } @@ -125,16 +124,8 @@ public class SelfEditingPolicySetupTest extends AbstractTestClass { @Test public void noSelfEditorIdentifier() { ids.clear(); - ids.add(new Identifier() { /* empty identifier */ }); - assertAddObjectPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE, - Authorization.INCONCLUSIVE); - } - - @Test - public void blacklistedSelfEditor() { - ids.clear(); - ids.add(new SelfEditingIdentifierFactory.SelfEditing(seIndividual, - "Don't like this guy.")); + ids.add(new Identifier() { /* empty identifier */ + }); assertAddObjectPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE, Authorization.INCONCLUSIVE); }