DATAGEODE-212 - Refactor Gateway Sender/Receiver support and remove unnecessary configuration validations.

src/test/java/org/springframework/data/gemfire/config/annotation/EnableGatewayReceiverConfigurationTests.java

@@ -167,7 +167,7 @@ public class EnableGatewayReceiverConfigurationTests {
 
         @Override
         public void configure(String beanName, GatewayReceiverFactoryBean bean) {
-            bean.getTransportFilters().stream().forEach(o -> beanNames.add(((TestGatewayTransportFilter) o).name));
+            bean.getTransportFilters().forEach(o -> beanNames.add(((TestGatewayTransportFilter) o).name));
         }
     }
 

src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.data.gemfire.wan;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.mock;
@@ -98,7 +98,10 @@ public class GatewayReceiverFactoryBeanTest {
 			factoryBean.afterPropertiesSet();
 		}
 		catch (IllegalArgumentException expected) {
-			assertEquals("'startPort' must be less than or equal to 8192.", expected.getMessage());
+
+			assertThat(expected).hasMessageContaining("[startPort] must be less than or equal to [8192]");
+			assertThat(expected).hasNoCause();
+
 			throw expected;
 		}
 	}

src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java

@@ -13,21 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.wan;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.junit.Test;
+
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.cache.wan.GatewaySenderFactory;
-import org.junit.Test;
+
 import org.springframework.data.gemfire.TestUtils;
 
 /**
@@ -176,29 +177,6 @@ public class GatewaySenderFactoryBeanTest {
 		assertEquals(69, gatewaySender.getRemoteDSId());
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void parallelGatewaySenderWithOrderPolicyCreation() {
-
-		GatewaySenderFactory mockGatewaySenderFactory =
-			mockGatewaySenderFactory("g2", 69);
-
-		GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
-			mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
-
-		factoryBean.setName("g2");
-		factoryBean.setRemoteDistributedSystemId(69);
-		factoryBean.setParallel(true);
-		factoryBean.setOrderPolicy(GatewaySender.OrderPolicy.KEY);
-
-		try {
-			factoryBean.doInit();
-		}
-		catch (IllegalArgumentException expected) {
-			assertEquals("Order Policy cannot be used with a Parallel Gateway Sender Queue.", expected.getMessage());
-			throw expected;
-		}
-	}
-
 	@Test
 	public void gatewaySenderCreationWithDiskSynchronousAndNoPersistence() throws Exception {