From e3e2853f7ad1d809c2a078d60a2fdcba193ed81b Mon Sep 17 00:00:00 2001
From: Alberto Gomez <alberto.gomez@est.tech>
Date: Fri, 5 Nov 2021 08:15:46 +0100
Subject: [PATCH] MODULE: Do not allow changing group-transaction-events

---
 .../cli/commands/AlterGatewaySenderCommand.java   | 15 +++------------
 .../AlterGatewaySenderCommandDUnitTest.java       | 10 ++--------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/AlterGatewaySenderCommand.java b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/AlterGatewaySenderCommand.java
index e367d723f224..506c244f026b 100644
--- a/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/AlterGatewaySenderCommand.java
+++ b/geode-gfsh/src/main/java/org/apache/geode/management/internal/cli/commands/AlterGatewaySenderCommand.java
@@ -113,18 +113,9 @@ public ResultModel alterGatewaySender(@CliOption(key = CliStrings.ALTER_GATEWAYS
           "alter-gateway-sender cannot be performed for --batch-time-interval values smaller then -1.");
     }
 
-    if (groupTransactionEvents != null && groupTransactionEvents
-        && !oldConfiguration.mustGroupTransactionEvents()) {
-      if (!oldConfiguration.isParallel() && (oldConfiguration.getDispatcherThreads() == null
-          || Integer.parseInt(oldConfiguration.getDispatcherThreads()) > 1)) {
-        return ResultModel.createError(
-            "alter-gateway-sender cannot be performed for --group-transaction-events attribute if serial sender and dispatcher-threads is greater than 1.");
-      }
-
-      if (oldConfiguration.isEnableBatchConflation()) {
-        return ResultModel.createError(
-            "alter-gateway-sender cannot be performed for --group-transaction-events attribute if batch-conflation is enabled.");
-      }
+    if (groupTransactionEvents != null && groupTransactionEvents) {
+      return ResultModel.createError(
+          "alter-gateway-sender cannot be performed for --group-transaction-events attribute.");
     }
 
     Set<DistributedMember> dsMembers = findMembers(onGroup, onMember);
diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/AlterGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/AlterGatewaySenderCommandDUnitTest.java
index 14cc30bec75a..9cd106b140c7 100644
--- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/AlterGatewaySenderCommandDUnitTest.java
+++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/AlterGatewaySenderCommandDUnitTest.java
@@ -460,14 +460,8 @@ public void testCreateParallelGatewaySenderAndChangeGroupTransaction() throws Ex
         .containsOutput("sender1P");
 
     gfsh.executeAndAssertThat("alter gateway-sender --id=sender1P --group-transaction-events=true")
-        .statusIsSuccess();
-
-    // verify that server1's event queue has the default value
-    server1.invoke(() -> {
-      InternalCache cache = ClusterStartupRule.getCache();
-      GatewaySender sender = cache.getGatewaySender("sender1P");
-      assertThat(sender.mustGroupTransactionEvents()).isTrue();
-    });
+        .statusIsError()
+        .containsOutput("alter-gateway-sender cannot be performed for --group-transaction-events");
   }
 
   public static class MyGatewayEventFilter implements GatewayEventFilter {