projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Funktionsunabhängiger Name für das erweiterte Interface RebalanceListener
[demos/kafka/training]
/
src
/
test
/
java
/
de
/
juplo
/
kafka
/
GenericApplicationTests.java
diff --git
a/src/test/java/de/juplo/kafka/GenericApplicationTests.java
b/src/test/java/de/juplo/kafka/GenericApplicationTests.java
index
0f40058
..
8124c81
100644
(file)
--- a/
src/test/java/de/juplo/kafka/GenericApplicationTests.java
+++ b/
src/test/java/de/juplo/kafka/GenericApplicationTests.java
@@
-62,13
+62,11
@@
abstract class GenericApplicationTests<K, V>
@Autowired
ExecutorService executor;
@Autowired
@Autowired
ExecutorService executor;
@Autowired
- StateRepository stateRepository;
- @Autowired
MongoClient mongoClient;
@Autowired
MongoProperties mongoProperties;
@Autowired
MongoClient mongoClient;
@Autowired
MongoProperties mongoProperties;
@Autowired
-
PollIntervalAwareConsumer
RebalanceListener rebalanceListener;
+ RebalanceListener rebalanceListener;
@Autowired
RecordHandler<K, V> recordHandler;
@Autowired
RecordHandler<K, V> recordHandler;
@@
-93,7
+91,7
@@
abstract class GenericApplicationTests<K, V>
/** Tests methods */
@Test
/** Tests methods */
@Test
- void commitsCurrentOffsetsOnSuccess()
+ void commitsCurrentOffsetsOnSuccess()
throws Exception
{
int numberOfGeneratedMessages =
recordGenerator.generate(false, false, messageSender);
{
int numberOfGeneratedMessages =
recordGenerator.generate(false, false, messageSender);
@@
-116,6
+114,7
@@
abstract class GenericApplicationTests<K, V>
.isThrownBy(() -> endlessConsumer.exitStatus())
.describedAs("Consumer should still be running");
.isThrownBy(() -> endlessConsumer.exitStatus())
.describedAs("Consumer should still be running");
+ endlessConsumer.stop();
recordGenerator.assertBusinessLogic();
}
recordGenerator.assertBusinessLogic();
}
@@
-213,7
+212,7
@@
abstract class GenericApplicationTests<K, V>
Long expected = offsetsToCheck.get(tp) + 1;
log.debug("Checking, if the offset {} for {} is at most {}", offset, tp, expected);
assertThat(offset)
Long expected = offsetsToCheck.get(tp) + 1;
log.debug("Checking, if the offset {} for {} is at most {}", offset, tp, expected);
assertThat(offset)
- .describedAs("Committed offset
corresponds
to the offset of the consumer")
+ .describedAs("Committed offset
must be at most equal
to the offset of the consumer")
.isLessThanOrEqualTo(expected);
isOffsetBehindSeen.add(offset < expected);
});
.isLessThanOrEqualTo(expected);
isOffsetBehindSeen.add(offset < expected);
});
@@
-248,29
+247,23
@@
abstract class GenericApplicationTests<K, V>
void seekToEnd()
{
offsetConsumer.assign(partitions());
void seekToEnd()
{
offsetConsumer.assign(partitions());
+ offsetConsumer.seekToEnd(partitions());
partitions().forEach(tp ->
{
partitions().forEach(tp ->
{
+ // seekToEnd() works lazily: it only takes effect on poll()/position()
Long offset = offsetConsumer.position(tp);
log.info("New position for {}: {}", tp, offset);
Long offset = offsetConsumer.position(tp);
log.info("New position for {}: {}", tp, offset);
- Integer partition = tp.partition();
- StateDocument document =
- stateRepository
- .findById(partition.toString())
- .orElse(new StateDocument(partition));
- document.offset = offset;
- stateRepository.save(document);
});
});
+ // The new positions must be commited!
+ offsetConsumer.commitSync();
offsetConsumer.unsubscribe();
}
void doForCurrentOffsets(BiConsumer<TopicPartition, Long> consumer)
{
offsetConsumer.unsubscribe();
}
void doForCurrentOffsets(BiConsumer<TopicPartition, Long> consumer)
{
- partitions().forEach(tp ->
- {
- String partition = Integer.toString(tp.partition());
- Optional<Long> offset = stateRepository.findById(partition).map(document -> document.offset);
- consumer.accept(tp, offset.orElse(0l));
- });
+ offsetConsumer.assign(partitions());
+ partitions().forEach(tp -> consumer.accept(tp, offsetConsumer.position(tp)));
+ offsetConsumer.unsubscribe();
}
List<TopicPartition> partitions()
}
List<TopicPartition> partitions()
@@
-393,7
+386,6
@@
abstract class GenericApplicationTests<K, V>
{
try
{
{
try
{
- endlessConsumer.stop();
testRecordProducer.close();
offsetConsumer.close();
}
testRecordProducer.close();
offsetConsumer.close();
}