This is an automated email from the ASF dual-hosted git repository. sruehl pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit ad51475bc2ca801fd5af861b6d6e925ccff88fa4 Author: Sebastian Rühl <[email protected]> AuthorDate: Wed Aug 21 18:09:58 2024 +0200 fix(bacnet): typo in RejectMessage --- plc4go/internal/bacnetip/NetworkService.go | 6 +- plc4go/internal/bacnetip/mock_APCI_test.go | 33 ++++ plc4go/internal/bacnetip/mock_IPCI_test.go | 33 ++++ plc4go/internal/bacnetip/mock_NPCI_test.go | 33 ++++ plc4go/internal/bacnetip/mock_NPDU_test.go | 33 ++++ plc4go/internal/bacnetip/mock_PCI_test.go | 33 ++++ plc4go/internal/bacnetip/mock_PDU_test.go | 33 ++++ plc4go/protocols/bacnetip/readwrite/model/NLM.go | 4 +- ...erToNetwork.go => NLMRejectMessageToNetwork.go} | 88 +++++----- .../model/NLMRejectMessageToNetworkRejectReason.go | 191 +++++++++++++++++++++ .../model/NLMRejectRouterToNetworkRejectReason.go | 191 --------------------- .../apache/plc4x/java/bacnetip/readwrite/NLM.java | 2 +- ...Network.java => NLMRejectMessageToNetwork.java} | 54 +++--- ... => NLMRejectMessageToNetworkRejectReason.java} | 12 +- .../protocols/bacnetip/bacnet-private-enums.mspec | 2 +- .../resources/protocols/bacnetip/bacnetip.mspec | 4 +- 16 files changed, 475 insertions(+), 277 deletions(-) diff --git a/plc4go/internal/bacnetip/NetworkService.go b/plc4go/internal/bacnetip/NetworkService.go index 441b48e668..417c933ac4 100644 --- a/plc4go/internal/bacnetip/NetworkService.go +++ b/plc4go/internal/bacnetip/NetworkService.go @@ -1037,7 +1037,7 @@ func (n *NetworkServiceElement) Indication(args Args, kwargs KWArgs) error { n.IAmRouterToNetwork(adapter, nlm) case readWriteModel.NLMICouldBeRouterToNetwork: n.ICouldBeRouterToNetwork(adapter, nlm) - case readWriteModel.NLMRejectRouterToNetwork: + case readWriteModel.NLMRejectMessageToNetwork: n.RejectRouterToNetwork(adapter, nlm) case readWriteModel.NLMRouterBusyToNetwork: n.RouterBusyToNetwork(adapter, nlm) @@ -1079,7 +1079,7 @@ func (n *NetworkServiceElement) Confirmation(args Args, kwargs KWArgs) error { n.IAmRouterToNetwork(adapter, nlm) case readWriteModel.NLMICouldBeRouterToNetwork: n.ICouldBeRouterToNetwork(adapter, nlm) - case readWriteModel.NLMRejectRouterToNetwork: + case readWriteModel.NLMRejectMessageToNetwork: n.RejectRouterToNetwork(adapter, nlm) case readWriteModel.NLMRouterBusyToNetwork: n.RouterBusyToNetwork(adapter, nlm) @@ -1232,7 +1232,7 @@ func (n *NetworkServiceElement) ICouldBeRouterToNetwork(adapter *NetworkAdapter, // TODO: implement me } -func (n *NetworkServiceElement) RejectRouterToNetwork(adapter *NetworkAdapter, nlm readWriteModel.NLMRejectRouterToNetwork) { +func (n *NetworkServiceElement) RejectRouterToNetwork(adapter *NetworkAdapter, nlm readWriteModel.NLMRejectMessageToNetwork) { // TODO: implement me } diff --git a/plc4go/internal/bacnetip/mock_APCI_test.go b/plc4go/internal/bacnetip/mock_APCI_test.go index 5c58ce6215..b99b26ac1e 100644 --- a/plc4go/internal/bacnetip/mock_APCI_test.go +++ b/plc4go/internal/bacnetip/mock_APCI_test.go @@ -337,6 +337,39 @@ func (_c *MockAPCI_SetPDUSource_Call) RunAndReturn(run func(*Address)) *MockAPCI return _c } +// SetPDUUserData provides a mock function with given fields: _a0 +func (_m *MockAPCI) SetPDUUserData(_a0 spi.Message) { + _m.Called(_a0) +} + +// MockAPCI_SetPDUUserData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetPDUUserData' +type MockAPCI_SetPDUUserData_Call struct { + *mock.Call +} + +// SetPDUUserData is a helper method to define mock.On call +// - _a0 spi.Message +func (_e *MockAPCI_Expecter) SetPDUUserData(_a0 interface{}) *MockAPCI_SetPDUUserData_Call { + return &MockAPCI_SetPDUUserData_Call{Call: _e.mock.On("SetPDUUserData", _a0)} +} + +func (_c *MockAPCI_SetPDUUserData_Call) Run(run func(_a0 spi.Message)) *MockAPCI_SetPDUUserData_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(spi.Message)) + }) + return _c +} + +func (_c *MockAPCI_SetPDUUserData_Call) Return() *MockAPCI_SetPDUUserData_Call { + _c.Call.Return() + return _c +} + +func (_c *MockAPCI_SetPDUUserData_Call) RunAndReturn(run func(spi.Message)) *MockAPCI_SetPDUUserData_Call { + _c.Call.Return(run) + return _c +} + // String provides a mock function with given fields: func (_m *MockAPCI) String() string { ret := _m.Called() diff --git a/plc4go/internal/bacnetip/mock_IPCI_test.go b/plc4go/internal/bacnetip/mock_IPCI_test.go index 2689864a4c..4ccd93fd53 100644 --- a/plc4go/internal/bacnetip/mock_IPCI_test.go +++ b/plc4go/internal/bacnetip/mock_IPCI_test.go @@ -246,6 +246,39 @@ func (_c *MockIPCI_SetPDUSource_Call) RunAndReturn(run func(*Address)) *MockIPCI return _c } +// SetPDUUserData provides a mock function with given fields: _a0 +func (_m *MockIPCI) SetPDUUserData(_a0 spi.Message) { + _m.Called(_a0) +} + +// MockIPCI_SetPDUUserData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetPDUUserData' +type MockIPCI_SetPDUUserData_Call struct { + *mock.Call +} + +// SetPDUUserData is a helper method to define mock.On call +// - _a0 spi.Message +func (_e *MockIPCI_Expecter) SetPDUUserData(_a0 interface{}) *MockIPCI_SetPDUUserData_Call { + return &MockIPCI_SetPDUUserData_Call{Call: _e.mock.On("SetPDUUserData", _a0)} +} + +func (_c *MockIPCI_SetPDUUserData_Call) Run(run func(_a0 spi.Message)) *MockIPCI_SetPDUUserData_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(spi.Message)) + }) + return _c +} + +func (_c *MockIPCI_SetPDUUserData_Call) Return() *MockIPCI_SetPDUUserData_Call { + _c.Call.Return() + return _c +} + +func (_c *MockIPCI_SetPDUUserData_Call) RunAndReturn(run func(spi.Message)) *MockIPCI_SetPDUUserData_Call { + _c.Call.Return(run) + return _c +} + // String provides a mock function with given fields: func (_m *MockIPCI) String() string { ret := _m.Called() diff --git a/plc4go/internal/bacnetip/mock_NPCI_test.go b/plc4go/internal/bacnetip/mock_NPCI_test.go index c80a69d88c..8ba97282e2 100644 --- a/plc4go/internal/bacnetip/mock_NPCI_test.go +++ b/plc4go/internal/bacnetip/mock_NPCI_test.go @@ -476,6 +476,39 @@ func (_c *MockNPCI_SetPDUSource_Call) RunAndReturn(run func(*Address)) *MockNPCI return _c } +// SetPDUUserData provides a mock function with given fields: _a0 +func (_m *MockNPCI) SetPDUUserData(_a0 spi.Message) { + _m.Called(_a0) +} + +// MockNPCI_SetPDUUserData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetPDUUserData' +type MockNPCI_SetPDUUserData_Call struct { + *mock.Call +} + +// SetPDUUserData is a helper method to define mock.On call +// - _a0 spi.Message +func (_e *MockNPCI_Expecter) SetPDUUserData(_a0 interface{}) *MockNPCI_SetPDUUserData_Call { + return &MockNPCI_SetPDUUserData_Call{Call: _e.mock.On("SetPDUUserData", _a0)} +} + +func (_c *MockNPCI_SetPDUUserData_Call) Run(run func(_a0 spi.Message)) *MockNPCI_SetPDUUserData_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(spi.Message)) + }) + return _c +} + +func (_c *MockNPCI_SetPDUUserData_Call) Return() *MockNPCI_SetPDUUserData_Call { + _c.Call.Return() + return _c +} + +func (_c *MockNPCI_SetPDUUserData_Call) RunAndReturn(run func(spi.Message)) *MockNPCI_SetPDUUserData_Call { + _c.Call.Return(run) + return _c +} + // String provides a mock function with given fields: func (_m *MockNPCI) String() string { ret := _m.Called() diff --git a/plc4go/internal/bacnetip/mock_NPDU_test.go b/plc4go/internal/bacnetip/mock_NPDU_test.go index 99ba7c2148..b570fa487f 100644 --- a/plc4go/internal/bacnetip/mock_NPDU_test.go +++ b/plc4go/internal/bacnetip/mock_NPDU_test.go @@ -891,6 +891,39 @@ func (_c *MockNPDU_SetPDUSource_Call) RunAndReturn(run func(*Address)) *MockNPDU return _c } +// SetPDUUserData provides a mock function with given fields: _a0 +func (_m *MockNPDU) SetPDUUserData(_a0 spi.Message) { + _m.Called(_a0) +} + +// MockNPDU_SetPDUUserData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetPDUUserData' +type MockNPDU_SetPDUUserData_Call struct { + *mock.Call +} + +// SetPDUUserData is a helper method to define mock.On call +// - _a0 spi.Message +func (_e *MockNPDU_Expecter) SetPDUUserData(_a0 interface{}) *MockNPDU_SetPDUUserData_Call { + return &MockNPDU_SetPDUUserData_Call{Call: _e.mock.On("SetPDUUserData", _a0)} +} + +func (_c *MockNPDU_SetPDUUserData_Call) Run(run func(_a0 spi.Message)) *MockNPDU_SetPDUUserData_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(spi.Message)) + }) + return _c +} + +func (_c *MockNPDU_SetPDUUserData_Call) Return() *MockNPDU_SetPDUUserData_Call { + _c.Call.Return() + return _c +} + +func (_c *MockNPDU_SetPDUUserData_Call) RunAndReturn(run func(spi.Message)) *MockNPDU_SetPDUUserData_Call { + _c.Call.Return(run) + return _c +} + // SetPduData provides a mock function with given fields: _a0 func (_m *MockNPDU) SetPduData(_a0 []byte) { _m.Called(_a0) diff --git a/plc4go/internal/bacnetip/mock_PCI_test.go b/plc4go/internal/bacnetip/mock_PCI_test.go index e4ed32e696..299bff5522 100644 --- a/plc4go/internal/bacnetip/mock_PCI_test.go +++ b/plc4go/internal/bacnetip/mock_PCI_test.go @@ -337,6 +337,39 @@ func (_c *MockPCI_SetPDUSource_Call) RunAndReturn(run func(*Address)) *MockPCI_S return _c } +// SetPDUUserData provides a mock function with given fields: _a0 +func (_m *MockPCI) SetPDUUserData(_a0 spi.Message) { + _m.Called(_a0) +} + +// MockPCI_SetPDUUserData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetPDUUserData' +type MockPCI_SetPDUUserData_Call struct { + *mock.Call +} + +// SetPDUUserData is a helper method to define mock.On call +// - _a0 spi.Message +func (_e *MockPCI_Expecter) SetPDUUserData(_a0 interface{}) *MockPCI_SetPDUUserData_Call { + return &MockPCI_SetPDUUserData_Call{Call: _e.mock.On("SetPDUUserData", _a0)} +} + +func (_c *MockPCI_SetPDUUserData_Call) Run(run func(_a0 spi.Message)) *MockPCI_SetPDUUserData_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(spi.Message)) + }) + return _c +} + +func (_c *MockPCI_SetPDUUserData_Call) Return() *MockPCI_SetPDUUserData_Call { + _c.Call.Return() + return _c +} + +func (_c *MockPCI_SetPDUUserData_Call) RunAndReturn(run func(spi.Message)) *MockPCI_SetPDUUserData_Call { + _c.Call.Return(run) + return _c +} + // String provides a mock function with given fields: func (_m *MockPCI) String() string { ret := _m.Called() diff --git a/plc4go/internal/bacnetip/mock_PDU_test.go b/plc4go/internal/bacnetip/mock_PDU_test.go index 0ee17f4701..49fbc13f55 100644 --- a/plc4go/internal/bacnetip/mock_PDU_test.go +++ b/plc4go/internal/bacnetip/mock_PDU_test.go @@ -846,6 +846,39 @@ func (_c *MockPDU_SetPDUSource_Call) RunAndReturn(run func(*Address)) *MockPDU_S return _c } +// SetPDUUserData provides a mock function with given fields: _a0 +func (_m *MockPDU) SetPDUUserData(_a0 spi.Message) { + _m.Called(_a0) +} + +// MockPDU_SetPDUUserData_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetPDUUserData' +type MockPDU_SetPDUUserData_Call struct { + *mock.Call +} + +// SetPDUUserData is a helper method to define mock.On call +// - _a0 spi.Message +func (_e *MockPDU_Expecter) SetPDUUserData(_a0 interface{}) *MockPDU_SetPDUUserData_Call { + return &MockPDU_SetPDUUserData_Call{Call: _e.mock.On("SetPDUUserData", _a0)} +} + +func (_c *MockPDU_SetPDUUserData_Call) Run(run func(_a0 spi.Message)) *MockPDU_SetPDUUserData_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(spi.Message)) + }) + return _c +} + +func (_c *MockPDU_SetPDUUserData_Call) Return() *MockPDU_SetPDUUserData_Call { + _c.Call.Return() + return _c +} + +func (_c *MockPDU_SetPDUUserData_Call) RunAndReturn(run func(spi.Message)) *MockPDU_SetPDUUserData_Call { + _c.Call.Return(run) + return _c +} + // SetPduData provides a mock function with given fields: _a0 func (_m *MockPDU) SetPduData(_a0 []byte) { _m.Called(_a0) diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLM.go b/plc4go/protocols/bacnetip/readwrite/model/NLM.go index e5066eac39..2f7517ba59 100644 --- a/plc4go/protocols/bacnetip/readwrite/model/NLM.go +++ b/plc4go/protocols/bacnetip/readwrite/model/NLM.go @@ -168,8 +168,8 @@ func NLMParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, apduLe _childTemp, typeSwitchError = NLMIAmRouterToNetworkParseWithBuffer(ctx, readBuffer, apduLength) case messageType == 0x02: // NLMICouldBeRouterToNetwork _childTemp, typeSwitchError = NLMICouldBeRouterToNetworkParseWithBuffer(ctx, readBuffer, apduLength) - case messageType == 0x03: // NLMRejectRouterToNetwork - _childTemp, typeSwitchError = NLMRejectRouterToNetworkParseWithBuffer(ctx, readBuffer, apduLength) + case messageType == 0x03: // NLMRejectMessageToNetwork + _childTemp, typeSwitchError = NLMRejectMessageToNetworkParseWithBuffer(ctx, readBuffer, apduLength) case messageType == 0x04: // NLMRouterBusyToNetwork _childTemp, typeSwitchError = NLMRouterBusyToNetworkParseWithBuffer(ctx, readBuffer, apduLength) case messageType == 0x05: // NLMRouterAvailableToNetwork diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go similarity index 63% rename from plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go rename to plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go index 79c18192e2..c256ad3fea 100644 --- a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetwork.go +++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetwork.go @@ -29,29 +29,29 @@ import ( // Code generated by code-generation. DO NOT EDIT. -// NLMRejectRouterToNetwork is the corresponding interface of NLMRejectRouterToNetwork -type NLMRejectRouterToNetwork interface { +// NLMRejectMessageToNetwork is the corresponding interface of NLMRejectMessageToNetwork +type NLMRejectMessageToNetwork interface { fmt.Stringer utils.LengthAware utils.Serializable NLM // GetRejectReason returns RejectReason (property field) - GetRejectReason() NLMRejectRouterToNetworkRejectReason + GetRejectReason() NLMRejectMessageToNetworkRejectReason // GetDestinationNetworkAddress returns DestinationNetworkAddress (property field) GetDestinationNetworkAddress() uint16 } -// NLMRejectRouterToNetworkExactly can be used when we want exactly this type and not a type which fulfills NLMRejectRouterToNetwork. +// NLMRejectMessageToNetworkExactly can be used when we want exactly this type and not a type which fulfills NLMRejectMessageToNetwork. // This is useful for switch cases. -type NLMRejectRouterToNetworkExactly interface { - NLMRejectRouterToNetwork - isNLMRejectRouterToNetwork() bool +type NLMRejectMessageToNetworkExactly interface { + NLMRejectMessageToNetwork + isNLMRejectMessageToNetwork() bool } -// _NLMRejectRouterToNetwork is the data-structure of this message -type _NLMRejectRouterToNetwork struct { +// _NLMRejectMessageToNetwork is the data-structure of this message +type _NLMRejectMessageToNetwork struct { *_NLM - RejectReason NLMRejectRouterToNetworkRejectReason + RejectReason NLMRejectMessageToNetworkRejectReason DestinationNetworkAddress uint16 } @@ -60,7 +60,7 @@ type _NLMRejectRouterToNetwork struct { /////////////////////// Accessors for discriminator values. /////////////////////// -func (m *_NLMRejectRouterToNetwork) GetMessageType() uint8 { +func (m *_NLMRejectMessageToNetwork) GetMessageType() uint8 { return 0x03 } @@ -69,9 +69,9 @@ func (m *_NLMRejectRouterToNetwork) GetMessageType() uint8 { /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////// -func (m *_NLMRejectRouterToNetwork) InitializeParent(parent NLM) {} +func (m *_NLMRejectMessageToNetwork) InitializeParent(parent NLM) {} -func (m *_NLMRejectRouterToNetwork) GetParent() NLM { +func (m *_NLMRejectMessageToNetwork) GetParent() NLM { return m._NLM } @@ -80,11 +80,11 @@ func (m *_NLMRejectRouterToNetwork) GetParent() NLM { /////////////////////// Accessors for property fields. /////////////////////// -func (m *_NLMRejectRouterToNetwork) GetRejectReason() NLMRejectRouterToNetworkRejectReason { +func (m *_NLMRejectMessageToNetwork) GetRejectReason() NLMRejectMessageToNetworkRejectReason { return m.RejectReason } -func (m *_NLMRejectRouterToNetwork) GetDestinationNetworkAddress() uint16 { +func (m *_NLMRejectMessageToNetwork) GetDestinationNetworkAddress() uint16 { return m.DestinationNetworkAddress } @@ -93,9 +93,9 @@ func (m *_NLMRejectRouterToNetwork) GetDestinationNetworkAddress() uint16 { /////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////// -// NewNLMRejectRouterToNetwork factory function for _NLMRejectRouterToNetwork -func NewNLMRejectRouterToNetwork(rejectReason NLMRejectRouterToNetworkRejectReason, destinationNetworkAddress uint16, apduLength uint16) *_NLMRejectRouterToNetwork { - _result := &_NLMRejectRouterToNetwork{ +// NewNLMRejectMessageToNetwork factory function for _NLMRejectMessageToNetwork +func NewNLMRejectMessageToNetwork(rejectReason NLMRejectMessageToNetworkRejectReason, destinationNetworkAddress uint16, apduLength uint16) *_NLMRejectMessageToNetwork { + _result := &_NLMRejectMessageToNetwork{ RejectReason: rejectReason, DestinationNetworkAddress: destinationNetworkAddress, _NLM: NewNLM(apduLength), @@ -105,21 +105,21 @@ func NewNLMRejectRouterToNetwork(rejectReason NLMRejectRouterToNetworkRejectReas } // Deprecated: use the interface for direct cast -func CastNLMRejectRouterToNetwork(structType any) NLMRejectRouterToNetwork { - if casted, ok := structType.(NLMRejectRouterToNetwork); ok { +func CastNLMRejectMessageToNetwork(structType any) NLMRejectMessageToNetwork { + if casted, ok := structType.(NLMRejectMessageToNetwork); ok { return casted } - if casted, ok := structType.(*NLMRejectRouterToNetwork); ok { + if casted, ok := structType.(*NLMRejectMessageToNetwork); ok { return *casted } return nil } -func (m *_NLMRejectRouterToNetwork) GetTypeName() string { - return "NLMRejectRouterToNetwork" +func (m *_NLMRejectMessageToNetwork) GetTypeName() string { + return "NLMRejectMessageToNetwork" } -func (m *_NLMRejectRouterToNetwork) GetLengthInBits(ctx context.Context) uint16 { +func (m *_NLMRejectMessageToNetwork) GetLengthInBits(ctx context.Context) uint16 { lengthInBits := uint16(m.GetParentLengthInBits(ctx)) // Simple field (rejectReason) @@ -131,21 +131,21 @@ func (m *_NLMRejectRouterToNetwork) GetLengthInBits(ctx context.Context) uint16 return lengthInBits } -func (m *_NLMRejectRouterToNetwork) GetLengthInBytes(ctx context.Context) uint16 { +func (m *_NLMRejectMessageToNetwork) GetLengthInBytes(ctx context.Context) uint16 { return m.GetLengthInBits(ctx) / 8 } -func NLMRejectRouterToNetworkParse(ctx context.Context, theBytes []byte, apduLength uint16) (NLMRejectRouterToNetwork, error) { - return NLMRejectRouterToNetworkParseWithBuffer(ctx, utils.NewReadBufferByteBased(theBytes), apduLength) +func NLMRejectMessageToNetworkParse(ctx context.Context, theBytes []byte, apduLength uint16) (NLMRejectMessageToNetwork, error) { + return NLMRejectMessageToNetworkParseWithBuffer(ctx, utils.NewReadBufferByteBased(theBytes), apduLength) } -func NLMRejectRouterToNetworkParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, apduLength uint16) (NLMRejectRouterToNetwork, error) { +func NLMRejectMessageToNetworkParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer, apduLength uint16) (NLMRejectMessageToNetwork, error) { positionAware := readBuffer _ = positionAware log := zerolog.Ctx(ctx) _ = log - if pullErr := readBuffer.PullContext("NLMRejectRouterToNetwork"); pullErr != nil { - return nil, errors.Wrap(pullErr, "Error pulling for NLMRejectRouterToNetwork") + if pullErr := readBuffer.PullContext("NLMRejectMessageToNetwork"); pullErr != nil { + return nil, errors.Wrap(pullErr, "Error pulling for NLMRejectMessageToNetwork") } currentPos := positionAware.GetPos() _ = currentPos @@ -154,9 +154,9 @@ func NLMRejectRouterToNetworkParseWithBuffer(ctx context.Context, readBuffer uti if pullErr := readBuffer.PullContext("rejectReason"); pullErr != nil { return nil, errors.Wrap(pullErr, "Error pulling for rejectReason") } - _rejectReason, _rejectReasonErr := NLMRejectRouterToNetworkRejectReasonParseWithBuffer(ctx, readBuffer) + _rejectReason, _rejectReasonErr := NLMRejectMessageToNetworkRejectReasonParseWithBuffer(ctx, readBuffer) if _rejectReasonErr != nil { - return nil, errors.Wrap(_rejectReasonErr, "Error parsing 'rejectReason' field of NLMRejectRouterToNetwork") + return nil, errors.Wrap(_rejectReasonErr, "Error parsing 'rejectReason' field of NLMRejectMessageToNetwork") } rejectReason := _rejectReason if closeErr := readBuffer.CloseContext("rejectReason"); closeErr != nil { @@ -166,16 +166,16 @@ func NLMRejectRouterToNetworkParseWithBuffer(ctx context.Context, readBuffer uti // Simple Field (destinationNetworkAddress) _destinationNetworkAddress, _destinationNetworkAddressErr := readBuffer.ReadUint16("destinationNetworkAddress", 16) if _destinationNetworkAddressErr != nil { - return nil, errors.Wrap(_destinationNetworkAddressErr, "Error parsing 'destinationNetworkAddress' field of NLMRejectRouterToNetwork") + return nil, errors.Wrap(_destinationNetworkAddressErr, "Error parsing 'destinationNetworkAddress' field of NLMRejectMessageToNetwork") } destinationNetworkAddress := _destinationNetworkAddress - if closeErr := readBuffer.CloseContext("NLMRejectRouterToNetwork"); closeErr != nil { - return nil, errors.Wrap(closeErr, "Error closing for NLMRejectRouterToNetwork") + if closeErr := readBuffer.CloseContext("NLMRejectMessageToNetwork"); closeErr != nil { + return nil, errors.Wrap(closeErr, "Error closing for NLMRejectMessageToNetwork") } // Create a partially initialized instance - _child := &_NLMRejectRouterToNetwork{ + _child := &_NLMRejectMessageToNetwork{ _NLM: &_NLM{ ApduLength: apduLength, }, @@ -186,7 +186,7 @@ func NLMRejectRouterToNetworkParseWithBuffer(ctx context.Context, readBuffer uti return _child, nil } -func (m *_NLMRejectRouterToNetwork) Serialize() ([]byte, error) { +func (m *_NLMRejectMessageToNetwork) Serialize() ([]byte, error) { wb := utils.NewWriteBufferByteBased(utils.WithInitialSizeForByteBasedBuffer(int(m.GetLengthInBytes(context.Background())))) if err := m.SerializeWithWriteBuffer(context.Background(), wb); err != nil { return nil, err @@ -194,14 +194,14 @@ func (m *_NLMRejectRouterToNetwork) Serialize() ([]byte, error) { return wb.GetBytes(), nil } -func (m *_NLMRejectRouterToNetwork) SerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.WriteBuffer) error { +func (m *_NLMRejectMessageToNetwork) SerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.WriteBuffer) error { positionAware := writeBuffer _ = positionAware log := zerolog.Ctx(ctx) _ = log ser := func() error { - if pushErr := writeBuffer.PushContext("NLMRejectRouterToNetwork"); pushErr != nil { - return errors.Wrap(pushErr, "Error pushing for NLMRejectRouterToNetwork") + if pushErr := writeBuffer.PushContext("NLMRejectMessageToNetwork"); pushErr != nil { + return errors.Wrap(pushErr, "Error pushing for NLMRejectMessageToNetwork") } // Simple Field (rejectReason) @@ -223,19 +223,19 @@ func (m *_NLMRejectRouterToNetwork) SerializeWithWriteBuffer(ctx context.Context return errors.Wrap(_destinationNetworkAddressErr, "Error serializing 'destinationNetworkAddress' field") } - if popErr := writeBuffer.PopContext("NLMRejectRouterToNetwork"); popErr != nil { - return errors.Wrap(popErr, "Error popping for NLMRejectRouterToNetwork") + if popErr := writeBuffer.PopContext("NLMRejectMessageToNetwork"); popErr != nil { + return errors.Wrap(popErr, "Error popping for NLMRejectMessageToNetwork") } return nil } return m.SerializeParent(ctx, writeBuffer, m, ser) } -func (m *_NLMRejectRouterToNetwork) isNLMRejectRouterToNetwork() bool { +func (m *_NLMRejectMessageToNetwork) isNLMRejectMessageToNetwork() bool { return true } -func (m *_NLMRejectRouterToNetwork) String() string { +func (m *_NLMRejectMessageToNetwork) String() string { if m == nil { return "<nil>" } diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetworkRejectReason.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetworkRejectReason.go new file mode 100644 index 0000000000..0bfd98c715 --- /dev/null +++ b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectMessageToNetworkRejectReason.go @@ -0,0 +1,191 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package model + +import ( + "context" + "fmt" + + "github.com/apache/plc4x/plc4go/spi/utils" + + "github.com/pkg/errors" + "github.com/rs/zerolog" +) + +// Code generated by code-generation. DO NOT EDIT. + +// NLMRejectMessageToNetworkRejectReason is an enum +type NLMRejectMessageToNetworkRejectReason uint8 + +type INLMRejectMessageToNetworkRejectReason interface { + fmt.Stringer + utils.LengthAware + utils.Serializable +} + +const ( + NLMRejectMessageToNetworkRejectReason_OTHER NLMRejectMessageToNetworkRejectReason = 0 + NLMRejectMessageToNetworkRejectReason_NOT_DIRECTLY_CONNECTED NLMRejectMessageToNetworkRejectReason = 1 + NLMRejectMessageToNetworkRejectReason_BUSY NLMRejectMessageToNetworkRejectReason = 2 + NLMRejectMessageToNetworkRejectReason_UNKNOWN_NLMT NLMRejectMessageToNetworkRejectReason = 3 + NLMRejectMessageToNetworkRejectReason_TOO_LONG NLMRejectMessageToNetworkRejectReason = 4 + NLMRejectMessageToNetworkRejectReason_SECURITY_ERROR NLMRejectMessageToNetworkRejectReason = 5 + NLMRejectMessageToNetworkRejectReason_ADDRESSING_ERROR NLMRejectMessageToNetworkRejectReason = 6 +) + +var NLMRejectMessageToNetworkRejectReasonValues []NLMRejectMessageToNetworkRejectReason + +func init() { + _ = errors.New + NLMRejectMessageToNetworkRejectReasonValues = []NLMRejectMessageToNetworkRejectReason{ + NLMRejectMessageToNetworkRejectReason_OTHER, + NLMRejectMessageToNetworkRejectReason_NOT_DIRECTLY_CONNECTED, + NLMRejectMessageToNetworkRejectReason_BUSY, + NLMRejectMessageToNetworkRejectReason_UNKNOWN_NLMT, + NLMRejectMessageToNetworkRejectReason_TOO_LONG, + NLMRejectMessageToNetworkRejectReason_SECURITY_ERROR, + NLMRejectMessageToNetworkRejectReason_ADDRESSING_ERROR, + } +} + +func NLMRejectMessageToNetworkRejectReasonByValue(value uint8) (enum NLMRejectMessageToNetworkRejectReason, ok bool) { + switch value { + case 0: + return NLMRejectMessageToNetworkRejectReason_OTHER, true + case 1: + return NLMRejectMessageToNetworkRejectReason_NOT_DIRECTLY_CONNECTED, true + case 2: + return NLMRejectMessageToNetworkRejectReason_BUSY, true + case 3: + return NLMRejectMessageToNetworkRejectReason_UNKNOWN_NLMT, true + case 4: + return NLMRejectMessageToNetworkRejectReason_TOO_LONG, true + case 5: + return NLMRejectMessageToNetworkRejectReason_SECURITY_ERROR, true + case 6: + return NLMRejectMessageToNetworkRejectReason_ADDRESSING_ERROR, true + } + return 0, false +} + +func NLMRejectMessageToNetworkRejectReasonByName(value string) (enum NLMRejectMessageToNetworkRejectReason, ok bool) { + switch value { + case "OTHER": + return NLMRejectMessageToNetworkRejectReason_OTHER, true + case "NOT_DIRECTLY_CONNECTED": + return NLMRejectMessageToNetworkRejectReason_NOT_DIRECTLY_CONNECTED, true + case "BUSY": + return NLMRejectMessageToNetworkRejectReason_BUSY, true + case "UNKNOWN_NLMT": + return NLMRejectMessageToNetworkRejectReason_UNKNOWN_NLMT, true + case "TOO_LONG": + return NLMRejectMessageToNetworkRejectReason_TOO_LONG, true + case "SECURITY_ERROR": + return NLMRejectMessageToNetworkRejectReason_SECURITY_ERROR, true + case "ADDRESSING_ERROR": + return NLMRejectMessageToNetworkRejectReason_ADDRESSING_ERROR, true + } + return 0, false +} + +func NLMRejectMessageToNetworkRejectReasonKnows(value uint8) bool { + for _, typeValue := range NLMRejectMessageToNetworkRejectReasonValues { + if uint8(typeValue) == value { + return true + } + } + return false +} + +func CastNLMRejectMessageToNetworkRejectReason(structType any) NLMRejectMessageToNetworkRejectReason { + castFunc := func(typ any) NLMRejectMessageToNetworkRejectReason { + if sNLMRejectMessageToNetworkRejectReason, ok := typ.(NLMRejectMessageToNetworkRejectReason); ok { + return sNLMRejectMessageToNetworkRejectReason + } + return 0 + } + return castFunc(structType) +} + +func (m NLMRejectMessageToNetworkRejectReason) GetLengthInBits(ctx context.Context) uint16 { + return 8 +} + +func (m NLMRejectMessageToNetworkRejectReason) GetLengthInBytes(ctx context.Context) uint16 { + return m.GetLengthInBits(ctx) / 8 +} + +func NLMRejectMessageToNetworkRejectReasonParse(ctx context.Context, theBytes []byte) (NLMRejectMessageToNetworkRejectReason, error) { + return NLMRejectMessageToNetworkRejectReasonParseWithBuffer(ctx, utils.NewReadBufferByteBased(theBytes)) +} + +func NLMRejectMessageToNetworkRejectReasonParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NLMRejectMessageToNetworkRejectReason, error) { + log := zerolog.Ctx(ctx) + _ = log + val, err := readBuffer.ReadUint8("NLMRejectMessageToNetworkRejectReason", 8) + if err != nil { + return 0, errors.Wrap(err, "error reading NLMRejectMessageToNetworkRejectReason") + } + if enum, ok := NLMRejectMessageToNetworkRejectReasonByValue(val); !ok { + log.Debug().Interface("val", val).Msg("no value val found for NLMRejectMessageToNetworkRejectReason") + return NLMRejectMessageToNetworkRejectReason(val), nil + } else { + return enum, nil + } +} + +func (e NLMRejectMessageToNetworkRejectReason) Serialize() ([]byte, error) { + wb := utils.NewWriteBufferByteBased() + if err := e.SerializeWithWriteBuffer(context.Background(), wb); err != nil { + return nil, err + } + return wb.GetBytes(), nil +} + +func (e NLMRejectMessageToNetworkRejectReason) SerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.WriteBuffer) error { + log := zerolog.Ctx(ctx) + _ = log + return writeBuffer.WriteUint8("NLMRejectMessageToNetworkRejectReason", 8, uint8(uint8(e)), utils.WithAdditionalStringRepresentation(e.PLC4XEnumName())) +} + +// PLC4XEnumName returns the name that is used in code to identify this enum +func (e NLMRejectMessageToNetworkRejectReason) PLC4XEnumName() string { + switch e { + case NLMRejectMessageToNetworkRejectReason_OTHER: + return "OTHER" + case NLMRejectMessageToNetworkRejectReason_NOT_DIRECTLY_CONNECTED: + return "NOT_DIRECTLY_CONNECTED" + case NLMRejectMessageToNetworkRejectReason_BUSY: + return "BUSY" + case NLMRejectMessageToNetworkRejectReason_UNKNOWN_NLMT: + return "UNKNOWN_NLMT" + case NLMRejectMessageToNetworkRejectReason_TOO_LONG: + return "TOO_LONG" + case NLMRejectMessageToNetworkRejectReason_SECURITY_ERROR: + return "SECURITY_ERROR" + case NLMRejectMessageToNetworkRejectReason_ADDRESSING_ERROR: + return "ADDRESSING_ERROR" + } + return fmt.Sprintf("Unknown(%v)", uint8(e)) +} + +func (e NLMRejectMessageToNetworkRejectReason) String() string { + return e.PLC4XEnumName() +} diff --git a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go b/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go deleted file mode 100644 index 11ae4ad63e..0000000000 --- a/plc4go/protocols/bacnetip/readwrite/model/NLMRejectRouterToNetworkRejectReason.go +++ /dev/null @@ -1,191 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package model - -import ( - "context" - "fmt" - - "github.com/apache/plc4x/plc4go/spi/utils" - - "github.com/pkg/errors" - "github.com/rs/zerolog" -) - -// Code generated by code-generation. DO NOT EDIT. - -// NLMRejectRouterToNetworkRejectReason is an enum -type NLMRejectRouterToNetworkRejectReason uint8 - -type INLMRejectRouterToNetworkRejectReason interface { - fmt.Stringer - utils.LengthAware - utils.Serializable -} - -const ( - NLMRejectRouterToNetworkRejectReason_OTHER NLMRejectRouterToNetworkRejectReason = 0 - NLMRejectRouterToNetworkRejectReason_NOT_DIRECTLY_CONNECTED NLMRejectRouterToNetworkRejectReason = 1 - NLMRejectRouterToNetworkRejectReason_BUSY NLMRejectRouterToNetworkRejectReason = 2 - NLMRejectRouterToNetworkRejectReason_UNKNOWN_NLMT NLMRejectRouterToNetworkRejectReason = 3 - NLMRejectRouterToNetworkRejectReason_TOO_LONG NLMRejectRouterToNetworkRejectReason = 4 - NLMRejectRouterToNetworkRejectReason_SECURITY_ERROR NLMRejectRouterToNetworkRejectReason = 5 - NLMRejectRouterToNetworkRejectReason_ADDRESSING_ERROR NLMRejectRouterToNetworkRejectReason = 6 -) - -var NLMRejectRouterToNetworkRejectReasonValues []NLMRejectRouterToNetworkRejectReason - -func init() { - _ = errors.New - NLMRejectRouterToNetworkRejectReasonValues = []NLMRejectRouterToNetworkRejectReason{ - NLMRejectRouterToNetworkRejectReason_OTHER, - NLMRejectRouterToNetworkRejectReason_NOT_DIRECTLY_CONNECTED, - NLMRejectRouterToNetworkRejectReason_BUSY, - NLMRejectRouterToNetworkRejectReason_UNKNOWN_NLMT, - NLMRejectRouterToNetworkRejectReason_TOO_LONG, - NLMRejectRouterToNetworkRejectReason_SECURITY_ERROR, - NLMRejectRouterToNetworkRejectReason_ADDRESSING_ERROR, - } -} - -func NLMRejectRouterToNetworkRejectReasonByValue(value uint8) (enum NLMRejectRouterToNetworkRejectReason, ok bool) { - switch value { - case 0: - return NLMRejectRouterToNetworkRejectReason_OTHER, true - case 1: - return NLMRejectRouterToNetworkRejectReason_NOT_DIRECTLY_CONNECTED, true - case 2: - return NLMRejectRouterToNetworkRejectReason_BUSY, true - case 3: - return NLMRejectRouterToNetworkRejectReason_UNKNOWN_NLMT, true - case 4: - return NLMRejectRouterToNetworkRejectReason_TOO_LONG, true - case 5: - return NLMRejectRouterToNetworkRejectReason_SECURITY_ERROR, true - case 6: - return NLMRejectRouterToNetworkRejectReason_ADDRESSING_ERROR, true - } - return 0, false -} - -func NLMRejectRouterToNetworkRejectReasonByName(value string) (enum NLMRejectRouterToNetworkRejectReason, ok bool) { - switch value { - case "OTHER": - return NLMRejectRouterToNetworkRejectReason_OTHER, true - case "NOT_DIRECTLY_CONNECTED": - return NLMRejectRouterToNetworkRejectReason_NOT_DIRECTLY_CONNECTED, true - case "BUSY": - return NLMRejectRouterToNetworkRejectReason_BUSY, true - case "UNKNOWN_NLMT": - return NLMRejectRouterToNetworkRejectReason_UNKNOWN_NLMT, true - case "TOO_LONG": - return NLMRejectRouterToNetworkRejectReason_TOO_LONG, true - case "SECURITY_ERROR": - return NLMRejectRouterToNetworkRejectReason_SECURITY_ERROR, true - case "ADDRESSING_ERROR": - return NLMRejectRouterToNetworkRejectReason_ADDRESSING_ERROR, true - } - return 0, false -} - -func NLMRejectRouterToNetworkRejectReasonKnows(value uint8) bool { - for _, typeValue := range NLMRejectRouterToNetworkRejectReasonValues { - if uint8(typeValue) == value { - return true - } - } - return false -} - -func CastNLMRejectRouterToNetworkRejectReason(structType any) NLMRejectRouterToNetworkRejectReason { - castFunc := func(typ any) NLMRejectRouterToNetworkRejectReason { - if sNLMRejectRouterToNetworkRejectReason, ok := typ.(NLMRejectRouterToNetworkRejectReason); ok { - return sNLMRejectRouterToNetworkRejectReason - } - return 0 - } - return castFunc(structType) -} - -func (m NLMRejectRouterToNetworkRejectReason) GetLengthInBits(ctx context.Context) uint16 { - return 8 -} - -func (m NLMRejectRouterToNetworkRejectReason) GetLengthInBytes(ctx context.Context) uint16 { - return m.GetLengthInBits(ctx) / 8 -} - -func NLMRejectRouterToNetworkRejectReasonParse(ctx context.Context, theBytes []byte) (NLMRejectRouterToNetworkRejectReason, error) { - return NLMRejectRouterToNetworkRejectReasonParseWithBuffer(ctx, utils.NewReadBufferByteBased(theBytes)) -} - -func NLMRejectRouterToNetworkRejectReasonParseWithBuffer(ctx context.Context, readBuffer utils.ReadBuffer) (NLMRejectRouterToNetworkRejectReason, error) { - log := zerolog.Ctx(ctx) - _ = log - val, err := readBuffer.ReadUint8("NLMRejectRouterToNetworkRejectReason", 8) - if err != nil { - return 0, errors.Wrap(err, "error reading NLMRejectRouterToNetworkRejectReason") - } - if enum, ok := NLMRejectRouterToNetworkRejectReasonByValue(val); !ok { - log.Debug().Interface("val", val).Msg("no value val found for NLMRejectRouterToNetworkRejectReason") - return NLMRejectRouterToNetworkRejectReason(val), nil - } else { - return enum, nil - } -} - -func (e NLMRejectRouterToNetworkRejectReason) Serialize() ([]byte, error) { - wb := utils.NewWriteBufferByteBased() - if err := e.SerializeWithWriteBuffer(context.Background(), wb); err != nil { - return nil, err - } - return wb.GetBytes(), nil -} - -func (e NLMRejectRouterToNetworkRejectReason) SerializeWithWriteBuffer(ctx context.Context, writeBuffer utils.WriteBuffer) error { - log := zerolog.Ctx(ctx) - _ = log - return writeBuffer.WriteUint8("NLMRejectRouterToNetworkRejectReason", 8, uint8(uint8(e)), utils.WithAdditionalStringRepresentation(e.PLC4XEnumName())) -} - -// PLC4XEnumName returns the name that is used in code to identify this enum -func (e NLMRejectRouterToNetworkRejectReason) PLC4XEnumName() string { - switch e { - case NLMRejectRouterToNetworkRejectReason_OTHER: - return "OTHER" - case NLMRejectRouterToNetworkRejectReason_NOT_DIRECTLY_CONNECTED: - return "NOT_DIRECTLY_CONNECTED" - case NLMRejectRouterToNetworkRejectReason_BUSY: - return "BUSY" - case NLMRejectRouterToNetworkRejectReason_UNKNOWN_NLMT: - return "UNKNOWN_NLMT" - case NLMRejectRouterToNetworkRejectReason_TOO_LONG: - return "TOO_LONG" - case NLMRejectRouterToNetworkRejectReason_SECURITY_ERROR: - return "SECURITY_ERROR" - case NLMRejectRouterToNetworkRejectReason_ADDRESSING_ERROR: - return "ADDRESSING_ERROR" - } - return fmt.Sprintf("Unknown(%v)", uint8(e)) -} - -func (e NLMRejectRouterToNetworkRejectReason) String() string { - return e.PLC4XEnumName() -} diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLM.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLM.java index ebbccf1bc3..9e635ee109 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLM.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLM.java @@ -130,7 +130,7 @@ public abstract class NLM implements Message { } else if (EvaluationHelper.equals(messageType, (short) 0x02)) { builder = NLMICouldBeRouterToNetwork.staticParseNLMBuilder(readBuffer, apduLength); } else if (EvaluationHelper.equals(messageType, (short) 0x03)) { - builder = NLMRejectRouterToNetwork.staticParseNLMBuilder(readBuffer, apduLength); + builder = NLMRejectMessageToNetwork.staticParseNLMBuilder(readBuffer, apduLength); } else if (EvaluationHelper.equals(messageType, (short) 0x04)) { builder = NLMRouterBusyToNetwork.staticParseNLMBuilder(readBuffer, apduLength); } else if (EvaluationHelper.equals(messageType, (short) 0x05)) { diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectRouterToNetwork.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetwork.java similarity index 75% rename from plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectRouterToNetwork.java rename to plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetwork.java index a664032c42..ff38448e99 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectRouterToNetwork.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetwork.java @@ -35,7 +35,7 @@ import org.apache.plc4x.java.spi.generation.*; // Code generated by code-generation. DO NOT EDIT. -public class NLMRejectRouterToNetwork extends NLM implements Message { +public class NLMRejectMessageToNetwork extends NLM implements Message { // Accessors for discriminator values. public Short getMessageType() { @@ -43,14 +43,14 @@ public class NLMRejectRouterToNetwork extends NLM implements Message { } // Properties. - protected final NLMRejectRouterToNetworkRejectReason rejectReason; + protected final NLMRejectMessageToNetworkRejectReason rejectReason; protected final int destinationNetworkAddress; // Arguments. protected final Integer apduLength; - public NLMRejectRouterToNetwork( - NLMRejectRouterToNetworkRejectReason rejectReason, + public NLMRejectMessageToNetwork( + NLMRejectMessageToNetworkRejectReason rejectReason, int destinationNetworkAddress, Integer apduLength) { super(apduLength); @@ -59,7 +59,7 @@ public class NLMRejectRouterToNetwork extends NLM implements Message { this.apduLength = apduLength; } - public NLMRejectRouterToNetworkRejectReason getRejectReason() { + public NLMRejectMessageToNetworkRejectReason getRejectReason() { return rejectReason; } @@ -71,23 +71,23 @@ public class NLMRejectRouterToNetwork extends NLM implements Message { protected void serializeNLMChild(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - writeBuffer.pushContext("NLMRejectRouterToNetwork"); + writeBuffer.pushContext("NLMRejectMessageToNetwork"); // Simple Field (rejectReason) writeSimpleEnumField( "rejectReason", - "NLMRejectRouterToNetworkRejectReason", + "NLMRejectMessageToNetworkRejectReason", rejectReason, new DataWriterEnumDefault<>( - NLMRejectRouterToNetworkRejectReason::getValue, - NLMRejectRouterToNetworkRejectReason::name, + NLMRejectMessageToNetworkRejectReason::getValue, + NLMRejectMessageToNetworkRejectReason::name, writeUnsignedShort(writeBuffer, 8))); // Simple Field (destinationNetworkAddress) writeSimpleField( "destinationNetworkAddress", destinationNetworkAddress, writeUnsignedInt(writeBuffer, 16)); - writeBuffer.popContext("NLMRejectRouterToNetwork"); + writeBuffer.popContext("NLMRejectMessageToNetwork"); } @Override @@ -98,7 +98,7 @@ public class NLMRejectRouterToNetwork extends NLM implements Message { @Override public int getLengthInBits() { int lengthInBits = super.getLengthInBits(); - NLMRejectRouterToNetwork _value = this; + NLMRejectMessageToNetwork _value = this; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (rejectReason) @@ -112,34 +112,34 @@ public class NLMRejectRouterToNetwork extends NLM implements Message { public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer apduLength) throws ParseException { - readBuffer.pullContext("NLMRejectRouterToNetwork"); + readBuffer.pullContext("NLMRejectMessageToNetwork"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - NLMRejectRouterToNetworkRejectReason rejectReason = + NLMRejectMessageToNetworkRejectReason rejectReason = readEnumField( "rejectReason", - "NLMRejectRouterToNetworkRejectReason", + "NLMRejectMessageToNetworkRejectReason", new DataReaderEnumDefault<>( - NLMRejectRouterToNetworkRejectReason::enumForValue, + NLMRejectMessageToNetworkRejectReason::enumForValue, readUnsignedShort(readBuffer, 8))); int destinationNetworkAddress = readSimpleField("destinationNetworkAddress", readUnsignedInt(readBuffer, 16)); - readBuffer.closeContext("NLMRejectRouterToNetwork"); + readBuffer.closeContext("NLMRejectMessageToNetwork"); // Create the instance - return new NLMRejectRouterToNetworkBuilderImpl( + return new NLMRejectMessageToNetworkBuilderImpl( rejectReason, destinationNetworkAddress, apduLength); } - public static class NLMRejectRouterToNetworkBuilderImpl implements NLM.NLMBuilder { - private final NLMRejectRouterToNetworkRejectReason rejectReason; + public static class NLMRejectMessageToNetworkBuilderImpl implements NLM.NLMBuilder { + private final NLMRejectMessageToNetworkRejectReason rejectReason; private final int destinationNetworkAddress; private final Integer apduLength; - public NLMRejectRouterToNetworkBuilderImpl( - NLMRejectRouterToNetworkRejectReason rejectReason, + public NLMRejectMessageToNetworkBuilderImpl( + NLMRejectMessageToNetworkRejectReason rejectReason, int destinationNetworkAddress, Integer apduLength) { this.rejectReason = rejectReason; @@ -147,11 +147,11 @@ public class NLMRejectRouterToNetwork extends NLM implements Message { this.apduLength = apduLength; } - public NLMRejectRouterToNetwork build(Integer apduLength) { + public NLMRejectMessageToNetwork build(Integer apduLength) { - NLMRejectRouterToNetwork nLMRejectRouterToNetwork = - new NLMRejectRouterToNetwork(rejectReason, destinationNetworkAddress, apduLength); - return nLMRejectRouterToNetwork; + NLMRejectMessageToNetwork nLMRejectMessageToNetwork = + new NLMRejectMessageToNetwork(rejectReason, destinationNetworkAddress, apduLength); + return nLMRejectMessageToNetwork; } } @@ -160,10 +160,10 @@ public class NLMRejectRouterToNetwork extends NLM implements Message { if (this == o) { return true; } - if (!(o instanceof NLMRejectRouterToNetwork)) { + if (!(o instanceof NLMRejectMessageToNetwork)) { return false; } - NLMRejectRouterToNetwork that = (NLMRejectRouterToNetwork) o; + NLMRejectMessageToNetwork that = (NLMRejectMessageToNetwork) o; return (getRejectReason() == that.getRejectReason()) && (getDestinationNetworkAddress() == that.getDestinationNetworkAddress()) && super.equals(that) diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectRouterToNetworkRejectReason.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetworkRejectReason.java similarity index 79% rename from plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectRouterToNetworkRejectReason.java rename to plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetworkRejectReason.java index 25664a8480..4dfc617bf9 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectRouterToNetworkRejectReason.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMRejectMessageToNetworkRejectReason.java @@ -23,7 +23,7 @@ import java.util.Map; // Code generated by code-generation. DO NOT EDIT. -public enum NLMRejectRouterToNetworkRejectReason { +public enum NLMRejectMessageToNetworkRejectReason { OTHER((short) 0), NOT_DIRECTLY_CONNECTED((short) 1), BUSY((short) 2), @@ -31,19 +31,19 @@ public enum NLMRejectRouterToNetworkRejectReason { TOO_LONG((short) 4), SECURITY_ERROR((short) 5), ADDRESSING_ERROR((short) 6); - private static final Map<Short, NLMRejectRouterToNetworkRejectReason> map; + private static final Map<Short, NLMRejectMessageToNetworkRejectReason> map; static { map = new HashMap<>(); - for (NLMRejectRouterToNetworkRejectReason value : - NLMRejectRouterToNetworkRejectReason.values()) { + for (NLMRejectMessageToNetworkRejectReason value : + NLMRejectMessageToNetworkRejectReason.values()) { map.put((short) value.getValue(), value); } } private final short value; - NLMRejectRouterToNetworkRejectReason(short value) { + NLMRejectMessageToNetworkRejectReason(short value) { this.value = value; } @@ -51,7 +51,7 @@ public enum NLMRejectRouterToNetworkRejectReason { return value; } - public static NLMRejectRouterToNetworkRejectReason enumForValue(short value) { + public static NLMRejectMessageToNetworkRejectReason enumForValue(short value) { return map.get(value); } diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-private-enums.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-private-enums.mspec index 2d2670f09a..ced3a3e091 100644 --- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-private-enums.mspec +++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnet-private-enums.mspec @@ -469,7 +469,7 @@ ] // Attention: No proprietary extension allowed -[enum uint 8 NLMRejectRouterToNetworkRejectReason +[enum uint 8 NLMRejectMessageToNetworkRejectReason ['0' OTHER ] ['1' NOT_DIRECTLY_CONNECTED ] ['2' BUSY ] diff --git a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec index c5ab29cd9e..8cee11b75a 100644 --- a/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec +++ b/protocols/bacnetip/src/main/resources/protocols/bacnetip/bacnetip.mspec @@ -145,8 +145,8 @@ [simple uint 16 destinationNetworkAddress ] [simple uint 8 performanceIndex ] ] - ['0x03' *RejectRouterToNetwork - [simple NLMRejectRouterToNetworkRejectReason + ['0x03' *RejectMessageToNetwork + [simple NLMRejectMessageToNetworkRejectReason rejectReason ] [simple uint 16 destinationNetworkAddress ] ]
