fix: package resolution

ngyewch · Dec 26, 2023 · 8b7f4ed · 8b7f4ed
1 parent 685ec22
commit 8b7f4ed
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/generator/wrapperFileDescriptor.go b/generator/wrapperFileDescriptor.go
@@ -17,12 +17,15 @@ type FileDescriptorWrapper struct {
 }
 
 func WrapFileDescriptor(fd protoreflect.FileDescriptor, includeServices bool) FileDescriptorWrapper {
-	javaPackage := ""
+	javaPackage := string(fd.Package())
 	javaOuterClassName := filenameToJavaClassName(fd.Path())
 	javaMultipleFiles := false
 	options, ok := fd.Options().(*descriptorpb.FileOptions)
 	if ok {
-		javaPackage = options.GetJavaPackage()
+		javaPackage1 := options.GetJavaPackage()
+		if javaPackage1 != "" {
+			javaPackage = javaPackage1
+		}
 		javaOuterClassName1 := options.GetJavaOuterClassname()
 		if javaOuterClassName1 != "" {
 			javaOuterClassName = JavaClassName(javaOuterClassName1)