Polishing.

Un-deprecate constructor. Rearrange method arguments to match parameter significance. Reformat code, replace space indents with tabs.

Original pull request: #2403.

Author: mp911de

Diff for: src/main/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactory.java

@@ -29,6 +29,7 @@
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.projection.Accessor;
@@ -45,8 +46,8 @@
 import com.jayway.jsonpath.ParseContext;
 import com.jayway.jsonpath.PathNotFoundException;
 import com.jayway.jsonpath.TypeRef;
-import com.jayway.jsonpath.spi.mapper.MappingProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
+import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
 /**
  * {@link MethodInterceptorFactory} to create a {@link MethodInterceptor} that will
@@ -61,34 +62,38 @@ public class JsonProjectingMethodInterceptorFactory implements MethodInterceptor
 
 	private final ParseContext context;
 
-    /**
-     * Creates a new {@link JsonProjectingMethodInterceptorFactory} using the given {@link MappingProvider} and {@link JsonProvider}.
-     *
-     * @param mappingProvider must not be {@literal null}.
-     * @param jsonProvider must not be {@literal null}.
-     */
-    public JsonProjectingMethodInterceptorFactory(MappingProvider mappingProvider, JsonProvider jsonProvider) {
-
-        Assert.notNull(mappingProvider, "MappingProvider must not be null!");
-        Assert.notNull(jsonProvider, "JsonProvider must not be null!");
-
-        Configuration configuration = Configuration.builder()//
-                .options(Option.ALWAYS_RETURN_LIST)//
-                .mappingProvider(mappingProvider)//
-                .jsonProvider(jsonProvider)//
-                .build();
-
-        this.context = JsonPath.using(configuration);
-    }
-
 	/**
-	 * Creates a new {@link JsonProjectingMethodInterceptorFactory} using the given {@link MappingProvider}.
+	 * Creates a new {@link JsonProjectingMethodInterceptorFactory} using the default {@link JsonProvider} and the given
+	 * {@link MappingProvider}.
 	 *
 	 * @param mappingProvider must not be {@literal null}.
+	 * @see Configuration#defaultConfiguration()
+	 * @see Configuration#jsonProvider()
 	 */
-	@Deprecated
 	public JsonProjectingMethodInterceptorFactory(MappingProvider mappingProvider) {
-	    this(mappingProvider, Configuration.defaultConfiguration().jsonProvider());
+		this(Configuration.defaultConfiguration().jsonProvider(), mappingProvider);
+	}
+
+	/**
+	 * Creates a new {@link JsonProjectingMethodInterceptorFactory} using the given {@link JsonProvider} and
+	 * {@link MappingProvider}.
+	 *
+	 * @param jsonProvider must not be {@literal null}.
+	 * @param mappingProvider must not be {@literal null}.
+	 * @since 2.5.3
+	 */
+	public JsonProjectingMethodInterceptorFactory(JsonProvider jsonProvider, MappingProvider mappingProvider) {
+
+		Assert.notNull(jsonProvider, "JsonProvider must not be null!");
+		Assert.notNull(mappingProvider, "MappingProvider must not be null!");
+
+		Configuration configuration = Configuration.builder()//
+				.options(Option.ALWAYS_RETURN_LIST) //
+				.jsonProvider(jsonProvider) //
+				.mappingProvider(mappingProvider) //
+				.build();
+
+		this.context = JsonPath.using(configuration);
 	}
 
 	/*

Diff for: src/main/java/org/springframework/data/web/ProjectingJackson2HttpMessageConverter.java

@@ -19,7 +19,6 @@
 import java.lang.reflect.Type;
 import java.util.Map;
 
-import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
@@ -37,6 +36,7 @@
 import org.springframework.util.ConcurrentReferenceHashMap;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
 import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
 
 /**
@@ -85,8 +85,8 @@ private static SpelAwareProxyProjectionFactory initProjectionFactory(ObjectMappe
 		Assert.notNull(mapper, "ObjectMapper must not be null!");
 
 		SpelAwareProxyProjectionFactory projectionFactory = new SpelAwareProxyProjectionFactory();
-		projectionFactory
-				.registerMethodInvokerFactory(new JsonProjectingMethodInterceptorFactory(new JacksonMappingProvider(mapper), new JacksonJsonProvider(mapper)));
+		projectionFactory.registerMethodInvokerFactory(new JsonProjectingMethodInterceptorFactory(
+				new JacksonJsonProvider(mapper), new JacksonMappingProvider(mapper)));
 
 		return projectionFactory;
 	}

Diff for: src/test/java/org/springframework/data/web/JsonProjectingMethodInterceptorFactoryUnitTests.java

@@ -17,8 +17,6 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
-import com.jayway.jsonpath.spi.json.JsonProvider;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -30,10 +28,13 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.spi.json.JacksonJsonProvider;
+import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider;
 import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
@@ -60,9 +61,11 @@ void setUp() {
 
 		SpelAwareProxyProjectionFactory projectionFactory = new SpelAwareProxyProjectionFactory();
 
-		MappingProvider mappingProvider = new JacksonMappingProvider(new ObjectMapper());
-        JsonProvider jsonProvider = new JacksonJsonProvider(new ObjectMapper());
-		projectionFactory.registerMethodInvokerFactory(new JsonProjectingMethodInterceptorFactory(mappingProvider, jsonProvider));
+		ObjectMapper objectMapper = new ObjectMapper();
+		MappingProvider mappingProvider = new JacksonMappingProvider(objectMapper);
+		JsonProvider jsonProvider = new JacksonJsonProvider(objectMapper);
+		projectionFactory
+				.registerMethodInvokerFactory(new JsonProjectingMethodInterceptorFactory(jsonProvider, mappingProvider));
 
 		this.projectionFactory = projectionFactory;
 		this.customer = projectionFactory.createProjection(Customer.class, new ByteArrayInputStream(json.getBytes()));