Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-626 - Added formatters for Point and Distance.

Browse Source 
Ported Spring Data REST's converters for Distance and Point and turned them into Formatter instances. Extended Metric interface to return an abbreviation. Added getUnit() to Distance and tweaked Jackson setup to ignore the additional property.

We now automatically register the news introduced Formatters when using @EnableSpringDataWebSupport so that Point and Distance values can be parsed and printed from and to Strings out of the box.
This commit is contained in:
Oliver Gierke
2015-01-04 16:42:05 +01:00
parent d4a09853f1
commit 23cad97b9a
12 changed files with 511 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/java/org/springframework/data/geo/DistanceUnitTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2014 the original author or authors.
* Copyright 2011-2015 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.
@@ -137,4 +137,12 @@ public class DistanceUnitTests {
Distance serialized = (Distance) SerializationUtils.deserialize(SerializationUtils.serialize(dist));
assertThat(serialized, is(dist));
}
/**
* @see DATACMNS-626
*/
@Test
public void returnsMetricsAbbreviationAsUnit() {
assertThat(new Distance(10, KILOMETERS).getUnit(), is("km"));
}
}

98
src/test/java/org/springframework/data/geo/format/DistanceFormatterUnitTests.java Normal file
View File

@@ -0,0 +1,98 @@
/*
* Copyright 2014-2015 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
*
* http://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.geo.format;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.springframework.data.geo.format.DistanceFormatter.*;
import java.text.ParseException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Locale;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.springframework.data.geo.Distance;
import org.springframework.data.geo.Metrics;
/**
* Unit tests for {@link DistanceFormatter}.
*
* @author Oliver Gierke
*/
@RunWith(Enclosed.class)
public class DistanceFormatterUnitTests {
static Distance REFERENCE = new Distance(10.8, Metrics.KILOMETERS);
public static class UnparameterizedTests {
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test(expected = IllegalArgumentException.class)
public void rejectsArbitraryNonsense() {
INSTANCE.convert("foo");
}
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test(expected = IllegalArgumentException.class)
public void rejectsUnsupportedMetric() {
INSTANCE.convert("10.8cm");
}
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test
public void printsDistance() {
assertThat(INSTANCE.print(REFERENCE, Locale.US), is("10.8km"));
}
}
@RunWith(Parameterized.class)
public static class ParameterizedTests {
@Parameters
public static Collection<String[]> parameters() {
return Arrays.asList(new String[] { "10.8km" }, new String[] { " 10.8km" }, new String[] { " 10.8 km" },
new String[] { " 10.8 km " }, new String[] { " 10.8 KM" }, new String[] { " 10.8 kilometers" },
new String[] { " 10.8 KILOMETERS" }, new String[] { " 10.8 KILOMETERS " });
}
public @Parameter String source;
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test
public void parsesDistanceFromString() {
assertThat(INSTANCE.convert(source), is(REFERENCE));
}
@Test
public void parsesDistances() throws ParseException {
assertThat(INSTANCE.parse(source, Locale.US), is(REFERENCE));
}
}
}

104
src/test/java/org/springframework/data/geo/format/PointFormatterUnitTests.java Normal file
View File

@@ -0,0 +1,104 @@
/*
* Copyright 2014-2015 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
*
* http://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.geo.format;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.springframework.data.geo.format.PointFormatter.*;
import java.text.ParseException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Locale;
import org.junit.Test;
import org.junit.experimental.runners.Enclosed;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameter;
import org.junit.runners.Parameterized.Parameters;
import org.springframework.data.geo.Point;
/**
* Unit tests for {@link PointFormatter}.
*
* @author Oliver Gierke
*/
@RunWith(Enclosed.class)
public class PointFormatterUnitTests {
static Point REFERENCE = new Point(20.9, 10.8);
@Test
public void testname() {
// To make sure Maven picks up the tests
}
public static class UnparameterizedTests {
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test(expected = IllegalArgumentException.class)
public void rejectsArbitraryNonsense() {
INSTANCE.convert("foo");
}
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test(expected = IllegalArgumentException.class)
public void rejectsMoreThanTwoCoordinates() {
INSTANCE.convert("10.8,20.9,30.10");
}
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test(expected = IllegalArgumentException.class)
public void rejectsInvalidCoordinate() {
INSTANCE.convert("10.8,foo");
}
}
@RunWith(Parameterized.class)
public static class ParameterizedTests {
@Parameters
public static Collection<String[]> parameters() {
return Arrays.asList(new String[] { "10.8,20.9" }, new String[] { " 10.8,20.9 " },
new String[] { " 10.8 ,20.9" }, new String[] { " 10.8, 20.9 " });
}
public @Parameter String source;
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test
public void convertsPointFromString() {
assertThat(INSTANCE.convert(source), is(REFERENCE));
}
/**
* @see DATAREST-279, DATACMNS-626
*/
@Test
public void parsesPoint() throws ParseException {
assertThat(INSTANCE.parse(source, Locale.US), is(REFERENCE));
}
}
}