This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit b5ed562bb5f17feb93ea972d2d71e470a037c019 Author: Christofer Dutz <[email protected]> AuthorDate: Fri Jan 22 12:00:55 2021 +0100 - Fixed some package errors --- .../plc4go/knxnetip/readwrite/ParserHelper.go | 124 ++++---- .../plc4go/knxnetip/readwrite/XmlParserHelper.go | 338 ++++++++++----------- 2 files changed, 231 insertions(+), 231 deletions(-) diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go b/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go index 6c83543..cea565b 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/ParserHelper.go @@ -16,74 +16,74 @@ // specific language governing permissions and limitations // under the License. // -package model +package readwrite import ( - "errors" - "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/internal/plc4go/spi" - "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils" + "errors" + "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/internal/plc4go/spi" + "github.com/apache/plc4x/plc4go/internal/plc4go/spi/utils" ) type KnxnetipParserHelper struct { } func (m KnxnetipParserHelper) Parse(typeName string, arguments []string, io *utils.ReadBuffer) (spi.Message, error) { - switch typeName { - case "HPAIControlEndpoint": - return model.HPAIControlEndpointParse(io) - case "TunnelingResponseDataBlock": - return model.TunnelingResponseDataBlockParse(io) - case "DeviceConfigurationAckDataBlock": - return model.DeviceConfigurationAckDataBlockParse(io) - case "ConnectionRequestInformation": - return model.ConnectionRequestInformationParse(io) - case "HPAIDiscoveryEndpoint": - return model.HPAIDiscoveryEndpointParse(io) - case "ProjectInstallationIdentifier": - return model.ProjectInstallationIdentifierParse(io) - case "ServiceId": - return model.ServiceIdParse(io) - case "HPAIDataEndpoint": - return model.HPAIDataEndpointParse(io) - case "RelativeTimestamp": - return model.RelativeTimestampParse(io) - case "CEMI": - size, err := utils.StrToUint8(arguments[0]) - if err != nil { - return nil, err - } - return model.CEMIParse(io, size) - case "KnxNetIpMessage": - return model.KnxNetIpMessageParse(io) - case "DeviceStatus": - return model.DeviceStatusParse(io) - case "IPAddress": - return model.IPAddressParse(io) - case "CEMIAdditionalInformation": - return model.CEMIAdditionalInformationParse(io) - case "KnxAddress": - return model.KnxAddressParse(io) - case "ConnectionResponseDataBlock": - return model.ConnectionResponseDataBlockParse(io) - case "TunnelingRequestDataBlock": - return model.TunnelingRequestDataBlockParse(io) - case "DIBDeviceInfo": - return model.DIBDeviceInfoParse(io) - case "DeviceConfigurationRequestDataBlock": - return model.DeviceConfigurationRequestDataBlockParse(io) - case "DIBSuppSvcFamilies": - return model.DIBSuppSvcFamiliesParse(io) - case "LDataFrame": - return model.LDataFrameParse(io) - case "KnxGroupAddress": - numLevels, err := utils.StrToUint8(arguments[0]) - if err != nil { - return nil, err - } - return model.KnxGroupAddressParse(io, numLevels) - case "MACAddress": - return model.MACAddressParse(io) - } - return nil, errors.New("Unsupported type " + typeName) + switch typeName { + case "HPAIControlEndpoint": + return model.HPAIControlEndpointParse(io) + case "TunnelingResponseDataBlock": + return model.TunnelingResponseDataBlockParse(io) + case "DeviceConfigurationAckDataBlock": + return model.DeviceConfigurationAckDataBlockParse(io) + case "ConnectionRequestInformation": + return model.ConnectionRequestInformationParse(io) + case "HPAIDiscoveryEndpoint": + return model.HPAIDiscoveryEndpointParse(io) + case "ProjectInstallationIdentifier": + return model.ProjectInstallationIdentifierParse(io) + case "ServiceId": + return model.ServiceIdParse(io) + case "HPAIDataEndpoint": + return model.HPAIDataEndpointParse(io) + case "RelativeTimestamp": + return model.RelativeTimestampParse(io) + case "CEMI": + size, err := utils.StrToUint8(arguments[0]) + if err != nil { + return nil, err + } + return model.CEMIParse(io, size) + case "KnxNetIpMessage": + return model.KnxNetIpMessageParse(io) + case "DeviceStatus": + return model.DeviceStatusParse(io) + case "IPAddress": + return model.IPAddressParse(io) + case "CEMIAdditionalInformation": + return model.CEMIAdditionalInformationParse(io) + case "KnxAddress": + return model.KnxAddressParse(io) + case "ConnectionResponseDataBlock": + return model.ConnectionResponseDataBlockParse(io) + case "TunnelingRequestDataBlock": + return model.TunnelingRequestDataBlockParse(io) + case "DIBDeviceInfo": + return model.DIBDeviceInfoParse(io) + case "DeviceConfigurationRequestDataBlock": + return model.DeviceConfigurationRequestDataBlockParse(io) + case "DIBSuppSvcFamilies": + return model.DIBSuppSvcFamiliesParse(io) + case "LDataFrame": + return model.LDataFrameParse(io) + case "KnxGroupAddress": + numLevels, err := utils.StrToUint8(arguments[0]) + if err != nil { + return nil, err + } + return model.KnxGroupAddressParse(io, numLevels) + case "MACAddress": + return model.MACAddressParse(io) + } + return nil, errors.New("Unsupported type " + typeName) } diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go b/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go index b06768b..29003ae 100644 --- a/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go +++ b/plc4go/internal/plc4go/knxnetip/readwrite/XmlParserHelper.go @@ -16,181 +16,181 @@ // specific language governing permissions and limitations // under the License. // -package model +package readwrite import ( - "encoding/xml" - "errors" - "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model" - "github.com/apache/plc4x/plc4go/internal/plc4go/spi" + "encoding/xml" + "errors" + "github.com/apache/plc4x/plc4go/internal/plc4go/knxnetip/readwrite/model" + "github.com/apache/plc4x/plc4go/internal/plc4go/spi" ) type KnxnetipXmlParserHelper struct { } func (m KnxnetipXmlParserHelper) Parse(typeName string, xmlString string) (spi.Message, error) { - switch typeName { - case "HPAIControlEndpoint": - var obj *model.HPAIControlEndpoint - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "TunnelingResponseDataBlock": - var obj *model.TunnelingResponseDataBlock - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "DeviceConfigurationAckDataBlock": - var obj *model.DeviceConfigurationAckDataBlock - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "ConnectionRequestInformation": - var obj *model.ConnectionRequestInformation - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "HPAIDiscoveryEndpoint": - var obj *model.HPAIDiscoveryEndpoint - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "ProjectInstallationIdentifier": - var obj *model.ProjectInstallationIdentifier - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "ServiceId": - var obj *model.ServiceId - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "HPAIDataEndpoint": - var obj *model.HPAIDataEndpoint - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "RelativeTimestamp": - var obj *model.RelativeTimestamp - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "CEMI": - var obj *model.CEMI - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "KnxNetIpMessage": - var obj *model.KnxNetIpMessage - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "DeviceStatus": - var obj *model.DeviceStatus - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "IPAddress": - var obj *model.IPAddress - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "CEMIAdditionalInformation": - var obj *model.CEMIAdditionalInformation - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "KnxAddress": - var obj *model.KnxAddress - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "ConnectionResponseDataBlock": - var obj *model.ConnectionResponseDataBlock - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "TunnelingRequestDataBlock": - var obj *model.TunnelingRequestDataBlock - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "DIBDeviceInfo": - var obj *model.DIBDeviceInfo - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "DeviceConfigurationRequestDataBlock": - var obj *model.DeviceConfigurationRequestDataBlock - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "DIBSuppSvcFamilies": - var obj *model.DIBSuppSvcFamilies - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "LDataFrame": - var obj *model.LDataFrame - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "KnxGroupAddress": - var obj *model.KnxGroupAddress - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - case "MACAddress": - var obj *model.MACAddress - err := xml.Unmarshal([]byte(xmlString), &obj) - if err != nil { - return nil, errors.New("error unmarshalling xml: " + err.Error()) - } - return obj, nil - } - return nil, errors.New("Unsupported type " + typeName) + switch typeName { + case "HPAIControlEndpoint": + var obj *model.HPAIControlEndpoint + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "TunnelingResponseDataBlock": + var obj *model.TunnelingResponseDataBlock + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "DeviceConfigurationAckDataBlock": + var obj *model.DeviceConfigurationAckDataBlock + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "ConnectionRequestInformation": + var obj *model.ConnectionRequestInformation + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "HPAIDiscoveryEndpoint": + var obj *model.HPAIDiscoveryEndpoint + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "ProjectInstallationIdentifier": + var obj *model.ProjectInstallationIdentifier + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "ServiceId": + var obj *model.ServiceId + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "HPAIDataEndpoint": + var obj *model.HPAIDataEndpoint + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "RelativeTimestamp": + var obj *model.RelativeTimestamp + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "CEMI": + var obj *model.CEMI + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "KnxNetIpMessage": + var obj *model.KnxNetIpMessage + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "DeviceStatus": + var obj *model.DeviceStatus + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "IPAddress": + var obj *model.IPAddress + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "CEMIAdditionalInformation": + var obj *model.CEMIAdditionalInformation + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "KnxAddress": + var obj *model.KnxAddress + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "ConnectionResponseDataBlock": + var obj *model.ConnectionResponseDataBlock + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "TunnelingRequestDataBlock": + var obj *model.TunnelingRequestDataBlock + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "DIBDeviceInfo": + var obj *model.DIBDeviceInfo + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "DeviceConfigurationRequestDataBlock": + var obj *model.DeviceConfigurationRequestDataBlock + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "DIBSuppSvcFamilies": + var obj *model.DIBSuppSvcFamilies + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "LDataFrame": + var obj *model.LDataFrame + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "KnxGroupAddress": + var obj *model.KnxGroupAddress + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + case "MACAddress": + var obj *model.MACAddress + err := xml.Unmarshal([]byte(xmlString), &obj) + if err != nil { + return nil, errors.New("error unmarshalling xml: " + err.Error()) + } + return obj, nil + } + return nil, errors.New("Unsupported type " + typeName) }
