@@ -22,6 +22,7 @@ import (
2222const (
2323 defaultCommentDelimiter = " "
2424 defaultFileExtension = "json"
25+ defaultPackageName = "package"
2526 defaultRefPrefix = "#/definitions/"
2627 messageDelimiter = "+"
2728 versionDraft04 = "http://json-schema.org/draft-04/schema#"
@@ -359,22 +360,22 @@ func (c *Converter) convert(request *plugin.CodeGeneratorRequest) (*plugin.CodeG
359360 }
360361 }
361362
362- // Check that this file has a proto package:
363+ // Check that this file has a proto package, and give it one if not :
363364 if fileDesc .GetPackage () == "" {
364- c .logger .WithField ("filename" , fileDesc .GetName ()).Warn ( " Proto file doesn't specify a package" )
365- continue
365+ c .logger .WithField ("filename" , fileDesc .GetName ()).WithField ( "default_package_name" , defaultPackageName ). Debug ( " Proto file doesn't specify a package - assuming the default " )
366+ fileDesc . Package = strPtr ( defaultPackageName )
366367 }
367368
368369 // Build a list of any messages specified by this file:
369370 for _ , msgDesc := range fileDesc .GetMessageType () {
370371 c .logger .WithField ("msg_name" , msgDesc .GetName ()).WithField ("package_name" , fileDesc .GetPackage ()).Debug ("Loading a message" )
371- c .registerType (fileDesc .Package , msgDesc )
372+ c .registerType (fileDesc .GetPackage () , msgDesc )
372373 }
373374
374375 // Build a list of any enums specified by this file:
375376 for _ , en := range fileDesc .GetEnumType () {
376377 c .logger .WithField ("enum_name" , en .GetName ()).WithField ("package_name" , fileDesc .GetPackage ()).Debug ("Loading an enum" )
377- c .registerEnum (fileDesc .Package , en )
378+ c .registerEnum (fileDesc .GetPackage () , en )
378379 }
379380
380381 // Generate schemas for this file:
0 commit comments