{
+ /**
+ * {@link JsonSerializer} converting {@link GeoJsonMultiPolygon} to:
+ *
+ *
+ *
+ * {
+ * "type": "MultiPolygon",
+ * "coordinates": [
+ * [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+ * [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+ * [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+ * ]
+ * }
+ *
+ *
+ *
+ * @author Bjorn Harvold
+ * @author Christoph Strobl
+ * @since 3.2
+ */
+ static class GeoJsonMultiPolygonSerializer extends GeoJsonSerializer {
@Override
- public void serialize(GeoJsonMultiPolygon value, JsonGenerator gen, SerializerProvider serializers) throws IOException, JsonProcessingException {
- gen.writeStartObject();
- gen.writeStringField("type", value.getType());
- gen.writeArrayFieldStart("coordinates");
+ protected void doSerialize(GeoJsonMultiPolygon value, JsonGenerator jsonGenerator) throws IOException {
+
for (GeoJsonPolygon polygon : value.getCoordinates()) {
- gen.writeStartArray();
-
- gen.writeStartArray();
+ jsonGenerator.writeStartArray();
for (GeoJsonLineString lineString : polygon.getCoordinates()) {
-
- for (Point p : lineString.getCoordinates()) {
- gen.writeObject(new double[]{p.getX(), p.getY()});
- }
-
+ writeLine(lineString.getCoordinates(), jsonGenerator);
}
-
- gen.writeEndArray();
- gen.writeEndArray();
+ jsonGenerator.writeEndArray();
}
- gen.writeEndArray();
- gen.writeEndObject();
}
}
}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonModuleRoundTripUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonModuleRoundTripUnitTests.java
deleted file mode 100644
index 5ca4bc8a2..000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonModuleRoundTripUnitTests.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright 2015-2021 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.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.geo;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.data.geo.Point;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Bjorn Harvold
- */
-public class GeoJsonModuleRoundTripUnitTests {
-
- ObjectMapper mapper;
-
- @BeforeEach
- public void setUp() {
-
- mapper = new ObjectMapper();
- mapper.registerModule(new GeoJsonModule());
- mapper.registerModule(new GeoJsonSerializersModule());
- }
-
- @Test
- public void shouldMarshalJsonPointCorrectly() throws IOException {
-
- String json = "{\"type\":\"Point\",\"coordinates\":[10.0,20.0]}";
- GeoJsonPoint point = new GeoJsonPoint(10D, 20D);
-
- assertThat(mapper.readValue(json, GeoJsonPoint.class)).isEqualTo(point);
-
- String backToJSON = mapper.writeValueAsString(point);
-
- assertThat(backToJSON).isEqualTo(json);
- }
-
- @Test
- public void shouldMarshalGeoJsonLineStringCorrectly()
- throws IOException {
-
- String json = "{\"type\":\"LineString\",\"coordinates\":[[10.0,20.0],[30.0,40.0],[50.0,60.0]]}";
-
- GeoJsonLineString lineString = new GeoJsonLineString(Arrays.asList(new Point(10, 20), new Point(30, 40), new Point(50, 60)));
-
- assertThat(mapper.readValue(json, GeoJsonLineString.class)).isEqualTo(lineString);
-
- String backToJSON = mapper.writeValueAsString(lineString);
-
- assertThat(backToJSON).isEqualTo(json);
- }
-
- @Test
- public void shouldMarshalGeoJsonMultiPointCorrectly() throws IOException {
-
- String json = "{\"type\":\"MultiPoint\",\"coordinates\":[[10.0,20.0],[30.0,40.0],[50.0,60.0]]}";
- GeoJsonMultiPoint multiPoint = new GeoJsonMultiPoint(Arrays.asList(new Point(10, 20), new Point(30, 40), new Point(50, 60)));
-
- assertThat(mapper.readValue(json, GeoJsonMultiPoint.class)).isEqualTo(multiPoint);
-
- String backToJSON = mapper.writeValueAsString(multiPoint);
-
- assertThat(backToJSON).isEqualTo(json);
- }
-
- @Test
- @SuppressWarnings("unchecked")
- public void shouldMarshalGeoJsonMultiLineStringCorrectly() throws IOException {
-
- String json = "{\"type\":\"MultiLineString\",\"coordinates\":[[[10.0,20.0],[30.0,40.0]],[[50.0,60.0],[70.0,80.0]]]}";
- GeoJsonMultiLineString multiLineString = new GeoJsonMultiLineString(Arrays.asList(new Point(10, 20), new Point(30, 40)), Arrays.asList(new Point(50, 60), new Point(70, 80)));
-
- assertThat(mapper.readValue(json, GeoJsonMultiLineString.class)).isEqualTo(multiLineString);
-
- String backToJSON = mapper.writeValueAsString(multiLineString);
-
- assertThat(backToJSON).isEqualTo(json);
- }
-
- @Test
- public void shouldMarshalGeoJsonPolygonCorrectly() throws IOException {
- String json = "{\"type\":\"Polygon\",\"coordinates\":[[[100.0,0.0],[101.0,0.0],[101.0,1.0],[100.0,1.0],[100.0,0.0]]]}";
-
- List points = Arrays.asList(new Point(100, 0), new Point(101, 0), new Point(101, 1), new Point(100, 1), new Point(100, 0));
- GeoJsonPolygon polygon = new GeoJsonPolygon(points);
-
- assertThat(mapper.readValue(json, GeoJsonPolygon.class)).isEqualTo(polygon);
-
- String backToJSON = mapper.writeValueAsString(polygon);
-
- assertThat(backToJSON).isEqualTo(json);
- }
-
- @Test
- public void shouldMarshalGeoJsonMultiPolygonCorrectly()
- throws IOException {
-
- String json = "{\"type\":\"MultiPolygon\",\"coordinates\":["
- + "["
- + "["
- + "[102.0,2.0],[103.0,2.0],[103.0,3.0],[102.0,3.0],[102.0,2.0]"
- + "]"
- + "],"
- + "["
- + "["
- + "[100.0,0.0],[101.0,0.0],[101.0,1.0],[100.0,1.0],[100.0,0.0]"
- + "]"
- + "],"
- + "["
- + "["
- + "[100.2,0.2],[100.8,0.2],[100.8,0.8],[100.2,0.8],[100.2,0.2]"
- + "]"
- + "]"
- + "]"
- + "}";
-
- GeoJsonMultiPolygon multiPolygon = new GeoJsonMultiPolygon(Arrays.asList(
- new GeoJsonPolygon(Arrays.asList(new Point(102, 2), new Point(103, 2), new Point(103, 3), new Point(102, 3),
- new Point(102, 2))),
- new GeoJsonPolygon(Arrays.asList(new Point(100, 0), new Point(101, 0), new Point(101, 1), new Point(100, 1),
- new Point(100, 0))),
- new GeoJsonPolygon(Arrays.asList(new Point(100.2, 0.2), new Point(100.8, 0.2), new Point(100.8, 0.8),
- new Point(100.2, 0.8), new Point(100.2, 0.2)))));
-
- assertThat(mapper.readValue(json, GeoJsonMultiPolygon.class)).isEqualTo(multiPolygon);
-
- String backToJSON = mapper.writeValueAsString(multiPolygon);
-
- assertThat(backToJSON).isEqualTo(json);
-
- }
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersUnitTests.java
new file mode 100644
index 000000000..498193b80
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersUnitTests.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2021 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.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.geo;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.geo.Point;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * @author Bjorn Harvold
+ * @author Christoph Strobl
+ */
+class GeoJsonSerializersUnitTests {
+
+ ObjectMapper mapper;
+
+ @BeforeEach
+ void beforeEach() {
+
+ mapper = new ObjectMapper();
+ mapper.registerModule(new GeoJsonSerializersModule());
+ }
+
+ @Test // GH-3517
+ void shouldSerializeJsonPointCorrectly() throws IOException {
+
+ GeoJsonPoint geoJsonPoint = new GeoJsonPoint(10D, 20D);
+
+ assertThat(mapper.writeValueAsString(geoJsonPoint)).isEqualTo("{\"type\":\"Point\",\"coordinates\":[10.0,20.0]}");
+ }
+
+ @Test // GH-3517
+ public void shouldSerializeGeoJsonLineStringCorrectly() throws IOException {
+
+ GeoJsonLineString lineString = new GeoJsonLineString(
+ Arrays.asList(new Point(10, 20), new Point(30, 40), new Point(50, 60)));
+
+ assertThat(mapper.writeValueAsString(lineString))
+ .isEqualTo("{\"type\":\"LineString\",\"coordinates\":[[10.0,20.0],[30.0,40.0],[50.0,60.0]]}");
+ }
+
+ @Test // GH-3517
+ public void shouldSerializeGeoJsonMultiPointCorrectly() throws IOException {
+
+ GeoJsonMultiPoint multiPoint = new GeoJsonMultiPoint(
+ Arrays.asList(new Point(10, 20), new Point(30, 40), new Point(50, 60)));
+
+ assertThat(mapper.writeValueAsString(multiPoint))
+ .isEqualTo("{\"type\":\"MultiPoint\",\"coordinates\":[[10.0,20.0],[30.0,40.0],[50.0,60.0]]}");
+ }
+
+ @Test // GH-3517
+ public void shouldSerializeJsonMultiLineStringCorrectly() throws IOException {
+
+ GeoJsonMultiLineString multiLineString = new GeoJsonMultiLineString(
+ Arrays.asList(new Point(10, 20), new Point(30, 40)), Arrays.asList(new Point(50, 60), new Point(70, 80)));
+
+ assertThat(mapper.writeValueAsString(multiLineString)).isEqualTo(
+ "{\"type\":\"MultiLineString\",\"coordinates\":[[[10.0,20.0],[30.0,40.0]],[[50.0,60.0],[70.0,80.0]]]}");
+ }
+
+ @Test // GH-3517
+ public void shouldSerializeGeoJsonPolygonCorrectly() throws IOException {
+
+ List points = Arrays.asList(new Point(100, 0), new Point(101, 0), new Point(101, 1), new Point(100, 1),
+ new Point(100, 0));
+ GeoJsonPolygon polygon = new GeoJsonPolygon(points);
+
+ assertThat(mapper.writeValueAsString(polygon)).isEqualTo("{\"type\":\"Polygon\",\"coordinates\":[[[100.0,0.0],[101.0,0.0],[101.0,1.0],[100.0,1.0],[100.0,0.0]]]}");
+ }
+
+ @Test // GH-3517
+ public void shouldSerializeGeoJsonMultiPolygonCorrectly() throws IOException {
+
+ String json = "{\"type\":\"MultiPolygon\",\"coordinates\":[" + "[" + "["
+ + "[102.0,2.0],[103.0,2.0],[103.0,3.0],[102.0,3.0],[102.0,2.0]" + "]" + "]," + "[" + "["
+ + "[100.0,0.0],[101.0,0.0],[101.0,1.0],[100.0,1.0],[100.0,0.0]" + "]" + "]," + "[" + "["
+ + "[100.2,0.2],[100.8,0.2],[100.8,0.8],[100.2,0.8],[100.2,0.2]" + "]" + "]" + "]" + "}";
+
+ GeoJsonMultiPolygon multiPolygon = new GeoJsonMultiPolygon(Arrays.asList(
+ new GeoJsonPolygon(Arrays.asList(new Point(102, 2), new Point(103, 2), new Point(103, 3), new Point(102, 3),
+ new Point(102, 2))),
+ new GeoJsonPolygon(Arrays.asList(new Point(100, 0), new Point(101, 0), new Point(101, 1), new Point(100, 1),
+ new Point(100, 0))),
+ new GeoJsonPolygon(Arrays.asList(new Point(100.2, 0.2), new Point(100.8, 0.2), new Point(100.8, 0.8),
+ new Point(100.2, 0.8), new Point(100.2, 0.2)))));
+
+ assertThat(mapper.writeValueAsString(multiPolygon)).isEqualTo(json);
+ }
+}
diff --git a/src/main/asciidoc/reference/mongodb.adoc b/src/main/asciidoc/reference/mongodb.adoc
index 2500dc76f..aca6fed42 100644
--- a/src/main/asciidoc/reference/mongodb.adoc
+++ b/src/main/asciidoc/reference/mongodb.adoc
@@ -1700,6 +1700,43 @@ Returning the 3 Documents just like the GeoJSON variant:
<4> Distance from center point in _Kilometers_ - take it times 1000 to match _Meters_ of the GeoJSON variant.
====
+==== GeoJSON Jackson Modules
+
+By using the <>, Spring Data adds additional Jackson ``Modules``s to the `ObjectMapper` for de-/serializing common types used by the Spring Data domain.
+Please refer to the <> section to learn more about the infrastructure setup of this feature.
+
+The MongoDB module additionally registers ``JsonDeserializer``s for the following GeoJSON types via its `GeoJsonConfiguration` exposing the `GeoJsonModule`.
+----
+org.springframework.data.mongodb.core.geo.GeoJsonPoint
+org.springframework.data.mongodb.core.geo.GeoJsonMultiPoint
+org.springframework.data.mongodb.core.geo.GeoJsonLineString
+org.springframework.data.mongodb.core.geo.GeoJsonMultiLineString
+org.springframework.data.mongodb.core.geo.GeoJsonPolygon
+org.springframework.data.mongodb.core.geo.GeoJsonMultiPolygon
+----
+
+[NOTE]
+====
+The `GeoJsonModule` only registers ``JsonDeserializer``s! +
+To equip the `ObjectMapper` with a symmetric set of ``JsonSerializer``s you need to either manually configure those for the `ObjectMapper` or provide a custom `SpringDataJacksonModules` configuration exposing `GeoJsonModule.serializers()` as a Spring Bean.
+
+[source,java]
+----
+class GeoJsonConfiguration implements SpringDataJacksonModules {
+
+ @Bean
+ public Module geoJsonSerializers() {
+ return GeoJsonModule.serializers();
+ }
+}
+----
+====
+
+[WARNING]
+====
+The next major version (`4.0`) will by default register both, ``JsonDeserializer``s and ``JsonSerializer``s for GeoJSON types.
+====
+
[[mongo.textsearch]]
=== Full-text Queries