updated dependencies and go
This commit is contained in:
+29
-30
@@ -7,7 +7,6 @@ import (
|
||||
"reflect"
|
||||
|
||||
"git.blackforestbytes.com/BlackForestBytes/goext/dataext"
|
||||
"git.blackforestbytes.com/BlackForestBytes/goext/langext"
|
||||
"go.mongodb.org/mongo-driver/bson"
|
||||
"go.mongodb.org/mongo-driver/bson/bsoncodec"
|
||||
"go.mongodb.org/mongo-driver/bson/bsonrw"
|
||||
@@ -21,42 +20,42 @@ type ErrorType struct {
|
||||
|
||||
//goland:noinspection GoUnusedGlobalVariable
|
||||
var (
|
||||
TypeInternal = NewType("INTERNAL_ERROR", langext.Ptr(500))
|
||||
TypePanic = NewType("PANIC", langext.Ptr(500))
|
||||
TypeNotImplemented = NewType("NOT_IMPLEMENTED", langext.Ptr(500))
|
||||
TypeAssert = NewType("ASSERT", langext.Ptr(500))
|
||||
TypeInternal = NewType("INTERNAL_ERROR", new(500))
|
||||
TypePanic = NewType("PANIC", new(500))
|
||||
TypeNotImplemented = NewType("NOT_IMPLEMENTED", new(500))
|
||||
TypeAssert = NewType("ASSERT", new(500))
|
||||
|
||||
TypeMongoQuery = NewType("MONGO_QUERY", langext.Ptr(500))
|
||||
TypeCursorTokenDecode = NewType("CURSOR_TOKEN_DECODE", langext.Ptr(500))
|
||||
TypeMongoFilter = NewType("MONGO_FILTER", langext.Ptr(500))
|
||||
TypeMongoReflection = NewType("MONGO_REFLECTION", langext.Ptr(500))
|
||||
TypeMongoInvalidOpt = NewType("MONGO_INVALIDOPT", langext.Ptr(500))
|
||||
TypeMongoQuery = NewType("MONGO_QUERY", new(500))
|
||||
TypeCursorTokenDecode = NewType("CURSOR_TOKEN_DECODE", new(500))
|
||||
TypeMongoFilter = NewType("MONGO_FILTER", new(500))
|
||||
TypeMongoReflection = NewType("MONGO_REFLECTION", new(500))
|
||||
TypeMongoInvalidOpt = NewType("MONGO_INVALIDOPT", new(500))
|
||||
|
||||
TypeSQLQuery = NewType("SQL_QUERY", langext.Ptr(500))
|
||||
TypeSQLBuild = NewType("SQL_BUILD", langext.Ptr(500))
|
||||
TypeSQLDecode = NewType("SQL_DECODE", langext.Ptr(500))
|
||||
TypeSQLQuery = NewType("SQL_QUERY", new(500))
|
||||
TypeSQLBuild = NewType("SQL_BUILD", new(500))
|
||||
TypeSQLDecode = NewType("SQL_DECODE", new(500))
|
||||
|
||||
TypeWrap = NewType("Wrap", nil)
|
||||
|
||||
TypeBindFailURI = NewType("BINDFAIL_URI", langext.Ptr(400))
|
||||
TypeBindFailQuery = NewType("BINDFAIL_QUERY", langext.Ptr(400))
|
||||
TypeBindFailJSON = NewType("BINDFAIL_JSON", langext.Ptr(400))
|
||||
TypeBindFailFormData = NewType("BINDFAIL_FORMDATA", langext.Ptr(400))
|
||||
TypeBindFailHeader = NewType("BINDFAIL_HEADER", langext.Ptr(400))
|
||||
TypeBindFailURI = NewType("BINDFAIL_URI", new(400))
|
||||
TypeBindFailQuery = NewType("BINDFAIL_QUERY", new(400))
|
||||
TypeBindFailJSON = NewType("BINDFAIL_JSON", new(400))
|
||||
TypeBindFailFormData = NewType("BINDFAIL_FORMDATA", new(400))
|
||||
TypeBindFailHeader = NewType("BINDFAIL_HEADER", new(400))
|
||||
|
||||
TypeMarshalEntityID = NewType("MARSHAL_ENTITY_ID", langext.Ptr(400))
|
||||
TypeInvalidCSID = NewType("INVALID_CSID", langext.Ptr(400))
|
||||
TypeMarshalEntityID = NewType("MARSHAL_ENTITY_ID", new(400))
|
||||
TypeInvalidCSID = NewType("INVALID_CSID", new(400))
|
||||
|
||||
TypeGoogleStatuscode = NewType("GOOGLE_STATUSCODE", langext.Ptr(400))
|
||||
TypeGoogleResponse = NewType("GOOGLE_RESPONSE", langext.Ptr(400))
|
||||
TypeGoogleStatuscode = NewType("GOOGLE_STATUSCODE", new(400))
|
||||
TypeGoogleResponse = NewType("GOOGLE_RESPONSE", new(400))
|
||||
|
||||
TypeUnauthorized = NewType("UNAUTHORIZED", langext.Ptr(401))
|
||||
TypeAuthFailed = NewType("AUTH_FAILED", langext.Ptr(401))
|
||||
TypeUnauthorized = NewType("UNAUTHORIZED", new(401))
|
||||
TypeAuthFailed = NewType("AUTH_FAILED", new(401))
|
||||
|
||||
TypeInvalidImage = NewType("IMAGEEXT_INVALID_IMAGE", langext.Ptr(400))
|
||||
TypeInvalidMimeType = NewType("IMAGEEXT_INVALID_MIMETYPE", langext.Ptr(400))
|
||||
TypeInvalidImage = NewType("IMAGEEXT_INVALID_IMAGE", new(400))
|
||||
TypeInvalidMimeType = NewType("IMAGEEXT_INVALID_MIMETYPE", new(400))
|
||||
|
||||
TypeWebsocket = NewType("WEBSOCKET", langext.Ptr(500))
|
||||
TypeWebsocket = NewType("WEBSOCKET", new(500))
|
||||
|
||||
// other values come from the downstream application that uses goext
|
||||
)
|
||||
@@ -113,7 +112,7 @@ func (e ErrorType) MarshalBSONValue() (bsontype.Type, []byte, error) {
|
||||
}
|
||||
|
||||
func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader, val reflect.Value) error {
|
||||
if val.Kind() == reflect.Ptr && val.IsNil() {
|
||||
if val.Kind() == reflect.Pointer && val.IsNil() {
|
||||
if !val.CanSet() {
|
||||
return errors.New("ValueUnmarshalerDecodeValue")
|
||||
}
|
||||
@@ -125,7 +124,7 @@ func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader
|
||||
return err
|
||||
}
|
||||
|
||||
if val.Kind() == reflect.Ptr && len(src) == 0 {
|
||||
if val.Kind() == reflect.Pointer && len(src) == 0 {
|
||||
val.Set(reflect.Zero(val.Type()))
|
||||
return nil
|
||||
}
|
||||
@@ -135,7 +134,7 @@ func (e ErrorType) DecodeValue(dc bsoncodec.DecodeContext, vr bsonrw.ValueReader
|
||||
return err
|
||||
}
|
||||
|
||||
if val.Kind() == reflect.Ptr {
|
||||
if val.Kind() == reflect.Pointer {
|
||||
val.Set(reflect.ValueOf(&e))
|
||||
} else {
|
||||
val.Set(reflect.ValueOf(e))
|
||||
|
||||
Reference in New Issue
Block a user