Update import paths of 2.x for Go Modules, based on: https://github.c…

…om/golang/go/wiki/Modules#releasing-modules-v2-or-higher

enforcer.go

@@ -19,14 +19,14 @@ import (
 	"fmt"
 
 	"github.com/Knetic/govaluate"
-	"github.com/casbin/casbin/effect"
-	"github.com/casbin/casbin/log"
-	"github.com/casbin/casbin/model"
-	"github.com/casbin/casbin/persist"
-	fileadapter "github.com/casbin/casbin/persist/file-adapter"
-	"github.com/casbin/casbin/rbac"
-	defaultrolemanager "github.com/casbin/casbin/rbac/default-role-manager"
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/effect"
+	"github.com/casbin/casbin/v2/log"
+	"github.com/casbin/casbin/v2/model"
+	"github.com/casbin/casbin/v2/persist"
+	fileadapter "github.com/casbin/casbin/v2/persist/file-adapter"
+	"github.com/casbin/casbin/v2/rbac"
+	defaultrolemanager "github.com/casbin/casbin/v2/rbac/default-role-manager"
+	"github.com/casbin/casbin/v2/util"
 )
 
 // Enforcer is the main interface for authorization enforcement and policy management.

enforcer_synced.go

@@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/casbin/casbin/persist"
+	"github.com/casbin/casbin/v2/persist"
 )
 
 // SyncedEnforcer wraps Enforcer and provides synchronized access

enforcer_test.go

@@ -17,7 +17,7 @@ package casbin
 import (
 	"testing"
 
-	"github.com/casbin/casbin/persist/file-adapter"
+	"github.com/casbin/casbin/v2/persist/file-adapter"
 )
 
 func TestKeyMatchModelInMemory(t *testing.T) {

error_test.go

@@ -17,7 +17,7 @@ package casbin
 import (
 	"testing"
 
-	"github.com/casbin/casbin/persist/file-adapter"
+	"github.com/casbin/casbin/v2/persist/file-adapter"
 )
 
 func TestPathError(t *testing.T) {

filter_test.go

@@ -17,7 +17,7 @@ package casbin
 import (
 	"testing"
 
-	"github.com/casbin/casbin/persist/file-adapter"
+	"github.com/casbin/casbin/v2/persist/file-adapter"
 )
 
 func TestInitFilteredAdapter(t *testing.T) {

go.mod

@@ -1,3 +1,3 @@
-module github.com/casbin/casbin
+module github.com/casbin/casbin/v2
 
 require github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible

management_api_test.go

@@ -17,7 +17,7 @@ package casbin
 import (
 	"testing"
 
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/util"
 )
 
 func testStringList(t *testing.T, title string, f func() []string, res []string) {

model/assertion.go

@@ -18,8 +18,8 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/casbin/casbin/log"
-	"github.com/casbin/casbin/rbac"
+	"github.com/casbin/casbin/v2/log"
+	"github.com/casbin/casbin/v2/rbac"
 )
 
 // Assertion represents an expression in a section of the model.

model/function.go

@@ -14,7 +14,7 @@
 
 package model
 
-import "github.com/casbin/casbin/util"
+import "github.com/casbin/casbin/v2/util"
 
 // FunctionMap represents the collection of Function.
 type FunctionMap map[string]func(args ...interface{}) (interface{}, error)

model/model.go

@@ -18,9 +18,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/casbin/casbin/config"
-	"github.com/casbin/casbin/log"
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/config"
+	"github.com/casbin/casbin/v2/log"
+	"github.com/casbin/casbin/v2/util"
 )
 
 // Model represents the whole access control model.

model/policy.go

@@ -15,9 +15,9 @@
 package model
 
 import (
-	"github.com/casbin/casbin/log"
-	"github.com/casbin/casbin/rbac"
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/log"
+	"github.com/casbin/casbin/v2/rbac"
+	"github.com/casbin/casbin/v2/util"
 )
 
 // BuildRoleLinks initializes the roles in RBAC.

model_test.go

@@ -17,10 +17,10 @@ package casbin
 import (
 	"testing"
 
-	"github.com/casbin/casbin/persist/file-adapter"
-	"github.com/casbin/casbin/rbac"
-	"github.com/casbin/casbin/rbac/default-role-manager"
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/persist/file-adapter"
+	"github.com/casbin/casbin/v2/rbac"
+	"github.com/casbin/casbin/v2/rbac/default-role-manager"
+	"github.com/casbin/casbin/v2/util"
 )
 
 func testEnforce(t *testing.T, e *Enforcer, sub string, obj interface{}, act string, res bool) {

persist/adapter.go

@@ -17,7 +17,7 @@ package persist
 import (
 	"strings"
 
-	"github.com/casbin/casbin/model"
+	"github.com/casbin/casbin/v2/model"
 )
 
 // LoadPolicyLine loads a text line as a policy rule to model.

persist/adapter_filtered.go

@@ -15,7 +15,7 @@
 package persist
 
 import (
-	"github.com/casbin/casbin/model"
+	"github.com/casbin/casbin/v2/model"
 )
 
 // FilteredAdapter is the interface for Casbin adapters supporting filtered policies.

persist/file-adapter/adapter.go

@@ -21,9 +21,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/casbin/casbin/model"
-	"github.com/casbin/casbin/persist"
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/model"
+	"github.com/casbin/casbin/v2/persist"
+	"github.com/casbin/casbin/v2/util"
 )
 
 // Adapter is the file adapter for Casbin.

persist/file-adapter/adapter_filtered.go

@@ -20,8 +20,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/casbin/casbin/model"
-	"github.com/casbin/casbin/persist"
+	"github.com/casbin/casbin/v2/model"
+	"github.com/casbin/casbin/v2/persist"
 )
 
 // FilteredAdapter is the filtered file adapter for Casbin. It can load policy

persist/file-adapter/adapter_mock.go

@@ -21,8 +21,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/casbin/casbin/model"
-	"github.com/casbin/casbin/persist"
+	"github.com/casbin/casbin/v2/model"
+	"github.com/casbin/casbin/v2/persist"
 )
 
 // AdapterMock is the file adapter for Casbin.

rbac/default-role-manager/role_manager.go

@@ -17,9 +17,9 @@ package defaultrolemanager
 import (
 	"sync"
 
-	"github.com/casbin/casbin/errors"
-	"github.com/casbin/casbin/log"
-	"github.com/casbin/casbin/rbac"
+	"github.com/casbin/casbin/v2/errors"
+	"github.com/casbin/casbin/v2/log"
+	"github.com/casbin/casbin/v2/rbac"
 )
 
 type MatchingFunc func(arg1, arg2 string) bool

rbac/default-role-manager/role_manager_test.go

@@ -17,8 +17,8 @@ package defaultrolemanager
 import (
 	"testing"
 
-	"github.com/casbin/casbin/rbac"
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/rbac"
+	"github.com/casbin/casbin/v2/util"
 )
 
 func testRole(t *testing.T, rm rbac.RoleManager, name1 string, name2 string, res bool) {

rbac_api.go

@@ -17,7 +17,7 @@ package casbin
 import (
 	"errors"
 
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/util"
 )
 
 // GetRolesForUser gets the roles that a user has.

rbac_api_test.go

@@ -17,8 +17,8 @@ package casbin
 import (
 	"testing"
 
-	"github.com/casbin/casbin/errors"
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/errors"
+	"github.com/casbin/casbin/v2/util"
 )
 
 func testGetRoles(t *testing.T, e *Enforcer, name string, res []string) {

rbac_api_with_domains_test.go

@@ -17,7 +17,7 @@ package casbin
 import (
 	"testing"
 
-	"github.com/casbin/casbin/util"
+	"github.com/casbin/casbin/v2/util"
 )
 
 // testGetUsersInDomain: Add by Gordon

util/builtin_operators.go

@@ -19,7 +19,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/casbin/casbin/rbac"
+	"github.com/casbin/casbin/v2/rbac"
 )
 
 // KeyMatch determines whether key1 matches the pattern of key2 (similar to RESTful path), key2 can contain a *.
@@ -58,7 +58,7 @@ func KeyMatch2(key1 string, key2 string) bool {
 		key2 = re.ReplaceAllString(key2, "$1[^/]+$2")
 	}
 
-	return RegexMatch(key1, "^" + key2 + "$")
+	return RegexMatch(key1, "^"+key2+"$")
 }
 
 // KeyMatch2Func is the wrapper for KeyMatch2.
@@ -83,7 +83,7 @@ func KeyMatch3(key1 string, key2 string) bool {
 		key2 = re.ReplaceAllString(key2, "$1[^/]+$2")
 	}
 
-	return RegexMatch(key1, "^" + key2 + "$")
+	return RegexMatch(key1, "^"+key2+"$")
 }
 
 // KeyMatch3Func is the wrapper for KeyMatch3.