Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[VIVO-1436] Address code review comments on PR #85 #95

Closed
wants to merge 1 commit into from
Closed

[VIVO-1436] Address code review comments on PR #85 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/AdvisingRelationshipChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class AdvisingRelationshipChecker extends RelationshipChecker {
public boolean isRelated(OntModel ontModel, List<String> fromUris, List<String> toUris) {
for (String resourceUri : fromUris) {
if (isAdvisingRelationship(ontModel, resourceUri)) {
if (anyUrisInCommon(ontModel, toUris, getUrisOfAdvisors(ontModel, resourceUri))) {
if (anyUrisInCommon(toUris, getUrisOfAdvisors(ontModel, resourceUri))) {
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/CourseChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class CourseChecker extends RelationshipChecker {
public boolean isRelated(OntModel ontModel, List<String> fromUris, List<String> toUris) {
for (String resourceUri : fromUris) {
if (isCourse(ontModel, resourceUri)) {
if (anyUrisInCommon(ontModel, toUris, getUrisOfTeachers(ontModel, resourceUri))) {
if (anyUrisInCommon(toUris, getUrisOfTeachers(ontModel, resourceUri))) {
return true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/GrantChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ public class GrantChecker extends RelationshipChecker {
public boolean isRelated(OntModel ontModel, List<String> fromUris, List<String> toUris) {
for (String resourceUri : fromUris) {
if (isGrant(ontModel, resourceUri)) {
if (anyUrisInCommon(ontModel, toUris,
if (anyUrisInCommon(toUris,
getUrisOfPrincipalInvestigators(ontModel, resourceUri))) {
return true;
}
if (anyUrisInCommon(ontModel, toUris,
if (anyUrisInCommon(toUris,
getUrisOfCoPrincipalInvestigators(ontModel, resourceUri))) {
return true;
}
Expand Down
6 changes: 3 additions & 3 deletions api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/InfoContentEntityChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ public class InfoContentEntityChecker extends RelationshipChecker {
public boolean isRelated(OntModel ontModel, List<String> fromUris, List<String> toUris) {
for (String resourceUri : fromUris) {
if (isInfoContentEntity(ontModel, resourceUri)) {
if (anyUrisInCommon(ontModel, toUris, getUrisOfAuthors(ontModel, resourceUri))) {
if (anyUrisInCommon(toUris, getUrisOfAuthors(ontModel, resourceUri))) {
return true;
}
if (anyUrisInCommon(ontModel, toUris, getUrisOfEditors(ontModel, resourceUri))) {
if (anyUrisInCommon(toUris, getUrisOfEditors(ontModel, resourceUri))) {
return true;
}
if (anyUrisInCommon(ontModel, toUris, getUrisOfFeatured(ontModel, resourceUri))) {
if (anyUrisInCommon(toUris, getUrisOfFeatured(ontModel, resourceUri))) {
return true;
}
}
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/PresentationChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class PresentationChecker extends RelationshipChecker {
public boolean isRelated(OntModel ontModel, List<String> fromUris, List<String> toUris) {
for (String resourceUri : fromUris) {
if (isPresentation(ontModel, resourceUri)) {
if (anyUrisInCommon(ontModel, toUris, getUrisOfPresenters(ontModel, resourceUri))) {
if (anyUrisInCommon(toUris, getUrisOfPresenters(ontModel, resourceUri))) {
return true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/edu/cornell/mannlib/vivo/auth/policy/ProjectOrServiceChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ public class ProjectOrServiceChecker extends RelationshipChecker {
public boolean isRelated(OntModel ontModel, List<String> fromUris, List<String> toUris) {
for (String resourceUri : fromUris) {
if (isProject(ontModel, resourceUri)) {
if (anyUrisInCommon(ontModel, toUris,
if (anyUrisInCommon(toUris,
getClinicalAgentsOfProject(ontModel, resourceUri))) {
return true;
}
}
if (isService(ontModel, resourceUri)) {
if (anyUrisInCommon(ontModel, toUris,
if (anyUrisInCommon(toUris,
getClinicalAgentsOfService(ontModel, resourceUri))) {
return true;
}
Expand Down