From badda280bc4780830b27c3e8d26c09cb6741d226 Mon Sep 17 00:00:00 2001 From: crowleySynopsys Date: Tue, 3 May 2022 14:53:46 -0400 Subject: [PATCH] Change API of Bdio2FileUploadService.uploadFile to return Bdio2UploadResult instead of HttpUrl. --- .../blackduck/bdio2/Bdio2FileUploadService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2FileUploadService.java b/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2FileUploadService.java index 75b3b3705..d12877225 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2FileUploadService.java +++ b/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2FileUploadService.java @@ -46,13 +46,13 @@ public Bdio2FileUploadService( this.bdio2Uploader = bdio2Uploader; } - public HttpUrl uploadFile(UploadTarget uploadTarget, long timeout) throws IntegrationException, InterruptedException { + public Bdio2UploadResult uploadFile(UploadTarget uploadTarget, long timeout) throws IntegrationException, InterruptedException { logger.debug(String.format("Uploading BDIO file %s", uploadTarget.getUploadFile())); List bdioFileContentList = bdio2Extractor.extractContent(uploadTarget.getUploadFile()); return uploadFiles(bdioFileContentList, uploadTarget.getProjectAndVersion().orElse(null), timeout); } - private HttpUrl uploadFiles(List bdioFiles, @Nullable NameVersion nameVersion, long timeout) throws IntegrationException, InterruptedException { + private Bdio2UploadResult uploadFiles(List bdioFiles, @Nullable NameVersion nameVersion, long timeout) throws IntegrationException, InterruptedException { if (bdioFiles.isEmpty()) { throw new IllegalArgumentException("BDIO files cannot be empty."); } @@ -78,8 +78,7 @@ private HttpUrl uploadFiles(List bdioFiles, @Nullable NameVersi Bdio2UploadJob bdio2UploadJob = new Bdio2UploadJob(bdio2Uploader, header, remainingFiles, editor, count); ResilientJobExecutor jobExecutor = new ResilientJobExecutor(jobConfig); - return jobExecutor.executeJob(bdio2UploadJob) - .getUploadUrl(); + return jobExecutor.executeJob(bdio2UploadJob); } }