From 657e63f58033d6b4f093a73132c5498b42b76cc3 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 3 Apr 2012 16:11:59 +0000 Subject: [PATCH] NIHVIVO-3404 Provide getResourceUris() and getPredicateUri() methods on AbstractPropertyStatementAction, to permit easier checking by policies. --- .../propstmt/AbstractDataPropertyStatementAction.java | 6 ++++++ .../AbstractObjectPropertyStatementAction.java | 10 ++++++++-- .../propstmt/AbstractPropertyStatementAction.java | 8 ++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java index 74a94678c..5ea769755 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java @@ -34,10 +34,16 @@ public abstract class AbstractDataPropertyStatementAction extends return subjectUri; } + @Override public String getPredicateUri() { return predicateUri; } + @Override + public String[] getResourceUris() { + return new String[] {subjectUri}; + } + @Override public String toString() { return getClass().getSimpleName() + ": <" + subjectUri + "> <" diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java index 53d0c9b6d..da380c383 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractObjectPropertyStatementAction.java @@ -38,12 +38,18 @@ public abstract class AbstractObjectPropertyStatementAction extends return subjectUri; } + public String getObjectUri() { + return objectUri; + } + + @Override public String getPredicateUri() { return predicateUri; } - public String getObjectUri() { - return objectUri; + @Override + public String[] getResourceUris() { + return new String[] {subjectUri, objectUri}; } @Override diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java index 1824f51dc..82434a2bd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractPropertyStatementAction.java @@ -20,4 +20,12 @@ public abstract class AbstractPropertyStatementAction extends RequestedAction { public OntModel getOntModel() { return ontModel; } + + /** + * Get the URI of the Resources that are involved in this statement. Those + * are the Subject, and the Object if this is an ObjectProperty request. + */ + public abstract String[] getResourceUris(); + + public abstract String getPredicateUri(); }