Skip to content

Commit c873e39

Browse files
PLUGINS-313 Adding stack trace visualization to xsync configuration dashboard
1 parent 6692d28 commit c873e39

36 files changed

Lines changed: 844 additions & 1176 deletions

src/main/java/org/nrg/xnat/xsync/anonymize/AbstractExportAnonymizer.java

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.util.List;
1212
import java.util.concurrent.Callable;
1313

14+
import lombok.Setter;
1415
import org.nrg.xnat.archive.ArchivingException;
1516
import org.nrg.xnat.helpers.merge.MergeUtils;
1617
import org.slf4j.Logger;
@@ -23,6 +24,7 @@
2324
import org.nrg.xdat.XDAT;
2425

2526

27+
@Setter
2628
public abstract class AbstractExportAnonymizer implements Callable<List<AnonymizationResult>> {
2729
public static final Logger logger = LoggerFactory.getLogger(AbstractExportAnonymizer.class);
2830

@@ -32,16 +34,12 @@ public abstract class AbstractExportAnonymizer implements Callable<List<Anonymiz
3234

3335
abstract String getLabel();
3436

35-
public void setNext(AbstractExportAnonymizer a) {
36-
this.next = a;
37-
}
38-
39-
public List<AnonymizationResult> anonymize(List<File> files) throws MizerException {
37+
public List<AnonymizationResult> anonymize(List<File> files) throws MizerException {
4038

4139
String scriptContent = this.getScript();
4240
if (StringUtils.isNotEmpty(scriptContent)) {
4341
final MizerService service = XDAT.getContextService().getBeanSafely(MizerService.class);
44-
final List<AnonymizationResult> anonResult = service.anonymize(files, this.getProjectName(), this.getSubject(), this.getLabel(), new Long(0), scriptContent, true, false);
42+
final List<AnonymizationResult> anonResult = service.anonymize(files, this.getProjectName(), this.getSubject(), this.getLabel(), 0L, scriptContent, true, false);
4543

4644
try {
4745
MergeUtils.deleteRejectedFiles(logger, anonResult, getProjectName());
@@ -62,38 +60,24 @@ public List<AnonymizationResult> anonymize(List<File> files) throws MizerExcepti
6260
// this project does not have an anon script
6361
//Just copy the files
6462
}
65-
6663
}
6764

68-
6965
/**
7066
* Get the appropriate edit script.
71-
*
72-
* @return
7367
*/
7468
abstract String getScript();
7569

76-
/**
77-
* Check if editing is enabled.
78-
*
79-
* @return
80-
*/
8170
abstract boolean isEnabled();
8271

8372
/**
8473
* Sometimes the session passed in isn't associated with a project, for
8574
* instance if the session is in the prearchive so subclasses must specify
8675
* how to get the project name.
87-
*
88-
* @return
8976
*/
9077
abstract String getProjectName();
9178

9279
/**
9380
* Get the list of files that need to be anonymized.
94-
*
95-
* @return
96-
* @throws IOException
9781
*/
9882
abstract List<File> getFilesToAnonymize() throws IOException;
9983

src/main/java/org/nrg/xsync/local/ResourceSyncManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void syncResources(XnatSubjectdataI remoteSubject, Map<String, List<XnatA
8181
List<XnatAbstractresourceI> deletedResources = resourcesToBeSynced.get(QueryResultUtil.DELETE_STATUS);
8282
List<XnatAbstractresourceI> updatedResources = resourcesToBeSynced.get(QueryResultUtil.ACTIVE_STATUS);
8383
List<XnatAbstractresourceI> newResources = resourcesToBeSynced.get(QueryResultUtil.NEW_STATUS);
84-
if (deletedResources != null && deletedResources.size() > 0) {
84+
if (deletedResources != null && !deletedResources.isEmpty()) {
8585
//Remove each of these resources from the Remote site
8686
if (syncAllStates) {
8787
for (XnatAbstractresourceI resource:deletedResources) {
@@ -245,7 +245,7 @@ private void pushResourceInParts(XnatSubjectdataI remoteSubject, XnatAbstractres
245245
if (resource.getFileSize() != null) {
246246
resourceSyncItem.setFileSize(resource.getFileSize());
247247
} else {
248-
resourceSyncItem.setFileSize(new Long(0));
248+
resourceSyncItem.setFileSize(0L);
249249
}
250250
resourceSyncItem.setSyncStatus(XsyncUtils.SYNC_STATUS_FAILED);
251251
resourceSyncItem.setMessage("Subject " + localSubject.getLabel() + " resource " + rLabel + " could not be updated. " + responses.toString() );
@@ -262,7 +262,7 @@ private void pushResourceInParts(XnatSubjectdataI remoteSubject, XnatAbstractres
262262
if (resource.getFileSize() != null) {
263263
resourceSyncItem.setFileSize(resource.getFileSize());
264264
} else {
265-
resourceSyncItem.setFileSize(new Long(0));
265+
resourceSyncItem.setFileSize(0L);
266266
}
267267
resourceSyncItem.setSyncStatus(XsyncUtils.SYNC_STATUS_FAILED);
268268
resourceSyncItem.setMessage("Subject " + localSubject.getLabel() + " resource " + rLabel + " could not be updated. " + e.getMessage() );

0 commit comments

Comments
 (0)