Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Spring Boot 3 autoconfiguration support. #378

Merged
merged 3 commits into from Jan 30, 2023
Merged

Add Spring Boot 3 autoconfiguration support. #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d37421c
Add support for Spring boot 3 autoconfiguration.
gklijs Jan 24, 2023
21a96e6
Add spring boot 3 integration test.
gklijs Jan 24, 2023
636d80c
Add Java 17 job, and use it for sonar, with the spring boot 3 integra…
gklijs Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Expand Up @@ -20,6 +20,9 @@ jobs:
sonar-enabled: false
deploy-enabled: true
- java-version: 11
sonar-enabled: false
deploy-enabled: false
- java-version: 17
sonar-enabled: true
deploy-enabled: false

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pullrequest.yml
View file
Open in desktop
Expand Up @@ -13,8 +13,10 @@ jobs:
- java-version: 8
sonar-enabled: false
- java-version: 11
sonar-enabled: false
- java-version: 17
sonar-enabled: true
fail-fast: false # run both to the end
fail-fast: false # run all to the end

steps:
- name: Checkout code
Expand Down
190 changes: 190 additions & 0 deletions axon-spring-boot-3-integrationtests/pom.xml
View file
Open in desktop
@@ -0,0 +1,190 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2023. Axon Framework
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.2</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>axon-spring-boot-3-integrationtests</artifactId>
<groupId>org.axonframework.extensions.kafka</groupId>

<name>Axon Framework Kafka Extension Spring Boot 3 Integration Tests</name>
<description>
Module used to test the integration with Spring Boot 3
</description>
<version>4.7.0-SNAPSHOT</version>

<packaging>jar</packaging>

<dependencies>

<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-spring-boot-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.axonframework.extensions.kafka</groupId>
<artifactId>axon-kafka-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>

<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>

<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-eventsourcing</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>redpanda</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.17.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>17</source>
<target>17</target>
<encoding>UTF-8</encoding>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>coverage</id>
<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>coverage-aggregate</id>
<build>
<defaultGoal>verify</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<repositories>
<repository>
<id>sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>

</project>
93 changes: 93 additions & 0 deletions .../org/axonframework/extensions/kafka/integration/StreamableKafkaSourceIntegrationTest.java
View file
Open in desktop
@@ -0,0 +1,93 @@
/*
* Copyright (c) 2010-2023. Axon Framework
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.axonframework.extensions.kafka.integration;

import org.axonframework.common.stream.BlockingStream;
import org.axonframework.eventhandling.DomainEventMessage;
import org.axonframework.eventhandling.TrackedEventMessage;
import org.axonframework.eventhandling.gateway.EventGateway;
import org.axonframework.extensions.kafka.eventhandling.consumer.streamable.StreamableKafkaMessageSource;
import org.junit.jupiter.api.*;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.context.annotation.EnableMBeanExport;
import org.springframework.jmx.support.RegistrationPolicy;
import org.springframework.test.context.ContextConfiguration;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.redpanda.RedpandaContainer;

import java.time.Duration;

import static org.awaitility.Awaitility.await;
import static org.axonframework.eventsourcing.utils.EventStoreTestUtils.createEvent;
import static org.junit.jupiter.api.Assertions.*;

@Testcontainers
class StreamableKafkaSourceIntegrationTest {

@Container
private static final RedpandaContainer REDPANDA_CONTAINER = new RedpandaContainer(
"docker.redpanda.com/vectorized/redpanda:v22.2.1");
private ApplicationContextRunner testApplicationContext;

@BeforeEach
void setUp() {
testApplicationContext = new ApplicationContextRunner();
}

@Test
void messageSendViaKafkaShouldBeReceived() {
testApplicationContext
.withPropertyValues("axon.axonserver.enabled=false")
.withPropertyValues("axon.kafka.fetcher.enabled=true")
.withPropertyValues("axon.kafka.consumer.event-processor-mode=tracking")
.withPropertyValues("axon.kafka.producer.bootstrap-servers=" + REDPANDA_CONTAINER.getBootstrapServers())
.withPropertyValues("axon.kafka.consumer.bootstrap-servers=" + REDPANDA_CONTAINER.getBootstrapServers())
.withUserConfiguration(DefaultContext.class)
.run(context -> {
EventGateway eventGateway = context.getBean(EventGateway.class);
assertNotNull(eventGateway);
publishEvent(eventGateway);
StreamableKafkaMessageSource<String, byte[]> messageSource = context.getBean(
StreamableKafkaMessageSource.class);
assertNotNull(messageSource);
receiveMessage(messageSource);
});
}

private void publishEvent(EventGateway eventGateway) {
DomainEventMessage<String> event = createEvent();
eventGateway.publish(event);
}

private void receiveMessage(StreamableKafkaMessageSource<String, byte[]> messageSource)
throws InterruptedException {
BlockingStream<TrackedEventMessage<?>> stream = messageSource.openStream(null);
await().atMost(Duration.ofSeconds(5L)).until(stream::hasNextAvailable);
TrackedEventMessage<?> message = stream.nextAvailable();
assertNotNull(message);
assertEquals("payload", message.getPayload());
}

@ContextConfiguration
@EnableAutoConfiguration
@EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
public static class DefaultContext {

}
}
31 changes: 31 additions & 0 deletions axon-spring-boot-3-integrationtests/src/test/resources/logback-test.xml
View file
Open in desktop
@@ -0,0 +1,31 @@
<!--
~ Copyright (c) 2010-2023. Axon Framework
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
</encoder>
</appender>

<root level="info">
<appender-ref ref="STDOUT"/>
</root>

<logger name="org.testcontainers" level="INFO"/>
<logger name="com.github.dockerjava" level="WARN"/>
<logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="OFF"/>
</configuration>
10 changes: 8 additions & 2 deletions coverage-report/pom.xml
View file
Open in desktop
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2010-2022. Axon Framework
~ Copyright (c) 2010-2023. Axon Framework
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -25,7 +25,7 @@
</parent>

<artifactId>axon-kafka-coverage-report</artifactId>
<version>4.6.0-SNAPSHOT</version>
<version>4.7.0-SNAPSHOT</version>

<name>Axon Framework Kafka Extension - Coverage Report Generator</name>
<description>Coverage Report Generator for the Axon Kafka Extension</description>
Expand All @@ -48,6 +48,12 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.axonframework.extensions.kafka</groupId>
<artifactId>axon-spring-boot-3-integrationtests</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
Expand Down