From c98b13c8339e79adac4838616c0cc03c55f44290 Mon Sep 17 00:00:00 2001 From: Ginny Guan Date: Wed, 23 Oct 2024 16:33:07 +0800 Subject: [PATCH] refactor!: update module to v4 BREAKING CHANGE: import paths will need to change to v4 Signed-off-by: Ginny Guan --- clients/command.go | 16 ++++++++-------- clients/command_test.go | 14 +++++++------- go.mod | 4 ++-- go.sum | 4 ++-- internal/pkg/mqtt/client.go | 4 ++-- internal/pkg/mqtt/client_integration_test.go | 4 ++-- internal/pkg/mqtt/client_options.go | 4 ++-- internal/pkg/mqtt/client_options_test.go | 4 ++-- internal/pkg/mqtt/client_test.go | 4 ++-- internal/pkg/nats/client.go | 6 +++--- internal/pkg/nats/client_no_nats.go | 4 ++-- internal/pkg/nats/client_no_nats_test.go | 2 +- internal/pkg/nats/client_test.go | 8 ++++---- internal/pkg/nats/connection.go | 2 +- internal/pkg/nats/interfaces/marshaller.go | 2 +- .../interfaces/mocks/MarshallerUnmarshaller.go | 2 +- internal/pkg/nats/jetstream/client.go | 6 +++--- internal/pkg/nats/jetstream/client_no_nats.go | 4 ++-- .../pkg/nats/jetstream/client_no_nats_test.go | 2 +- internal/pkg/nats/jetstream/connection.go | 2 +- internal/pkg/nats/jetstream/stream.go | 2 +- internal/pkg/nats/marshaller.go | 2 +- internal/pkg/nats/marshaller_test.go | 8 ++++---- internal/pkg/nats/options.go | 4 ++-- internal/pkg/nats/options_test.go | 4 ++-- internal/pkg/noopclient.go | 2 +- internal/pkg/redis/client.go | 4 ++-- internal/pkg/redis/client_integration_test.go | 6 +++--- internal/pkg/redis/client_test.go | 6 +++--- internal/pkg/redis/configuration_options.go | 4 ++-- internal/pkg/redis/configuration_options_test.go | 2 +- internal/pkg/redis/goredis.go | 2 +- internal/pkg/redis/mocks/RedisClient.go | 2 +- internal/pkg/redis/types.go | 2 +- internal/pkg/request.go | 2 +- internal/pkg/request_test.go | 2 +- messaging/factory.go | 10 +++++----- messaging/factory_nats_test.go | 4 ++-- messaging/factory_no_nats_test.go | 4 ++-- messaging/factory_noop.go | 2 +- messaging/factory_test.go | 2 +- messaging/interface.go | 2 +- messaging/mocks/MessageClient.go | 2 +- messaging/mqtt/configuration.go | 2 +- messaging/mqtt/configuration_test.go | 6 +++--- messaging/redis/configuration.go | 2 +- messaging/redis/configuration_test.go | 2 +- pkg/types/message_envelope.go | 4 ++-- pkg/types/message_envelope_test.go | 4 ++-- 49 files changed, 99 insertions(+), 99 deletions(-) diff --git a/clients/command.go b/clients/command.go index 3099ff6c..7fe81bae 100644 --- a/clients/command.go +++ b/clients/command.go @@ -14,14 +14,14 @@ import ( "strconv" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" - edgexErr "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" - - "github.com/edgexfoundry/go-mod-messaging/v3/messaging" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/responses" + edgexErr "github.com/edgexfoundry/go-mod-core-contracts/v4/errors" + + "github.com/edgexfoundry/go-mod-messaging/v4/messaging" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) type CommandClient struct { diff --git a/clients/command_test.go b/clients/command_test.go index 43c73a9b..9c679c99 100644 --- a/clients/command_test.go +++ b/clients/command_test.go @@ -14,18 +14,18 @@ import ( "testing" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" - "github.com/edgexfoundry/go-mod-messaging/v3/messaging/mocks" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/responses" + "github.com/edgexfoundry/go-mod-messaging/v4/messaging/mocks" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) const ( diff --git a/go.mod b/go.mod index 74c98bc4..55ef8d79 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/edgexfoundry/go-mod-messaging/v3 +module github.com/edgexfoundry/go-mod-messaging/v4 go 1.23 require ( github.com/eclipse/paho.mqtt.golang v1.5.0 - github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 + github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.1 github.com/go-redis/redis/v7 v7.3.0 github.com/google/uuid v1.6.0 github.com/hashicorp/go-multierror v1.1.1 diff --git a/go.sum b/go.sum index cb6ea167..83c52f37 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o= github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53 h1:aHnYwqpg0LcnMrgNQlkRQjzHAS/IML/9GI368OmNCz4= -github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.53/go.mod h1:MLk37/79M26+bZr3IptNZuYmQBEVbXwzDp1VHQkFhIk= +github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.1 h1:nAKgq3FZNyCLUxus5j+4pT0vcmT1I5+4MJCUAaD8Pg8= +github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.1/go.mod h1:I3EG+Tg/gcVSUJ+IJDuvVKFISnRu8oQtMXqltE1rzT8= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= diff --git a/internal/pkg/mqtt/client.go b/internal/pkg/mqtt/client.go index 96868891..65eb20bf 100644 --- a/internal/pkg/mqtt/client.go +++ b/internal/pkg/mqtt/client.go @@ -24,8 +24,8 @@ import ( "sync" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" pahoMqtt "github.com/eclipse/paho.mqtt.golang" ) diff --git a/internal/pkg/mqtt/client_integration_test.go b/internal/pkg/mqtt/client_integration_test.go index 0dc5c97c..a954be86 100644 --- a/internal/pkg/mqtt/client_integration_test.go +++ b/internal/pkg/mqtt/client_integration_test.go @@ -34,12 +34,12 @@ import ( "testing" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // TestIntegrationWithMQTTServer end-to-end test of the MQTT client with a MQTT server. diff --git a/internal/pkg/mqtt/client_options.go b/internal/pkg/mqtt/client_options.go index eb210084..07fbc3df 100644 --- a/internal/pkg/mqtt/client_options.go +++ b/internal/pkg/mqtt/client_options.go @@ -22,8 +22,8 @@ import ( "strconv" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // MQTTClientConfig contains all the configurations for the MQTT client. diff --git a/internal/pkg/mqtt/client_options_test.go b/internal/pkg/mqtt/client_options_test.go index 76c77b76..606cc5b3 100644 --- a/internal/pkg/mqtt/client_options_test.go +++ b/internal/pkg/mqtt/client_options_test.go @@ -17,11 +17,11 @@ package mqtt import ( "testing" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) func TestCreateMQTTClientConfiguration(t *testing.T) { diff --git a/internal/pkg/mqtt/client_test.go b/internal/pkg/mqtt/client_test.go index fb5d9ea2..9d31d008 100644 --- a/internal/pkg/mqtt/client_test.go +++ b/internal/pkg/mqtt/client_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" pahoMqtt "github.com/eclipse/paho.mqtt.golang" "github.com/stretchr/testify/assert" diff --git a/internal/pkg/nats/client.go b/internal/pkg/nats/client.go index f301a31b..6a18de8f 100644 --- a/internal/pkg/nats/client.go +++ b/internal/pkg/nats/client.go @@ -25,9 +25,9 @@ import ( "sync" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats/interfaces" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats/interfaces" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/hashicorp/go-multierror" "github.com/nats-io/nats.go" ) diff --git a/internal/pkg/nats/client_no_nats.go b/internal/pkg/nats/client_no_nats.go index 4eb8d4d8..a2369744 100644 --- a/internal/pkg/nats/client_no_nats.go +++ b/internal/pkg/nats/client_no_nats.go @@ -20,8 +20,8 @@ package nats import ( "fmt" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // NewClient initializes creates a new client using NATS core diff --git a/internal/pkg/nats/client_no_nats_test.go b/internal/pkg/nats/client_no_nats_test.go index 28fea570..f966997f 100644 --- a/internal/pkg/nats/client_no_nats_test.go +++ b/internal/pkg/nats/client_no_nats_test.go @@ -20,7 +20,7 @@ package nats import ( "testing" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/pkg/nats/client_test.go b/internal/pkg/nats/client_test.go index 0e3cad56..58aefd13 100644 --- a/internal/pkg/nats/client_test.go +++ b/internal/pkg/nats/client_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats/interfaces" - mocks2 "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats/interfaces/mocks" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats/interfaces" + mocks2 "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats/interfaces/mocks" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" diff --git a/internal/pkg/nats/connection.go b/internal/pkg/nats/connection.go index 7a787bee..fb6edf79 100644 --- a/internal/pkg/nats/connection.go +++ b/internal/pkg/nats/connection.go @@ -19,7 +19,7 @@ package nats import ( - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats/interfaces" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats/interfaces" ) // ConnectNats is a function that can be provided to determine the underlying connection for clients to use. diff --git a/internal/pkg/nats/interfaces/marshaller.go b/internal/pkg/nats/interfaces/marshaller.go index 8be18929..af2b8fac 100644 --- a/internal/pkg/nats/interfaces/marshaller.go +++ b/internal/pkg/nats/interfaces/marshaller.go @@ -19,7 +19,7 @@ package interfaces import ( - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/nats-io/nats.go" ) diff --git a/internal/pkg/nats/interfaces/mocks/MarshallerUnmarshaller.go b/internal/pkg/nats/interfaces/mocks/MarshallerUnmarshaller.go index 04eb8e64..b7cda90c 100644 --- a/internal/pkg/nats/interfaces/mocks/MarshallerUnmarshaller.go +++ b/internal/pkg/nats/interfaces/mocks/MarshallerUnmarshaller.go @@ -7,7 +7,7 @@ import ( nats "github.com/nats-io/nats.go" mock "github.com/stretchr/testify/mock" - types "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + types "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // MarshallerUnmarshaller is an autogenerated mock type for the MarshallerUnmarshaller type diff --git a/internal/pkg/nats/jetstream/client.go b/internal/pkg/nats/jetstream/client.go index 8df15158..f22a7855 100644 --- a/internal/pkg/nats/jetstream/client.go +++ b/internal/pkg/nats/jetstream/client.go @@ -21,9 +21,9 @@ package jetstream import ( "strings" - natsMessaging "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats/interfaces" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + natsMessaging "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats/interfaces" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/nats-io/nats.go" ) diff --git a/internal/pkg/nats/jetstream/client_no_nats.go b/internal/pkg/nats/jetstream/client_no_nats.go index eaceb369..5bf6a637 100644 --- a/internal/pkg/nats/jetstream/client_no_nats.go +++ b/internal/pkg/nats/jetstream/client_no_nats.go @@ -20,8 +20,8 @@ package jetstream import ( "fmt" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // NewClient initializes creates a new client using NATS core diff --git a/internal/pkg/nats/jetstream/client_no_nats_test.go b/internal/pkg/nats/jetstream/client_no_nats_test.go index 29b2ed89..b72afece 100644 --- a/internal/pkg/nats/jetstream/client_no_nats_test.go +++ b/internal/pkg/nats/jetstream/client_no_nats_test.go @@ -20,7 +20,7 @@ package jetstream import ( "testing" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/pkg/nats/jetstream/connection.go b/internal/pkg/nats/jetstream/connection.go index 0fc1d171..5be766a6 100644 --- a/internal/pkg/nats/jetstream/connection.go +++ b/internal/pkg/nats/jetstream/connection.go @@ -21,7 +21,7 @@ package jetstream import ( "strings" - natsMessaging "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats" + natsMessaging "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats" "github.com/nats-io/nats.go" ) diff --git a/internal/pkg/nats/jetstream/stream.go b/internal/pkg/nats/jetstream/stream.go index b9a967d4..4a093212 100644 --- a/internal/pkg/nats/jetstream/stream.go +++ b/internal/pkg/nats/jetstream/stream.go @@ -21,7 +21,7 @@ package jetstream import ( "strings" - localnats "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats" + localnats "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats" ) const ( diff --git a/internal/pkg/nats/marshaller.go b/internal/pkg/nats/marshaller.go index c5cdca62..15a04074 100644 --- a/internal/pkg/nats/marshaller.go +++ b/internal/pkg/nats/marshaller.go @@ -27,7 +27,7 @@ import ( "github.com/nats-io/nats.go" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) type jsonMarshaller struct { diff --git a/internal/pkg/nats/marshaller_test.go b/internal/pkg/nats/marshaller_test.go index 71a15be7..32e7fb8e 100644 --- a/internal/pkg/nats/marshaller_test.go +++ b/internal/pkg/nats/marshaller_test.go @@ -24,15 +24,15 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common" "github.com/google/uuid" "github.com/nats-io/nats.go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats/interfaces" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats/interfaces" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) var marshallerCases = map[string]interfaces.MarshallerUnmarshaller{ diff --git a/internal/pkg/nats/options.go b/internal/pkg/nats/options.go index 46b855c8..fe9d14fa 100644 --- a/internal/pkg/nats/options.go +++ b/internal/pkg/nats/options.go @@ -29,8 +29,8 @@ import ( "os" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/nats-io/nats.go" ) diff --git a/internal/pkg/nats/options_test.go b/internal/pkg/nats/options_test.go index 0500c7b7..0d27eaae 100644 --- a/internal/pkg/nats/options_test.go +++ b/internal/pkg/nats/options_test.go @@ -22,12 +22,12 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) func TestCreateClientConfiguration(t *testing.T) { diff --git a/internal/pkg/noopclient.go b/internal/pkg/noopclient.go index 50ad4bdf..31b5151f 100644 --- a/internal/pkg/noopclient.go +++ b/internal/pkg/noopclient.go @@ -20,7 +20,7 @@ package pkg import ( "time" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) type NoopClient struct{} diff --git a/internal/pkg/redis/client.go b/internal/pkg/redis/client.go index 4af5405b..c8c348bd 100644 --- a/internal/pkg/redis/client.go +++ b/internal/pkg/redis/client.go @@ -27,8 +27,8 @@ import ( "sync" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) const ( diff --git a/internal/pkg/redis/client_integration_test.go b/internal/pkg/redis/client_integration_test.go index e97463d0..793b9839 100644 --- a/internal/pkg/redis/client_integration_test.go +++ b/internal/pkg/redis/client_integration_test.go @@ -37,13 +37,13 @@ import ( "testing" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http" - commonConstants "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/clients/http" + commonConstants "github.com/edgexfoundry/go-mod-core-contracts/v4/common" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) const ( diff --git a/internal/pkg/redis/client_test.go b/internal/pkg/redis/client_test.go index 9ad49288..9aae4ff1 100644 --- a/internal/pkg/redis/client_test.go +++ b/internal/pkg/redis/client_test.go @@ -39,9 +39,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - redisMocks "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/redis/mocks" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + redisMocks "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/redis/mocks" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) var HostInfo = types.HostInfo{ diff --git a/internal/pkg/redis/configuration_options.go b/internal/pkg/redis/configuration_options.go index 0542edd6..ead31347 100644 --- a/internal/pkg/redis/configuration_options.go +++ b/internal/pkg/redis/configuration_options.go @@ -15,8 +15,8 @@ package redis import ( - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // OptionalClientConfiguration contains additional configuration properties which can be provided via the diff --git a/internal/pkg/redis/configuration_options_test.go b/internal/pkg/redis/configuration_options_test.go index ba7ae5c4..2a75a853 100644 --- a/internal/pkg/redis/configuration_options_test.go +++ b/internal/pkg/redis/configuration_options_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) func TestNewClientConfiguration(t *testing.T) { diff --git a/internal/pkg/redis/goredis.go b/internal/pkg/redis/goredis.go index f63fa83d..72d01ca6 100644 --- a/internal/pkg/redis/goredis.go +++ b/internal/pkg/redis/goredis.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" goRedis "github.com/go-redis/redis/v7" ) diff --git a/internal/pkg/redis/mocks/RedisClient.go b/internal/pkg/redis/mocks/RedisClient.go index 1651c83b..0929b903 100644 --- a/internal/pkg/redis/mocks/RedisClient.go +++ b/internal/pkg/redis/mocks/RedisClient.go @@ -5,7 +5,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - types "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + types "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // RedisClient is an autogenerated mock type for the RedisClient type diff --git a/internal/pkg/redis/types.go b/internal/pkg/redis/types.go index e79c697f..88f582d4 100644 --- a/internal/pkg/redis/types.go +++ b/internal/pkg/redis/types.go @@ -19,7 +19,7 @@ package redis import ( "crypto/tls" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) const ( diff --git a/internal/pkg/request.go b/internal/pkg/request.go index d499d85e..a8faac64 100644 --- a/internal/pkg/request.go +++ b/internal/pkg/request.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" ) diff --git a/internal/pkg/request_test.go b/internal/pkg/request_test.go index e9087094..1156c28b 100644 --- a/internal/pkg/request_test.go +++ b/internal/pkg/request_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/messaging/factory.go b/messaging/factory.go index 86315531..05d2df71 100644 --- a/messaging/factory.go +++ b/messaging/factory.go @@ -23,11 +23,11 @@ import ( "fmt" "strings" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/mqtt" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats/jetstream" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/redis" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/mqtt" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats/jetstream" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/redis" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) const ( diff --git a/messaging/factory_nats_test.go b/messaging/factory_nats_test.go index a0ff32be..9da4ddc5 100644 --- a/messaging/factory_nats_test.go +++ b/messaging/factory_nats_test.go @@ -21,8 +21,8 @@ package messaging import ( "testing" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/nats" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/nats" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/messaging/factory_no_nats_test.go b/messaging/factory_no_nats_test.go index cc15384d..75f43e4d 100644 --- a/messaging/factory_no_nats_test.go +++ b/messaging/factory_no_nats_test.go @@ -21,8 +21,8 @@ package messaging_test import ( "testing" - "github.com/edgexfoundry/go-mod-messaging/v3/messaging" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/messaging" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/google/uuid" "github.com/stretchr/testify/require" ) diff --git a/messaging/factory_noop.go b/messaging/factory_noop.go index fd816eac..8bb35140 100644 --- a/messaging/factory_noop.go +++ b/messaging/factory_noop.go @@ -22,7 +22,7 @@ package messaging import ( "errors" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // NewMessageClient is noop implementation when service doesn't need the message bus. diff --git a/messaging/factory_test.go b/messaging/factory_test.go index 0cbaeaaa..5ef0f5b6 100644 --- a/messaging/factory_test.go +++ b/messaging/factory_test.go @@ -19,7 +19,7 @@ package messaging import ( "testing" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/messaging/interface.go b/messaging/interface.go index 7ff0c82b..e8d59eaf 100644 --- a/messaging/interface.go +++ b/messaging/interface.go @@ -19,7 +19,7 @@ package messaging import ( "time" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // MessageClient is the messaging interface for publisher-subscriber pattern diff --git a/messaging/mocks/MessageClient.go b/messaging/mocks/MessageClient.go index 395ec1a3..8fe72b39 100644 --- a/messaging/mocks/MessageClient.go +++ b/messaging/mocks/MessageClient.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - types "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + types "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) // MessageClient is an autogenerated mock type for the MessageClient type diff --git a/messaging/mqtt/configuration.go b/messaging/mqtt/configuration.go index fa51a482..e4a9ed46 100644 --- a/messaging/mqtt/configuration.go +++ b/messaging/mqtt/configuration.go @@ -18,7 +18,7 @@ package mqtt import ( "strconv" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" ) // mqttOptionalConfigurationBuilder encapsulates the optional configuration data following the builder pattern. Updating diff --git a/messaging/mqtt/configuration_test.go b/messaging/mqtt/configuration_test.go index 346c0592..78205612 100644 --- a/messaging/mqtt/configuration_test.go +++ b/messaging/mqtt/configuration_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg/mqtt" - "github.com/edgexfoundry/go-mod-messaging/v3/pkg/types" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg/mqtt" + "github.com/edgexfoundry/go-mod-messaging/v4/pkg/types" ) func TestBuilderMethods(t *testing.T) { diff --git a/messaging/redis/configuration.go b/messaging/redis/configuration.go index c4a75b88..0eccb8eb 100644 --- a/messaging/redis/configuration.go +++ b/messaging/redis/configuration.go @@ -1,6 +1,6 @@ package redis -import "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" +import "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" type redisOptionalConfigurationBuilder struct { options map[string]string diff --git a/messaging/redis/configuration_test.go b/messaging/redis/configuration_test.go index 8a6e2425..0925d3ae 100644 --- a/messaging/redis/configuration_test.go +++ b/messaging/redis/configuration_test.go @@ -3,7 +3,7 @@ package redis import ( "testing" - "github.com/edgexfoundry/go-mod-messaging/v3/internal/pkg" + "github.com/edgexfoundry/go-mod-messaging/v4/internal/pkg" "github.com/stretchr/testify/assert" ) diff --git a/pkg/types/message_envelope.go b/pkg/types/message_envelope.go index a21a1d60..e919a706 100644 --- a/pkg/types/message_envelope.go +++ b/pkg/types/message_envelope.go @@ -23,8 +23,8 @@ import ( "errors" "fmt" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common" "github.com/google/uuid" ) diff --git a/pkg/types/message_envelope_test.go b/pkg/types/message_envelope_test.go index 38381d83..e4d17e21 100644 --- a/pkg/types/message_envelope_test.go +++ b/pkg/types/message_envelope_test.go @@ -22,8 +22,8 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v3/common" - commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v4/common" + commonDTO "github.com/edgexfoundry/go-mod-core-contracts/v4/dtos/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" )