Skip to content

Commit d227805

Browse files
committed
Spotless: Automatic code format updates
1 parent ececd75 commit d227805

File tree

4 files changed

+73
-47
lines changed

4 files changed

+73
-47
lines changed

src/main/java/com/mongodb/kafka/connect/sink/MongoSinkTopicConfig.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,12 +389,19 @@ public String getTopic() {
389389
public boolean logErrors() {
390390
return !tolerateErrors()
391391
|| ConfigHelper.getOverrideOrFallback(
392-
this, AbstractConfig::getBoolean, OVERRIDE_ERRORS_LOG_ENABLE_CONFIG, ERRORS_LOG_ENABLE_CONFIG);
392+
this,
393+
AbstractConfig::getBoolean,
394+
OVERRIDE_ERRORS_LOG_ENABLE_CONFIG,
395+
ERRORS_LOG_ENABLE_CONFIG);
393396
}
394397

395398
public boolean tolerateErrors() {
396-
String errorsTolerance = ConfigHelper.getOverrideOrFallback(
397-
this, AbstractConfig::getString, OVERRIDE_ERRORS_TOLERANCE_CONFIG, ERRORS_TOLERANCE_CONFIG);
399+
String errorsTolerance =
400+
ConfigHelper.getOverrideOrFallback(
401+
this,
402+
AbstractConfig::getString,
403+
OVERRIDE_ERRORS_TOLERANCE_CONFIG,
404+
ERRORS_TOLERANCE_CONFIG);
398405
return ErrorTolerance.valueOf(errorsTolerance.toUpperCase()).equals(ErrorTolerance.ALL);
399406
}
400407

src/main/java/com/mongodb/kafka/connect/source/MongoSourceConfig.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -439,21 +439,30 @@ public JsonWriterSettings getJsonWriterSettings() {
439439

440440
@SuppressWarnings("deprecated")
441441
public boolean tolerateErrors() {
442-
String errorsTolerance = ConfigHelper.getOverrideOrFallback(
443-
this, AbstractConfig::getString, OVERRIDE_ERRORS_TOLERANCE_CONFIG, ERRORS_TOLERANCE_CONFIG);
442+
String errorsTolerance =
443+
ConfigHelper.getOverrideOrFallback(
444+
this,
445+
AbstractConfig::getString,
446+
OVERRIDE_ERRORS_TOLERANCE_CONFIG,
447+
ERRORS_TOLERANCE_CONFIG);
444448
return ErrorTolerance.valueOf(errorsTolerance.toUpperCase()).equals(ErrorTolerance.ALL);
445449
}
446450

447451
public boolean logErrors() {
448452
return !tolerateErrors()
449453
|| ConfigHelper.getOverrideOrFallback(
450-
this, AbstractConfig::getBoolean, OVERRIDE_ERRORS_LOG_ENABLE_CONFIG, ERRORS_LOG_ENABLE_CONFIG);
454+
this,
455+
AbstractConfig::getBoolean,
456+
OVERRIDE_ERRORS_LOG_ENABLE_CONFIG,
457+
ERRORS_LOG_ENABLE_CONFIG);
451458
}
452459

453460
public String getDlqTopic() {
454461
return ConfigHelper.getOverrideOrFallback(
455-
this, AbstractConfig::getString,
456-
OVERRIDE_ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG, ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG);
462+
this,
463+
AbstractConfig::getString,
464+
OVERRIDE_ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
465+
ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG);
457466
}
458467

459468
private <T extends Configurable> T configureInstance(final T instance) {

src/main/java/com/mongodb/kafka/connect/util/ConfigHelper.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,10 @@ public static String getOverrideOrDefault(
156156
}
157157

158158
public static <T> T getOverrideOrFallback(
159-
final AbstractConfig config, final BiFunction<AbstractConfig, String, T> getter,
160-
final String overrideProperty, final String defaultProperty) {
159+
final AbstractConfig config,
160+
final BiFunction<AbstractConfig, String, T> getter,
161+
final String overrideProperty,
162+
final String defaultProperty) {
161163
String propertyToRead =
162164
config.originals().containsKey(overrideProperty) ? overrideProperty : defaultProperty;
163165
return getter.apply(config, propertyToRead);

src/test/java/com/mongodb/kafka/connect/source/MongoSourceConfigTest.java

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -375,63 +375,71 @@ void testErrorConfigurations() {
375375
void testErrorConfigurationOverrides() {
376376
assertAll(
377377
"Error configuration overrides",
378-
() -> assertTrue(createSourceConfig(OVERRIDE_ERRORS_TOLERANCE_CONFIG, "all").tolerateErrors()),
379-
() -> assertFalse(createSourceConfig(OVERRIDE_ERRORS_TOLERANCE_CONFIG, "none").tolerateErrors()),
378+
() ->
379+
assertTrue(
380+
createSourceConfig(OVERRIDE_ERRORS_TOLERANCE_CONFIG, "all").tolerateErrors()),
381+
() ->
382+
assertFalse(
383+
createSourceConfig(OVERRIDE_ERRORS_TOLERANCE_CONFIG, "none").tolerateErrors()),
380384
() ->
381385
assertFalse(
382386
createSourceConfig(
383-
format(
384-
"{'%s': '%s', '%s': '%s'}",
385-
ERRORS_TOLERANCE_CONFIG,
386-
"all",
387-
OVERRIDE_ERRORS_TOLERANCE_CONFIG,
388-
"none"))
389-
.tolerateErrors()),
387+
format(
388+
"{'%s': '%s', '%s': '%s'}",
389+
ERRORS_TOLERANCE_CONFIG,
390+
"all",
391+
OVERRIDE_ERRORS_TOLERANCE_CONFIG,
392+
"none"))
393+
.tolerateErrors()),
390394
() ->
391395
assertTrue(
392396
createSourceConfig(
393-
format(
394-
"{'%s': '%s', '%s': '%s'}",
395-
ERRORS_TOLERANCE_CONFIG,
396-
"none",
397-
OVERRIDE_ERRORS_TOLERANCE_CONFIG,
398-
"all"))
397+
format(
398+
"{'%s': '%s', '%s': '%s'}",
399+
ERRORS_TOLERANCE_CONFIG,
400+
"none",
401+
OVERRIDE_ERRORS_TOLERANCE_CONFIG,
402+
"all"))
399403
.tolerateErrors()),
400404
() -> assertTrue(createSourceConfig(OVERRIDE_ERRORS_LOG_ENABLE_CONFIG, "true").logErrors()),
401-
() -> assertTrue(
405+
() ->
406+
assertTrue(
402407
createSourceConfig(
403-
format(
404-
"{'%s': '%s', '%s': '%s'}",
405-
ERRORS_LOG_ENABLE_CONFIG,
406-
"false",
407-
OVERRIDE_ERRORS_LOG_ENABLE_CONFIG,
408-
"true"))
408+
format(
409+
"{'%s': '%s', '%s': '%s'}",
410+
ERRORS_LOG_ENABLE_CONFIG,
411+
"false",
412+
OVERRIDE_ERRORS_LOG_ENABLE_CONFIG,
413+
"true"))
409414
.logErrors()),
410415
() -> assertEquals("", createSourceConfig().getDlqTopic()),
411-
() -> assertEquals("dlq", createSourceConfig(OVERRIDE_ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG, "dlq").getDlqTopic()),
416+
() ->
417+
assertEquals(
418+
"dlq",
419+
createSourceConfig(OVERRIDE_ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG, "dlq")
420+
.getDlqTopic()),
412421
() ->
413422
assertEquals(
414423
"dlq",
415424
createSourceConfig(
416-
format(
417-
"{'%s': '%s', '%s': '%s'}",
418-
ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
419-
"qld",
420-
OVERRIDE_ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
421-
"dlq"))
425+
format(
426+
"{'%s': '%s', '%s': '%s'}",
427+
ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
428+
"qld",
429+
OVERRIDE_ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
430+
"dlq"))
422431
.getDlqTopic()),
423432
() ->
424433
assertEquals(
425434
"",
426435
createSourceConfig(
427-
format(
428-
"{'%s': '%s', '%s': '%s'}",
429-
ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
430-
"qld",
431-
OVERRIDE_ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
432-
""))
433-
.getDlqTopic())
434-
);
436+
format(
437+
"{'%s': '%s', '%s': '%s'}",
438+
ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
439+
"qld",
440+
OVERRIDE_ERRORS_DEAD_LETTER_QUEUE_TOPIC_NAME_CONFIG,
441+
""))
442+
.getDlqTopic()));
435443
}
436444

437445
@Test

0 commit comments

Comments
 (0)