Optimize imports

tommysitu · tommysitu · commit 443b5394f654 · 2025-11-12T22:25:16.000Z
diff --git a/core/action/action_test.go b/core/action/action_test.go
@@ -1,12 +1,13 @@
 package action_test
 
 import (
-	"github.com/SpectoLabs/hoverfly/core/journal"
-	"github.com/gorilla/mux"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
+	"github.com/SpectoLabs/hoverfly/core/journal"
+	"github.com/gorilla/mux"
+
 	"github.com/SpectoLabs/hoverfly/core/action"
 	"github.com/SpectoLabs/hoverfly/core/models"
 	. "github.com/onsi/gomega"
diff --git a/core/benchmark_test.go b/core/benchmark_test.go
@@ -4,12 +4,13 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/SpectoLabs/hoverfly/core/handlers/v2"
-	. "github.com/onsi/gomega"
 	"net/http"
 	"os"
 	"testing"
 	"time"
+
+	"github.com/SpectoLabs/hoverfly/core/handlers/v2"
+	. "github.com/onsi/gomega"
 )
 
 func BenchmarkPutSimulationAPI(b *testing.B) {
diff --git a/core/cors/cors_test.go b/core/cors/cors_test.go
@@ -1,10 +1,11 @@
 package cors
 
 import (
-	. "github.com/onsi/gomega"
 	"io"
 	"net/http"
 	"testing"
+
+	. "github.com/onsi/gomega"
 )
 
 func Test_InterceptPreflightRequest_ReturnSuccessResponseWithDefaultHeaders(t *testing.T) {
diff --git a/core/delay/log_normal_generator.go b/core/delay/log_normal_generator.go
@@ -2,8 +2,9 @@ package delay
 
 import (
 	"errors"
-	"gonum.org/v1/gonum/stat/distuv"
 	"math"
+
+	"gonum.org/v1/gonum/stat/distuv"
 )
 
 func ValidateLogNormalDelayOptions(min int, max int, mean int, median int) error {
diff --git a/core/handlers/v2/hoverfly_journalindex_handler.go b/core/handlers/v2/hoverfly_journalindex_handler.go
@@ -2,10 +2,11 @@ package v2
 
 import (
 	"encoding/json"
+	"net/http"
+
 	"github.com/SpectoLabs/hoverfly/core/handlers"
 	"github.com/codegangsta/negroni"
 	"github.com/go-zoo/bone"
-	"net/http"
 )
 
 type HoverflyJournalIndex interface {
diff --git a/core/handlers/v2/hoverfly_journalindex_handler_test.go b/core/handlers/v2/hoverfly_journalindex_handler_test.go
@@ -3,10 +3,11 @@ package v2
 import (
 	"bytes"
 	"encoding/json"
-	. "github.com/onsi/gomega"
 	"io"
 	"net/http"
 	"testing"
+
+	. "github.com/onsi/gomega"
 )
 
 type HoverflyJournalIndexStub struct{}
diff --git a/core/handlers/v2/hoverfly_templatedatasource_handler.go b/core/handlers/v2/hoverfly_templatedatasource_handler.go
@@ -2,10 +2,11 @@ package v2
 
 import (
 	"encoding/json"
+	"net/http"
+
 	"github.com/SpectoLabs/hoverfly/core/handlers"
 	"github.com/codegangsta/negroni"
 	"github.com/go-zoo/bone"
-	"net/http"
 )
 
 type HoverflyTemplateDataSource interface {
diff --git a/core/handlers/v2/journal_handler.go b/core/handlers/v2/journal_handler.go
@@ -4,12 +4,13 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"strconv"
+	"time"
+
 	"github.com/SpectoLabs/hoverfly/core/handlers"
 	"github.com/SpectoLabs/hoverfly/core/util"
 	"github.com/codegangsta/negroni"
 	"github.com/go-zoo/bone"
-	"strconv"
-	"time"
 )
 
 const DefaultJournalLimit = 25
diff --git a/core/handlers/v2/testutils.go b/core/handlers/v2/testutils.go
@@ -3,11 +3,12 @@ package v2
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/SpectoLabs/hoverfly/core/handlers"
-	"github.com/codegangsta/negroni"
 	"io"
 	"net/http"
 	"net/http/httptest"
+
+	"github.com/SpectoLabs/hoverfly/core/handlers"
+	"github.com/codegangsta/negroni"
 )
 
 func makeRequestOnHandler(handlerFunc negroni.HandlerFunc, request *http.Request) *httptest.ResponseRecorder {
diff --git a/core/hoverfly_service.go b/core/hoverfly_service.go
@@ -3,10 +3,11 @@ package hoverfly
 import (
 	"errors"
 	"fmt"
-	"github.com/SpectoLabs/hoverfly/core/templating"
 	"regexp"
 	"sort"
 
+	"github.com/SpectoLabs/hoverfly/core/templating"
+
 	"github.com/SpectoLabs/hoverfly/core/action"
 	"github.com/SpectoLabs/hoverfly/core/delay"
 
diff --git a/core/hoverfly_test.go b/core/hoverfly_test.go
@@ -3,13 +3,14 @@ package hoverfly
 import (
 	"bytes"
 	"fmt"
-	"github.com/SpectoLabs/hoverfly/core/cors"
-	"github.com/SpectoLabs/hoverfly/core/modes"
 	"io"
 	"net/http"
 	"os"
 	"testing"
 
+	"github.com/SpectoLabs/hoverfly/core/cors"
+	"github.com/SpectoLabs/hoverfly/core/modes"
+
 	"github.com/SpectoLabs/hoverfly/core/authentication/backends"
 	"github.com/SpectoLabs/hoverfly/core/cache"
 	"github.com/SpectoLabs/hoverfly/core/handlers/v1"
diff --git a/core/journal/journal_index.go b/core/journal/journal_index.go
@@ -1,11 +1,12 @@
 package journal
 
 import (
+	"strings"
+
 	v2 "github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	"github.com/SpectoLabs/hoverfly/core/models"
 	"github.com/SpectoLabs/hoverfly/core/util"
 	"github.com/SpectoLabs/raymond"
-	"strings"
 )
 
 type Index struct {
diff --git a/core/journal/journal_index_test.go b/core/journal/journal_index_test.go
@@ -1,11 +1,12 @@
 package journal
 
 import (
+	"testing"
+
 	v2 "github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	"github.com/SpectoLabs/hoverfly/core/models"
 	"github.com/SpectoLabs/hoverfly/core/util"
 	. "github.com/onsi/gomega"
-	"testing"
 )
 
 func TestIndex_AddJournalEntry(t *testing.T) {
diff --git a/core/journal/journal_test.go b/core/journal/journal_test.go
@@ -2,7 +2,6 @@ package journal_test
 
 import (
 	"bytes"
-	"github.com/SpectoLabs/hoverfly/core/models"
 	"io"
 	"net/http"
 	"net/url"
@@ -11,6 +10,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/SpectoLabs/hoverfly/core/models"
+
 	"github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	"github.com/SpectoLabs/hoverfly/core/journal"
 	"github.com/SpectoLabs/hoverfly/core/matching/matchers"
diff --git a/core/matching/cache_matcher_test.go b/core/matching/cache_matcher_test.go
@@ -1,12 +1,13 @@
 package matching_test
 
 import (
+	"testing"
+
 	"github.com/SpectoLabs/hoverfly/core/cache"
 	"github.com/SpectoLabs/hoverfly/core/matching"
 	"github.com/SpectoLabs/hoverfly/core/matching/matchers"
 	"github.com/SpectoLabs/hoverfly/core/models"
 	. "github.com/onsi/gomega"
-	"testing"
 )
 
 func Test_CacheMatcher_GetCachedResponse_WillReturnErrorIfCacheIsNil(t *testing.T) {
diff --git a/core/matching/matchers/matcher_value_generator.go b/core/matching/matchers/matcher_value_generator.go
@@ -2,9 +2,10 @@ package matchers
 
 import (
 	"encoding/json"
-	"github.com/SpectoLabs/hoverfly/core/util"
 	"reflect"
 
+	"github.com/SpectoLabs/hoverfly/core/util"
+
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/util/jsonpath"
 )
diff --git a/core/models/delay_log_normal.go b/core/models/delay_log_normal.go
@@ -3,11 +3,12 @@ package models
 import (
 	"errors"
 	"fmt"
-	coreDelay "github.com/SpectoLabs/hoverfly/core/delay"
 	"regexp"
 	"strings"
 	"time"
 
+	coreDelay "github.com/SpectoLabs/hoverfly/core/delay"
+
 	"github.com/SpectoLabs/hoverfly/core/handlers/v1"
 	log "github.com/sirupsen/logrus"
 )
diff --git a/core/models/request_matcher.go b/core/models/request_matcher.go
@@ -2,6 +2,7 @@ package models
 
 import (
 	"encoding/json"
+
 	v2 "github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	"github.com/SpectoLabs/hoverfly/core/matching/matchers"
 	"github.com/SpectoLabs/hoverfly/core/util"
diff --git a/core/modes/diff_mode.go b/core/modes/diff_mode.go
@@ -6,16 +6,17 @@ import (
 	"compress/gzip"
 	"encoding/json"
 	"fmt"
+	"io"
+	"net/http"
+	"reflect"
+	"time"
+
 	"github.com/SpectoLabs/hoverfly/core/errors"
 	"github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	"github.com/SpectoLabs/hoverfly/core/models"
 	"github.com/SpectoLabs/hoverfly/core/util"
 	"github.com/dsnet/compress/brotli"
 	log "github.com/sirupsen/logrus"
-	"io"
-	"net/http"
-	"reflect"
-	"time"
 )
 
 type HoverflyDiff interface {
diff --git a/core/modes/modes_test.go b/core/modes/modes_test.go
@@ -2,11 +2,12 @@ package modes_test
 
 import (
 	"errors"
-	"github.com/SpectoLabs/hoverfly/core/util"
 	"io"
 	"net/http"
 	"testing"
 
+	"github.com/SpectoLabs/hoverfly/core/util"
+
 	"github.com/SpectoLabs/hoverfly/core/models"
 	"github.com/SpectoLabs/hoverfly/core/modes"
 	. "github.com/onsi/gomega"
diff --git a/core/templating/datasource_test.go b/core/templating/datasource_test.go
@@ -1,9 +1,10 @@
 package templating
 
 import (
+	"testing"
+
 	v2 "github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	. "github.com/onsi/gomega"
-	"testing"
 )
 
 func Test_NewDataSourceMethod(t *testing.T) {
diff --git a/core/util/util.go b/core/util/util.go
@@ -7,13 +7,7 @@ import (
 	"encoding/json"
 	encoding_xml "encoding/xml"
 	"fmt"
-	"github.com/ChrisTrenkamp/xsel/exec"
-	"github.com/ChrisTrenkamp/xsel/grammar"
-	"github.com/ChrisTrenkamp/xsel/parser"
-	"github.com/ChrisTrenkamp/xsel/store"
-	log "github.com/sirupsen/logrus"
 	"io"
-	"k8s.io/client-go/util/jsonpath"
 	"math/big"
 	"math/rand"
 	"net/http"
@@ -27,6 +21,13 @@ import (
 	"time"
 	"unicode/utf8"
 
+	"github.com/ChrisTrenkamp/xsel/exec"
+	"github.com/ChrisTrenkamp/xsel/grammar"
+	"github.com/ChrisTrenkamp/xsel/parser"
+	"github.com/ChrisTrenkamp/xsel/store"
+	log "github.com/sirupsen/logrus"
+	"k8s.io/client-go/util/jsonpath"
+
 	xj "github.com/SpectoLabs/goxml2json"
 	"github.com/tdewolff/minify/v2"
 	mjson "github.com/tdewolff/minify/v2/json"
diff --git a/functional-tests/core/api/cors_api_v2_test.go b/functional-tests/core/api/cors_api_v2_test.go
@@ -1,11 +1,12 @@
 package api_test
 
 import (
+	"io/ioutil"
+
 	"github.com/SpectoLabs/hoverfly/functional-tests"
 	"github.com/dghubble/sling"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"io/ioutil"
 )
 
 var _ = Describe("/api/v2/hoverfly/cors", func() {
diff --git a/functional-tests/core/ft_cors_test.go b/functional-tests/core/ft_cors_test.go
@@ -1,13 +1,14 @@
 package hoverfly_test
 
 import (
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+
 	"github.com/SpectoLabs/hoverfly/functional-tests"
 	"github.com/dghubble/sling"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
 )
 
 var _ = Describe("When I run Hoverfly", func() {
diff --git a/functional-tests/core/ft_import_test.go b/functional-tests/core/ft_import_test.go
@@ -2,12 +2,13 @@ package hoverfly_test
 
 import (
 	"encoding/json"
+	"io/ioutil"
+
 	v2 "github.com/SpectoLabs/hoverfly/core/handlers/v2"
 	"github.com/SpectoLabs/hoverfly/functional-tests"
 	"github.com/SpectoLabs/hoverfly/functional-tests/testdata"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"io/ioutil"
 )
 
 var _ = Describe("When I run Hoverfly", func() {
diff --git a/functional-tests/core/ft_journal_indexing_test.go b/functional-tests/core/ft_journal_indexing_test.go
@@ -1,15 +1,16 @@
 package hoverfly_test
 
 import (
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+
 	functional_tests "github.com/SpectoLabs/hoverfly/functional-tests"
 	"github.com/SpectoLabs/hoverfly/functional-tests/testdata"
 	"github.com/dghubble/sling"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"strings"
 )
 
 var _ = Describe("Manage journal indexing in hoverfly", func() {
diff --git a/functional-tests/core/ft_postserveaction_test.go b/functional-tests/core/ft_postserveaction_test.go
diff --git a/functional-tests/core/ft_proxy_https_test.go b/functional-tests/core/ft_proxy_https_test.go
diff --git a/functional-tests/hoverctl/import_export_test.go b/functional-tests/hoverctl/import_export_test.go
diff --git a/functional-tests/hoverctl/simulation_test.go b/functional-tests/hoverctl/simulation_test.go
diff --git a/hoverctl/cmd/bash_completion.go b/hoverctl/cmd/bash_completion.go
diff --git a/hoverctl/cmd/journalindex.go b/hoverctl/cmd/journalindex.go
diff --git a/hoverctl/cmd/simulation.go b/hoverctl/cmd/simulation.go
diff --git a/hoverctl/cmd/utils.go b/hoverctl/cmd/utils.go
diff --git a/hoverctl/configuration/config_test.go b/hoverctl/configuration/config_test.go
diff --git a/hoverctl/wrapper/current_state.go b/hoverctl/wrapper/current_state.go
diff --git a/hoverctl/wrapper/destination.go b/hoverctl/wrapper/destination.go
diff --git a/hoverctl/wrapper/journalindex.go b/hoverctl/wrapper/journalindex.go
diff --git a/hoverctl/wrapper/templatedatasource.go b/hoverctl/wrapper/templatedatasource.go

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@ package delay`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`		`- "gonum.org/v1/gonum/stat/distuv"`
`6`	`5`	`"math"`
	`6`	`+`
	`7`	`+ "gonum.org/v1/gonum/stat/distuv"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func ValidateLogNormalDelayOptions(min int, max int, mean int, median int) error {`