From 7241857f7f63f635312eb2c7acb21da348ed12de Mon Sep 17 00:00:00 2001 From: Christoph Pirkl <4711730+kaklakariada@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:20:22 +0200 Subject: [PATCH] #269: Remove deprecated methods/fields (#281) --- doc/changes/changes_17.1.0.md | 9 ++++++ .../com/exasol/adapter/AdapterProperties.java | 29 ------------------- .../exasol/adapter/AdapterPropertiesTest.java | 4 +-- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/doc/changes/changes_17.1.0.md b/doc/changes/changes_17.1.0.md index 586152c..6e9c93c 100644 --- a/doc/changes/changes_17.1.0.md +++ b/doc/changes/changes_17.1.0.md @@ -8,6 +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`: +* 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` 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..c5d561e 100644 --- a/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java +++ b/src/test/java/com/exasol/adapter/AdapterPropertiesTest.java @@ -30,10 +30,8 @@ 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 }) + DEBUG_ADDRESS_PROPERTY, LOG_LEVEL_PROPERTY, EXCLUDED_CAPABILITIES_PROPERTY }) @ParameterizedTest void testGetStringProperty(final String property) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {