Skip to content
Open
Show file tree
Hide file tree
Changes from 5 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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -1051,3 +1051,8 @@ src/hpc-server/hpc-integration-api/target/hpc-integration-api-3.14.0.jar
src/hpc-server/hpc-integration-api/target/classes/META-INF/MANIFEST.MF
src/hpc-server/hpc-integration-api/target/classes/META-INF/maven/gov.nih.nci.hpc/hpc-integration-api/pom.properties
src/hpc-server/hpc-integration-api/target/classes/META-INF/maven/gov.nih.nci.hpc/hpc-integration-api/pom.xml
src/hpc-server/.idea/copilot.data.migration.agent.xml
src/hpc-server/.idea/copilot.data.migration.ask.xml
src/hpc-server/.idea/copilot.data.migration.ask2agent.xml
src/hpc-server/.idea/copilot.data.migration.edit.xml
src/hpc-server/.idea/copilotDiffState.xml
9 changes: 5 additions & 4 deletions src/hpc-server/hpc-integration-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@
<artifactId>hpc-integration-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>hpc-domain-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -125,10 +130,6 @@
<groupId>software.amazon.awssdk</groupId>
<artifactId>aws-core</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk.crt</groupId>
<artifactId>aws-crt</artifactId>
</dependency>
<dependency>
<groupId>com.google.apis</groupId>
<artifactId>google-api-services-drive</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ private HpcDataObjectUploadResponse uploadDataObject(Object authenticatedToken,
uploadResponse.setDataTransferType(HpcDataTransferType.S_3);
uploadResponse.setDataTransferStarted(dataTransferStarted);
uploadResponse.setDataTransferCompleted(dataTransferCompleted);
uploadResponse.setDataTransferRequestId(String.valueOf(fileUpload.hashCode()));
uploadResponse.setDataTransferRequestId(String.valueOf(fileUpload.completionFuture().hashCode()));
uploadResponse.setSourceSize(sourceFile.length());
uploadResponse.setDataTransferMethod(HpcDataTransferUploadMethod.SYNC);
if (archiveType.equals(HpcArchiveType.ARCHIVE)) {
Expand Down
Loading