tilman/mam-migration
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed filename from UploadReference

Browse Source
This commit is contained in:
GEXCE
2017-11-08 22:23:00 +01:00
parent daedfb7031
commit c0ffd9fc20
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AH MAM Migration/src/com/bayer/edam/migration/MamMigrationSelective.java
+2 -2
View File
@@ -592,7 +592,7 @@ public class MamMigrationSelective implements CommandLineRunner {
for (UploadReference reference : openUploads) { for (UploadReference reference : openUploads) {
if (reference.token != null) { if (reference.token != null) {
UploadFileRecord fileRecord = new UploadFileRecord(); UploadFileRecord fileRecord = new UploadFileRecord();
fileRecord.addFile(reference.token, reference.filename, reference.isMaster); fileRecord.addFile(reference.token, reference.isMaster);
log.debug("Attach uploaded file to " + reference.targetRecord); log.debug("Attach uploaded file to " + reference.targetRecord);
HttpEntity<UploadFileRecord> httpEntity = new HttpEntity<UploadFileRecord>(fileRecord, adamHeaders); HttpEntity<UploadFileRecord> httpEntity = new HttpEntity<UploadFileRecord>(fileRecord, adamHeaders);
@@ -610,7 +610,7 @@ public class MamMigrationSelective implements CommandLineRunner {
processedReferences.add(reference); processedReferences.add(reference);
} }
else { else {
log.debug("Checking status of upload " + reference.filename + " at " + reference.uri); log.debug("Checking status of " + reference.filename + " for " + reference.uri);
UploadResult result = restTemplate.exchange(Definitions.adamHost + reference.uri, HttpMethod.GET, adamHeadersEntity, UploadResult.class).getBody(); UploadResult result = restTemplate.exchange(Definitions.adamHost + reference.uri, HttpMethod.GET, adamHeadersEntity, UploadResult.class).getBody();
log.debug("Result: " + result); log.debug("Result: " + result);
AH MAM Migration/src/com/bayer/edam/migration/adam/UploadFileRecord.java
+5 -7
View File
@@ -6,13 +6,11 @@ import java.util.List;
public class UploadFileRecord { public class UploadFileRecord {
public static class WriteFile { public static class WriteFile {
public WriteFile(String id, String filename) { public WriteFile(String id) {
this.id = id; this.id = id;
this.filename = filename;
} }
public String id; public String id;
public String filename;
} }
@@ -38,8 +36,8 @@ public class UploadFileRecord {
public List<FileContent> addOrUpdate = new ArrayList<FileContent>(); public List<FileContent> addOrUpdate = new ArrayList<FileContent>();
} }
public UploadFileRecord(String masterToken, String masterFilename) { public UploadFileRecord(String masterToken) {
addFile(masterToken, masterFilename, true); addFile(masterToken, true);
} }
public UploadFileRecord() { public UploadFileRecord() {
@@ -48,8 +46,8 @@ public class UploadFileRecord {
public String contentType = "Record"; public String contentType = "Record";
public Files files = new Files(); public Files files = new Files();
public void addFile(String token, String filename, boolean isMaster) { public void addFile(String token, boolean isMaster) {
files.addOrUpdate.add(new FileContent(new Versions(new WriteFile(token, filename)))); files.addOrUpdate.add(new FileContent(new Versions(new WriteFile(token))));
if (isMaster) if (isMaster)
files.master = token; files.master = token;