FIX: Add /v2 to import pathes in packages & Fix test for regexp & fuzzy

sdqri · Aug 21, 2024 · 082fd39 · 082fd39
1 parent 5690699
commit 082fd39
Show file tree

Hide file tree

Showing 45 changed files with 58 additions and 58 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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