From 60a23e1e32adaf99c37a33ef7dcfe888a31e5e2f Mon Sep 17 00:00:00 2001 From: Elizabeth J Lee Date: Tue, 6 Dec 2022 12:38:57 -0700 Subject: [PATCH] refactor!: update module to v3 BREAKING CHANGE: import paths will need to change to v3 Signed-off-by: Elizabeth J Lee --- clients/http/command.go | 12 +- clients/http/command_test.go | 6 +- clients/http/common.go | 10 +- clients/http/common_test.go | 4 +- clients/http/device.go | 14 +- clients/http/device_test.go | 8 +- clients/http/deviceprofile.go | 14 +- clients/http/deviceprofile_test.go | 10 +- clients/http/deviceservice.go | 14 +- clients/http/deviceservice_test.go | 8 +- clients/http/deviceservicecallback.go | 12 +- clients/http/deviceservicecallback_test.go | 6 +- clients/http/deviceservicecommand.go | 12 +- clients/http/deviceservicecommand_test.go | 8 +- clients/http/event.go | 14 +- clients/http/event_test.go | 10 +- clients/http/general.go | 10 +- clients/http/general_test.go | 4 +- clients/http/interval.go | 14 +- clients/http/interval_test.go | 10 +- clients/http/intervalaction.go | 14 +- clients/http/intervalaction_test.go | 10 +- clients/http/notification.go | 14 +- clients/http/notification_test.go | 12 +- clients/http/provisionwatcher.go | 14 +- clients/http/provisionwatcher_test.go | 8 +- clients/http/reading.go | 12 +- clients/http/reading_test.go | 6 +- clients/http/subscription.go | 14 +- clients/http/subscription_test.go | 12 +- clients/http/system.go | 12 +- clients/http/system_test.go | 6 +- clients/http/transmission.go | 12 +- clients/http/transmission_test.go | 8 +- clients/http/utils/common.go | 4 +- clients/http/utils/request.go | 4 +- clients/interfaces/command.go | 6 +- clients/interfaces/common.go | 4 +- clients/interfaces/device.go | 8 +- clients/interfaces/deviceprofile.go | 8 +- clients/interfaces/deviceservice.go | 8 +- clients/interfaces/deviceservicecallback.go | 6 +- clients/interfaces/deviceservicecommand.go | 6 +- clients/interfaces/event.go | 8 +- clients/interfaces/general.go | 4 +- clients/interfaces/interval.go | 8 +- clients/interfaces/intervalaction.go | 8 +- clients/interfaces/mocks/CommandClient.go | 23 ++- clients/interfaces/mocks/CommonClient.go | 21 ++- clients/interfaces/mocks/DeviceClient.go | 25 ++- .../interfaces/mocks/DeviceProfileClient.go | 25 ++- .../mocks/DeviceServiceCallbackClient.go | 23 ++- .../interfaces/mocks/DeviceServiceClient.go | 25 ++- .../mocks/DeviceServiceCommandClient.go | 23 ++- clients/interfaces/mocks/EventClient.go | 25 ++- clients/interfaces/mocks/GeneralClient.go | 21 ++- .../interfaces/mocks/IntervalActionClient.go | 156 ++++++++++++++++++ clients/interfaces/mocks/IntervalClient.go | 156 ++++++++++++++++++ .../interfaces/mocks/NotificationClient.go | 25 ++- .../mocks/ProvisionWatcherClient.go | 25 ++- clients/interfaces/mocks/ReadingClient.go | 23 ++- .../interfaces/mocks/SubscriptionClient.go | 25 ++- .../mocks/SystemManagementClient.go | 23 ++- .../interfaces/mocks/TransmissionClient.go | 23 ++- clients/interfaces/notification.go | 8 +- clients/interfaces/provisionwatcher.go | 8 +- clients/interfaces/reading.go | 6 +- clients/interfaces/subscription.go | 8 +- clients/interfaces/system.go | 6 +- clients/interfaces/transmission.go | 6 +- clients/logger/README.md | 2 +- clients/logger/logger.go | 4 +- clients/logger/logger_test.go | 2 +- clients/logger/mock-logger.go | 2 +- clients/logger/mocks/LoggingClient.go | 19 ++- common/utils.go | 2 +- common/validator.go | 2 +- dtos/address.go | 6 +- dtos/address_test.go | 4 +- dtos/autoevent.go | 2 +- dtos/common/base.go | 2 +- dtos/common/base_test.go | 2 +- dtos/common/config_test.go | 2 +- dtos/common/metrics_test.go | 2 +- dtos/common/ping_test.go | 2 +- dtos/common/secret.go | 4 +- dtos/common/secret_test.go | 2 +- dtos/common/version_test.go | 2 +- dtos/device.go | 2 +- dtos/device_test.go | 2 +- dtos/devicecommand.go | 2 +- dtos/deviceprofile.go | 6 +- dtos/deviceprofile_test.go | 4 +- dtos/deviceresource.go | 2 +- dtos/deviceservice.go | 2 +- dtos/deviceservice_test.go | 2 +- dtos/event.go | 4 +- dtos/event_test.go | 6 +- dtos/interval.go | 2 +- dtos/intervalaction.go | 2 +- dtos/metric.go | 11 +- dtos/notification.go | 2 +- dtos/notification_test.go | 2 +- dtos/protocolproperties.go | 2 +- dtos/provisionwatcher.go | 2 +- dtos/provisionwatcher_test.go | 2 +- dtos/reading.go | 6 +- dtos/reading_test.go | 4 +- dtos/requests/device.go | 10 +- dtos/requests/device_test.go | 8 +- dtos/requests/devicecommand.go | 12 +- dtos/requests/devicecommand_test.go | 8 +- dtos/requests/deviceprofile.go | 10 +- dtos/requests/deviceprofile_test.go | 8 +- dtos/requests/deviceprofilebasicinfo.go | 12 +- dtos/requests/deviceprofilebasicinfo_test.go | 8 +- dtos/requests/deviceresource.go | 12 +- dtos/requests/deviceresource_test.go | 8 +- dtos/requests/deviceservice.go | 10 +- dtos/requests/deviceservice_test.go | 8 +- dtos/requests/event.go | 10 +- dtos/requests/event_test.go | 6 +- dtos/requests/interval.go | 10 +- dtos/requests/interval_test.go | 6 +- dtos/requests/intervalaction.go | 10 +- dtos/requests/intervalaction_test.go | 8 +- dtos/requests/notification.go | 10 +- dtos/requests/notification_test.go | 4 +- dtos/requests/operation.go | 6 +- dtos/requests/operation_test.go | 2 +- dtos/requests/provisionwatcher.go | 10 +- dtos/requests/provisionwatcher_test.go | 6 +- dtos/requests/subscription.go | 10 +- dtos/requests/subscription_test.go | 4 +- dtos/resourceoperation.go | 2 +- dtos/resourceproperties.go | 2 +- dtos/responses/corecommand.go | 4 +- dtos/responses/corecommand_test.go | 4 +- dtos/responses/device.go | 4 +- dtos/responses/device_test.go | 2 +- dtos/responses/deviceprofile.go | 4 +- dtos/responses/deviceprofile_test.go | 2 +- dtos/responses/deviceresource.go | 4 +- dtos/responses/deviceresource_test.go | 2 +- dtos/responses/deviceservice.go | 4 +- dtos/responses/deviceservice_test.go | 2 +- dtos/responses/event.go | 8 +- dtos/responses/event_test.go | 2 +- dtos/responses/interval.go | 4 +- dtos/responses/interval_test.go | 2 +- dtos/responses/intervalaction.go | 4 +- dtos/responses/intervalaction_test.go | 2 +- dtos/responses/notification.go | 4 +- dtos/responses/notification_test.go | 2 +- dtos/responses/provisionwatcher.go | 4 +- dtos/responses/provisionwatcher_test.go | 2 +- dtos/responses/reading.go | 4 +- dtos/responses/reading_test.go | 2 +- dtos/responses/subscription.go | 4 +- dtos/responses/subscription_test.go | 2 +- dtos/responses/transmission.go | 4 +- dtos/responses/transmission_test.go | 2 +- dtos/responses/uom.go | 2 +- dtos/subscription.go | 2 +- dtos/systemevent.go | 2 +- dtos/systemevent_test.go | 2 +- dtos/transmission.go | 2 +- dtos/transmissionrecord.go | 2 +- go.mod | 2 +- models/address.go | 4 +- models/intervalaction.go | 2 +- models/intervalaction_test.go | 2 +- models/log_entry.go | 2 +- models/subscription.go | 2 +- models/subscription_test.go | 2 +- models/transmission.go | 2 +- 176 files changed, 1082 insertions(+), 527 deletions(-) create mode 100644 clients/interfaces/mocks/IntervalActionClient.go create mode 100644 clients/interfaces/mocks/IntervalClient.go diff --git a/clients/http/command.go b/clients/http/command.go index 6febdd89..c564ea00 100644 --- a/clients/http/command.go +++ b/clients/http/command.go @@ -11,12 +11,12 @@ import ( "path" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "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-core-contracts/v3/errors" ) type CommandClient struct { diff --git a/clients/http/command_test.go b/clients/http/command_test.go index 497b745e..209dd42e 100644 --- a/clients/http/command_test.go +++ b/clients/http/command_test.go @@ -13,9 +13,9 @@ import ( "path" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" "github.com/stretchr/testify/require" ) diff --git a/clients/http/common.go b/clients/http/common.go index bff377ce..92697208 100644 --- a/clients/http/common.go +++ b/clients/http/common.go @@ -8,11 +8,11 @@ package http import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type commonClient struct { diff --git a/clients/http/common_test.go b/clients/http/common_test.go index b81f1748..07a68423 100644 --- a/clients/http/common_test.go +++ b/clients/http/common_test.go @@ -13,8 +13,8 @@ import ( "net/http/httptest" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) const ( diff --git a/clients/http/device.go b/clients/http/device.go index 9e4d1a84..ddb78040 100644 --- a/clients/http/device.go +++ b/clients/http/device.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type DeviceClient struct { diff --git a/clients/http/device_test.go b/clients/http/device_test.go index a94a757b..4a4b586f 100644 --- a/clients/http/device_test.go +++ b/clients/http/device_test.go @@ -6,10 +6,10 @@ import ( "path" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" "github.com/stretchr/testify/require" ) diff --git a/clients/http/deviceprofile.go b/clients/http/deviceprofile.go index c532115f..57a05702 100644 --- a/clients/http/deviceprofile.go +++ b/clients/http/deviceprofile.go @@ -14,13 +14,13 @@ import ( "strings" "sync" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type DeviceProfileClient struct { diff --git a/clients/http/deviceprofile_test.go b/clients/http/deviceprofile_test.go index 3ca92e56..0175a0cd 100644 --- a/clients/http/deviceprofile_test.go +++ b/clients/http/deviceprofile_test.go @@ -12,11 +12,11 @@ import ( "runtime" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/clients/http/deviceservice.go b/clients/http/deviceservice.go index 40e11119..6fb0738d 100644 --- a/clients/http/deviceservice.go +++ b/clients/http/deviceservice.go @@ -7,13 +7,13 @@ import ( "strconv" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type DeviceServiceClient struct { diff --git a/clients/http/deviceservice_test.go b/clients/http/deviceservice_test.go index fc6e37f1..04735419 100644 --- a/clients/http/deviceservice_test.go +++ b/clients/http/deviceservice_test.go @@ -6,10 +6,10 @@ import ( "path" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/clients/http/deviceservicecallback.go b/clients/http/deviceservicecallback.go index 9dc46724..f9eda4f1 100644 --- a/clients/http/deviceservicecallback.go +++ b/clients/http/deviceservicecallback.go @@ -9,12 +9,12 @@ import ( "context" "path" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type deviceServiceCallbackClient struct { diff --git a/clients/http/deviceservicecallback_test.go b/clients/http/deviceservicecallback_test.go index 55438412..9799f6cc 100644 --- a/clients/http/deviceservicecallback_test.go +++ b/clients/http/deviceservicecallback_test.go @@ -11,9 +11,9 @@ import ( "path" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/clients/http/deviceservicecommand.go b/clients/http/deviceservicecommand.go index 6133d8d9..ede0c281 100644 --- a/clients/http/deviceservicecommand.go +++ b/clients/http/deviceservicecommand.go @@ -11,12 +11,12 @@ import ( "net/url" "path" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "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-core-contracts/v3/errors" "github.com/fxamacker/cbor/v2" ) diff --git a/clients/http/deviceservicecommand_test.go b/clients/http/deviceservicecommand_test.go index 5d6aa52c..bb430492 100644 --- a/clients/http/deviceservicecommand_test.go +++ b/clients/http/deviceservicecommand_test.go @@ -10,10 +10,10 @@ import ( "net/http" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/clients/http/event.go b/clients/http/event.go index 3af53582..3956f038 100644 --- a/clients/http/event.go +++ b/clients/http/event.go @@ -11,13 +11,13 @@ import ( "path" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type eventClient struct { diff --git a/clients/http/event_test.go b/clients/http/event_test.go index eb9fc76a..679bf5e8 100644 --- a/clients/http/event_test.go +++ b/clients/http/event_test.go @@ -12,11 +12,11 @@ import ( "strconv" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/clients/http/general.go b/clients/http/general.go index 8eac8a73..a5af756a 100644 --- a/clients/http/general.go +++ b/clients/http/general.go @@ -8,11 +8,11 @@ package http import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type generalClient struct { diff --git a/clients/http/general_test.go b/clients/http/general_test.go index 8637c88b..cc4b2c45 100644 --- a/clients/http/general_test.go +++ b/clients/http/general_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) func Test_generalClient_FetchConfiguration(t *testing.T) { diff --git a/clients/http/interval.go b/clients/http/interval.go index 43fdb0fa..5408ac73 100644 --- a/clients/http/interval.go +++ b/clients/http/interval.go @@ -11,13 +11,13 @@ import ( "path" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type IntervalClient struct { diff --git a/clients/http/interval_test.go b/clients/http/interval_test.go index b8d12a30..70a580fd 100644 --- a/clients/http/interval_test.go +++ b/clients/http/interval_test.go @@ -11,11 +11,11 @@ import ( "path" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/clients/http/intervalaction.go b/clients/http/intervalaction.go index 827b93f7..d0185939 100644 --- a/clients/http/intervalaction.go +++ b/clients/http/intervalaction.go @@ -11,13 +11,13 @@ import ( "path" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type IntervalActionClient struct { diff --git a/clients/http/intervalaction_test.go b/clients/http/intervalaction_test.go index 94bb30cc..25ce37c0 100644 --- a/clients/http/intervalaction_test.go +++ b/clients/http/intervalaction_test.go @@ -11,11 +11,11 @@ import ( "path" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/clients/http/notification.go b/clients/http/notification.go index 00970bdc..22ca7ea2 100644 --- a/clients/http/notification.go +++ b/clients/http/notification.go @@ -11,13 +11,13 @@ import ( "path" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type NotificationClient struct { diff --git a/clients/http/notification_test.go b/clients/http/notification_test.go index 27600c83..86121e00 100644 --- a/clients/http/notification_test.go +++ b/clients/http/notification_test.go @@ -12,12 +12,12 @@ import ( "strconv" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/require" ) diff --git a/clients/http/provisionwatcher.go b/clients/http/provisionwatcher.go index 5aa901dd..9f63592f 100644 --- a/clients/http/provisionwatcher.go +++ b/clients/http/provisionwatcher.go @@ -12,13 +12,13 @@ import ( "strconv" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type ProvisionWatcherClient struct { diff --git a/clients/http/provisionwatcher_test.go b/clients/http/provisionwatcher_test.go index cadc4632..6dadb56d 100644 --- a/clients/http/provisionwatcher_test.go +++ b/clients/http/provisionwatcher_test.go @@ -11,10 +11,10 @@ import ( "path" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" "github.com/stretchr/testify/require" ) diff --git a/clients/http/reading.go b/clients/http/reading.go index cde38811..f2dad60a 100644 --- a/clients/http/reading.go +++ b/clients/http/reading.go @@ -11,12 +11,12 @@ import ( "path" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "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-core-contracts/v3/errors" ) type readingClient struct { diff --git a/clients/http/reading_test.go b/clients/http/reading_test.go index b5bb7ed8..b5cef1c2 100644 --- a/clients/http/reading_test.go +++ b/clients/http/reading_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) func TestQueryAllReadings(t *testing.T) { diff --git a/clients/http/subscription.go b/clients/http/subscription.go index e46b5193..aa4d7e63 100644 --- a/clients/http/subscription.go +++ b/clients/http/subscription.go @@ -11,13 +11,13 @@ import ( "path" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type SubscriptionClient struct { diff --git a/clients/http/subscription_test.go b/clients/http/subscription_test.go index 05895aea..3921ad9d 100644 --- a/clients/http/subscription_test.go +++ b/clients/http/subscription_test.go @@ -11,12 +11,12 @@ import ( "path" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/require" ) diff --git a/clients/http/system.go b/clients/http/system.go index 69e2d593..5d06cbd8 100644 --- a/clients/http/system.go +++ b/clients/http/system.go @@ -10,12 +10,12 @@ import ( "net/url" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type SystemManagementClient struct { diff --git a/clients/http/system_test.go b/clients/http/system_test.go index c6b449b6..27e59138 100644 --- a/clients/http/system_test.go +++ b/clients/http/system_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" ) func TestSystemManagementClient_GetHealth(t *testing.T) { diff --git a/clients/http/transmission.go b/clients/http/transmission.go index b049175c..d353c062 100644 --- a/clients/http/transmission.go +++ b/clients/http/transmission.go @@ -11,12 +11,12 @@ import ( "path" "strconv" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils" - "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/interfaces" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/http/utils" + "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/interfaces" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "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-core-contracts/v3/errors" ) type TransmissionClient struct { diff --git a/clients/http/transmission_test.go b/clients/http/transmission_test.go index b6f370c9..d606f0e5 100644 --- a/clients/http/transmission_test.go +++ b/clients/http/transmission_test.go @@ -12,10 +12,10 @@ import ( "strconv" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "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-core-contracts/v3/models" "github.com/stretchr/testify/require" ) diff --git a/clients/http/utils/common.go b/clients/http/utils/common.go index a43d8eb6..d4da5650 100644 --- a/clients/http/utils/common.go +++ b/clients/http/utils/common.go @@ -18,8 +18,8 @@ import ( "path" "path/filepath" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" "github.com/google/uuid" ) diff --git a/clients/http/utils/request.go b/clients/http/utils/request.go index cb4bad4f..f46e34ec 100644 --- a/clients/http/utils/request.go +++ b/clients/http/utils/request.go @@ -12,8 +12,8 @@ import ( "net/http" "net/url" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // GetRequest makes the get request and return the body diff --git a/clients/interfaces/command.go b/clients/interfaces/command.go index 7b5317a2..ad9d685c 100644 --- a/clients/interfaces/command.go +++ b/clients/interfaces/command.go @@ -8,9 +8,9 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "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-core-contracts/v3/errors" ) // CommandClient defines the interface for interactions with the command endpoints on the EdgeX Foundry core-command service. diff --git a/clients/interfaces/common.go b/clients/interfaces/common.go index 0aad0444..7e78fc98 100644 --- a/clients/interfaces/common.go +++ b/clients/interfaces/common.go @@ -8,8 +8,8 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type CommonClient interface { diff --git a/clients/interfaces/device.go b/clients/interfaces/device.go index 2916849d..b277c660 100644 --- a/clients/interfaces/device.go +++ b/clients/interfaces/device.go @@ -8,10 +8,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // DeviceClient defines the interface for interactions with the Device endpoint on the EdgeX Foundry core-metadata service. diff --git a/clients/interfaces/deviceprofile.go b/clients/interfaces/deviceprofile.go index e8d811e6..10f48c10 100644 --- a/clients/interfaces/deviceprofile.go +++ b/clients/interfaces/deviceprofile.go @@ -8,10 +8,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // DeviceProfileClient defines the interface for interactions with the DeviceProfile endpoint on the EdgeX Foundry core-metadata service. diff --git a/clients/interfaces/deviceservice.go b/clients/interfaces/deviceservice.go index 5babdcb8..65ae287d 100644 --- a/clients/interfaces/deviceservice.go +++ b/clients/interfaces/deviceservice.go @@ -3,10 +3,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // DeviceServiceClient defines the interface for interactions with the Device Service endpoint on the EdgeX Foundry core-metadata service. diff --git a/clients/interfaces/deviceservicecallback.go b/clients/interfaces/deviceservicecallback.go index dfa626e5..d0a86453 100644 --- a/clients/interfaces/deviceservicecallback.go +++ b/clients/interfaces/deviceservicecallback.go @@ -8,9 +8,9 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // DeviceServiceCallbackClient defines the interface for interactions with the callback endpoint on the EdgeX Foundry device service. diff --git a/clients/interfaces/deviceservicecommand.go b/clients/interfaces/deviceservicecommand.go index 20f96508..33c65d10 100644 --- a/clients/interfaces/deviceservicecommand.go +++ b/clients/interfaces/deviceservicecommand.go @@ -8,9 +8,9 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "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-core-contracts/v3/errors" ) // DeviceServiceCommandClient defines the interface for interactions with the device command endpoints on the EdgeX Foundry device services. diff --git a/clients/interfaces/event.go b/clients/interfaces/event.go index 4574254a..b7bc40c9 100644 --- a/clients/interfaces/event.go +++ b/clients/interfaces/event.go @@ -8,10 +8,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // EventClient defines the interface for interactions with the Event endpoint on the EdgeX Foundry core-data service. diff --git a/clients/interfaces/general.go b/clients/interfaces/general.go index 36819b2e..3ad5e7d3 100644 --- a/clients/interfaces/general.go +++ b/clients/interfaces/general.go @@ -8,8 +8,8 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type GeneralClient interface { diff --git a/clients/interfaces/interval.go b/clients/interfaces/interval.go index 2a62f57e..932f7311 100644 --- a/clients/interfaces/interval.go +++ b/clients/interfaces/interval.go @@ -8,10 +8,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // IntervalClient defines the interface for interactions with the Interval endpoint on the EdgeX Foundry support-scheduler service. diff --git a/clients/interfaces/intervalaction.go b/clients/interfaces/intervalaction.go index 63d835d4..f05fe3d0 100644 --- a/clients/interfaces/intervalaction.go +++ b/clients/interfaces/intervalaction.go @@ -8,10 +8,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // IntervalActionClient defines the interface for interactions with the IntervalAction endpoint on the EdgeX Foundry support-scheduler service. diff --git a/clients/interfaces/mocks/CommandClient.go b/clients/interfaces/mocks/CommandClient.go index b30b86e8..59b57594 100644 --- a/clients/interfaces/mocks/CommandClient.go +++ b/clients/interfaces/mocks/CommandClient.go @@ -1,17 +1,17 @@ -// Code generated by mockery v2.9.4. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // CommandClient is an autogenerated mock type for the CommandClient type @@ -160,3 +160,18 @@ func (_m *CommandClient) IssueSetCommandByNameWithObject(ctx context.Context, de return r0, r1 } + +type mockConstructorTestingTNewCommandClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewCommandClient creates a new instance of CommandClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCommandClient(t mockConstructorTestingTNewCommandClient) *CommandClient { + mock := &CommandClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/CommonClient.go b/clients/interfaces/mocks/CommonClient.go index 4835c13a..97bc7ea6 100644 --- a/clients/interfaces/mocks/CommonClient.go +++ b/clients/interfaces/mocks/CommonClient.go @@ -1,13 +1,13 @@ -// Code generated by mockery v2.7.4. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" ) @@ -131,3 +131,18 @@ func (_m *CommonClient) Version(ctx context.Context) (common.VersionResponse, er return r0, r1 } + +type mockConstructorTestingTNewCommonClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewCommonClient creates a new instance of CommonClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCommonClient(t mockConstructorTestingTNewCommonClient) *CommonClient { + mock := &CommonClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/DeviceClient.go b/clients/interfaces/mocks/DeviceClient.go index e2769e13..3b1af7fe 100644 --- a/clients/interfaces/mocks/DeviceClient.go +++ b/clients/interfaces/mocks/DeviceClient.go @@ -1,19 +1,19 @@ -// Code generated by mockery v2.5.1. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // DeviceClient is an autogenerated mock type for the DeviceClient type @@ -208,3 +208,18 @@ func (_m *DeviceClient) Update(ctx context.Context, reqs []requests.UpdateDevice return r0, r1 } + +type mockConstructorTestingTNewDeviceClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewDeviceClient creates a new instance of DeviceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDeviceClient(t mockConstructorTestingTNewDeviceClient) *DeviceClient { + mock := &DeviceClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/DeviceProfileClient.go b/clients/interfaces/mocks/DeviceProfileClient.go index ce8a38ca..e88c07d6 100644 --- a/clients/interfaces/mocks/DeviceProfileClient.go +++ b/clients/interfaces/mocks/DeviceProfileClient.go @@ -1,19 +1,19 @@ -// Code generated by mockery v2.7.4. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // DeviceProfileClient is an autogenerated mock type for the DeviceProfileClient type @@ -448,3 +448,18 @@ func (_m *DeviceProfileClient) UpdateDeviceProfileResource(ctx context.Context, return r0, r1 } + +type mockConstructorTestingTNewDeviceProfileClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewDeviceProfileClient creates a new instance of DeviceProfileClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDeviceProfileClient(t mockConstructorTestingTNewDeviceProfileClient) *DeviceProfileClient { + mock := &DeviceProfileClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/DeviceServiceCallbackClient.go b/clients/interfaces/mocks/DeviceServiceCallbackClient.go index 51fe6721..d158c0ed 100644 --- a/clients/interfaces/mocks/DeviceServiceCallbackClient.go +++ b/clients/interfaces/mocks/DeviceServiceCallbackClient.go @@ -1,17 +1,17 @@ -// Code generated by mockery v0.0.0-dev. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" ) // DeviceServiceCallbackClient is an autogenerated mock type for the DeviceServiceCallbackClient type @@ -225,3 +225,18 @@ func (_m *DeviceServiceCallbackClient) ValidateDeviceCallback(ctx context.Contex return r0, r1 } + +type mockConstructorTestingTNewDeviceServiceCallbackClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewDeviceServiceCallbackClient creates a new instance of DeviceServiceCallbackClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDeviceServiceCallbackClient(t mockConstructorTestingTNewDeviceServiceCallbackClient) *DeviceServiceCallbackClient { + mock := &DeviceServiceCallbackClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/DeviceServiceClient.go b/clients/interfaces/mocks/DeviceServiceClient.go index e75d4fa7..0e29554c 100644 --- a/clients/interfaces/mocks/DeviceServiceClient.go +++ b/clients/interfaces/mocks/DeviceServiceClient.go @@ -1,19 +1,19 @@ -// Code generated by mockery v2.5.1. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // DeviceServiceClient is an autogenerated mock type for the DeviceServiceClient type @@ -139,3 +139,18 @@ func (_m *DeviceServiceClient) Update(ctx context.Context, reqs []requests.Updat return r0, r1 } + +type mockConstructorTestingTNewDeviceServiceClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewDeviceServiceClient creates a new instance of DeviceServiceClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDeviceServiceClient(t mockConstructorTestingTNewDeviceServiceClient) *DeviceServiceClient { + mock := &DeviceServiceClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/DeviceServiceCommandClient.go b/clients/interfaces/mocks/DeviceServiceCommandClient.go index 42aac5f2..12deaf8a 100644 --- a/clients/interfaces/mocks/DeviceServiceCommandClient.go +++ b/clients/interfaces/mocks/DeviceServiceCommandClient.go @@ -1,17 +1,17 @@ -// Code generated by mockery 2.9.4. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // DeviceServiceCommandClient is an autogenerated mock type for the DeviceServiceCommandClient type @@ -89,3 +89,18 @@ func (_m *DeviceServiceCommandClient) SetCommandWithObject(ctx context.Context, return r0, r1 } + +type mockConstructorTestingTNewDeviceServiceCommandClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewDeviceServiceCommandClient creates a new instance of DeviceServiceCommandClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDeviceServiceCommandClient(t mockConstructorTestingTNewDeviceServiceCommandClient) *DeviceServiceCommandClient { + mock := &DeviceServiceCommandClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/EventClient.go b/clients/interfaces/mocks/EventClient.go index a77f3744..35a94d5d 100644 --- a/clients/interfaces/mocks/EventClient.go +++ b/clients/interfaces/mocks/EventClient.go @@ -1,19 +1,19 @@ -// Code generated by mockery v2.5.1. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // EventClient is an autogenerated mock type for the EventClient type @@ -204,3 +204,18 @@ func (_m *EventClient) EventsByTimeRange(ctx context.Context, start int, end int return r0, r1 } + +type mockConstructorTestingTNewEventClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewEventClient creates a new instance of EventClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewEventClient(t mockConstructorTestingTNewEventClient) *EventClient { + mock := &EventClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/GeneralClient.go b/clients/interfaces/mocks/GeneralClient.go index ac5d5375..9e429c6e 100644 --- a/clients/interfaces/mocks/GeneralClient.go +++ b/clients/interfaces/mocks/GeneralClient.go @@ -1,13 +1,13 @@ -// Code generated by mockery v0.0.0-dev. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" ) @@ -62,3 +62,18 @@ func (_m *GeneralClient) FetchMetrics(ctx context.Context) (common.MetricsRespon return r0, r1 } + +type mockConstructorTestingTNewGeneralClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewGeneralClient creates a new instance of GeneralClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewGeneralClient(t mockConstructorTestingTNewGeneralClient) *GeneralClient { + mock := &GeneralClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/IntervalActionClient.go b/clients/interfaces/mocks/IntervalActionClient.go new file mode 100644 index 00000000..379f7f28 --- /dev/null +++ b/clients/interfaces/mocks/IntervalActionClient.go @@ -0,0 +1,156 @@ +// Code generated by mockery v2.15.0. DO NOT EDIT. + +package mocks + +import ( + context "context" + + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + + mock "github.com/stretchr/testify/mock" + + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" +) + +// IntervalActionClient is an autogenerated mock type for the IntervalActionClient type +type IntervalActionClient struct { + mock.Mock +} + +// Add provides a mock function with given fields: ctx, reqs +func (_m *IntervalActionClient) Add(ctx context.Context, reqs []requests.AddIntervalActionRequest) ([]common.BaseWithIdResponse, errors.EdgeX) { + ret := _m.Called(ctx, reqs) + + var r0 []common.BaseWithIdResponse + if rf, ok := ret.Get(0).(func(context.Context, []requests.AddIntervalActionRequest) []common.BaseWithIdResponse); ok { + r0 = rf(ctx, reqs) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]common.BaseWithIdResponse) + } + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, []requests.AddIntervalActionRequest) errors.EdgeX); ok { + r1 = rf(ctx, reqs) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +// AllIntervalActions provides a mock function with given fields: ctx, offset, limit +func (_m *IntervalActionClient) AllIntervalActions(ctx context.Context, offset int, limit int) (responses.MultiIntervalActionsResponse, errors.EdgeX) { + ret := _m.Called(ctx, offset, limit) + + var r0 responses.MultiIntervalActionsResponse + if rf, ok := ret.Get(0).(func(context.Context, int, int) responses.MultiIntervalActionsResponse); ok { + r0 = rf(ctx, offset, limit) + } else { + r0 = ret.Get(0).(responses.MultiIntervalActionsResponse) + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, int, int) errors.EdgeX); ok { + r1 = rf(ctx, offset, limit) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +// DeleteIntervalActionByName provides a mock function with given fields: ctx, name +func (_m *IntervalActionClient) DeleteIntervalActionByName(ctx context.Context, name string) (common.BaseResponse, errors.EdgeX) { + ret := _m.Called(ctx, name) + + var r0 common.BaseResponse + if rf, ok := ret.Get(0).(func(context.Context, string) common.BaseResponse); ok { + r0 = rf(ctx, name) + } else { + r0 = ret.Get(0).(common.BaseResponse) + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, string) errors.EdgeX); ok { + r1 = rf(ctx, name) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +// IntervalActionByName provides a mock function with given fields: ctx, name +func (_m *IntervalActionClient) IntervalActionByName(ctx context.Context, name string) (responses.IntervalActionResponse, errors.EdgeX) { + ret := _m.Called(ctx, name) + + var r0 responses.IntervalActionResponse + if rf, ok := ret.Get(0).(func(context.Context, string) responses.IntervalActionResponse); ok { + r0 = rf(ctx, name) + } else { + r0 = ret.Get(0).(responses.IntervalActionResponse) + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, string) errors.EdgeX); ok { + r1 = rf(ctx, name) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +// Update provides a mock function with given fields: ctx, reqs +func (_m *IntervalActionClient) Update(ctx context.Context, reqs []requests.UpdateIntervalActionRequest) ([]common.BaseResponse, errors.EdgeX) { + ret := _m.Called(ctx, reqs) + + var r0 []common.BaseResponse + if rf, ok := ret.Get(0).(func(context.Context, []requests.UpdateIntervalActionRequest) []common.BaseResponse); ok { + r0 = rf(ctx, reqs) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]common.BaseResponse) + } + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, []requests.UpdateIntervalActionRequest) errors.EdgeX); ok { + r1 = rf(ctx, reqs) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +type mockConstructorTestingTNewIntervalActionClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewIntervalActionClient creates a new instance of IntervalActionClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewIntervalActionClient(t mockConstructorTestingTNewIntervalActionClient) *IntervalActionClient { + mock := &IntervalActionClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/IntervalClient.go b/clients/interfaces/mocks/IntervalClient.go new file mode 100644 index 00000000..23dba1e8 --- /dev/null +++ b/clients/interfaces/mocks/IntervalClient.go @@ -0,0 +1,156 @@ +// Code generated by mockery v2.15.0. DO NOT EDIT. + +package mocks + +import ( + context "context" + + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + + mock "github.com/stretchr/testify/mock" + + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" +) + +// IntervalClient is an autogenerated mock type for the IntervalClient type +type IntervalClient struct { + mock.Mock +} + +// Add provides a mock function with given fields: ctx, reqs +func (_m *IntervalClient) Add(ctx context.Context, reqs []requests.AddIntervalRequest) ([]common.BaseWithIdResponse, errors.EdgeX) { + ret := _m.Called(ctx, reqs) + + var r0 []common.BaseWithIdResponse + if rf, ok := ret.Get(0).(func(context.Context, []requests.AddIntervalRequest) []common.BaseWithIdResponse); ok { + r0 = rf(ctx, reqs) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]common.BaseWithIdResponse) + } + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, []requests.AddIntervalRequest) errors.EdgeX); ok { + r1 = rf(ctx, reqs) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +// AllIntervals provides a mock function with given fields: ctx, offset, limit +func (_m *IntervalClient) AllIntervals(ctx context.Context, offset int, limit int) (responses.MultiIntervalsResponse, errors.EdgeX) { + ret := _m.Called(ctx, offset, limit) + + var r0 responses.MultiIntervalsResponse + if rf, ok := ret.Get(0).(func(context.Context, int, int) responses.MultiIntervalsResponse); ok { + r0 = rf(ctx, offset, limit) + } else { + r0 = ret.Get(0).(responses.MultiIntervalsResponse) + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, int, int) errors.EdgeX); ok { + r1 = rf(ctx, offset, limit) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +// DeleteIntervalByName provides a mock function with given fields: ctx, name +func (_m *IntervalClient) DeleteIntervalByName(ctx context.Context, name string) (common.BaseResponse, errors.EdgeX) { + ret := _m.Called(ctx, name) + + var r0 common.BaseResponse + if rf, ok := ret.Get(0).(func(context.Context, string) common.BaseResponse); ok { + r0 = rf(ctx, name) + } else { + r0 = ret.Get(0).(common.BaseResponse) + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, string) errors.EdgeX); ok { + r1 = rf(ctx, name) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +// IntervalByName provides a mock function with given fields: ctx, name +func (_m *IntervalClient) IntervalByName(ctx context.Context, name string) (responses.IntervalResponse, errors.EdgeX) { + ret := _m.Called(ctx, name) + + var r0 responses.IntervalResponse + if rf, ok := ret.Get(0).(func(context.Context, string) responses.IntervalResponse); ok { + r0 = rf(ctx, name) + } else { + r0 = ret.Get(0).(responses.IntervalResponse) + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, string) errors.EdgeX); ok { + r1 = rf(ctx, name) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +// Update provides a mock function with given fields: ctx, reqs +func (_m *IntervalClient) Update(ctx context.Context, reqs []requests.UpdateIntervalRequest) ([]common.BaseResponse, errors.EdgeX) { + ret := _m.Called(ctx, reqs) + + var r0 []common.BaseResponse + if rf, ok := ret.Get(0).(func(context.Context, []requests.UpdateIntervalRequest) []common.BaseResponse); ok { + r0 = rf(ctx, reqs) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]common.BaseResponse) + } + } + + var r1 errors.EdgeX + if rf, ok := ret.Get(1).(func(context.Context, []requests.UpdateIntervalRequest) errors.EdgeX); ok { + r1 = rf(ctx, reqs) + } else { + if ret.Get(1) != nil { + r1 = ret.Get(1).(errors.EdgeX) + } + } + + return r0, r1 +} + +type mockConstructorTestingTNewIntervalClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewIntervalClient creates a new instance of IntervalClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewIntervalClient(t mockConstructorTestingTNewIntervalClient) *IntervalClient { + mock := &IntervalClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/NotificationClient.go b/clients/interfaces/mocks/NotificationClient.go index 1e88ae62..a2aa99fc 100644 --- a/clients/interfaces/mocks/NotificationClient.go +++ b/clients/interfaces/mocks/NotificationClient.go @@ -1,19 +1,19 @@ -// Code generated by mockery v2.7.4. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // NotificationClient is an autogenerated mock type for the NotificationClient type @@ -275,3 +275,18 @@ func (_m *NotificationClient) SendNotification(ctx context.Context, reqs []reque return r0, r1 } + +type mockConstructorTestingTNewNotificationClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewNotificationClient creates a new instance of NotificationClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewNotificationClient(t mockConstructorTestingTNewNotificationClient) *NotificationClient { + mock := &NotificationClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/ProvisionWatcherClient.go b/clients/interfaces/mocks/ProvisionWatcherClient.go index 8fb7d990..a624f51d 100644 --- a/clients/interfaces/mocks/ProvisionWatcherClient.go +++ b/clients/interfaces/mocks/ProvisionWatcherClient.go @@ -1,19 +1,19 @@ -// Code generated by mockery v2.5.1. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // ProvisionWatcherClient is an autogenerated mock type for the ProvisionWatcherClient type @@ -185,3 +185,18 @@ func (_m *ProvisionWatcherClient) Update(ctx context.Context, reqs []requests.Up return r0, r1 } + +type mockConstructorTestingTNewProvisionWatcherClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewProvisionWatcherClient creates a new instance of ProvisionWatcherClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewProvisionWatcherClient(t mockConstructorTestingTNewProvisionWatcherClient) *ProvisionWatcherClient { + mock := &ProvisionWatcherClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/ReadingClient.go b/clients/interfaces/mocks/ReadingClient.go index 162acfc3..78d5168b 100644 --- a/clients/interfaces/mocks/ReadingClient.go +++ b/clients/interfaces/mocks/ReadingClient.go @@ -1,17 +1,17 @@ -// Code generated by mockery v2.9.4. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // ReadingClient is an autogenerated mock type for the ReadingClient type @@ -248,3 +248,18 @@ func (_m *ReadingClient) ReadingsByTimeRange(ctx context.Context, start int, end return r0, r1 } + +type mockConstructorTestingTNewReadingClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewReadingClient creates a new instance of ReadingClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewReadingClient(t mockConstructorTestingTNewReadingClient) *ReadingClient { + mock := &ReadingClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/SubscriptionClient.go b/clients/interfaces/mocks/SubscriptionClient.go index 893d9864..55ba2a25 100644 --- a/clients/interfaces/mocks/SubscriptionClient.go +++ b/clients/interfaces/mocks/SubscriptionClient.go @@ -1,19 +1,19 @@ -// Code generated by mockery v2.7.4. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // SubscriptionClient is an autogenerated mock type for the SubscriptionClient type @@ -208,3 +208,18 @@ func (_m *SubscriptionClient) Update(ctx context.Context, reqs []requests.Update return r0, r1 } + +type mockConstructorTestingTNewSubscriptionClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewSubscriptionClient creates a new instance of SubscriptionClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSubscriptionClient(t mockConstructorTestingTNewSubscriptionClient) *SubscriptionClient { + mock := &SubscriptionClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/SystemManagementClient.go b/clients/interfaces/mocks/SystemManagementClient.go index 4be85523..8a9ca28d 100644 --- a/clients/interfaces/mocks/SystemManagementClient.go +++ b/clients/interfaces/mocks/SystemManagementClient.go @@ -1,17 +1,17 @@ -// Code generated by mockery v0.0.0-dev. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - requests "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" + requests "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" ) // SystemManagementClient is an autogenerated mock type for the SystemManagementClient type @@ -118,3 +118,18 @@ func (_m *SystemManagementClient) GetMetrics(ctx context.Context, services []str return r0, r1 } + +type mockConstructorTestingTNewSystemManagementClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewSystemManagementClient creates a new instance of SystemManagementClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSystemManagementClient(t mockConstructorTestingTNewSystemManagementClient) *SystemManagementClient { + mock := &SystemManagementClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/mocks/TransmissionClient.go b/clients/interfaces/mocks/TransmissionClient.go index be397cb5..49e76a0a 100644 --- a/clients/interfaces/mocks/TransmissionClient.go +++ b/clients/interfaces/mocks/TransmissionClient.go @@ -1,17 +1,17 @@ -// Code generated by mockery v2.9.4. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( context "context" - common "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + common "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" - responses "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" + responses "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" ) // TransmissionClient is an autogenerated mock type for the TransmissionClient type @@ -179,3 +179,18 @@ func (_m *TransmissionClient) TransmissionsByTimeRange(ctx context.Context, star return r0, r1 } + +type mockConstructorTestingTNewTransmissionClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewTransmissionClient creates a new instance of TransmissionClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewTransmissionClient(t mockConstructorTestingTNewTransmissionClient) *TransmissionClient { + mock := &TransmissionClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/clients/interfaces/notification.go b/clients/interfaces/notification.go index c6a6fe4a..65f36a56 100644 --- a/clients/interfaces/notification.go +++ b/clients/interfaces/notification.go @@ -8,10 +8,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // NotificationClient defines the interface for interactions with the Notification endpoint on the EdgeX Foundry support-notifications service. diff --git a/clients/interfaces/provisionwatcher.go b/clients/interfaces/provisionwatcher.go index 5d145d07..fb7e5859 100644 --- a/clients/interfaces/provisionwatcher.go +++ b/clients/interfaces/provisionwatcher.go @@ -8,10 +8,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // ProvisionWatcherClient defines the interface for interactions with the ProvisionWatcher endpoint on the EdgeX Foundry core-metadata service. diff --git a/clients/interfaces/reading.go b/clients/interfaces/reading.go index cb40d5fc..45abc1c3 100644 --- a/clients/interfaces/reading.go +++ b/clients/interfaces/reading.go @@ -8,9 +8,9 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "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-core-contracts/v3/errors" ) // ReadingClient defines the interface for interactions with the Reading endpoint on the EdgeX Foundry core-data service. diff --git a/clients/interfaces/subscription.go b/clients/interfaces/subscription.go index c10a215c..f1d7c0e9 100644 --- a/clients/interfaces/subscription.go +++ b/clients/interfaces/subscription.go @@ -8,10 +8,10 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/responses" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // SubscriptionClient defines the interface for interactions with the Subscription endpoint on the EdgeX Foundry support-notifications service. diff --git a/clients/interfaces/system.go b/clients/interfaces/system.go index 665c3de4..9da0ae9c 100644 --- a/clients/interfaces/system.go +++ b/clients/interfaces/system.go @@ -8,9 +8,9 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/requests" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // SystemManagementClient defines the interface for interactions with the API endpoint on the EdgeX Foundry sys-mgmt-agent service. diff --git a/clients/interfaces/transmission.go b/clients/interfaces/transmission.go index 56ac3e74..48be29db 100644 --- a/clients/interfaces/transmission.go +++ b/clients/interfaces/transmission.go @@ -8,9 +8,9 @@ package interfaces import ( "context" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "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-core-contracts/v3/errors" ) // TransmissionClient defines the interface for interactions with the Transmission endpoint on the EdgeX Foundry support-notifications service. diff --git a/clients/logger/README.md b/clients/logger/README.md index 8d3e4d9f..d959ba2c 100644 --- a/clients/logger/README.md +++ b/clients/logger/README.md @@ -4,7 +4,7 @@ This package contains the logging client written in the Go programming language. ### How To Use ### To use the logging client package you first need to import the library into your project: ``` -import "github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logging" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/clients/logging" ``` To send a log message to STDOUT, you first need to create a LoggingClient with desired Log Level and then you can send log messages (indicating the log level of the message using one of the various log function calls). ``` diff --git a/clients/logger/logger.go b/clients/logger/logger.go index 6270703f..d3742a1a 100644 --- a/clients/logger/logger.go +++ b/clients/logger/logger.go @@ -25,8 +25,8 @@ import ( stdLog "log" "os" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/go-kit/log" ) diff --git a/clients/logger/logger_test.go b/clients/logger/logger_test.go index 78de1edf..0207c490 100644 --- a/clients/logger/logger_test.go +++ b/clients/logger/logger_test.go @@ -9,7 +9,7 @@ package logger import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" ) diff --git a/clients/logger/mock-logger.go b/clients/logger/mock-logger.go index bc137155..3e562de1 100644 --- a/clients/logger/mock-logger.go +++ b/clients/logger/mock-logger.go @@ -14,7 +14,7 @@ package logger -import "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" // MockLogger is a type that can be used for mocking the LoggingClient interface during unit tests type MockLogger struct { diff --git a/clients/logger/mocks/LoggingClient.go b/clients/logger/mocks/LoggingClient.go index c5ad03bd..a3201e35 100644 --- a/clients/logger/mocks/LoggingClient.go +++ b/clients/logger/mocks/LoggingClient.go @@ -1,9 +1,9 @@ -// Code generated by mockery v0.0.0-dev. DO NOT EDIT. +// Code generated by mockery v2.15.0. DO NOT EDIT. package mocks import ( - errors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + errors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" mock "github.com/stretchr/testify/mock" ) @@ -122,3 +122,18 @@ func (_m *LoggingClient) Warnf(msg string, args ...interface{}) { _ca = append(_ca, args...) _m.Called(_ca...) } + +type mockConstructorTestingTNewLoggingClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewLoggingClient creates a new instance of LoggingClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewLoggingClient(t mockConstructorTestingTNewLoggingClient) *LoggingClient { + mock := &LoggingClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/common/utils.go b/common/utils.go index 71cbca66..5b806d5c 100644 --- a/common/utils.go +++ b/common/utils.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) var valueTypes = []string{ diff --git a/common/validator.go b/common/validator.go index affa3277..3612168d 100644 --- a/common/validator.go +++ b/common/validator.go @@ -17,7 +17,7 @@ import ( "github.com/go-playground/validator/v10" "github.com/google/uuid" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) var val *validator.Validate diff --git a/dtos/address.go b/dtos/address.go index 93ff51a3..f1486871 100644 --- a/dtos/address.go +++ b/dtos/address.go @@ -6,9 +6,9 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) type Address struct { diff --git a/dtos/address_test.go b/dtos/address_test.go index 6536c3ee..daaa0cf3 100644 --- a/dtos/address_test.go +++ b/dtos/address_test.go @@ -11,8 +11,8 @@ import ( "net/http" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/autoevent.go b/dtos/autoevent.go index 25c206d3..1f5d40ae 100644 --- a/dtos/autoevent.go +++ b/dtos/autoevent.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // AutoEvent and its properties are defined in the APIv2 specification: diff --git a/dtos/common/base.go b/dtos/common/base.go index b87283d8..8bd839fc 100644 --- a/dtos/common/base.go +++ b/dtos/common/base.go @@ -8,7 +8,7 @@ package common import ( "github.com/google/uuid" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" ) // BaseRequest defines the base content for request DTOs (data transfer objects). diff --git a/dtos/common/base_test.go b/dtos/common/base_test.go index c85cce33..1d13333d 100644 --- a/dtos/common/base_test.go +++ b/dtos/common/base_test.go @@ -11,7 +11,7 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/common/config_test.go b/dtos/common/config_test.go index 82a4d42e..d2253203 100644 --- a/dtos/common/config_test.go +++ b/dtos/common/config_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" ) func TestNewConfigResponse(t *testing.T) { diff --git a/dtos/common/metrics_test.go b/dtos/common/metrics_test.go index 83b39abf..952bf3c8 100644 --- a/dtos/common/metrics_test.go +++ b/dtos/common/metrics_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" ) func TestNewMetricsResponse(t *testing.T) { diff --git a/dtos/common/ping_test.go b/dtos/common/ping_test.go index 1077e8ec..5f9464e2 100644 --- a/dtos/common/ping_test.go +++ b/dtos/common/ping_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" ) func TestNewPingResponse(t *testing.T) { diff --git a/dtos/common/secret.go b/dtos/common/secret.go index 694ba574..113d4c7c 100644 --- a/dtos/common/secret.go +++ b/dtos/common/secret.go @@ -19,8 +19,8 @@ package common import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // SecretDataKeyValue is a key/value pair to be stored in the Secret Store as part of the Secret Data diff --git a/dtos/common/secret_test.go b/dtos/common/secret_test.go index e4c595f2..a4a523b9 100644 --- a/dtos/common/secret_test.go +++ b/dtos/common/secret_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) const ( diff --git a/dtos/common/version_test.go b/dtos/common/version_test.go index 275913eb..a5877dcf 100644 --- a/dtos/common/version_test.go +++ b/dtos/common/version_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" ) func TestNewVersionResponse(t *testing.T) { diff --git a/dtos/device.go b/dtos/device.go index 4e74ea0c..1e66f13d 100644 --- a/dtos/device.go +++ b/dtos/device.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // Device and its properties are defined in the APIv2 specification: diff --git a/dtos/device_test.go b/dtos/device_test.go index c8ba0cc8..5c4431c9 100644 --- a/dtos/device_test.go +++ b/dtos/device_test.go @@ -8,7 +8,7 @@ package dtos import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" ) diff --git a/dtos/devicecommand.go b/dtos/devicecommand.go index c0c43fa7..6945ce97 100644 --- a/dtos/devicecommand.go +++ b/dtos/devicecommand.go @@ -5,7 +5,7 @@ package dtos -import "github.com/edgexfoundry/go-mod-core-contracts/v2/models" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/models" // DeviceCommand and its properties are defined in the APIv2 specification: // https://app.swaggerhub.com/apis-docs/EdgeXFoundry1/core-metadata/2.1.0#/DeviceCommand diff --git a/dtos/deviceprofile.go b/dtos/deviceprofile.go index 0c0b777a..3261c260 100644 --- a/dtos/deviceprofile.go +++ b/dtos/deviceprofile.go @@ -10,9 +10,9 @@ import ( "fmt" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // DeviceProfile and its properties are defined in the APIv2 specification: diff --git a/dtos/deviceprofile_test.go b/dtos/deviceprofile_test.go index 0bf9c57c..83c7f4d3 100644 --- a/dtos/deviceprofile_test.go +++ b/dtos/deviceprofile_test.go @@ -9,8 +9,8 @@ import ( "gopkg.in/yaml.v3" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/deviceresource.go b/dtos/deviceresource.go index 1d3088f8..08924e60 100644 --- a/dtos/deviceresource.go +++ b/dtos/deviceresource.go @@ -5,7 +5,7 @@ package dtos -import "github.com/edgexfoundry/go-mod-core-contracts/v2/models" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/models" // DeviceResource and its properties are defined in the APIv2 specification: // https://app.swaggerhub.com/apis-docs/EdgeXFoundry1/core-metadata/2.1.0#/DeviceResource diff --git a/dtos/deviceservice.go b/dtos/deviceservice.go index 05b01a85..e809e703 100644 --- a/dtos/deviceservice.go +++ b/dtos/deviceservice.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // DeviceService and its properties are defined in the APIv2 specification: diff --git a/dtos/deviceservice_test.go b/dtos/deviceservice_test.go index 20e2d17c..16c91386 100644 --- a/dtos/deviceservice_test.go +++ b/dtos/deviceservice_test.go @@ -8,7 +8,7 @@ package dtos import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" ) diff --git a/dtos/event.go b/dtos/event.go index fe3b7595..e4c8db2e 100644 --- a/dtos/event.go +++ b/dtos/event.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" ) diff --git a/dtos/event_test.go b/dtos/event_test.go index cce8a160..2192ad30 100644 --- a/dtos/event_test.go +++ b/dtos/event_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" ) diff --git a/dtos/interval.go b/dtos/interval.go index b970c381..4d0145a7 100644 --- a/dtos/interval.go +++ b/dtos/interval.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // Interval and its properties are defined in the APIv2 specification: diff --git a/dtos/intervalaction.go b/dtos/intervalaction.go index 3fbea7bd..d2dcb2c1 100644 --- a/dtos/intervalaction.go +++ b/dtos/intervalaction.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // IntervalAction and its properties are defined in the APIv2 specification: diff --git a/dtos/metric.go b/dtos/metric.go index 8727fa96..6c04f530 100644 --- a/dtos/metric.go +++ b/dtos/metric.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // Metric defines the metric data for a specific named metric @@ -99,10 +99,13 @@ func ValidateMetricName(name string, nameType string) error { // ToLineProtocol transforms the Metric to Line Protocol syntax which is most commonly used with InfluxDB // For more information on Line Protocol see: https://docs.influxdata.com/influxdb/v2.0/reference/syntax/line-protocol/ // Line Protocol Syntax: -// [,=[,=]] =[,=] [] +// +// [,=[,=]] =[,=] [] +// // Examples: -// measurementName fieldKey="field string value" 1556813561098000000 -// myMeasurement,tag1=value1,tag2=value2 fieldKey="fieldValue" 1556813561098000000 +// +// measurementName fieldKey="field string value" 1556813561098000000 +// myMeasurement,tag1=value1,tag2=value2 fieldKey="fieldValue" 1556813561098000000 // // Note that this is a simple helper function for those receiving this DTO that are pushing metrics to an endpoint // that receives LineProtocol such as InfluxDb or Telegraf diff --git a/dtos/notification.go b/dtos/notification.go index 5302f75b..dde8433f 100644 --- a/dtos/notification.go +++ b/dtos/notification.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/google/uuid" ) diff --git a/dtos/notification_test.go b/dtos/notification_test.go index 440a210a..74fa4c6a 100644 --- a/dtos/notification_test.go +++ b/dtos/notification_test.go @@ -3,7 +3,7 @@ package dtos import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" ) diff --git a/dtos/protocolproperties.go b/dtos/protocolproperties.go index 9a36ff28..d88b8d2f 100644 --- a/dtos/protocolproperties.go +++ b/dtos/protocolproperties.go @@ -5,7 +5,7 @@ package dtos -import "github.com/edgexfoundry/go-mod-core-contracts/v2/models" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/models" // ProtocolProperties contains the device connection information in key/value pair type ProtocolProperties map[string]string diff --git a/dtos/provisionwatcher.go b/dtos/provisionwatcher.go index 6253cbf0..4162c985 100644 --- a/dtos/provisionwatcher.go +++ b/dtos/provisionwatcher.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // ProvisionWatcher and its properties are defined in the APIv2 specification: diff --git a/dtos/provisionwatcher_test.go b/dtos/provisionwatcher_test.go index ec450db8..e01a2044 100644 --- a/dtos/provisionwatcher_test.go +++ b/dtos/provisionwatcher_test.go @@ -8,7 +8,7 @@ package dtos import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" ) diff --git a/dtos/reading.go b/dtos/reading.go index 4e36779d..20ea58f4 100644 --- a/dtos/reading.go +++ b/dtos/reading.go @@ -14,9 +14,9 @@ import ( "github.com/google/uuid" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // BaseReading and its properties are defined in the APIv2 specification: diff --git a/dtos/reading_test.go b/dtos/reading_test.go index db29b2ee..8f346709 100644 --- a/dtos/reading_test.go +++ b/dtos/reading_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" ) diff --git a/dtos/requests/device.go b/dtos/requests/device.go index 582790eb..1fec65f3 100644 --- a/dtos/requests/device.go +++ b/dtos/requests/device.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // AddDeviceRequest defines the Request Content for POST Device DTO. diff --git a/dtos/requests/device_test.go b/dtos/requests/device_test.go index d144e05e..8d2e3268 100644 --- a/dtos/requests/device_test.go +++ b/dtos/requests/device_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/requests/devicecommand.go b/dtos/requests/devicecommand.go index 5fc9fa22..20cf0709 100644 --- a/dtos/requests/devicecommand.go +++ b/dtos/requests/devicecommand.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // AddDeviceCommandRequest defines the Request Content for POST DeviceCommand DTO. @@ -85,7 +85,7 @@ func (dc *UpdateDeviceCommandRequest) UnmarshalJSON(b []byte) error { return nil } -// ReplaceDeviceCommandModelFieldsWithDTO replace existing DeviceCommand's fields with DTO patch +// ReplaceDeviceCommandModelFieldsWithDTO replace existing DeviceCommand's fields with DTO patch func ReplaceDeviceCommandModelFieldsWithDTO(dc *models.DeviceCommand, patch dtos.UpdateDeviceCommand) { if patch.IsHidden != nil { dc.IsHidden = *patch.IsHidden diff --git a/dtos/requests/devicecommand_test.go b/dtos/requests/devicecommand_test.go index bbb79aea..0aba982d 100644 --- a/dtos/requests/devicecommand_test.go +++ b/dtos/requests/devicecommand_test.go @@ -9,10 +9,10 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/requests/deviceprofile.go b/dtos/requests/deviceprofile.go index b1e4b23f..835d0d32 100644 --- a/dtos/requests/deviceprofile.go +++ b/dtos/requests/deviceprofile.go @@ -10,11 +10,11 @@ import ( "errors" "strings" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + edgexErrors "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // DeviceProfileRequest defines the Request Content for POST DeviceProfile DTO. diff --git a/dtos/requests/deviceprofile_test.go b/dtos/requests/deviceprofile_test.go index 7e8d24c7..4b56ce92 100644 --- a/dtos/requests/deviceprofile_test.go +++ b/dtos/requests/deviceprofile_test.go @@ -10,10 +10,10 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/requests/deviceprofilebasicinfo.go b/dtos/requests/deviceprofilebasicinfo.go index 8c6c9a37..f1435cbe 100644 --- a/dtos/requests/deviceprofilebasicinfo.go +++ b/dtos/requests/deviceprofilebasicinfo.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // DeviceProfileBasicInfoRequest defines the Request Content for PATCH UpdateDeviceProfileBasicInfo DTO. @@ -48,7 +48,7 @@ func (d *DeviceProfileBasicInfoRequest) UnmarshalJSON(b []byte) error { return nil } -// ReplaceDeviceProfileModelBasicInfoFieldsWithDTO replace existing DeviceProfile's basic info fields with DTO patch +// ReplaceDeviceProfileModelBasicInfoFieldsWithDTO replace existing DeviceProfile's basic info fields with DTO patch func ReplaceDeviceProfileModelBasicInfoFieldsWithDTO(dp *models.DeviceProfile, patch dtos.UpdateDeviceProfileBasicInfo) { if patch.Description != nil { dp.Description = *patch.Description diff --git a/dtos/requests/deviceprofilebasicinfo_test.go b/dtos/requests/deviceprofilebasicinfo_test.go index 4fc21181..bc52512b 100644 --- a/dtos/requests/deviceprofilebasicinfo_test.go +++ b/dtos/requests/deviceprofilebasicinfo_test.go @@ -8,10 +8,10 @@ package requests import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/dtos/requests/deviceresource.go b/dtos/requests/deviceresource.go index 87bca3f2..8dc13422 100644 --- a/dtos/requests/deviceresource.go +++ b/dtos/requests/deviceresource.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // DeviceResourceRequest defines the Request Content for POST DeviceResource DTO. @@ -83,7 +83,7 @@ func (dr *UpdateDeviceResourceRequest) UnmarshalJSON(b []byte) error { return nil } -// ReplaceDeviceResourceModelFieldsWithDTO replace existing DeviceResource's fields with DTO patch +// ReplaceDeviceResourceModelFieldsWithDTO replace existing DeviceResource's fields with DTO patch func ReplaceDeviceResourceModelFieldsWithDTO(dr *models.DeviceResource, patch dtos.UpdateDeviceResource) { if patch.Description != nil { dr.Description = *patch.Description diff --git a/dtos/requests/deviceresource_test.go b/dtos/requests/deviceresource_test.go index c7b30a3f..3ca42112 100644 --- a/dtos/requests/deviceresource_test.go +++ b/dtos/requests/deviceresource_test.go @@ -9,10 +9,10 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/requests/deviceservice.go b/dtos/requests/deviceservice.go index f69017ca..bddd4c87 100644 --- a/dtos/requests/deviceservice.go +++ b/dtos/requests/deviceservice.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // AddDeviceServiceRequest defines the Request Content for POST DeviceService DTO. diff --git a/dtos/requests/deviceservice_test.go b/dtos/requests/deviceservice_test.go index 46e63323..f376f63f 100644 --- a/dtos/requests/deviceservice_test.go +++ b/dtos/requests/deviceservice_test.go @@ -10,10 +10,10 @@ import ( "fmt" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/requests/event.go b/dtos/requests/event.go index c0cca550..81b05484 100644 --- a/dtos/requests/event.go +++ b/dtos/requests/event.go @@ -9,11 +9,11 @@ import ( "encoding/json" "os" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/fxamacker/cbor/v2" ) diff --git a/dtos/requests/event_test.go b/dtos/requests/event_test.go index 6a8bb64d..5ff298b6 100644 --- a/dtos/requests/event_test.go +++ b/dtos/requests/event_test.go @@ -11,9 +11,9 @@ import ( "strconv" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/fxamacker/cbor/v2" "github.com/stretchr/testify/assert" diff --git a/dtos/requests/interval.go b/dtos/requests/interval.go index c31f09e3..0e21ec41 100644 --- a/dtos/requests/interval.go +++ b/dtos/requests/interval.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // AddIntervalRequest defines the Request Content for POST Interval DTO. diff --git a/dtos/requests/interval_test.go b/dtos/requests/interval_test.go index 223c5a63..3d1032c6 100644 --- a/dtos/requests/interval_test.go +++ b/dtos/requests/interval_test.go @@ -9,9 +9,9 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/requests/intervalaction.go b/dtos/requests/intervalaction.go index 1fe7401f..410d71c6 100644 --- a/dtos/requests/intervalaction.go +++ b/dtos/requests/intervalaction.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // AddIntervalRequest defines the Request Content for POST Interval DTO. diff --git a/dtos/requests/intervalaction_test.go b/dtos/requests/intervalaction_test.go index cf286128..8da4857d 100644 --- a/dtos/requests/intervalaction_test.go +++ b/dtos/requests/intervalaction_test.go @@ -9,10 +9,10 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/requests/notification.go b/dtos/requests/notification.go index ca965134..27edf178 100644 --- a/dtos/requests/notification.go +++ b/dtos/requests/notification.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // AddNotificationRequest defines the Request Content for POST Notification DTO. diff --git a/dtos/requests/notification_test.go b/dtos/requests/notification_test.go index 6cbf55ba..1f19896d 100644 --- a/dtos/requests/notification_test.go +++ b/dtos/requests/notification_test.go @@ -9,8 +9,8 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/requests/operation.go b/dtos/requests/operation.go index 5efafa14..4f787509 100644 --- a/dtos/requests/operation.go +++ b/dtos/requests/operation.go @@ -8,9 +8,9 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // OperationRequest defines the Request Content for SMA POST Operation. diff --git a/dtos/requests/operation_test.go b/dtos/requests/operation_test.go index e4e05d5c..ca472817 100644 --- a/dtos/requests/operation_test.go +++ b/dtos/requests/operation_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) var testOperationRequest = OperationRequest{ diff --git a/dtos/requests/provisionwatcher.go b/dtos/requests/provisionwatcher.go index 97ecfb88..22712101 100644 --- a/dtos/requests/provisionwatcher.go +++ b/dtos/requests/provisionwatcher.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // AddProvisionWatcherRequest defines the Request Content for POST ProvisionWatcher DTO. diff --git a/dtos/requests/provisionwatcher_test.go b/dtos/requests/provisionwatcher_test.go index 129eb2cc..40d91a0f 100644 --- a/dtos/requests/provisionwatcher_test.go +++ b/dtos/requests/provisionwatcher_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) var testProvisionWatcherName = "TestWatcher" diff --git a/dtos/requests/subscription.go b/dtos/requests/subscription.go index b4592027..4942bbdd 100644 --- a/dtos/requests/subscription.go +++ b/dtos/requests/subscription.go @@ -8,11 +8,11 @@ package requests import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) var supportedChannelTypes = []string{common.EMAIL, common.REST} diff --git a/dtos/requests/subscription_test.go b/dtos/requests/subscription_test.go index dfb5913a..0245bc83 100644 --- a/dtos/requests/subscription_test.go +++ b/dtos/requests/subscription_test.go @@ -9,8 +9,8 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/dtos/resourceoperation.go b/dtos/resourceoperation.go index 18345e1e..ba71da0f 100644 --- a/dtos/resourceoperation.go +++ b/dtos/resourceoperation.go @@ -5,7 +5,7 @@ package dtos -import "github.com/edgexfoundry/go-mod-core-contracts/v2/models" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/models" // ResourceOperation and its properties are defined in the APIv2 specification: // https://app.swaggerhub.com/apis-docs/EdgeXFoundry1/core-metadata/2.1.0#/ResourceOperation diff --git a/dtos/resourceproperties.go b/dtos/resourceproperties.go index bbcd8a98..a4a909e4 100644 --- a/dtos/resourceproperties.go +++ b/dtos/resourceproperties.go @@ -5,7 +5,7 @@ package dtos -import "github.com/edgexfoundry/go-mod-core-contracts/v2/models" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/models" // ResourceProperties and its properties care defined in the APIv2 specification: // https://app.swaggerhub.com/apis-docs/EdgeXFoundry1/core-metadata/2.1.0#/ResourceProperties diff --git a/dtos/responses/corecommand.go b/dtos/responses/corecommand.go index 97a88f93..3ef2f1a5 100644 --- a/dtos/responses/corecommand.go +++ b/dtos/responses/corecommand.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // DeviceCoreCommandResponse defines the Response Content for GET DeviceCoreCommand DTO. diff --git a/dtos/responses/corecommand_test.go b/dtos/responses/corecommand_test.go index 3fd1be4b..d3525c51 100644 --- a/dtos/responses/corecommand_test.go +++ b/dtos/responses/corecommand_test.go @@ -9,8 +9,8 @@ import ( "net/http" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/device.go b/dtos/responses/device.go index 8ae97395..465cfafa 100644 --- a/dtos/responses/device.go +++ b/dtos/responses/device.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // DeviceResponse defines the Response Content for GET Device DTOs. diff --git a/dtos/responses/device_test.go b/dtos/responses/device_test.go index 3aac2ef7..1274f50f 100644 --- a/dtos/responses/device_test.go +++ b/dtos/responses/device_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/deviceprofile.go b/dtos/responses/deviceprofile.go index 3e6e7a51..572c40e9 100644 --- a/dtos/responses/deviceprofile.go +++ b/dtos/responses/deviceprofile.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // DeviceProfileResponse defines the Response Content for GET DeviceProfile DTOs. diff --git a/dtos/responses/deviceprofile_test.go b/dtos/responses/deviceprofile_test.go index d74b154a..cb3ccd1c 100644 --- a/dtos/responses/deviceprofile_test.go +++ b/dtos/responses/deviceprofile_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/deviceresource.go b/dtos/responses/deviceresource.go index 70492c83..6afabb25 100644 --- a/dtos/responses/deviceresource.go +++ b/dtos/responses/deviceresource.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // DeviceResourceResponse defines the Response Content for GET DeviceResource DTOs. diff --git a/dtos/responses/deviceresource_test.go b/dtos/responses/deviceresource_test.go index acbd93d6..e215ad83 100644 --- a/dtos/responses/deviceresource_test.go +++ b/dtos/responses/deviceresource_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/deviceservice.go b/dtos/responses/deviceservice.go index ea562f95..917130ae 100644 --- a/dtos/responses/deviceservice.go +++ b/dtos/responses/deviceservice.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // DeviceServiceResponse defines the Response Content for GET DeviceService DTOs. diff --git a/dtos/responses/deviceservice_test.go b/dtos/responses/deviceservice_test.go index cc268956..95d680f7 100644 --- a/dtos/responses/deviceservice_test.go +++ b/dtos/responses/deviceservice_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/event.go b/dtos/responses/event.go index ee455a33..a93fe3ab 100644 --- a/dtos/responses/event.go +++ b/dtos/responses/event.go @@ -9,10 +9,10 @@ import ( "encoding/json" "os" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + dtoCommon "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" "github.com/fxamacker/cbor/v2" ) diff --git a/dtos/responses/event_test.go b/dtos/responses/event_test.go index 75823876..3435f7be 100644 --- a/dtos/responses/event_test.go +++ b/dtos/responses/event_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" ) func TestNewEventResponse(t *testing.T) { diff --git a/dtos/responses/interval.go b/dtos/responses/interval.go index 07f1fd30..75c3aa6a 100644 --- a/dtos/responses/interval.go +++ b/dtos/responses/interval.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // IntervalResponse defines the Response Content for GET Interval DTOs. diff --git a/dtos/responses/interval_test.go b/dtos/responses/interval_test.go index 3ac854ad..42255ddf 100644 --- a/dtos/responses/interval_test.go +++ b/dtos/responses/interval_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/intervalaction.go b/dtos/responses/intervalaction.go index c8c957f1..c0800bcc 100644 --- a/dtos/responses/intervalaction.go +++ b/dtos/responses/intervalaction.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // IntervalActionResponse defines the Response Content for GET IntervalAction DTOs. diff --git a/dtos/responses/intervalaction_test.go b/dtos/responses/intervalaction_test.go index 747f0594..72493c35 100644 --- a/dtos/responses/intervalaction_test.go +++ b/dtos/responses/intervalaction_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/notification.go b/dtos/responses/notification.go index a7d76623..8b8f312b 100644 --- a/dtos/responses/notification.go +++ b/dtos/responses/notification.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // NotificationResponse defines the Response Content for GET Notification DTO. diff --git a/dtos/responses/notification_test.go b/dtos/responses/notification_test.go index ab1c1f83..71791c1e 100644 --- a/dtos/responses/notification_test.go +++ b/dtos/responses/notification_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/provisionwatcher.go b/dtos/responses/provisionwatcher.go index b2d1c0c6..6e6d133b 100644 --- a/dtos/responses/provisionwatcher.go +++ b/dtos/responses/provisionwatcher.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // ProvisionWatcherResponse defines the Response Content for GET ProvisionWatcher DTOs. diff --git a/dtos/responses/provisionwatcher_test.go b/dtos/responses/provisionwatcher_test.go index 72346e8f..50dc6b2f 100644 --- a/dtos/responses/provisionwatcher_test.go +++ b/dtos/responses/provisionwatcher_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/reading.go b/dtos/responses/reading.go index 5c077da1..3ac971c1 100644 --- a/dtos/responses/reading.go +++ b/dtos/responses/reading.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // ReadingResponse defines the Response Content for GET reading DTO. diff --git a/dtos/responses/reading_test.go b/dtos/responses/reading_test.go index f874ae03..4a7d80bd 100644 --- a/dtos/responses/reading_test.go +++ b/dtos/responses/reading_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" ) func TestNewReadingResponse(t *testing.T) { diff --git a/dtos/responses/subscription.go b/dtos/responses/subscription.go index 708ff0da..092d3568 100644 --- a/dtos/responses/subscription.go +++ b/dtos/responses/subscription.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // SubscriptionResponse defines the Subscription Content for GET Subscription DTOs. diff --git a/dtos/responses/subscription_test.go b/dtos/responses/subscription_test.go index 91779953..528dccc0 100644 --- a/dtos/responses/subscription_test.go +++ b/dtos/responses/subscription_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/transmission.go b/dtos/responses/transmission.go index 87ad885e..d3f9f73e 100644 --- a/dtos/responses/transmission.go +++ b/dtos/responses/transmission.go @@ -6,8 +6,8 @@ package responses import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // TransmissionResponse defines the Response Content for GET Transmission DTO. diff --git a/dtos/responses/transmission_test.go b/dtos/responses/transmission_test.go index d7f5d55c..5041ff58 100644 --- a/dtos/responses/transmission_test.go +++ b/dtos/responses/transmission_test.go @@ -8,7 +8,7 @@ package responses import ( "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos" "github.com/stretchr/testify/assert" ) diff --git a/dtos/responses/uom.go b/dtos/responses/uom.go index 915d0e2b..ec7bd0ec 100644 --- a/dtos/responses/uom.go +++ b/dtos/responses/uom.go @@ -5,7 +5,7 @@ package responses -import "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" +import "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" type UnitsOfMeasureResponse struct { common.BaseResponse `json:",inline"` diff --git a/dtos/subscription.go b/dtos/subscription.go index 55fc3d28..a9b086a2 100644 --- a/dtos/subscription.go +++ b/dtos/subscription.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // Subscription and its properties are defined in the APIv2 specification: diff --git a/dtos/systemevent.go b/dtos/systemevent.go index df0d93c3..040d06df 100644 --- a/dtos/systemevent.go +++ b/dtos/systemevent.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/dtos/common" ) // SystemEvent defines the data for a system event diff --git a/dtos/systemevent_test.go b/dtos/systemevent_test.go index e1d59a5a..dbc4cd2b 100644 --- a/dtos/systemevent_test.go +++ b/dtos/systemevent_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" ) var expectedApiVersion = common.ApiVersion diff --git a/dtos/transmission.go b/dtos/transmission.go index 90cffb80..d6cb2b9b 100644 --- a/dtos/transmission.go +++ b/dtos/transmission.go @@ -6,7 +6,7 @@ package dtos import ( - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) // Transmission and its properties are defined in the APIv2 specification: diff --git a/dtos/transmissionrecord.go b/dtos/transmissionrecord.go index a8f7154b..e5a71e25 100644 --- a/dtos/transmissionrecord.go +++ b/dtos/transmissionrecord.go @@ -8,7 +8,7 @@ package dtos import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/models" + "github.com/edgexfoundry/go-mod-core-contracts/v3/models" ) type TransmissionRecord struct { diff --git a/go.mod b/go.mod index 3830fd1c..60af5299 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/edgexfoundry/go-mod-core-contracts/v2 +module github.com/edgexfoundry/go-mod-core-contracts/v3 go 1.18 diff --git a/models/address.go b/models/address.go index a2066706..52fc941f 100644 --- a/models/address.go +++ b/models/address.go @@ -8,8 +8,8 @@ package models import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) type Address interface { diff --git a/models/intervalaction.go b/models/intervalaction.go index aebb4a44..bac2f419 100644 --- a/models/intervalaction.go +++ b/models/intervalaction.go @@ -8,7 +8,7 @@ package models import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // IntervalAction and its properties are defined in the APIv2 specification: diff --git a/models/intervalaction_test.go b/models/intervalaction_test.go index 557ac93e..a6db6e00 100644 --- a/models/intervalaction_test.go +++ b/models/intervalaction_test.go @@ -9,7 +9,7 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/log_entry.go b/models/log_entry.go index 1c2ef4de..81b92a0d 100644 --- a/models/log_entry.go +++ b/models/log_entry.go @@ -17,7 +17,7 @@ package models import ( "encoding/json" "fmt" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // These constants identify the log levels in order of increasing severity. diff --git a/models/subscription.go b/models/subscription.go index a83f2c28..b79544b9 100644 --- a/models/subscription.go +++ b/models/subscription.go @@ -8,7 +8,7 @@ package models import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // Subscription and its properties are defined in the APIv2 specification: diff --git a/models/subscription_test.go b/models/subscription_test.go index 514e900e..3bd07afa 100644 --- a/models/subscription_test.go +++ b/models/subscription_test.go @@ -9,7 +9,7 @@ import ( "encoding/json" "testing" - "github.com/edgexfoundry/go-mod-core-contracts/v2/common" + "github.com/edgexfoundry/go-mod-core-contracts/v3/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/models/transmission.go b/models/transmission.go index 4fb40181..76031619 100644 --- a/models/transmission.go +++ b/models/transmission.go @@ -8,7 +8,7 @@ package models import ( "encoding/json" - "github.com/edgexfoundry/go-mod-core-contracts/v2/errors" + "github.com/edgexfoundry/go-mod-core-contracts/v3/errors" ) // Transmission and its properties are defined in the APIv2 specification: