GA Changes (#40028)

* api review changes * reworking filesmbpropertieshelper * style
Azure · May 13, 2024 · cd2c740 · cd2c740
1 parent 7eb1a64
commit cd2c740
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 30 deletions.
diff --git a/...zure-storage-file-share/src/main/java/com/azure/storage/file/share/FileSmbProperties.java b/...zure-storage-file-share/src/main/java/com/azure/storage/file/share/FileSmbProperties.java
@@ -4,6 +4,7 @@
 package com.azure.storage.file.share;
 
 import com.azure.core.http.HttpHeaders;
+import com.azure.storage.file.share.implementation.accesshelpers.FileSmbPropertiesHelper;
 import com.azure.storage.file.share.models.NtfsFileAttributes;
 
 import java.time.OffsetDateTime;
@@ -214,7 +215,7 @@ static String parseFileSMBDate(OffsetDateTime time) {
      *
      * @param httpHeaders The headers to construct FileSmbProperties from
      */
-    public FileSmbProperties(HttpHeaders httpHeaders) {
+    FileSmbProperties(HttpHeaders httpHeaders) {
         this.filePermissionKey = httpHeaders.getValue(FileConstants.HeaderConstants.FILE_PERMISSION_KEY);
         String attributes = httpHeaders.getValue(FileConstants.HeaderConstants.FILE_ATTRIBUTES);
         this.ntfsFileAttributes = attributes == null ? null : NtfsFileAttributes.toAttributes(attributes);
@@ -228,4 +229,13 @@ public FileSmbProperties(HttpHeaders httpHeaders) {
         this.fileId = httpHeaders.getValue(FileConstants.HeaderConstants.FILE_ID);
         this.parentId = httpHeaders.getValue(FileConstants.HeaderConstants.FILE_PARENT_ID);
     }
+
+    static {
+        FileSmbPropertiesHelper.setAccessor(new FileSmbPropertiesHelper.FileSmbPropertiesAccessor() {
+            @Override
+            public FileSmbProperties create(HttpHeaders httpHeaders) {
+                return new FileSmbProperties(httpHeaders);
+            }
+        });
+    }
 }
diff --git a/...va/com/azure/storage/file/share/implementation/accesshelpers/FileSmbPropertiesHelper.java b/...va/com/azure/storage/file/share/implementation/accesshelpers/FileSmbPropertiesHelper.java
@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.storage.file.share.implementation.accesshelpers;
+
+import com.azure.core.http.HttpHeaders;
+import com.azure.storage.file.share.FileSmbProperties;
+
+/**
+ * Helper class to access private values of {@link FileSmbProperties} across package boundaries.
+ */
+public final class FileSmbPropertiesHelper {
+
+    private static FileSmbPropertiesAccessor accessor;
+
+    private FileSmbPropertiesHelper() { }
+
+
+    /**
+     * Type defining the methods to set the non-public properties of a {@link FileSmbProperties} instance.
+     */
+    public interface FileSmbPropertiesAccessor {
+        /**
+         * Creates a new instance of {@link FileSmbProperties} backed by an internal instance of
+         * {@link FileSmbProperties}.
+         *
+         * @param httpHeaders The internal headers.
+         * @return A new instance of {@link FileSmbProperties}.
+         */
+        FileSmbProperties create(HttpHeaders httpHeaders);
+    }
+
+    /**
+     * The method called from {@link FileSmbProperties} to set it's accessor.
+     *
+     * @param accessor The accessor.
+     */
+    public static void setAccessor(final FileSmbPropertiesAccessor accessor) {
+        FileSmbPropertiesHelper.accessor = accessor;
+    }
+
+    /**
+     * Creates a new instance of {@link FileSmbProperties} backed by an internal instance of
+     * {@link FileSmbProperties}.
+     *
+     * @param httpHeaders The internal headers.
+     * @return A new instance of {@link FileSmbProperties}.
+     */
+    public static FileSmbProperties create(HttpHeaders httpHeaders) {
+        if (accessor == null) {
+            new FileSmbProperties();
+        }
+
+        assert accessor != null;
+        return accessor.create(httpHeaders);
+    }
+}
diff --git a/...ile-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java b/...ile-share/src/main/java/com/azure/storage/file/share/implementation/util/ModelHelper.java
@@ -16,6 +16,7 @@
 import com.azure.storage.common.implementation.Constants;
 import com.azure.storage.common.implementation.StorageImplUtils;
 import com.azure.storage.file.share.FileSmbProperties;
+import com.azure.storage.file.share.implementation.accesshelpers.FileSmbPropertiesHelper;
 import com.azure.storage.file.share.implementation.MessageConstants;
 import com.azure.storage.file.share.implementation.accesshelpers.ShareFileDownloadHeadersConstructorProxy;
 import com.azure.storage.file.share.implementation.models.DeleteSnapshotsOptionType;
@@ -342,7 +343,7 @@ public static Response<ShareFileInfo> createFileInfoResponse(ResponseBase<FilesC
         String eTag = response.getDeserializedHeaders().getETag();
         OffsetDateTime lastModified = response.getDeserializedHeaders().getLastModified();
         boolean isServerEncrypted = response.getDeserializedHeaders().isXMsRequestServerEncrypted();
-        FileSmbProperties smbProperties = new FileSmbProperties(response.getHeaders());
+        FileSmbProperties smbProperties = FileSmbPropertiesHelper.create(response.getHeaders());
         ShareFileInfo shareFileInfo = new ShareFileInfo(eTag, lastModified, isServerEncrypted, smbProperties);
         return new SimpleResponse<>(response, shareFileInfo);
     }
@@ -375,7 +376,7 @@ public static Response<ShareFileProperties> getPropertiesResponse(
         String copySource = headers.getXMsCopySource();
         CopyStatusType copyStatus = headers.getXMsCopyStatus();
         Boolean isServerEncrypted = headers.isXMsServerEncrypted();
-        FileSmbProperties smbProperties = new FileSmbProperties(response.getHeaders());
+        FileSmbProperties smbProperties = FileSmbPropertiesHelper.create(response.getHeaders());
         ShareFileProperties shareFileProperties = new ShareFileProperties(eTag, lastModified, metadata, fileType,
             contentLength, contentType, contentMD5, contentEncoding, cacheControl, contentDisposition,
             leaseStatusType, leaseStateType, leaseDurationType, copyCompletionTime, copyStatusDescription, copyId,
@@ -388,7 +389,7 @@ public static Response<ShareFileInfo> setPropertiesResponse(
         String eTag = response.getDeserializedHeaders().getETag();
         OffsetDateTime lastModified = response.getDeserializedHeaders().getLastModified();
         boolean isServerEncrypted = response.getDeserializedHeaders().isXMsRequestServerEncrypted();
-        FileSmbProperties smbProperties = new FileSmbProperties(response.getHeaders());
+        FileSmbProperties smbProperties = FileSmbPropertiesHelper.create(response.getHeaders());
         ShareFileInfo shareFileInfo = new ShareFileInfo(eTag, lastModified, isServerEncrypted, smbProperties);
         return new SimpleResponse<>(response, shareFileInfo);
     }
@@ -515,7 +516,7 @@ public static Response<ShareDirectoryInfo> mapShareDirectoryInfo(
         final ResponseBase<DirectoriesCreateHeaders, Void> response) {
         String eTag = response.getDeserializedHeaders().getETag();
         OffsetDateTime lastModified = response.getDeserializedHeaders().getLastModified();
-        FileSmbProperties smbProperties = new FileSmbProperties(response.getHeaders());
+        FileSmbProperties smbProperties = FileSmbPropertiesHelper.create(response.getHeaders());
         ShareDirectoryInfo shareDirectoryInfo = new ShareDirectoryInfo(eTag, lastModified, smbProperties);
         return new SimpleResponse<>(response, shareDirectoryInfo);
     }
@@ -526,7 +527,7 @@ public static Response<ShareDirectoryProperties> mapShareDirectoryPropertiesResp
         String eTag = response.getDeserializedHeaders().getETag();
         OffsetDateTime offsetDateTime = response.getDeserializedHeaders().getLastModified();
         boolean isServerEncrypted = response.getDeserializedHeaders().isXMsServerEncrypted();
-        FileSmbProperties smbProperties = new FileSmbProperties(response.getHeaders());
+        FileSmbProperties smbProperties = FileSmbPropertiesHelper.create(response.getHeaders());
         ShareDirectoryProperties shareDirectoryProperties =
             new ShareDirectoryProperties(metadata, eTag, offsetDateTime, isServerEncrypted, smbProperties);
         return new SimpleResponse<>(response, shareDirectoryProperties);
@@ -536,7 +537,7 @@ public static Response<ShareDirectoryInfo> mapSetPropertiesResponse(
         final ResponseBase<DirectoriesSetPropertiesHeaders, Void> response) {
         String eTag = response.getDeserializedHeaders().getETag();
         OffsetDateTime lastModified = response.getDeserializedHeaders().getLastModified();
-        FileSmbProperties smbProperties = new FileSmbProperties(response.getHeaders());
+        FileSmbProperties smbProperties = FileSmbPropertiesHelper.create(response.getHeaders());
         ShareDirectoryInfo shareDirectoryInfo = new ShareDirectoryInfo(eTag, lastModified, smbProperties);
         return new SimpleResponse<>(response, shareDirectoryInfo);
     }

diff --git a/...le-share/src/main/java/com/azure/storage/file/share/models/ShareFileDownloadResponse.java b/...le-share/src/main/java/com/azure/storage/file/share/models/ShareFileDownloadResponse.java
@@ -3,12 +3,8 @@
 
 package com.azure.storage.file.share.models;
 
-import com.azure.core.http.HttpHeaders;
-import com.azure.core.http.HttpRequest;
 import com.azure.core.http.rest.ResponseBase;
 
-import java.io.InputStream;
-
 /**
  * This class contains the response information returned from the server when downloading a file.
  */
@@ -22,19 +18,4 @@ public ShareFileDownloadResponse(ShareFileDownloadAsyncResponse response) {
         super(response.getRequest(), response.getStatusCode(), response.getHeaders(), null,
             response.getDeserializedHeaders());
     }
-
-    /**
-     * Constructs a {@link ShareFileDownloadResponse}.
-     *
-     * @param request – The HTTP request which resulted in this response.
-     * @param statusCode – The status code of the HTTP response.
-     * @param headers – The headers of the HTTP response.
-     * @param value – The deserialized value of the HTTP response.
-     * @param deserializedHeaders – The deserialized headers of the HTTP response.
-     *
-     */
-    public ShareFileDownloadResponse(HttpRequest request, int statusCode, HttpHeaders headers, InputStream value,
-        ShareFileDownloadHeaders deserializedHeaders) {
-        super(request, statusCode, headers, null, deserializedHeaders);
-    }
 }
diff --git a/sdk/storage/azure-storage-file-share/src/main/java/module-info.java b/sdk/storage/azure-storage-file-share/src/main/java/module-info.java
@@ -4,10 +4,6 @@
 module com.azure.storage.file.share {
     requires transitive com.azure.storage.common;
 
-    requires com.azure.json;
-    requires com.azure.xml;
-    requires java.xml;
-
     exports com.azure.storage.file.share;
     exports com.azure.storage.file.share.models;
     exports com.azure.storage.file.share.options;