unify key sort mode type

Signed-off-by: Jeromy <jeromyj@gmail.com>

Author: whyrusleeping

obj/atlas/structMapAutogen.go

@@ -8,26 +8,21 @@ import (
 )
 
 func AutogenerateStructMapEntry(rt reflect.Type) *AtlasEntry {
-	return AutogenerateStructMapEntryUsingTags(rt, "refmt", StructFieldSort_Default)
+	return AutogenerateStructMapEntryUsingTags(rt, "refmt", KeySortMode_Default)
 }
 
-func AutogenerateStructMapEntryUsingTags(rt reflect.Type, tagName, sorter string) *AtlasEntry {
+func AutogenerateStructMapEntryUsingTags(rt reflect.Type, tagName string, sorter KeySortMode) *AtlasEntry {
 	entry := &AtlasEntry{
 		Type:      rt,
 		StructMap: &StructMap{Fields: exploreFields(rt, tagName, sorter)},
 	}
 	return entry
 }
 
-const (
-	StructFieldSort_Default = "default"
-	StructFieldSort_RFC7049 = "rfc7049"
-)
-
 // exploreFields returns a list of fields that StructAtlas should recognize for the given type.
 // The algorithm is breadth-first search over the set of structs to include - the top struct
 // and then any reachable anonymous structs.
-func exploreFields(rt reflect.Type, tagName string, sorter string) []StructMapEntry {
+func exploreFields(rt reflect.Type, tagName string, sorter KeySortMode) []StructMapEntry {
 	// Anonymous fields to explore at the current level and the next.
 	current := []StructMapEntry{}
 	next := []StructMapEntry{{Type: rt}}
@@ -143,9 +138,9 @@ func exploreFields(rt reflect.Type, tagName string, sorter string) []StructMapEn
 
 	fields = out
 	switch sorter {
-	case StructFieldSort_Default:
+	case KeySortMode_Default:
 		sort.Sort(StructMapEntry_byFieldRoute(fields))
-	case StructFieldSort_RFC7049:
+	case KeySortMode_RFC7049:
 		sort.Sort(StructMapEntry_RFC7049(fields))
 	default:
 		panic("invalid struct sorter option")

obj/atlas/structMapBuilding.go

@@ -77,7 +77,7 @@ func (x *BuilderStructMap) Autogenerate() *BuilderStructMap {
 /*
 	Automatically generate mappings using a given struct field sorting scheme
 */
-func (x *BuilderStructMap) AutogenerateWithSortingScheme(sorting string) *BuilderStructMap {
+func (x *BuilderStructMap) AutogenerateWithSortingScheme(sorting KeySortMode) *BuilderStructMap {
 	autoEntry := AutogenerateStructMapEntryUsingTags(x.entry.Type, "refmt", sorting)
 	x.entry.StructMap.Fields = append(x.entry.StructMap.Fields, autoEntry.StructMap.Fields...)
 	return x