go/aicra
go
/
aicra
0
1
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

move config -> internal.config and config.datatype to datatype

This commit is contained in:
Adrien Marquès 2020-03-16 09:20:00 +01:00
parent 4e0d669029
commit 1b4922693b
Signed by: xdrm-brackets
GPG Key ID: D75243CA236D825E
20 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/datatype/builtin/any.go → datatype/builtin/any.go
View File

@ -1,6 +1,6 @@
package builtin package builtin
import "git.xdrm.io/go/aicra/config/datatype" import "git.xdrm.io/go/aicra/datatype"
// AnyDataType is what its name tells // AnyDataType is what its name tells
type AnyDataType struct{} type AnyDataType struct{}

2
config/datatype/builtin/any_test.go → datatype/builtin/any_test.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"git.xdrm.io/go/aicra/config/datatype/builtin" "git.xdrm.io/go/aicra/datatype/builtin"
) )
func TestAny_AvailableTypes(t *testing.T) { func TestAny_AvailableTypes(t *testing.T) {

2
config/datatype/builtin/bool.go → datatype/builtin/bool.go
View File

@ -1,6 +1,6 @@
package builtin package builtin
import "git.xdrm.io/go/aicra/config/datatype" import "git.xdrm.io/go/aicra/datatype"
// BoolDataType is what its name tells // BoolDataType is what its name tells
type BoolDataType struct{} type BoolDataType struct{}

2
config/datatype/builtin/bool_test.go → datatype/builtin/bool_test.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"git.xdrm.io/go/aicra/config/datatype/builtin" "git.xdrm.io/go/aicra/datatype/builtin"
) )
func TestBool_AvailableTypes(t *testing.T) { func TestBool_AvailableTypes(t *testing.T) {

2
config/datatype/builtin/float.go → datatype/builtin/float.go
View File

@ -3,7 +3,7 @@ package builtin
import ( import (
"encoding/json" "encoding/json"
"git.xdrm.io/go/aicra/config/datatype" "git.xdrm.io/go/aicra/datatype"
) )
// FloatDataType is what its name tells // FloatDataType is what its name tells

2
config/datatype/builtin/float_test.go → datatype/builtin/float_test.go
View File

@ -5,7 +5,7 @@ import (
"math" "math"
"testing" "testing"
"git.xdrm.io/go/aicra/config/datatype/builtin" "git.xdrm.io/go/aicra/datatype/builtin"
) )
func TestFloat64_AvailableTypes(t *testing.T) { func TestFloat64_AvailableTypes(t *testing.T) {

2
config/datatype/builtin/int.go → datatype/builtin/int.go
View File

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"math" "math"
"git.xdrm.io/go/aicra/config/datatype" "git.xdrm.io/go/aicra/datatype"
) )
// IntDataType is what its name tells // IntDataType is what its name tells

2
config/datatype/builtin/int_test.go → datatype/builtin/int_test.go
View File

@ -5,7 +5,7 @@ import (
"math" "math"
"testing" "testing"
"git.xdrm.io/go/aicra/config/datatype/builtin" "git.xdrm.io/go/aicra/datatype/builtin"
) )
func TestInt_AvailableTypes(t *testing.T) { func TestInt_AvailableTypes(t *testing.T) {

2
config/datatype/builtin/string.go → datatype/builtin/string.go
View File

@ -4,7 +4,7 @@ import (
"regexp" "regexp"
"strconv" "strconv"
"git.xdrm.io/go/aicra/config/datatype" "git.xdrm.io/go/aicra/datatype"
) )
var fixedLengthRegex = regexp.MustCompile(`^string\((\d+)\)$`) var fixedLengthRegex = regexp.MustCompile(`^string\((\d+)\)$`)

2
config/datatype/builtin/string_test.go → datatype/builtin/string_test.go
View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"git.xdrm.io/go/aicra/config/datatype/builtin" "git.xdrm.io/go/aicra/datatype/builtin"
) )
func TestString_AvailableTypes(t *testing.T) { func TestString_AvailableTypes(t *testing.T) {

2
config/datatype/builtin/uint.go → datatype/builtin/uint.go
View File

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"math" "math"
"git.xdrm.io/go/aicra/config/datatype" "git.xdrm.io/go/aicra/datatype"
) )
// UintDataType is what its name tells // UintDataType is what its name tells

2
config/datatype/builtin/uint_test.go → datatype/builtin/uint_test.go
View File

@ -5,7 +5,7 @@ import (
"math" "math"
"testing" "testing"
"git.xdrm.io/go/aicra/config/datatype/builtin" "git.xdrm.io/go/aicra/datatype/builtin"
) )
func TestUint_AvailableTypes(t *testing.T) { func TestUint_AvailableTypes(t *testing.T) {

6
config/datatype/types.go → datatype/types.go
View File

@ -4,9 +4,9 @@ package datatype
// and casts the value into a compatible type // and casts the value into a compatible type
type Validator func(value interface{}) (cast interface{}, valid bool) type Validator func(value interface{}) (cast interface{}, valid bool)
// DataType builds a DataType from the type definition (from the // T builds a T from the type definition (from the
// configuration field "type") and returns NIL if the type // configuration field "type") and returns NIL if the type
// definition does not match this DataType // definition does not match this T
type DataType interface { type T interface {
Build(typeDefinition string) Validator Build(typeDefinition string) Validator
} }

2
config/config_test.go → internal/config/config_test.go
View File

@ -8,7 +8,7 @@ import (
"strings" "strings"
"testing" "testing"
"git.xdrm.io/go/aicra/config/datatype/builtin" "git.xdrm.io/go/aicra/datatype/builtin"
) )
func TestLegalServiceName(t *testing.T) { func TestLegalServiceName(t *testing.T) {

0
config/errors.go → internal/config/errors.go
View File

0
config/func.go → internal/config/func.go
View File

4
config/parameter.go → internal/config/parameter.go
View File

@ -1,6 +1,6 @@
package config package config
import "git.xdrm.io/go/aicra/config/datatype" import "git.xdrm.io/go/aicra/datatype"
func (param *Parameter) checkAndFormat() error { func (param *Parameter) checkAndFormat() error {
@ -24,7 +24,7 @@ func (param *Parameter) checkAndFormat() error {
} }
// assigns the first matching data type from the type definition // assigns the first matching data type from the type definition
func (param *Parameter) assignDataType(types []datatype.DataType) bool { func (param *Parameter) assignDataType(types []datatype.T) bool {
for _, dtype := range types { for _, dtype := range types {
param.Validator = dtype.Build(param.Type) param.Validator = dtype.Build(param.Type)
if param.Validator != nil { if param.Validator != nil {

6
config/server.go → internal/config/server.go
View File

@ -7,14 +7,14 @@ import (
"net/http" "net/http"
"strings" "strings"
"git.xdrm.io/go/aicra/config/datatype" "git.xdrm.io/go/aicra/datatype"
) )
// Parse builds a server configuration from a json reader and checks for most format errors. // Parse builds a server configuration from a json reader and checks for most format errors.
// you can provide additional DataTypes as variadic arguments // you can provide additional DataTypes as variadic arguments
func Parse(r io.Reader, dtypes ...datatype.DataType) (*Server, error) { func Parse(r io.Reader, dtypes ...datatype.T) (*Server, error) {
server := &Server{ server := &Server{
Types: make([]datatype.DataType, 0), Types: make([]datatype.T, 0),
Services: make([]*Service, 0), Services: make([]*Service, 0),
} }
// add data types // add data types

4
config/service.go → internal/config/service.go
View File

@ -6,7 +6,7 @@ import (
"regexp" "regexp"
"strings" "strings"
"git.xdrm.io/go/aicra/config/datatype" "git.xdrm.io/go/aicra/datatype"
) )
var braceRegex = regexp.MustCompile(`^{([a-z_-]+)}$`) var braceRegex = regexp.MustCompile(`^{([a-z_-]+)}$`)
@ -86,7 +86,7 @@ func (svc *Service) checkPattern() error {
return nil return nil
} }
func (svc *Service) checkAndFormatInput(types []datatype.DataType) error { func (svc *Service) checkAndFormatInput(types []datatype.T) error {
// ignore no parameter // ignore no parameter
if svc.Input == nil || len(svc.Input) < 1 { if svc.Input == nil || len(svc.Input) < 1 {

4
config/types.go → internal/config/types.go
View File

@ -3,14 +3,14 @@ package config
import ( import (
"net/http" "net/http"
"git.xdrm.io/go/aicra/config/datatype" "git.xdrm.io/go/aicra/datatype"
) )
var availableHTTPMethods = []string{http.MethodGet, http.MethodPost, http.MethodPut, http.MethodDelete} var availableHTTPMethods = []string{http.MethodGet, http.MethodPost, http.MethodPut, http.MethodDelete}
// Server represents a full server configuration // Server represents a full server configuration
type Server struct { type Server struct {
Types []datatype.DataType Types []datatype.T
Services []*Service Services []*Service
} }