@@ -10,7 +10,7 @@ import (
10
10
"github.com/uber/prototool/internal/text"
11
11
)
12
12
13
- var defaultJavaPackagePrefix = "com.bilibili. bapis"
13
+ var defaultJavaPackagePrefix = "com.bapis"
14
14
15
15
var fileOptionsJavaPackagePrefixLinter = NewLinter (
16
16
"FILE_OPTIONS_JAVA_PACKAGE_PREFIX" ,
@@ -52,7 +52,7 @@ func (v *fileOptionsJavaPackagePrefixVisitor) Finally() error {
52
52
}
53
53
ignoredDirs := os .Getenv ("PROTO_JAVA_PACKAGE_PREFIX_IGNORED" )
54
54
if ignoredDirs == "" {
55
- ignoredDirs = "bilibili, extension,third_party"
55
+ ignoredDirs = "extension,third_party"
56
56
}
57
57
for _ , ignored := range strings .Split (ignoredDirs , "," ) {
58
58
if ignored == strings .Split (v .fileName , "/" )[0 ] {
@@ -61,7 +61,7 @@ func (v *fileOptionsJavaPackagePrefixVisitor) Finally() error {
61
61
}
62
62
expect_package := prefix + "." + strings .Replace (filepath .Dir (v .fileName ), "/" , "." , - 1 )
63
63
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 )
65
65
if expect_package != value {
66
66
v .AddFailuref (v .option .Position , `Expect option "java_package" as: "%s" actual: "%s"` , expect_package , value )
67
67
}
0 commit comments