Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-07-02 00:32:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed GeoEnvelope to GeoBox

Browse Source
This commit is contained in:
Artur Konczak 2013-09-27 22:58:26 +01:00
parent 714bcf87fe
commit bb81fa75db
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/elasticsearch/core/CriteriaFilterProcessor.java
View File

@ -16,7 +16,7 @@
package org.springframework.data.elasticsearch.core; package org.springframework.data.elasticsearch.core;
import org.elasticsearch.index.query.*; import org.elasticsearch.index.query.*;
import org.springframework.data.elasticsearch.core.geo.GeoEnvelope; import org.springframework.data.elasticsearch.core.geo.GeoBox;
import org.springframework.data.elasticsearch.core.geo.GeoPoint; import org.springframework.data.elasticsearch.core.geo.GeoPoint;
import org.springframework.data.elasticsearch.core.query.Criteria; import org.springframework.data.elasticsearch.core.query.Criteria;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@ -152,8 +152,8 @@ class CriteriaFilterProcessor {
} }
private void oneParameterBBox(GeoBoundingBoxFilterBuilder filter, Object value) { private void oneParameterBBox(GeoBoundingBoxFilterBuilder filter, Object value) {
Assert.isTrue(value instanceof GeoEnvelope, "single-element of a geo bbox filter must be type of GeoEnvelop"); Assert.isTrue(value instanceof GeoBox, "single-element of a geo bbox filter must be type of GeoEnvelop");
GeoEnvelope geoBBox = (GeoEnvelope) value; GeoBox geoBBox = (GeoBox) value;
filter.topLeft(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon()); filter.topLeft(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon());
filter.bottomRight(geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon()); filter.bottomRight(geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon());
} }

4
src/main/java/org/springframework/data/elasticsearch/core/geo/GeoEnvelope.java → src/main/java/org/springframework/data/elasticsearch/core/geo/GeoBox.java
View File

@ -20,12 +20,12 @@ package org.springframework.data.elasticsearch.core.geo;
* *
* @author Franck Marchand * @author Franck Marchand
*/ */
public class GeoEnvelope { public class GeoBox {
private GeoPoint topLeft; private GeoPoint topLeft;
private GeoPoint bottomRight; private GeoPoint bottomRight;
public GeoEnvelope(GeoPoint topLeft, GeoPoint bottomRight) { public GeoBox(GeoPoint topLeft, GeoPoint bottomRight) {
this.topLeft = topLeft; this.topLeft = topLeft;
this.bottomRight = bottomRight; this.bottomRight = bottomRight;
} }

6
src/main/java/org/springframework/data/elasticsearch/core/query/Criteria.java
View File

@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.elasticsearch.core.geo.GeoEnvelope; import org.springframework.data.elasticsearch.core.geo.GeoBox;
import org.springframework.data.elasticsearch.core.geo.GeoPoint; import org.springframework.data.elasticsearch.core.geo.GeoPoint;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@ -387,10 +387,10 @@ public class Criteria {
/** /**
* Creates new CriteriaEntry for {@code location BBOX bounding box} * Creates new CriteriaEntry for {@code location BBOX bounding box}
* *
* @param bbox {@link org.springframework.data.elasticsearch.core.geo.GeoEnvelope} bounding box(left top corner + right bottom corner) * @param bbox {@link org.springframework.data.elasticsearch.core.geo.GeoBox} bounding box(left top corner + right bottom corner)
* @return Criteria the chaind criteria with the new 'bbox' criteria included. * @return Criteria the chaind criteria with the new 'bbox' criteria included.
*/ */
public Criteria bbox(GeoEnvelope bbox) { public Criteria bbox(GeoBox bbox) {
Assert.notNull(bbox, "bbox value for bbox criteria must not be null"); Assert.notNull(bbox, "bbox value for bbox criteria must not be null");
filterCriteria.add(new CriteriaEntry(OperationKey.BBOX, new Object[]{bbox})); filterCriteria.add(new CriteriaEntry(OperationKey.BBOX, new Object[]{bbox}));
return this; return this;

2
src/test/java/org/springframework/data/elasticsearch/core/geo/ElasticsearchTemplateGeoTests.java
View File

@ -191,7 +191,7 @@ public class ElasticsearchTemplateGeoTests {
loadClassBaseEntities(); loadClassBaseEntities();
CriteriaQuery geoLocationCriteriaQuery3 = new CriteriaQuery( CriteriaQuery geoLocationCriteriaQuery3 = new CriteriaQuery(
new Criteria("location").bbox( new Criteria("location").bbox(
new GeoEnvelope(new GeoPoint(53.5171d, 0), new GeoBox(new GeoPoint(53.5171d, 0),
new GeoPoint(49.5171d, 0.2062d)))); new GeoPoint(49.5171d, 0.2062d))));
//when //when
List<AuthorMarkerEntity> geoAuthorsForGeoCriteria3 = elasticsearchTemplate.queryForList(geoLocationCriteriaQuery3, AuthorMarkerEntity.class); List<AuthorMarkerEntity> geoAuthorsForGeoCriteria3 = elasticsearchTemplate.queryForList(geoLocationCriteriaQuery3, AuthorMarkerEntity.class);