DATACMNS-864 - Some tweaks after upgrade to Spring 5.0.

Tweaked QuerydslPredicateArgumentResolverUnitTests to adhere to stricter contract in MethodParameter.

Got rid of the ancient Spring 3.x / 4.x distinction regarding the repository populators source XML file.

Author: odrotbohm

src/test/java/org/springframework/data/repository/config/ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.java

@@ -24,7 +24,6 @@
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.core.SpringVersion;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.repository.init.Jackson2ResourceReader;
 import org.springframework.data.repository.init.ResourceReaderRepositoryPopulator;
@@ -99,10 +98,7 @@ private static void assertIsListOfClasspathResourcesWithPath(Object source, Stri
 
 	private static ClassPathResource getPopulatorResource() {
 
-		String springVersion = SpringVersion.getVersion();
-		String populatorsResourceName = springVersion.startsWith("4") ? "populators-spring-4.0.xml" : "populators.xml";
-
-		return new ClassPathResource(populatorsResourceName,
+		return new ClassPathResource("populators.xml",
 				ResourceReaderRepositoryPopulatorBeanDefinitionParserIntegrationTests.class);
 	}
 }

src/test/java/org/springframework/data/web/querydsl/QuerydslPredicateArgumentResolverUnitTests.java

@@ -254,7 +254,7 @@ public void detectsDomainTypesCorrectly() {
 	private static MethodParameter getMethodParameterFor(String methodName, Class<?>... args) throws RuntimeException {
 
 		try {
-			return new MethodParameter(Sample.class.getMethod(methodName, args), 0);
+			return new MethodParameter(Sample.class.getMethod(methodName, args), args.length == 0 ? -1 : 0);
 		} catch (NoSuchMethodException e) {
 			throw new RuntimeException(e);
 		}