Merge pull request #4248 from flycash/rft/renameInfra

rename infrastructure to core

pkg/adapter/admin.go

@@ -17,7 +17,7 @@ package adapter
 import (
 	"time"
 
-	_ "github.com/astaxie/beego/pkg/infrastructure/governor"
+	_ "github.com/astaxie/beego/pkg/core/governor"
 	"github.com/astaxie/beego/pkg/server/web"
 )
 

pkg/adapter/config.go

@@ -18,7 +18,7 @@ import (
 	context2 "context"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	newCfg "github.com/astaxie/beego/pkg/infrastructure/config"
+	newCfg "github.com/astaxie/beego/pkg/core/config"
 	"github.com/astaxie/beego/pkg/server/web"
 )
 

pkg/adapter/config/adapter.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
 )
 
 type newToOldConfigerAdapter struct {

pkg/adapter/config/config.go

@@ -41,7 +41,7 @@
 package config
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
 )
 
 // Configer defines how to get and set value from configuration raw data.

pkg/adapter/config/env/env.go

@@ -17,7 +17,7 @@
 package env
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/config/env"
+	"github.com/astaxie/beego/pkg/core/config/env"
 )
 
 // Get returns a value by key.

pkg/adapter/config/fake.go

@@ -15,7 +15,7 @@
 package config
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
 )
 
 // NewFakeConfig return a fake Configer

pkg/adapter/config/json.go

@@ -15,5 +15,5 @@
 package config
 
 import (
-	_ "github.com/astaxie/beego/pkg/infrastructure/config/json"
+	_ "github.com/astaxie/beego/pkg/core/config/json"
 )

pkg/adapter/config/xml/xml.go

@@ -30,5 +30,5 @@
 package xml
 
 import (
-	_ "github.com/astaxie/beego/pkg/infrastructure/config/xml"
+	_ "github.com/astaxie/beego/pkg/core/config/xml"
 )

pkg/adapter/config/yaml/yaml.go

@@ -30,5 +30,5 @@
 package yaml
 
 import (
-	_ "github.com/astaxie/beego/pkg/infrastructure/config/yaml"
+	_ "github.com/astaxie/beego/pkg/core/config/yaml"
 )

pkg/adapter/log.go

@@ -17,9 +17,9 @@ package adapter
 import (
 	"strings"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 
-	webLog "github.com/astaxie/beego/pkg/infrastructure/logs"
+	webLog "github.com/astaxie/beego/pkg/core/logs"
 )
 
 // Log levels to control the logging output.

pkg/adapter/metric/prometheus.go

@@ -24,7 +24,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/astaxie/beego/pkg"
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 	"github.com/astaxie/beego/pkg/server/web"
 )
 

pkg/adapter/orm/orm.go

@@ -60,7 +60,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/client/orm"
 	"github.com/astaxie/beego/pkg/client/orm/hints"
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // DebugQueries define the debug

pkg/adapter/session/couchbase/sess_couchbase.go

@@ -37,7 +37,7 @@ import (
 	"net/http"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	beecb "github.com/astaxie/beego/pkg/infrastructure/session/couchbase"
+	beecb "github.com/astaxie/beego/pkg/core/session/couchbase"
 )
 
 // SessionStore store each session

pkg/adapter/session/ledis/ledis_session.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	beeLedis "github.com/astaxie/beego/pkg/infrastructure/session/ledis"
+	beeLedis "github.com/astaxie/beego/pkg/core/session/ledis"
 )
 
 // SessionStore ledis session store

pkg/adapter/session/memcache/sess_memcache.go

@@ -38,7 +38,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/adapter/session"
 
-	beemem "github.com/astaxie/beego/pkg/infrastructure/session/memcache"
+	beemem "github.com/astaxie/beego/pkg/core/session/memcache"
 )
 
 // SessionStore memcache session store

pkg/adapter/session/mysql/sess_mysql.go

@@ -45,7 +45,7 @@ import (
 	"net/http"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	"github.com/astaxie/beego/pkg/infrastructure/session/mysql"
+	"github.com/astaxie/beego/pkg/core/session/mysql"
 
 	// import mysql driver
 	_ "github.com/go-sql-driver/mysql"

pkg/adapter/session/postgres/sess_postgresql.go

@@ -58,7 +58,7 @@ import (
 	// import postgresql Driver
 	_ "github.com/lib/pq"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session/postgres"
+	"github.com/astaxie/beego/pkg/core/session/postgres"
 )
 
 // SessionStore postgresql session store

pkg/adapter/session/provider_adapter.go

@@ -17,7 +17,7 @@ package session
 import (
 	"context"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 )
 
 type oldToNewProviderAdapter struct {

pkg/adapter/session/redis/sess_redis.go

@@ -38,7 +38,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/adapter/session"
 
-	beeRedis "github.com/astaxie/beego/pkg/infrastructure/session/redis"
+	beeRedis "github.com/astaxie/beego/pkg/core/session/redis"
 )
 
 // MaxPoolSize redis max pool size

pkg/adapter/session/redis_cluster/redis_cluster.go

@@ -37,7 +37,7 @@ import (
 	"net/http"
 
 	"github.com/astaxie/beego/pkg/adapter/session"
-	cluster "github.com/astaxie/beego/pkg/infrastructure/session/redis_cluster"
+	cluster "github.com/astaxie/beego/pkg/core/session/redis_cluster"
 )
 
 // MaxPoolSize redis_cluster max pool size

pkg/adapter/session/redis_sentinel/sess_redis_sentinel.go

@@ -38,7 +38,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/adapter/session"
 
-	sentinel "github.com/astaxie/beego/pkg/infrastructure/session/redis_sentinel"
+	sentinel "github.com/astaxie/beego/pkg/core/session/redis_sentinel"
 )
 
 // DefaultPoolSize redis_sentinel default pool size

pkg/adapter/session/sess_cookie.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 )
 
 // CookieSessionStore Cookie SessionStore

pkg/adapter/session/sess_file.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 )
 
 // FileSessionStore File session store

pkg/adapter/session/sess_mem.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 )
 
 // MemSessionStore memory session store.

pkg/adapter/session/sess_utils.go

@@ -15,7 +15,7 @@
 package session
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 )
 
 // EncodeGob encode the obj to gob

pkg/adapter/session/session.go

@@ -32,7 +32,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 )
 
 // Store contains all data for one session process with specific id.

pkg/adapter/session/ssdb/sess_ssdb.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/astaxie/beego/pkg/adapter/session"
 
-	beeSsdb "github.com/astaxie/beego/pkg/infrastructure/session/ssdb"
+	beeSsdb "github.com/astaxie/beego/pkg/core/session/ssdb"
 )
 
 // Provider holds ssdb client and configs

pkg/adapter/session/store_adapter.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/infrastructure/session"
+	"github.com/astaxie/beego/pkg/core/session"
 )
 
 type NewToOldStoreAdapter struct {

pkg/adapter/toolbox/healthcheck.go

@@ -31,7 +31,7 @@
 package toolbox
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/governor"
+	"github.com/astaxie/beego/pkg/core/governor"
 )
 
 // AdminCheckList holds health checker map

pkg/adapter/toolbox/profile.go

@@ -19,7 +19,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/governor"
+	"github.com/astaxie/beego/pkg/core/governor"
 )
 
 var startTime = time.Now()

pkg/adapter/utils/caller.go

@@ -15,7 +15,7 @@
 package utils
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // GetFuncName get function name

pkg/adapter/utils/debug.go

@@ -15,7 +15,7 @@
 package utils
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // Display print the data in console

pkg/adapter/utils/file.go

@@ -15,7 +15,7 @@
 package utils
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // SelfPath gets compiled executable file absolute path

pkg/adapter/utils/mail.go

@@ -17,7 +17,7 @@ package utils
 import (
 	"io"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // Email is the type used for email messages

pkg/adapter/utils/pagination/paginator.go

@@ -17,7 +17,7 @@ package pagination
 import (
 	"net/http"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils/pagination"
+	"github.com/astaxie/beego/pkg/core/utils/pagination"
 )
 
 // Paginator within the state of a http request.

pkg/adapter/utils/rand.go

@@ -15,7 +15,7 @@
 package utils
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // RandomCreateBytes generate random []byte by specify chars.

pkg/adapter/utils/safemap.go

@@ -15,7 +15,7 @@
 package utils
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // BeeMap is a map with lock

pkg/adapter/utils/slice.go

@@ -15,7 +15,7 @@
 package utils
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 type reducetype func(interface{}) interface{}

pkg/adapter/utils/utils.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // GetGOPATHs returns all paths in GOPATH variable.

pkg/adapter/validation/util.go

@@ -17,7 +17,7 @@ package validation
 import (
 	"reflect"
 
-	"github.com/astaxie/beego/pkg/infrastructure/validation"
+	"github.com/astaxie/beego/pkg/core/validation"
 )
 
 const (

pkg/adapter/validation/validation.go

@@ -50,7 +50,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/astaxie/beego/pkg/infrastructure/validation"
+	"github.com/astaxie/beego/pkg/core/validation"
 )
 
 // ValidFormer valid interface

pkg/adapter/validation/validators.go

@@ -17,7 +17,7 @@ package validation
 import (
 	"sync"
 
-	"github.com/astaxie/beego/pkg/infrastructure/validation"
+	"github.com/astaxie/beego/pkg/core/validation"
 )
 
 // CanSkipFuncs will skip valid if RequiredFirst is true and the struct field's value is empty

pkg/client/orm/do_nothing_orm.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"database/sql"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // DoNothingOrm won't do anything, usually you use this to custom your mock Ormer implementation

pkg/client/orm/filter/bean/default_value_filter.go

@@ -19,10 +19,10 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 
 	"github.com/astaxie/beego/pkg/client/orm"
-	"github.com/astaxie/beego/pkg/infrastructure/bean"
+	"github.com/astaxie/beego/pkg/core/bean"
 )
 
 // DefaultValueFilterChainBuilder only works for InsertXXX method,

pkg/client/orm/filter_orm_decorator.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 const (

pkg/client/orm/filter_orm_decorator_test.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 
 	"github.com/stretchr/testify/assert"
 )

pkg/client/orm/hints/db_hints.go

@@ -15,7 +15,7 @@
 package hints
 
 import (
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 const (

pkg/client/orm/migration/ddl.go

@@ -17,7 +17,7 @@ package migration
 import (
 	"fmt"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 // Index struct defines the structure of Index Columns

pkg/client/orm/migration/migration.go

@@ -34,7 +34,7 @@ import (
 	"time"
 
 	"github.com/astaxie/beego/pkg/client/orm"
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 // const the data format for the bee generate migration datatype

pkg/client/orm/orm.go

@@ -63,9 +63,9 @@ import (
 	"time"
 
 	"github.com/astaxie/beego/pkg/client/orm/hints"
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 // DebugQueries define the debug

pkg/client/orm/types.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 // TableNaming is usually used by model

pkg/core/bean/tag_auto_wire_bean_factory.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 const DefaultValueTagKey = "default"

pkg/core/config/env/env.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 var env *utils.BeeMap

pkg/core/config/etcd/config.go

@@ -26,8 +26,8 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 const etcdOpts = "etcdOpts"

pkg/core/config/json/json.go

@@ -27,8 +27,8 @@ import (
 
 	"github.com/mitchellh/mapstructure"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 // JSONConfig is a json config parser and implements Config interface.

pkg/core/config/json/json_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
 )
 
 func TestJsonStartsWithArray(t *testing.T) {

pkg/core/config/xml/xml.go

@@ -42,8 +42,8 @@ import (
 
 	"github.com/mitchellh/mapstructure"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 
 	"github.com/beego/x2j"
 )

pkg/core/config/xml/xml_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
 )
 
 func TestXML(t *testing.T) {

pkg/core/config/yaml/yaml.go

@@ -44,8 +44,8 @@ import (
 	"github.com/beego/goyaml2"
 	"gopkg.in/yaml.v2"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 // Config is a yaml config parser and implements Config interface.

pkg/core/config/yaml/yaml_test.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/astaxie/beego/pkg/infrastructure/config"
+	"github.com/astaxie/beego/pkg/core/config"
 )
 
 func TestYaml(t *testing.T) {

pkg/core/governor/profile.go

@@ -26,7 +26,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/astaxie/beego/pkg/infrastructure/utils"
+	"github.com/astaxie/beego/pkg/core/utils"
 )
 
 var startTime = time.Now()

pkg/core/logs/alils/alils.go

@@ -9,7 +9,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/pkg/errors"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 const (

pkg/core/logs/es/es.go

@@ -12,7 +12,7 @@ import (
 	"github.com/elastic/go-elasticsearch/v6"
 	"github.com/elastic/go-elasticsearch/v6/esapi"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 // NewES returns a LoggerInterface

pkg/core/logs/es/index.go

@@ -17,7 +17,7 @@ package es
 import (
 	"fmt"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 // IndexNaming generate the index name

pkg/core/logs/es/index_test.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/astaxie/beego/pkg/infrastructure/logs"
+	"github.com/astaxie/beego/pkg/core/logs"
 )
 
 func TestDefaultIndexNaming_IndexName(t *testing.T) {