Skip to content

Commit

Permalink
RESTful Service : List configured Storage systems should only fetch u…
Browse files Browse the repository at this point in the history
…sed/free space for storage systems which match the specified filter fix #1378
  • Loading branch information
gunterze committed May 8, 2018
1 parent 9e49daa commit 379dd74
Showing 1 changed file with 3 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
import java.io.IOException;
import java.util.*;

import static org.dcm4che3.util.StringUtils.contains;

/**
* @author Vrinda Nayak <vrinda.nayak@j4care.com>
* @author Gunter Zeilinger <gunterze@gmail.com>
Expand Down Expand Up @@ -177,16 +175,16 @@ private List<StorageSystem> getStorageSystems() {
String storageID = desc.getStorageID();
Set<String> usages = new HashSet<>();
Set<String> aets = new HashSet<>();
if (contains(arcdev.getSeriesMetadataStorageIDs(), storageID)) {
if (StringUtils.contains(arcdev.getSeriesMetadataStorageIDs(), storageID)) {
usages.add("dcmSeriesMetadataStorageID");
}
for (ApplicationEntity ae : device.getApplicationEntities()) {
ArchiveAEExtension arcAE = ae.getAEExtension(ArchiveAEExtension.class);
if (contains(arcAE.getObjectStorageIDs(), desc.getStorageID())) {
if (StringUtils.contains(arcAE.getObjectStorageIDs(), desc.getStorageID())) {
usages.add("dcmObjectStorageID");
aets.add(ae.getAETitle());
}
if (contains(arcAE.getMetadataStorageIDs(), desc.getStorageID())) {
if (StringUtils.contains(arcAE.getMetadataStorageIDs(), desc.getStorageID())) {
usages.add("dcmMetadataStorageID");
aets.add(ae.getAETitle());
}
Expand Down

0 comments on commit 379dd74

Please sign in to comment.