Change properties names

Author: Grzegorz Kołakowski

src/main/java/com/getindata/connectors/http/internal/sink/httpclient/JavaNetSinkHttpClient.java

@@ -61,12 +61,12 @@ public JavaNetSinkHttpClient(
         ComposeHttpStatusCodeCheckerConfig checkerConfig =
             ComposeHttpStatusCodeCheckerConfig.builder()
                 .properties(properties)
-                .deprecatedErrorWhiteListPrefix(HTTP_ERROR_SINK_CODE_WHITE_LIST)
-                .deprecatedCodePrefix(HTTP_ERROR_SINK_CODES_LIST)
-                .errorWhiteListPrefix("")      // TODO: sink not refactored yet
-                .errorCodePrefix("")
-                .retryableWhiteListPrefix("")
-                .retryableCodePrefix("")
+                .errorWhiteListPrefix(HTTP_ERROR_SINK_CODE_WHITE_LIST)
+                .errorCodePrefix(HTTP_ERROR_SINK_CODES_LIST)
+                .nonRetryableErrorWhiteListPrefix("")      // TODO: sink not refactored yet
+                .nonRetryableErrorCodePrefix("")
+                .retryableErrorWhiteListPrefix("")
+                .retryableErrorCodePrefix("")
                 .build();
 
         this.statusCodeChecker = new ComposeHttpStatusCodeChecker(checkerConfig);

src/main/java/com/getindata/connectors/http/internal/status/ComposeHttpStatusCodeChecker.java

@@ -36,26 +36,26 @@ public class ComposeHttpStatusCodeChecker implements HttpStatusCodeChecker {
     public ComposeHttpStatusCodeChecker(ComposeHttpStatusCodeCheckerConfig config) {
         // Handle deprecated configuration for backward compatibility.
         if (areDeprecatedPropertiesUsed(config)) {
-            notRetryableErrorStatusCodes = buildPredicate(config, config.getDeprecatedCodePrefix(),
-                config.getDeprecatedErrorWhiteListPrefix(), DEFAULT_DEPRECATED_ERROR_CODES);
+            notRetryableErrorStatusCodes = buildPredicate(config, config.getErrorCodePrefix(),
+                config.getErrorWhiteListPrefix(), DEFAULT_DEPRECATED_ERROR_CODES);
             retryableErrorStatusCodes = integer -> false;
         } else {
-            retryableErrorStatusCodes = buildPredicate(config, config.getRetryableCodePrefix(),
-                config.getRetryableWhiteListPrefix(), DEFAULT_RETRYABLE_ERROR_CODES);
-            notRetryableErrorStatusCodes = buildPredicate(config, config.getErrorCodePrefix(),
-                config.getErrorWhiteListPrefix(), DEFAULT_ERROR_CODES);
+            retryableErrorStatusCodes = buildPredicate(config, config.getRetryableErrorCodePrefix(),
+                config.getRetryableErrorWhiteListPrefix(), DEFAULT_RETRYABLE_ERROR_CODES);
+            notRetryableErrorStatusCodes =
+                buildPredicate(config, config.getNonRetryableErrorCodePrefix(),
+                    config.getNonRetryableErrorWhiteListPrefix(), DEFAULT_ERROR_CODES);
         }
     }
 
     private boolean areDeprecatedPropertiesUsed(ComposeHttpStatusCodeCheckerConfig config) {
-        boolean whiteListDefined =
-            !isNullOrWhitespaceOnly(config.getDeprecatedErrorWhiteListPrefix());
-        boolean codeListDefined = !isNullOrWhitespaceOnly(config.getDeprecatedCodePrefix());
+        boolean whiteListDefined = !isNullOrWhitespaceOnly(config.getErrorWhiteListPrefix());
+        boolean codeListDefined = !isNullOrWhitespaceOnly(config.getErrorCodePrefix());
 
         return (whiteListDefined && !isNullOrWhitespaceOnly(
-            config.getProperties().getProperty(config.getDeprecatedErrorWhiteListPrefix())))
-            || (codeListDefined && !isNullOrWhitespaceOnly(
-            config.getProperties().getProperty(config.getDeprecatedCodePrefix())));
+            config.getProperties().getProperty(config.getErrorWhiteListPrefix()))) ||
+            (codeListDefined && !isNullOrWhitespaceOnly(
+                config.getProperties().getProperty(config.getErrorCodePrefix())));
     }
 
     private Predicate<Integer> buildPredicate(
@@ -157,17 +157,17 @@ public HttpResponseStatus checkStatus(int statusCode) {
     @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
     public static class ComposeHttpStatusCodeCheckerConfig {
 
-        private final String deprecatedErrorWhiteListPrefix;
-
-        private final String deprecatedCodePrefix;
-
         private final String errorWhiteListPrefix;
 
         private final String errorCodePrefix;
 
-        private final String retryableWhiteListPrefix;
+        private final String nonRetryableErrorWhiteListPrefix;
+
+        private final String nonRetryableErrorCodePrefix;
+
+        private final String retryableErrorWhiteListPrefix;
 
-        private final String retryableCodePrefix;
+        private final String retryableErrorCodePrefix;
 
         private final Properties properties;
     }

src/main/java/com/getindata/connectors/http/internal/table/lookup/JavaNetHttpPollingClient.java

@@ -79,12 +79,13 @@ public JavaNetHttpPollingClient(
         ComposeHttpStatusCodeCheckerConfig checkerConfig =
             ComposeHttpStatusCodeCheckerConfig.builder()
                 .properties(options.getProperties())
-                .deprecatedErrorWhiteListPrefix(HTTP_ERROR_SOURCE_LOOKUP_CODE_WHITE_LIST)
-                .deprecatedCodePrefix(HTTP_ERROR_SOURCE_LOOKUP_CODES_LIST)
-                .errorWhiteListPrefix(HTTP_ERROR_NON_RETRYABLE_SOURCE_LOOKUP_CODE_WHITE_LIST)
-                .errorCodePrefix(HTTP_ERROR_NON_RETRYABLE_SOURCE_LOOKUP_CODES_LIST)
-                .retryableWhiteListPrefix(HTTP_ERROR_RETRYABLE_SOURCE_LOOKUP_CODE_WHITE_LIST)
-                .retryableCodePrefix(HTTP_ERROR_RETRYABLE_SOURCE_LOOKUP_CODES_LIST)
+                .errorWhiteListPrefix(HTTP_ERROR_SOURCE_LOOKUP_CODE_WHITE_LIST)
+                .errorCodePrefix(HTTP_ERROR_SOURCE_LOOKUP_CODES_LIST)
+                .nonRetryableErrorWhiteListPrefix(
+                    HTTP_ERROR_NON_RETRYABLE_SOURCE_LOOKUP_CODE_WHITE_LIST)
+                .nonRetryableErrorCodePrefix(HTTP_ERROR_NON_RETRYABLE_SOURCE_LOOKUP_CODES_LIST)
+                .retryableErrorWhiteListPrefix(HTTP_ERROR_RETRYABLE_SOURCE_LOOKUP_CODE_WHITE_LIST)
+                .retryableErrorCodePrefix(HTTP_ERROR_RETRYABLE_SOURCE_LOOKUP_CODES_LIST)
                 .build();
 
         this.statusCodeChecker = new ComposeHttpStatusCodeChecker(checkerConfig);

src/test/java/com/getindata/connectors/http/internal/status/ComposeHttpStatusCodeCheckerTest.java

@@ -184,10 +184,10 @@ void shouldThrowOnInvalidCodeRangeInRetryableError(String listCode) {
     private ComposeHttpStatusCodeCheckerConfig prepareCheckerConfig(Properties properties) {
         return ComposeHttpStatusCodeCheckerConfig.builder()
             .properties(properties)
-            .errorCodePrefix(NOT_RETRYABLE_CODE_PROPERTY)
-            .errorWhiteListPrefix(NOT_RETRYABLE_WHITELIST_PROPERTY)
-            .retryableCodePrefix(RETRYABLE_CODE_PROPERTY)
-            .retryableWhiteListPrefix(RETRYABLE_WHITELIST_PROPERTY)
+            .nonRetryableErrorCodePrefix(NOT_RETRYABLE_CODE_PROPERTY)
+            .nonRetryableErrorWhiteListPrefix(NOT_RETRYABLE_WHITELIST_PROPERTY)
+            .retryableErrorCodePrefix(RETRYABLE_CODE_PROPERTY)
+            .retryableErrorWhiteListPrefix(RETRYABLE_WHITELIST_PROPERTY)
             .build();
     }
 }