Adjusting SpanTermQuery to work w/ latest changes.

One final refactoring of the SpanTermQuery - makes sure the class hierarchy works again.

Relates to #10217
This commit is contained in:
Isabel Drost-Fromm 2015-05-15 16:15:55 +02:00
parent 65f2641695
commit 7a7c7f4716
9 changed files with 11 additions and 9 deletions

View File

@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
public class FieldMaskingSpanQueryBuilder extends SpanQueryBuilder implements BoostableQueryBuilder<FieldMaskingSpanQueryBuilder> {
public class FieldMaskingSpanQueryBuilder extends QueryBuilder implements SpanQueryBuilder, BoostableQueryBuilder<FieldMaskingSpanQueryBuilder> {
private final SpanQueryBuilder queryBuilder;

View File

@ -26,7 +26,7 @@ import java.io.IOException;
/**
* Builder for {@link org.apache.lucene.search.spans.SpanContainingQuery}.
*/
public class SpanContainingQueryBuilder extends SpanQueryBuilder implements BoostableQueryBuilder<SpanContainingQueryBuilder> {
public class SpanContainingQueryBuilder extends QueryBuilder implements SpanQueryBuilder, BoostableQueryBuilder<SpanContainingQueryBuilder> {
private SpanQueryBuilder big;
private SpanQueryBuilder little;

View File

@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
public class SpanFirstQueryBuilder extends SpanQueryBuilder implements BoostableQueryBuilder<SpanFirstQueryBuilder> {
public class SpanFirstQueryBuilder extends QueryBuilder implements SpanQueryBuilder, BoostableQueryBuilder<SpanFirstQueryBuilder> {
private final SpanQueryBuilder matchBuilder;

View File

@ -22,7 +22,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
public class SpanMultiTermQueryBuilder extends SpanQueryBuilder {
public class SpanMultiTermQueryBuilder extends QueryBuilder implements SpanQueryBuilder {
private MultiTermQueryBuilder multiTermQueryBuilder;

View File

@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
import java.util.ArrayList;
public class SpanNearQueryBuilder extends SpanQueryBuilder implements BoostableQueryBuilder<SpanNearQueryBuilder> {
public class SpanNearQueryBuilder extends QueryBuilder implements SpanQueryBuilder, BoostableQueryBuilder<SpanNearQueryBuilder> {
private ArrayList<SpanQueryBuilder> clauses = new ArrayList<>();

View File

@ -23,7 +23,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
public class SpanNotQueryBuilder extends SpanQueryBuilder implements BoostableQueryBuilder<SpanNotQueryBuilder> {
public class SpanNotQueryBuilder extends QueryBuilder implements SpanQueryBuilder, BoostableQueryBuilder<SpanNotQueryBuilder> {
private SpanQueryBuilder include;

View File

@ -24,7 +24,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
import java.util.ArrayList;
public class SpanOrQueryBuilder extends SpanQueryBuilder implements BoostableQueryBuilder<SpanOrQueryBuilder> {
public class SpanOrQueryBuilder extends QueryBuilder implements SpanQueryBuilder, BoostableQueryBuilder<SpanOrQueryBuilder> {
private ArrayList<SpanQueryBuilder> clauses = new ArrayList<>();

View File

@ -19,6 +19,8 @@
package org.elasticsearch.index.query;
public interface SpanQueryBuilder {
import org.elasticsearch.common.xcontent.ToXContent;
public interface SpanQueryBuilder extends ToXContent {
}

View File

@ -26,7 +26,7 @@ import java.io.IOException;
/**
* Builder for {@link org.apache.lucene.search.spans.SpanWithinQuery}.
*/
public class SpanWithinQueryBuilder extends SpanQueryBuilder implements BoostableQueryBuilder<SpanWithinQueryBuilder> {
public class SpanWithinQueryBuilder extends QueryBuilder implements SpanQueryBuilder, BoostableQueryBuilder<SpanWithinQueryBuilder> {
private SpanQueryBuilder big;
private SpanQueryBuilder little;