GEODE-8302: doc and error messages changes after review

apache · Jul 1, 2020 · d4bc365 · d4bc365
1 parent 549137d
commit d4bc365
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb b/geode-docs/tools_modules/gfsh/command-pages/create.html.md.erb
@@ -635,7 +635,7 @@ create gateway-sender --id=value --remote-distributed-system-id=value
 <tr>
 <td><span class="keyword parmname">\-\-group-transaction-events</span></td>
 <td>Boolean value to ensure that all the events of a transaction are sent in the same batch, i.e., they are never spread across different batches.
-<p>Only allowed to be set on gateway senders with the <code class="ph codeph">parallel</code> attribute set to false and <code class="ph codeph">dispatcher-threads</code> attribute equal to 1, or on gatewaysenders with the <code class="ph codeph">parallel</code> attribute set to true. Also, the  <code class="ph codeph">enable-batch-conflation</code> attribute of the gateway sender must be set to false.</p>
+<p>Only allowed to be set on gateway senders with the <code class="ph codeph">parallel</code> attribute set to false and <code class="ph codeph">dispatcher-threads</code> attribute equal to 1, or on gateway senders with the <code class="ph codeph">parallel</code> attribute set to true. Also, the  <code class="ph codeph">enable-batch-conflation</code> attribute of the gateway sender must be set to false.</p>
 <p><b>Note:</b> In order to work for a transaction, the regions to which the transaction events belong must be replicated by the same set of senders with this flag enabled.</p></td>
 </td>
 <td>false</td>

diff --git a/...in/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java b/...in/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java
@@ -302,7 +302,7 @@ public ResultModel preExecution(GfshParseResult parseResult) {
 
       if (groupTransactionEvents && batchConflationEnabled) {
         return ResultModel.createError(
-            "Gateway Sender cannot be created with --group-transaction-events and --enable-batch-conflation.");
+            "Gateway Sender cannot be created with both --group-transaction-events and --enable-batch-conflation.");
       }
 
       return ResultModel.createInfo("");

diff --git a/...ava/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java b/...ava/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java
@@ -180,7 +180,7 @@ public void testInvalidGroupTransactionEventsDueToConflationEnabled() {
         "create gateway-sender --member=xyz --id=1 --remote-distributed-system-id=1 " +
             "--group-transaction-events --enable-batch-conflation --order-policy=THREAD")
         .statusIsError().containsOutput(
-            "Gateway Sender cannot be created with --group-transaction-events and --enable-batch-conflation");
+            "Gateway Sender cannot be created with both --group-transaction-events and --enable-batch-conflation");
   }
 
   @Test

diff --git a/...egrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/...egrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -104,7 +104,7 @@ public void test_create_GatewaySender_ThrowsException_when_GroupTransactionEvent
     assertThatThrownBy(() -> fact.create("NYSender", 2))
         .isInstanceOf(GatewaySenderException.class)
         .hasMessageContaining(
-            "GatewaySender NYSender cannot be created with group transaction events set to true and batch conflation enabled");
+            "GatewaySender NYSender cannot be created with both group transaction events set to true and batch conflation enabled");
   }
 
   /**

diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderFactoryImpl.java
@@ -250,7 +250,7 @@ public GatewaySender create(String id, int remoteDSId) {
     if (this.attrs.mustGroupTransactionEvents() && this.attrs.isBatchConflationEnabled()) {
       throw new GatewaySenderException(
           String.format(
-              "GatewaySender %s cannot be created with group transaction events set to true and batch conflation enabled",
+              "GatewaySender %s cannot be created with both group transaction events set to true and batch conflation enabled",
               id));
     }