General Core changes before release (Azure#37055)

Author: alzimmermsft

sdk/core/azure-core/src/main/java/com/azure/core/implementation/ImplUtils.java

@@ -384,6 +384,11 @@ public static RetryStrategy getRetryStrategyFromOptions(RetryOptions retryOption
         }
     }
 
+    @SuppressWarnings("unchecked")
+    public static <E extends Throwable> void sneakyThrows(Throwable e) throws E {
+        throw (E) e;
+    }
+
     private ImplUtils() {
     }
 }

sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/rest/AsyncRestProxy.java

@@ -287,6 +287,10 @@ public void updateRequest(RequestDataConfiguration requestDataConfiguration, Ser
         Object bodyContentObject = requestDataConfiguration.getBodyContent();
         SwaggerMethodParser methodParser = requestDataConfiguration.getMethodParser();
 
+        if (bodyContentObject == null) {
+            return;
+        }
+
         // Attempt to use JsonSerializable or XmlSerializable in a separate block.
         if (supportsJsonSerializable(bodyContentObject.getClass())) {
             request.setBody(serializeJsonSerializableToBytes((JsonSerializable<?>) bodyContentObject));

sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/rest/RestProxyBase.java

@@ -409,10 +409,5 @@ static boolean supportsXmlSerializable(Class<?> bodyContentClass) {
     static ByteBuffer serializeAsXmlSerializable(Object bodyContent) throws IOException {
         return ReflectionSerializable.serializeXmlSerializableToByteBuffer(bodyContent);
     }
-
-    @SuppressWarnings("unchecked")
-    static <E extends Exception> void sneakyThrows(Exception e) throws E {
-        throw (E) e;
-    }
 }
 

sdk/core/azure-core/src/main/java/com/azure/core/implementation/http/rest/SyncRestProxy.java

@@ -10,6 +10,7 @@
 import com.azure.core.http.rest.RequestOptions;
 import com.azure.core.http.rest.Response;
 import com.azure.core.http.rest.StreamResponse;
+import com.azure.core.implementation.ImplUtils;
 import com.azure.core.implementation.TypeUtil;
 import com.azure.core.implementation.serializer.HttpResponseDecoder;
 import com.azure.core.util.Base64Url;
@@ -82,7 +83,7 @@ public Object invoke(Object proxy, Method method, RequestOptions options, EnumSe
                 errorOptions);
         } catch (Exception e) {
             tracer.end(null, e, context);
-            sneakyThrows(e);
+            ImplUtils.sneakyThrows(e);
             return null;
         }
     }
@@ -220,6 +221,10 @@ public void updateRequest(RequestDataConfiguration requestDataConfiguration,
         HttpRequest request = requestDataConfiguration.getHttpRequest();
         Object bodyContentObject = requestDataConfiguration.getBodyContent();
 
+        if (bodyContentObject == null) {
+            return;
+        }
+
         // Attempt to use JsonSerializable or XmlSerializable in a separate block.
         if (supportsJsonSerializable(bodyContentObject.getClass())) {
             request.setBody(serializeJsonSerializableToBytes((JsonSerializable<?>) bodyContentObject));

sdk/core/azure-core/src/main/java/com/azure/core/util/CoreUtils.java

@@ -541,24 +541,50 @@ static UUID randomUuid(long msb, long lsb) {
      * Calls {@link Future#get(long, TimeUnit)} and returns the value if the {@code future} completes before the timeout
      * is triggered. If the timeout is triggered, the {@code future} is {@link Future#cancel(boolean) cancelled}
      * interrupting the execution of the task that the {@link Future} represented.
+     * <p>
+     * If the timeout is {@link Duration#isZero()} or is {@link Duration#isNegative()} then the timeout will be ignored
+     * and an infinite timeout will be used.
      *
      * @param <T> The type of value returned by the {@code future}.
      * @param future The {@link Future} to get the value from.
-     * @param timeout The timeout value.
-     * @param unit The {@link TimeUnit} of the timeout value.
+     * @param timeout The timeout value. If the timeout is {@link Duration#isZero()} or is {@link Duration#isNegative()}
+     * then the timeout will be ignored and an infinite timeout will be used.
      * @return The value from the {@code future}.
+     * @throws NullPointerException If {@code future} is null.
      * @throws CancellationException If the computation was cancelled.
      * @throws ExecutionException If the computation threw an exception.
      * @throws InterruptedException If the current thread was interrupted while waiting.
      * @throws TimeoutException If the wait timed out.
+     * @throws RuntimeException If the {@code future} threw an exception during processing.
+     * @throws Error If the {@code future} threw an {@link Error} during processing.
      */
-    public static <T> T getFutureWithCancellation(Future<T> future, long timeout, TimeUnit unit)
+    public static <T> T getResultWithTimeout(Future<T> future, Duration timeout)
         throws InterruptedException, ExecutionException, TimeoutException {
+        Objects.requireNonNull(future, "'future' cannot be null.");
+
+        if (!hasTimeout(timeout)) {
+            return future.get();
+        }
+
         try {
-            return future.get(timeout, unit);
+            return future.get(timeout.toMillis(), TimeUnit.MILLISECONDS);
         } catch (TimeoutException e) {
             future.cancel(true);
             throw e;
+        } catch (ExecutionException e) {
+            Throwable cause = e.getCause();
+            if (cause instanceof Error) {
+                throw (Error) cause;
+            } else if (cause instanceof RuntimeException) {
+                throw (RuntimeException) cause;
+            } else {
+                ImplUtils.sneakyThrows(cause);
+                throw e;
+            }
         }
     }
+
+    private static boolean hasTimeout(Duration timeout) {
+        return timeout != null && !timeout.isZero() && !timeout.isNegative();
+    }
 }

sdk/core/azure-core/src/test/java/com/azure/core/util/CoreUtilsTests.java

@@ -548,7 +548,7 @@ public void futureTimesOutAndIsCancelled() {
             });
 
             try {
-                CoreUtils.getFutureWithCancellation(future, 100, TimeUnit.MILLISECONDS);
+                CoreUtils.getResultWithTimeout(future, Duration.ofMillis(100));
                 fail("Expected future to timout and be cancelled.");
             } catch (TimeoutException e) {
                 // Expected.

sdk/tables/azure-data-tables/src/main/java/com/azure/data/tables/TableClient.java

@@ -66,13 +66,12 @@
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static com.azure.core.util.CoreUtils.getFutureWithCancellation;
+import static com.azure.core.util.CoreUtils.getResultWithTimeout;
 import static com.azure.data.tables.implementation.TableUtils.callWithOptionalTimeout;
 import static com.azure.data.tables.implementation.TableUtils.hasTimeout;
 import static com.azure.data.tables.implementation.TableUtils.mapThrowableToTableServiceException;
@@ -343,8 +342,7 @@ public Response<Void> deleteTableWithResponse(Duration timeout, Context context)
 
         try {
             return hasTimeout(timeout)
-                ? getFutureWithCancellation(THREAD_POOL.submit(callable::get), timeout.toMillis(), TimeUnit.MILLISECONDS)
-                : callable.get();
+                ? getResultWithTimeout(THREAD_POOL.submit(callable::get), timeout) : callable.get();
         } catch (InterruptedException | ExecutionException | TimeoutException ex) {
             throw logger.logExceptionAsError(new RuntimeException(ex));
         } catch (RuntimeException ex) {
@@ -819,8 +817,7 @@ private Response<Void> deleteEntityWithResponse(String partitionKey, String rowK
 
         try {
             return hasTimeout(timeout)
-                ? getFutureWithCancellation(THREAD_POOL.submit(callable::get), timeout.toMillis(), TimeUnit.MILLISECONDS)
-                : callable.get();
+                ? getResultWithTimeout(THREAD_POOL.submit(callable::get), timeout) : callable.get();
         } catch (InterruptedException | ExecutionException | TimeoutException ex) {
             throw logger.logExceptionAsError(new RuntimeException(ex));
         } catch (RuntimeException ex) {
@@ -1542,8 +1539,7 @@ public Response<TableTransactionResult> submitTransactionWithResponse(List<Table
 
         try {
             return hasTimeout(timeout)
-                ? getFutureWithCancellation(THREAD_POOL.submit(callable::get), timeout.toMillis(), TimeUnit.MILLISECONDS)
-                : callable.get();
+                ? getResultWithTimeout(THREAD_POOL.submit(callable::get), timeout) : callable.get();
         } catch (InterruptedException | ExecutionException | TimeoutException ex) {
             throw logger.logExceptionAsError(new RuntimeException(ex));
         } catch (RuntimeException ex) {

sdk/tables/azure-data-tables/src/main/java/com/azure/data/tables/TableServiceClient.java

@@ -43,12 +43,11 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static com.azure.core.util.CoreUtils.getFutureWithCancellation;
+import static com.azure.core.util.CoreUtils.getResultWithTimeout;
 import static com.azure.data.tables.implementation.TableUtils.callWithOptionalTimeout;
 import static com.azure.data.tables.implementation.TableUtils.hasTimeout;
 
@@ -381,8 +380,7 @@ public Response<Void> deleteTableWithResponse(String tableName, Duration timeout
         Supplier<Response<Void>> callable = () -> deleteTableWithResponse(tableName, context);
         try {
             return hasTimeout(timeout)
-                ? getFutureWithCancellation(THREAD_POOL.submit(callable::get), timeout.toMillis(), TimeUnit.MILLISECONDS)
-                : callable.get();
+                ? getResultWithTimeout(THREAD_POOL.submit(callable::get), timeout) : callable.get();
         } catch (InterruptedException | ExecutionException | TimeoutException e) {
             throw logger.logExceptionAsError(new RuntimeException(e));
         } catch (RuntimeException e) {

sdk/tables/azure-data-tables/src/main/java/com/azure/data/tables/implementation/TableUtils.java

@@ -52,7 +52,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static com.azure.core.util.CoreUtils.getFutureWithCancellation;
+import static com.azure.core.util.CoreUtils.getResultWithTimeout;
 import static com.azure.core.util.FluxUtil.monoError;
 import static com.azure.core.util.tracing.Tracer.AZ_TRACING_NAMESPACE_KEY;
 /**
@@ -616,7 +616,7 @@ public static <T> T callWithOptionalTimeout(Supplier<T> callable, ExecutorServic
         ClientLogger logger) {
         try {
             return hasTimeout(timeout)
-                ? getFutureWithCancellation(threadPool.submit(callable::get), timeout.toMillis(), TimeUnit.MILLISECONDS)
+                ? getResultWithTimeout(threadPool.submit(callable::get), timeout)
                 : callable.get();
         } catch (InterruptedException | ExecutionException | TimeoutException ex) {
             throw logger.logExceptionAsError(new RuntimeException(ex));