This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new c32cc0868e8 upgrade to azure-sdk-bom version 1.2.6
c32cc0868e8 is described below
commit c32cc0868e86238968b69ec44083c7ed0cef3efd
Author: Babak Vahdat <bvah...@apache.org>
AuthorDate: Tue Sep 27 17:36:30 2022 +0200
upgrade to azure-sdk-bom version 1.2.6
---
camel-dependencies/pom.xml | 2 +-
.../azure/storage/blob/client/BlobClientWrapper.java | 17 +++++++++--------
.../azure/storage/blob/operations/BlobOperations.java | 8 +++++---
.../storage/blob/integration/BlobOperationsIT.java | 19 +++++++++++++++----
parent/pom.xml | 2 +-
5 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index dd1a1056bcb..358ba29581d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -67,7 +67,7 @@
<aws-java-sdk2-version>2.17.282</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
- <azure-sdk-bom-version>1.2.5</azure-sdk-bom-version>
+ <azure-sdk-bom-version>1.2.6</azure-sdk-bom-version>
<azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>
<bouncycastle-version>1.71</bouncycastle-version>
<box-java-sdk-version>2.58.0</box-java-sdk-version>
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
index fc5e70230da..b99cff0bd14 100644
---
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
+++
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/client/BlobClientWrapper.java
@@ -26,6 +26,7 @@ import java.util.Locale;
import java.util.Map;
import com.azure.core.http.HttpHeaders;
+import com.azure.core.http.rest.PagedIterable;
import com.azure.core.http.rest.Response;
import com.azure.core.http.rest.ResponseBase;
import com.azure.core.util.Context;
@@ -48,9 +49,10 @@ import
com.azure.storage.blob.models.DeleteSnapshotsOptionType;
import com.azure.storage.blob.models.DownloadRetryOptions;
import com.azure.storage.blob.models.PageBlobItem;
import com.azure.storage.blob.models.PageBlobRequestConditions;
-import com.azure.storage.blob.models.PageList;
import com.azure.storage.blob.models.PageRange;
+import com.azure.storage.blob.models.PageRangeItem;
import com.azure.storage.blob.models.ParallelTransferOptions;
+import com.azure.storage.blob.options.ListPageRangesOptions;
import com.azure.storage.blob.sas.BlobSasPermission;
import com.azure.storage.blob.sas.BlobServiceSasSignatureValues;
import com.azure.storage.blob.specialized.AppendBlobClient;
@@ -100,7 +102,7 @@ public class BlobClientWrapper {
final OutputStream stream, final BlobRange range,
final DownloadRetryOptions options, final BlobRequestConditions
requestConditions, final boolean getRangeContentMd5,
final Duration timeout) {
- return client.downloadWithResponse(stream, range, options,
requestConditions, getRangeContentMd5, timeout,
+ return client.downloadStreamWithResponse(stream, range, options,
requestConditions, getRangeContentMd5, timeout,
Context.NONE);
}
@@ -169,10 +171,7 @@ public class BlobClientWrapper {
.setStartTime(OffsetDateTime.now());
String sasToken = sourceBlob.generateSas(values);
- String res = client.copyFromUrl(sourceBlob.getBlobUrl() + "?" +
sasToken);
-
- return res;
-
+ return client.copyFromUrl(sourceBlob.getBlobUrl() + "?" + sasToken);
}
public boolean appendBlobExists() {
@@ -203,10 +202,12 @@ public class BlobClientWrapper {
return getPageBlobClient().clearPagesWithResponse(pageRange,
pageBlobRequestConditions, timeout, Context.NONE);
}
- public Response<PageList> getPageBlobRanges(
+ public PagedIterable<PageRangeItem> getPageBlobRanges(
final BlobRange blobRange, final BlobRequestConditions
requestConditions,
final Duration timeout) {
- return getPageBlobClient().getPageRangesWithResponse(blobRange,
requestConditions, timeout, Context.NONE);
+ final ListPageRangesOptions listPageRangesOptions = new
ListPageRangesOptions(blobRange);
+ listPageRangesOptions.setRequestConditions(requestConditions);
+ return getPageBlobClient().listPageRanges(listPageRangesOptions,
timeout, Context.NONE);
}
public boolean pageBlobExists() {
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
index f042e73ebb6..f8e911b0761 100644
---
a/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
+++
b/components/camel-azure/camel-azure-storage-blob/src/main/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperations.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import com.azure.core.http.rest.PagedIterable;
import com.azure.core.http.rest.Response;
import com.azure.core.http.rest.ResponseBase;
import com.azure.storage.blob.BlobClient;
@@ -45,8 +46,8 @@ import com.azure.storage.blob.models.BlockListType;
import com.azure.storage.blob.models.DeleteSnapshotsOptionType;
import com.azure.storage.blob.models.DownloadRetryOptions;
import com.azure.storage.blob.models.PageBlobItem;
-import com.azure.storage.blob.models.PageList;
import com.azure.storage.blob.models.PageRange;
+import com.azure.storage.blob.models.PageRangeItem;
import com.azure.storage.blob.models.ParallelTransferOptions;
import com.azure.storage.blob.sas.BlobSasPermission;
import com.azure.storage.blob.sas.BlobServiceSasSignatureValues;
@@ -420,8 +421,9 @@ public class BlobOperations {
LOG.trace("Getting the page blob ranges [{}] from exchange [{}]...",
configurationProxy.getBlobName(exchange),
exchange);
- final Response<PageList> response =
client.getPageBlobRanges(blobRange,
commonRequestOptions.getBlobRequestConditions(),
- commonRequestOptions.getTimeout());
+ final PagedIterable<PageRangeItem> response
+ = client.getPageBlobRanges(blobRange,
commonRequestOptions.getBlobRequestConditions(),
+ commonRequestOptions.getTimeout());
return BlobOperationResponse.create(response);
}
diff --git
a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
index cbf24f01109..88d5d9a99f7 100644
---
a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
+++
b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/integration/BlobOperationsIT.java
@@ -30,9 +30,11 @@ import java.security.SecureRandom;
import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
-import com.azure.storage.blob.models.PageList;
+import com.azure.core.http.rest.PagedIterable;
import com.azure.storage.blob.models.PageRange;
+import com.azure.storage.blob.models.PageRangeItem;
import com.azure.storage.blob.specialized.BlobInputStream;
import org.apache.camel.Exchange;
import org.apache.camel.component.azure.storage.blob.BlobBlock;
@@ -54,6 +56,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -409,10 +413,17 @@ class BlobOperationsIT extends Base {
assertNotNull(response);
- final PageList pageList = (PageList) response.getBody();
+ final PagedIterable<?> pagedIterable = (PagedIterable<?>)
response.getBody();
+ List<?> pageRangeItems =
pagedIterable.stream().collect(Collectors.toList());
- assertEquals(pageRange.getStart(),
pageList.getPageRange().get(0).getStart());
- assertEquals(pageRange.getEnd(),
pageList.getPageRange().get(0).getEnd());
+ assertEquals(1, pageRangeItems.size());
+ assertInstanceOf(PageRangeItem.class, pageRangeItems.get(0));
+
+ PageRangeItem pageRangeItem = (PageRangeItem) pageRangeItems.get(0);
+
+ assertEquals(pageRange.getStart(),
pageRangeItem.getRange().getOffset());
+ assertEquals(pageRange.getEnd(), pageRangeItem.getRange().getLength()
- 1);
+ assertFalse(pageRangeItem.isClear());
blobClientWrapper.delete(null, null, null);
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 7f258e4f5fd..5aba118de91 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -84,7 +84,7 @@
<aws-java-sdk2-version>2.17.282</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
- <azure-sdk-bom-version>1.2.5</azure-sdk-bom-version>
+ <azure-sdk-bom-version>1.2.6</azure-sdk-bom-version>
<azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>
<bouncycastle-version>1.71</bouncycastle-version>
<box-java-sdk-version>2.58.0</box-java-sdk-version>
