use uuidutil

adapters/flipp/flipp.go

@@ -9,13 +9,13 @@ import (
 	"strings"
 
 	"github.com/buger/jsonparser"
-	"github.com/gofrs/uuid"
 	"github.com/prebid/go-gdpr/consentconstants"
 	"github.com/prebid/go-gdpr/vendorconsent"
 	"github.com/prebid/openrtb/v19/openrtb2"
 	"github.com/prebid/prebid-server/v2/adapters"
 	"github.com/prebid/prebid-server/v2/config"
 	"github.com/prebid/prebid-server/v2/openrtb_ext"
+	"github.com/prebid/prebid-server/v2/util/uuidutil"
 )
 
 const (
@@ -25,7 +25,7 @@ const (
 	defaultCurrency = "USD"
 )
 
-var uuidGenerator UUIDGenerator
+var uuidGenerator uuidutil.UUIDGenerator
 
 var (
 	count    int64 = 1
@@ -37,17 +37,9 @@ type adapter struct {
 	endpoint string
 }
 
-type UUIDGenerator struct {
-	Generate func() (uuid.UUID, error)
-}
-
-func Generate() (uuid.UUID, error) {
-	return uuid.NewV4()
-}
-
 // Builder builds a new instance of the Flipp adapter for the given bidder with the given config.
 func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server config.Server) (adapters.Bidder, error) {
-	uuidGenerator.Generate = Generate
+	uuidGenerator = uuidutil.UUIDRandomGenerator{}
 	bidder := &adapter{
 		endpoint: config.Endpoint,
 	}
@@ -145,7 +137,7 @@ func (a *adapter) processImp(request *openrtb2.BidRequest, imp openrtb2.Imp) (*a
 		if err != nil {
 			return nil, fmt.Errorf("unable to generate user uuid. %v", err)
 		}
-		userKey = uid.String()
+		userKey = uid
 	}
 
 	keywordsArray := strings.Split(request.Site.Keywords, ",")

adapters/flipp/flipp_test.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/gofrs/uuid"
 	"github.com/prebid/openrtb/v19/openrtb2"
 	"github.com/prebid/prebid-server/v2/adapters/adapterstest"
 	"github.com/prebid/prebid-server/v2/config"
@@ -14,15 +13,17 @@ import (
 
 const fakeUuid = "30470a14-2949-4110-abce-b62d57304ad5"
 
-func GenerateFakeUUID() (uuid.UUID, error) {
-	return uuid.FromStringOrNil(fakeUuid), nil
+type TestUUIDGenerator struct{}
+
+func (TestUUIDGenerator) Generate() (string, error) {
+	return fakeUuid, nil
 }
 
 func TestJsonSamples(t *testing.T) {
 	bidder, buildErr := Builder(openrtb_ext.BidderFlipp, config.Adapter{
 		Endpoint: "http://example.com/pserver"},
 		config.Server{ExternalUrl: "http://hosturl.com", GvlID: 1, DataCenter: "2"})
-	uuidGenerator.Generate = GenerateFakeUUID
+	uuidGenerator = TestUUIDGenerator{}
 
 	if buildErr != nil {
 		t.Fatalf("Builder returned unexpected error %v", buildErr)

go.mod

@@ -15,7 +15,6 @@ require (
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/golang/glog v1.0.0
-	github.com/json-iterator/go v1.1.12
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/lib/pq v1.10.4
 	github.com/mitchellh/copystructure v1.2.0
@@ -47,6 +46,7 @@ require (
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect