projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refaktorisierungen des Testfalls gemerged (Branch 'deserialization')
[demos/kafka/training]
/
src
/
test
/
java
/
de
/
juplo
/
kafka
/
ApplicationTests.java
diff --git
a/src/test/java/de/juplo/kafka/ApplicationTests.java
b/src/test/java/de/juplo/kafka/ApplicationTests.java
index
05eebd0
..
62906b3
100644
(file)
--- a/
src/test/java/de/juplo/kafka/ApplicationTests.java
+++ b/
src/test/java/de/juplo/kafka/ApplicationTests.java
@@
-15,6
+15,7
@@
import org.springframework.boot.test.context.ConfigDataApplicationContextInitial
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
+import org.springframework.kafka.support.serializer.JsonSerializer;
import org.springframework.kafka.test.context.EmbeddedKafka;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.kafka.test.context.EmbeddedKafka;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
@@
-24,8
+25,8
@@
import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.function.BiConsumer;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Consumer;
-import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@
-56,7
+57,7
@@
class ApplicationTests
@Autowired
KafkaProducer<String, Bytes> kafkaProducer;
@Autowired
@Autowired
KafkaProducer<String, Bytes> kafkaProducer;
@Autowired
- KafkaConsumer<String,
Long
> kafkaConsumer;
+ KafkaConsumer<String,
ClientMessage
> kafkaConsumer;
@Autowired
KafkaConsumer<Bytes, Bytes> offsetConsumer;
@Autowired
@Autowired
KafkaConsumer<Bytes, Bytes> offsetConsumer;
@Autowired
@@
-64,11
+65,11
@@
class ApplicationTests
@Autowired
ExecutorService executor;
@Autowired
ExecutorService executor;
- Consumer<ConsumerRecord<String,
Long
>> testHandler;
- EndlessConsumer<String,
Long
> endlessConsumer;
+ Consumer<ConsumerRecord<String,
ClientMessage
>> testHandler;
+ EndlessConsumer<String,
ClientMessage
> endlessConsumer;
Map<TopicPartition, Long> oldOffsets;
Map<TopicPartition, Long> newOffsets;
Map<TopicPartition, Long> oldOffsets;
Map<TopicPartition, Long> newOffsets;
- Set<ConsumerRecord<String,
Long
>> receivedRecords;
+ Set<ConsumerRecord<String,
ClientMessage
>> receivedRecords;
/** Tests methods */
/** Tests methods */
@@
-79,7
+80,7
@@
class ApplicationTests
{
send100Messages((partition, key, counter) ->
{
{
send100Messages((partition, key, counter) ->
{
- Bytes value =
new Bytes(valueSerializer.serialize(TOPIC, counter)
);
+ Bytes value =
serialize(key, counter
);
return new ProducerRecord<>(TOPIC, partition, key, value);
});
return new ProducerRecord<>(TOPIC, partition, key, value);
});
@@
-108,7
+109,7
@@
class ApplicationTests
{
Bytes value = counter == 77
? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
{
Bytes value = counter == 77
? new Bytes(stringSerializer.serialize(TOPIC, "BOOM!"))
- :
new Bytes(valueSerializer.serialize(TOPIC, counter)
);
+ :
serialize(key, counter
);
return new ProducerRecord<>(TOPIC, partition, key, value);
});
return new ProducerRecord<>(TOPIC, partition, key, value);
});
@@
-208,6
+209,7
@@
class ApplicationTests
ProducerRecord<String, Bytes> record =
recordGenerator.generate(partition, Integer.toString(partition*10+key%2), ++i);
ProducerRecord<String, Bytes> record =
recordGenerator.generate(partition, Integer.toString(partition*10+key%2), ++i);
+ record.headers().add("__TypeId__", "message".getBytes());
kafkaProducer.send(record, (metadata, e) ->
{
if (metadata != null)
kafkaProducer.send(record, (metadata, e) ->
{
if (metadata != null)
@@
-232,6
+234,14
@@
class ApplicationTests
}
}
}
}
+ Bytes serialize(String key, Long value)
+ {
+ ClientMessage message = new ClientMessage();
+ message.setClient(key);
+ message.setMessage(value.toString());
+ return new Bytes(valueSerializer.serialize(TOPIC, message));
+ }
+
@BeforeEach
public void init()
@BeforeEach
public void init()
@@
-248,7
+258,7
@@
class ApplicationTests
newOffsets.put(tp, offset - 1);
});
newOffsets.put(tp, offset - 1);
});
- Consumer<ConsumerRecord<String,
Long
>> captureOffsetAndExecuteTestHandler =
+ Consumer<ConsumerRecord<String,
ClientMessage
>> captureOffsetAndExecuteTestHandler =
record ->
{
newOffsets.put(
record ->
{
newOffsets.put(
@@
-288,9
+298,9
@@
class ApplicationTests
public static class Configuration
{
@Bean
public static class Configuration
{
@Bean
- Serializer<
Long
> serializer()
+ Serializer<
ClientMessage
> serializer()
{
{
- return new
LongSerializer
();
+ return new
JsonSerializer<>
();
}
@Bean
}
@Bean