From 6784c2df9577e289025ad5e75722fba61e897977 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Mon, 9 Jul 2018 00:08:53 +0200 Subject: [PATCH] moved local imports into 'internal' parent package --- cmd/aicra/compile.go | 2 +- cmd/aicra/main.go | 4 ++-- {checker => internal/checker}/default/any/main.go | 0 {checker => internal/checker}/default/int/main.go | 0 {checker => internal/checker}/default/string/main.go | 0 {checker => internal/checker}/default/varchar/main.go | 0 {checker => internal/checker}/public.go | 0 {checker => internal/checker}/types.go | 0 {clifmt => internal/clifmt}/colors.go | 0 {clifmt => internal/clifmt}/symbols.go | 0 {config => internal/config}/controller.go | 0 {config => internal/config}/method.go | 0 {config => internal/config}/types.go | 0 {multipart => internal/multipart}/private.go | 0 {multipart => internal/multipart}/public.go | 0 {multipart => internal/multipart}/types.go | 0 {request => internal/request}/dataset.go | 2 +- {request => internal/request}/parameter.go | 0 {request => internal/request}/request.go | 0 {request => internal/request}/types.go | 0 {request => internal/request}/utils.go | 0 server.go | 6 +++--- types.go | 4 ++-- util.go | 4 ++-- 24 files changed, 11 insertions(+), 11 deletions(-) rename {checker => internal/checker}/default/any/main.go (100%) rename {checker => internal/checker}/default/int/main.go (100%) rename {checker => internal/checker}/default/string/main.go (100%) rename {checker => internal/checker}/default/varchar/main.go (100%) rename {checker => internal/checker}/public.go (100%) rename {checker => internal/checker}/types.go (100%) rename {clifmt => internal/clifmt}/colors.go (100%) rename {clifmt => internal/clifmt}/symbols.go (100%) rename {config => internal/config}/controller.go (100%) rename {config => internal/config}/method.go (100%) rename {config => internal/config}/types.go (100%) rename {multipart => internal/multipart}/private.go (100%) rename {multipart => internal/multipart}/public.go (100%) rename {multipart => internal/multipart}/types.go (100%) rename {request => internal/request}/dataset.go (98%) rename {request => internal/request}/parameter.go (100%) rename {request => internal/request}/request.go (100%) rename {request => internal/request}/types.go (100%) rename {request => internal/request}/utils.go (100%) diff --git a/cmd/aicra/compile.go b/cmd/aicra/compile.go index ba82330..0310a68 100644 --- a/cmd/aicra/compile.go +++ b/cmd/aicra/compile.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "git.xdrm.io/go/aicra/clifmt" + "git.xdrm.io/go/aicra/internal/clifmt" "os" "os/exec" "path/filepath" diff --git a/cmd/aicra/main.go b/cmd/aicra/main.go index 3abcba2..730f218 100644 --- a/cmd/aicra/main.go +++ b/cmd/aicra/main.go @@ -3,7 +3,7 @@ package main import ( "flag" "fmt" - "git.xdrm.io/go/aicra/clifmt" + "git.xdrm.io/go/aicra/internal/clifmt" "os" "path/filepath" "time" @@ -76,7 +76,7 @@ func main() { } // default types folder - dtPath := filepath.Join(os.Getenv("GOPATH"), "src/git.xdrm.io/go/aicra/checker/default") + dtPath := filepath.Join(os.Getenv("GOPATH"), "src/git.xdrm.io/go/aicra/internal/checker/default") /* (3) Check path are existing dirs ---------------------------------------------------------*/ diff --git a/checker/default/any/main.go b/internal/checker/default/any/main.go similarity index 100% rename from checker/default/any/main.go rename to internal/checker/default/any/main.go diff --git a/checker/default/int/main.go b/internal/checker/default/int/main.go similarity index 100% rename from checker/default/int/main.go rename to internal/checker/default/int/main.go diff --git a/checker/default/string/main.go b/internal/checker/default/string/main.go similarity index 100% rename from checker/default/string/main.go rename to internal/checker/default/string/main.go diff --git a/checker/default/varchar/main.go b/internal/checker/default/varchar/main.go similarity index 100% rename from checker/default/varchar/main.go rename to internal/checker/default/varchar/main.go diff --git a/checker/public.go b/internal/checker/public.go similarity index 100% rename from checker/public.go rename to internal/checker/public.go diff --git a/checker/types.go b/internal/checker/types.go similarity index 100% rename from checker/types.go rename to internal/checker/types.go diff --git a/clifmt/colors.go b/internal/clifmt/colors.go similarity index 100% rename from clifmt/colors.go rename to internal/clifmt/colors.go diff --git a/clifmt/symbols.go b/internal/clifmt/symbols.go similarity index 100% rename from clifmt/symbols.go rename to internal/clifmt/symbols.go diff --git a/config/controller.go b/internal/config/controller.go similarity index 100% rename from config/controller.go rename to internal/config/controller.go diff --git a/config/method.go b/internal/config/method.go similarity index 100% rename from config/method.go rename to internal/config/method.go diff --git a/config/types.go b/internal/config/types.go similarity index 100% rename from config/types.go rename to internal/config/types.go diff --git a/multipart/private.go b/internal/multipart/private.go similarity index 100% rename from multipart/private.go rename to internal/multipart/private.go diff --git a/multipart/public.go b/internal/multipart/public.go similarity index 100% rename from multipart/public.go rename to internal/multipart/public.go diff --git a/multipart/types.go b/internal/multipart/types.go similarity index 100% rename from multipart/types.go rename to internal/multipart/types.go diff --git a/request/dataset.go b/internal/request/dataset.go similarity index 98% rename from request/dataset.go rename to internal/request/dataset.go index f67e28e..5a6a4af 100644 --- a/request/dataset.go +++ b/internal/request/dataset.go @@ -3,7 +3,7 @@ package request import ( "encoding/json" "fmt" - "git.xdrm.io/go/aicra/multipart" + "git.xdrm.io/go/aicra/internal/multipart" "log" "net/http" "strings" diff --git a/request/parameter.go b/internal/request/parameter.go similarity index 100% rename from request/parameter.go rename to internal/request/parameter.go diff --git a/request/request.go b/internal/request/request.go similarity index 100% rename from request/request.go rename to internal/request/request.go diff --git a/request/types.go b/internal/request/types.go similarity index 100% rename from request/types.go rename to internal/request/types.go diff --git a/request/utils.go b/internal/request/utils.go similarity index 100% rename from request/utils.go rename to internal/request/utils.go diff --git a/server.go b/server.go index 9c0d5cc..2d98e2f 100644 --- a/server.go +++ b/server.go @@ -2,12 +2,12 @@ package aicra import ( "fmt" - "git.xdrm.io/go/aicra/checker" - "git.xdrm.io/go/aicra/config" e "git.xdrm.io/go/aicra/err" "git.xdrm.io/go/aicra/implement" + "git.xdrm.io/go/aicra/internal/checker" + "git.xdrm.io/go/aicra/internal/config" + "git.xdrm.io/go/aicra/internal/request" "git.xdrm.io/go/aicra/middleware" - "git.xdrm.io/go/aicra/request" "log" "net/http" ) diff --git a/types.go b/types.go index 429736e..5d05943 100644 --- a/types.go +++ b/types.go @@ -1,8 +1,8 @@ package aicra import ( - "git.xdrm.io/go/aicra/checker" - "git.xdrm.io/go/aicra/config" + "git.xdrm.io/go/aicra/internal/checker" + "git.xdrm.io/go/aicra/internal/config" "git.xdrm.io/go/aicra/middleware" ) diff --git a/util.go b/util.go index 39b7809..d6c1271 100644 --- a/util.go +++ b/util.go @@ -2,10 +2,10 @@ package aicra import ( "encoding/json" - "git.xdrm.io/go/aicra/config" "git.xdrm.io/go/aicra/err" "git.xdrm.io/go/aicra/implement" - "git.xdrm.io/go/aicra/request" + "git.xdrm.io/go/aicra/internal/config" + "git.xdrm.io/go/aicra/internal/request" "log" "net/http" )