Skip to content

Commit 3df49d3

Browse files
chrisdutzchrisdutz
committed
Merge branch 'develop' into refactor/spi3
# Conflicts: # plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java # plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionObjectDefinition.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesDataType.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesMethod.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesObject.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableAdd.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableAlias.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableAliases.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableAnalog.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableBase.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableDelete.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableFind.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableI.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableIetf.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableLog.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableOpc.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableServer.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableTag.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableTopics.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaNodeIdServicesVariableType.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/OpcuaStatusCode.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Variant.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantBoolean.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByte.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByteString.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDataValue.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDateTime.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDiagnosticInfo.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDouble.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExpandedNodeId.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExtensionObject.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantFloat.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantGuid.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt16.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt32.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt64.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantLocalizedText.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantNodeId.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantNull.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantQualifiedName.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantSByte.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantStatusCode.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantString.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt16.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt32.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt64.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantVariant.java # plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantXmlElement.java # plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/WithOption.java # plc4j/spi/values/src/main/java/org/apache/plc4x/java/spi/values/DefaultPlcValueHandler.java # plc4j/utils/test-utils/src/main/java/org/apache/plc4x/test/manual/ManualTest.java # protocols/bacnetip/src/main/generated/protocols/bacnetip/bacnet-vendorids.mspec
2 parents 58aec26 + e500266 commit 3df49d3

445 files changed

Lines changed: 28071 additions & 7715 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/go-platform-test-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fail-fast: false
3737
runs-on: ${{ matrix.os }}
3838
steps:
39-
- uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.0
39+
- uses: dorny/test-reporter@a43b3a5f7366b97d083190328d2c652e1a8b6aa2 # v3.0.0
4040
with:
4141
artifact: "golang-test-report-${{ matrix.os }}"
4242
name: "Golang Tests (OS: ${{ matrix.os }})"

‎.github/workflows/go-platform.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-go,enable-all-checks,update-generated-code' -pl :plc4go -am ${{ steps.platform_opts.outputs.platform_opts }} install
177177
178178
- name: Upload Test Report (first failure)
179-
uses: actions/upload-artifact@v6
179+
uses: actions/upload-artifact@v7
180180
if: failure()
181181
with:
182182
name: "golang-test-report-first-failure-${{ matrix.os }}"
@@ -189,7 +189,7 @@ jobs:
189189
run: ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-go,skip-bacnet-regression-test,update-generated-code' -pl :plc4go -am ${{ steps.platform_opts.outputs.platform_opts }} install
190190

191191
- name: Upload Test Report
192-
uses: actions/upload-artifact@v6
192+
uses: actions/upload-artifact@v7
193193
if: success() || failure()
194194
with:
195195
name: "golang-test-report-${{ matrix.os }}"

‎.github/workflows/java-platform-test-report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
fail-fast: false
3939
runs-on: ${{ matrix.os }}
4040
steps:
41-
- uses: dorny/test-reporter@b082adf0eced0765477756c2a610396589b8c637 # v2.5.0
41+
- uses: dorny/test-reporter@a43b3a5f7366b97d083190328d2c652e1a8b6aa2 # v3.0.0
4242
with:
4343
artifact: "java-test-report-${{ matrix.os }}-java-${{ matrix.java }}"
4444
name: "Java Tests (OS: ${{ matrix.os }}, Java: ${{ matrix.java }})"

‎.github/workflows/java-platform.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-java,enable-all-checks,update-generated-code' ${{ steps.platform_opts.outputs.platform_opts }} install
130130
131131
- name: Upload Test Report (first failure)
132-
uses: actions/upload-artifact@v6
132+
uses: actions/upload-artifact@v7
133133
if: failure()
134134
with:
135135
name: "java-test-report-first-failure-${{ matrix.os }}-java-${{ matrix.java }}"
@@ -142,7 +142,7 @@ jobs:
142142
run: ./mvnw${{ steps.platform_suffix.outputs.platform_suffix }} ${{ steps.extra_options.outputs.extra_options }} -B -P'with-java,skip-bacnet-regression-test,update-generated-code' ${{ steps.platform_opts.outputs.platform_opts }} install
143143

144144
- name: Upload Test Report
145-
uses: actions/upload-artifact@v6
145+
uses: actions/upload-artifact@v7
146146
if: success() || failure()
147147
with:
148148
name: "java-test-report-${{ matrix.os }}-java-${{ matrix.java }}"

‎.github/workflows/release-drafter.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ on:
2222
push:
2323
branches:
2424
- develop
25-
# pull_request event is required only for autolabeler
26-
pull_request:
27-
# Only following types are handled by the action, but one can default to all as well
28-
types: [opened, reopened, synchronize]
29-
# pull_request_target event is required for autolabeler to support PRs from forks
30-
# pull_request_target:
31-
# types: [opened, reopened, synchronize]
3225

3326
permissions:
3427
contents: read
@@ -52,7 +45,7 @@ jobs:
5245
# echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
5346

5447
# Drafts your next Release notes as Pull Requests are merged into "master"
55-
- uses: release-drafter/release-drafter@v6
48+
- uses: release-drafter/release-drafter@v7
5649
# (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
5750
# with:
5851
# config-name: my-config.yml

‎.mvn/extensions.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<extension>
2222
<groupId>com.gradle</groupId>
2323
<artifactId>develocity-maven-extension</artifactId>
24-
<version>2.3.3</version>
24+
<version>2.4.0</version>
2525
</extension>
2626
<extension>
2727
<groupId>com.gradle</groupId>
2828
<artifactId>common-custom-user-data-maven-extension</artifactId>
29-
<version>2.1.0</version>
29+
<version>2.2.0</version>
3030
</extension>
3131
</extensions>

‎RELEASE_NOTES‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ New Features
1111
providing a min time interval to prevent excessive
1212
notifications.
1313
- Added a new PlcCertificateAuthentication to the API module.
14+
- Initial version of a new Java UMAS driver.
1415

1516
Incompatible changes
1617
--------------------

‎code-generation/language/go/src/main/resources/templates/go/complex-type-template.go.ftlh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,11 @@ func (m *_${type.name}) GetLengthInBits(ctx context.Context) uint16 {
831831

832832
<#if type.isDiscriminatedParentTypeDefinition()>
833833
func (m *_${type.name}) getLengthInBits(ctx context.Context) uint16 {
834+
<#if type.parentType.isPresent()>
835+
lengthInBits := uint16(m.${type.getParentType().orElseThrow().name}Contract.(*_${type.getParentType().orElseThrow().name}).getLengthInBits(ctx))
836+
<#else>
834837
lengthInBits := uint16(0)
838+
</#if>
835839
<#list type.fields as field>
836840
<#switch field.typeName>
837841
<#case "array">
@@ -1609,7 +1613,7 @@ func (m *_${type.name}) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
16091613
ctx,
16101614
"${optionalField.name}",
16111615
"${helper.getLanguageTypeNameForField(field)}",
1612-
<#if typedField.type.isComplexTypeReference()>GetRef(</#if>m.Get${optionalField.name?cap_first}()<#if typedField.type.isComplexTypeReference()>)</#if>,
1616+
<#if typedField.type.isComplexTypeReference()>new(</#if>m.Get${optionalField.name?cap_first}()<#if typedField.type.isComplexTypeReference()>)</#if>,
16131617
${helper.getEnumDataWriterCall(optionalField.type, optionalField.name, "value")}
16141618
<#if optionalField.conditionExpression.present>
16151619
, ${helper.toSerializationExpression(optionalField, helper.boolTypeReference, optionalField.conditionExpression.get(), parserArguments)}
@@ -1620,7 +1624,7 @@ func (m *_${type.name}) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
16201624
WriteOptionalField(
16211625
ctx,
16221626
"${optionalField.name}",
1623-
<#if typedField.type.isComplexTypeReference()>GetRef(</#if>m.Get${optionalField.name?cap_first}()<#if typedField.type.isComplexTypeReference()>)</#if>,
1627+
<#if typedField.type.isComplexTypeReference()>new(</#if>m.Get${optionalField.name?cap_first}()<#if typedField.type.isComplexTypeReference()>)</#if>,
16241628
WriteDataIO(writeBuffer,
16251629
func (wb utils.WriteBuffer, val any) error {
16261630
return ${optionalField.type.asComplexTypeReference().orElseThrow().name}.
@@ -1644,7 +1648,7 @@ func (m *_${type.name}) SerializeWithWriteBuffer(ctx context.Context, writeBuffe
16441648
WriteOptionalField[${helper.getLanguageTypeNameForField(field)}](
16451649
ctx,
16461650
"${optionalField.name}",
1647-
<#if typedField.type.isComplexTypeReference()>GetRef(</#if>m.Get${optionalField.name?cap_first}()<#if typedField.type.isComplexTypeReference()>)</#if>,
1651+
<#if typedField.type.isComplexTypeReference()>new(</#if>m.Get${optionalField.name?cap_first}()<#if typedField.type.isComplexTypeReference()>)</#if>,
16481652
${helper.getDataWriterCall(typedField.type, optionalField.name)},
16491653
<#if helper.isGeneratePropertiesForParserArguments() && optionalField.conditionExpression.present>
16501654
${helper.toSerializationExpression(optionalField, helper.boolTypeReference, optionalField.conditionExpression.get(), parserArguments)}

‎code-generation/language/go/src/test/resources/plc4go/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//
1919
module github.com/apache/plc4x/plc4go
2020

21-
go 1.23
21+
go 1.26
2222

2323
require (
2424
github.com/ajankovic/xdiff v0.0.1

0 commit comments

Comments
 (0)