>From Michael Blow <[email protected]>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19416 )
Change subject: [NO ISSUE][*DB][MISC] Updates to accommodate Java 21 ...................................................................... [NO ISSUE][*DB][MISC] Updates to accommodate Java 21 - Update javaparser plugin for Java 21 - Update azure utils validation to accommodate Java 21 In Java 21, the URL ctor does (additional) validation of the URL than was done previously- update the adapter setup logic to accommodate failures when setting a malformed URL on the client builder Ext-ref: MB-65321 Change-Id: I31ef40ad04861b7d45f661bcc5550687272f4b8e Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19416 Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Michael Blow <[email protected]> --- M asterixdb/pom.xml M asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureUtils.java M hyracks-fullstack/pom.xml 3 files changed, 32 insertions(+), 4 deletions(-) Approvals: Hussain Towaileb: Looks good to me, approved Michael Blow: Verified diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureUtils.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureUtils.java index 0dc9ad2..13480fd 100644 --- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureUtils.java +++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/azure/blob_storage/AzureUtils.java @@ -118,7 +118,11 @@ if (endpoint == null) { throw new CompilationException(PARAMETERS_REQUIRED, ENDPOINT_FIELD_NAME); } - builder.endpoint(endpoint); + try { + builder.endpoint(endpoint); + } catch (Exception ex) { + throw new CompilationException(ErrorCode.EXTERNAL_SOURCE_ERROR, ex, getMessageOrToString(ex)); + } // Shared Key if (accountName != null || accountKey != null) { @@ -271,7 +275,11 @@ if (endpoint == null) { throw new CompilationException(PARAMETERS_REQUIRED, ENDPOINT_FIELD_NAME); } - builder.endpoint(endpoint); + try { + builder.endpoint(endpoint); + } catch (Exception ex) { + throw new CompilationException(ErrorCode.EXTERNAL_SOURCE_ERROR, ex, getMessageOrToString(ex)); + } // Shared Key if (accountName != null || accountKey != null) { diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index e4d9a26..7799ddc 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -660,7 +660,7 @@ <dependency> <groupId>com.github.javaparser</groupId> <artifactId>javaparser-core</artifactId> - <version>3.25.5</version> + <version>3.26.3</version> </dependency> </dependencies> </plugin> diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 66b4ebb..1b65a1b 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -775,7 +775,7 @@ <dependency> <groupId>com.github.javaparser</groupId> <artifactId>javaparser-core</artifactId> - <version>3.25.5</version> + <version>3.26.3</version> </dependency> </dependencies> </plugin> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19416 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: morpheus Gerrit-Change-Id: I31ef40ad04861b7d45f661bcc5550687272f4b8e Gerrit-Change-Number: 19416 Gerrit-PatchSet: 4 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Hussain Towaileb <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-MessageType: merged
