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:
58563cd
)
users: 1.0.5 - Updated Spring Boot to `3.2.5`
users-1.0.5
author
Kai Moritz
<kai@juplo.de>
Sun, 5 May 2024 09:17:40 +0000
(11:17 +0200)
committer
Kai Moritz
<kai@juplo.de>
Sun, 5 May 2024 10:41:03 +0000
(12:41 +0200)
Dockerfile
patch
|
blob
|
history
pom.xml
patch
|
blob
|
history
src/main/java/de/juplo/kafka/wordcount/users/User.java
patch
|
blob
|
history
src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java
patch
|
blob
|
history
diff --git
a/Dockerfile
b/Dockerfile
index
9b3b5f5
..
4e9a5d8
100644
(file)
--- a/
Dockerfile
+++ b/
Dockerfile
@@
-1,4
+1,4
@@
-FROM
openjdk:11-jre-slim
+FROM
eclipse-temurin:17-jre
COPY target/*.jar /opt/app.jar
EXPOSE 8082
ENTRYPOINT ["java", "-jar", "/opt/app.jar"]
COPY target/*.jar /opt/app.jar
EXPOSE 8082
ENTRYPOINT ["java", "-jar", "/opt/app.jar"]
diff --git
a/pom.xml
b/pom.xml
index
70d5654
..
6273a0e
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-5,12
+5,12
@@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>
2.5.4
</version>
+ <version>
3.2.5
</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>de.juplo.kafka.wordcount</groupId>
<artifactId>users</artifactId>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>de.juplo.kafka.wordcount</groupId>
<artifactId>users</artifactId>
- <version>1.0.
4
</version>
+ <version>1.0.
5
</version>
<name>Wordcount-Users</name>
<description>Users-service of the multi-user wordcount-example</description>
<properties>
<name>Wordcount-Users</name>
<description>Users-service of the multi-user wordcount-example</description>
<properties>
diff --git
a/src/main/java/de/juplo/kafka/wordcount/users/User.java
b/src/main/java/de/juplo/kafka/wordcount/users/User.java
index
04c9e0c
..
5dba5fa
100644
(file)
--- a/
src/main/java/de/juplo/kafka/wordcount/users/User.java
+++ b/
src/main/java/de/juplo/kafka/wordcount/users/User.java
@@
-1,11
+1,11
@@
package de.juplo.kafka.wordcount.users;
package de.juplo.kafka.wordcount.users;
+import jakarta.validation.constraints.NotEmpty;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
-import javax.validation.constraints.NotEmpty;
@Getter
@Getter
diff --git
a/src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java
b/src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java
index
1c7572e
..
bc78988
100644
(file)
--- a/
src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java
+++ b/
src/main/java/de/juplo/kafka/wordcount/users/UsersStreamProcessor.java
@@
-2,6
+2,8
@@
package de.juplo.kafka.wordcount.users;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.Serdes;
import lombok.extern.slf4j.Slf4j;
import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.common.serialization.Serdes;
@@
-13,8
+15,6
@@
import org.apache.kafka.streams.state.ReadOnlyKeyValueStore;
import org.springframework.boot.SpringApplication;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.boot.SpringApplication;
import org.springframework.context.ConfigurableApplicationContext;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import java.net.URI;
import java.util.Optional;
import java.util.Properties;
import java.net.URI;
import java.util.Optional;
import java.util.Properties;