From f39a6ec99ac3c272aff6062ef816fc364bd9e90f Mon Sep 17 00:00:00 2001 From: Phodal Huang Date: Sat, 14 Dec 2019 21:02:13 +0800 Subject: [PATCH] refactor: fix package issue --- adapter/api/JavaApiApp.go | 6 +++--- adapter/api/JavaApiListener.go | 4 ++-- adapter/call/JavaCallApp.go | 4 ++-- adapter/call/JavaCallListener.go | 4 ++-- adapter/identifier/JavaIdentifierApp.go | 4 ++-- adapter/identifier/JavaIdentifierListener.go | 4 ++-- adapter/sql/SqlIdentifierApp.go | 4 ++-- adapter/sql/SqlIdentifierListener.go | 2 +- cmd/analysis.go | 6 +++--- cmd/api.go | 4 ++-- cmd/refactor.go | 6 +++--- cmd/sql.go | 2 +- coca.go | 2 +- go.mod | 2 +- refactor/base/JavaRefactorListener.go | 4 ++-- refactor/main.go | 4 ++-- refactor/move_class/move_class_app.go | 8 ++++---- refactor/rename/rename_method.go | 8 ++++---- refactor/unused/remove_unused_import.go | 6 +++--- refactor/unused_classes/UnusedClassesApp.go | 4 ++-- refactor/utils/analysis_util.go | 2 +- utils/config_util.go | 2 +- utils/java_package_util.go | 2 +- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/adapter/api/JavaApiApp.go b/adapter/api/JavaApiApp.go index b887d69..cb283e1 100644 --- a/adapter/api/JavaApiApp.go +++ b/adapter/api/JavaApiApp.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - . "github.com/phodal/coca/adapter/models" - . "github.com/phodal/coca/language/java" - . "github.com/phodal/coca/utils" + . "coca/adapter/models" + . "coca/language/java" + . "coca/utils" ) var parsedDeps []JClassNode diff --git a/adapter/api/JavaApiListener.go b/adapter/api/JavaApiListener.go index 164445e..326d4e1 100644 --- a/adapter/api/JavaApiListener.go +++ b/adapter/api/JavaApiListener.go @@ -3,8 +3,8 @@ package api import ( "fmt" "github.com/antlr/antlr4/runtime/Go/antlr" - "github.com/phodal/coca/adapter/models" - . "github.com/phodal/coca/language/java" + "coca/adapter/models" + . "coca/language/java" "reflect" "strings" ) diff --git a/adapter/call/JavaCallApp.go b/adapter/call/JavaCallApp.go index d5b9492..c6ec29b 100644 --- a/adapter/call/JavaCallApp.go +++ b/adapter/call/JavaCallApp.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - . "github.com/phodal/coca/adapter/models" - . "github.com/phodal/coca/language/java" + . "coca/adapter/models" + . "coca/language/java" ) var nodeInfos []JClassNode diff --git a/adapter/call/JavaCallListener.go b/adapter/call/JavaCallListener.go index bbfdc37..66c30c8 100644 --- a/adapter/call/JavaCallListener.go +++ b/adapter/call/JavaCallListener.go @@ -2,8 +2,8 @@ package call import ( "github.com/antlr/antlr4/runtime/Go/antlr" - . "github.com/phodal/coca/adapter/models" - . "github.com/phodal/coca/language/java" + . "coca/adapter/models" + . "coca/language/java" "reflect" "strings" ) diff --git a/adapter/identifier/JavaIdentifierApp.go b/adapter/identifier/JavaIdentifierApp.go index 67a7c92..b1c9050 100644 --- a/adapter/identifier/JavaIdentifierApp.go +++ b/adapter/identifier/JavaIdentifierApp.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - . "github.com/phodal/coca/adapter/models" - . "github.com/phodal/coca/language/java" + . "coca/adapter/models" + . "coca/language/java" ) var nodeInfos []JsonIdentifier = nil diff --git a/adapter/identifier/JavaIdentifierListener.go b/adapter/identifier/JavaIdentifierListener.go index ca229ae..13003bb 100644 --- a/adapter/identifier/JavaIdentifierListener.go +++ b/adapter/identifier/JavaIdentifierListener.go @@ -1,8 +1,8 @@ package identifier import ( - . "github.com/phodal/coca/adapter/models" - . "github.com/phodal/coca/language/java" + . "coca/adapter/models" + . "coca/language/java" ) var node *JIdentifier; diff --git a/adapter/sql/SqlIdentifierApp.go b/adapter/sql/SqlIdentifierApp.go index 8c10942..2283cf3 100644 --- a/adapter/sql/SqlIdentifierApp.go +++ b/adapter/sql/SqlIdentifierApp.go @@ -3,8 +3,8 @@ package sql import ( "fmt" "github.com/antlr/antlr4/runtime/Go/antlr" - . "github.com/phodal/coca/adapter/sql/parse" - parser "github.com/phodal/coca/language/sql" + . "coca/adapter/sql/parse" + parser "coca/language/sql" "os" "path/filepath" "strings" diff --git a/adapter/sql/SqlIdentifierListener.go b/adapter/sql/SqlIdentifierListener.go index 1561d81..4e540dc 100644 --- a/adapter/sql/SqlIdentifierListener.go +++ b/adapter/sql/SqlIdentifierListener.go @@ -2,7 +2,7 @@ package sql import ( "fmt" - . "github.com/phodal/coca/language/sql" + . "coca/language/sql" ) type SqlIdentifierListener struct { diff --git a/cmd/analysis.go b/cmd/analysis.go index 384efad..4c06216 100644 --- a/cmd/analysis.go +++ b/cmd/analysis.go @@ -4,9 +4,9 @@ import ( "encoding/json" "github.com/spf13/cobra" - . "github.com/phodal/coca/adapter/call" - . "github.com/phodal/coca/adapter/identifier" - . "github.com/phodal/coca/utils" + . "coca/adapter/call" + . "coca/adapter/identifier" + . "coca/utils" ) var analysisCmd *cobra.Command = &cobra.Command{ diff --git a/cmd/api.go b/cmd/api.go index 7ed5125..481a08c 100644 --- a/cmd/api.go +++ b/cmd/api.go @@ -2,8 +2,8 @@ package cmd import ( "encoding/json" - . "github.com/phodal/coca/adapter/api" - . "github.com/phodal/coca/utils" + . "coca/adapter/api" + . "coca/utils" "github.com/spf13/cobra" ) diff --git a/cmd/refactor.go b/cmd/refactor.go index 26f5fa1..f9a26c6 100644 --- a/cmd/refactor.go +++ b/cmd/refactor.go @@ -1,9 +1,9 @@ package cmd import ( - . "github.com/phodal/coca/refactor/move_class" - . "github.com/phodal/coca/refactor/rename" - . "github.com/phodal/coca/refactor/unused" + . "coca/refactor/move_class" + . "coca/refactor/rename" + . "coca/refactor/unused" "github.com/spf13/cobra" ) diff --git a/cmd/sql.go b/cmd/sql.go index 9a77f9f..97864bc 100644 --- a/cmd/sql.go +++ b/cmd/sql.go @@ -1,7 +1,7 @@ package cmd import ( - . "github.com/phodal/coca/adapter/sql" + . "coca/adapter/sql" "github.com/spf13/cobra" ) diff --git a/coca.go b/coca.go index 96def0a..4c0fc49 100644 --- a/coca.go +++ b/coca.go @@ -1,7 +1,7 @@ package main import ( - "github.com/phodal/coca/cmd" + "coca/cmd" ) func main() { diff --git a/go.mod b/go.mod index f157655..d4677ca 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/phodal/coca +module coca go 1.13 diff --git a/refactor/base/JavaRefactorListener.go b/refactor/base/JavaRefactorListener.go index f4dcc93..29b0fc5 100644 --- a/refactor/base/JavaRefactorListener.go +++ b/refactor/base/JavaRefactorListener.go @@ -1,8 +1,8 @@ package base import ( - . "github.com/phodal/coca/language/java" - . "github.com/phodal/coca/refactor/base/models" + . "coca/language/java" + . "coca/refactor/base/models" "strings" "unicode" ) diff --git a/refactor/main.go b/refactor/main.go index f180acd..aa1eaec 100644 --- a/refactor/main.go +++ b/refactor/main.go @@ -3,8 +3,8 @@ package main import ( "encoding/json" "fmt" - . "github.com/phodal/coca/adapter/call" - . "github.com/phodal/coca/adapter/identifier" + . "coca/adapter/call" + . "coca/adapter/identifier" ) func main() { diff --git a/refactor/move_class/move_class_app.go b/refactor/move_class/move_class_app.go index eeaf3d7..21d24f3 100644 --- a/refactor/move_class/move_class_app.go +++ b/refactor/move_class/move_class_app.go @@ -11,10 +11,10 @@ import ( "runtime" "strings" - . "github.com/phodal/coca/refactor/base" - . "github.com/phodal/coca/refactor/base/models" - . "github.com/phodal/coca/refactor/utils" - . "github.com/phodal/coca/utils" + . "coca/refactor/base" + . "coca/refactor/base/models" + . "coca/refactor/utils" + . "coca/utils" ) var currentFile string diff --git a/refactor/rename/rename_method.go b/refactor/rename/rename_method.go index 4a42312..0719d87 100644 --- a/refactor/rename/rename_method.go +++ b/refactor/rename/rename_method.go @@ -2,10 +2,10 @@ package unused import ( "encoding/json" - . "github.com/phodal/coca/adapter/models" - . "github.com/phodal/coca/refactor/base/models" - . "github.com/phodal/coca/utils" - . "github.com/phodal/coca/utils/models" + . "coca/adapter/models" + . "coca/refactor/base/models" + . "coca/utils" + . "coca/utils/models" "io/ioutil" "log" "strings" diff --git a/refactor/unused/remove_unused_import.go b/refactor/unused/remove_unused_import.go index 5112978..38d244d 100644 --- a/refactor/unused/remove_unused_import.go +++ b/refactor/unused/remove_unused_import.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - . "github.com/phodal/coca/refactor/base" - . "github.com/phodal/coca/refactor/base/models" - . "github.com/phodal/coca/refactor/utils" + . "coca/refactor/base" + . "coca/refactor/base/models" + . "coca/refactor/utils" ) var currentFile string diff --git a/refactor/unused_classes/UnusedClassesApp.go b/refactor/unused_classes/UnusedClassesApp.go index 475d7d4..34a54fc 100644 --- a/refactor/unused_classes/UnusedClassesApp.go +++ b/refactor/unused_classes/UnusedClassesApp.go @@ -3,8 +3,8 @@ package main import ( "encoding/json" "fmt" - . "github.com/phodal/coca/adapter/models" - . "github.com/phodal/coca/utils" + . "coca/adapter/models" + . "coca/utils" "sort" "strings" ) diff --git a/refactor/utils/analysis_util.go b/refactor/utils/analysis_util.go index 4eac412..26ddd3d 100644 --- a/refactor/utils/analysis_util.go +++ b/refactor/utils/analysis_util.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - . "github.com/phodal/coca/language/java" + . "coca/language/java" ) func GetJavaFiles(codeDir string) []string { diff --git a/utils/config_util.go b/utils/config_util.go index 4dfddaa..85e7b93 100644 --- a/utils/config_util.go +++ b/utils/config_util.go @@ -1,7 +1,7 @@ package utils import ( - . "github.com/phodal/coca/utils/models" + . "coca/utils/models" "strings" ) var relates []RefactorChangeRelate diff --git a/utils/java_package_util.go b/utils/java_package_util.go index ce9d707..943d79f 100644 --- a/utils/java_package_util.go +++ b/utils/java_package_util.go @@ -1,7 +1,7 @@ package utils import ( - . "github.com/phodal/coca/utils/models" + . "coca/utils/models" "strings" ) -- GitLab