Merge branch 'axon-4.10.x'

# Conflicts: # axon-server-connector/pom.xml # config/pom.xml # coverage-report/pom.xml # disruptor/pom.xml # eventsourcing/pom.xml # hibernate-6-integrationtests/pom.xml # integrationtests/pom.xml # legacy/pom.xml # messaging/pom.xml # messaging/src/test/java/org/axonframework/messaging/GenericMessageTest.java # metrics-micrometer/pom.xml # metrics/pom.xml # migration/pom.xml # modelling/pom.xml # pom.xml # reactorless-test/pom.xml # spring-boot-3-integrationtests/pom.xml # spring-boot-autoconfigure/pom.xml # spring-boot-starter/pom.xml # spring-boot3-dummy/pom.xml # spring/pom.xml # test/pom.xml # tracing-opentelemetry/pom.xml
lachja · Nov 7, 2024 · b8b9527 · b8b9527
2 parents fa6b53e + 0ff6fe2
commit b8b9527
Show file tree

Hide file tree

Showing 19 changed files with 635 additions and 222 deletions.
diff --git a/...nnector/src/main/java/org/axonframework/axonserver/connector/AxonServerConfiguration.java b/...nnector/src/main/java/org/axonframework/axonserver/connector/AxonServerConfiguration.java
@@ -151,6 +151,12 @@ public class AxonServerConfiguration {
      */
     private FlowControlConfiguration commandFlowControl;
 
+    /**
+     * A toggle dictating whether to invoke query handlers directly if they are registered in the local environment.
+     * Defaults to {@code false}.
+     */
+    private boolean shortcutQueriesToLocalHandlers = false;
+
     /**
      * The number of threads executing commands. Defaults to {@code 10} threads.
      */
@@ -234,9 +240,9 @@ public class AxonServerConfiguration {
     /**
      * Flag that allows block-listing of event types to be enabled.
      * <p>
-     * Disabling this may have serious performance impact, as it requires all
-     * {@link EventMessage events} from Axon Server to be sent to clients, even if a
-     * client is unable to process the event. Default is to have block-listing enabled.
+     * Disabling this may have serious performance impact, as it requires all {@link EventMessage events} from Axon
+     * Server to be sent to clients, even if a client is unable to process the event. Default is to have block-listing
+     * enabled.
      */
     private boolean eventBlockListingEnabled = true;
 
@@ -298,8 +304,7 @@ public class AxonServerConfiguration {
 
     /**
      * Defines the number of threads that should be used for connection management activities by the
-     * {@link AxonServerConnectionFactory} used by the
-     * {@link AxonServerConnectionManager}.
+     * {@link AxonServerConnectionFactory} used by the {@link AxonServerConnectionManager}.
      * <p>
      * This includes activities related to connecting to Axon Server, setting up instruction streams, sending and
      * validating heartbeats, etc.
@@ -320,8 +325,7 @@ public class AxonServerConfiguration {
     private Eventhandling eventhandling = new Eventhandling();
 
     /**
-     * Properties describing the settings for the
-     * {@link AxonServerEventStore EventStore}.
+     * Properties describing the settings for the {@link AxonServerEventStore EventStore}.
      */
     private EventStoreConfiguration eventStoreConfiguration = new EventStoreConfiguration();
 
@@ -358,6 +362,14 @@ public boolean isEnabled() {
         return enabled;
     }
 
+    public boolean isShortcutQueriesToLocalHandlers() {
+        return shortcutQueriesToLocalHandlers;
+    }
+
+    public void setShortcutQueriesToLocalHandlers(boolean shortcutQueriesToLocalHandlers) {
+        this.shortcutQueriesToLocalHandlers = shortcutQueriesToLocalHandlers;
+    }
+
     /**
      * Set whether (automatic) configuration of the Axon Server Connector is enabled. When {@code false}, the connector
      * will not be implicitly be configured. Defaults to {@code true}.
@@ -945,9 +957,9 @@ public void setDisableEventBlacklisting(boolean disableEventBlacklisting) {
     /**
      * Flag that allows block-listing of event types to be enabled.
      * <p>
-     * Disabling this may have serious performance impact, as it requires all
-     * {@link EventMessage events} from Axon Server to be sent to clients, even if a
-     * client is unable to process the event. Default is to have block-listing enabled.
+     * Disabling this may have serious performance impact, as it requires all {@link EventMessage events} from Axon
+     * Server to be sent to clients, even if a client is unable to process the event. Default is to have block-listing
+     * enabled.
      *
      * @return Flag that allows block-listing of event types to be enabled.
      */
@@ -958,9 +970,9 @@ public boolean isEventBlockListingEnabled() {
     /**
      * Sets flag that allows block-listing of event types to be enabled.
      * <p>
-     * Disabling this may have serious performance impact, as it requires all
-     * {@link EventMessage events} from Axon Server to be sent to clients, even if a
-     * client is unable to process the event. Default is to have block-listing enabled.
+     * Disabling this may have serious performance impact, as it requires all {@link EventMessage events} from Axon
+     * Server to be sent to clients, even if a client is unable to process the event. Default is to have block-listing
+     * enabled.
      *
      * @param eventBlockListingEnabled Flag that allows block-listing of event types to be enabled.
      */
@@ -1128,36 +1140,32 @@ public void setForceReconnectThroughServers(boolean forceReconnectThroughServers
 
     /**
      * The number of threads that should be used for connection management activities by the
-     * {@link AxonServerConnectionFactory} used by the
-     * {@link AxonServerConnectionManager}.
+     * {@link AxonServerConnectionFactory} used by the {@link AxonServerConnectionManager}.
      * <p>
      * This includes activities related to connecting to Axon Server, setting up instruction streams, sending and
      * validating heartbeats, etc.
      * <p>
      * Defaults to a pool size of {@code 2} threads.
      *
      * @return The number of threads that should be used for connection management activities by the
-     * {@link AxonServerConnectionFactory} used by the
-     * {@link AxonServerConnectionManager}.
+     * {@link AxonServerConnectionFactory} used by the {@link AxonServerConnectionManager}.
      */
     public int getConnectionManagementThreadPoolSize() {
         return connectionManagementThreadPoolSize;
     }
 
     /**
      * Define the number of threads that should be used for connection management activities by the
-     * {@link AxonServerConnectionFactory} used by the
-     * {@link AxonServerConnectionManager}.
+     * {@link AxonServerConnectionFactory} used by the {@link AxonServerConnectionManager}.
      * <p>
      * This includes activities related to connecting to Axon Server, setting up instruction streams, sending and
      * validating heartbeats, etc.
      * <p>
      * Defaults to a pool size of {@code 2} threads.
      *
      * @param connectionManagementThreadPoolSize The number of threads that should be used for connection management
-     *                                           activities by the
-     *                                           {@link AxonServerConnectionFactory} used
-     *                                           by the {@link AxonServerConnectionManager}.
+     *                                           activities by the {@link AxonServerConnectionFactory} used by the
+     *                                           {@link AxonServerConnectionManager}.
      */
     public void setConnectionManagementThreadPoolSize(int connectionManagementThreadPoolSize) {
         this.connectionManagementThreadPoolSize = connectionManagementThreadPoolSize;
@@ -1490,8 +1498,8 @@ public static class ProcessorSettings {
              * The load balancing strategy tells Axon Server how to share the event handling load among all available
              * application instances running this event processor, by moving segments from one instance to another. Note
              * that load balancing is <b>only</b> supported for
-             * {@link StreamingEventProcessor StreamingEventProcessors}, as only
-             * {@code StreamingEventProcessors} are capable of splitting the event handling load in segments.
+             * {@link StreamingEventProcessor StreamingEventProcessors}, as only {@code StreamingEventProcessors} are
+             * capable of splitting the event handling load in segments.
              * <p>
              * As the strategies names may change per Axon Server version it is recommended to check the documentation
              * for the possible strategies.