1
0
mirror of https://github.com/mainflux/mainflux.git synced 2025-04-28 13:48:49 +08:00
Aleksandar Novaković 649986b19f MF-757 - Add support for explicit content type (#771)
* Add format to raw message and content type mapping

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Add format as part of content type header

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Add format to content-type header for WS adapter

Add format as part of content-type and add support for
content-type header and query parameter.

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Add support for format and content-type in MQTT adapter

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Add format and content-type to CoAP adapter

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Add documentation for content type and format

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Add comments to MQTT code

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Fix SenML JSON CoAP code type

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Remove format from the adapters

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Remove format from the docs

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Remove format field from MQTT adapter

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Update content type to be optional

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Add support for CBOR content type in the normalizer

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>

* Update docs for MQTT content type

Signed-off-by: Aleksandar Novakovic <anovakovic01@gmail.com>
2019-07-25 02:22:28 +02:00

81 lines
1.6 KiB
Go

//
// Copyright (c) 2018
// Mainflux
//
// SPDX-License-Identifier: Apache-2.0
//
package normalizer
import (
"strings"
"github.com/cisco/senml"
"github.com/mainflux/mainflux"
)
var formats = map[string]senml.Format{
mainflux.SenMLJSON: senml.JSON,
mainflux.SenMLCBOR: senml.CBOR,
}
type normalizer struct{}
// New returns normalizer service implementation.
func New() Service {
return normalizer{}
}
func (n normalizer) Normalize(msg mainflux.RawMessage) (NormalizedData, error) {
format, ok := formats[msg.ContentType]
if !ok {
format = senml.JSON
}
raw, err := senml.Decode(msg.Payload, format)
if err != nil {
return NormalizedData{}, err
}
normalized := senml.Normalize(raw)
msgs := make([]mainflux.Message, len(normalized.Records))
for k, v := range normalized.Records {
m := mainflux.Message{
Channel: msg.Channel,
Subtopic: msg.Subtopic,
Publisher: msg.Publisher,
Protocol: msg.Protocol,
Name: v.Name,
Unit: v.Unit,
Time: v.Time,
UpdateTime: v.UpdateTime,
Link: v.Link,
}
switch {
case v.Value != nil:
m.Value = &mainflux.Message_FloatValue{FloatValue: *v.Value}
case v.BoolValue != nil:
m.Value = &mainflux.Message_BoolValue{BoolValue: *v.BoolValue}
case v.DataValue != "":
m.Value = &mainflux.Message_DataValue{DataValue: v.DataValue}
case v.StringValue != "":
m.Value = &mainflux.Message_StringValue{StringValue: v.StringValue}
}
if v.Sum != nil {
m.ValueSum = &mainflux.SumValue{Value: *v.Sum}
}
msgs[k] = m
}
output := strings.ToLower(msg.ContentType)
return NormalizedData{
ContentType: output,
Messages: msgs,
}, nil
}