Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Open Subsurface Data Universe Software
Platform
System
Lib
cloud
azure
OS Core Lib Azure
Commits
fcf12f9e
Commit
fcf12f9e
authored
Dec 10, 2020
by
Kelly Domico
Browse files
Add logging to copyFile method
parent
6822fa2b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/opengroup/osdu/azure/blobstorage/BlobStore.java
View file @
fcf12f9e
...
...
@@ -20,6 +20,7 @@ import com.azure.storage.blob.BlobServiceClient;
import
com.azure.storage.blob.models.BlobCopyInfo
;
import
com.azure.storage.blob.models.BlobErrorCode
;
import
com.azure.storage.blob.models.BlobStorageException
;
import
com.azure.storage.blob.models.CopyStatusType
;
import
com.azure.storage.blob.sas.BlobContainerSasPermission
;
import
com.azure.storage.blob.sas.BlobSasPermission
;
import
com.azure.storage.blob.sas.BlobServiceSasSignatureValues
;
...
...
@@ -257,8 +258,15 @@ public class BlobStore {
BlobContainerClient
blobContainerClient
=
getBlobContainerClient
(
dataPartitionId
,
containerName
);
BlockBlobClient
blockBlobClient
=
blobContainerClient
.
getBlobClient
(
filePath
).
getBlockBlobClient
();
final
long
start
=
System
.
currentTimeMillis
();
SyncPoller
<
BlobCopyInfo
,
Void
>
result
=
blockBlobClient
.
beginCopy
(
sourceUrl
,
Duration
.
ofSeconds
(
1
));
return
result
.
waitForCompletion
().
getValue
();
BlobCopyInfo
blobCopyInfo
=
result
.
waitForCompletion
().
getValue
();
final
long
timeTaken
=
System
.
currentTimeMillis
()
-
start
;
final
String
target
=
String
.
format
(
"%s:%s/%s"
,
dataPartitionId
,
containerName
,
filePath
);
CopyStatusType
status
=
blobCopyInfo
==
null
?
CopyStatusType
.
FAILED
:
blobCopyInfo
.
getCopyStatus
();
logDependency
(
"COPY_FILE"
,
sourceUrl
,
target
,
timeTaken
,
status
.
toString
(),
status
==
CopyStatusType
.
SUCCESS
);
return
blobCopyInfo
;
}
/**
...
...
src/test/java/org/opengroup/osdu/azure/blobstorage/BlobStoreTest.java
View file @
fcf12f9e
...
...
@@ -19,10 +19,7 @@ import com.azure.core.util.polling.SyncPoller;
import
com.azure.storage.blob.BlobClient
;
import
com.azure.storage.blob.BlobContainerClient
;
import
com.azure.storage.blob.BlobServiceClient
;
import
com.azure.storage.blob.models.BlobCopyInfo
;
import
com.azure.storage.blob.models.BlobErrorCode
;
import
com.azure.storage.blob.models.BlobStorageException
;
import
com.azure.storage.blob.models.BlockBlobItem
;
import
com.azure.storage.blob.models.*
;
import
com.azure.storage.blob.sas.BlobContainerSasPermission
;
import
com.azure.storage.blob.sas.BlobSasPermission
;
import
com.azure.storage.blob.sas.BlobServiceSasSignatureValues
;
...
...
@@ -40,7 +37,6 @@ import org.opengroup.osdu.core.common.model.http.AppException;
import
java.io.ByteArrayOutputStream
;
import
java.time.Duration
;
import
java.time.OffsetDateTime
;
import
java.util.List
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertEquals
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertNull
;
...
...
@@ -249,6 +245,7 @@ public class BlobStoreTest {
public
void
copyFile_Success
()
{
String
copyId
=
"copyId"
;
doReturn
(
copyId
).
when
(
blobCopyInfo
).
getCopyId
();
doReturn
(
CopyStatusType
.
SUCCESS
).
when
(
blobCopyInfo
).
getCopyStatus
();
doReturn
(
blobCopyInfo
).
when
(
pollResponse
).
getValue
();
doReturn
(
pollResponse
).
when
(
syncPoller
).
waitForCompletion
();
doReturn
(
syncPoller
).
when
(
blockBlobClient
).
beginCopy
(
SOURCE_FILE_URL
,
Duration
.
ofSeconds
(
1
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment