diff --git a/effdsl_test.go b/effdsl_test.go index 1074549..aa837ff 100644 --- a/effdsl_test.go +++ b/effdsl_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" - effdsl "github.com/sdqri/effdsl" - bq "github.com/sdqri/effdsl/queries/boolquery" - eq "github.com/sdqri/effdsl/queries/existsquery" - qs "github.com/sdqri/effdsl/queries/querystring" - rq "github.com/sdqri/effdsl/queries/rangequery" - tq "github.com/sdqri/effdsl/queries/termquery" + "github.com/sdqri/effdsl/v2" + bq "github.com/sdqri/effdsl/v2/queries/boolquery" + eq "github.com/sdqri/effdsl/v2/queries/existsquery" + qs "github.com/sdqri/effdsl/v2/queries/querystring" + rq "github.com/sdqri/effdsl/v2/queries/rangequery" + tq "github.com/sdqri/effdsl/v2/queries/termquery" ) func TestWithQuery(t *testing.T) { diff --git a/queries/boolquery/bool_query.go b/queries/boolquery/bool_query.go index 9b50aa9..7b13e0a 100644 --- a/queries/boolquery/bool_query.go +++ b/queries/boolquery/bool_query.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type CompoundQueries string diff --git a/queries/boolquery/bool_query_test.go b/queries/boolquery/bool_query_test.go index 4e03e31..b465314 100644 --- a/queries/boolquery/bool_query_test.go +++ b/queries/boolquery/bool_query_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - effdsl "github.com/sdqri/effdsl" - bq "github.com/sdqri/effdsl/queries/boolquery" + effdsl "github.com/sdqri/effdsl/v2" + bq "github.com/sdqri/effdsl/v2/queries/boolquery" ) func TestBoolQuery(t *testing.T) { diff --git a/queries/boostingquery/boosting_query.go b/queries/boostingquery/boosting_query.go index d0d1ff9..33599d8 100644 --- a/queries/boostingquery/boosting_query.go +++ b/queries/boostingquery/boosting_query.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type BoostingQueryS struct { diff --git a/queries/boostingquery/boosting_query_test.go b/queries/boostingquery/boosting_query_test.go index 124cac7..8d821bd 100644 --- a/queries/boostingquery/boosting_query_test.go +++ b/queries/boostingquery/boosting_query_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - bq "github.com/sdqri/effdsl/queries/boostingquery" - tq "github.com/sdqri/effdsl/queries/termquery" + bq "github.com/sdqri/effdsl/v2/queries/boostingquery" + tq "github.com/sdqri/effdsl/v2/queries/termquery" ) func TestBoostingQuery(t *testing.T) { diff --git a/queries/constantscore/constant_score.go b/queries/constantscore/constant_score.go index 214a0fa..ff53a34 100644 --- a/queries/constantscore/constant_score.go +++ b/queries/constantscore/constant_score.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type ConstantScoreQueryS struct { diff --git a/queries/constantscore/constant_score_test.go b/queries/constantscore/constant_score_test.go index 9a7ca5b..dbef57d 100644 --- a/queries/constantscore/constant_score_test.go +++ b/queries/constantscore/constant_score_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - cs "github.com/sdqri/effdsl/queries/constantscore" - tq "github.com/sdqri/effdsl/queries/termquery" + cs "github.com/sdqri/effdsl/v2/queries/constantscore" + tq "github.com/sdqri/effdsl/v2/queries/termquery" ) func TestConstantScoreQuery_WithAllOptions(t *testing.T) { diff --git a/queries/dismaxquery/dis_max_query.go b/queries/dismaxquery/dis_max_query.go index 7e2225b..ce0e973 100644 --- a/queries/dismaxquery/dis_max_query.go +++ b/queries/dismaxquery/dis_max_query.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type DisMaxQueryS struct { diff --git a/queries/dismaxquery/dis_max_query_test.go b/queries/dismaxquery/dis_max_query_test.go index 1dad0e0..b8b6b30 100644 --- a/queries/dismaxquery/dis_max_query_test.go +++ b/queries/dismaxquery/dis_max_query_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/sdqri/effdsl" - dmq "github.com/sdqri/effdsl/queries/dismaxquery" - tq "github.com/sdqri/effdsl/queries/termquery" + "github.com/sdqri/effdsl/v2" + dmq "github.com/sdqri/effdsl/v2/queries/dismaxquery" + tq "github.com/sdqri/effdsl/v2/queries/termquery" ) func TestDisMaxQuery(t *testing.T) { diff --git a/queries/existsquery/exists_query.go b/queries/existsquery/exists_query.go index 84ee5e3..06af109 100644 --- a/queries/existsquery/exists_query.go +++ b/queries/existsquery/exists_query.go @@ -3,7 +3,7 @@ package existsquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type ExistsQueryS struct { diff --git a/queries/existsquery/exists_query_test.go b/queries/existsquery/exists_query_test.go index baeb8b3..1852eda 100644 --- a/queries/existsquery/exists_query_test.go +++ b/queries/existsquery/exists_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - eq "github.com/sdqri/effdsl/queries/existsquery" + eq "github.com/sdqri/effdsl/v2/queries/existsquery" ) func TestNewExistsQuery(t *testing.T) { diff --git a/queries/fuzzyquery/fuzzy_query.go b/queries/fuzzyquery/fuzzy_query.go index 5a06500..4791244 100644 --- a/queries/fuzzyquery/fuzzy_query.go +++ b/queries/fuzzyquery/fuzzy_query.go @@ -3,7 +3,7 @@ package fuzzyquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) // FuzzyQueryS represents a query that matches documents containing terms diff --git a/queries/fuzzyquery/fuzzy_query_test.go b/queries/fuzzyquery/fuzzy_query_test.go index 0fcb079..9ae23e4 100644 --- a/queries/fuzzyquery/fuzzy_query_test.go +++ b/queries/fuzzyquery/fuzzy_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - fq "github.com/sdqri/effdsl/queries/fuzzyquery" + fq "github.com/sdqri/effdsl/v2/queries/fuzzyquery" ) func TestFuzzyQuery_WithNoOptions(t *testing.T) { diff --git a/queries/idsquery/ids_query.go b/queries/idsquery/ids_query.go index a0e516f..818a3d5 100644 --- a/queries/idsquery/ids_query.go +++ b/queries/idsquery/ids_query.go @@ -3,7 +3,7 @@ package idsquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) // IDsQueryS represents the structure of the IDs query. diff --git a/queries/idsquery/ids_query_test.go b/queries/idsquery/ids_query_test.go index 437736e..a479101 100644 --- a/queries/idsquery/ids_query_test.go +++ b/queries/idsquery/ids_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - iq "github.com/sdqri/effdsl/queries/idsquery" + iq "github.com/sdqri/effdsl/v2/queries/idsquery" ) func TestIDsQuery(t *testing.T) { diff --git a/queries/matchboolprefix/match_boolean_prefix.go b/queries/matchboolprefix/match_boolean_prefix.go index 556dd0a..859e92d 100644 --- a/queries/matchboolprefix/match_boolean_prefix.go +++ b/queries/matchboolprefix/match_boolean_prefix.go @@ -3,7 +3,7 @@ package matchboolprefix import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type MatchBoolPrefixQueryS struct { diff --git a/queries/matchboolprefix/match_boolean_prefix_test.go b/queries/matchboolprefix/match_boolean_prefix_test.go index f39768a..0707c9d 100644 --- a/queries/matchboolprefix/match_boolean_prefix_test.go +++ b/queries/matchboolprefix/match_boolean_prefix_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - mbpq "github.com/sdqri/effdsl/queries/matchboolprefix" + mbpq "github.com/sdqri/effdsl/v2/queries/matchboolprefix" ) func TestNewMatchBoolPrefixQueryWithAnalyzer(t *testing.T) { diff --git a/queries/matchphraseprefix/match_phrase_prefix.go b/queries/matchphraseprefix/match_phrase_prefix.go index 0641b92..302ed50 100644 --- a/queries/matchphraseprefix/match_phrase_prefix.go +++ b/queries/matchphraseprefix/match_phrase_prefix.go @@ -3,7 +3,7 @@ package matchphraseprefix import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type MatchPhrasePrefixQueryS struct { diff --git a/queries/matchphraseprefix/match_phrase_prefix_test.go b/queries/matchphraseprefix/match_phrase_prefix_test.go index 05b3de4..4c36ae9 100644 --- a/queries/matchphraseprefix/match_phrase_prefix_test.go +++ b/queries/matchphraseprefix/match_phrase_prefix_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - mppq "github.com/sdqri/effdsl/queries/matchphraseprefix" + mppq "github.com/sdqri/effdsl/v2/queries/matchphraseprefix" ) func TestNewMatchPhrasePrefixQueryWithNoOptions(t *testing.T) { diff --git a/queries/matchphrasequery/match_phrase_query.go b/queries/matchphrasequery/match_phrase_query.go index 2acc0c0..e0a915f 100644 --- a/queries/matchphrasequery/match_phrase_query.go +++ b/queries/matchphrasequery/match_phrase_query.go @@ -3,7 +3,7 @@ package matchphrasequery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type MatchPhraseQueryS struct { diff --git a/queries/matchphrasequery/match_phrase_query_test.go b/queries/matchphrasequery/match_phrase_query_test.go index 47275bf..68de2af 100644 --- a/queries/matchphrasequery/match_phrase_query_test.go +++ b/queries/matchphrasequery/match_phrase_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - mpq "github.com/sdqri/effdsl/queries/matchphrasequery" + mpq "github.com/sdqri/effdsl/v2/queries/matchphrasequery" ) func TestNewMatchPhraseQueryWithNoOptions(t *testing.T) { diff --git a/queries/matchquery/match_query.go b/queries/matchquery/match_query.go index 61de502..ec1ecfd 100644 --- a/queries/matchquery/match_query.go +++ b/queries/matchquery/match_query.go @@ -3,7 +3,7 @@ package matchquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type MatchQueryS struct { diff --git a/queries/matchquery/match_query_test.go b/queries/matchquery/match_query_test.go index b126b49..5cfac8d 100644 --- a/queries/matchquery/match_query_test.go +++ b/queries/matchquery/match_query_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - mq "github.com/sdqri/effdsl/queries/matchquery" + mq "github.com/sdqri/effdsl/v2/queries/matchquery" ) func Test_MatchQueryS_MarshalJSON(t *testing.T) { diff --git a/queries/prefixquery/prefix_query.go b/queries/prefixquery/prefix_query.go index ed5e21a..afdddd3 100644 --- a/queries/prefixquery/prefix_query.go +++ b/queries/prefixquery/prefix_query.go @@ -3,7 +3,7 @@ package prefixquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) // PrefixQueryS represents a query that matches documents containing terms diff --git a/queries/prefixquery/prefix_query_test.go b/queries/prefixquery/prefix_query_test.go index 58d56c0..23d819a 100644 --- a/queries/prefixquery/prefix_query_test.go +++ b/queries/prefixquery/prefix_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - pq "github.com/sdqri/effdsl/queries/prefixquery" + pq "github.com/sdqri/effdsl/v2/queries/prefixquery" ) func TestPrefixQuery_WithNoOptions(t *testing.T) { diff --git a/queries/querystring/query_string.go b/queries/querystring/query_string.go index 90abeac..c3dc4dd 100644 --- a/queries/querystring/query_string.go +++ b/queries/querystring/query_string.go @@ -3,7 +3,7 @@ package querystring import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type QueryStringS struct { diff --git a/queries/querystring/query_string_test.go b/queries/querystring/query_string_test.go index bf3095e..fe6be10 100644 --- a/queries/querystring/query_string_test.go +++ b/queries/querystring/query_string_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - qs "github.com/sdqri/effdsl/queries/querystring" + qs "github.com/sdqri/effdsl/v2/queries/querystring" ) func TestQueryString(t *testing.T) { diff --git a/queries/rangequery/range_query.go b/queries/rangequery/range_query.go index 4bd6135..fba49ab 100644 --- a/queries/rangequery/range_query.go +++ b/queries/rangequery/range_query.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type RangeQueryS struct { diff --git a/queries/rangequery/range_query_test.go b/queries/rangequery/range_query_test.go index 94f242e..1d17e7f 100644 --- a/queries/rangequery/range_query_test.go +++ b/queries/rangequery/range_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - rq "github.com/sdqri/effdsl/queries/rangequery" + rq "github.com/sdqri/effdsl/v2/queries/rangequery" ) func TestNewRangeQueryWithNoOptions(t *testing.T) { diff --git a/queries/regexpquery/regexp_query.go b/queries/regexpquery/regexp_query.go index fe853ec..0da7c65 100644 --- a/queries/regexpquery/regexp_query.go +++ b/queries/regexpquery/regexp_query.go @@ -3,7 +3,7 @@ package regexpquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) // RegexpQueryS represents a query that matches documents containing terms diff --git a/queries/regexpquery/regexp_query_test.go b/queries/regexpquery/regexp_query_test.go index 913be69..480ad4f 100644 --- a/queries/regexpquery/regexp_query_test.go +++ b/queries/regexpquery/regexp_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - rq "github.com/sdqri/effdsl/queries/regexpquery" + rq "github.com/sdqri/effdsl/v2/queries/regexpquery" ) func TestRegexpQuery_WithNoOptions(t *testing.T) { @@ -20,7 +20,7 @@ func TestRegexpQuery_WithNoOptions(t *testing.T) { } func TestRegexpQuery_WithAllOptions(t *testing.T) { - expectedBody := `{"regexp":{"fake_field":{"value":"fake_value","flags":"fake_flags","case_insensitive":true,"max_determinized_states":100,"rewrite":"fake_rewrite"}}}` + expectedBody := `{"regexp":{"fake_field":{"value":"fake_value","flags":"fake_flags","case_insensitive":true,"max_determinized_states":100,"rewrite":"constant_score"}}}` regexpQueryResult := rq.RegexpQuery( "fake_field", "fake_value", diff --git a/queries/simplequerystring/simple_query_string.go b/queries/simplequerystring/simple_query_string.go index 253a6b4..5952852 100644 --- a/queries/simplequerystring/simple_query_string.go +++ b/queries/simplequerystring/simple_query_string.go @@ -3,7 +3,7 @@ package simplequerystring import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type Simple struct { diff --git a/queries/simplequerystring/simple_query_string_test.go b/queries/simplequerystring/simple_query_string_test.go index 29c429f..f9681a3 100644 --- a/queries/simplequerystring/simple_query_string_test.go +++ b/queries/simplequerystring/simple_query_string_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - sqs "github.com/sdqri/effdsl/queries/simplequerystring" + sqs "github.com/sdqri/effdsl/v2/queries/simplequerystring" ) func TestQueryString(t *testing.T) { diff --git a/queries/termquery/term_query.go b/queries/termquery/term_query.go index 7bd2eae..2084cd5 100644 --- a/queries/termquery/term_query.go +++ b/queries/termquery/term_query.go @@ -3,7 +3,7 @@ package termquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type TermQueryS struct { diff --git a/queries/termquery/term_query_test.go b/queries/termquery/term_query_test.go index c3adad1..c97e94a 100644 --- a/queries/termquery/term_query_test.go +++ b/queries/termquery/term_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - tq "github.com/sdqri/effdsl/queries/termquery" + tq "github.com/sdqri/effdsl/v2/queries/termquery" ) func TestNewTermQuery(t *testing.T) { diff --git a/queries/termsquery/terms_query.go b/queries/termsquery/terms_query.go index 46a127e..0c8e631 100644 --- a/queries/termsquery/terms_query.go +++ b/queries/termsquery/terms_query.go @@ -3,8 +3,8 @@ package termsquery import ( "encoding/json" - "github.com/sdqri/effdsl" - "github.com/sdqri/effdsl/utils" + "github.com/sdqri/effdsl/v2" + "github.com/sdqri/effdsl/v2/utils" ) type TermsQueryS struct { diff --git a/queries/termsquery/terms_query_test.go b/queries/termsquery/terms_query_test.go index 23953d0..4d39c89 100644 --- a/queries/termsquery/terms_query_test.go +++ b/queries/termsquery/terms_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - tsq "github.com/sdqri/effdsl/queries/termsquery" + tsq "github.com/sdqri/effdsl/v2/queries/termsquery" ) func TestNewTermsQuery(t *testing.T) { diff --git a/queries/termssetquery/terms_set_query.go b/queries/termssetquery/terms_set_query.go index 14269f4..d069100 100644 --- a/queries/termssetquery/terms_set_query.go +++ b/queries/termssetquery/terms_set_query.go @@ -3,7 +3,7 @@ package termssetquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) type TermSetQueryS struct { diff --git a/queries/termssetquery/terms_set_query_test.go b/queries/termssetquery/terms_set_query_test.go index f7ac57b..2d03506 100644 --- a/queries/termssetquery/terms_set_query_test.go +++ b/queries/termssetquery/terms_set_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - tsq "github.com/sdqri/effdsl/queries/termssetquery" + tsq "github.com/sdqri/effdsl/v2/queries/termssetquery" ) func TestNewTermSetQuery_WithTermsOnly(t *testing.T) { diff --git a/queries/wildcardquery/wildcard_query.go b/queries/wildcardquery/wildcard_query.go index d03e8a9..decc924 100644 --- a/queries/wildcardquery/wildcard_query.go +++ b/queries/wildcardquery/wildcard_query.go @@ -3,7 +3,7 @@ package wildcardquery import ( "encoding/json" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-wildcard-query.html diff --git a/queries/wildcardquery/wildcard_query_test.go b/queries/wildcardquery/wildcard_query_test.go index 9f87160..3fe0c8d 100644 --- a/queries/wildcardquery/wildcard_query_test.go +++ b/queries/wildcardquery/wildcard_query_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - wcq "github.com/sdqri/effdsl/queries/wildcardquery" + wcq "github.com/sdqri/effdsl/v2/queries/wildcardquery" ) func Test_WildcardQueryS_MarshalJSON(t *testing.T) { @@ -17,6 +17,6 @@ func Test_WildcardQueryS_MarshalJSON(t *testing.T) { body, err := q.Ok.MarshalJSON() require.NoError(t, err) - const expected = `{"wildcard":{"field_name":{"boost":1,"rewrite":"constant_score","value":"some match query"}}}` + const expected = `{"wildcard":{"field_name":{"boost":1,"rewrite":"constant_score_blended","value":"some match query"}}}` require.Equal(t, expected, string(body)) } diff --git a/search_collapse_test.go b/search_collapse_test.go index e5dcab2..8383f73 100644 --- a/search_collapse_test.go +++ b/search_collapse_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) func TestNewSearchCollapse(t *testing.T) { diff --git a/search_sort_test.go b/search_sort_test.go index c9f095c..1196e12 100644 --- a/search_sort_test.go +++ b/search_sort_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) func TestNewSortClauseWithDefaultOrder(t *testing.T) { diff --git a/search_source_filtering_test.go b/search_source_filtering_test.go index bb72167..675788c 100644 --- a/search_source_filtering_test.go +++ b/search_source_filtering_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) func TestNewSourceFilter(t *testing.T) { diff --git a/search_suggest_test.go b/search_suggest_test.go index 667fbc1..df461d1 100644 --- a/search_suggest_test.go +++ b/search_suggest_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - effdsl "github.com/sdqri/effdsl" + "github.com/sdqri/effdsl/v2" ) func Test_Search_Suggest_MarshalJSON(t *testing.T) {