MODULE: Create TX grouping sender impls.

geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java

@@ -126,8 +126,6 @@ public abstract class AbstractGatewaySender implements InternalGatewaySender, Di
 
   protected boolean isParallel;
 
-  protected boolean groupTransactionEvents;
-
   protected int retriesToGetTransactionEventsFromQueue;
 
   protected boolean isForInternalUse;
@@ -257,7 +255,6 @@ public AbstractGatewaySender(InternalCache cache, StatisticsClock statisticsCloc
     alertThreshold = attrs.getAlertThreshold();
     copyDeprecatedAttributes(attrs);
     isParallel = attrs.isParallel();
-    groupTransactionEvents = attrs.mustGroupTransactionEvents();
     retriesToGetTransactionEventsFromQueue = attrs.getRetriesToGetTransactionEventsFromQueue();
     isForInternalUse = attrs.isForInternalUse();
     diskStoreName = attrs.getDiskStoreName();
@@ -564,7 +561,7 @@ public boolean isParallel() {
 
   @Override
   public boolean mustGroupTransactionEvents() {
-    return groupTransactionEvents;
+    return false;
   }
 
   /**
@@ -743,7 +740,7 @@ public void setBatchTimeInterval(int batchTimeInterval) {
    *
    */
   public void setGroupTransactionEvents(boolean groupTransactionEvents) {
-    this.groupTransactionEvents = groupTransactionEvents;
+    // TODO jbarrett remove this
   }
 
   /**

geode-wan/src/main/java/org/apache/geode/cache/wan/internal/txgrouping/parallel/TxGroupingParallelGatewaySenderCreation.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.cache.wan.internal.txgrouping.parallel;
+
+import org.jetbrains.annotations.NotNull;
+
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
+import org.apache.geode.internal.cache.xmlcache.ParallelGatewaySenderCreation;
+
+public class TxGroupingParallelGatewaySenderCreation extends ParallelGatewaySenderCreation {
+
+  public TxGroupingParallelGatewaySenderCreation(final @NotNull InternalCache cache,
+      final @NotNull GatewaySenderAttributes attributes) {
+    super(cache, attributes);
+  }
+
+  @Override
+  public boolean mustGroupTransactionEvents() {
+    return false;
+  }
+
+}

geode-wan/src/main/java/org/apache/geode/cache/wan/internal/txgrouping/parallel/TxGroupingParallelGatewaySenderImpl.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.cache.wan.internal.txgrouping.parallel;
+
+import org.jetbrains.annotations.NotNull;
+
+import org.apache.geode.cache.wan.internal.parallel.ParallelGatewaySenderImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
+import org.apache.geode.internal.statistics.StatisticsClock;
+
+public class TxGroupingParallelGatewaySenderImpl extends ParallelGatewaySenderImpl {
+
+  public TxGroupingParallelGatewaySenderImpl(final @NotNull InternalCache cache,
+      final @NotNull StatisticsClock clock,
+      final @NotNull GatewaySenderAttributes attributes) {
+    super(cache, clock, attributes);
+  }
+
+  @Override
+  public boolean mustGroupTransactionEvents() {
+    return true;
+  }
+
+}

geode-wan/src/main/java/org/apache/geode/cache/wan/internal/txgrouping/parallel/TxGroupingParallelGatewaySenderTypeFactory.java

@@ -18,14 +18,12 @@
 import org.jetbrains.annotations.NotNull;
 
 import org.apache.geode.cache.wan.GatewaySender;
-import org.apache.geode.cache.wan.internal.parallel.ParallelGatewaySenderImpl;
 import org.apache.geode.cache.wan.internal.parallel.ParallelGatewaySenderTypeFactory;
 import org.apache.geode.cache.wan.internal.txgrouping.CommonTxGroupingGatewaySenderFactory;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
 import org.apache.geode.internal.cache.wan.GatewaySenderException;
 import org.apache.geode.internal.cache.wan.MutableGatewaySenderAttributes;
-import org.apache.geode.internal.cache.xmlcache.ParallelGatewaySenderCreation;
 import org.apache.geode.internal.statistics.StatisticsClock;
 
 public class TxGroupingParallelGatewaySenderTypeFactory extends ParallelGatewaySenderTypeFactory {
@@ -47,12 +45,12 @@ public void validate(final @NotNull MutableGatewaySenderAttributes attributes)
   public GatewaySender create(final @NotNull InternalCache cache,
       final @NotNull StatisticsClock clock,
       final @NotNull GatewaySenderAttributes attributes) {
-    return new ParallelGatewaySenderImpl(cache, clock, attributes);
+    return new TxGroupingParallelGatewaySenderImpl(cache, clock, attributes);
   }
 
   @Override
   public GatewaySender createCreation(final @NotNull InternalCache cache,
       final @NotNull GatewaySenderAttributes attributes) {
-    return new ParallelGatewaySenderCreation(cache, attributes);
+    return new TxGroupingParallelGatewaySenderCreation(cache, attributes);
   }
 }

geode-wan/src/main/java/org/apache/geode/cache/wan/internal/txgrouping/serial/TxGroupingSerialGatewaySenderCreation.java

@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.cache.wan.internal.txgrouping.serial;
+
+import org.jetbrains.annotations.NotNull;
+
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
+import org.apache.geode.internal.cache.xmlcache.SerialGatewaySenderCreation;
+
+public class TxGroupingSerialGatewaySenderCreation extends SerialGatewaySenderCreation {
+
+  public TxGroupingSerialGatewaySenderCreation(final @NotNull InternalCache cache,
+      final @NotNull GatewaySenderAttributes attributes) {
+    super(cache, attributes);
+  }
+
+  @Override
+  public boolean mustGroupTransactionEvents() {
+    return true;
+  }
+
+}

geode-wan/src/main/java/org/apache/geode/cache/wan/internal/txgrouping/serial/TxGroupingSerialGatewaySenderImpl.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package org.apache.geode.cache.wan.internal.txgrouping.serial;
+
+import org.jetbrains.annotations.NotNull;
+
+import org.apache.geode.cache.wan.internal.serial.SerialGatewaySenderImpl;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
+import org.apache.geode.internal.statistics.StatisticsClock;
+
+public class TxGroupingSerialGatewaySenderImpl extends SerialGatewaySenderImpl {
+
+  public TxGroupingSerialGatewaySenderImpl(final @NotNull InternalCache cache,
+      final @NotNull StatisticsClock clock,
+      final @NotNull GatewaySenderAttributes attributes) {
+    super(cache, clock, attributes);
+  }
+
+  @Override
+  public boolean mustGroupTransactionEvents() {
+    return true;
+  }
+
+}

geode-wan/src/main/java/org/apache/geode/cache/wan/internal/txgrouping/serial/TxGroupingSerialGatewaySenderTypeFactory.java

@@ -20,14 +20,12 @@
 import org.jetbrains.annotations.NotNull;
 
 import org.apache.geode.cache.wan.GatewaySender;
-import org.apache.geode.cache.wan.internal.serial.SerialGatewaySenderImpl;
 import org.apache.geode.cache.wan.internal.serial.SerialGatewaySenderTypeFactory;
 import org.apache.geode.cache.wan.internal.txgrouping.CommonTxGroupingGatewaySenderFactory;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
 import org.apache.geode.internal.cache.wan.GatewaySenderException;
 import org.apache.geode.internal.cache.wan.MutableGatewaySenderAttributes;
-import org.apache.geode.internal.cache.xmlcache.SerialGatewaySenderCreation;
 import org.apache.geode.internal.statistics.StatisticsClock;
 
 public class TxGroupingSerialGatewaySenderTypeFactory extends SerialGatewaySenderTypeFactory {
@@ -58,13 +56,13 @@ public void validate(final @NotNull MutableGatewaySenderAttributes attributes)
   public GatewaySender create(final @NotNull InternalCache cache,
       final @NotNull StatisticsClock clock,
       final @NotNull GatewaySenderAttributes attributes) {
-    return new SerialGatewaySenderImpl(cache, clock, attributes);
+    return new TxGroupingSerialGatewaySenderImpl(cache, clock, attributes);
   }
 
   @Override
   public GatewaySender createCreation(final @NotNull InternalCache cache,
       final @NotNull GatewaySenderAttributes attributes) {
-    return new SerialGatewaySenderCreation(cache, attributes);
+    return new TxGroupingSerialGatewaySenderCreation(cache, attributes);
   }
 
 }