Process review comments

- Adjust heartbeat configuration example to show how to disable it, as
enabled is the default.
- Replace sort for filter in the handler-enhancers.md section, as that's
 more to the point
- Drop "command handling components" notice from the given phase
description, as it's the aggregate under test. Emphasize the
registerAnnotatedCommandHandler option with a link to external command
handlers as a replacement.

#304

Author: smcvb

appendices/message-handler-tuning/handler-enhancers.md

@@ -9,7 +9,7 @@ You can use handler enhancers to intercept and perform checks on groups of `@Mes
 To create a handler enhancer, you implement the `HandlerEnhancerDefinition` interface and override the `wrapHandler()` method.
 All this method does is give you access to the `MessageHandlingMember<T>`, which is an object representing any handler specified in the system.
 
-You can then sort these handlers based on the type of `Message` they handle by using the `MessageHandlingMember.canHandleMessageType(Class<? extends Message>)` method.
+You can then filter these handlers based on the type of `Message` they handle by using the `MessageHandlingMember.canHandleMessageType(Class<? extends Message>)` method.
 Doing so, you can specifically enhance message handlers dealing with, for example, the `CommandMessage`.
 
 For your handler enhancer to run, you'll need to create a `META-INF/services/org.axonframework.messaging.annotation.HandlerEnhancerDefinition` file containing the fully qualified class name of the handler enhancer you have created or register the enhancer explicitly in the `Configurer`.
@@ -67,7 +67,7 @@ public @interface MyAnnotation {
 
 1. Implement the `HandlerEnhancerDefinition` interface
 2. Override the `wrapHandler` method to perform your logic.
-3. Sort out the types of handlers you want to wrap based on a specific attribute, for example, the `metaDataKey` attribute from the `MyAnnotation`.
+3. Filter the types of handlers you want to wrap based on a specific attribute, for example, the `metaDataKey` attribute from the `MyAnnotation`.
 4. Handle the method inside of a `MessageHandlingMember`. In this case, indicating the handler is only suitable if the meta-data key matches a value.
 5. For annotation-specific attributes to exist in the `MessageHandlingMember's` attribute collection, meta-annotation the custom annotation with `HasHandlerAttributes`.
 6. If you are not interested in wrapping the handler, return the original passed into the `wrapHandler` method.

axon-framework/testing/commands-events.md

@@ -83,10 +83,6 @@ public class GiftCardTest {
 >}
 >```
 
-
- 
-
-
 The "given-when-then" test fixture defines three stages: configuration, execution and validation. Each of these stages is represented by a different interface: `FixtureConfiguration`, `TestExecutor` and `ResultValidator`, respectively.
 
 > **Fluent Interface**
@@ -111,7 +107,7 @@ During the configuration phase \(i.e. before the first "given" is provided\), yo
 
 * `registerAnnotatedCommandHandler`:
 
-  Registers a Annotated Command Handler object. 
+  Registers a [Annotated Command Handler object](../axon-framework-commands/command-handlers.md#external-command-handlers) that interacts with the aggregate. 
   Use this method to register components containing `@CommandHandler` annotated methods that invoke the `Repository` to execute operation on an aggregate.
   You may end up in such a scenario when you prefer that command handlers and/or command messages are not contained inside the domain model (i.e. the aggregate).
 
@@ -170,7 +166,7 @@ During the configuration phase \(i.e. before the first "given" is provided\), yo
 ### Given Phase
 
 Once you have configured the fixture, you can start the given phase.
-Axon's test fixtures provide several given methods aligning with the modeling option of the aggregate.
+Axon's test fixtures provide several given methods aligning with the modeling options of an aggregate.
 Below is a list of all the operations of the given phase:
 
 * `givenNoPriorActivity`:
@@ -219,7 +215,7 @@ We can separate the execution phase options into roughly three variants:
 Below is a list of all the operations you can use in the execution phase:
 
 * `when(Object)`:
-  Using the `when` method, you can provide a command for the fixture to execute against the command handling component under test.
+  Using the `when` method, you can provide a command for the fixture to execute against the aggregate under test.
   Similar to the given events, if the provided command is of type `CommandMessage`, the fixture dispatches it as is.
   The fixture monitors the behavior of the invoked handler \(either on the aggregate or as an external handler\) and compares it to the expectations you register in the [validation phase](#validation-phase).
 * `when(Object, Map<String, ?>)`:
@@ -242,7 +238,8 @@ Below is a list of all the operations you can use in the execution phase:
 
 ### Validation Phase
 
-The last phase is the validation phase, which allows you to check on the activities of the command handling component. This is generally done purely in terms of return values and events.
+The last phase is the validation phase, which allows you to check on the activities of the aggregate. 
+This is generally done purely in terms of return values and events.
 
 #### Validating Command Result
 

axon-server/administration/monitoring/heartbeat-monitoring.md

@@ -17,18 +17,19 @@ axoniq.axonserver.heartbeat.enabled=true
 
 Please note that when combining Axon Server with Axon Framework, the framework application should also have Heartbeat Monitoring enabled.
 Note that this is enabled *by default* in Axon Framework.
-If you want to emphasize this further, regard the following configuration:
+
+If you want to disable heartbeat monitoring this further, regard the following configuration:
 
 {% tabs %}
 {% tab title="Axon Configuration API" %}
 ```java
 public class AxonConfig {
     // ...
-    public void enableHeartbeats(Configurer configurer) {
+    public void disableHeartbeats(Configurer configurer) {
         configurer.registerComponent(AxonServerConfiguration.class, config -> {
             AxonServerConfiguration.HeartbeatConfiguration heartbeatConfig =
                     new AxonServerConfiguration.HeartbeatConfiguration();
-            heartbeatConfig.setEnabled(true);
+            heartbeatConfig.setEnabled(false);
 
             AxonServerConfiguration serverConfig = new AxonServerConfiguration();
             serverConfig.setHeartbeat(heartbeatConfig);
@@ -41,7 +42,7 @@ public class AxonConfig {
 
 {% tab title="Spring Boot Auto Configuration" %}
 ```text
-axon.axonserver.heartbeat.enabled=true
+axon.axonserver.heartbeat.enabled=false
 ```
 {% endtab %}
 {% endtabs %}