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
The following commit(s) were added to refs/heads/develop by this push:
new fd21d83c75 chore: updated generated code
fd21d83c75 is described below
commit fd21d83c7573aac04035340887efc630251e7373
Author: Christofer Dutz <[email protected]>
AuthorDate: Wed Apr 9 22:30:03 2025 +0200
chore: updated generated code
---
README.md | 3 +
.../knxnetip/readwrite/model/KnxManufacturer.go | 42 ++++--
.../java/knxnetip/readwrite/KnxManufacturer.java | 7 +-
.../java/opcua/readwrite/ExtensionHeader.java | 143 ---------------------
.../knxnetip/readwrite/model/KnxManufacturer.cs | 27 ++--
.../protocols/knxnetip/knx-master-data.mspec | 7 +-
6 files changed, 57 insertions(+), 172 deletions(-)
diff --git a/README.md b/README.md
index aaf28225e8..8f30431692 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,9 @@ All requirements are retrieved by the build itself
### Building with Docker
+Part of the build requires quite a bit of ram.
+Before running the Docker build, please ensure that the Docker runtime has at
least 12GB of ram available.
+
If you don't want to bother setting up the environment on your normal system,
and you have Docker installed, you can also build everything in a Docker
container:
```
diff --git a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
index d0b4a9ed81..0a57c38822 100644
--- a/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
+++ b/plc4go/protocols/knxnetip/readwrite/model/KnxManufacturer.go
@@ -80,7 +80,7 @@ const (
KnxManufacturer_M_ZUMTOBEL
KnxManufacturer = 34
KnxManufacturer_M_HOLEC_SYSTEMEN
KnxManufacturer = 35
KnxManufacturer_M_PHOENIX_CONTACT
KnxManufacturer = 36
- KnxManufacturer_M_WAGO_KONTAKTTECHNIK
KnxManufacturer = 37
+ KnxManufacturer_M_WAGO_GMBH_AND_CO_KG
KnxManufacturer = 37
KnxManufacturer_M_KNXPRESSO
KnxManufacturer = 38
KnxManufacturer_M_WIELAND_ELECTRIC
KnxManufacturer = 39
KnxManufacturer_M_HERMANN_KLEINHUIS
KnxManufacturer = 40
@@ -766,8 +766,9 @@ const (
KnxManufacturer_M_MICRO_TEK_SRL_F_M_C_TRADE_MARK
KnxManufacturer = 720
KnxManufacturer_M_ORENDA_ELECTRIC
KnxManufacturer = 721
KnxManufacturer_M_ERSE_KABLO
KnxManufacturer = 722
- KnxManufacturer_M_ABB___RESERVED
KnxManufacturer = 723
- KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED
KnxManufacturer = 724
+ KnxManufacturer_M_PRADO_EUROPE_BV
KnxManufacturer = 723
+ KnxManufacturer_M_ABB___RESERVED
KnxManufacturer = 724
+ KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED
KnxManufacturer = 725
)
var KnxManufacturerValues []KnxManufacturer
@@ -812,7 +813,7 @@ func init() {
KnxManufacturer_M_ZUMTOBEL,
KnxManufacturer_M_HOLEC_SYSTEMEN,
KnxManufacturer_M_PHOENIX_CONTACT,
- KnxManufacturer_M_WAGO_KONTAKTTECHNIK,
+ KnxManufacturer_M_WAGO_GMBH_AND_CO_KG,
KnxManufacturer_M_KNXPRESSO,
KnxManufacturer_M_WIELAND_ELECTRIC,
KnxManufacturer_M_HERMANN_KLEINHUIS,
@@ -1498,6 +1499,7 @@ func init() {
KnxManufacturer_M_MICRO_TEK_SRL_F_M_C_TRADE_MARK,
KnxManufacturer_M_ORENDA_ELECTRIC,
KnxManufacturer_M_ERSE_KABLO,
+ KnxManufacturer_M_PRADO_EUROPE_BV,
KnxManufacturer_M_ABB___RESERVED,
KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED,
}
@@ -4283,10 +4285,14 @@ func (e KnxManufacturer) Number() uint16 {
}
case 723:
{ /* '723' */
- return 43954
+ return 784
}
case 724:
{ /* '724' */
+ return 43954
+ }
+ case 725:
+ { /* '725' */
return 43959
}
case 73:
@@ -5629,7 +5635,7 @@ func (e KnxManufacturer) Name() string {
}
case 37:
{ /* '37' */
- return "WAGO Kontakttechnik"
+ return "WAGO GmbH & Co.KG"
}
case 370:
{ /* '370' */
@@ -7201,10 +7207,14 @@ func (e KnxManufacturer) Name() string {
}
case 723:
{ /* '723' */
- return "ABB - reserved"
+ return "prado europe bv"
}
case 724:
{ /* '724' */
+ return "ABB - reserved"
+ }
+ case 725:
+ { /* '725' */
return "Busch-Jaeger Elektro - reserved"
}
case 73:
@@ -7943,7 +7953,7 @@ func KnxManufacturerByValue(value uint16) (enum
KnxManufacturer, ok bool) {
case 369:
return KnxManufacturer_M_UBEE_INTERACTIVE_EUROPE, true
case 37:
- return KnxManufacturer_M_WAGO_KONTAKTTECHNIK, true
+ return KnxManufacturer_M_WAGO_GMBH_AND_CO_KG, true
case 370:
return KnxManufacturer_M_REXEL, true
case 371:
@@ -8729,8 +8739,10 @@ func KnxManufacturerByValue(value uint16) (enum
KnxManufacturer, ok bool) {
case 722:
return KnxManufacturer_M_ERSE_KABLO, true
case 723:
- return KnxManufacturer_M_ABB___RESERVED, true
+ return KnxManufacturer_M_PRADO_EUROPE_BV, true
case 724:
+ return KnxManufacturer_M_ABB___RESERVED, true
+ case 725:
return KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED, true
case 73:
return KnxManufacturer_M_AGFEO, true
@@ -9398,8 +9410,8 @@ func KnxManufacturerByName(value string) (enum
KnxManufacturer, ok bool) {
return KnxManufacturer_M_SABIANA_SPA, true
case "M_UBEE_INTERACTIVE_EUROPE":
return KnxManufacturer_M_UBEE_INTERACTIVE_EUROPE, true
- case "M_WAGO_KONTAKTTECHNIK":
- return KnxManufacturer_M_WAGO_KONTAKTTECHNIK, true
+ case "M_WAGO_GMBH_AND_CO_KG":
+ return KnxManufacturer_M_WAGO_GMBH_AND_CO_KG, true
case "M_REXEL":
return KnxManufacturer_M_REXEL, true
case "M_GES_TEKNIK_A_S_":
@@ -10184,6 +10196,8 @@ func KnxManufacturerByName(value string) (enum
KnxManufacturer, ok bool) {
return KnxManufacturer_M_ORENDA_ELECTRIC, true
case "M_ERSE_KABLO":
return KnxManufacturer_M_ERSE_KABLO, true
+ case "M_PRADO_EUROPE_BV":
+ return KnxManufacturer_M_PRADO_EUROPE_BV, true
case "M_ABB___RESERVED":
return KnxManufacturer_M_ABB___RESERVED, true
case "M_BUSCH_JAEGER_ELEKTRO___RESERVED":
@@ -10926,8 +10940,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_SABIANA_SPA"
case KnxManufacturer_M_UBEE_INTERACTIVE_EUROPE:
return "M_UBEE_INTERACTIVE_EUROPE"
- case KnxManufacturer_M_WAGO_KONTAKTTECHNIK:
- return "M_WAGO_KONTAKTTECHNIK"
+ case KnxManufacturer_M_WAGO_GMBH_AND_CO_KG:
+ return "M_WAGO_GMBH_AND_CO_KG"
case KnxManufacturer_M_REXEL:
return "M_REXEL"
case KnxManufacturer_M_GES_TEKNIK_A_S_:
@@ -11712,6 +11726,8 @@ func (e KnxManufacturer) PLC4XEnumName() string {
return "M_ORENDA_ELECTRIC"
case KnxManufacturer_M_ERSE_KABLO:
return "M_ERSE_KABLO"
+ case KnxManufacturer_M_PRADO_EUROPE_BV:
+ return "M_PRADO_EUROPE_BV"
case KnxManufacturer_M_ABB___RESERVED:
return "M_ABB___RESERVED"
case KnxManufacturer_M_BUSCH_JAEGER_ELEKTRO___RESERVED:
diff --git
a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
index 733e11ebb3..95403aa7c5 100644
---
a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
+++
b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java
@@ -63,7 +63,7 @@ public enum KnxManufacturer {
M_ZUMTOBEL((int) 34, (int) 55, (String) "ZUMTOBEL"),
M_HOLEC_SYSTEMEN((int) 35, (int) 56, (String) "HOLEC Systemen"),
M_PHOENIX_CONTACT((int) 36, (int) 57, (String) "Phoenix Contact"),
- M_WAGO_KONTAKTTECHNIK((int) 37, (int) 61, (String) "WAGO Kontakttechnik"),
+ M_WAGO_GMBH_AND_CO_KG((int) 37, (int) 61, (String) "WAGO GmbH & Co.KG"),
M_KNXPRESSO((int) 38, (int) 62, (String) "knXpresso"),
M_WIELAND_ELECTRIC((int) 39, (int) 66, (String) "Wieland Electric"),
M_HERMANN_KLEINHUIS((int) 40, (int) 67, (String) "Hermann Kleinhuis"),
@@ -843,9 +843,10 @@ public enum KnxManufacturer {
(int) 720, (int) 781, (String) "Micro Tek Srl (F.M.C trade mark)"),
M_ORENDA_ELECTRIC((int) 721, (int) 782, (String) "Orenda Electric"),
M_ERSE_KABLO((int) 722, (int) 783, (String) "ERSE KABLO"),
- M_ABB___RESERVED((int) 723, (int) 43954, (String) "ABB - reserved"),
+ M_PRADO_EUROPE_BV((int) 723, (int) 784, (String) "prado europe bv"),
+ M_ABB___RESERVED((int) 724, (int) 43954, (String) "ABB - reserved"),
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
- (int) 724, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
+ (int) 725, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
private static final Map<Integer, KnxManufacturer> map;
static {
diff --git
a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionHeader.java
b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionHeader.java
deleted file mode 100644
index 240f479a85..0000000000
---
a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ExtensionHeader.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.plc4x.java.opcua.readwrite;
-
-import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
-import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
-import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
-
-import java.time.*;
-import java.util.*;
-import org.apache.plc4x.java.api.exceptions.*;
-import org.apache.plc4x.java.api.value.*;
-import org.apache.plc4x.java.spi.codegen.*;
-import org.apache.plc4x.java.spi.codegen.fields.*;
-import org.apache.plc4x.java.spi.codegen.io.*;
-import org.apache.plc4x.java.spi.generation.*;
-
-// Code generated by code-generation. DO NOT EDIT.
-
-public class ExtensionHeader implements Message {
-
- // Properties.
- protected final boolean xmlbody;
- protected final boolean binaryBody;
-
- public ExtensionHeader(boolean xmlbody, boolean binaryBody) {
- super();
- this.xmlbody = xmlbody;
- this.binaryBody = binaryBody;
- }
-
- public boolean getXmlbody() {
- return xmlbody;
- }
-
- public boolean getBinaryBody() {
- return binaryBody;
- }
-
- public void serialize(WriteBuffer writeBuffer) throws SerializationException
{
- PositionAware positionAware = writeBuffer;
- boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
- writeBuffer.pushContext("ExtensionHeader");
-
- // Reserved Field (reserved)
- writeReservedField("reserved", (byte) 0x00, writeSignedByte(writeBuffer,
5));
-
- // Simple Field (xmlbody)
- writeSimpleField("xmlbody", xmlbody, writeBoolean(writeBuffer));
-
- // Simple Field (binaryBody)
- writeSimpleField("binaryBody", binaryBody, writeBoolean(writeBuffer));
-
- writeBuffer.popContext("ExtensionHeader");
- }
-
- @Override
- public int getLengthInBytes() {
- return (int) Math.ceil((float) getLengthInBits() / 8.0);
- }
-
- @Override
- public int getLengthInBits() {
- int lengthInBits = 0;
- ExtensionHeader _value = this;
- boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
- // Reserved Field (reserved)
- lengthInBits += 5;
-
- // Simple field (xmlbody)
- lengthInBits += 1;
-
- // Simple field (binaryBody)
- lengthInBits += 1;
-
- return lengthInBits;
- }
-
- public static ExtensionHeader staticParse(ReadBuffer readBuffer) throws
ParseException {
- readBuffer.pullContext("ExtensionHeader");
- PositionAware positionAware = readBuffer;
- boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-
- Byte reservedField0 = readReservedField("reserved",
readSignedByte(readBuffer, 5), (byte) 0x00);
-
- boolean xmlbody = readSimpleField("xmlbody", readBoolean(readBuffer));
-
- boolean binaryBody = readSimpleField("binaryBody",
readBoolean(readBuffer));
-
- readBuffer.closeContext("ExtensionHeader");
- // Create the instance
- ExtensionHeader _extensionHeader;
- _extensionHeader = new ExtensionHeader(xmlbody, binaryBody);
- return _extensionHeader;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (!(o instanceof ExtensionHeader)) {
- return false;
- }
- ExtensionHeader that = (ExtensionHeader) o;
- return (getXmlbody() == that.getXmlbody()) && (getBinaryBody() ==
that.getBinaryBody()) && true;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(getXmlbody(), getBinaryBody());
- }
-
- @Override
- public String toString() {
- WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true,
true);
- try {
- writeBufferBoxBased.writeSerializable(this);
- } catch (SerializationException e) {
- throw new RuntimeException(e);
- }
- return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
- }
-}
diff --git
a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
index b71ef0e8d4..aacb73dd72 100644
---
a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++
b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -61,7 +61,7 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_ZUMTOBEL = 34,
M_HOLEC_SYSTEMEN = 35,
M_PHOENIX_CONTACT = 36,
- M_WAGO_KONTAKTTECHNIK = 37,
+ M_WAGO_GMBH_AND_CO_KG = 37,
M_KNXPRESSO = 38,
M_WIELAND_ELECTRIC = 39,
M_HERMANN_KLEINHUIS = 40,
@@ -747,8 +747,9 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
M_MICRO_TEK_SRL_F_M_C_TRADE_MARK = 720,
M_ORENDA_ELECTRIC = 721,
M_ERSE_KABLO = 722,
- M_ABB___RESERVED = 723,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 724,
+ M_PRADO_EUROPE_BV = 723,
+ M_ABB___RESERVED = 724,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 725,
}
public static class KnxManufacturerInfo
@@ -1661,7 +1662,7 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_UBEE_INTERACTIVE_EUROPE: { /* '369' */
return 420;
}
- case KnxManufacturer.M_WAGO_KONTAKTTECHNIK: { /* '37' */
+ case KnxManufacturer.M_WAGO_GMBH_AND_CO_KG: { /* '37' */
return 61;
}
case KnxManufacturer.M_REXEL: { /* '370' */
@@ -2840,10 +2841,13 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_ERSE_KABLO: { /* '722' */
return 783;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '723' */
+ case KnxManufacturer.M_PRADO_EUROPE_BV: { /* '723' */
+ return 784;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '724' */
return 43954;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'724' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'725' */
return 43959;
}
case KnxManufacturer.M_AGFEO: { /* '73' */
@@ -3846,8 +3850,8 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_UBEE_INTERACTIVE_EUROPE: { /* '369' */
return "Ubee Interactive Europe";
}
- case KnxManufacturer.M_WAGO_KONTAKTTECHNIK: { /* '37' */
- return "WAGO Kontakttechnik";
+ case KnxManufacturer.M_WAGO_GMBH_AND_CO_KG: { /* '37' */
+ return "WAGO GmbH & Co.KG";
}
case KnxManufacturer.M_REXEL: { /* '370' */
return "Rexel";
@@ -5025,10 +5029,13 @@ namespace
org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_ERSE_KABLO: { /* '722' */
return "ERSE KABLO";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '723' */
+ case KnxManufacturer.M_PRADO_EUROPE_BV: { /* '723' */
+ return "prado europe bv";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '724' */
return "ABB - reserved";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'724' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /*
'725' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_AGFEO: { /* '73' */
diff --git
a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
index 1c4f0019e1..52c191ee7d 100644
---
a/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
+++
b/protocols/knxnetip/src/main/generated/protocols/knxnetip/knx-master-data.mspec
@@ -786,7 +786,7 @@
['34' M_ZUMTOBEL ['55', '"ZUMTOBEL"']]
['35' M_HOLEC_SYSTEMEN ['56', '"HOLEC Systemen"']]
['36' M_PHOENIX_CONTACT ['57', '"Phoenix Contact"']]
- ['37' M_WAGO_KONTAKTTECHNIK ['61', '"WAGO Kontakttechnik"']]
+ ['37' M_WAGO_GMBH_AND_CO_KG ['61', '"WAGO GmbH & Co.KG"']]
['38' M_KNXPRESSO ['62', '"knXpresso"']]
['39' M_WIELAND_ELECTRIC ['66', '"Wieland Electric"']]
['40' M_HERMANN_KLEINHUIS ['67', '"Hermann Kleinhuis"']]
@@ -1472,8 +1472,9 @@
['720' M_MICRO_TEK_SRL_F_M_C_TRADE_MARK ['781', '"Micro Tek Srl (F.M.C
trade mark)"']]
['721' M_ORENDA_ELECTRIC ['782', '"Orenda Electric"']]
['722' M_ERSE_KABLO ['783', '"ERSE KABLO"']]
- ['723' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
- ['724' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro
- reserved"']]
+ ['723' M_PRADO_EUROPE_BV ['784', '"prado europe bv"']]
+ ['724' M_ABB___RESERVED ['43954', '"ABB - reserved"']]
+ ['725' M_BUSCH_JAEGER_ELEKTRO___RESERVED ['43959', '"Busch-Jaeger Elektro
- reserved"']]
]
