NIHVIVO-1232 Give the object property statement actions a common ancestor. Make them immutable objects.

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/ifaces/ThreeParameterAction.java

@@ -1,41 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces;
-
-/**
- * A base class for actions that work with a triple.
- *
- * @author bdc34
- *
- */
-public abstract class ThreeParameterAction implements RequestedAction{
-
-    //TODO: these should not be public
-    public String uriOfSubject;
-    public String uriOfObject;
-    public String uriOfPredicate;
-
-    public String getUriOfObject() {
-        return uriOfObject;
-    }
-    public void setUriOfObject(String uriOfObject) {
-        this.uriOfObject = uriOfObject;
-    }
-    public String getUriOfPredicate() {
-        return uriOfPredicate;
-    }
-    public void setUriOfPredicate(String uriOfPredicate) {
-        this.uriOfPredicate = uriOfPredicate;
-    }
-    public String getUriOfSubject() {
-        return uriOfSubject;
-    }
-    public void setUriOfSubject(String uriOfSubject) {
-        this.uriOfSubject = uriOfSubject;
-    }
-    
-    public String toString(){
-        return this.getClass().getName() +
-        " <" + uriOfSubject + "> <" + uriOfPredicate + "> <" + uriOfObject + ">";
-    }
-}

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AddObjectPropStmt.java

@@ -5,23 +5,18 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.ThreeParameterAction;
 
-public class AddObjectPropStmt extends ThreeParameterAction implements RequestedAction {
+public class AddObjectPropStmt extends ObjectPropertyAction implements
+		RequestedAction {
 
-    public AddObjectPropStmt(String uriOfSub, String uriOfPred, String uriOfObj){
+	public AddObjectPropStmt(String uriOfSub, String uriOfPred, String uriOfObj) {
-        this.uriOfSubject = uriOfSub;
+		super(uriOfSub, uriOfPred, uriOfObj);
-        this.uriOfObject = uriOfObj;
+	}
-        this.uriOfPredicate = uriOfPred;
-    }
 
-    public String getURI() {
+	@Override
-        return RequestActionConstants.actionNamespace + this.getClass().getName();
+	public PolicyDecision accept(VisitingPolicyIface policy,
-    }
+			IdentifierBundle ids) {
-
+		return policy.visit(ids, this);
-    public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){
+	}
-        return policy.visit(ids,this);
-    }
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/DropObjectPropStmt.java

@@ -5,22 +5,18 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.ThreeParameterAction;
 
-public class DropObjectPropStmt  extends ThreeParameterAction implements RequestedAction {
+public class DropObjectPropStmt extends ObjectPropertyAction implements
+		RequestedAction {
 
-    public DropObjectPropStmt(String sub, String pred, String obj){
+	public DropObjectPropStmt(String sub, String pred, String obj) {
-            setUriOfSubject(sub);
+		super(sub, pred, obj);
-            setUriOfPredicate(pred);
+	}
-            setUriOfObject(obj);
-    }
 
-    public String getURI() {
+	@Override
-        return RequestActionConstants.actionNamespace + this.getClass().getName();
+	public PolicyDecision accept(VisitingPolicyIface policy,
-    }
+			IdentifierBundle ids) {
-    public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle ids){
+		return policy.visit(ids, this);
-        return policy.visit(ids,this);
+	}
-    }
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/EditObjPropStmt.java

@@ -5,33 +5,25 @@ package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt;
 import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
 import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
 import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.ThreeParameterAction;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 
-public class EditObjPropStmt extends ThreeParameterAction implements RequestedAction {
+public class EditObjPropStmt extends ObjectPropertyAction implements
+		RequestedAction {
 
+	public EditObjPropStmt(ObjectPropertyStatement ops) {
+		super(ops.getSubjectURI(), ops.getPropertyURI(), ops.getObjectURI());
+	}
 
-    public EditObjPropStmt(ObjectPropertyStatement ops){    
+	public EditObjPropStmt(String subjectUri, String keywordPredUri,
-        setUriOfSubject(ops.getSubjectURI());
+			String objectUri) {
-        setUriOfPredicate(ops.getPropertyURI());
+		super(subjectUri, keywordPredUri, objectUri);
-        setUriOfObject(ops.getObjectURI());
+	}
-    }
 
-    public EditObjPropStmt(String subjectUri, String keywordPredUri,
+	@Override
-            String objectUri) {
+	public PolicyDecision accept(VisitingPolicyIface policy,
-        setUriOfSubject(subjectUri);
+			IdentifierBundle whoToAuth) {
-        setUriOfPredicate(keywordPredUri);
+		return policy.visit(whoToAuth, this);
-        setUriOfObject(objectUri);
+	}
-    }
-
-    public PolicyDecision accept(VisitingPolicyIface policy, IdentifierBundle whoToAuth) {
-        return policy.visit(whoToAuth,this);
-    }
-
-    public String getURI() {
-     return RequestActionConstants.actionNamespace + this.getClass().getName();
-    }
 
 }

webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/ObjectPropertyAction.java

@@ -0,0 +1,54 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.VisitingPolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+
+/**
+ * A base class for requested actions that involve manipulating an object
+ * property.
+ */
+public abstract class ObjectPropertyAction implements RequestedAction {
+	public final String uriOfSubject;
+	public final String uriOfPredicate;
+	public final String uriOfObject;
+
+	public ObjectPropertyAction(String uriOfSubject, String uriOfPredicate,
+			String uriOfObject) {
+		this.uriOfSubject = uriOfSubject;
+		this.uriOfPredicate = uriOfPredicate;
+		this.uriOfObject = uriOfObject;
+	}
+
+	public String getUriOfSubject() {
+		return uriOfSubject;
+	}
+
+	public String getUriOfPredicate() {
+		return uriOfPredicate;
+	}
+
+	public String getUriOfObject() {
+		return uriOfObject;
+	}
+
+	@Override
+	public String getURI() {
+		return RequestActionConstants.actionNamespace
+				+ this.getClass().getName();
+	}
+
+	@Override
+	public abstract PolicyDecision accept(VisitingPolicyIface policy,
+			IdentifierBundle whoToAuth);
+
+	@Override
+	public String toString() {
+		return this.getClass().getSimpleName() + ": <" + uriOfSubject + "> <"
+				+ uriOfPredicate + "> <" + uriOfObject + ">";
+	}
+}