Upgrade Azure Blobstore from legacy azure-sdk (11.0) to latest (12.27.1)

geowebcache/azureblob/pom.xml

@@ -11,6 +11,26 @@
   <groupId>org.geowebcache</groupId>
   <artifactId>gwc-azure-blob</artifactId>
 
+  <properties>
+    <!-- Same sdk version as imageio-ext's cog-ragengereader-azure for GeoSever compatibility -->
+    <azure.version>12.27.1</azure.version>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <!--
+            Use the same netty version as imageio-ext's cog-ragengereader-s3 and cog-rangereader-azure
+            See https://github.com/geosolutions-it/imageio-ext/pull/312
+        -->
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>4.1.113.Final</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.geowebcache</groupId>
@@ -19,10 +39,9 @@
     </dependency>
 
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
+      <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <!-- at the time of writing 11.0.1 was available but pom on repoes was corrupted -->
-      <version>11.0.0</version>
+      <version>${azure.version}</version>
     </dependency>
 
     <dependency>

geowebcache/azureblob/src/main/java/org/geowebcache/azure/AzureBlobStoreData.java

@@ -29,7 +29,7 @@ public class AzureBlobStoreData {
     private String accountName;
     private String accountKey;
     private Integer maxConnections;
-    private Boolean useHTTPS;
+    private boolean useHTTPS;
     private String proxyHost;
     private Integer proxyPort;
     private String proxyUsername;
@@ -113,11 +113,11 @@ public void setMaxConnections(Integer maxConnections) {
         this.maxConnections = maxConnections;
     }
 
-    public Boolean isUseHTTPS() {
+    public boolean isUseHTTPS() {
         return useHTTPS;
     }
 
-    public void setUseHTTPS(Boolean useHTTPS) {
+    public void setUseHTTPS(boolean useHTTPS) {
         this.useHTTPS = useHTTPS;
     }
 
@@ -137,6 +137,7 @@ public void setProxyPort(Integer proxyPort) {
         this.proxyPort = proxyPort;
     }
 
+    /** unused */
     public String getProxyUsername() {
         return proxyUsername;
     }
@@ -145,6 +146,7 @@ public void setProxyUsername(String proxyUsername) {
         this.proxyUsername = proxyUsername;
     }
 
+    /** unused */
     public String getProxyPassword() {
         return proxyPassword;
     }

geowebcache/azureblob/src/main/java/org/geowebcache/azure/AzureBlobStoreInfo.java

@@ -52,7 +52,7 @@ public class AzureBlobStoreInfo extends BlobStoreInfo {
 
     private String maxConnections;
 
-    private Boolean useHTTPS = true;
+    private boolean useHTTPS = true;
 
     private String proxyHost;
 
@@ -139,7 +139,7 @@ public Boolean isUseHTTPS() {
     }
 
     /** @param useHTTPS whether to use HTTPS (true) or HTTP (false) when talking to Azure */
-    public void setUseHTTPS(Boolean useHTTPS) {
+    public void setUseHTTPS(boolean useHTTPS) {
         this.useHTTPS = useHTTPS;
     }
 
@@ -260,7 +260,7 @@ public int hashCode() {
         result = prime * result + ((proxyPort == null) ? 0 : proxyPort.hashCode());
         result = prime * result + ((proxyUsername == null) ? 0 : proxyUsername.hashCode());
         result = prime * result + ((serviceURL == null) ? 0 : serviceURL.hashCode());
-        result = prime * result + ((useHTTPS == null) ? 0 : useHTTPS.hashCode());
+        result = prime * result + (useHTTPS ? 1 : 0);
         return result;
     }
 
@@ -300,9 +300,7 @@ public boolean equals(Object obj) {
         if (serviceURL == null) {
             if (other.serviceURL != null) return false;
         } else if (!serviceURL.equals(other.serviceURL)) return false;
-        if (useHTTPS == null) {
-            if (other.useHTTPS != null) return false;
-        } else if (!useHTTPS.equals(other.useHTTPS)) return false;
+        if (useHTTPS != other.useHTTPS) return false;
         return true;
     }