From ee320ed4972e9a462a43b0133a8c8fbc12e6db95 Mon Sep 17 00:00:00 2001 From: Connie Date: Wed, 25 Sep 2019 13:59:39 -0700 Subject: [PATCH 1/2] Rename from values to getValues() --- .../src/main/java/com/azure/core/util/ExpandableStringEnum.java | 2 +- .../src/main/java/com/azure/storage/blob/models/AccessTier.java | 2 +- .../java/com/azure/storage/blob/models/AccessTierOptional.java | 2 +- .../java/com/azure/storage/blob/models/AccessTierRequired.java | 2 +- .../main/java/com/azure/storage/blob/models/ArchiveStatus.java | 2 +- .../com/azure/storage/blob/models/GeoReplicationStatusType.java | 2 +- .../java/com/azure/storage/blob/models/PublicAccessType.java | 2 +- .../java/com/azure/storage/blob/models/RehydratePriority.java | 2 +- .../java/com/azure/storage/blob/models/StorageErrorCode.java | 2 +- .../java/com/azure/storage/file/models/StorageErrorCode.java | 2 +- .../azure/storage/queue/models/GeoReplicationStatusType.java | 2 +- .../java/com/azure/storage/queue/models/StorageErrorCode.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java index 075bbbd22a92..8fdd07774ad8 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/util/ExpandableStringEnum.java @@ -72,7 +72,7 @@ protected static > T fromString(String name, C * @return a collection of all known values */ @SuppressWarnings("unchecked") - protected static > Collection values(Class clazz) { + protected static > Collection getValues(Class clazz) { // Make a copy of all values Collection> values = new ArrayList<>(VALUES_BY_NAME.values()); diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTier.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTier.java index fafe6d2eb7ef..40e95349f1cb 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTier.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTier.java @@ -97,6 +97,6 @@ public static AccessTier fromString(String name) { * @return known AccessTier values. */ public static Collection values() { - return values(AccessTier.class); + return getValues(AccessTier.class); } } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java index ce8e818b1d48..ecf298789d3d 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierOptional.java @@ -97,6 +97,6 @@ public static AccessTierOptional fromString(String name) { * @return known AccessTierOptional values. */ public static Collection values() { - return values(AccessTierOptional.class); + return getValues(AccessTierOptional.class); } } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java index 82401f54ff9e..1d18454546e0 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/AccessTierRequired.java @@ -97,6 +97,6 @@ public static AccessTierRequired fromString(String name) { * @return known AccessTierRequired values. */ public static Collection values() { - return values(AccessTierRequired.class); + return getValues(AccessTierRequired.class); } } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ArchiveStatus.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ArchiveStatus.java index 5bf03bde28df..dce3b1c2ad0f 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ArchiveStatus.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/ArchiveStatus.java @@ -37,6 +37,6 @@ public static ArchiveStatus fromString(String name) { * @return known ArchiveStatus values. */ public static Collection values() { - return values(ArchiveStatus.class); + return getValues(ArchiveStatus.class); } } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/GeoReplicationStatusType.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/GeoReplicationStatusType.java index e459bc355f7b..14304e34a89c 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/GeoReplicationStatusType.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/GeoReplicationStatusType.java @@ -42,6 +42,6 @@ public static GeoReplicationStatusType fromString(String name) { * @return known GeoReplicationStatusType values. */ public static Collection values() { - return values(GeoReplicationStatusType.class); + return getValues(GeoReplicationStatusType.class); } } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PublicAccessType.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PublicAccessType.java index 6bc958765fb8..6aaa61ea66a4 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PublicAccessType.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/PublicAccessType.java @@ -37,6 +37,6 @@ public static PublicAccessType fromString(String name) { * @return known PublicAccessType values. */ public static Collection values() { - return values(PublicAccessType.class); + return getValues(PublicAccessType.class); } } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java index 8fc928767f37..82a64a0b8a92 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/RehydratePriority.java @@ -37,6 +37,6 @@ public static RehydratePriority fromString(String name) { * @return known RehydratePriority values. */ public static Collection values() { - return values(RehydratePriority.class); + return getValues(RehydratePriority.class); } } diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java index 5ef1a7209dee..1a767328daec 100644 --- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java +++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/models/StorageErrorCode.java @@ -552,6 +552,6 @@ public static StorageErrorCode fromString(String name) { * @return known StorageErrorCode values. */ public static Collection values() { - return values(StorageErrorCode.class); + return getValues(StorageErrorCode.class); } } diff --git a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/models/StorageErrorCode.java b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/models/StorageErrorCode.java index 682ff493c191..57bc057bd27c 100644 --- a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/models/StorageErrorCode.java +++ b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/models/StorageErrorCode.java @@ -327,6 +327,6 @@ public static StorageErrorCode fromString(String name) { * @return known StorageErrorCode values. */ public static Collection values() { - return values(StorageErrorCode.class); + return getValues(StorageErrorCode.class); } } diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/GeoReplicationStatusType.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/GeoReplicationStatusType.java index 0238afe0211e..ce1d30930e7c 100644 --- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/GeoReplicationStatusType.java +++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/GeoReplicationStatusType.java @@ -42,6 +42,6 @@ public static GeoReplicationStatusType fromString(String name) { * @return known GeoReplicationStatusType values. */ public static Collection values() { - return values(GeoReplicationStatusType.class); + return getValues(GeoReplicationStatusType.class); } } diff --git a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java index dfa27d5fed94..b4123b8f1efd 100644 --- a/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java +++ b/sdk/storage/azure-storage-queue/src/main/java/com/azure/storage/queue/models/StorageErrorCode.java @@ -282,6 +282,6 @@ public static StorageErrorCode fromString(String name) { * @return known StorageErrorCode values. */ public static Collection values() { - return values(StorageErrorCode.class); + return getValues(StorageErrorCode.class); } } From c3b970b14dfb479fe14ba641b8e460f7488b14c7 Mon Sep 17 00:00:00 2001 From: Connie Date: Wed, 25 Sep 2019 14:06:04 -0700 Subject: [PATCH 2/2] Rename parameter. --- .../java/com/azure/core/credentials/SimpleTokenCache.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java index 53f5b9e2c778..69fa4f683d2e 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/credentials/SimpleTokenCache.java @@ -26,11 +26,11 @@ public class SimpleTokenCache { /** * Creates an instance of RefreshableTokenCredential with default scheme "Bearer". * - * @param getNew a method to get a new token + * @param tokenSupplier a method to get a new token */ - public SimpleTokenCache(Supplier> getNew) { + public SimpleTokenCache(Supplier> tokenSupplier) { this.wip = new AtomicBoolean(false); - this.getNew = getNew; + this.getNew = tokenSupplier; } /**