Skip to content

Commit 65f49b3

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

File tree

5 files changed

+63
-61
lines changed

5 files changed

+63
-61
lines changed

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

+6-6
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+
.whiteListPrefix(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

+24-23
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,40 @@ public class ComposeHttpStatusCodeChecker implements HttpStatusCodeChecker {
2323
private static final int MIN_HTTP_STATUS_CODE = 100;
2424
private static final int MAX_HTTP_STATUS_CODE = 599;
2525

26-
private static final Predicate<Integer> DEFAULT_ERROR_CODES =
26+
private static final Predicate<Integer> DEFAULT_NON_RETRYABLE_ERROR_CODES =
2727
new TypeStatusCodeCheckerPredicate(HttpResponseCodeType.CLIENT_ERROR);
2828
private static final Predicate<Integer> DEFAULT_RETRYABLE_ERROR_CODES =
2929
new TypeStatusCodeCheckerPredicate(HttpResponseCodeType.SERVER_ERROR);
3030
private static final Predicate<Integer> DEFAULT_DEPRECATED_ERROR_CODES =
31-
DEFAULT_ERROR_CODES.or(DEFAULT_RETRYABLE_ERROR_CODES);
31+
DEFAULT_NON_RETRYABLE_ERROR_CODES.or(DEFAULT_RETRYABLE_ERROR_CODES);
3232

3333
private final Predicate<Integer> retryableErrorStatusCodes;
34-
private final Predicate<Integer> notRetryableErrorStatusCodes;
34+
private final Predicate<Integer> nonRetryableErrorStatusCodes;
3535

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+
nonRetryableErrorStatusCodes = buildPredicate(config, config.getErrorCodePrefix(),
40+
config.getWhiteListPrefix(), 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+
nonRetryableErrorStatusCodes =
46+
buildPredicate(config, config.getNonRetryableErrorCodePrefix(),
47+
config.getNonRetryableErrorWhiteListPrefix(),
48+
DEFAULT_NON_RETRYABLE_ERROR_CODES);
4749
}
4850
}
4951

5052
private boolean areDeprecatedPropertiesUsed(ComposeHttpStatusCodeCheckerConfig config) {
51-
boolean whiteListDefined =
52-
!isNullOrWhitespaceOnly(config.getDeprecatedErrorWhiteListPrefix());
53-
boolean codeListDefined = !isNullOrWhitespaceOnly(config.getDeprecatedCodePrefix());
53+
boolean whiteListDefined = !isNullOrWhitespaceOnly(config.getWhiteListPrefix());
54+
boolean codeListDefined = !isNullOrWhitespaceOnly(config.getErrorCodePrefix());
5455

5556
return (whiteListDefined && !isNullOrWhitespaceOnly(
56-
config.getProperties().getProperty(config.getDeprecatedErrorWhiteListPrefix())))
57-
|| (codeListDefined && !isNullOrWhitespaceOnly(
58-
config.getProperties().getProperty(config.getDeprecatedCodePrefix())));
57+
config.getProperties().getProperty(config.getWhiteListPrefix()))) ||
58+
(codeListDefined && !isNullOrWhitespaceOnly(
59+
config.getProperties().getProperty(config.getErrorCodePrefix())));
5960
}
6061

6162
private Predicate<Integer> buildPredicate(
@@ -143,8 +144,8 @@ public HttpResponseStatus checkStatus(int statusCode) {
143144
MAX_HTTP_STATUS_CODE)
144145
);
145146

146-
if (notRetryableErrorStatusCodes.test(statusCode)) {
147-
return HttpResponseStatus.FAILURE_NOT_RETRYABLE;
147+
if (nonRetryableErrorStatusCodes.test(statusCode)) {
148+
return HttpResponseStatus.FAILURE_NON_RETRYABLE;
148149
} else if (retryableErrorStatusCodes.test(statusCode)) {
149150
return HttpResponseStatus.FAILURE_RETRYABLE;
150151
} else {
@@ -157,17 +158,17 @@ public HttpResponseStatus checkStatus(int statusCode) {
157158
@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
158159
public static class ComposeHttpStatusCodeCheckerConfig {
159160

160-
private final String deprecatedErrorWhiteListPrefix;
161+
private final String whiteListPrefix;
161162

162-
private final String deprecatedCodePrefix;
163+
private final String errorCodePrefix;
163164

164-
private final String errorWhiteListPrefix;
165+
private final String nonRetryableErrorWhiteListPrefix;
165166

166-
private final String errorCodePrefix;
167+
private final String nonRetryableErrorCodePrefix;
167168

168-
private final String retryableWhiteListPrefix;
169+
private final String retryableErrorWhiteListPrefix;
169170

170-
private final String retryableCodePrefix;
171+
private final String retryableErrorCodePrefix;
171172

172173
private final Properties properties;
173174
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ public enum HttpResponseStatus {
1616
/**
1717
* Request failed but cannot be retried.
1818
*/
19-
FAILURE_NOT_RETRYABLE,
19+
FAILURE_NON_RETRYABLE,
2020
}

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

+12-11
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+
.whiteListPrefix(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);
@@ -157,7 +158,7 @@ private Optional<RowData> queryAndProcess(RowData lookupData) throws Exception {
157158
);
158159
Response parsedResponse = processHttpResponse(httpResponse, request);
159160
if (parsedResponse.getStatus() == HttpResponseStatus.SUCCESS
160-
|| parsedResponse.getStatus() == HttpResponseStatus.FAILURE_NOT_RETRYABLE) {
161+
|| parsedResponse.getStatus() == HttpResponseStatus.FAILURE_NON_RETRYABLE) {
161162
return parsedResponse.getRowData();
162163
} else {
163164
if (tryCount == maxRetryCount) {
@@ -197,9 +198,9 @@ private Response processHttpResponse(
197198
if (httpResponseStatus == HttpResponseStatus.SUCCESS) {
198199
log.trace("Returned successful status code [%s].");
199200
return Response.success(responseBodyDecoder.deserialize(responseBody.getBytes()));
200-
} else if (httpResponseStatus == HttpResponseStatus.FAILURE_NOT_RETRYABLE) {
201+
} else if (httpResponseStatus == HttpResponseStatus.FAILURE_NON_RETRYABLE) {
201202
log.warn(format("Returned not retryable error status code [%s].", statusCode));
202-
return Response.notRetryable();
203+
return Response.nonRetryable();
203204
} else if (httpResponseStatus == HttpResponseStatus.FAILURE_RETRYABLE) {
204205
log.warn(format("Returned retryable error status code [%s].", statusCode));
205206
return Response.retryable();
@@ -220,8 +221,8 @@ static Response success(RowData rowData) {
220221
return new Response(HttpResponseStatus.SUCCESS, rowData);
221222
}
222223

223-
static Response notRetryable() {
224-
return new Response(HttpResponseStatus.FAILURE_NOT_RETRYABLE, null);
224+
static Response nonRetryable() {
225+
return new Response(HttpResponseStatus.FAILURE_NON_RETRYABLE, null);
225226
}
226227

227228
static Response retryable() {

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

+20-20
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import static org.junit.jupiter.api.Assertions.assertThrows;
1212

1313
import com.getindata.connectors.http.internal.status.ComposeHttpStatusCodeChecker.ComposeHttpStatusCodeCheckerConfig;
14-
import static com.getindata.connectors.http.internal.status.HttpResponseStatus.FAILURE_NOT_RETRYABLE;
14+
import static com.getindata.connectors.http.internal.status.HttpResponseStatus.FAILURE_NON_RETRYABLE;
1515
import static com.getindata.connectors.http.internal.status.HttpResponseStatus.FAILURE_RETRYABLE;
1616
import static com.getindata.connectors.http.internal.status.HttpResponseStatus.SUCCESS;
1717

@@ -33,8 +33,8 @@ void shouldReturnAppropriateStatusByDefault() {
3333
assertThat(codeChecker.checkStatus(100)).isEqualTo(SUCCESS);
3434
assertThat(codeChecker.checkStatus(200)).isEqualTo(SUCCESS);
3535
assertThat(codeChecker.checkStatus(302)).isEqualTo(SUCCESS);
36-
assertThat(codeChecker.checkStatus(400)).isEqualTo(FAILURE_NOT_RETRYABLE);
37-
assertThat(codeChecker.checkStatus(404)).isEqualTo(FAILURE_NOT_RETRYABLE);
36+
assertThat(codeChecker.checkStatus(400)).isEqualTo(FAILURE_NON_RETRYABLE);
37+
assertThat(codeChecker.checkStatus(404)).isEqualTo(FAILURE_NON_RETRYABLE);
3838
assertThat(codeChecker.checkStatus(500)).isEqualTo(FAILURE_RETRYABLE);
3939
assertThat(codeChecker.checkStatus(501)).isEqualTo(FAILURE_RETRYABLE);
4040
assertThat(codeChecker.checkStatus(503)).isEqualTo(FAILURE_RETRYABLE);
@@ -54,14 +54,14 @@ void shouldReturnAppropriateStatus() {
5454
HttpStatusCodeChecker codeChecker = new ComposeHttpStatusCodeChecker(checkerConfig);
5555

5656
assertAll(() -> {
57-
assertThat(codeChecker.checkStatus(100)).isEqualTo(FAILURE_NOT_RETRYABLE);
57+
assertThat(codeChecker.checkStatus(100)).isEqualTo(FAILURE_NON_RETRYABLE);
5858
assertThat(codeChecker.checkStatus(200)).isEqualTo(SUCCESS);
59-
assertThat(codeChecker.checkStatus(400)).isEqualTo(FAILURE_NOT_RETRYABLE);
59+
assertThat(codeChecker.checkStatus(400)).isEqualTo(FAILURE_NON_RETRYABLE);
6060
assertThat(codeChecker.checkStatus(404)).isEqualTo(FAILURE_RETRYABLE);
6161
assertThat(codeChecker.checkStatus(500)).isEqualTo(FAILURE_RETRYABLE);
6262
assertThat(codeChecker.checkStatus(501)).isEqualTo(SUCCESS);
6363
assertThat(codeChecker.checkStatus(503)).isEqualTo(FAILURE_RETRYABLE);
64-
assertThat(codeChecker.checkStatus(505)).isEqualTo(FAILURE_NOT_RETRYABLE);
64+
assertThat(codeChecker.checkStatus(505)).isEqualTo(FAILURE_NON_RETRYABLE);
6565
});
6666
}
6767

@@ -87,13 +87,13 @@ void shouldParseWhiteList() {
8787
.withFailMessage(
8888
"Not on a white list but matches 3XX range. "
8989
+ "Should be considered as error code.")
90-
.isEqualTo(FAILURE_NOT_RETRYABLE);
90+
.isEqualTo(FAILURE_NON_RETRYABLE);
9191
});
9292
}
9393

9494
@Test
9595
void shouldParseErrorCodeList() {
96-
List<Integer> notRetryableCodes = List.of(100, 202, 404);
96+
List<Integer> nonRetryableCodes = List.of(100, 202, 404);
9797
List<Integer> retryableCodes = List.of(302, 502);
9898
Properties properties = new Properties();
9999
properties.setProperty(NOT_RETRYABLE_CODE_PROPERTY, "100, 202, 404");
@@ -103,8 +103,8 @@ void shouldParseErrorCodeList() {
103103
HttpStatusCodeChecker codeChecker = new ComposeHttpStatusCodeChecker(checkerConfig);
104104

105105
assertAll(() -> {
106-
notRetryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
107-
.isEqualTo(FAILURE_NOT_RETRYABLE));
106+
nonRetryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
107+
.isEqualTo(FAILURE_NON_RETRYABLE));
108108
retryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
109109
.isEqualTo(FAILURE_RETRYABLE));
110110
});
@@ -115,15 +115,15 @@ void shouldParseErrorCodeRange() {
115115
Properties properties = new Properties();
116116
properties.setProperty(NOT_RETRYABLE_CODE_PROPERTY, "1XX, 2XX");
117117
properties.setProperty(RETRYABLE_CODE_PROPERTY, "3XX, 4XX");
118-
List<Integer> notRetryableCodes = List.of(100, 110, 200, 220);
118+
List<Integer> nonRetryableCodes = List.of(100, 110, 200, 220);
119119
List<Integer> retryableCodes = List.of(301, 404);
120120

121121
ComposeHttpStatusCodeCheckerConfig checkerConfig = prepareCheckerConfig(properties);
122122
HttpStatusCodeChecker codeChecker = new ComposeHttpStatusCodeChecker(checkerConfig);
123123

124124
assertAll(() -> {
125-
notRetryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
126-
.isEqualTo(FAILURE_NOT_RETRYABLE));
125+
nonRetryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
126+
.isEqualTo(FAILURE_NON_RETRYABLE));
127127
retryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
128128
.isEqualTo(FAILURE_RETRYABLE));
129129
assertThat(codeChecker.checkStatus(503))
@@ -138,15 +138,15 @@ void shouldIgnoreRedundantWhiteSpacesOrEmptyOrRepeatedValues() {
138138
Properties properties = new Properties();
139139
properties.setProperty(NOT_RETRYABLE_CODE_PROPERTY, " , 100,200, 300, , 303 ,200 ");
140140
properties.setProperty(RETRYABLE_CODE_PROPERTY, ",5XX, 4XX,, ,");
141-
List<Integer> notRetryableCodes = List.of(100, 200, 300, 303);
141+
List<Integer> nonRetryableCodes = List.of(100, 200, 300, 303);
142142
List<Integer> retryableCodes = List.of(500, 501, 400, 401);
143143

144144
ComposeHttpStatusCodeCheckerConfig checkerConfig = prepareCheckerConfig(properties);
145145
HttpStatusCodeChecker codeChecker = new ComposeHttpStatusCodeChecker(checkerConfig);
146146

147147
assertAll(() -> {
148-
notRetryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
149-
.isEqualTo(FAILURE_NOT_RETRYABLE));
148+
nonRetryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
149+
.isEqualTo(FAILURE_NON_RETRYABLE));
150150
retryableCodes.forEach(code -> assertThat(codeChecker.checkStatus(code))
151151
.isEqualTo(FAILURE_RETRYABLE));
152152
});
@@ -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)