Skip to content

Commit 8ecba71

Browse files
sruehlsruehl
committed
fix(plc4j/opcua): should compile now again
1 parent 91c8849 commit 8ecba71

39 files changed

Lines changed: 5368 additions & 10 deletions

File tree

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,8 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
272272
writeByteArrayField("${namedField.name}", ${namedField.name}, writeByteArray(writeBuffer, 8)${helper.getFieldOptions(typedField, parserArguments)});
273273
<#elseif arrayField.type.elementTypeReference.isSimpleTypeReference()>
274274
writeSimpleTypeArrayField("${namedField.name}", ${namedField.name}, ${helper.getDataWriterCall(arrayField.type.elementTypeReference, namedField.name)}${helper.getFieldOptions(typedField, parserArguments)});
275+
<#elseif arrayField.type.elementTypeReference.isEnumTypeReference()>
276+
writeSimpleTypeArrayField("${namedField.name}", ${namedField.name}, ${helper.getEnumDataWriterCall(arrayField.type.elementTypeReference.asEnumTypeReference().orElseThrow(), namedField.name, "value")}${helper.getFieldOptions(typedField, parserArguments)});
275277
<#else>
276278
writeComplexTypeArrayField("${namedField.name}", ${namedField.name}, writeBuffer${helper.getFieldOptions(typedField, parserArguments)});
277279
</#if>
@@ -298,15 +300,15 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
298300
<#assign namedField = field.asNamedField().orElseThrow()>
299301

300302
// Discriminator Field (${discriminatorField.name}) (Used as input to a switch field)
301-
<#if typedField.type.isEnumTypeReference()>writeDiscriminatorEnumField("${namedField.name}", "${helper.getLanguageTypeNameForField(field)}", get${discriminatorField.name?cap_first}(), ${helper.getEnumDataWriterCall(typedField.type, namedField.name, "value")}${helper.getFieldOptions(typedField, parserArguments)});<#else>writeDiscriminatorField("${namedField.name}", get${discriminatorField.name?cap_first}(), ${helper.getDataWriterCall(typedField.type, namedField.name)}${helper.getFieldOptions(typedField, parserArguments)});</#if>
303+
<#if typedField.type.isEnumTypeReference()>writeDiscriminatorEnumField("${namedField.name}", "${helper.getLanguageTypeNameForField(field)}", get${discriminatorField.name?cap_first}(), ${helper.getEnumDataWriterCall(typedField.type.asEnumTypeReference().orElseThrow(), namedField.name, "value")}${helper.getFieldOptions(typedField, parserArguments)});<#else>writeDiscriminatorField("${namedField.name}", get${discriminatorField.name?cap_first}(), ${helper.getDataWriterCall(typedField.type, namedField.name)}${helper.getFieldOptions(typedField, parserArguments)});</#if>
302304
<#break>
303305
<#case "enum">
304306
<#assign enumField = field.asEnumField().orElseThrow()>
305307
<#assign typedField = field.asTypedField().orElseThrow()>
306308
<#assign namedField = field.asNamedField().orElseThrow()>
307309

308310
// Enum field (${namedField.name})
309-
writeEnumField("${namedField.name}", "${helper.getLanguageTypeNameForField(field)}", ${namedField.name}, ${helper.getEnumDataWriterCall(typedField.type, namedField.name, enumField.fieldName)}${helper.getFieldOptions(typedField, parserArguments)});
311+
writeEnumField("${namedField.name}", "${helper.getLanguageTypeNameForField(field)}", ${namedField.name}, ${helper.getEnumDataWriterCall(typedField.type.asEnumTypeReference().orElseThrow(), namedField.name, enumField.fieldName)}${helper.getFieldOptions(typedField, parserArguments)});
310312
<#break>
311313
<#case "implicit">
312314
<#assign implicitField = field.asImplicitField().orElseThrow()>
@@ -341,7 +343,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
341343

342344
// Optional Field (${optionalField.name}) (Can be skipped, if the value is null)
343345
<#if optionalField.type.isEnumTypeReference()>
344-
writeOptionalEnumField("${optionalField.name}", "${helper.getLanguageTypeNameForField(field)}", ${optionalField.name}, ${helper.getEnumDataWriterCall(optionalField.type, optionalField.name, "value")}<#if optionalField.conditionExpression.present>, ${helper.toSerializationExpression(optionalField, helper.boolTypeReference, optionalField.conditionExpression.get(), parserArguments)}</#if>${helper.getFieldOptions(typedField, parserArguments)});
346+
writeOptionalEnumField("${optionalField.name}", "${helper.getLanguageTypeNameForField(field)}", ${optionalField.name}, ${helper.getEnumDataWriterCall(optionalField.type.asEnumTypeReference().orElseThrow(), optionalField.name, "value")}<#if optionalField.conditionExpression.present>, ${helper.toSerializationExpression(optionalField, helper.boolTypeReference, optionalField.conditionExpression.get(), parserArguments)}</#if>${helper.getFieldOptions(typedField, parserArguments)});
345347
<#elseif optionalField.type.isDataIoTypeReference()>
346348
writeOptionalField("${optionalField.name}", ${optionalField.name}, writeDataIO(writeBuffer, (wb, val) -> ${optionalField.type.asComplexTypeReference().orElseThrow().name}.staticSerialize(wb, val<#if optionalField.type.asComplexTypeReference().orElseThrow().params?has_content>, <#list optionalField.type.asComplexTypeReference().orElseThrow().params.orElseThrow() as param>${helper.toParseExpression(optionalField, helper.anyTypeReference, param, parserArguments)}<#sep>, </#sep></#list></#if>))<#if optionalField.conditionExpression.present>, ${helper.toSerializationExpression(optionalField, helper.boolTypeReference, optionalField.conditionExpression.get(), parserArguments)}</#if>${helper.getFieldOptions(typedField, parserArguments)});
347349
<#else>
@@ -369,7 +371,7 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
369371

370372
// Simple Field (${namedField.name})
371373
<#if typedField.type.isEnumTypeReference()>
372-
writeSimpleEnumField("${simpleField.name}", "${helper.getLanguageTypeNameForField(field)}", ${simpleField.name}, ${helper.getEnumDataWriterCall(simpleField.type, simpleField.name, "value")}${helper.getFieldOptions(typedField, parserArguments)});
374+
writeSimpleEnumField("${simpleField.name}", "${helper.getLanguageTypeNameForField(field)}", ${simpleField.name}, ${helper.getEnumDataWriterCall(simpleField.type.asEnumTypeReference().orElseThrow(), simpleField.name, "value")}${helper.getFieldOptions(typedField, parserArguments)});
373375
<#elseif simpleField.type.isDataIoTypeReference()>
374376
writeSimpleField("${simpleField.name}", ${simpleField.name}, new DataWriterDataIoDefault(writeBuffer, (wb, val) -> ${simpleField.type.asComplexTypeReference().orElseThrow().name}.staticSerialize(wb, val<#if simpleField.type.asComplexTypeReference().orElseThrow().params?has_content>, <#list simpleField.type.asComplexTypeReference().orElseThrow().params.orElseThrow() as param>${helper.toParseExpression(simpleField, helper.anyTypeReference, param, parserArguments)}<#sep>, </#sep></#list></#if>${helper.getFieldOptions(typedField, parserArguments)})));
375377
<#else>
@@ -429,6 +431,9 @@ public<#if type.isDiscriminatedParentTypeDefinition()> abstract</#if> class ${ty
429431
<#else>
430432
lengthInBits += ${simpleTypeReference.sizeInBits} * ${arrayField.name}.<#if arrayElementTypeReference.isByteBased()>length<#else>size()</#if>;
431433
</#if>
434+
<#elseif arrayElementTypeReference.isEnumTypeReference()>
435+
<#assign enumgTypeReference = arrayElementTypeReference.asEnumTypeReference().orElseThrow()>
436+
lengthInBits += ${enumgTypeReference.getBaseTypeReference().orElseThrow().sizeInBits} * ${arrayField.name}.<#if arrayElementTypeReference.isByteBased()>length<#else>size()</#if>;
432437
<#elseif arrayField.isCountArrayField()>
433438
int i=0;
434439
<#assign nonSimpleTypeReference = arrayElementTypeReference.asNonSimpleTypeReference().orElseThrow()>

‎plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,8 @@ public enum BACnetVendorId {
446446
DISTECH_CONTROLS_INC((int) 364, (int) 364, (String) "Distech Controls Inc."),
447447
INDUSTRIAL_TECHNOLOGY_RESEARCH_INSTITUTE(
448448
(int) 365, (int) 365, (String) "Industrial Technology Research Institute"),
449-
ICONICS_INC((int) 366, (int) 366, (String) "ICONICS, Inc."),
449+
MITSUBISHI_ELECTRIC_ICONICS_DIGITAL_SOLUTIONS(
450+
(int) 366, (int) 366, (String) "Mitsubishi Electric Iconics Digital Solutions"),
450451
IQ_CONTROLSSC((int) 367, (int) 367, (String) "IQ Controls s.c."),
451452
OJ_ELECTRONICSAS((int) 368, (int) 368, (String) "OJ Electronics A/S"),
452453
ROLBIT_LTD((int) 369, (int) 369, (String) "Rolbit Ltd."),
@@ -1452,7 +1453,8 @@ public enum BACnetVendorId {
14521453
PINESHORE_ENERGYLLC((int) 1266, (int) 1266, (String) "Pineshore Energy LLC"),
14531454
BRASCH_ENVIRONMENTAL_TECHNOLOGIESLLC(
14541455
(int) 1267, (int) 1267, (String) "Brasch Environmental Technologies, LLC"),
1455-
LION_CONTROLS_COLTD((int) 1268, (int) 1268, (String) "Lion Controls Co., LTD"),
1456+
SHEN_ZHEN_ZHI_XING_BUILDING_TECH_CO_LTD(
1457+
(int) 1268, (int) 1268, (String) "ShenZhen ZhiXing Building Tech Co., Ltd"),
14561458
SINUX((int) 1269, (int) 1269, (String) "Sinux"),
14571459
AVNET_INC((int) 1270, (int) 1270, (String) "Avnet Inc."),
14581460
SOMFY_ACTIVITESSA((int) 1271, (int) 1271, (String) "Somfy Activites SA"),
@@ -1775,6 +1777,19 @@ public enum BACnetVendorId {
17751777
SS_REGELTECHNIK_GMBH((int) 1545, (int) 1545, (String) "S+S Regeltechnik GmbH"),
17761778
AIR_BOX_INC((int) 1546, (int) 1546, (String) "AirBox, Inc."),
17771779
RVE((int) 1547, (int) 1547, (String) "RVE"),
1780+
MOTOROLA_SOLUTIONS((int) 1548, (int) 1548, (String) "Motorola Solutions"),
1781+
BACSYS_INNOVATIONS_PRIVATE_LIMITED(
1782+
(int) 1549, (int) 1549, (String) "BACSYS Innovations Private Limited"),
1783+
EWATTCH((int) 1550, (int) 1550, (String) "Ewattch"),
1784+
BUILTLAYERLLC((int) 1551, (int) 1551, (String) "Builtlayer LLC"),
1785+
AG_DOMOTIXSRL((int) 1552, (int) 1552, (String) "A&G Domotix S.R.L."),
1786+
HYTRONIK_INDUSTRIAL_LIMITED((int) 1553, (int) 1553, (String) "Hytronik Industrial Limited"),
1787+
WHO_REINRAUMTECHNIK((int) 1554, (int) 1554, (String) "WHO Reinraumtechnik"),
1788+
TRICO_LIMITED((int) 1555, (int) 1555, (String) "TRICO Limited"),
1789+
SLK_AUTOMATIONSRL((int) 1556, (int) 1556, (String) "SLKAutomation SRL"),
1790+
ZAPHIREAS((int) 1557, (int) 1557, (String) "Zaphire AS"),
1791+
AJ_MANUFACTURING((int) 1558, (int) 1558, (String) "AJ Manufacturing"),
1792+
FUTURE_MOTORS_LTD((int) 1559, (int) 1559, (String) "Future Motors Ltd."),
17781793
UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown");
17791794
private static final Map<Integer, BACnetVendorId> map;
17801795

‎plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxManufacturer.java‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ public enum KnxManufacturer {
753753
M_RHOMBUS_EUROPE((int) 652, (int) 710, (String) "Rhombus Europe"),
754754
M_TURING_THINK((int) 653, (int) 711, (String) "Turing-Think"),
755755
M_MICHOI((int) 654, (int) 712, (String) "Michoi"),
756-
M_CAV_AUDIOGUANGZHOUCO__LTD((int) 655, (int) 713, (String) "CAV AUDIO(GUANGZHOU)CO.,LTD"),
756+
M_CAV_SMARTGUANGZHOUCO__LTD((int) 655, (int) 713, (String) "CAV SMART(GUANGZHOU)CO.,LTD"),
757757
M_HELKAMA_BICA_OY((int) 656, (int) 714, (String) "Helkama Bica Oy"),
758758
M_MODULYTE((int) 657, (int) 715, (String) "ModuLyte"),
759759
M_CONSOLINNO_ENERGY_GMBH((int) 658, (int) 716, (String) "Consolinno Energy GmbH"),
@@ -856,9 +856,26 @@ public enum KnxManufacturer {
856856
M_GUANGDONG_YUEJINGRUN_TECHNOLOGY_CO__LTD(
857857
(int) 732, (int) 793, (String) "Guangdong Yuejingrun Technology Co.,Ltd"),
858858
M_SMATEK_ELECTRONICS_LIMITED((int) 733, (int) 794, (String) "SMATEK ELECTRONICS LIMITED"),
859-
M_ABB___RESERVED((int) 734, (int) 43954, (String) "ABB - reserved"),
859+
M_ANYTEK_ELECTRONIC_TECHNOLOGY_SZ_CO___LTD_(
860+
(int) 734, (int) 795, (String) "Anytek Electronic Technology (SZ) Co., Ltd."),
861+
M_MORELINKS_SMART_HOME((int) 735, (int) 796, (String) "Morelinks Smart Home"),
862+
M_CIRTX_GMBH((int) 736, (int) 797, (String) "Cirtx GmbH"),
863+
M_QLITE((int) 737, (int) 798, (String) "QLITE"),
864+
M_ZHONGSHAN_ILLUS_LIGHTING_CO__LTD(
865+
(int) 738, (int) 799, (String) "Zhongshan Illus LIghting Co.,Ltd"),
866+
M_HANGZHOU_KONKE_INFORMATION_TECHNOLOGY_CO___LTD_(
867+
(int) 739, (int) 800, (String) "Hangzhou Konke Information Technology Co., Ltd."),
868+
M_SHANGHAI_FANTE_DIGITAL_TECHNOLOGY_CO___LTD(
869+
(int) 740, (int) 801, (String) "Shanghai Fante Digital Technology Co., Ltd"),
870+
M_CONFIO((int) 741, (int) 802, (String) "CONFIO"),
871+
M_SONIC_TECHNOLOGIES((int) 742, (int) 803, (String) "Sonic Technologies"),
872+
M_SHANGHAI_INNOVATECH_INFORMATION_TECHNOLOGY_CO___LT(
873+
(int) 743, (int) 804, (String) "Shanghai Innovatech Information Technology Co., Lt"),
874+
M_ABI_SICHERHEITSSYSTEME_GMBH((int) 744, (int) 805, (String) "ABI Sicherheitssysteme GmbH"),
875+
M_RYT((int) 745, (int) 806, (String) "RYT"),
876+
M_ABB___RESERVED((int) 746, (int) 43954, (String) "ABB - reserved"),
860877
M_BUSCH_JAEGER_ELEKTRO___RESERVED(
861-
(int) 735, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
878+
(int) 747, (int) 43959, (String) "Busch-Jaeger Elektro - reserved");
862879
private static final Map<Integer, KnxManufacturer> map;
863880

864881
static {

0 commit comments

Comments
 (0)