Upgrade to spring 4.1.0.RELEASE

Author: dilipkrish

pom.xml

@@ -58,7 +58,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.version>3.2.9.RELEASE</spring.version>
+		<spring.version>4.1.0.RELEASE</spring.version>
 		<logback.version>1.1.2</logback.version>
 		<jackson.version>2.4.1</jackson.version>
 		<jaxrs.version>1.0</jaxrs.version>

src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java

@@ -100,7 +100,7 @@ public void halSetupIsAppliedToAllTransitiveComponentsInRequestMappingHandlerAda
 
 		boolean found = false;
 
-		for (HandlerMethodArgumentResolver resolver : adapter.getArgumentResolvers().getResolvers()) {
+		for (HandlerMethodArgumentResolver resolver : adapter.getArgumentResolvers()) {
 
 			if (resolver instanceof AbstractMessageConverterMethodArgumentResolver) {
 

src/test/java/org/springframework/hateoas/core/ControllerEntityLinksFactoryBeanUnitTest.java

@@ -15,24 +15,23 @@
  */
 package org.springframework.hateoas.core;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.hateoas.core.ControllerEntityLinksUnitTest.Person;
 import org.springframework.hateoas.core.ControllerEntityLinksUnitTest.SampleController;
 import org.springframework.hateoas.mvc.ControllerLinkBuilderFactory;
 import org.springframework.stereotype.Controller;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Unit tests for {@link ControllerEntityLinksFactoryBean}.
- * 
+ *
  * @author Oliver Gierke
  */
 public class ControllerEntityLinksFactoryBeanUnitTest {
@@ -56,12 +55,13 @@ public void discoversSampleControllerFromApplicationContext() throws Exception {
 		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
 		factory.registerBeanDefinition("controller", new RootBeanDefinition(SampleController.class));
 
-		ApplicationContext context = new GenericApplicationContext(factory);
+		GenericApplicationContext context = new GenericApplicationContext(factory);
 
 		ControllerEntityLinksFactoryBean builder = new ControllerEntityLinksFactoryBean();
 		builder.setAnnotation(Controller.class);
 		builder.setLinkBuilderFactory(new ControllerLinkBuilderFactory());
 		builder.setApplicationContext(context);
+		context.refresh();
 		builder.afterPropertiesSet();
 
 		ControllerEntityLinks entityLinks = builder.getObject();