Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

import edu.unc.lib.boxc.migration.cdm.options.GenerateSourceFileMappingOptions;
import edu.unc.lib.boxc.migration.cdm.services.CdmFieldService;
import edu.unc.lib.boxc.migration.cdm.services.StreamingMetadataService;
import edu.unc.lib.boxc.migration.cdm.status.SourceFilesSummaryService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -39,7 +38,6 @@ public class AccessFilesCommand {
private CLIMain parentCommand;

private MigrationProject project;
private StreamingMetadataService streamingMetadataService;
private SourceFilesSummaryService summaryService;
private AccessFileService accessService;

Expand Down Expand Up @@ -137,13 +135,8 @@ private void initialize(boolean dryRun) throws IOException {
CdmFieldService fieldService = new CdmFieldService();
CdmIndexService indexService = new CdmIndexService();
indexService.setProject(project);
streamingMetadataService = new StreamingMetadataService();
streamingMetadataService.setProject(project);
streamingMetadataService.setFieldService(fieldService);
streamingMetadataService.setIndexService(indexService);
accessService = new AccessFileService();
accessService.setIndexService(indexService);
accessService.setStreamingMetadataService(streamingMetadataService);
accessService.setProject(project);
summaryService = new SourceFilesSummaryService();
summaryService.setProject(project);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import edu.unc.lib.boxc.migration.cdm.services.CdmFieldService;
import edu.unc.lib.boxc.migration.cdm.services.CdmIndexService;
import edu.unc.lib.boxc.migration.cdm.services.MigrationProjectFactory;
import edu.unc.lib.boxc.migration.cdm.services.StreamingMetadataService;
import edu.unc.lib.boxc.migration.cdm.status.SourceFilesSummaryService;
import edu.unc.lib.boxc.migration.cdm.validators.AggregateFilesValidator;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -40,7 +39,6 @@ public class AggregateFilesCommand {
private CdmFieldService fieldService;
private CdmIndexService indexService;
private SourceFilesSummaryService summaryService;
private StreamingMetadataService streamingMetadataService;

@CommandLine.Command(name = "generate",
description = {
Expand Down Expand Up @@ -139,14 +137,9 @@ private void initialize(boolean sortBottom, boolean dryRun) throws IOException {
fieldService = new CdmFieldService();
indexService = new CdmIndexService();
indexService.setProject(project);
streamingMetadataService = new StreamingMetadataService();
streamingMetadataService.setProject(project);
streamingMetadataService.setFieldService(fieldService);
streamingMetadataService.setIndexService(indexService);
aggregateService = new AggregateFileMappingService(sortBottom);
aggregateService.setIndexService(indexService);
aggregateService.setProject(project);
aggregateService.setStreamingMetadataService(streamingMetadataService);
summaryService = new SourceFilesSummaryService();
summaryService.setProject(project);
summaryService.setDryRun(dryRun);
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/edu/unc/lib/boxc/migration/cdm/SipsCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import edu.unc.lib.boxc.migration.cdm.services.AltTextService;
import edu.unc.lib.boxc.migration.cdm.services.AspaceRefIdService;
import edu.unc.lib.boxc.migration.cdm.services.CdmFieldService;
import edu.unc.lib.boxc.migration.cdm.services.StreamingMetadataService;
import org.slf4j.Logger;

import edu.unc.lib.boxc.migration.cdm.exceptions.MigrationException;
Expand Down Expand Up @@ -53,7 +52,6 @@ public class SipsCommand {
private AggregateFileMappingService aggregateTopMappingService;
private AggregateFileMappingService aggregateBottomMappingService;
private CdmFieldService fieldService;
private StreamingMetadataService streamingMetadataService;
private PIDMinter pidMinter;
private PremisLoggerFactoryImpl premisLoggerFactory;
private SipService sipService;
Expand Down Expand Up @@ -155,10 +153,6 @@ private void initialize() throws IOException {
aggregateBottomMappingService.setIndexService(indexService);
aggregateBottomMappingService.setProject(project);
fieldService = new CdmFieldService();
streamingMetadataService = new StreamingMetadataService();
streamingMetadataService.setProject(project);
streamingMetadataService.setFieldService(fieldService);
streamingMetadataService.setIndexService(indexService);

sipService = new SipService();
sipService.setIndexService(indexService);
Expand All @@ -173,6 +167,5 @@ private void initialize() throws IOException {
sipService.setChompbConfig(parentCommand.getChompbConfig());
sipService.setAggregateTopMappingService(aggregateTopMappingService);
sipService.setAggregateBottomMappingService(aggregateBottomMappingService);
sipService.setStreamingMetadataService(streamingMetadataService);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import edu.unc.lib.boxc.migration.cdm.services.CdmExportFilesService;
import edu.unc.lib.boxc.migration.cdm.services.CdmFieldService;
import edu.unc.lib.boxc.migration.cdm.services.CdmFileRetrievalService;
import edu.unc.lib.boxc.migration.cdm.services.StreamingMetadataService;
import edu.unc.lib.boxc.migration.cdm.status.SourceFilesSummaryService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
Expand Down Expand Up @@ -50,7 +49,6 @@ public class SourceFilesCommand {
private CdmExportFilesService exportFilesService;
private CdmFieldService fieldService;
private SourceFilesSummaryService summaryService;
private StreamingMetadataService streamingMetadataService;

@Command(name = "generate",
description = {
Expand Down Expand Up @@ -95,7 +93,6 @@ public int validate(@Option(names = { "-f", "--force"},
initialize(false);
SourceFilesValidator validator = new SourceFilesValidator();
validator.setProject(project);
validator.setStreamingMetadataService(streamingMetadataService);
List<String> errors = validator.validateMappings(force);
if (errors.isEmpty()) {
outputLogger.info("PASS: Source file mapping at path {} is valid",
Expand Down Expand Up @@ -127,7 +124,6 @@ public int status() throws Exception {
initialize(false);
SourceFilesStatusService statusService = new SourceFilesStatusService();
statusService.setProject(project);
statusService.setStreamingMetadataService(streamingMetadataService);
statusService.report(parentCommand.getVerbosity());

return 0;
Expand Down Expand Up @@ -205,13 +201,8 @@ private void initialize(boolean dryRun) throws IOException {
fieldService = new CdmFieldService();
indexService = new CdmIndexService();
indexService.setProject(project);
streamingMetadataService = new StreamingMetadataService();
streamingMetadataService.setProject(project);
streamingMetadataService.setFieldService(fieldService);
streamingMetadataService.setIndexService(indexService);
sourceService = new SourceFileService();
sourceService.setIndexService(indexService);
sourceService.setStreamingMetadataService(streamingMetadataService);
sourceService.setProject(project);
summaryService = new SourceFilesSummaryService();
summaryService.setProject(project);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import edu.unc.lib.boxc.migration.cdm.services.CdmFieldService;
import edu.unc.lib.boxc.migration.cdm.services.CdmIndexService;
import edu.unc.lib.boxc.migration.cdm.services.MigrationProjectFactory;
import edu.unc.lib.boxc.migration.cdm.services.StreamingMetadataService;
import edu.unc.lib.boxc.migration.cdm.status.ProjectStatusService;
import org.slf4j.Logger;
import picocli.CommandLine.Command;
Expand All @@ -31,7 +30,6 @@ public class StatusCommand implements Callable<Integer> {
private ProjectStatusService statusService;
private CdmFieldService fieldService;
private CdmIndexService indexService;
private StreamingMetadataService streamingMetadataService;
private MigrationProject project;

@Override
Expand All @@ -56,12 +54,7 @@ private void initialize() throws IOException {
fieldService = new CdmFieldService();
indexService = new CdmIndexService();
indexService.setProject(project);
streamingMetadataService = new StreamingMetadataService();
streamingMetadataService.setProject(project);
streamingMetadataService.setFieldService(fieldService);
streamingMetadataService.setIndexService(indexService);
statusService = new ProjectStatusService();
statusService.setProject(project);
statusService.setStreamingMetadataService(streamingMetadataService);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public class SipService {
private MigrationProject project;
private ChompbConfigService.ChompbConfig chompbConfig;
private PermissionsService permissionsService;
private StreamingMetadataService streamingMetadataService;
private PIDMinter pidMinter;
private CdmToDestMapper cdmToDestMapper = new CdmToDestMapper();
private WorkGeneratorFactory workGeneratorFactory;
Expand Down Expand Up @@ -113,7 +112,6 @@ private void initDependencies(SipGenerationOptions options, Connection conn) thr
workGeneratorFactory.setPostMigrationReportService(postMigrationReportService);
workGeneratorFactory.setAggregateTopMappingService(aggregateTopMappingService);
workGeneratorFactory.setAggregateBottomMappingService(aggregateBottomMappingService);
workGeneratorFactory.setStreamingMetadataService(streamingMetadataService);
try {
workGeneratorFactory.setPermissionsInfo(permissionsService.loadMappings(project));
} catch (NoSuchFileException e) {
Expand Down Expand Up @@ -445,10 +443,6 @@ public void setPermissionsService(PermissionsService permissionsService) {
this.permissionsService = permissionsService;
}

public void setStreamingMetadataService(StreamingMetadataService streamingMetadataService) {
this.streamingMetadataService = streamingMetadataService;
}

public void setPidMinter(PIDMinter pidMinter) {
this.pidMinter = pidMinter;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.slf4j.Logger;

import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import java.nio.file.FileSystems;
Expand Down Expand Up @@ -66,7 +65,6 @@ public class SourceFileService {

protected MigrationProject project;
protected CdmIndexService indexService;
protected StreamingMetadataService streamingMetadataService;

public SourceFileService() {
}
Expand Down Expand Up @@ -108,11 +106,8 @@ public void generateMapping(GenerateSourceFileMappingOptions options) throws IOE
// Generate source file mapping entry for each returned object
while (rs.next()) {
String cdmId = rs.getString(1);
// when creating a blank source files csv, filter out source files for duracloud content
if (options.isPopulateBlank()) {
if (!streamingMetadataService.verifyRecordHasStreamingMetadata(cdmId)) {
csvPrinter.printRecord(cdmId, null, null, null);
}
csvPrinter.printRecord(cdmId, null, null, null);
continue;
}

Expand Down Expand Up @@ -587,8 +582,4 @@ public void setProject(MigrationProject project) {
public void setIndexService(CdmIndexService indexService) {
this.indexService = indexService;
}

public void setStreamingMetadataService(StreamingMetadataService streamingMetadataService) {
this.streamingMetadataService = streamingMetadataService;
}
}

This file was deleted.

Loading
Loading