Skip to content

Commit e010c6f

Browse files
authored
Merge pull request #1 from yann9/java-options/package-prefix
java package ‘-‘ replace with ‘.’
2 parents 62e81f6 + 9b943fb commit e010c6f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

internal/lint/check_java_package_prefix.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/uber/prototool/internal/text"
1111
)
1212

13-
var defaultJavaPackagePrefix = "com.bilibili.bapis"
13+
var defaultJavaPackagePrefix = "com.bapis"
1414

1515
var fileOptionsJavaPackagePrefixLinter = NewLinter(
1616
"FILE_OPTIONS_JAVA_PACKAGE_PREFIX",
@@ -52,7 +52,7 @@ func (v *fileOptionsJavaPackagePrefixVisitor) Finally() error {
5252
}
5353
ignoredDirs := os.Getenv("PROTO_JAVA_PACKAGE_PREFIX_IGNORED")
5454
if ignoredDirs == "" {
55-
ignoredDirs = "bilibili,extension,third_party"
55+
ignoredDirs = "extension,third_party"
5656
}
5757
for _, ignored := range strings.Split(ignoredDirs, ",") {
5858
if ignored == strings.Split(v.fileName, "/")[0] {
@@ -61,7 +61,7 @@ func (v *fileOptionsJavaPackagePrefixVisitor) Finally() error {
6161
}
6262
expect_package := prefix + "." + strings.Replace(filepath.Dir(v.fileName), "/", ".", -1)
6363
expect_package = strings.Replace(expect_package, "interface", "interfaces", -1)
64-
expect_package = strings.Replace(expect_package, "-", "_", -1)
64+
expect_package = strings.Replace(expect_package, "-", ".", -1)
6565
if expect_package != value {
6666
v.AddFailuref(v.option.Position, `Expect option "java_package" as: "%s" actual: "%s"`, expect_package, value)
6767
}

0 commit comments

Comments
 (0)