Skip to content

Commit 271f382

Browse files
author
Grzegorz Kołakowski
committed
Change properties names
1 parent 2589b95 commit 271f382

File tree

4 files changed

+35
-34
lines changed

4 files changed

+35
-34
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ public JavaNetSinkHttpClient(
6161
ComposeHttpStatusCodeCheckerConfig checkerConfig =
6262
ComposeHttpStatusCodeCheckerConfig.builder()
6363
.properties(properties)
64-
.deprecatedErrorWhiteListPrefix(HTTP_ERROR_SINK_CODE_WHITE_LIST)
65-
.deprecatedCodePrefix(HTTP_ERROR_SINK_CODES_LIST)
66-
.errorWhiteListPrefix("") // TODO: sink not refactored yet
67-
.errorCodePrefix("")
68-
.retryableWhiteListPrefix("")
69-
.retryableCodePrefix("")
64+
.errorWhiteListPrefix(HTTP_ERROR_SINK_CODE_WHITE_LIST)
65+
.errorCodePrefix(HTTP_ERROR_SINK_CODES_LIST)
66+
.nonRetryableErrorWhiteListPrefix("") // TODO: sink not refactored yet
67+
.nonRetryableErrorCodePrefix("")
68+
.retryableErrorWhiteListPrefix("")
69+
.retryableErrorCodePrefix("")
7070
.build();
7171

7272
this.statusCodeChecker = new ComposeHttpStatusCodeChecker(checkerConfig);

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@ public class ComposeHttpStatusCodeChecker implements HttpStatusCodeChecker {
3636
public ComposeHttpStatusCodeChecker(ComposeHttpStatusCodeCheckerConfig config) {
3737
// Handle deprecated configuration for backward compatibility.
3838
if (areDeprecatedPropertiesUsed(config)) {
39-
notRetryableErrorStatusCodes = buildPredicate(config, config.getDeprecatedCodePrefix(),
40-
config.getDeprecatedErrorWhiteListPrefix(), DEFAULT_DEPRECATED_ERROR_CODES);
39+
notRetryableErrorStatusCodes = buildPredicate(config, config.getErrorCodePrefix(),
40+
config.getErrorWhiteListPrefix(), DEFAULT_DEPRECATED_ERROR_CODES);
4141
retryableErrorStatusCodes = integer -> false;
4242
} else {
43-
retryableErrorStatusCodes = buildPredicate(config, config.getRetryableCodePrefix(),
44-
config.getRetryableWhiteListPrefix(), DEFAULT_RETRYABLE_ERROR_CODES);
45-
notRetryableErrorStatusCodes = buildPredicate(config, config.getErrorCodePrefix(),
46-
config.getErrorWhiteListPrefix(), DEFAULT_ERROR_CODES);
43+
retryableErrorStatusCodes = buildPredicate(config, config.getRetryableErrorCodePrefix(),
44+
config.getRetryableErrorWhiteListPrefix(), DEFAULT_RETRYABLE_ERROR_CODES);
45+
notRetryableErrorStatusCodes =
46+
buildPredicate(config, config.getNonRetryableErrorCodePrefix(),
47+
config.getNonRetryableErrorWhiteListPrefix(), DEFAULT_ERROR_CODES);
4748
}
4849
}
4950

5051
private boolean areDeprecatedPropertiesUsed(ComposeHttpStatusCodeCheckerConfig config) {
51-
boolean whiteListDefined =
52-
!isNullOrWhitespaceOnly(config.getDeprecatedErrorWhiteListPrefix());
53-
boolean codeListDefined = !isNullOrWhitespaceOnly(config.getDeprecatedCodePrefix());
52+
boolean whiteListDefined = !isNullOrWhitespaceOnly(config.getErrorWhiteListPrefix());
53+
boolean codeListDefined = !isNullOrWhitespaceOnly(config.getErrorCodePrefix());
5454

5555
return (whiteListDefined && !isNullOrWhitespaceOnly(
56-
config.getProperties().getProperty(config.getDeprecatedErrorWhiteListPrefix())))
57-
|| (codeListDefined && !isNullOrWhitespaceOnly(
58-
config.getProperties().getProperty(config.getDeprecatedCodePrefix())));
56+
config.getProperties().getProperty(config.getErrorWhiteListPrefix()))) ||
57+
(codeListDefined && !isNullOrWhitespaceOnly(
58+
config.getProperties().getProperty(config.getErrorCodePrefix())));
5959
}
6060

6161
private Predicate<Integer> buildPredicate(
@@ -157,17 +157,17 @@ public HttpResponseStatus checkStatus(int statusCode) {
157157
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
158158
public static class ComposeHttpStatusCodeCheckerConfig {
159159

160-
private final String deprecatedErrorWhiteListPrefix;
161-
162-
private final String deprecatedCodePrefix;
163-
164160
private final String errorWhiteListPrefix;
165161

166162
private final String errorCodePrefix;
167163

168-
private final String retryableWhiteListPrefix;
164+
private final String nonRetryableErrorWhiteListPrefix;
165+
166+
private final String nonRetryableErrorCodePrefix;
167+
168+
private final String retryableErrorWhiteListPrefix;
169169

170-
private final String retryableCodePrefix;
170+
private final String retryableErrorCodePrefix;
171171

172172
private final Properties properties;
173173
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@ public JavaNetHttpPollingClient(
7979
ComposeHttpStatusCodeCheckerConfig checkerConfig =
8080
ComposeHttpStatusCodeCheckerConfig.builder()
8181
.properties(options.getProperties())
82-
.deprecatedErrorWhiteListPrefix(HTTP_ERROR_SOURCE_LOOKUP_CODE_WHITE_LIST)
83-
.deprecatedCodePrefix(HTTP_ERROR_SOURCE_LOOKUP_CODES_LIST)
84-
.errorWhiteListPrefix(HTTP_ERROR_NON_RETRYABLE_SOURCE_LOOKUP_CODE_WHITE_LIST)
85-
.errorCodePrefix(HTTP_ERROR_NON_RETRYABLE_SOURCE_LOOKUP_CODES_LIST)
86-
.retryableWhiteListPrefix(HTTP_ERROR_RETRYABLE_SOURCE_LOOKUP_CODE_WHITE_LIST)
87-
.retryableCodePrefix(HTTP_ERROR_RETRYABLE_SOURCE_LOOKUP_CODES_LIST)
82+
.errorWhiteListPrefix(HTTP_ERROR_SOURCE_LOOKUP_CODE_WHITE_LIST)
83+
.errorCodePrefix(HTTP_ERROR_SOURCE_LOOKUP_CODES_LIST)
84+
.nonRetryableErrorWhiteListPrefix(
85+
HTTP_ERROR_NON_RETRYABLE_SOURCE_LOOKUP_CODE_WHITE_LIST)
86+
.nonRetryableErrorCodePrefix(HTTP_ERROR_NON_RETRYABLE_SOURCE_LOOKUP_CODES_LIST)
87+
.retryableErrorWhiteListPrefix(HTTP_ERROR_RETRYABLE_SOURCE_LOOKUP_CODE_WHITE_LIST)
88+
.retryableErrorCodePrefix(HTTP_ERROR_RETRYABLE_SOURCE_LOOKUP_CODES_LIST)
8889
.build();
8990

9091
this.statusCodeChecker = new ComposeHttpStatusCodeChecker(checkerConfig);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ void shouldThrowOnInvalidCodeRangeInRetryableError(String listCode) {
184184
private ComposeHttpStatusCodeCheckerConfig prepareCheckerConfig(Properties properties) {
185185
return ComposeHttpStatusCodeCheckerConfig.builder()
186186
.properties(properties)
187-
.errorCodePrefix(NOT_RETRYABLE_CODE_PROPERTY)
188-
.errorWhiteListPrefix(NOT_RETRYABLE_WHITELIST_PROPERTY)
189-
.retryableCodePrefix(RETRYABLE_CODE_PROPERTY)
190-
.retryableWhiteListPrefix(RETRYABLE_WHITELIST_PROPERTY)
187+
.nonRetryableErrorCodePrefix(NOT_RETRYABLE_CODE_PROPERTY)
188+
.nonRetryableErrorWhiteListPrefix(NOT_RETRYABLE_WHITELIST_PROPERTY)
189+
.retryableErrorCodePrefix(RETRYABLE_CODE_PROPERTY)
190+
.retryableErrorWhiteListPrefix(RETRYABLE_WHITELIST_PROPERTY)
191191
.build();
192192
}
193193
}

0 commit comments

Comments
 (0)