feat(plc4go/bacnetip): update with improved debug output

apache · Sep 4, 2024 · b871bc7 · b871bc7
1 parent 5412078
commit b871bc7
Show file tree

Hide file tree

Showing 114 changed files with 5,950 additions and 419 deletions.
diff --git a/plc4go/internal/bacnetip/bacgopes/app_Application.go b/plc4go/internal/bacnetip/bacgopes/app_Application.go
@@ -32,6 +32,7 @@ type ApplicationRequirements interface {
 	ApplicationServiceElementRequirements
 }
 
+//go:generate plc4xGenerator -type=Application -prefix=app_
 type Application struct {
 	ApplicationServiceElementContract
 	Collector
@@ -41,12 +42,12 @@ type Application struct {
 	localDevice      *LocalDeviceObject
 	deviceInfoCache  *DeviceInfoCache
 	controllers      map[string]any
-	helpers          map[string]func(pdu PDU) error
+	helpers          map[string]func(pdu PDU) error `ignore:"true"`
 
 	_startupDisabled bool
 
 	// pass through args
-	argAseID *int
+	argAseID *int `ignore:"true"`
 
 	log zerolog.Logger
 }
@@ -59,8 +60,8 @@ func NewApplication(localLog zerolog.Logger, localDevice *LocalDeviceObject, opt
 		opt(a)
 	}
 	localLog.Debug().
-		Interface("localDevice", localDevice).
-		Interface("deviceInfoCache", a.deviceInfoCache).
+		Stringer("localDevice", localDevice).
+		Stringer("deviceInfoCache", a.deviceInfoCache).
 		Interface("aseID", a.argAseID).
 		Msg("NewApplication")
 	var err error
@@ -124,10 +125,6 @@ func (a *Application) GetDeviceInfoCache() *DeviceInfoCache {
 	return a.deviceInfoCache
 }
 
-func (a *Application) String() string {
-	return fmt.Sprintf("Application(TBD...)") // TODO: fill some info here
-}
-
 // AddObject adds an object to the local collection
 func (a *Application) AddObject(obj *LocalDeviceObject) error {
 	a.log.Debug().Stringer("obj", obj).Msg("AddObject")

diff --git a/plc4go/internal/bacnetip/bacgopes/app_ApplicationIOController.go b/plc4go/internal/bacnetip/bacgopes/app_ApplicationIOController.go
@@ -26,15 +26,16 @@ import (
 	readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model"
 )
 
+//go:generate plc4xGenerator -type=ApplicationIOController -prefix=app_
 type ApplicationIOController struct {
 	*IOController
 	*Application
 
 	queueByAddress map[string]*SieveQueue
 
 	// pass through args
-	argDeviceInfoCache *DeviceInfoCache
-	argAseID           *int
+	argDeviceInfoCache *DeviceInfoCache `ignore:"true"`
+	argAseID           *int             `ignore:"true"`
 
 	log zerolog.Logger
 }

diff --git a/plc4go/internal/bacnetip/bacgopes/app_ApplicationIOController_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/app_ApplicationIOController_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/app_Application_plc4xgen.go b/plc4go/internal/bacnetip/bacgopes/app_Application_plc4xgen.go
diff --git a/plc4go/internal/bacnetip/bacgopes/app_BIPNetworkApplication.go b/plc4go/internal/bacnetip/bacgopes/app_BIPNetworkApplication.go
@@ -33,9 +33,9 @@ type BIPNetworkApplication struct {
 	mux          *UDPMultiplexer
 
 	// passThroughArgs
-	argBBMDAddress *Address
-	argBBMDTTL     *int
-	argEID         *int
+	argBBMDAddress *Address `ignore:"true"`
+	argBBMDTTL     *int     `ignore:"true"`
+	argEID         *int     `ignore:"true"`
 
 	log zerolog.Logger
 }

diff --git a/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication.go b/plc4go/internal/bacnetip/bacgopes/app_BIPSimpleApplication.go
@@ -30,14 +30,14 @@ type BIPSimpleApplication struct {
 	*WhoIsIAmServices
 	*ReadWritePropertyServices
 
-	localAddress Address
-	asap         *ApplicationServiceAccessPoint
-	smap         *StateMachineAccessPoint
-	nsap         *NetworkServiceAccessPoint
-	nse          *NetworkServiceElement
-	bip          *BIPSimple
-	annexj       *AnnexJCodec
-	mux          *UDPMultiplexer
+	localAddress Address                        `stringer:"true"`
+	asap         *ApplicationServiceAccessPoint `stringer:"true"`
+	smap         *StateMachineAccessPoint       `stringer:"true"`
+	nsap         *NetworkServiceAccessPoint     `stringer:"true"`
+	nse          *NetworkServiceElement         `stringer:"true"`
+	bip          *BIPSimple                     `stringer:"true"`
+	annexj       *AnnexJCodec                   `stringer:"true"`
+	mux          *UDPMultiplexer                `stringer:"true"`
 
 	log zerolog.Logger
 }