Fix the Content Header-related issue with CBOR.

Signed-off-by: Akram Ahmad <sftwr2020@gmail.com>
edgexfoundry · Apr 9, 2020 · 1556322 · 1556322
1 parent b92b1a4
commit 1556322
Show file tree

Hide file tree

Showing 9 changed files with 205 additions and 48 deletions.
diff --git a/example/cmd/device-simple/Attribution.txt b/example/cmd/device-simple/Attribution.txt
@@ -96,6 +96,9 @@ https://github.com/pmezard/go-difflib/blob/master/LICENSE
 stretchr/testify (MIT) https://github.com/stretchr/testify
 https://github.com/stretchr/testify/blob/master/LICENSE
 
+ugorji/go (MIT) https://github.com/ugorji/go
+https://github.com/ugorji/go/blob/master/LICENSE
+
 kr/logfmt (MIT) https://github.com/kr/logfmt
 https://github.com/kr/logfmt/blob/master/Readme
 

diff --git a/go.mod b/go.mod
@@ -10,6 +10,7 @@ require (
 	github.com/gorilla/mux v1.7.1
 	github.com/pkg/errors v0.8.1
 	github.com/stretchr/testify v1.5.1
+	github.com/ugorji/go v1.1.4
 	gopkg.in/yaml.v2 v2.2.8
 )
 

diff --git a/internal/autoevent/executor.go b/internal/autoevent/executor.go
@@ -12,11 +12,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/OneOfOne/xxhash"
 	"github.com/edgexfoundry/device-sdk-go/internal/common"
 	"github.com/edgexfoundry/device-sdk-go/internal/handler"
 	dsModels "github.com/edgexfoundry/device-sdk-go/pkg/models"
 	contract "github.com/edgexfoundry/go-mod-core-contracts/models"
+
+	"github.com/OneOfOne/xxhash"
 )
 
 type Executor interface {
@@ -80,7 +81,7 @@ func readResource(e *executor) (*dsModels.Event, common.AppError) {
 	vars[common.NameVar] = e.deviceName
 	vars[common.CommandVar] = e.autoEvent.Resource
 
-	evt, appErr := handler.CommandHandler(vars, "", common.GetCmdMethod, "")
+	evt, appErr := handler.CommandHandler(vars, "", nil)
 	return evt, appErr
 }
 

diff --git a/internal/common/types.go b/internal/common/types.go
@@ -16,7 +16,8 @@ import (
 // WritableInfo is a struct which contains configuration settings that can be changed in the Registry .
 type WritableInfo struct {
 	// Level is the logging level of writing log message
-	LogLevel string
+	LogLevel     string
+	ChecksumAlgo string
 }
 
 // ServiceInfo is a struct which contains service related configuration

diff --git a/internal/controller/restfuncs.go b/internal/controller/restfuncs.go
@@ -20,6 +20,7 @@ import (
 	"github.com/edgexfoundry/device-sdk-go/internal/handler/callback"
 	"github.com/edgexfoundry/go-mod-core-contracts/clients"
 	contract "github.com/edgexfoundry/go-mod-core-contracts/models"
+
 	"github.com/gorilla/mux"
 )
 
@@ -105,7 +106,7 @@ func commandFunc(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	event, appErr := handler.CommandHandler(vars, body, req.Method, req.URL.RawQuery)
+	event, appErr := handler.CommandHandler(vars, body, req)
 
 	if appErr != nil {
 		http.Error(w, fmt.Sprintf("%s %s", appErr.Message(), req.URL.Path), appErr.Code())
@@ -149,7 +150,7 @@ func commandAllFunc(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	events, appErr := handler.CommandAllHandler(vars[common.CommandVar], body, req.Method, req.URL.RawQuery)
+	events, appErr := handler.CommandAllHandler(vars[common.CommandVar], body, req)
 	if appErr != nil {
 		http.Error(w, appErr.Message(), appErr.Code())
 	} else if len(events) > 0 {