feat(plc4go/plx4xgenerator): add prefix support

apache · Sep 4, 2024 · 83f7524 · 83f7524
1 parent 8c7f35c
commit 83f7524
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 22 deletions.
diff --git a/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication.go b/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication.go
@@ -24,7 +24,7 @@ import (
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=BIPSimpleApplication
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=BIPSimpleApplication -prefix=app_
 type BIPSimpleApplication struct {
 	*ApplicationIOController
 	*WhoIsIAmServices

diff --git a/...bacgopes/BIPSimpleApplication_plc4xgen.go → ...opes/app_BIPSimpleApplication_plc4xgen.go b/...bacgopes/BIPSimpleApplication_plc4xgen.go → ...opes/app_BIPSimpleApplication_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo.go b/plc4go/internal/bacnetip/bacgopes/app_DeviceInfo.go
@@ -21,7 +21,7 @@ package bacgopes
 
 import readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=DeviceInfo
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=DeviceInfo -prefix=app_
 type DeviceInfo struct {
 	DeviceIdentifier readWriteModel.BACnetTagPayloadObjectIdentifier
 	Address          Address

diff --git a/.../bacnetip/bacgopes/DeviceInfo_plc4xgen.go → ...netip/bacgopes/app_DeviceInfo_plc4xgen.go b/.../bacnetip/bacgopes/DeviceInfo_plc4xgen.go → ...netip/bacgopes/app_DeviceInfo_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/capability.go b/plc4go/internal/bacnetip/bacgopes/capability.go
@@ -23,7 +23,7 @@ import "github.com/rs/zerolog"
 
 // TODO: implement
 //
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=Capability
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=Capability -prefix=capability_
 type Capability struct {
 }
 

diff --git a/.../bacnetip/bacgopes/Capability_plc4xgen.go → ...acgopes/capability_Capability_plc4xgen.go b/.../bacnetip/bacgopes/Capability_plc4xgen.go → ...acgopes/capability_Capability_plc4xgen.go
diff --git a/...tip/bacgopes/WhoIsIAmServices_plc4xgen.go → ...gopes/device_WhoIsIAmServices_plc4xgen.go b/...tip/bacgopes/WhoIsIAmServices_plc4xgen.go → ...gopes/device_WhoIsIAmServices_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOCB.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOCB.go
@@ -74,7 +74,7 @@ type _IOCB interface {
 var _identNext = 1
 var _identLock sync.Mutex
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOCB
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOCB -prefix=iocb_
 type IOCB struct {
 	ioID           int
 	request        PDU

diff --git a/...ternal/bacnetip/bacgopes/IOCB_plc4xgen.go → ...l/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go b/...ternal/bacnetip/bacgopes/IOCB_plc4xgen.go → ...l/bacnetip/bacgopes/iocb_IOCB_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOController.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOController.go
@@ -52,7 +52,7 @@ type IOControllerRequirements interface {
 	AbortIO(iocb _IOCB, err error) error
 }
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOController
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOController -prefix=iocb_
 type IOController struct {
 	name         string
 	requirements IOControllerRequirements

diff --git a/...acnetip/bacgopes/IOController_plc4xgen.go → ...ip/bacgopes/iocb_IOController_plc4xgen.go b/...acnetip/bacgopes/IOController_plc4xgen.go → ...ip/bacgopes/iocb_IOController_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOQController.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOQController.go
@@ -31,7 +31,7 @@ type IOQControllerRequirements interface {
 	ProcessIO(iocb _IOCB) error
 }
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOQController
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOQController -prefix=iocb_
 type IOQController struct {
 	*IOController
 	state      IOQControllerStates

diff --git a/...cnetip/bacgopes/IOQController_plc4xgen.go → ...p/bacgopes/iocb_IOQController_plc4xgen.go b/...cnetip/bacgopes/IOQController_plc4xgen.go → ...p/bacgopes/iocb_IOQController_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue.go b/plc4go/internal/bacnetip/bacgopes/iocb_IOQueue.go
@@ -30,7 +30,7 @@ import (
 	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOQueue
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=IOQueue -prefix=iocb_
 type IOQueue struct {
 	name     string
 	notEmpty sync.Cond

diff --git a/...nal/bacnetip/bacgopes/IOQueue_plc4xgen.go → ...acnetip/bacgopes/iocb_IOQueue_plc4xgen.go b/...nal/bacnetip/bacgopes/IOQueue_plc4xgen.go → ...acnetip/bacgopes/iocb_IOQueue_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue.go b/plc4go/internal/bacnetip/bacgopes/iocb_SieveQueue.go
@@ -24,7 +24,7 @@ import (
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=SieveQueue
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=SieveQueue -prefix=iocb_
 type SieveQueue struct {
 	*IOQController
 	requestFn func(apdu PDU)

diff --git a/.../bacnetip/bacgopes/SieveQueue_plc4xgen.go → ...etip/bacgopes/iocb_SieveQueue_plc4xgen.go b/.../bacnetip/bacgopes/SieveQueue_plc4xgen.go → ...etip/bacgopes/iocb_SieveQueue_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices.go b/plc4go/internal/bacnetip/bacgopes/object_ReadWritePropertyServices.go
@@ -19,7 +19,7 @@
 
 package bacgopes
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=ReadWritePropertyServices
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=ReadWritePropertyServices -prefix=object_
 type ReadWritePropertyServices struct {
 }
 

diff --git a/...pes/ReadWritePropertyServices_plc4xgen.go → ...ect_ReadWritePropertyServices_plc4xgen.go b/...pes/ReadWritePropertyServices_plc4xgen.go → ...ect_ReadWritePropertyServices_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/service_device_Device.go b/plc4go/internal/bacnetip/bacgopes/service_device_Device.go
@@ -33,7 +33,7 @@ type WhoIsIAmServicesRequirements interface {
 	Request(args Args, kwargs KWArgs) error
 }
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=WhoIsIAmServices
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=WhoIsIAmServices -prefix=device_
 type WhoIsIAmServices struct {
 	_requirements WhoIsIAmServicesRequirements
 	*Capability

diff --git a/plc4go/internal/bacnetip/bacgopes/udp_UDPActor.go b/plc4go/internal/bacnetip/bacgopes/udp_UDPActor.go
@@ -25,7 +25,7 @@ import (
 	"github.com/rs/zerolog"
 )
 
-//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=UDPActor
+//go:generate go run ../../../tools/plc4xgenerator/gen.go -type=UDPActor -prefix=udp_
 type UDPActor struct {
 	director *UDPDirector
 	timeout  uint32

diff --git a/...al/bacnetip/bacgopes/UDPActor_plc4xgen.go → ...acnetip/bacgopes/udp_UDPActor_plc4xgen.go b/...al/bacnetip/bacgopes/UDPActor_plc4xgen.go → ...acnetip/bacgopes/udp_UDPActor_plc4xgen.go
diff --git a/plc4go/tools/plc4xgenerator/gen.go b/plc4go/tools/plc4xgenerator/gen.go
@@ -38,6 +38,7 @@ import (
 var (
 	typeNames = flag.String("type", "", "comma-separated list of type names; must be set")
 	output    = flag.String("output", "", "output file name; default srcdir/<type>_plc4xgen.go")
+	prefix    = flag.String("prefix", "", "prefix for all generated files")
 	buildTags = flag.String("tags", "", "comma-separated list of build tags to apply")
 )
 
@@ -114,6 +115,10 @@ func main() {
 		baseName := fmt.Sprintf("%s_plc4xgen.go", typeList[0])
 		outputName = filepath.Join(dir, baseName)
 	}
+	if *prefix != "" {
+		directory, file := filepath.Split(outputName)
+		outputName = filepath.Join(directory, *prefix+file)
+	}
 	err := os.WriteFile(outputName, src, 0644)
 	if err != nil {
 		log.Fatalf("writing output: %s", err)