From eeff477700e425092c8cba826ac602393a9902e2 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Mon, 22 Apr 2024 15:53:06 +0200 Subject: [PATCH 1/3] #269: Remove deprecated methods/fields --- doc/changes/changes_17.1.0.md | 7 +++++ .../com/exasol/adapter/AdapterProperties.java | 29 ------------------- .../exasol/adapter/AdapterPropertiesTest.java | 2 -- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/doc/changes/changes_17.1.0.md b/doc/changes/changes_17.1.0.md index 586152c..a0d5ef8 100644 --- a/doc/changes/changes_17.1.0.md +++ b/doc/changes/changes_17.1.0.md @@ -8,6 +8,13 @@ This release adds support for scalar function [`WIDTH_BUCKET`](https://docs.exas * `ScalarFunctionCapability.WIDTH_BUCKET` * `ScalarFunction.WIDTH_BUCKET` +## Breaking Changes + +This release removes the following deprecated fields/methods from class `com.exasol.adapter.AdapterProperties`: +* Constant `EXCEPTION_HANDLING_PROPERTY` +* Method `getExceptionHandling()` +* Method `hasExceptionHandling()` + ## Features * #278: Added support for scalar function `WIDTH_BUCKET` diff --git a/src/main/java/com/exasol/adapter/AdapterProperties.java b/src/main/java/com/exasol/adapter/AdapterProperties.java index 2f1ba18..4bad7bb 100644 --- a/src/main/java/com/exasol/adapter/AdapterProperties.java +++ b/src/main/java/com/exasol/adapter/AdapterProperties.java @@ -39,13 +39,6 @@ public class AdapterProperties extends AbstractAdapterProperties { * The constant EXCLUDED_CAPABILITIES_PROPERTY. */ public static final String EXCLUDED_CAPABILITIES_PROPERTY = "EXCLUDED_CAPABILITIES"; - /** - * The constant EXCEPTION_HANDLING_PROPERTY. - * - * @deprecated this will be removed in the next release - */ - @Deprecated(forRemoval = true) - public static final String EXCEPTION_HANDLING_PROPERTY = "EXCEPTION_HANDLING"; /** * The constant IGNORE_ERRORS_PROPERTY. */ @@ -114,17 +107,6 @@ public String getExcludedCapabilities() { return get(EXCLUDED_CAPABILITIES_PROPERTY); } - /** - * Get the exception handling - * - * @return exception handling - * @deprecated this will be removed in the next release - */ - @Deprecated(forRemoval = true) - public String getExceptionHandling() { - return get(EXCEPTION_HANDLING_PROPERTY); - } - /** * Get the list of ignored errors * @@ -229,17 +211,6 @@ public boolean hasExcludedCapabilities() { return containsKey(EXCLUDED_CAPABILITIES_PROPERTY); } - /** - * Check if the exception handling property is set - * - * @return true if exception handling property is set - * @deprecated this will be removed in the next release - */ - @Deprecated(forRemoval = true) - public boolean hasExceptionHandling() { - return containsKey(EXCEPTION_HANDLING_PROPERTY); - } - /** * Check if the ignore errors property is set * diff --git a/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java b/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java index 858f1c1..afb6f2c 100644 --- a/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java +++ b/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java @@ -30,8 +30,6 @@ void testEmptyProperties() { assertThat(AdapterProperties.emptyProperties(), equalTo(new AdapterProperties(Collections.emptyMap()))); } - @SuppressWarnings("removal") // EXCEPTION_HANDLING_PROPERTY will be removed in - // https://github.com/exasol/virtual-schema-common-java/issues/269 @ValueSource(strings = { CATALOG_NAME_PROPERTY, SCHEMA_NAME_PROPERTY, CONNECTION_NAME_PROPERTY, DEBUG_ADDRESS_PROPERTY, LOG_LEVEL_PROPERTY, EXCLUDED_CAPABILITIES_PROPERTY, EXCEPTION_HANDLING_PROPERTY }) @ParameterizedTest From fbe460dbc7dc6b42d7ad821b69d456688e188e38 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Mon, 22 Apr 2024 15:54:11 +0200 Subject: [PATCH 2/3] Fix test case --- src/test/java/com/exasol/adapter/AdapterPropertiesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java b/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java index afb6f2c..c5d561e 100644 --- a/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java +++ b/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java @@ -31,7 +31,7 @@ void testEmptyProperties() { } @ValueSource(strings = { CATALOG_NAME_PROPERTY, SCHEMA_NAME_PROPERTY, CONNECTION_NAME_PROPERTY, - DEBUG_ADDRESS_PROPERTY, LOG_LEVEL_PROPERTY, EXCLUDED_CAPABILITIES_PROPERTY, EXCEPTION_HANDLING_PROPERTY }) + DEBUG_ADDRESS_PROPERTY, LOG_LEVEL_PROPERTY, EXCLUDED_CAPABILITIES_PROPERTY }) @ParameterizedTest void testGetStringProperty(final String property) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException { From 159716bf408ef57892744ec548554fd926b80ccc Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Mon, 22 Apr 2024 15:55:50 +0200 Subject: [PATCH 3/3] Improve changelog entry --- doc/changes/changes_17.1.0.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/changes/changes_17.1.0.md b/doc/changes/changes_17.1.0.md index a0d5ef8..6e9c93c 100644 --- a/doc/changes/changes_17.1.0.md +++ b/doc/changes/changes_17.1.0.md @@ -8,13 +8,15 @@ This release adds support for scalar function [`WIDTH_BUCKET`](https://docs.exas * `ScalarFunctionCapability.WIDTH_BUCKET` * `ScalarFunction.WIDTH_BUCKET` -## Breaking Changes - -This release removes the following deprecated fields/methods from class `com.exasol.adapter.AdapterProperties`: +**Breaking Changes:** This release removes the following deprecated fields/methods from class `com.exasol.adapter.AdapterProperties`: * Constant `EXCEPTION_HANDLING_PROPERTY` * Method `getExceptionHandling()` * Method `hasExceptionHandling()` +## Breaking Changes + +* #269: Removed deprecated exception handling fields/methods from `AdapterProperties` + ## Features * #278: Added support for scalar function `WIDTH_BUCKET`