Iterating on the approach to avoid hangs during Accessor initializati…

…on (#28961)

* Iterating on the approach to avoid hangs during Accessor initialization

* Updating changelogs

* Update ImplementationBridgeHelpers.java

sdk/cosmos/azure-cosmos-spark_3-1_2-12/CHANGELOG.md

@@ -8,7 +8,7 @@
 
 #### Bugs Fixed
 * Fixed an issue with creating new Throughput control client item when `enableThroughputControlGroup` is being called multiple times with the same throughput control group. - See [PR 28905](https://github.com/Azure/azure-sdk-for-java/pull/28905)
-* Fixed a possible dead-lock on static ctor for CosmosException when the runtime is using custom class loaders. - See [PR 28912](https://github.com/Azure/azure-sdk-for-java/pull/28912)
+* Fixed a possible dead-lock on static ctor for CosmosException when the runtime is using custom class loaders. - See [PR 28912](https://github.com/Azure/azure-sdk-for-java/pull/28912) and [PR 28961](https://github.com/Azure/azure-sdk-for-java/pull/28961)
 
 #### Other Changes
 * Changed 429 (Throttling) retry policy to have an upper bound for the back-off time of 5 seconds - See [PR 28764](https://github.com/Azure/azure-sdk-for-java/pull/28764)

sdk/cosmos/azure-cosmos-spark_3-2_2-12/CHANGELOG.md

@@ -8,7 +8,7 @@
 
 #### Bugs Fixed
 * Fixed an issue with creating new Throughput control client item when `enableThroughputControlGroup` is being called multiple times with the same throughput control group. - See [PR 28905](https://github.com/Azure/azure-sdk-for-java/pull/28905)
-* Fixed a possible dead-lock on static ctor for CosmosException when the runtime is using custom class loaders. - See [PR 28912](https://github.com/Azure/azure-sdk-for-java/pull/28912)
+* Fixed a possible dead-lock on static ctor for CosmosException when the runtime is using custom class loaders. - See [PR 28912](https://github.com/Azure/azure-sdk-for-java/pull/28912) and [PR 28961](https://github.com/Azure/azure-sdk-for-java/pull/28961)
 
 #### Other Changes
 * Changed 429 (Throttling) retry policy to have an upper bound for the back-off time of 5 seconds - See [PR 28764](https://github.com/Azure/azure-sdk-for-java/pull/28764)

sdk/cosmos/azure-cosmos/CHANGELOG.md

@@ -9,7 +9,7 @@
 #### Bugs Fixed
 * Fixed bubbling of Errors in case of any `java.lang.Error` - See [PR 28620](https://github.com/Azure/azure-sdk-for-java/pull/28620)
 * Fixed an issue with creating new Throughput control client item when `enableThroughputControlGroup` is being called multiple times with the same throughput control group. - See [PR 28905](https://github.com/Azure/azure-sdk-for-java/pull/28905)
-* Fixed a possible dead-lock on static ctor for CosmosException when the runtime is using custom class loaders. - See [PR 28912](https://github.com/Azure/azure-sdk-for-java/pull/28912)
+* Fixed a possible dead-lock on static ctor for CosmosException when the runtime is using custom class loaders. - See [PR 28912](https://github.com/Azure/azure-sdk-for-java/pull/28912) and [PR 28961](https://github.com/Azure/azure-sdk-for-java/pull/28961) 
 
 #### Other Changes
 * Added `exceptionMessage` and `exceptionResponseHeaders` to `CosmosDiagnostics` in case of any exceptions - See [PR 28620](https://github.com/Azure/azure-sdk-for-java/pull/28620)

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClientEncryptionKey.java

@@ -111,19 +111,15 @@ String getLink() {
     }
 
     /**
-     * Should not be called form user-code. This method is a no-op and is just used internally
+     * Should not be called from user-code. This method is a no-op and is just used internally
      * to force loading this class
      */
-    public static void doNothingButEnsureLoadingClass() {}
+    public static void doNothingButEnsureLoadingClass() { initialize(); }
 
-    static {
+    private static void initialize() {
         ImplementationBridgeHelpers.CosmosAsyncClientEncryptionKeyHelper.setCosmosAsyncClientEncryptionKeyAccessor(
-            new ImplementationBridgeHelpers.CosmosAsyncClientEncryptionKeyHelper.CosmosAsyncClientEncryptionKeyAccessor() {
-
-                @Override
-                public Mono<CosmosClientEncryptionKeyResponse> readClientEncryptionKey(CosmosAsyncClientEncryptionKey cosmosAsyncClientEncryptionKey, RequestOptions requestOptions) {
-                    return cosmosAsyncClientEncryptionKey.read(requestOptions);
-                }
-            });
+            (cosmosAsyncClientEncryptionKey, requestOptions) -> cosmosAsyncClientEncryptionKey.read(requestOptions));
     }
+
+    static { initialize(); }
 }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncContainer.java

@@ -1721,20 +1721,15 @@ public void enableGlobalThroughputControlGroup(
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Should not be called form user-code. This method is a no-op and is just used internally
+     * Should not be called from user-code. This method is a no-op and is just used internally
      * to force loading this class
      */
-    public static void doNothingButEnsureLoadingClass() {}
+    public static void doNothingButEnsureLoadingClass() { initialize(); }
 
-    static {
+    private static void initialize() {
         ImplementationBridgeHelpers.CosmosAsyncContainerHelper.setCosmosAsyncContainerAccessor(
-            new ImplementationBridgeHelpers.CosmosAsyncContainerHelper.CosmosAsyncContainerAccessor() {
-                @Override
-                public <T> Function<CosmosPagedFluxOptions, Flux<FeedResponse<T>>> queryChangeFeedInternalFunc(CosmosAsyncContainer cosmosAsyncContainer,
-                                                                                                               CosmosChangeFeedRequestOptions cosmosChangeFeedRequestOptions,
-                                                                                                               Class<T> classType) {
-                    return cosmosAsyncContainer.queryChangeFeedInternalFunc(cosmosChangeFeedRequestOptions, classType);
-                }
-            });
+            CosmosAsyncContainer::queryChangeFeedInternalFunc);
     }
+
+    static { initialize(); }
 }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java

@@ -1080,12 +1080,12 @@ private Mono<ThroughputResponse> readThroughputInternal(Mono<CosmosDatabaseRespo
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Should not be called form user-code. This method is a no-op and is just used internally
+     * Should not be called from user-code. This method is a no-op and is just used internally
      * to force loading this class
      */
-    public static void doNothingButEnsureLoadingClass() {}
+    public static void doNothingButEnsureLoadingClass() { initialize(); }
 
-    static {
+    private static void initialize() {
         ImplementationBridgeHelpers.CosmosAsyncDatabaseHelper.setCosmosAsyncDatabaseAccessor(
             new ImplementationBridgeHelpers.CosmosAsyncDatabaseHelper.CosmosAsyncDatabaseAccessor() {
 
@@ -1100,4 +1100,6 @@ public String getLink(CosmosAsyncDatabase cosmosAsyncDatabase) {
                 }
             });
     }
+
+    static { initialize(); }
 }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClient.java

@@ -229,13 +229,15 @@ public GlobalThroughputControlConfigBuilder createGlobalThroughputControlConfigB
     }
 
     /**
-     * Should not be called form user-code. This method is a no-op and is just used internally
+     * Should not be called from user-code. This method is a no-op and is just used internally
      * to force loading this class
      */
-    public static void doNothingButEnsureLoadingClass() {}
+    public static void doNothingButEnsureLoadingClass() { initialize(); }
 
-    static {
+    private static void initialize() {
         ImplementationBridgeHelpers.CosmosClientHelper.setCosmosClientAccessor(
             cosmosClient -> cosmosClient.asyncClient());
     }
+
+    static { initialize(); }
 }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosClientBuilder.java

@@ -862,12 +862,12 @@ private void ifThrowIllegalArgException(boolean value, String error) {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Should not be called form user-code. This method is a no-op and is just used internally
+     * Should not be called from user-code. This method is a no-op and is just used internally
      * to force loading this class
      */
-    public static void doNothingButEnsureLoadingClass() {}
+    public static void doNothingButEnsureLoadingClass() { initialize(); }
 
-    static {
+    private static void initialize() {
         CosmosClientBuilderHelper.setCosmosClientBuilderAccessor(
             new CosmosClientBuilderHelper.CosmosClientBuilderAccessor() {
 
@@ -908,4 +908,6 @@ public ConsistencyLevel getConsistencyLevel(CosmosClientBuilder builder) {
                 }
             });
     }
+
+    static { initialize(); }
 }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosDiagnostics.java

@@ -163,12 +163,12 @@ private AtomicBoolean isDiagnosticsCapturedInPagedFlux(){
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Should not be called form user-code. This method is a no-op and is just used internally
+     * Should not be called from user-code. This method is a no-op and is just used internally
      * to force loading this class
      */
-    public static void doNothingButEnsureLoadingClass() {}
+    public static void doNothingButEnsureLoadingClass() { initialize(); }
 
-    static {
+    private static void initialize() {
         ImplementationBridgeHelpers.CosmosDiagnosticsHelper.setCosmosDiagnosticsAccessor(
             new ImplementationBridgeHelpers.CosmosDiagnosticsHelper.CosmosDiagnosticsAccessor() {
                 @Override
@@ -190,4 +190,6 @@ public AtomicBoolean isDiagnosticsCapturedInPagedFlux(CosmosDiagnostics cosmosDi
                 }
             });
     }
+
+    static { initialize(); }
 }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosException.java

@@ -547,19 +547,15 @@ void setRntbdPendingRequestQueueSize(int rntbdPendingRequestQueueSize) {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Should not be called form user-code. This method is a no-op and is just used internally
+     * Should not be called from user-code. This method is a no-op and is just used internally
      * to force loading this class
      */
-    public static void doNothingButEnsureLoadingClass() {}
+    public static void doNothingButEnsureLoadingClass() { initialize(); }
 
-    static {
+    private static void initialize() {
         ImplementationBridgeHelpers.CosmosExceptionHelper.setCosmosExceptionAccessor(
-            new ImplementationBridgeHelpers.CosmosExceptionHelper.CosmosExceptionAccessor() {
-
-                @Override
-                public CosmosException createCosmosException(int statusCode, Exception innerException) {
-                    return new CosmosException(statusCode, innerException);
-                }
-            });
+            (statusCode, innerException) -> new CosmosException(statusCode, innerException));
     }
+
+    static { initialize(); }
 }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/DirectConnectionConfig.java

@@ -317,12 +317,12 @@ public String toString() {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     /**
-     * Should not be called form user-code. This method is a no-op and is just used internally
+     * Should not be called from user-code. This method is a no-op and is just used internally
      * to force loading this class
      */
-    public static void doNothingButEnsureLoadingClass() {}
+    public static void doNothingButEnsureLoadingClass() { initialize(); }
 
-    static {
+    private static void initialize() {
         ImplementationBridgeHelpers.DirectConnectionConfigHelper.setDirectConnectionConfigAccessor(
             new ImplementationBridgeHelpers.DirectConnectionConfigHelper.DirectConnectionConfigAccessor() {
                 @Override
@@ -348,4 +348,6 @@ public DirectConnectionConfig setIoThreadPriority(DirectConnectionConfig config,
                 }
             });
     }
+
+    static { initialize(); }
 }