Fixed bug where eTag would not deserialize in listPaths (#6723)

Azure · Dec 9, 2019 · a400f61 · a400f61
1 parent ef8545d
commit a400f61
Show file tree

Hide file tree

Showing 23 changed files with 16 additions and 34 deletions.
diff --git a/...ain/java/com/azure/storage/file/datalake/implementation/DataLakeStorageClientBuilder.java b/...ain/java/com/azure/storage/file/datalake/implementation/DataLakeStorageClientBuilder.java
@@ -119,12 +119,7 @@ public DataLakeStorageClientBuilder pipeline(HttpPipeline pipeline) {
      */
     public DataLakeStorageClientImpl build() {
         if (pipeline == null) {
-            this.pipeline = new HttpPipelineBuilder()
-                                .policies(
-                                    new UserAgentPolicy(),
-                                    new RetryPolicy(),
-                                    new CookiePolicy())
-                                .build();
+            this.pipeline = new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy()).build();
         }
         DataLakeStorageClientImpl client = new DataLakeStorageClientImpl(pipeline);
         if (this.url != null) {

diff --git a/...c/main/java/com/azure/storage/file/datalake/implementation/DataLakeStorageClientImpl.java b/...c/main/java/com/azure/storage/file/datalake/implementation/DataLakeStorageClientImpl.java
@@ -194,12 +194,7 @@ public PathsImpl paths() {
      * Initializes an instance of DataLakeStorageClient client.
      */
     public DataLakeStorageClientImpl() {
-        this(new HttpPipelineBuilder()
-                 .policies(
-                     new UserAgentPolicy(),
-                     new RetryPolicy(),
-                     new CookiePolicy())
-                 .build());
+        new HttpPipelineBuilder().policies(new UserAgentPolicy(), new RetryPolicy(), new CookiePolicy()).build();
     }
 
     /**

diff --git a/...n/java/com/azure/storage/file/datalake/implementation/models/FileSystemCreateHeaders.java b/...n/java/com/azure/storage/file/datalake/implementation/models/FileSystemCreateHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...n/java/com/azure/storage/file/datalake/implementation/models/FileSystemDeleteHeaders.java b/...n/java/com/azure/storage/file/datalake/implementation/models/FileSystemDeleteHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...com/azure/storage/file/datalake/implementation/models/FileSystemGetPropertiesHeaders.java b/...com/azure/storage/file/datalake/implementation/models/FileSystemGetPropertiesHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...ava/com/azure/storage/file/datalake/implementation/models/FileSystemListPathsHeaders.java b/...ava/com/azure/storage/file/datalake/implementation/models/FileSystemListPathsHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...com/azure/storage/file/datalake/implementation/models/FileSystemSetPropertiesHeaders.java b/...com/azure/storage/file/datalake/implementation/models/FileSystemSetPropertiesHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/.../java/com/azure/storage/file/datalake/implementation/models/ModifiedAccessConditions.java b/.../java/com/azure/storage/file/datalake/implementation/models/ModifiedAccessConditions.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...le-datalake/src/main/java/com/azure/storage/file/datalake/implementation/models/Path.java b/...le-datalake/src/main/java/com/azure/storage/file/datalake/implementation/models/Path.java
@@ -33,7 +33,7 @@ public final class Path {
     /*
      * The eTag property.
      */
-    @JsonProperty(value = "eTag")
+    @JsonProperty(value = "etag")
     private String eTag;
 
     /*

diff --git a/...ain/java/com/azure/storage/file/datalake/implementation/models/PathAppendDataHeaders.java b/...ain/java/com/azure/storage/file/datalake/implementation/models/PathAppendDataHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...rc/main/java/com/azure/storage/file/datalake/implementation/models/PathCreateHeaders.java b/...rc/main/java/com/azure/storage/file/datalake/implementation/models/PathCreateHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...rc/main/java/com/azure/storage/file/datalake/implementation/models/PathDeleteHeaders.java b/...rc/main/java/com/azure/storage/file/datalake/implementation/models/PathDeleteHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...main/java/com/azure/storage/file/datalake/implementation/models/PathFlushDataHeaders.java b/...main/java/com/azure/storage/file/datalake/implementation/models/PathFlushDataHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/.../java/com/azure/storage/file/datalake/implementation/models/PathGetPropertiesHeaders.java b/.../java/com/azure/storage/file/datalake/implementation/models/PathGetPropertiesHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...src/main/java/com/azure/storage/file/datalake/implementation/models/PathLeaseHeaders.java b/...src/main/java/com/azure/storage/file/datalake/implementation/models/PathLeaseHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/.../src/main/java/com/azure/storage/file/datalake/implementation/models/PathReadHeaders.java b/.../src/main/java/com/azure/storage/file/datalake/implementation/models/PathReadHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...va/com/azure/storage/file/datalake/implementation/models/PathSetAccessControlHeaders.java b/...va/com/azure/storage/file/datalake/implementation/models/PathSetAccessControlHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...rc/main/java/com/azure/storage/file/datalake/implementation/models/PathUpdateHeaders.java b/...rc/main/java/com/azure/storage/file/datalake/implementation/models/PathUpdateHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/.../com/azure/storage/file/datalake/implementation/models/ServiceListFileSystemsHeaders.java b/.../com/azure/storage/file/datalake/implementation/models/ServiceListFileSystemsHeaders.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...com/azure/storage/file/datalake/implementation/models/SourceModifiedAccessConditions.java b/...com/azure/storage/file/datalake/implementation/models/SourceModifiedAccessConditions.java
@@ -7,7 +7,6 @@
 import com.azure.core.annotation.Fluent;
 import com.azure.core.util.DateTimeRfc1123;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.time.OffsetDateTime;
 
 /**

diff --git a/...rage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/package-info.java b/...rage-file-datalake/src/main/java/com/azure/storage/file/datalake/models/package-info.java
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+// Code generated by Microsoft (R) AutoRest Code Generator.
 
 /**
  * Package containing classes for DataLakeStorageClient.

diff --git a/...rage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileSystemAPITest.groovy b/...rage-file-datalake/src/test/java/com/azure/storage/file/datalake/FileSystemAPITest.groovy
@@ -828,23 +828,23 @@ class FileSystemAPITest extends APISpec {
         then:
         def dirPath = response.next()
         dirPath.getName() == dirName
-//        dirPath.getETag()
+        dirPath.getETag()
         dirPath.getGroup()
         dirPath.getLastModified()
         dirPath.getOwner()
         dirPath.getPermissions()
-//        dirPath.getContentLength()
+//        dirPath.getContentLength() // known issue with service
         dirPath.isDirectory()
 
         response.hasNext()
         def filePath = response.next()
         filePath.getName() == fileName
-//        filePath.getETag()
+        filePath.getETag()
         filePath.getGroup()
         filePath.getLastModified()
         filePath.getOwner()
         filePath.getPermissions()
-//        filePath.getContentLength()
+//        filePath.getContentLength() // known issue with service
         !filePath.isDirectory()
 
         !response.hasNext()

diff --git a/sdk/storage/azure-storage-file-datalake/swagger/README.md b/sdk/storage/azure-storage-file-datalake/swagger/README.md
@@ -148,6 +148,14 @@ directive:
     $.TransactionalContentMD5["x-ms-parameter-grouping"].name = "path-http-headers";
 ```
 
+### Make eTag in Path JsonProperty to etag
+``` yaml
+directive:
+- from: Path.java
+  where: $
+  transform: >
+    return $.replace('@JsonProperty(value = "eTag")\n    private String eTag;', '@JsonProperty(value = "etag")\n    private String eTag;');
+```
 
 ![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fsdk%2Fstorage%2Fazure-storage-file-datalake%2Fswagger%2FREADME.png)