Using upstream axon server 4.6

trimoq · trimoq · commit 477ec780cb5d · 2022-07-18T16:41:20.000+02:00
diff --git a/reset-handler/docker-compose.yml b/reset-handler/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   axonserver:
-    image: axoniq/axonserver
+    image: 'axoniq/axonserver:4.6.0-dev'
     hostname: axonserver
     ports:
       - '8024:8024'
diff --git a/reset-handler/pom.xml b/reset-handler/pom.xml
@@ -18,12 +18,12 @@
         <dependency>
             <groupId>org.axonframework</groupId>
             <artifactId>axon-spring-boot-starter</artifactId>
-            <version>4.6.0-SNAPSHOT</version>
+            <version>4.5.14</version>
         </dependency>
         <dependency>
             <groupId>io.axoniq</groupId>
             <artifactId>axonserver-connector-java</artifactId>
-            <version>4.6.0-SNAPSHOT</version>
+            <version>4.6.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/reset-handler/src/main/java/io/axoniq/config/ConfigBasedAdminChannel.java b/reset-handler/src/main/java/io/axoniq/config/ConfigBasedAdminChannel.java
@@ -1,8 +1,7 @@
 package io.axoniq.config;
 
-import io.axoniq.axonserver.connector.AxonServerConnectionFactory;
 import io.axoniq.axonserver.connector.admin.AdminChannel;
-import org.springframework.beans.factory.annotation.Value;
+import org.axonframework.axonserver.connector.AxonServerConnectionManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
@@ -12,21 +11,13 @@
  */
 @Component
 public class ConfigBasedAdminChannel {
-
-    private final String contextName;
-    private final String componentName;
-
-    public ConfigBasedAdminChannel(@Value("${axon.axonserver.context}") String contextName,
-                                   @Value("${axon.axonserver.component-name}") String componentName){
-        this.contextName = contextName;
-        this.componentName = componentName;
+    public ConfigBasedAdminChannel(AxonServerConnectionManager axonServerConnectionManager){
+        this.axonServerConnectionManager = axonServerConnectionManager;
     }
+    private final AxonServerConnectionManager axonServerConnectionManager;
 
     @Bean
     public AdminChannel adminChannel() {
-        return AxonServerConnectionFactory.forClient(componentName)
-                .build()
-                .connect(contextName)
-                .adminChannel();
+        return axonServerConnectionManager.getConnection().adminChannel();
     }
 }
diff --git a/reset-handler/src/main/java/io/axoniq/service/RestEventProcessorService.java b/reset-handler/src/main/java/io/axoniq/service/RestEventProcessorService.java
@@ -31,9 +31,11 @@ public class RestEventProcessorService implements EventProcessorService {
 
     public RestEventProcessorService(@Value("${axon.axonserver.context}") String context,
                                      @Value("${axon.axonserver.component-name}") String component,
-                                     TokenStore tokenStore, Configuration configuration) {
+                                     @Value("${axon.axonserver.http-url}") String httpUrl,
+                                     TokenStore tokenStore,
+                                     Configuration configuration) {
         this.configuration = configuration;
-        this.webClient = WebClient.create("http://localhost:8024");
+        this.webClient = WebClient.create(httpUrl!=null?httpUrl:"http://localhost:8024");
         this.contextSupplier = () -> context;
         this.componentSupplier = () -> component;
         this.tokenStoreIdSupplier = () -> tokenStore.retrieveStorageIdentifier().get();
diff --git a/reset-handler/src/main/java/io/axoniq/service/ServerConnectorEventProcessorService.java b/reset-handler/src/main/java/io/axoniq/service/ServerConnectorEventProcessorService.java
@@ -22,7 +22,8 @@ public class ServerConnectorEventProcessorService implements EventProcessorServi
     private final Configuration configuration;
     private final AdminChannel adminChannel;
 
-    public ServerConnectorEventProcessorService(Configuration configuration, AdminChannel adminChannel) {
+    public ServerConnectorEventProcessorService(Configuration configuration,
+                                                AdminChannel adminChannel) {
         this.configuration = configuration;
         this.adminChannel = adminChannel;
     }
diff --git a/reset-handler/src/main/resources/application.yml b/reset-handler/src/main/resources/application.yml
@@ -2,4 +2,5 @@ axon:
   axonserver:
     context: "default"
     component-name: "component"
+    http-url: "http://127.0.0.1:8024"
 
diff --git a/reset-handler/src/test/java/io/axoniq/ResetServiceIntegrationTest.java b/reset-handler/src/test/java/io/axoniq/ResetServiceIntegrationTest.java
@@ -12,6 +12,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
@@ -40,15 +42,27 @@ public class ResetServiceIntegrationTest {
 
     private static final String EVENT_PROCESSOR_NAME="io.axoniq";
 
+    private static final int HTTP_PORT = 8024;
+    private static final int GRPC_PORT = 8124;
+
     @ClassRule
     @Container
     public static DockerComposeContainer environment =
             new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-                    .withExposedService("axonserver", 8024, Wait.forListeningPort())
-                    .withExposedService("axonserver", 8124, Wait.forListeningPort())
+                    .withExposedService("axonserver", HTTP_PORT, Wait.forListeningPort())
+                    .withExposedService("axonserver", GRPC_PORT, Wait.forListeningPort())
                     .waitingFor("axonserver", Wait.forLogMessage(".*Started AxonServer in .*",1));
 
+    @DynamicPropertySource
+    public static void properties(DynamicPropertyRegistry registry) {
+
+        int grpcPort = environment.getServicePort("axonserver", GRPC_PORT);
+        int httpPort = environment.getServicePort("axonserver", HTTP_PORT);
 
+        registry.add("axon.axonserver.servers", () -> "localhost:"+grpcPort);
+        registry.add("axon.axonserver.http-url", () -> "http://localhost:"+httpPort);
+
+    }
     @BeforeEach
     void prepare(){
         createEvents();
diff --git a/reset-handler/src/test/java/io/axoniq/controller/ResetE2ETest.java b/reset-handler/src/test/java/io/axoniq/controller/ResetE2ETest.java
@@ -8,6 +8,8 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.testcontainers.containers.DockerComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -24,8 +26,8 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class ResetE2ETest {
 
-    final static int PORT_A = 8024;
-    final static int PORT_B = 8124;
+    private static final int HTTP_PORT = 8024;
+    private static final int GRPC_PORT = 8124;
 
     @LocalServerPort
     private int port;
@@ -42,10 +44,19 @@ public class ResetE2ETest {
     @Container
     public static DockerComposeContainer environment =
             new DockerComposeContainer(new File("src/test/resources/compose-test.yml"))
-                    .withExposedService("axonserver", PORT_A, Wait.forListeningPort())
-                    .withExposedService("axonserver", PORT_B, Wait.forListeningPort())
+                    .withExposedService("axonserver", HTTP_PORT, Wait.forListeningPort())
+                    .withExposedService("axonserver", GRPC_PORT, Wait.forListeningPort())
                     .waitingFor("axonserver", Wait.forLogMessage(".*Started AxonServer in .*",1));
+    @DynamicPropertySource
+    public static void properties(DynamicPropertyRegistry registry) {
 
+        int grpcPort = environment.getServicePort("axonserver", GRPC_PORT);
+        int httpPort = environment.getServicePort("axonserver", HTTP_PORT);
+
+        registry.add("axon.axonserver.servers", () -> "localhost:"+grpcPort);
+        registry.add("axon.axonserver.http-url", () -> "http://localhost:"+httpPort);
+
+    }
     @Test
     void testEventsAreCreated(){
         prepareIntegrationTest();
diff --git a/reset-handler/src/test/resources/application.yml b/reset-handler/src/test/resources/application.yml
@@ -0,0 +1,5 @@
+axon:
+  axonserver:
+    context: "default"
+    component-name: "component"
+    http-url: "http://127.0.0.1:8024"
diff --git a/reset-handler/src/test/resources/compose-test.yml b/reset-handler/src/test/resources/compose-test.yml
@@ -1,8 +1,5 @@
 version: '3.3'
 services:
   axonserver:
-    image: hackyaxonserver
-    hostname: axonserver
-    ports:
-      - '8024:8024'
-      - '8124:8124'
+    image: 'axoniq/axonserver:4.6.0-dev'
+    hostname: axonserver

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ public class ServerConnectorEventProcessorService implements EventProcessorServi`
`22`	`22`	`private final Configuration configuration;`
`23`	`23`	`private final AdminChannel adminChannel;`
`24`	`24`
`25`		`- public ServerConnectorEventProcessorService(Configuration configuration, AdminChannel adminChannel) {`
	`25`	`+ public ServerConnectorEventProcessorService(Configuration configuration,`
	`26`	`+ AdminChannel adminChannel) {`
`26`	`27`	`this.configuration = configuration;`
`27`	`28`	`this.adminChannel = adminChannel;`
`28`	`29`	`}`