projects
/
demos
/
kafka
/
wordcount
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d6c2ef
)
WIP
author
Kai Moritz
<kai@juplo.de>
Sun, 25 Sep 2022 15:38:28 +0000
(17:38 +0200)
committer
Kai Moritz
<kai@juplo.de>
Sun, 25 Sep 2022 15:38:28 +0000
(17:38 +0200)
pom.xml
patch
|
blob
|
history
src/main/java/de/juplo/kafka/sumup/gateway/Application.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/sumup/gateway/ApplicationController.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/sumup/gateway/ApplicationProperties.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/sumup/gateway/Result.java
patch
|
blob
|
history
src/test/java/de/juplo/kafka/sumup/gateway/ApplicationTests.java
patch
|
blob
|
history
diff --git
a/pom.xml
b/pom.xml
index
edcedf5
..
ca23258
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-8,10
+8,10
@@
<version>2.5.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<version>2.5.4</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
- <groupId>de.juplo.kafka.
wordcount
</groupId>
- <artifactId>
recorder
</artifactId>
- <version>1
.0.1
</version>
- <name>
Wordcount-Recorder
</name>
+ <groupId>de.juplo.kafka.
sumup
</groupId>
+ <artifactId>
gateway
</artifactId>
+ <version>1
-SNAPSHOT
</version>
+ <name>
REST Gateway for the SumUp-Services
</name>
<description>Recorder-service of the multi-user wordcount-example</description>
<properties>
<docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
<description>Recorder-service of the multi-user wordcount-example</description>
<properties>
<docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
diff --git
a/src/main/java/de/juplo/kafka/sumup/gateway/Application.java
b/src/main/java/de/juplo/kafka/sumup/gateway/Application.java
index
abe0685
..
928a17f
100644
(file)
--- a/
src/main/java/de/juplo/kafka/sumup/gateway/Application.java
+++ b/
src/main/java/de/juplo/kafka/sumup/gateway/Application.java
@@
-1,4
+1,4
@@
-package de.juplo.kafka.
wordcount.recorder
;
+package de.juplo.kafka.
sumup.gateway
;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerConfig;
@@
-13,11
+13,11
@@
import java.util.Properties;
@SpringBootApplication
@SpringBootApplication
-@EnableConfigurationProperties(
Recorder
ApplicationProperties.class)
-public class
Recorder
Application
+@EnableConfigurationProperties(ApplicationProperties.class)
+public class Application
{
@Bean(destroyMethod = "close")
{
@Bean(destroyMethod = "close")
- KafkaProducer<String, String> producer(
Recorder
ApplicationProperties properties)
+ KafkaProducer<String, String> producer(ApplicationProperties properties)
{
Assert.hasText(properties.getBootstrapServer(), "juplo.wordcount.recorder.bootstrap-server must be set");
{
Assert.hasText(properties.getBootstrapServer(), "juplo.wordcount.recorder.bootstrap-server must be set");
@@
-31,6
+31,6
@@
public class RecorderApplication
public static void main(String[] args)
{
public static void main(String[] args)
{
- SpringApplication.run(
Recorder
Application.class, args);
+ SpringApplication.run(Application.class, args);
}
}
}
}
diff --git
a/src/main/java/de/juplo/kafka/sumup/gateway/ApplicationController.java
b/src/main/java/de/juplo/kafka/sumup/gateway/ApplicationController.java
index
5fe69ad
..
3ae1552
100644
(file)
--- a/
src/main/java/de/juplo/kafka/sumup/gateway/ApplicationController.java
+++ b/
src/main/java/de/juplo/kafka/sumup/gateway/ApplicationController.java
@@
-1,4
+1,4
@@
-package de.juplo.kafka.
wordcount.recorder
;
+package de.juplo.kafka.
sumup.gateway
;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
@@
-15,13
+15,13
@@
import javax.validation.constraints.NotEmpty;
@RestController
@RestController
-public class
Recorder
Controller
+public class
Application
Controller
{
private final String topic;
private final KafkaProducer<String, String> producer;
{
private final String topic;
private final KafkaProducer<String, String> producer;
- public
RecorderController(Recorder
ApplicationProperties properties, KafkaProducer<String,String> producer)
+ public
ApplicationController(
ApplicationProperties properties, KafkaProducer<String,String> producer)
{
this.topic = properties.getTopic();
this.producer = producer;
{
this.topic = properties.getTopic();
this.producer = producer;
@@
-34,7
+34,7
@@
public class RecorderController
MimeTypeUtils.APPLICATION_JSON_VALUE
},
produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
MimeTypeUtils.APPLICATION_JSON_VALUE
},
produces = MimeTypeUtils.APPLICATION_JSON_VALUE)
- DeferredResult<ResponseEntity<Re
cordingRe
sult>> speak(
+ DeferredResult<ResponseEntity<Result>> speak(
@PathVariable
@NotEmpty(message = "A username must be provided")
String username,
@PathVariable
@NotEmpty(message = "A username must be provided")
String username,
@@
-42,7
+42,7
@@
public class RecorderController
@NotEmpty(message = "The spoken sentence must not be empty!")
String sentence)
{
@NotEmpty(message = "The spoken sentence must not be empty!")
String sentence)
{
- DeferredResult<ResponseEntity<Re
cordingRe
sult>> result = new DeferredResult<>();
+ DeferredResult<ResponseEntity<Result>> result = new DeferredResult<>();
ProducerRecord<String, String> record = new ProducerRecord<>(topic, username, sentence);
producer.send(record, (metadata, exception) ->
ProducerRecord<String, String> record = new ProducerRecord<>(topic, username, sentence);
producer.send(record, (metadata, exception) ->
@@
-50,7
+50,7
@@
public class RecorderController
if (metadata != null)
{
result.setResult(
if (metadata != null)
{
result.setResult(
- ResponseEntity.ok(Re
cordingRe
sult.of(
+ ResponseEntity.ok(Result.of(
username,
sentence,
topic,
username,
sentence,
topic,
@@
-64,7
+64,7
@@
public class RecorderController
result.setErrorResult(
ResponseEntity
.internalServerError()
result.setErrorResult(
ResponseEntity
.internalServerError()
- .body(Re
cordingRe
sult.of(
+ .body(Result.of(
username,
sentence,
topic,
username,
sentence,
topic,
diff --git
a/src/main/java/de/juplo/kafka/sumup/gateway/ApplicationProperties.java
b/src/main/java/de/juplo/kafka/sumup/gateway/ApplicationProperties.java
index
552ebaf
..
029489b
100644
(file)
--- a/
src/main/java/de/juplo/kafka/sumup/gateway/ApplicationProperties.java
+++ b/
src/main/java/de/juplo/kafka/sumup/gateway/ApplicationProperties.java
@@
-1,4
+1,4
@@
-package de.juplo.kafka.
wordcount.recorder
;
+package de.juplo.kafka.
sumup.gateway
;
import lombok.Getter;
import lombok.Getter;
@@
-7,12
+7,12
@@
import lombok.ToString;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConfigurationProperties;
-@ConfigurationProperties("juplo.
wordcount.recorder
")
+@ConfigurationProperties("juplo.
sumup.gateway
")
@Getter
@Setter
@ToString
@Getter
@Setter
@ToString
-public class
Recorder
ApplicationProperties
+public class ApplicationProperties
{
private String bootstrapServer = "localhost:9092";
{
private String bootstrapServer = "localhost:9092";
- private String topic = "re
cording
s";
+ private String topic = "re
quest
s";
}
}
diff --git
a/src/main/java/de/juplo/kafka/sumup/gateway/Result.java
b/src/main/java/de/juplo/kafka/sumup/gateway/Result.java
index
939b1d4
..
b08894a
100644
(file)
--- a/
src/main/java/de/juplo/kafka/sumup/gateway/Result.java
+++ b/
src/main/java/de/juplo/kafka/sumup/gateway/Result.java
@@
-1,4
+1,4
@@
-package de.juplo.kafka.
wordcount.recorder
;
+package de.juplo.kafka.
sumup.gateway
;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Value;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Value;
@@
-7,7
+7,7
@@
import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
@Value(staticConstructor = "of")
@Value(staticConstructor = "of")
-public class Re
cordingRe
sult
+public class Result
{
@JsonInclude(NON_NULL) private final String username;
@JsonInclude(NON_NULL) private final String sentence;
{
@JsonInclude(NON_NULL) private final String username;
@JsonInclude(NON_NULL) private final String sentence;
diff --git
a/src/test/java/de/juplo/kafka/sumup/gateway/ApplicationTests.java
b/src/test/java/de/juplo/kafka/sumup/gateway/ApplicationTests.java
index
885a408
..
7ad2b7f
100644
(file)
--- a/
src/test/java/de/juplo/kafka/sumup/gateway/ApplicationTests.java
+++ b/
src/test/java/de/juplo/kafka/sumup/gateway/ApplicationTests.java
@@
-1,4
+1,4
@@
-package de.juplo.kafka.
wordcount.recorder
;
+package de.juplo.kafka.
sumup.gateway
;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;