cfc65a13f6
This commit includes updates that affects the build, testing, and
deployment of Tile38.
- The root level build.sh has been broken up into multiple scripts
and placed in the "scripts" directory.
- The vendor directory has been updated to follow the Go modules
rules, thus `make` should work on isolated environments. Also
some vendored packages may have been updated to a later
version, if needed.
- The Makefile has been updated to allow for making single
binaries such as `make tile38-server`. There is some scaffolding
during the build process, so from now on all binaries should be
made using make. For example, to run a development version of
the tile38-cli binary, do this:
make tile38-cli && ./tile38-cli
not this:
go run cmd/tile38-cli/main.go
- Travis.CI docker push script has been updated to address a
change to Docker's JSON repo meta output, which in turn fixes
a bug where new Tile38 versions were not being properly pushed
to Docker
57 lines
1.6 KiB
Go
57 lines
1.6 KiB
Go
// Copyright 2012-2018 The NATS Authors
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package builtin
|
|
|
|
import (
|
|
"encoding/json"
|
|
"strings"
|
|
)
|
|
|
|
// JsonEncoder is a JSON Encoder implementation for EncodedConn.
|
|
// This encoder will use the builtin encoding/json to Marshal
|
|
// and Unmarshal most types, including structs.
|
|
type JsonEncoder struct {
|
|
// Empty
|
|
}
|
|
|
|
// Encode
|
|
func (je *JsonEncoder) Encode(subject string, v interface{}) ([]byte, error) {
|
|
b, err := json.Marshal(v)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return b, nil
|
|
}
|
|
|
|
// Decode
|
|
func (je *JsonEncoder) Decode(subject string, data []byte, vPtr interface{}) (err error) {
|
|
switch arg := vPtr.(type) {
|
|
case *string:
|
|
// If they want a string and it is a JSON string, strip quotes
|
|
// This allows someone to send a struct but receive as a plain string
|
|
// This cast should be efficient for Go 1.3 and beyond.
|
|
str := string(data)
|
|
if strings.HasPrefix(str, `"`) && strings.HasSuffix(str, `"`) {
|
|
*arg = str[1 : len(str)-1]
|
|
} else {
|
|
*arg = str
|
|
}
|
|
case *[]byte:
|
|
*arg = data
|
|
default:
|
|
err = json.Unmarshal(data, arg)
|
|
}
|
|
return
|
|
}
|