Ensure all CommandEvents have same order of params

JAVA-4875
mongodb · Oct 9, 2023 · 8614945 · 8614945
1 parent 1d2d782
commit 8614945
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 26 deletions.
diff --git a/driver-core/src/main/com/mongodb/event/CommandFailedEvent.java b/driver-core/src/main/com/mongodb/event/CommandFailedEvent.java
@@ -37,18 +37,19 @@ public final class CommandFailedEvent extends CommandEvent {
     /**
      * Construct an instance.
      *
-     * @param requestContext the request context
-     * @param operationId the operation id
-     * @param requestId the request id
+     * @param requestContext        the request context
+     * @param operationId           the operation id
+     * @param requestId             the request id
      * @param connectionDescription the connection description
-     * @param commandName the command name
-     * @param elapsedTimeNanos the non-negative elapsed time in nanoseconds for the operation to complete
-     * @param throwable the throwable cause of the failure
+     * @param databaseName          the database name
+     * @param commandName           the command name
+     * @param elapsedTimeNanos      the non-negative elapsed time in nanoseconds for the operation to complete
+     * @param throwable             the throwable cause of the failure
      * @since 4.11
      */
     public CommandFailedEvent(@Nullable final RequestContext requestContext, final long operationId, final int requestId,
-            final ConnectionDescription connectionDescription, final String commandName,
-            final String databaseName, final long elapsedTimeNanos, final Throwable throwable) {
+            final ConnectionDescription connectionDescription, final String databaseName, final String commandName,
+            final long elapsedTimeNanos, final Throwable throwable) {
         super(requestContext, operationId, requestId, connectionDescription, commandName, databaseName);
         isTrueArgument("elapsed time is not negative", elapsedTimeNanos >= 0);
         this.elapsedTimeNanos = elapsedTimeNanos;

diff --git a/driver-core/src/main/com/mongodb/event/CommandSucceededEvent.java b/driver-core/src/main/com/mongodb/event/CommandSucceededEvent.java
@@ -37,19 +37,19 @@ public final class CommandSucceededEvent extends CommandEvent {
     /**
      * Construct an instance.
      *
-     * @param requestContext the request context
-     * @param operationId the operation id
-     * @param requestId the request id
+     * @param requestContext        the request context
+     * @param operationId           the operation id
+     * @param requestId             the request id
      * @param connectionDescription the connection description
-     * @param commandName the command name
-     * @param databaseName the database name
-     * @param response the command response
-     * @param elapsedTimeNanos the non-negative elapsed time in nanoseconds for the operation to complete
+     * @param databaseName          the database name
+     * @param commandName           the command name
+     * @param response              the command response
+     * @param elapsedTimeNanos      the non-negative elapsed time in nanoseconds for the operation to complete
      * @since 4.11
      */
     public CommandSucceededEvent(@Nullable final RequestContext requestContext, final long operationId, final int requestId,
-            final ConnectionDescription connectionDescription, final String commandName,
-            final String databaseName, final BsonDocument response, final long elapsedTimeNanos) {
+            final ConnectionDescription connectionDescription, final String databaseName, final String commandName,
+            final BsonDocument response, final long elapsedTimeNanos) {
         super(requestContext, operationId, requestId, connectionDescription, commandName, databaseName);
         this.response = response;
         isTrueArgument("elapsed time is not negative", elapsedTimeNanos >= 0);

diff --git a/driver-core/src/main/com/mongodb/internal/connection/ProtocolHelper.java b/driver-core/src/main/com/mongodb/internal/connection/ProtocolHelper.java
@@ -295,7 +295,7 @@ static void sendCommandSucceededEvent(final RequestMessage message, final String
         notNull("requestContext", requestContext);
         try {
             commandListener.commandSucceeded(new CommandSucceededEvent(getRequestContextForEvent(requestContext),
-                    operationContext.getId(), message.getId(), connectionDescription, commandName, databaseName, response,
+                    operationContext.getId(), message.getId(), connectionDescription, databaseName, commandName, response,
                     elapsedTimeNanos));
         } catch (Exception e) {
             if (PROTOCOL_EVENT_LOGGER.isWarnEnabled()) {
@@ -311,7 +311,7 @@ static void sendCommandFailedEvent(final RequestMessage message, final String da
         notNull("requestContext", requestContext);
         try {
             commandListener.commandFailed(new CommandFailedEvent(getRequestContextForEvent(requestContext),
-                    operationContext.getId(), message.getId(), connectionDescription, commandName, databaseName, elapsedTimeNanos,
+                    operationContext.getId(), message.getId(), connectionDescription, databaseName, commandName, elapsedTimeNanos,
                     throwable));
         } catch (Exception e) {
             if (PROTOCOL_EVENT_LOGGER.isWarnEnabled()) {

diff --git a/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java b/driver-core/src/test/functional/com/mongodb/internal/connection/TestCommandListener.java
@@ -250,7 +250,7 @@ else if (!observeSensitiveCommands) {
         lock.lock();
         try {
             events.add(new CommandSucceededEvent(event.getRequestContext(), event.getOperationId(), event.getRequestId(),
-                    event.getConnectionDescription(), event.getCommandName(), event.getDatabaseName(),
+                    event.getConnectionDescription(), event.getDatabaseName(), event.getCommandName(),
                     event.getResponse() == null ? null : event.getResponse().clone(),
                     event.getElapsedTime(TimeUnit.NANOSECONDS)));
             commandCompletedCondition.signal();

diff --git a/...c/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy b/...c/test/unit/com/mongodb/internal/connection/LoggingCommandEventSenderSpecification.groovy
@@ -77,12 +77,12 @@ class LoggingCommandEventSenderSpecification extends Specification {
                 [
                         new CommandStartedEvent(null, context.id, message.getId(), connectionDescription, namespace.databaseName,
                                 commandDocument.getFirstKey(), commandDocument.append('$db', new BsonString(namespace.databaseName))),
-                        new CommandSucceededEvent(null, context.id, message.getId(), connectionDescription, commandDocument.getFirstKey(),
-                                namespace.databaseName, new BsonDocument(), 1),
-                        new CommandSucceededEvent(null, context.id, message.getId(), connectionDescription, commandDocument.getFirstKey(),
-                                namespace.databaseName, replyDocument, 1),
-                        new CommandFailedEvent(null, context.id, message.getId(), connectionDescription, commandDocument.getFirstKey(),
-                                namespace.databaseName, 1, failureException)
+                        new CommandSucceededEvent(null, context.id, message.getId(), connectionDescription, namespace.databaseName,
+                                commandDocument.getFirstKey(), new BsonDocument(), 1),
+                        new CommandSucceededEvent(null, context.id, message.getId(), connectionDescription, namespace.databaseName,
+                                commandDocument.getFirstKey(), replyDocument, 1),
+                        new CommandFailedEvent(null, context.id, message.getId(), connectionDescription, namespace.databaseName,
+                                commandDocument.getFirstKey(), 1, failureException)
                 ])
 
         where: