From 24dc0f6f55266b0495c552bb946e024affcfd029 Mon Sep 17 00:00:00 2001 From: Christofer Dutz Date: Sun, 8 Sep 2024 13:13:38 +0200 Subject: [PATCH] chore: Reformatted imports in go --- .../internal/bacnetip/ApplicationLayerMessageCodec.go | 10 +++++----- plc4go/internal/bacnetip/bacgopes/apdu/apdu.go | 3 +-- plc4go/internal/bacnetip/bacgopes/apdu/apdu_APCI.go | 3 +-- plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go | 5 ++--- .../internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go | 3 +-- .../bacgopes/apdu/apdu_UnconfirmedRequestSequence.go | 3 +-- .../bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go | 3 +-- plc4go/internal/bacnetip/bacgopes/apdu/apdu__APDU.go | 3 +-- .../internal/bacnetip/bacgopes/app/app_Application.go | 3 +-- .../bacgopes/app/app_ApplicationIOController.go | 3 +-- .../bacnetip/bacgopes/appservice/app_DeviceInfo.go | 3 +-- .../bacgopes/appservice/app_DeviceInfoCache.go | 3 +-- .../appservice_ApplicationServiceAccessPoint.go | 3 +-- .../bacgopes/appservice/appservice_ClientSSM.go | 5 ++--- .../bacnetip/bacgopes/appservice/appservice_SSM.go | 3 +-- .../bacgopes/appservice/appservice_ServerSSM.go | 5 ++--- .../appservice/appservice_StateMachineAccessPoint.go | 3 +-- .../internal/bacnetip/bacgopes/basetypes/basetypes.go | 3 +-- plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLCI.go | 3 +-- plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLPDU.go | 5 ++--- .../bvll/bvll_DeleteForeignDeviceTableEntry.go | 3 +-- .../bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go | 5 ++--- .../bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go | 5 ++--- .../bacgopes/bvll/bvll_OriginalBroadcastNPDU.go | 5 ++--- .../bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go | 5 ++--- .../bvll/bvll_ReadBroadcastDistributionTable.go | 3 +-- .../bvll/bvll_ReadBroadcastDistributionTableAck.go | 3 +-- .../bacgopes/bvll/bvll_ReadForeignDeviceTable.go | 3 +-- .../bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go | 3 +-- .../bacgopes/bvll/bvll_RegisterForeignDevice.go | 3 +-- plc4go/internal/bacnetip/bacgopes/bvll/bvll_Result.go | 3 +-- .../bvll/bvll_WriteBroadcastDistributionTable.go | 3 +-- .../bacgopes/bvllservice/bvllservice_BIPBBMD.go | 3 +-- .../bacgopes/bvllservice/bvllservice_BIPForeign.go | 3 +-- .../bacgopes/bvllservice/bvllservice_BIPSimple.go | 3 +-- .../bacgopes/comm/comm_ApplicationServiceElement.go | 3 +-- plc4go/internal/bacnetip/bacgopes/comm/comm_Client.go | 3 +-- plc4go/internal/bacnetip/bacgopes/comm/comm_Server.go | 3 +-- .../bacnetip/bacgopes/comm/comm_ServiceAccessPoint.go | 3 +-- .../bacgopes/constructeddata/constructeddata.go | 3 +-- plc4go/internal/bacnetip/bacgopes/deleteme/deleteme.go | 5 ++--- plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOCB.go | 3 +-- plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOQueue.go | 3 +-- .../netservice/netservice_NetworkServiceAccessPoint.go | 3 +-- .../netservice/netservice_NetworkServiceElement.go | 3 +-- .../npdu/npdu_DisconnectConnectionToNetwork.go | 3 +-- .../bacgopes/npdu/npdu_EstablishConnectionToNetwork.go | 3 +-- .../bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go | 3 +-- .../bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go | 3 +-- .../bacgopes/npdu/npdu_InitializeRoutingTable.go | 3 +-- .../bacgopes/npdu/npdu_InitializeRoutingTableAck.go | 3 +-- plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go | 3 +-- plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPDU.go | 5 ++--- .../bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go | 3 +-- .../bacgopes/npdu/npdu_RejectMessageToNetwork.go | 3 +-- .../bacgopes/npdu/npdu_RouterAvailableToNetwork.go | 3 +-- .../bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go | 3 +-- .../bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go | 3 +-- .../bacgopes/npdu/npdu_WhoIsRouterToNetwork.go | 3 +-- plc4go/internal/bacnetip/bacgopes/pdu/comm__PCI.go | 5 ++--- plc4go/internal/bacnetip/bacgopes/pdu/pdu_PCI.go | 5 ++--- plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDU.go | 5 ++--- plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDUData.go | 3 +-- .../primitivedata/primitivedata_ApplicationTag.go | 3 +-- .../bacgopes/primitivedata/primitivedata_BitString.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Boolean.go | 3 +-- .../primitivedata/primitivedata_CharacterString.go | 3 +-- .../bacgopes/primitivedata/primitivedata_ContextTag.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Date.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Double.go | 3 +-- .../primitivedata/primitivedata_Enumeration.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Integer.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Null.go | 3 +-- .../primitivedata/primitivedata_ObjectIdentifier.go | 3 +-- .../primitivedata/primitivedata_OctetString.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Real.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Tag.go | 3 +-- .../bacgopes/primitivedata/primitivedata_TagList.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Time.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Unsigned.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Unsigned16.go | 3 +-- .../bacgopes/primitivedata/primitivedata_Unsigned8.go | 3 +-- .../service/service_device_WhoIsIAmServices.go | 3 +-- plc4go/internal/bacnetip/bacgopes/tests/quick/bvll.go | 3 +-- plc4go/internal/bacnetip/bacgopes/tests/quick/npdu.go | 3 +-- .../internal/bacnetip/bacgopes/tests/state_machine.go | 3 +-- .../bacgopes/tests/state_machine_StateMachine.go | 3 +-- .../bacgopes/tests/test_bvll/test_bbmd_test.go | 5 ++--- .../bacgopes/tests/test_bvll/test_codec_test.go | 5 ++--- .../bacgopes/tests/test_bvll/test_foreign_test.go | 3 +-- .../bacgopes/tests/test_bvll/test_simple_test.go | 3 +-- .../bacgopes/tests/test_comm/test_capability_test.go | 3 +-- .../bacgopes/tests/test_network/test_net_1_test.go | 3 +-- .../bacgopes/tests/test_network/test_net_2_test.go | 3 +-- .../bacgopes/tests/test_network/test_net_3_test.go | 3 +-- .../bacgopes/tests/test_npdu/test_codec_test.go | 5 ++--- .../bacgopes/tests/test_pdu/test_address_test.go | 3 +-- .../tests/test_primitive_data/test_bit_string_test.go | 3 +-- .../tests/test_primitive_data/test_boolean_test.go | 3 +-- .../test_primitive_data/test_character_string_test.go | 3 +-- .../tests/test_primitive_data/test_date_test.go | 3 +-- .../tests/test_primitive_data/test_double_test.go | 3 +-- .../tests/test_primitive_data/test_enumerated_test.go | 3 +-- .../tests/test_primitive_data/test_integer_test.go | 3 +-- .../tests/test_primitive_data/test_null_test.go | 3 +-- .../test_primitive_data/test_object_identifier_test.go | 3 +-- .../tests/test_primitive_data/test_object_type_test.go | 3 +-- .../test_primitive_data/test_octet_string_test.go | 3 +-- .../tests/test_primitive_data/test_real_test.go | 3 +-- .../tests/test_primitive_data/test_tag_test.go | 3 +-- .../tests/test_primitive_data/test_time_test.go | 3 +-- .../tests/test_primitive_data/test_unsigned_test.go | 3 +-- .../bacgopes/tests/test_segmentation/test_1_test.go | 7 +++---- .../bacnetip/bacgopes/tests/test_service/helpers.go | 3 +-- .../bacgopes/tests/test_service/test_cov_test.go | 3 +-- .../test_utilities/test_client_state_machine_test.go | 3 +-- .../test_utilities/test_server_state_machine_test.go | 3 +-- .../test_utilities/test_service_access_point_test.go | 3 +-- .../tests/test_utilities/test_state_machine_test.go | 7 +++---- .../tests/test_utilities/test_time_machine_test.go | 3 +-- .../bacgopes/tests/test_vlan/test_ipnetwork_test.go | 3 +-- .../bacgopes/tests/test_vlan/test_network_test.go | 3 +-- .../internal/bacnetip/bacgopes/tests/time_machine.go | 3 +-- .../bacgopes/tests/trapped_classes_TrappedClient.go | 3 +-- .../bacgopes/tests/trapped_classes_TrappedServer.go | 3 +-- .../internal/bacnetip/bacgopes/udp/udp_UDPDirector.go | 5 ++--- 126 files changed, 151 insertions(+), 276 deletions(-) diff --git a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go index 01c3344a070..7884a68238d 100644 --- a/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go +++ b/plc4go/internal/bacnetip/ApplicationLayerMessageCodec.go @@ -22,11 +22,6 @@ package bacnetip import ( "context" "fmt" - "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/app" - "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/appservice" - "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/iocb" - "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/local/device" - "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" "net" "net/url" "time" @@ -34,6 +29,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" + "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/app" + "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/appservice" + "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/iocb" + "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/local/device" + "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" "github.com/apache/plc4x/plc4go/spi" "github.com/apache/plc4x/plc4go/spi/transports/udp" diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu.go index a312b96aa54..dee252b16e5 100644 --- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu.go +++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu.go @@ -20,9 +20,8 @@ package apdu import ( - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) var APDUTypes map[readWriteModel.ApduType]func() Decoder diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APCI.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APCI.go index 25263dd06b2..ee3e80f534c 100644 --- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APCI.go +++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APCI.go @@ -26,13 +26,12 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/deleteme" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type APCI interface { diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go index 00e6043f351..b7314e1f349 100644 --- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go +++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_APDU.go @@ -26,13 +26,12 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type APDU interface { diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go index a776d557934..d5f550175c1 100644 --- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go +++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_IAmRequest.go @@ -20,11 +20,10 @@ package apdu import ( - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/constructeddata" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type IAmRequest struct { diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestSequence.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestSequence.go index 4def3a43f53..e8ad311ec6b 100644 --- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestSequence.go +++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_UnconfirmedRequestSequence.go @@ -22,9 +22,8 @@ package apdu import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) // UnconfirmedRequestSequenceContract provides a set of functions which can be overwritten by a sub struct diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go index 39026eae0cf..7653ea688ae 100644 --- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go +++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu_WhoIsRequest.go @@ -22,11 +22,10 @@ package apdu import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/constructeddata" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type WhoIsRequest struct { diff --git a/plc4go/internal/bacnetip/bacgopes/apdu/apdu__APDU.go b/plc4go/internal/bacnetip/bacgopes/apdu/apdu__APDU.go index aa13fba4068..4f23e7d3836 100644 --- a/plc4go/internal/bacnetip/bacgopes/apdu/apdu__APDU.go +++ b/plc4go/internal/bacnetip/bacgopes/apdu/apdu__APDU.go @@ -25,11 +25,10 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) // _APDU masks the Encode() and Decode() functions of the APDU diff --git a/plc4go/internal/bacnetip/bacgopes/app/app_Application.go b/plc4go/internal/bacnetip/bacgopes/app/app_Application.go index d782133365b..983b8a4aedb 100644 --- a/plc4go/internal/bacnetip/bacgopes/app/app_Application.go +++ b/plc4go/internal/bacnetip/bacgopes/app/app_Application.go @@ -25,8 +25,6 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/apdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/appservice" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/capability" @@ -35,6 +33,7 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/core" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/local/device" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ApplicationRequirements interface { diff --git a/plc4go/internal/bacnetip/bacgopes/app/app_ApplicationIOController.go b/plc4go/internal/bacnetip/bacgopes/app/app_ApplicationIOController.go index a8406599d3f..74c4e9afbaa 100644 --- a/plc4go/internal/bacnetip/bacgopes/app/app_ApplicationIOController.go +++ b/plc4go/internal/bacnetip/bacgopes/app/app_ApplicationIOController.go @@ -23,13 +23,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/appservice" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/iocb" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/local/device" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=ApplicationIOController -prefix=app_ diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/app_DeviceInfo.go b/plc4go/internal/bacnetip/bacgopes/appservice/app_DeviceInfo.go index aa84eafb722..f9b8e0e989b 100644 --- a/plc4go/internal/bacnetip/bacgopes/appservice/app_DeviceInfo.go +++ b/plc4go/internal/bacnetip/bacgopes/appservice/app_DeviceInfo.go @@ -20,9 +20,8 @@ package appservice import ( - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=DeviceInfo -prefix=app_ diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/app_DeviceInfoCache.go b/plc4go/internal/bacnetip/bacgopes/appservice/app_DeviceInfoCache.go index 14203f1f14b..553d1f58443 100644 --- a/plc4go/internal/bacnetip/bacgopes/appservice/app_DeviceInfoCache.go +++ b/plc4go/internal/bacnetip/bacgopes/appservice/app_DeviceInfoCache.go @@ -27,9 +27,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) // DeviceInfoCacheKey caches by either Instance, PduSource of both diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ApplicationServiceAccessPoint.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ApplicationServiceAccessPoint.go index 26ca3b833ec..32ed49a4605 100644 --- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ApplicationServiceAccessPoint.go +++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ApplicationServiceAccessPoint.go @@ -23,12 +23,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/apdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=ApplicationServiceAccessPoint -prefix=appservice_ diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ClientSSM.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ClientSSM.go index 7ad460f44cf..e5eea0178e6 100644 --- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ClientSSM.go +++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ClientSSM.go @@ -25,11 +25,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi/options" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi/options" ) type ClientSSM struct { diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_SSM.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_SSM.go index 8d5e83fb11f..a53fbcfb7b1 100644 --- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_SSM.go +++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_SSM.go @@ -25,13 +25,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/local/device" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/task" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type SSMState uint8 diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ServerSSM.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ServerSSM.go index e7514ec99bf..9a8acd58018 100644 --- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ServerSSM.go +++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_ServerSSM.go @@ -25,11 +25,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi/options" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi/options" ) type ServerSSM struct { diff --git a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_StateMachineAccessPoint.go b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_StateMachineAccessPoint.go index 54abacc1c2c..300a0af6ce9 100644 --- a/plc4go/internal/bacnetip/bacgopes/appservice/appservice_StateMachineAccessPoint.go +++ b/plc4go/internal/bacnetip/bacgopes/appservice/appservice_StateMachineAccessPoint.go @@ -23,13 +23,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/local/device" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=StateMachineAccessPoint -prefix=appservice_ diff --git a/plc4go/internal/bacnetip/bacgopes/basetypes/basetypes.go b/plc4go/internal/bacnetip/bacgopes/basetypes/basetypes.go index d02e3393728..81f22b9aad8 100644 --- a/plc4go/internal/bacnetip/bacgopes/basetypes/basetypes.go +++ b/plc4go/internal/bacnetip/bacgopes/basetypes/basetypes.go @@ -24,11 +24,10 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/constructeddata" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type vendorRange struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLCI.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLCI.go index 55da78ec017..1c41136bfba 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLCI.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLCI.go @@ -24,11 +24,10 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type BVLCIRequirements interface { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLPDU.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLPDU.go index 1bc6618a943..3d58f0cfffb 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLPDU.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_BVLPDU.go @@ -24,11 +24,10 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type BVLPDU interface { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DeleteForeignDeviceTableEntry.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DeleteForeignDeviceTableEntry.go index 0cfcd26b559..ec12c9b77cd 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DeleteForeignDeviceTableEntry.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DeleteForeignDeviceTableEntry.go @@ -26,10 +26,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type DeleteForeignDeviceTableEntry struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go index 1bca56d414d..60b324099cb 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_DistributeBroadcastToNetwork.go @@ -25,11 +25,10 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type DistributeBroadcastToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go index 942e0835f4f..da31e13fa18 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ForwardedNPDU.go @@ -27,11 +27,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type ForwardedNPDU struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalBroadcastNPDU.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalBroadcastNPDU.go index c9767128d1b..90f2eda0991 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalBroadcastNPDU.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalBroadcastNPDU.go @@ -25,11 +25,10 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type OriginalBroadcastNPDU struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go index 5cbcd807f87..07d8236f364 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_OriginalUnicastNPDU.go @@ -25,11 +25,10 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type OriginalUnicastNPDU struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTable.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTable.go index 1464d253441..710954b84e7 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTable.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTable.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ReadBroadcastDistributionTable struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTableAck.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTableAck.go index 48cee24c8c6..32f66564897 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTableAck.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadBroadcastDistributionTableAck.go @@ -26,10 +26,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ReadBroadcastDistributionTableAck struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTable.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTable.go index 22d9e44b6e7..061382705fc 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTable.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTable.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ReadForeignDeviceTable struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go index b420fef03d9..ac09d9c2bc6 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_ReadForeignDeviceTableAck.go @@ -26,10 +26,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ReadForeignDeviceTableAck struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_RegisterForeignDevice.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_RegisterForeignDevice.go index c1f465ff9df..08718369296 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_RegisterForeignDevice.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_RegisterForeignDevice.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type RegisterForeignDevice struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_Result.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_Result.go index 0437d1543e7..a06d97e2861 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_Result.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_Result.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Result struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_WriteBroadcastDistributionTable.go b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_WriteBroadcastDistributionTable.go index 3dc65a8b19d..1516bcdfb5f 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvll/bvll_WriteBroadcastDistributionTable.go +++ b/plc4go/internal/bacnetip/bacgopes/bvll/bvll_WriteBroadcastDistributionTable.go @@ -26,10 +26,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type WriteBroadcastDistributionTable struct { diff --git a/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPBBMD.go b/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPBBMD.go index acae9a27fcf..d56fcbd0b4a 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPBBMD.go +++ b/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPBBMD.go @@ -26,8 +26,6 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" @@ -35,6 +33,7 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/deleteme" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/task" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=BIPBBMD -prefix=bvllservice_ diff --git a/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPForeign.go b/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPForeign.go index e3f3d7d9845..3d2ea0c3468 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPForeign.go +++ b/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPForeign.go @@ -25,13 +25,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/task" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=BIPForeign -prefix=bvllservice_ diff --git a/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPSimple.go b/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPSimple.go index 7bf682ad45e..79880b1d872 100644 --- a/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPSimple.go +++ b/plc4go/internal/bacnetip/bacgopes/bvllservice/bvllservice_BIPSimple.go @@ -23,12 +23,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=BIPSimple -prefix=bvllservice_ diff --git a/plc4go/internal/bacnetip/bacgopes/comm/comm_ApplicationServiceElement.go b/plc4go/internal/bacnetip/bacgopes/comm/comm_ApplicationServiceElement.go index b48469834e3..8ea2d920209 100644 --- a/plc4go/internal/bacnetip/bacgopes/comm/comm_ApplicationServiceElement.go +++ b/plc4go/internal/bacnetip/bacgopes/comm/comm_ApplicationServiceElement.go @@ -23,10 +23,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" + "github.com/apache/plc4x/plc4go/spi/utils" ) type ApplicationServiceElement interface { diff --git a/plc4go/internal/bacnetip/bacgopes/comm/comm_Client.go b/plc4go/internal/bacnetip/bacgopes/comm/comm_Client.go index 869b905a5f1..f933ad28f8d 100644 --- a/plc4go/internal/bacnetip/bacgopes/comm/comm_Client.go +++ b/plc4go/internal/bacnetip/bacgopes/comm/comm_Client.go @@ -25,9 +25,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/spi/utils" ) type Client interface { diff --git a/plc4go/internal/bacnetip/bacgopes/comm/comm_Server.go b/plc4go/internal/bacnetip/bacgopes/comm/comm_Server.go index 1e9f1beefde..a254dcda391 100644 --- a/plc4go/internal/bacnetip/bacgopes/comm/comm_Server.go +++ b/plc4go/internal/bacnetip/bacgopes/comm/comm_Server.go @@ -25,9 +25,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/spi/utils" ) type Server interface { diff --git a/plc4go/internal/bacnetip/bacgopes/comm/comm_ServiceAccessPoint.go b/plc4go/internal/bacnetip/bacgopes/comm/comm_ServiceAccessPoint.go index aa838e5d0f7..32c5dd14deb 100644 --- a/plc4go/internal/bacnetip/bacgopes/comm/comm_ServiceAccessPoint.go +++ b/plc4go/internal/bacnetip/bacgopes/comm/comm_ServiceAccessPoint.go @@ -25,10 +25,9 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" + "github.com/apache/plc4x/plc4go/spi/utils" ) type ServiceAccessPoint interface { diff --git a/plc4go/internal/bacnetip/bacgopes/constructeddata/constructeddata.go b/plc4go/internal/bacnetip/bacgopes/constructeddata/constructeddata.go index 88d22118491..61ee5f2dc70 100644 --- a/plc4go/internal/bacnetip/bacgopes/constructeddata/constructeddata.go +++ b/plc4go/internal/bacnetip/bacgopes/constructeddata/constructeddata.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) var _sequenceOfClasses map[any]struct{} diff --git a/plc4go/internal/bacnetip/bacgopes/deleteme/deleteme.go b/plc4go/internal/bacnetip/bacgopes/deleteme/deleteme.go index 9123531bfad..8dde4eff2c1 100644 --- a/plc4go/internal/bacnetip/bacgopes/deleteme/deleteme.go +++ b/plc4go/internal/bacnetip/bacgopes/deleteme/deleteme.go @@ -22,11 +22,10 @@ package deleteme import ( "context" - "github.com/apache/plc4x/plc4go/spi" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/spi" + "github.com/apache/plc4x/plc4go/spi/utils" ) type MessageBridge interface { diff --git a/plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOCB.go b/plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOCB.go index 595514e7da9..26093b85058 100644 --- a/plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOCB.go +++ b/plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOCB.go @@ -26,10 +26,9 @@ import ( "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/task" + "github.com/apache/plc4x/plc4go/spi/utils" ) type IOCBState int diff --git a/plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOQueue.go b/plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOQueue.go index 45ce71c3431..f2e7f57d94f 100644 --- a/plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOQueue.go +++ b/plc4go/internal/bacnetip/bacgopes/iocb/iocb_IOQueue.go @@ -27,9 +27,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/spi/utils" ) //go:generate plc4xGenerator -type=IOQueue -prefix=iocb_ diff --git a/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceAccessPoint.go b/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceAccessPoint.go index e520c028e82..21ae13e76c2 100644 --- a/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceAccessPoint.go +++ b/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceAccessPoint.go @@ -25,14 +25,13 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/apdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/npdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=NetworkServiceAccessPoint -prefix=netservice_ diff --git a/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceElement.go b/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceElement.go index 9de3c67f37d..2ae19460582 100644 --- a/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceElement.go +++ b/plc4go/internal/bacnetip/bacgopes/netservice/netservice_NetworkServiceElement.go @@ -26,13 +26,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/core" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/npdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) //go:generate plc4xGenerator -type=NetworkServiceElement -prefix=netservice_ diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_DisconnectConnectionToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_DisconnectConnectionToNetwork.go index 9035ae30d77..05a59aae7c4 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_DisconnectConnectionToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_DisconnectConnectionToNetwork.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type DisconnectConnectionToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_EstablishConnectionToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_EstablishConnectionToNetwork.go index 5b253abd4af..836a1ec6b3d 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_EstablishConnectionToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_EstablishConnectionToNetwork.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type EstablishConnectionToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go index 8c1e033e5bd..6a091b94ec6 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_IAmRouterToNetwork.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type IAmRouterToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go index 135eafc45cc..3bf088d855c 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_ICouldBeRouterToNetwork.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ICouldBeRouterToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTable.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTable.go index 057f64f7aa4..1da5ef132c4 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTable.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTable.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type InitializeRoutingTable struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTableAck.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTableAck.go index 3d8c36a81c8..0b75989b259 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTableAck.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_InitializeRoutingTableAck.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type InitializeRoutingTableAck struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go index 25d375e5909..7014bd481ed 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPCI.go @@ -28,13 +28,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/deleteme" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type NPCI interface { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPDU.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPDU.go index 0ed288a9478..ba6a6e140db 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPDU.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NPDU.go @@ -26,13 +26,12 @@ import ( "github.com/pkg/errors" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type NPDU interface { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go index fa2ef8575ed..d7a03657db3 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_NetworkNumberIs.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type NetworkNumberIs struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RejectMessageToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RejectMessageToNetwork.go index 88579f6b409..1af39298711 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RejectMessageToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RejectMessageToNetwork.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type RejectMessageToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterAvailableToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterAvailableToNetwork.go index dcd92ed018c..d870f7d2a62 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterAvailableToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterAvailableToNetwork.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type RouterAvailableToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go index 4b590f857dc..019a01067bc 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_RouterBusyToNetwork.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type RouterBusyToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go index 11386f21f80..e0eebcb1885 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhatIsNetworkNumber.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type WhatIsNetworkNumber struct { diff --git a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhoIsRouterToNetwork.go b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhoIsRouterToNetwork.go index 269c24a1c08..c285e461d98 100644 --- a/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhoIsRouterToNetwork.go +++ b/plc4go/internal/bacnetip/bacgopes/npdu/npdu_WhoIsRouterToNetwork.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type WhoIsRouterToNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/pdu/comm__PCI.go b/plc4go/internal/bacnetip/bacgopes/pdu/comm__PCI.go index fd91dd4e06a..a6b0a0aec1f 100644 --- a/plc4go/internal/bacnetip/bacgopes/pdu/comm__PCI.go +++ b/plc4go/internal/bacnetip/bacgopes/pdu/comm__PCI.go @@ -26,12 +26,11 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/spi" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" + "github.com/apache/plc4x/plc4go/spi" + "github.com/apache/plc4x/plc4go/spi/utils" ) type IPCI interface { diff --git a/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PCI.go b/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PCI.go index 5fa2a8749dc..dc92e91ac53 100644 --- a/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PCI.go +++ b/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PCI.go @@ -24,11 +24,10 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type PCI interface { diff --git a/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDU.go b/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDU.go index 158e918f30d..07b421dfbb6 100644 --- a/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDU.go +++ b/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDU.go @@ -22,11 +22,10 @@ package pdu import ( "fmt" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi" ) type PDU interface { diff --git a/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDUData.go b/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDUData.go index a498e2d8cd6..3eeec39a102 100644 --- a/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDUData.go +++ b/plc4go/internal/bacnetip/bacgopes/pdu/pdu_PDUData.go @@ -24,10 +24,9 @@ import ( "fmt" "io" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" + "github.com/apache/plc4x/plc4go/spi/utils" ) type PDUData interface { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ApplicationTag.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ApplicationTag.go index b943b4ef241..44fdd3db2f7 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ApplicationTag.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ApplicationTag.go @@ -22,10 +22,9 @@ package primitivedata import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ApplicationTag struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_BitString.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_BitString.go index 8febf69d1e9..f88781932c0 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_BitString.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_BitString.go @@ -25,9 +25,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) // BitStringExtension can be used to inherit from BitString diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Boolean.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Boolean.go index 5c28c2028d6..19a64be7264 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Boolean.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Boolean.go @@ -24,9 +24,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Boolean struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_CharacterString.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_CharacterString.go index 3c06dfcc492..24af429b8fc 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_CharacterString.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_CharacterString.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type CharacterString struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ContextTag.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ContextTag.go index 94b1224805b..88551ddd66f 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ContextTag.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ContextTag.go @@ -22,10 +22,9 @@ package primitivedata import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ContextTag struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Date.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Date.go index f6c3758b5b9..a7d2548cd79 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Date.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Date.go @@ -28,10 +28,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) const _mm = `(?P0?[1-9]|1[0-4]|odd|even|255|[*])` diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Double.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Double.go index 3f8cd119835..3c0bdbd0ae3 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Double.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Double.go @@ -26,9 +26,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Double struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Enumeration.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Enumeration.go index 80e02616cac..badb39bcaf7 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Enumeration.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Enumeration.go @@ -26,9 +26,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func expandEnumerations(e EnumeratedContract) { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Integer.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Integer.go index e422648b0e9..843692e615a 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Integer.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Integer.go @@ -26,9 +26,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Integer struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Null.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Null.go index 5512fa788bc..d9387617a72 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Null.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Null.go @@ -24,9 +24,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Null struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ObjectIdentifier.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ObjectIdentifier.go index 5226b891631..79e1e76cd5d 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ObjectIdentifier.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_ObjectIdentifier.go @@ -27,9 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type ObjectIdentifierTuple struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_OctetString.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_OctetString.go index 8bcc8842f57..cae80501641 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_OctetString.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_OctetString.go @@ -25,10 +25,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type OctetString struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Real.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Real.go index b437d27a90d..12dfce42676 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Real.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Real.go @@ -26,9 +26,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Real struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Tag.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Tag.go index 8b5ca465eb1..853739d69ef 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Tag.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Tag.go @@ -24,10 +24,9 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) const ( diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_TagList.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_TagList.go index 6753507a7a3..aa5866c8e8d 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_TagList.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_TagList.go @@ -22,10 +22,9 @@ package primitivedata import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type TagList struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Time.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Time.go index 9ac287b01fb..0383ee7098f 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Time.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Time.go @@ -29,9 +29,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type TimeTuple struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned.go index e10ab13bbaf..6dcd7aef1e9 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned.go @@ -27,9 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Unsigned struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned16.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned16.go index bb869ca713d..b73d546e4be 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned16.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned16.go @@ -27,9 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Unsigned16 struct { diff --git a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned8.go b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned8.go index c8596d7ba8e..87ebc888bff 100644 --- a/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned8.go +++ b/plc4go/internal/bacnetip/bacgopes/primitivedata/primitivedata_Unsigned8.go @@ -27,9 +27,8 @@ import ( "github.com/pkg/errors" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type Unsigned8 struct { diff --git a/plc4go/internal/bacnetip/bacgopes/service/service_device_WhoIsIAmServices.go b/plc4go/internal/bacnetip/bacgopes/service/service_device_WhoIsIAmServices.go index c042d65f17b..9f98ea6e62d 100644 --- a/plc4go/internal/bacnetip/bacgopes/service/service_device_WhoIsIAmServices.go +++ b/plc4go/internal/bacnetip/bacgopes/service/service_device_WhoIsIAmServices.go @@ -25,13 +25,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/apdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/capability" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/local/device" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type WhoIsIAmServicesRequirements interface { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/quick/bvll.go b/plc4go/internal/bacnetip/bacgopes/tests/quick/bvll.go index 71c6933c266..4c4f6ad1cdc 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/quick/bvll.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/quick/bvll.go @@ -20,11 +20,10 @@ package quick import ( - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/deleteme" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func Result(i uint16) *bvll.Result { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/quick/npdu.go b/plc4go/internal/bacnetip/bacgopes/tests/quick/npdu.go index 89cdc9b271d..6a4cf76bb91 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/quick/npdu.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/quick/npdu.go @@ -20,9 +20,8 @@ package quick import ( - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/npdu" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func WhoIsRouterToNetwork(net uint16) *npdu.WhoIsRouterToNetwork { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/state_machine.go b/plc4go/internal/bacnetip/bacgopes/tests/state_machine.go index 81adf0d0a4c..7994aca94af 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/state_machine.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/state_machine.go @@ -27,13 +27,12 @@ import ( "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/npdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/task" + "github.com/apache/plc4x/plc4go/spi/utils" ) // Transition Instances of this class are transitions betweeen getStates of a state machine. diff --git a/plc4go/internal/bacnetip/bacgopes/tests/state_machine_StateMachine.go b/plc4go/internal/bacnetip/bacgopes/tests/state_machine_StateMachine.go index 2fdb6a72d47..066e24b77b3 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/state_machine_StateMachine.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/state_machine_StateMachine.go @@ -27,12 +27,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/globals" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/task" + "github.com/apache/plc4x/plc4go/spi/utils" ) // StateMachine A state machine consisting of states. Every state machine has a start diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_bbmd_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_bbmd_test.go index 60b85265bd3..1b67e8f0126 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_bbmd_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_bbmd_test.go @@ -29,9 +29,6 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/apdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" @@ -40,6 +37,8 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TBNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_codec_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_codec_test.go index 0cb7c0d8c67..eb2f51616d3 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_codec_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_codec_test.go @@ -25,9 +25,6 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/suite" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvllservice" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" @@ -37,6 +34,8 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TestAnnexJCodecSuite struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_foreign_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_foreign_test.go index 373e6a99e58..e29af759296 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_foreign_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_foreign_test.go @@ -27,8 +27,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" @@ -37,6 +35,7 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TFNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_simple_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_simple_test.go index 86185289aee..5cd6956cec5 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_simple_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_bvll/test_simple_test.go @@ -27,8 +27,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/bvll" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" @@ -36,6 +34,7 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_comm/test_capability_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_comm/test_capability_test.go index 7d602f9bc17..3a669814c53 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_comm/test_capability_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_comm/test_capability_test.go @@ -25,9 +25,8 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/capability" + "github.com/apache/plc4x/plc4go/spi/testutils" ) // TODO: big WIP diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_1_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_1_test.go index 3dfebd979ee..e0921b0bfad 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_1_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_1_test.go @@ -27,13 +27,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/npdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TNetwork1 struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_2_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_2_test.go index 7e3f3f5828b..cb14420dd56 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_2_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_2_test.go @@ -27,13 +27,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/npdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TNetwork2 struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_3_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_3_test.go index f3f9c4b29dd..e892afc9f7f 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_3_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_network/test_net_3_test.go @@ -28,13 +28,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/apdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TNetwork3 struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_npdu/test_codec_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_npdu/test_codec_test.go index 5a636e0ae9f..b6738338aa5 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_npdu/test_codec_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_npdu/test_codec_test.go @@ -25,9 +25,6 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/suite" - readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" @@ -36,6 +33,8 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TestNPDUCodecSuite struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_pdu/test_address_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_pdu/test_address_test.go index ba47b7f3a3a..c794505aa8c 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_pdu/test_address_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_pdu/test_address_test.go @@ -26,11 +26,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/spi/testutils" ) // Assert that the type, network, length, and address are what diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_bit_string_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_bit_string_test.go index 52624e3b035..123888af275 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_bit_string_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_bit_string_test.go @@ -25,12 +25,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type sampleBitString struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_boolean_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_boolean_test.go index c7364a581f0..e433278408b 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_boolean_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_boolean_test.go @@ -24,10 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func booleanTag(value bool) Tag { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_character_string_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_character_string_test.go index 285b1d15907..f159461a365 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_character_string_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_character_string_test.go @@ -25,10 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) const foxMessage = "the quick brown fox jumped over the lazy dog" diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_date_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_date_test.go index 93d68ba42b3..2d5515603bc 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_date_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_date_test.go @@ -24,10 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) // Convert a hex string to a character_string application tag. diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_double_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_double_test.go index 4c2a71c13f1..c9ca3f19072 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_double_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_double_test.go @@ -24,10 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func DoubleTag(x string) Tag { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_enumerated_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_enumerated_test.go index 210385ac0d1..5b644f4a804 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_enumerated_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_enumerated_test.go @@ -24,11 +24,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type quickBrownFox struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_integer_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_integer_test.go index edb9dd3b74f..5c6cf55d947 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_integer_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_integer_test.go @@ -25,11 +25,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/debugging" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func IntegerTag(x string) Tag { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_null_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_null_test.go index 95c26d3a413..b550050ead7 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_null_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_null_test.go @@ -24,10 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func NullTag(x string) Tag { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_object_identifier_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_object_identifier_test.go index cc64bfac289..02931a69559 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_object_identifier_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_object_identifier_test.go @@ -24,10 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func ObjectIdentifierTag(x string) Tag { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_object_type_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_object_type_test.go index 042ea802f44..36433226d97 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_object_type_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_object_type_test.go @@ -26,10 +26,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) type myObjectType struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_octet_string_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_octet_string_test.go index 86a8c871e02..73d6771bbd6 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_octet_string_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_octet_string_test.go @@ -24,10 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func OctetStringTag(x string) Tag { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_real_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_real_test.go index 1eb46de04e5..18216d8e7ce 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_real_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_real_test.go @@ -25,10 +25,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func RealTag(x string) Tag { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_tag_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_tag_test.go index b7c7a0af268..9db6e79dfc3 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_tag_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_tag_test.go @@ -25,11 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func TagTuple(tag Tag) (tagClass model.TagClass, tagNumber uint, tagLVT int, tagData []byte) { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_time_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_time_test.go index 4843dc6312e..424288bbbbe 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_time_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_time_test.go @@ -24,10 +24,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) // Convert a hex string to a character_string application tag. diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_unsigned_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_unsigned_test.go index c6becf655a8..3440db22313 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_unsigned_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_primitive_data/test_unsigned_test.go @@ -25,10 +25,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/primitivedata" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) func UnsignedTag(x string) Tag { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_segmentation/test_1_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_segmentation/test_1_test.go index 3fb17e7fc7e..22533773e6c 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_segmentation/test_1_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_segmentation/test_1_test.go @@ -28,10 +28,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi/testutils" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/app" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/appservice" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" @@ -43,6 +39,9 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi/testutils" + "github.com/apache/plc4x/plc4go/spi/utils" ) // This struct turns off the deferred startup function call that broadcasts I-Am-Router-To-Network and Network-Number-Is diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_service/helpers.go b/plc4go/internal/bacnetip/bacgopes/tests/test_service/helpers.go index 5babbec5465..5cd5aea2815 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_service/helpers.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_service/helpers.go @@ -25,8 +25,6 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/app" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/appservice" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/capability" @@ -39,6 +37,7 @@ import ( . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/service" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" ) // This struct turns off the deferred startup function call that broadcasts I-Am-Router-To-Network and Network-Number-Is diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_service/test_cov_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_service/test_cov_test.go index 3d708e7a70d..78c16a05b0d 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_service/test_cov_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_service/test_cov_test.go @@ -25,10 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/service" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" + "github.com/apache/plc4x/plc4go/spi/testutils" ) func TestBasic(t *testing.T) { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_client_state_machine_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_client_state_machine_test.go index dff1dde8c80..a24e51d0967 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_client_state_machine_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_client_state_machine_test.go @@ -25,11 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" + "github.com/apache/plc4x/plc4go/spi/testutils" ) func TestClientStateMachine(t *testing.T) { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_server_state_machine_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_server_state_machine_test.go index cd747257d19..46f6a72f0e1 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_server_state_machine_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_server_state_machine_test.go @@ -25,11 +25,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" + "github.com/apache/plc4x/plc4go/spi/testutils" ) func TestServerStateMachine(t *testing.T) { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_service_access_point_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_service_access_point_test.go index 7ce155c767e..00b1d18e0d2 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_service_access_point_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_service_access_point_test.go @@ -26,12 +26,11 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/suite" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type EchoAccessPointRequirements interface { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_state_machine_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_state_machine_test.go index f8a952cdb32..3fd279a571b 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_state_machine_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_state_machine_test.go @@ -28,14 +28,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" + . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" readWriteModel "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" "github.com/apache/plc4x/plc4go/spi" "github.com/apache/plc4x/plc4go/spi/testutils" "github.com/apache/plc4x/plc4go/spi/utils" - - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" ) type TPDU struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_time_machine_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_time_machine_test.go index 86209d2caca..c58fb0dbcd4 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_time_machine_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_utilities/test_time_machine_test.go @@ -28,11 +28,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/task" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TimeMachineSuite struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_vlan/test_ipnetwork_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_vlan/test_ipnetwork_test.go index 6ccea5b2501..29927b3fb83 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_vlan/test_ipnetwork_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_vlan/test_ipnetwork_test.go @@ -31,14 +31,13 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TIPNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/test_vlan/test_network_test.go b/plc4go/internal/bacnetip/bacgopes/tests/test_vlan/test_network_test.go index 1a3d2ceb91d..52aa6509303 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/test_vlan/test_network_test.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/test_vlan/test_network_test.go @@ -28,14 +28,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests" "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/tests/quick" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/vlan" + "github.com/apache/plc4x/plc4go/spi/testutils" ) type TNetwork struct { diff --git a/plc4go/internal/bacnetip/bacgopes/tests/time_machine.go b/plc4go/internal/bacnetip/bacgopes/tests/time_machine.go index 1afd8bcc7a0..939280b99d3 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/time_machine.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/time_machine.go @@ -27,10 +27,9 @@ import ( "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/testutils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/core" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/task" + "github.com/apache/plc4x/plc4go/spi/testutils" ) var globalTimeMachine *TimeMachine diff --git a/plc4go/internal/bacnetip/bacgopes/tests/trapped_classes_TrappedClient.go b/plc4go/internal/bacnetip/bacgopes/tests/trapped_classes_TrappedClient.go index 83557791aa0..48b3b05cd06 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/trapped_classes_TrappedClient.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/trapped_classes_TrappedClient.go @@ -23,11 +23,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/spi/utils" ) // TrappedClientContract provides a set of functions which can be overwritten by a sub struct diff --git a/plc4go/internal/bacnetip/bacgopes/tests/trapped_classes_TrappedServer.go b/plc4go/internal/bacnetip/bacgopes/tests/trapped_classes_TrappedServer.go index 4367cc0a4ea..fb5e11b2cd4 100644 --- a/plc4go/internal/bacnetip/bacgopes/tests/trapped_classes_TrappedServer.go +++ b/plc4go/internal/bacnetip/bacgopes/tests/trapped_classes_TrappedServer.go @@ -23,11 +23,10 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/spi/utils" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/spi/utils" ) // TrappedServerContract provides a set of functions which can be overwritten by a sub struct diff --git a/plc4go/internal/bacnetip/bacgopes/udp/udp_UDPDirector.go b/plc4go/internal/bacnetip/bacgopes/udp/udp_UDPDirector.go index f657f5a3ab2..f866244146c 100644 --- a/plc4go/internal/bacnetip/bacgopes/udp/udp_UDPDirector.go +++ b/plc4go/internal/bacnetip/bacgopes/udp/udp_UDPDirector.go @@ -29,12 +29,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/spi/options" - . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comm" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/comp" . "github.com/apache/plc4x/plc4go/internal/bacnetip/bacgopes/pdu" + "github.com/apache/plc4x/plc4go/protocols/bacnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/spi/options" ) //go:generate plc4xGenerator -type=UDPDirector -prefix=udp_