Skip to content

Commit

Permalink
FAIRSPC-81: removed redundant try-catch
Browse files Browse the repository at this point in the history
  • Loading branch information
@tgreenwood
tgreenwood committed Oct 14, 2024
1 parent b18d47a commit c35bae3
Showing 1 changed file with 36 additions and 46 deletions.
82 changes: 36 additions & 46 deletions projects/saturn/src/main/java/io/fairspace/saturn/services/workspaces/WorkspaceService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.Map;
import java.util.Optional;

import lombok.extern.log4j.*;
import lombok.extern.log4j.Log4j2;
import org.apache.jena.graph.Node;
import org.apache.jena.rdf.model.Model;
import org.apache.jena.rdf.model.Resource;
Expand Down Expand Up @@ -38,51 +38,41 @@ public WorkspaceService(Transactions tx, UserService userService) {

public List<Workspace> listWorkspaces() {
return tx.calculateRead(m -> {
try {
var user = m.wrapAsResource(getUserURI());
return new DAO(m)
.list(Workspace.class).stream()
.peek(ws -> {
var res = m.wrapAsResource(ws.getIri());
ws.setCanManage(userService.currentUser().isAdmin()
|| user.hasProperty(FS.isManagerOf, res));
ws.setCanCollaborate(ws.isCanManage() || user.hasProperty(FS.isMemberOf, res));
var workspaceCollections = m.listSubjectsWithProperty(FS.ownedBy, res)
.filterKeep(r -> r.hasProperty(RDF.type, FS.Collection))
.toList();
var totalCollectionCount = workspaceCollections.size();
var nonDeletedCollectionCount = (int) workspaceCollections.stream()
.filter(collection -> !collection.hasProperty(FS.dateDeleted))
.count();
var memberCount = m.listSubjectsWithProperty(RDF.type, FS.User)
.filterKeep(u -> u.hasProperty(FS.isMemberOf, res))
.toList()
.size();
var managers = new DAO(m)
.list(User.class).stream()
.filter(u -> m.wrapAsResource(u.getIri())
.hasProperty(FS.isManagerOf, res))
.collect(toList());
ws.setSummary(WorkspaceSummary.builder()
.totalCollectionCount(totalCollectionCount)
.nonDeletedCollectionCount(nonDeletedCollectionCount)
.memberCount(memberCount + managers.size())
.build());
ws.setManagers(managers);
})
.filter(ws -> userService.currentUser().isCanViewPublicMetadata()
|| ws.isCanManage()
|| ws.isCanCollaborate())
.collect(toList());
} catch (Throwable e) {
log.error("+++++++++++++++++++++++++++++");
log.error("+++++++++++++++++++++++++++++");
log.error("+++++++++++++++++++++++++++++");
log.error("+++++++++++++++++++++++++++++");
log.error("+++++++++++++++++++++++++++++");
log.error("Error listing workspaces", e);
throw e;
}
var user = m.wrapAsResource(getUserURI());
return new DAO(m)
.list(Workspace.class).stream()
.peek(ws -> {
var res = m.wrapAsResource(ws.getIri());
ws.setCanManage(
userService.currentUser().isAdmin() || user.hasProperty(FS.isManagerOf, res));
ws.setCanCollaborate(ws.isCanManage() || user.hasProperty(FS.isMemberOf, res));
var workspaceCollections = m.listSubjectsWithProperty(FS.ownedBy, res)
.filterKeep(r -> r.hasProperty(RDF.type, FS.Collection))
.toList();
var totalCollectionCount = workspaceCollections.size();
var nonDeletedCollectionCount = (int) workspaceCollections.stream()
.filter(collection -> !collection.hasProperty(FS.dateDeleted))
.count();
var memberCount = m.listSubjectsWithProperty(RDF.type, FS.User)
.filterKeep(u -> u.hasProperty(FS.isMemberOf, res))
.toList()
.size();
var managers = new DAO(m)
.list(User.class).stream()
.filter(u -> m.wrapAsResource(u.getIri())
.hasProperty(FS.isManagerOf, res))
.collect(toList());
ws.setSummary(WorkspaceSummary.builder()
.totalCollectionCount(totalCollectionCount)
.nonDeletedCollectionCount(nonDeletedCollectionCount)
.memberCount(memberCount + managers.size())
.build());
ws.setManagers(managers);
})
.filter(ws -> userService.currentUser().isCanViewPublicMetadata()
|| ws.isCanManage()
|| ws.isCanCollaborate())
.collect(toList());
});
}

Expand Down

0 comments on commit c35bae3

Please sign in to comment.