feat(sdk): Use v2 Command Client

Register v2 client in dic and change interface used throughout.

Signed-off-by: Alex Ullrich <[email protected]>

app-service-template/go.mod

@@ -6,7 +6,7 @@ go 1.15
 
 require (
 	github.com/edgexfoundry/app-functions-sdk-go/v2 v2.0.0-dev.52
-	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.90
+	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.91
 	github.com/google/uuid v1.2.0
 	github.com/stretchr/testify v1.7.0
 )

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/diegoholiveira/jsonlogic v1.0.1-0.20200220175622-ab7989be08b9
 	github.com/eclipse/paho.mqtt.golang v1.3.4
 	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.0.0-dev.54
-	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.90
+	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.91
 	github.com/edgexfoundry/go-mod-messaging/v2 v2.0.0-dev.13
 	github.com/edgexfoundry/go-mod-registry/v2 v2.0.0-dev.7
 	github.com/fxamacker/cbor/v2 v2.2.0

internal/app/service.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	interfaces2 "github.com/edgexfoundry/go-mod-core-contracts/v2/v2/clients/interfaces"
 	nethttp "net/http"
 	"os"
 	"os/signal"
@@ -29,7 +30,6 @@ import (
 	"syscall"
 
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients"
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/command"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/coredata"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/notifications"
@@ -480,7 +480,7 @@ func (svc *Service) EventClient() coredata.EventClient {
 }
 
 // CommandClient returns the Command client, which may be nil, from the dependency injection container
-func (svc *Service) CommandClient() command.CommandClient {
+func (svc *Service) CommandClient() interfaces2.CommandClient {
 	return container.CommandClientFrom(svc.dic.Get)
 }
 

internal/appfunction/context.go

@@ -23,10 +23,10 @@ import (
 
 	bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container"
 	"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/command"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/coredata"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/notifications"
+	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2/clients/interfaces"
 
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/internal/bootstrap/container"
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/pkg/util"
@@ -205,7 +205,7 @@ func (appContext *Context) EventClient() coredata.EventClient {
 }
 
 // CommandClient returns the Command client, which may be nil, from the dependency injection container
-func (appContext *Context) CommandClient() command.CommandClient {
+func (appContext *Context) CommandClient() interfaces.CommandClient {
 	return container.CommandClientFrom(appContext.dic.Get)
 }
 

internal/appfunction/context_test.go

@@ -27,12 +27,12 @@ import (
 	"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/interfaces/mocks"
 	"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients"
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/command"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/coredata"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/notifications"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/urlclient/local"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2"
+	v2clients "github.com/edgexfoundry/go-mod-core-contracts/v2/v2/clients/http"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2/dtos"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2/dtos/common"
 
@@ -55,11 +55,10 @@ func TestMain(m *testing.M) {
 			return notifications.NewNotificationsClient(local.New(clients.ApiNotificationRoute))
 		},
 		container.CommandClientName: func(get di.Get) interface{} {
-			return command.NewCommandClient(local.New(clients.ApiCommandRoute))
+			return v2clients.NewCommandClient(clients.ApiCommandRoute)
 		},
 		bootstrapContainer.LoggingClientInterfaceName: func(get di.Get) interface{} {
 			return logger.NewMockClient()
-
 		},
 	})
 	target = NewContext("", dic, "")

internal/bootstrap/container/clients.go

@@ -18,9 +18,9 @@ package container
 import (
 	"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/command"
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/notifications"
-
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/coredata"
+	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/notifications"
+	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2/clients/interfaces"
 )
 
 // ValueDescriptorClientName contains the name of the ValueDescriptorClient's implementation in the DIC.
@@ -63,10 +63,10 @@ func NotificationsClientFrom(get di.Get) notifications.NotificationsClient {
 var CommandClientName = di.TypeInstanceToName((*command.CommandClient)(nil))
 
 // NotificationsClientFrom helper function queries the DIC and returns the NotificationsClientInfo's implementation.
-func CommandClientFrom(get di.Get) command.CommandClient {
+func CommandClientFrom(get di.Get) interfaces.CommandClient {
 	if get(CommandClientName) == nil {
 		return nil
 	}
 
-	return get(CommandClientName).(command.CommandClient)
+	return get(CommandClientName).(interfaces.CommandClient)
 }

internal/bootstrap/handlers/clients.go

@@ -22,11 +22,13 @@ import (
 	"github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/startup"
 	"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients"
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/command"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/coredata"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/notifications"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/urlclient/local"
 
+	v2clients "github.com/edgexfoundry/go-mod-core-contracts/v2/v2/clients/http"
+	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2/clients/interfaces"
+
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/internal/bootstrap/container"
 )
 
@@ -50,7 +52,7 @@ func (_ *Clients) BootstrapHandler(
 
 	var eventClient coredata.EventClient
 	var valueDescriptorClient coredata.ValueDescriptorClient
-	var commandClient command.CommandClient
+	var commandClient interfaces.CommandClient
 	var notificationsClient notifications.NotificationsClient
 
 	// Use of these client interfaces is optional, so they are not required to be configured. For instance if not
@@ -64,8 +66,7 @@ func (_ *Clients) BootstrapHandler(
 	}
 
 	if _, ok := config.Clients[clients.CoreCommandServiceKey]; ok {
-		commandClient = command.NewCommandClient(
-			local.New(config.Clients[clients.CoreCommandServiceKey].Url() + clients.ApiDeviceRoute))
+		commandClient = v2clients.NewCommandClient(config.Clients[clients.CoreCommandServiceKey].Url())
 	}
 
 	if _, ok := config.Clients[clients.SupportNotificationsServiceKey]; ok {

pkg/interfaces/context.go

@@ -16,9 +16,9 @@
 package interfaces
 
 import (
+	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2/clients/interfaces"
 	"time"
 
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/command"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/coredata"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/notifications"
@@ -68,7 +68,7 @@ type AppFunctionContext interface {
 	EventClient() coredata.EventClient
 	// CommandClient returns the Command client. Note if Support Command is not specified in the Clients configuration,
 	// this will return nil.
-	CommandClient() command.CommandClient
+	CommandClient() interfaces.CommandClient
 	// NotificationsClient returns the Notifications client. Note if Support Notifications is not specified in the
 	// Clients configuration, this will return nil.
 	NotificationsClient() notifications.NotificationsClient

pkg/interfaces/service.go

@@ -16,9 +16,9 @@
 package interfaces
 
 import (
+	"github.com/edgexfoundry/go-mod-core-contracts/v2/v2/clients/interfaces"
 	"net/http"
 
-	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/command"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/coredata"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/notifications"
@@ -103,7 +103,7 @@ type ApplicationService interface {
 	EventClient() coredata.EventClient
 	// CommandClient returns the Command client. Note if Support Command is not specified in the Clients configuration,
 	// this will return nil.
-	CommandClient() command.CommandClient
+	CommandClient() interfaces.CommandClient
 	// NotificationsClient returns the Notifications client. Note if Support Notifications is not specified in the
 	// Clients configuration, this will return nil.
 	NotificationsClient() notifications.NotificationsClient