projects
/
demos
/
kafka
/
training
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge der überarbeiteten Compose-Konfiguration (Branch 'customized')
[demos/kafka/training]
/
src
/
main
/
java
/
de
/
juplo
/
kafka
/
RestProducer.java
diff --git
a/src/main/java/de/juplo/kafka/RestProducer.java
b/src/main/java/de/juplo/kafka/RestProducer.java
index
dea49f0
..
b430e35
100644
(file)
--- a/
src/main/java/de/juplo/kafka/RestProducer.java
+++ b/
src/main/java/de/juplo/kafka/RestProducer.java
@@
-4,14
+4,14
@@
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.StringSerializer;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.StringSerializer;
-import org.springframework.http.
MediaType
;
+import org.springframework.http.
HttpStatus
;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
import javax.annotation.PreDestroy;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
import javax.annotation.PreDestroy;
+import java.math.BigInteger;
import java.util.Properties;
import java.util.concurrent.ExecutionException;
import java.util.Properties;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
@Slf4j
@Slf4j
@@
-20,6
+20,7
@@
public class RestProducer
{
private final String id;
private final String topic;
{
private final String id;
private final String topic;
+ private final Integer partition;
private final KafkaProducer<String, String> producer;
private long produced = 0;
private final KafkaProducer<String, String> producer;
private long produced = 0;
@@
-28,6
+29,7
@@
public class RestProducer
{
this.id = properties.getClientId();
this.topic = properties.getTopic();
{
this.id = properties.getClientId();
this.topic = properties.getTopic();
+ this.partition = properties.getPartition();
Properties props = new Properties();
props.put("bootstrap.servers", properties.getBootstrapServer());
Properties props = new Properties();
props.put("bootstrap.servers", properties.getBootstrapServer());
@@
-47,6
+49,7
@@
public class RestProducer
@PostMapping(path = "{key}")
public DeferredResult<ProduceResult> send(
@PathVariable String key,
@PostMapping(path = "{key}")
public DeferredResult<ProduceResult> send(
@PathVariable String key,
+ @RequestHeader(name = "X-id", required = false) Long correlationId,
@RequestBody String value)
{
DeferredResult<ProduceResult> result = new DeferredResult<>();
@RequestBody String value)
{
DeferredResult<ProduceResult> result = new DeferredResult<>();
@@
-55,10
+58,17
@@
public class RestProducer
final ProducerRecord<String, String> record = new ProducerRecord<>(
topic, // Topic
final ProducerRecord<String, String> record = new ProducerRecord<>(
topic, // Topic
+ partition, // Partition
key, // Key
value // Value
);
key, // Key
value // Value
);
+ record.headers().add("source", id.getBytes());
+ if (correlationId != null)
+ {
+ record.headers().add("id", BigInteger.valueOf(correlationId).toByteArray());
+ }
+
producer.send(record, (metadata, e) ->
{
long now = System.currentTimeMillis();
producer.send(record, (metadata, e) ->
{
long now = System.currentTimeMillis();
@@
-95,9
+105,8
@@
public class RestProducer
long now = System.currentTimeMillis();
log.trace(
long now = System.currentTimeMillis();
log.trace(
- "{} - Queued
#{}
key={} latency={}ms",
+ "{} - Queued
message with
key={} latency={}ms",
id,
id,
- value,
record.key(),
now - time
);
record.key(),
now - time
);
@@
-105,6
+114,13
@@
public class RestProducer
return result;
}
return result;
}
+ @ExceptionHandler
+ @ResponseStatus(HttpStatus.BAD_REQUEST)
+ public ErrorResponse illegalStateException(IllegalStateException e)
+ {
+ return new ErrorResponse(e.getMessage(), HttpStatus.BAD_REQUEST.value());
+ }
+
@PreDestroy
public void destroy() throws ExecutionException, InterruptedException
{
@PreDestroy
public void destroy() throws ExecutionException, InterruptedException
{