diff --git a/spring-wolf-example/.mvn/wrapper/maven-wrapper.properties b/spring-wolf-example/.mvn/wrapper/maven-wrapper.properties index 8dea6c2..e276498 100644 --- a/spring-wolf-example/.mvn/wrapper/maven-wrapper.properties +++ b/spring-wolf-example/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-4/apache-maven-4.0.0-rc-4-bin.zip diff --git a/spring-wolf-example/Dockerfile b/spring-wolf-example/Dockerfile index 997a8af..3544952 100644 --- a/spring-wolf-example/Dockerfile +++ b/spring-wolf-example/Dockerfile @@ -16,7 +16,7 @@ COPY ./src src/ RUN --mount=type=bind,source=pom.xml,target=pom.xml \ --mount=type=cache,target=/root/.m2 \ ./mvnw package -DskipTests && \ - mv target/$(./mvnw help:evaluate -Dexpression=project.artifactId -q -DforceStdout)-$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout).jar target/app.jar + mv target/*.jar target/app.jar FROM package as extract diff --git a/spring-wolf-example/pom.xml b/spring-wolf-example/pom.xml index 719c28c..b875739 100644 --- a/spring-wolf-example/pom.xml +++ b/spring-wolf-example/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.10 + 4.0.2 @@ -19,8 +19,8 @@ 21 - 3.5.10 - 3.15.0 + 4.0.2 + 4.0.0-beta-4 5.0.1 1.18.42 2.0.0 diff --git a/spring-wolf-example/src/main/java/com/io/example/consumer/KafkaConsumer.java b/spring-wolf-example/src/main/java/com/io/example/consumer/KafkaConsumer.java index eaad3e2..9970de3 100644 --- a/spring-wolf-example/src/main/java/com/io/example/consumer/KafkaConsumer.java +++ b/spring-wolf-example/src/main/java/com/io/example/consumer/KafkaConsumer.java @@ -5,16 +5,16 @@ import io.github.springwolf.bindings.kafka.annotations.KafkaAsyncOperationBinding; import io.github.springwolf.core.asyncapi.annotations.AsyncListener; import io.github.springwolf.core.asyncapi.annotations.AsyncOperation; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.messaging.Message; import org.springframework.stereotype.Component; import java.util.function.Consumer; import static org.springframework.kafka.support.mapping.AbstractJavaTypeMapper.DEFAULT_CLASSID_FIELD_NAME; @Slf4j -@Component -public class KafkaConsumer implements Consumer { +@Component("kafkaConsumer") +public class KafkaConsumer implements Consumer> { @KafkaAsyncOperationBinding(bindingVersion = "1.0.0") @AsyncListener(operation = @AsyncOperation( @@ -31,7 +31,8 @@ public class KafkaConsumer implements Consumer { }) )) @Override - public void accept(KafkaDto kafkaDto) { + public void accept(Message message) { + var kafkaDto = message.getPayload(); log.info("receive: {}", kafkaDto.message()); } diff --git a/spring-wolf-example/src/main/java/com/io/example/producer/KafkaProducer.java b/spring-wolf-example/src/main/java/com/io/example/producer/KafkaProducer.java index 057c613..0676f31 100644 --- a/spring-wolf-example/src/main/java/com/io/example/producer/KafkaProducer.java +++ b/spring-wolf-example/src/main/java/com/io/example/producer/KafkaProducer.java @@ -36,7 +36,7 @@ public class KafkaProducer { @KafkaAsyncOperationBinding(bindingVersion = "1.0.0") public void send(String text) { KafkaDto message = new KafkaDto(text); - bridge.send("sendMessage-out-0", message); + bridge.send("kafkaV2Producer-out-0", message); } } \ No newline at end of file diff --git a/spring-wolf-example/src/main/resources/application.yaml b/spring-wolf-example/src/main/resources/application.yaml index 66cd4eb..db7e280 100644 --- a/spring-wolf-example/src/main/resources/application.yaml +++ b/spring-wolf-example/src/main/resources/application.yaml @@ -14,7 +14,7 @@ spring: bindings: # PRODUCER - sendMessage-out-0: + kafkaProducer-out-0: destination: ${kafka.topics.simple-topic} # CONSUMER