honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 02:14:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up enrich processors: (#50957)

Browse Source 
* Fix generics usages.
* Sealed match processor class.
This commit is contained in:
Martijn van Groningen 2020-01-15 08:50:50 +01:00
parent 5b6fa79fd8
commit e76c3d4d32
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/GeoMatchProcessor.java
View File

@ -59,12 +59,11 @@ public final class GeoMatchProcessor extends AbstractEnrichProcessor {
this.shapeRelation = shapeRelation;
}
@SuppressWarnings("unchecked")
@Override
public QueryBuilder getQueryBuilder(Object fieldValue) {
List<Point> points = new ArrayList<>();
if (fieldValue instanceof List) {
List<Object> values = (List<Object>) fieldValue;
List<?> values = (List<?>) fieldValue;
if (values.size() == 2 && values.get(0) instanceof Number) {
GeoPoint geoPoint = GeoUtils.parseGeoPoint(values, true);
points.add(new Point(geoPoint.lon(), geoPoint.lat()));

4
x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/MatchProcessor.java
View File

@ -16,7 +16,7 @@ import org.elasticsearch.script.TemplateScript;
import java.util.List;
import java.util.function.BiConsumer;
public class MatchProcessor extends AbstractEnrichProcessor {
public final class MatchProcessor extends AbstractEnrichProcessor {
MatchProcessor(
String tag,
@ -50,7 +50,7 @@ public class MatchProcessor extends AbstractEnrichProcessor {
@Override
public QueryBuilder getQueryBuilder(Object fieldValue) {
if (fieldValue instanceof List) {
return new TermsQueryBuilder(matchField, (List) fieldValue);
return new TermsQueryBuilder(matchField, (List<?>) fieldValue);
} else {
return new TermQueryBuilder(matchField, fieldValue);
}