From 438dbc4b33ef113fd496953e8c3ba1b13accd70b Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Mon, 5 Dec 2016 14:22:09 +0100 Subject: [PATCH] DATAMONGO-1546 - Register GeoJsonConfiguration via spring.factories. Related tickets: DATACMNS-952. --- .../data/mongodb/core/GeoJsonConfiguration.java | 7 +++---- .../src/main/resources/META-INF/spring.factories | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 spring-data-mongodb/src/main/resources/META-INF/spring.factories diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoJsonConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoJsonConfiguration.java index cb29dca57..ccc81cd79 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoJsonConfiguration.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoJsonConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,15 +17,14 @@ package org.springframework.data.mongodb.core; import org.springframework.context.annotation.Bean; import org.springframework.data.mongodb.core.geo.GeoJsonModule; -import org.springframework.data.web.config.SpringDataWebConfigurationMixin; +import org.springframework.data.web.config.SpringDataJacksonModules; /** * Configuration class to expose {@link GeoJsonModule} as a Spring bean. * * @author Oliver Gierke */ -@SpringDataWebConfigurationMixin -public class GeoJsonConfiguration { +public class GeoJsonConfiguration implements SpringDataJacksonModules { @Bean public GeoJsonModule geoJsonModule() { diff --git a/spring-data-mongodb/src/main/resources/META-INF/spring.factories b/spring-data-mongodb/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..752078269 --- /dev/null +++ b/spring-data-mongodb/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.data.web.config.SpringDataJacksonModules=org.springframework.data.mongodb.core.GeoJsonConfiguration