You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by gi...@apache.org on 2022/02/26 09:26:05 UTC
[plc4x] branch dependabot/maven/org.jetbrains-annotations-23.0.0 updated (ad478a9 -> 220c6d2)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch dependabot/maven/org.jetbrains-annotations-23.0.0
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
discard ad478a9 build(deps): bump annotations from 20.1.0 to 23.0.0
add 8afd22e feat(codegen): Started clening up the type references
add 8d36f18 Merge branch 'develop' into feature/cleaned-up-type-references
add 9ac5c0c refactor(codegen): cleanup type definitions
add d99e1e3 refactor(codegen): improve error message
add e9aa564 refactor(codegen): added TODO: about wrongly dispatched type reference
add 485dcf8 refactor(codegen): delay resolving of type reference
add 09415e0 refactor(codegen): removed inverted throwable logic
add f352cbf fix(codegen): fixed problem with concurrent modification
add 16b58b4 fix(codegen): fixed some places where Optional was ignored
add 080640d fix(codegen): fixed some issues with parent types
add dc49339 fix(codegen): fixed some optional usages
add 498413b fix(codegen): fixed some complex usages
add cb2db75 fix(codegen): fixed some complex usages
add d3a7113 fix(codegen): small improvements
add 080fe95 fix(codegen): fix issue where we forgot to set the type definition
add da3889f fix(codegen): fixed issue in CLanguageTemplateHelper
add b8c0c7b fix(codegen): fixed parent access issues
add 9afb345 fix(codegen): fixed small issue in go tempate
add 2443aed fix(codegen): put DataIo below ComplexType
add 00570ea fix(codegen): fix order
add 5b01ba0 fix(codegen): temporary fix for duplicated parser args on dataio definition
add b435e82 fix(codegen): remove temporary fix
add 7c59bc3 feat(codegen): Fixed array type handling and data-io code generation
add 749e034 feat(codegen): Fixed go code generation after refactoring
add 31db05d fix(codegen): fixed some issues in go codegen
add c216cbe feat(plc4go): fixes on golang
add aa61ce2 fix(codegen): fixed issues with wrong type handling
add 7eb4c99 fix(codegen): fixed issues with wrong type handling
add eaa18a6 fix(codegen): fixed issues with wrong type handling
add c874d78 fix(codegen): fixed data-io c
add e01cce8 fix(codegen): fixed usage of deprecated utils
add 1426944 feat(codegen): Kept on working on the migration
add 1ddd589 fix(codegen): fixed small issues with c generation
add c84266a fix(codegen): fixed issue with manual arrays
add 0f2903b fix(codegen): fixed issue with array in plc4j
add 4f275db fix(codegen): fixed issue with dataio in plc4j
add 82af78d fix(codegen): fixed issue with dataio in plc4j
add 8de2719 fix(codegen): fixed issue with dataio in plc4cs
add ffc9279 fix(codegen): replace getComplexTypeReferences() with getNonSimpleTypeReferences()
add d1ce919 fix(codegen): fixed small issues
add d5e3848 fix(codegen): fixed some complex references
add 27feac1 fix(codegen): fixed some issues in plc4c
add 9ba8cf2 feat(codegen): Fixed how data-io fields are referenced
add b997544 feat(codegen): Fixed how byte-based manualArray fields are parsed
add 5c89ba2 fix(codegen): fixed some issues in plc4c
add b8c1881 fix(codegen): fixed remaining helper calls
add 95c0d30 fix(codegen): fixed typo in plc4go
add 10389a2 feat(codegen): Removed some unreferenced code
add efda339 feat(codegen): Tried getting stuff working in C ;-)
add b2635e3 feat(codegen): Got the C code-generation working again
add ddcd8a8 fix(codegen): fixed typo in plc4go
add 9777dc2 feat(codegen): Got the C code-generation working again
add 83811e5 feat(codegen): Fixed an issue in the C# code gent
add b080c87 feat(codegen): Fixed an issue in the C# code gent
add a263357 fix(build): Set the compiler code-level to 1.8 in the entire plc4j part.
add f6b466a fix(build): Streamlined the artifact names of the plc4j examples
add e4be2ce fix(codegen): fixed problem with complex arguments
add 7707680 fix(plc4j/knx): Fixed code where plc4j code was not Java 8 compatible
add 8b58275 fix(codegen): fixed remaining issues
add 3beaf21 build: re-enable owasp
add a5e3c90 fix(build): Moved the cve-scan to the jenkins profile
add 71058d8 feat(codegen): Fixed more issues in the C# code gent
add 34d0887 feat(codegen): Fixed more issues in the C# code gent
add 08dbabb Merge branch 'feature/cleaned-up-type-references' into develop
add b7dcde9 feat(codegen): Fixed more issues in the C# code gent
add e492df7 fix(codegen/plc4j): try to fix big integer conversion issues
add 91daf10 fix(codegen): fix partial type references on variable literals
add d93719a6 fix(codegen): small typo fix
add 81fcbbb fix(codegen): include arguments by variable context lookup
add f6d146a fix(plc4j/examples): fixed wrong path of example parent pom
add d7c9c56 test(codegen): added test for variable literal type enrichment
add f18ae5c fix(codegen): fix lookup for variable literals by considering all fields
add 278598f fix(codegen): fix lookup for variable literals by considering builtins
add 00e0c26 chore(build): fix build
add 220c6d2 build(deps): bump annotations from 20.1.0 to 23.0.0
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ad478a9)
\
N -- N -- N refs/heads/dependabot/maven/org.jetbrains-annotations-23.0.0 (220c6d2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../BaseFreemarkerLanguageTemplateHelper.java | 158 +-
.../freemarker/FreemarkerLanguageOutput.java | 5 +-
.../plc4x/language/c/CLanguageTemplateHelper.java | 66 +-
.../resources/templates/c/data-io-template.c.ftlh | 47 +-
.../resources/templates/c/data-io-template.h.ftlh | 9 +-
.../resources/templates/c/enum-template.c.ftlh | 37 +-
.../resources/templates/c/enum-template.h.ftlh | 6 +-
.../resources/templates/c/pojo-template.c.ftlh | 630 ++--
.../resources/templates/c/pojo-template.h.ftlh | 10 +-
code-generation/language-cs/pom.xml | 2 +-
.../language/cs/CsLanguageTemplateHelper.java | 47 +-
.../templates/cs/data-io-template.cs.ftlh | 56 +-
.../resources/templates/cs/enum-template.cs.ftlh | 2 +-
.../resources/templates/cs/io-template.cs.ftlh | 40 +-
.../resources/templates/cs/model-template.cs.ftlh | 20 +-
.../language/go/GoLanguageTemplateHelper.java | 53 +-
.../templates/go/data-io-template.go.ftlh | 42 +-
.../resources/templates/go/enum-template.go.ftlh | 52 +-
.../resources/templates/go/model-template.go.ftlh | 242 +-
.../templates/go/parser-factory-template.go.ftlh | 2 +-
.../go/xml-parser-factory-template.go.ftlh | 6 +-
.../plc4go/test/readwrite/model/StaticHelper.go | 68 +-
.../language/java/JavaLanguageTemplateHelper.java | 55 +-
.../templates/java/data-io-template.java.ftlh | 77 +-
.../templates/java/enum-template.java.ftlh | 59 +-
.../templates/java/model-template.java.ftlh | 99 +-
.../java/test/readwrite/utils/StaticHelper.java | 74 +
code-generation/pom.xml | 5 +
code-generation/protocol-base-mspec/pom.xml | 6 +
.../plugins/codegenerator/language/mspec/MSpec.g4 | 2 +-
.../language/mspec/LazyTypeDefinitionConsumer.java | 1 +
.../mspec/expression/ExpressionStringListener.java | 78 +-
.../mspec/model/definitions/DefaultArgument.java | 35 +-
.../definitions/DefaultComplexTypeDefinition.java | 34 +-
.../definitions/DefaultDataIoTypeDefinition.java | 23 +-
.../DefaultDiscriminatedComplexTypeDefinition.java | 14 +-
.../definitions/DefaultEnumTypeDefinition.java | 27 +-
.../model/definitions/DefaultTypeDefinition.java | 20 +-
.../mspec/model/fields/DefaultAbstractField.java | 4 +-
.../mspec/model/fields/DefaultArrayField.java | 20 +-
.../mspec/model/fields/DefaultAssertField.java | 7 +-
.../mspec/model/fields/DefaultChecksumField.java | 13 +-
.../mspec/model/fields/DefaultConstField.java | 5 +-
.../model/fields/DefaultDiscriminatorField.java | 5 +-
.../mspec/model/fields/DefaultEnumField.java | 7 +-
.../mspec/model/fields/DefaultImplicitField.java | 7 +-
.../model/fields/DefaultManualArrayField.java | 18 +-
.../mspec/model/fields/DefaultManualField.java | 7 +-
.../mspec/model/fields/DefaultOptionalField.java | 6 +-
.../mspec/model/fields/DefaultPaddingField.java | 9 +-
.../mspec/model/fields/DefaultPeekField.java | 5 +-
.../mspec/model/fields/DefaultReservedField.java | 7 +-
.../mspec/model/fields/DefaultSimpleField.java | 8 +-
.../mspec/model/fields/DefaultTypedField.java | 21 +-
.../mspec/model/fields/DefaultTypedNamedField.java | 5 +-
.../mspec/model/fields/DefaultUnknownField.java | 7 +-
.../mspec/model/fields/DefaultVirtualField.java | 4 +-
.../DefaultArrayTypeReference.java} | 19 +-
.../references/DefaultComplexTypeReference.java | 23 +-
...erence.java => DefaultDataIoTypeReference.java} | 40 +-
...eference.java => DefaultEnumTypeReference.java} | 38 +-
.../mspec/model/terms/DefaultVariableLiteral.java | 32 +-
.../mspec/parser/MessageFormatListener.java | 209 +-
.../mspec/parser/MessageFormatParserTest.java | 620 +++-
.../src/test/resources/logback.xml | 2 +-
.../src/test/resources/mspec.example3 | 20 +-
.../apache/plc4x/protocol/test/TestProtocol.java | 8 +-
.../src/main/resources/protocols/test/test.mspec | 25 +-
plc4c/generated-sources/modbus/src/data_item.c | 13 -
plc4c/generated-sources/modbus/src/modbus_pdu.c | 3168 ++++++++++----------
.../generated-sources/s7/include/transport_size.h | 6 +-
plc4c/generated-sources/s7/src/cotp_packet.c | 435 ++-
plc4c/generated-sources/s7/src/cotp_parameter.c | 175 +-
plc4c/generated-sources/s7/src/data_item.c | 23 -
plc4c/generated-sources/s7/src/s7_address.c | 225 +-
.../s7/src/s7_data_alarm_message.c | 318 +-
plc4c/generated-sources/s7/src/s7_message.c | 116 +-
plc4c/generated-sources/s7/src/s7_parameter.c | 689 +++--
.../s7/src/s7_parameter_user_data_item.c | 347 ++-
plc4c/generated-sources/s7/src/s7_payload.c | 308 +-
.../s7/src/s7_payload_user_data_item.c | 1705 +++++------
.../s7/src/s7_var_request_parameter_item.c | 56 +-
plc4c/generated-sources/s7/src/transport_size.c | 228 +-
plc4go/go.sum | 2 -
.../readwrite/model/CIPEncapsulationPacket.go | 2 +-
.../internal/plc4go/ads/readwrite/ParserHelper.go | 26 +-
.../plc4go/ads/readwrite/XmlParserHelper.go | 25 +-
.../plc4go/ads/readwrite/model/AdsReadResponse.go | 2 +-
.../ads/readwrite/model/AdsReadWriteRequest.go | 2 +-
.../ads/readwrite/model/AdsReadWriteResponse.go | 2 +-
.../ads/readwrite/model/AdsWriteControlRequest.go | 2 +-
.../plc4go/ads/readwrite/model/AdsWriteRequest.go | 2 +-
.../plc4go/ads/readwrite/model/AmsPacket.go | 4 +-
.../plc4go/ads/readwrite/model/AmsTCPPacket.go | 2 +-
.../bacnetip/readwrite/model/ApplicationTag.go | 200 --
.../readwrite/model/BACnetActionCommand.go | 8 +-
...edServiceRequestAtomicReadFileStreamOrRecord.go | 4 +-
...firmedServiceRequestConfirmedCOVNotification.go | 10 +-
...rmedServiceRequestConfirmedEventNotification.go | 16 +-
.../BACnetConfirmedServiceRequestReadProperty.go | 4 +-
...netConfirmedServiceRequestReinitializeDevice.go | 2 +-
.../BACnetConfirmedServiceRequestSubscribeCOV.go | 8 +-
.../BACnetConfirmedServiceRequestWriteProperty.go | 6 +-
.../readwrite/model/BACnetConstructedData.go | 4 +-
.../model/BACnetConstructedDataCommand.go | 4 +-
.../model/BACnetConstructedDataEventTimestamps.go | 4 +-
.../bacnetip/readwrite/model/BACnetDateTime.go | 4 +-
.../model/BACnetDeviceObjectPropertyReference.go | 8 +-
.../model/BACnetNotificationParameters.go | 4 +-
.../BACnetNotificationParametersBufferReady.go | 8 +-
...ACnetNotificationParametersChangeOfBitString.go | 6 +-
.../BACnetNotificationParametersChangeOfState.go | 4 +-
.../BACnetNotificationParametersChangeOfValue.go | 4 +-
...tNotificationParametersChangeOfValueNewValue.go | 4 +-
...onParametersChangeOfValueNewValueChangedBits.go | 2 +-
...nParametersChangeOfValueNewValueChangedValue.go | 2 +-
...BACnetNotificationParametersComplexEventType.go | 2 +-
.../model/BACnetNotificationParametersExtended.go | 8 +-
...CnetNotificationParametersExtendedParameters.go | 4 +-
.../BACnetNotificationParametersFloatingLimit.go | 10 +-
.../BACnetNotificationParametersOutOfRange.go | 10 +-
.../BACnetNotificationParametersUnsignedRange.go | 8 +-
.../readwrite/model/BACnetPropertyReference.go | 2 +-
.../readwrite/model/BACnetPropertyStates.go | 4 +-
.../readwrite/model/BACnetPropertyValue.go | 2 +-
.../readwrite/model/BACnetPropertyValues.go | 4 +-
.../model/BACnetReadAccessSpecification.go | 6 +-
...BACnetServiceAckAtomicReadFileStreamOrRecord.go | 4 +-
.../model/BACnetServiceAckAtomicWriteFile.go | 2 +-
.../model/BACnetServiceAckReadProperty.go | 4 +-
.../bacnetip/readwrite/model/BACnetStatusFlags.go | 2 +-
.../bacnetip/readwrite/model/BACnetTimeStamp.go | 4 +-
.../readwrite/model/BACnetTimeStampSequence.go | 2 +-
.../readwrite/model/BACnetTimeStampTime.go | 2 +-
...rmedServiceRequestUnconfirmedCOVNotification.go | 10 +-
...rmedServiceRequestUnconfirmedPrivateTransfer.go | 4 +-
.../plc4go/bacnetip/readwrite/model/BVLC.go | 2 +-
.../readwrite/model/DF1UnprotectedReadResponse.go | 7 +-
.../plc4go/eip/readwrite/model/CipExchange.go | 2 +-
.../eip/readwrite/model/CipUnconnectedRequest.go | 2 +-
.../plc4go/eip/readwrite/model/EipPacket.go | 2 +-
.../model/SysexCommandReportFirmwareResponse.go | 7 +-
.../plc4go/knxnetip/readwrite/ParserHelper.go | 10 +
.../knxnetip/readwrite/PropertyDataTypeIO.go | 157 -
.../plc4go/knxnetip/readwrite/XmlParserHelper.go | 11 +
.../readwrite/model/ApduDataMemoryResponse.go | 2 +-
.../model/ConnectionRequestInformation.go | 2 +-
.../readwrite/model/ConnectionResponseDataBlock.go | 2 +-
.../knxnetip/readwrite/model/DIBDeviceInfo.go | 2 +-
.../knxnetip/readwrite/model/DIBSuppSvcFamilies.go | 2 +-
.../model/DeviceConfigurationAckDataBlock.go | 2 +-
.../model/DeviceConfigurationRequestDataBlock.go | 2 +-
.../readwrite/model/HPAIControlEndpoint.go | 2 +-
.../knxnetip/readwrite/model/HPAIDataEndpoint.go | 2 +-
.../readwrite/model/HPAIDiscoveryEndpoint.go | 2 +-
.../knxnetip/readwrite/model/KnxManufacturer.go | 26 +-
.../knxnetip/readwrite/model/KnxNetIpMessage.go | 4 +-
.../knxnetip/readwrite/model/LDataExtended.go | 2 +-
.../readwrite/model/TunnelingRequestDataBlock.go | 2 +-
.../readwrite/model/TunnelingResponseDataBlock.go | 2 +-
.../plc4go/modbus/readwrite/ParserHelper.go | 7 +
.../plc4go/modbus/readwrite/XmlParserHelper.go | 8 +
.../model/ModbusDeviceInformationObject.go | 2 +-
.../model/ModbusPDUGetComEventLogResponse.go | 2 +-
.../readwrite/model/ModbusPDUReadCoilsResponse.go | 2 +-
.../ModbusPDUReadDeviceIdentificationResponse.go | 2 +-
.../model/ModbusPDUReadDiscreteInputsResponse.go | 2 +-
.../model/ModbusPDUReadFifoQueueResponse.go | 4 +-
.../model/ModbusPDUReadFileRecordRequest.go | 2 +-
.../model/ModbusPDUReadFileRecordResponse.go | 2 +-
.../model/ModbusPDUReadFileRecordResponseItem.go | 2 +-
.../model/ModbusPDUReadHoldingRegistersResponse.go | 2 +-
.../model/ModbusPDUReadInputRegistersResponse.go | 2 +-
...sPDUReadWriteMultipleHoldingRegistersRequest.go | 2 +-
...PDUReadWriteMultipleHoldingRegistersResponse.go | 2 +-
.../model/ModbusPDUReportServerIdResponse.go | 2 +-
.../model/ModbusPDUWriteFileRecordRequest.go | 2 +-
.../model/ModbusPDUWriteFileRecordRequestItem.go | 2 +-
.../model/ModbusPDUWriteFileRecordResponse.go | 2 +-
.../model/ModbusPDUWriteFileRecordResponseItem.go | 2 +-
.../model/ModbusPDUWriteMultipleCoilsRequest.go | 2 +-
...odbusPDUWriteMultipleHoldingRegistersRequest.go | 2 +-
.../plc4go/modbus/readwrite/model/ModbusTcpADU.go | 2 +-
.../internal/plc4go/s7/readwrite/ParserHelper.go | 68 +-
.../plc4go/s7/readwrite/XmlParserHelper.go | 73 +-
.../plc4go/s7/readwrite/model/COTPPacket.go | 2 +-
.../plc4go/s7/readwrite/model/COTPParameter.go | 2 +-
.../plc4go/s7/readwrite/model/S7Message.go | 4 +-
.../readwrite/model/S7ParameterModeTransition.go | 2 +-
.../readwrite/model/S7ParameterReadVarRequest.go | 2 +-
.../s7/readwrite/model/S7ParameterUserData.go | 2 +-
.../model/S7ParameterUserDataItemCPUFunctions.go | 2 +-
.../readwrite/model/S7ParameterWriteVarRequest.go | 2 +-
.../s7/readwrite/model/S7PayloadUserDataItem.go | 2 +-
.../S7PayloadUserDataItemCpuFunctionAlarmAck.go | 2 +-
...yloadUserDataItemCpuFunctionAlarmAckResponse.go | 2 +-
...ayloadUserDataItemCpuFunctionReadSzlResponse.go | 2 +-
.../s7/readwrite/model/S7VarPayloadDataItem.go | 2 +-
.../model/S7VarRequestParameterItemAddress.go | 2 +-
.../plc4go/s7/readwrite/model/TPKTPacket.go | 2 +-
.../plc4go/s7/readwrite/model/TransportSize.go | 126 +-
.../plc4go/simulated/readwrite/ParserHelper.go | 10 +
.../plc4go/simulated/readwrite/XmlParserHelper.go | 9 +
plc4go/internal/plc4go/spi/utils/CastUtils.go | 12 +
.../plc4x/java/knxnetip/ets5/Ets5Parser.java | 2 +-
.../opcua/src/test/resources/log4j.properties | 2 +-
plc4j/examples/hello-cloud-azure/pom.xml | 2 +-
plc4j/examples/hello-cloud-google/pom.xml | 2 +-
plc4j/examples/hello-connectivity-kafka/pom.xml | 2 +-
plc4j/examples/hello-connectivity-mqtt/pom.xml | 2 +-
plc4j/examples/hello-discovery/pom.xml | 2 +-
.../examples/hello-influx-data-collection/pom.xml | 2 +-
plc4j/examples/hello-integration-edgent/pom.xml | 2 +-
plc4j/examples/hello-integration-iotdb/pom.xml | 2 +-
plc4j/examples/hello-opm/pom.xml | 2 +-
plc4j/examples/hello-webapp/client/pom.xml | 5 +-
plc4j/examples/hello-webapp/pom.xml | 2 +-
plc4j/examples/hello-webapp/webapp/pom.xml | 11 +-
plc4j/examples/hello-webservice/pom.xml | 2 +-
plc4j/examples/hello-world-kotlin/pom.xml | 2 +-
.../hello-world-plc4x-subscription/pom.xml | 2 +-
plc4j/examples/hello-world-plc4x-write/pom.xml | 2 +-
plc4j/examples/hello-world-plc4x/pom.xml | 2 +-
plc4j/examples/plc4j-s7event/pom.xml | 3 +-
plc4j/examples/poll-loop/pom.xml | 13 +-
plc4j/pom.xml | 14 +
.../knxnetip/readwrite/model/KnxManufacturer.cs | 26 +-
pom.xml | 4 +-
.../s7/src/main/resources/protocols/s7/s7.mspec | 62 +-
229 files changed, 6591 insertions(+), 5929 deletions(-)
copy plc4go/internal/plc4go/spi/values/BOOL.go => code-generation/language-go/src/test/resources/plc4go/internal/plc4go/test/readwrite/model/StaticHelper.go (50%)
create mode 100644 code-generation/language-java/src/test/resources/integration-test/src/main/java/org/apache/plc4x/java/test/readwrite/utils/StaticHelper.java
copy code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/{fields/DefaultDiscriminatorField.java => references/DefaultArrayTypeReference.java} (65%)
copy code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/{DefaultComplexTypeReference.java => DefaultDataIoTypeReference.java} (61%)
copy code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/references/{DefaultComplexTypeReference.java => DefaultEnumTypeReference.java} (66%)
copy {plc4j/drivers/opcua => code-generation/protocol-base-mspec}/src/test/resources/logback.xml (97%)
delete mode 100644 plc4go/internal/plc4go/bacnetip/readwrite/model/ApplicationTag.go
delete mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/PropertyDataTypeIO.go