Skip to content

Commit 4e9d137

Browse files
janvanmansumjanvanmansum
committed
Renamed Deposit in legacy code to DansBagDeposit
1 parent dfc30c0 commit 4e9d137

17 files changed

+55
-54
lines changed

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingService.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.knaw.dans.dvingest.core.dansbag;
1717

18-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
18+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
1919
import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
2020
import nl.knaw.dans.dvingest.core.yaml.EditFiles;
2121
import nl.knaw.dans.dvingest.core.yaml.EditPermissions;
@@ -28,13 +28,13 @@
2828
public interface DansBagMappingService {
2929
String getUpdatesDataset(Path depositDir) throws IOException, DataverseException;
3030

31-
Deposit readDansDeposit(Path depositDir) throws InvalidDepositException;
31+
DansBagDeposit readDansDeposit(Path depositDir) throws InvalidDepositException;
3232

33-
Dataset getDatasetMetadataFromDansDeposit(Deposit dansDeposit);
33+
Dataset getDatasetMetadataFromDansDeposit(DansBagDeposit dansDeposit);
3434

35-
EditFiles getEditFilesFromDansDeposit(Deposit dansDeposit);
35+
EditFiles getEditFilesFromDansDeposit(DansBagDeposit dansDeposit);
3636

37-
EditPermissions getEditPermissionsFromDansDeposit(Deposit dansDeposit);
37+
EditPermissions getEditPermissionsFromDansDeposit(DansBagDeposit dansDeposit);
3838

39-
String packageOriginalMetadata(Deposit dansDeposit) throws IOException;
39+
String packageOriginalMetadata(DansBagDeposit dansDeposit) throws IOException;
4040
}

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansBagMappingServiceImpl.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import nl.knaw.dans.dvingest.core.dansbag.deposit.DepositFileListerImpl;
2424
import nl.knaw.dans.dvingest.core.dansbag.deposit.DepositReader;
2525
import nl.knaw.dans.dvingest.core.dansbag.deposit.DepositReaderImpl;
26-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
26+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
2727
import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
28-
import nl.knaw.dans.dvingest.core.dansbag.io.BagDataManager;
29-
import nl.knaw.dans.dvingest.core.dansbag.io.BagDataManagerImpl;
3028
import nl.knaw.dans.dvingest.core.dansbag.mapper.DepositToDvDatasetMetadataMapper;
29+
import nl.knaw.dans.dvingest.core.dansbag.service.BagDataManager;
30+
import nl.knaw.dans.dvingest.core.dansbag.service.BagDataManagerImpl;
3131
import nl.knaw.dans.dvingest.core.dansbag.service.ManifestHelper;
3232
import nl.knaw.dans.dvingest.core.dansbag.service.ManifestHelperImpl;
3333
import nl.knaw.dans.dvingest.core.dansbag.service.XmlReader;
@@ -120,7 +120,7 @@ else if (depositToDvDatasetMetadataMapper.isMigration()) {
120120
}
121121

122122
@Override
123-
public Dataset getDatasetMetadataFromDansDeposit(Deposit dansDeposit) {
123+
public Dataset getDatasetMetadataFromDansDeposit(DansBagDeposit dansDeposit) {
124124
var dataset = depositToDvDatasetMetadataMapper.toDataverseDataset(
125125
dansDeposit.getDdm(),
126126
dansDeposit.getOtherDoiId(),
@@ -143,12 +143,12 @@ public Dataset getDatasetMetadataFromDansDeposit(Deposit dansDeposit) {
143143
}
144144

145145
@Override
146-
public EditFiles getEditFilesFromDansDeposit(Deposit dansDeposit) {
146+
public EditFiles getEditFilesFromDansDeposit(DansBagDeposit dansDeposit) {
147147
return new EditFilesComposer(dansDeposit, fileExclusionPattern, embargoExclusions).composeEditFiles();
148148
}
149149

150150
@Override
151-
public EditPermissions getEditPermissionsFromDansDeposit(Deposit dansDeposit) {
151+
public EditPermissions getEditPermissionsFromDansDeposit(DansBagDeposit dansDeposit) {
152152
var userId = dansDeposit.getDepositorUserId();
153153
var editPermissions = new EditPermissions();
154154
var roleAssignment = new RoleAssignment();
@@ -159,15 +159,15 @@ public EditPermissions getEditPermissionsFromDansDeposit(Deposit dansDeposit) {
159159
}
160160

161161
@Override
162-
public String packageOriginalMetadata(Deposit dansDeposit) throws IOException {
162+
public String packageOriginalMetadata(DansBagDeposit dansDeposit) throws IOException {
163163
// Zip the contents of the metadata directory of the bag
164164
var metadataDir = dansDeposit.getBagDir().resolve("metadata");
165165
var zipFile = dansDeposit.getBagDir().resolve("data/original-metadata.zip");
166166
ZipUtil.zipDirectory(metadataDir, zipFile, false);
167167
return zipFile.toString();
168168
}
169169

170-
Optional<String> getDateOfDeposit(Deposit dansDeposit) {
170+
Optional<String> getDateOfDeposit(DansBagDeposit dansDeposit) {
171171
if (dansDeposit.isUpdate()) {
172172
return Optional.empty(); // See for implementation CIT025B in DatasetUpdater
173173
}
@@ -176,15 +176,15 @@ Optional<String> getDateOfDeposit(Deposit dansDeposit) {
176176
}
177177
}
178178

179-
Optional<AuthenticatedUser> getDatasetContact(Deposit dansDeposit) {
179+
Optional<AuthenticatedUser> getDatasetContact(DansBagDeposit dansDeposit) {
180180
return Optional.ofNullable(dansDeposit.getDepositorUserId())
181181
.filter(StringUtils::isNotBlank)
182182
.map(userId -> dataverseService.getUserById(userId)
183183
.orElseThrow(() -> new RuntimeException("Unable to fetch user with id " + userId)));
184184
}
185185

186186
@Override
187-
public Deposit readDansDeposit(Path depositDir) throws InvalidDepositException {
187+
public DansBagDeposit readDansDeposit(Path depositDir) throws InvalidDepositException {
188188
return depositReader.readDeposit(depositDir);
189189
}
190190
}

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package nl.knaw.dans.dvingest.core.dansbag;
1717

1818
import lombok.AllArgsConstructor;
19-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
19+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
2020
import nl.knaw.dans.dvingest.core.service.YamlService;
2121
import nl.knaw.dans.dvingest.core.yaml.EditFilesRoot;
2222
import nl.knaw.dans.dvingest.core.yaml.EditPermissionsRoot;
@@ -26,7 +26,7 @@
2626

2727
@AllArgsConstructor
2828
public class DansDepositConverter {
29-
private final Deposit dansDeposit;
29+
private final DansBagDeposit dansDeposit;
3030
private final DansBagMappingService mappingService;
3131
private final YamlService yamlService;
3232

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/DansDepositSupport.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import nl.knaw.dans.dvingest.core.DataverseIngestBag;
2424
import nl.knaw.dans.dvingest.core.DataverseIngestDeposit;
2525
import nl.knaw.dans.dvingest.core.Deposit;
26+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
2627
import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
2728
import nl.knaw.dans.dvingest.core.dansbag.exception.RejectedDepositException;
2829
import nl.knaw.dans.dvingest.core.service.YamlService;
@@ -44,7 +45,7 @@ public class DansDepositSupport implements Deposit {
4445
private final DataverseIngestDeposit ingestDataverseIngestDeposit;
4546
private final boolean isDansDeposit;
4647

47-
private nl.knaw.dans.dvingest.core.dansbag.domain.Deposit dansDeposit;
48+
private DansBagDeposit dansDeposit;
4849

4950
public DansDepositSupport(DataverseIngestDeposit dataverseIngestDeposit, ValidateDansBagService validateDansBagService, DansBagMappingService dansBagMappingService, YamlService yamlService) {
5051
this.validateDansBagService = validateDansBagService;

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/EditFilesComposer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import lombok.AllArgsConstructor;
1919
import lombok.extern.slf4j.Slf4j;
2020
import nl.knaw.dans.dvingest.core.bagprocessor.DataversePath;
21-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
21+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
2222
import nl.knaw.dans.dvingest.core.dansbag.domain.FileInfo;
2323
import nl.knaw.dans.dvingest.core.dansbag.mapper.mapping.FileElement;
2424
import nl.knaw.dans.dvingest.core.dansbag.service.XPathEvaluator;
@@ -48,7 +48,7 @@
4848
@Slf4j
4949
@AllArgsConstructor
5050
public class EditFilesComposer {
51-
private final Deposit dansDeposit;
51+
private final DansBagDeposit dansDeposit;
5252
private final Pattern fileExclusionPattern;
5353
private final List<String> embargoExclusions;
5454
private static final SimpleDateFormat yyyymmddFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -158,7 +158,7 @@ private List<Path> getEmbargoedFiles(Map<Path, FileInfo> files, Instant dateAvai
158158
}
159159
}
160160

161-
private Map<Path, FileInfo> getFileInfo(Deposit dansDeposit) {
161+
private Map<Path, FileInfo> getFileInfo(DansBagDeposit dansDeposit) {
162162
var files = FileElement.pathToFileInfo(dansDeposit, false); // TODO: handle migration case
163163

164164
return files.entrySet().stream()
@@ -198,8 +198,8 @@ protected Map<String, String> getAutoRenameMap(Map<Path, FileInfo> files) {
198198
}
199199

200200
// TODO: move to mapping package
201-
private Instant getDateAvailable(Deposit deposit) {
202-
return XPathEvaluator.strings(deposit.getDdm(), "/ddm:DDM/ddm:profile/ddm:available")
201+
private Instant getDateAvailable(DansBagDeposit dansBagDeposit) {
202+
return XPathEvaluator.strings(dansBagDeposit.getDdm(), "/ddm:DDM/ddm:profile/ddm:available")
203203
.map(EditFilesComposer::parseDate)
204204
.findFirst()
205205
.orElseThrow(() -> new IllegalArgumentException("Deposit without a ddm:available element"));

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/EditFilesComposerForUpdate.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import lombok.extern.slf4j.Slf4j;
1919
import nl.knaw.dans.dvingest.core.bagprocessor.FilesInDatasetCache;
20-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
20+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
2121
import nl.knaw.dans.dvingest.core.dansbag.domain.FileInfo;
2222
import nl.knaw.dans.dvingest.core.service.DataverseService;
2323
import nl.knaw.dans.dvingest.core.yaml.FromTo;
@@ -41,7 +41,7 @@ public class EditFilesComposerForUpdate extends EditFilesComposer {
4141
// TODO: this should be a read-only variant the cache
4242
private FilesInDatasetCache filesInDatasetCache;
4343

44-
public EditFilesComposerForUpdate(Deposit dansDeposit, String updatesDatasetPid, Pattern fileExclusionPattern, List<String> embargoExclusions, DataverseService dataverseService) {
44+
public EditFilesComposerForUpdate(DansBagDeposit dansDeposit, String updatesDatasetPid, Pattern fileExclusionPattern, List<String> embargoExclusions, DataverseService dataverseService) {
4545
super(dansDeposit, fileExclusionPattern, embargoExclusions);
4646
this.updatesDatasetPid = updatesDatasetPid;
4747
this.dataverseService = dataverseService;

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/SupportedLicenses.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.knaw.dans.dvingest.core.dansbag;
1717

18-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
18+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
1919
import nl.knaw.dans.dvingest.core.dansbag.exception.RejectedDepositException;
2020
import nl.knaw.dans.dvingest.core.dansbag.mapper.mapping.LicenseElem;
2121
import nl.knaw.dans.dvingest.core.dansbag.service.XPathEvaluator;
@@ -46,7 +46,7 @@ public SupportedLicenses(DataverseService dataverseService) throws IOException,
4646
}
4747

4848

49-
public License getLicenseFromDansDeposit(Deposit dansDeposit) {
49+
public License getLicenseFromDansDeposit(DansBagDeposit dansDeposit) {
5050
var optLicenseUri = XPathEvaluator.nodes(dansDeposit.getDdm(), DDM_DCMI_METADATA + "/dcterms:license")
5151
.filter(LicenseElem::isLicenseUri)
5252
.findFirst()

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositFileLister.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package nl.knaw.dans.dvingest.core.dansbag.deposit;
1717

18-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
18+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
1919
import nl.knaw.dans.dvingest.core.dansbag.domain.DepositFile;
2020

2121
import java.io.IOException;
2222
import java.util.List;
2323

2424
public interface DepositFileLister {
25-
List<DepositFile> getDepositFiles(Deposit deposit) throws IOException;
25+
List<DepositFile> getDepositFiles(DansBagDeposit dansBagDeposit) throws IOException;
2626

2727
}

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositFileListerImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package nl.knaw.dans.dvingest.core.dansbag.deposit;
1717

18-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
18+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
1919
import nl.knaw.dans.dvingest.core.dansbag.domain.DepositFile;
2020
import nl.knaw.dans.dvingest.core.dansbag.domain.OriginalFilePathMapping;
2121
import nl.knaw.dans.dvingest.core.dansbag.service.ManifestHelperImpl;
@@ -35,13 +35,13 @@
3535

3636
public class DepositFileListerImpl implements DepositFileLister {
3737
@Override
38-
public List<DepositFile> getDepositFiles(Deposit deposit) throws IOException {
39-
var bag = deposit.getBag();
38+
public List<DepositFile> getDepositFiles(DansBagDeposit dansBagDeposit) throws IOException {
39+
var bag = dansBagDeposit.getBag();
4040
var bagDir = bag.getRootDir();
4141
var filePathToSha1 = ManifestHelperImpl.getFilePathToSha1(bag);
4242
var originalFilePathMappings = getOriginalFilePathMapping(bagDir);
4343

44-
return XPathEvaluator.nodes(deposit.getFilesXml(), FILES_FILE)
44+
return XPathEvaluator.nodes(dansBagDeposit.getFilesXml(), FILES_FILE)
4545
.map(node -> {
4646
var filePath = Optional.ofNullable(node.getAttributes().getNamedItem("filepath"))
4747
.map(Node::getTextContent)

‎src/main/java/nl/knaw/dans/dvingest/core/dansbag/deposit/DepositReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
*/
1616
package nl.knaw.dans.dvingest.core.dansbag.deposit;
1717

18-
import nl.knaw.dans.dvingest.core.dansbag.domain.Deposit;
18+
import nl.knaw.dans.dvingest.core.dansbag.domain.DansBagDeposit;
1919
import nl.knaw.dans.dvingest.core.dansbag.exception.InvalidDepositException;
2020

2121
import java.nio.file.Path;
2222

2323
public interface DepositReader {
2424

25-
Deposit readDeposit(Path depositDir) throws InvalidDepositException;
25+
DansBagDeposit readDeposit(Path depositDir) throws InvalidDepositException;
2626

2727
}

0 commit comments

Comments
 (0)