Skip to content

Commit 7c48a52

Browse files
kevinherronkevinherron
authored
Rename BuiltinDataType to OpcUaDataType (#1377)
Time to rip this band-aid off... "BuiltinDataType" is infuriatingly vague and provides no clues to what it is when being used/referenced in a codebase that uses Milo.
1 parent 128cd77 commit 7c48a52

File tree

80 files changed

+565
-572
lines changed

Some content is hidden

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

80 files changed

+565
-572
lines changed

‎milo-examples/server-examples/src/main/java/org/eclipse/milo/examples/server/ExampleNamespace.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
import org.eclipse.milo.opcua.sdk.server.nodes.filters.AttributeFilters;
5151
import org.eclipse.milo.opcua.sdk.server.util.SubscriptionModel;
5252
import org.eclipse.milo.opcua.stack.core.AttributeId;
53-
import org.eclipse.milo.opcua.stack.core.BuiltinDataType;
5453
import org.eclipse.milo.opcua.stack.core.NodeIds;
54+
import org.eclipse.milo.opcua.stack.core.OpcUaDataType;
5555
import org.eclipse.milo.opcua.stack.core.UaException;
5656
import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString;
5757
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
@@ -853,7 +853,7 @@ private void registerCustomEnumType() throws Exception {
853853
dataTypeId,
854854
new QualifiedName(getNamespaceIndex(), "CustomEnumType"),
855855
definition,
856-
ubyte(BuiltinDataType.Int32.getTypeId()));
856+
ubyte(OpcUaDataType.Int32.getTypeId()));
857857

858858
dictionaryManager.registerEnum(description);
859859
}

‎opc-ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonConversions.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Arrays;
2121
import java.util.HexFormat;
2222
import java.util.UUID;
23-
import org.eclipse.milo.opcua.stack.core.BuiltinDataType;
23+
import org.eclipse.milo.opcua.stack.core.OpcUaDataType;
2424
import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString;
2525
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
2626
import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime;
@@ -47,16 +47,16 @@ public class JsonConversions {
4747
// region OPC UA to JSON Conversions
4848

4949
/**
50-
* Convert an OPC UA value of some {@link BuiltinDataType} to a {@link JsonElement}.
50+
* Convert an OPC UA value of some {@link OpcUaDataType} to a {@link JsonElement}.
5151
*
52-
* <p>Converting from values of type {@link BuiltinDataType#DiagnosticInfo} is not supported.
52+
* <p>Converting from values of type {@link OpcUaDataType#DiagnosticInfo} is not supported.
5353
*
5454
* @param value the OPC UA value to convert.
55-
* @param dataType the OPC UA {@link BuiltinDataType} of the value.
55+
* @param dataType the OPC UA {@link OpcUaDataType} of the value.
5656
* @return the converted {@link JsonElement}.
57-
* @throws IllegalArgumentException if the {@link BuiltinDataType} is not supported.
57+
* @throws IllegalArgumentException if the {@link OpcUaDataType} is not supported.
5858
*/
59-
public static JsonElement from(Object value, BuiltinDataType dataType) {
59+
public static JsonElement from(Object value, OpcUaDataType dataType) {
6060
return switch (dataType) {
6161
case Boolean -> fromBoolean((Boolean) value);
6262
case SByte -> fromSByte((Byte) value);
@@ -242,7 +242,7 @@ public static JsonElement fromVariant(Variant value) {
242242

243243
var jsonObject = new JsonObject();
244244

245-
BuiltinDataType dataType = value.getBuiltinDataType().orElseThrow();
245+
OpcUaDataType dataType = value.getDataType().orElseThrow();
246246
jsonObject.addProperty("Type", dataType.getTypeId());
247247

248248
if (valueObject.getClass().isArray()) {
@@ -279,16 +279,16 @@ public static JsonElement fromVariant(Variant value) {
279279
// region JSON to OPC UA Conversions
280280

281281
/**
282-
* Convert a {@link JsonElement} to a value of some OPC UA {@link BuiltinDataType}.
282+
* Convert a {@link JsonElement} to a value of some OPC UA {@link OpcUaDataType}.
283283
*
284-
* <p>Converting to values of type {@link BuiltinDataType#DiagnosticInfo} is not supported.
284+
* <p>Converting to values of type {@link OpcUaDataType#DiagnosticInfo} is not supported.
285285
*
286286
* @param element the {@link JsonElement} to convert.
287-
* @param dataType the OPC UA {@link BuiltinDataType} to convert to.
287+
* @param dataType the OPC UA {@link OpcUaDataType} to convert to.
288288
* @return the converted value.
289-
* @throws IllegalArgumentException if the {@link BuiltinDataType} is not supported.
289+
* @throws IllegalArgumentException if the {@link OpcUaDataType} is not supported.
290290
*/
291-
public static Object to(JsonElement element, BuiltinDataType dataType) {
291+
public static Object to(JsonElement element, OpcUaDataType dataType) {
292292
return switch (dataType) {
293293
case Boolean -> toBoolean(element);
294294
case SByte -> toSByte(element);
@@ -510,7 +510,7 @@ public static Variant toVariant(JsonElement element) {
510510
int typeId = jsonObject.get("Type").getAsInt();
511511
JsonElement bodyElement = jsonObject.get("Body");
512512

513-
BuiltinDataType dataType = BuiltinDataType.fromTypeId(typeId);
513+
OpcUaDataType dataType = OpcUaDataType.fromTypeId(typeId);
514514
if (dataType == null) {
515515
throw new IllegalArgumentException("unknown type: " + typeId);
516516
}

‎opc-ua-sdk/codec-json/src/main/java/org/eclipse/milo/sdk/core/types/json/JsonStructCodec.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import java.util.UUID;
3030
import org.eclipse.milo.opcua.sdk.core.typetree.DataType;
3131
import org.eclipse.milo.opcua.sdk.core.typetree.DataTypeTree;
32-
import org.eclipse.milo.opcua.stack.core.BuiltinDataType;
3332
import org.eclipse.milo.opcua.stack.core.NodeIds;
33+
import org.eclipse.milo.opcua.stack.core.OpcUaDataType;
3434
import org.eclipse.milo.opcua.stack.core.StatusCodes;
3535
import org.eclipse.milo.opcua.stack.core.UaSerializationException;
3636
import org.eclipse.milo.opcua.stack.core.encoding.EncodingContext;
@@ -165,8 +165,8 @@ private JsonElement decodeFieldValue(UaDecoder decoder, StructureField field) {
165165

166166
if (field.getValueRank() == -1) {
167167
Object hint = getHint(field);
168-
if (hint instanceof BuiltinDataType) {
169-
return decodeBuiltinDataType(decoder, fieldName, (BuiltinDataType) hint);
168+
if (hint instanceof OpcUaDataType) {
169+
return decodeBuiltinDataType(decoder, fieldName, (OpcUaDataType) hint);
170170
} else if (hint instanceof EnumHint) {
171171
int enumValue = decoder.decodeEnum(fieldName);
172172

@@ -187,8 +187,8 @@ private JsonElement decodeFieldValue(UaDecoder decoder, StructureField field) {
187187
}
188188
} else if (field.getValueRank() == 1) {
189189
Object hint = getHint(field);
190-
if (hint instanceof BuiltinDataType) {
191-
return decodeBuiltinDataTypeArray(decoder, fieldName, (BuiltinDataType) hint);
190+
if (hint instanceof OpcUaDataType) {
191+
return decodeBuiltinDataTypeArray(decoder, fieldName, (OpcUaDataType) hint);
192192
} else if (hint instanceof EnumHint) {
193193
var array = new JsonArray();
194194
for (int value : decoder.decodeEnumArray(fieldName)) {
@@ -215,8 +215,8 @@ private JsonElement decodeFieldValue(UaDecoder decoder, StructureField field) {
215215
}
216216
} else if (field.getValueRank() > 1) {
217217
Object hint = getHint(field);
218-
if (hint instanceof BuiltinDataType) {
219-
Matrix matrix = decoder.decodeMatrix(fieldName, (BuiltinDataType) hint);
218+
if (hint instanceof OpcUaDataType) {
219+
Matrix matrix = decoder.decodeMatrix(fieldName, (OpcUaDataType) hint);
220220

221221
return decodeBuiltinDataTypeMatrix(matrix);
222222
} else if (hint instanceof EnumHint) {
@@ -225,7 +225,7 @@ private JsonElement decodeFieldValue(UaDecoder decoder, StructureField field) {
225225
return decodeEnumMatrix(matrix);
226226
} else if (hint instanceof StructHint) {
227227
if (dataTypeId.equals(NodeIds.Structure) || fieldAllowsSubtyping(field)) {
228-
Matrix matrix = decoder.decodeMatrix(fieldName, BuiltinDataType.ExtensionObject);
228+
Matrix matrix = decoder.decodeMatrix(fieldName, OpcUaDataType.ExtensionObject);
229229

230230
return decodeStructMatrix(decoder.getEncodingContext(), matrix, true);
231231
} else {
@@ -256,7 +256,7 @@ private boolean fieldAllowsSubtyping(StructureField field) {
256256
}
257257

258258
private static JsonElement decodeBuiltinDataType(
259-
UaDecoder decoder, String fieldName, BuiltinDataType dataType) {
259+
UaDecoder decoder, String fieldName, OpcUaDataType dataType) {
260260
return switch (dataType) {
261261
case Boolean -> JsonConversions.fromBoolean(decoder.decodeBoolean(fieldName));
262262
case SByte -> JsonConversions.fromSByte(decoder.decodeSByte(fieldName));
@@ -291,7 +291,7 @@ private static JsonElement decodeBuiltinDataType(
291291
}
292292

293293
private static JsonElement decodeBuiltinDataTypeArray(
294-
UaDecoder decoder, String fieldName, BuiltinDataType dataType) {
294+
UaDecoder decoder, String fieldName, OpcUaDataType dataType) {
295295
switch (dataType) {
296296
case Boolean:
297297
{
@@ -492,7 +492,7 @@ private static JsonElement decodeBuiltinDataTypeArray(
492492

493493
static JsonElement decodeBuiltinDataTypeMatrix(Matrix matrix) {
494494
return matrix
495-
.getBuiltinDataType()
495+
.getDataType()
496496
.map(
497497
dataType ->
498498
decodeBuiltinDataTypeMatrix(
@@ -501,7 +501,7 @@ static JsonElement decodeBuiltinDataTypeMatrix(Matrix matrix) {
501501
}
502502

503503
private static JsonElement decodeBuiltinDataTypeMatrix(
504-
Object flatArray, BuiltinDataType dataType, int[] dimensions, int offset) {
504+
Object flatArray, OpcUaDataType dataType, int[] dimensions, int offset) {
505505
var jsonArray = new JsonArray();
506506

507507
if (dimensions.length == 1) {
@@ -527,7 +527,7 @@ private static JsonElement decodeBuiltinDataTypeMatrix(
527527

528528
static JsonElement decodeEnumMatrix(Matrix matrix) {
529529
return decodeBuiltinDataTypeMatrix(
530-
matrix.getElements(), BuiltinDataType.Int32, matrix.getDimensions(), 0);
530+
matrix.getElements(), OpcUaDataType.Int32, matrix.getDimensions(), 0);
531531
}
532532

533533
static JsonElement decodeStructMatrix(EncodingContext context, Matrix matrix, boolean subtyped) {
@@ -656,8 +656,8 @@ private void encodeFieldValue(UaEncoder encoder, StructureField field, JsonEleme
656656

657657
if (field.getValueRank() == -1) {
658658
Object hint = getHint(field);
659-
if (hint instanceof BuiltinDataType) {
660-
encodeBuiltinDataType(encoder, fieldName, (BuiltinDataType) hint, value);
659+
if (hint instanceof OpcUaDataType) {
660+
encodeBuiltinDataType(encoder, fieldName, (OpcUaDataType) hint, value);
661661
} else if (hint instanceof EnumHint) {
662662
encoder.encodeEnum(fieldName, new JsonEnumWrapper(value.getAsInt(), dataTypeId.expanded()));
663663
} else if (hint instanceof StructHint) {
@@ -681,8 +681,8 @@ private void encodeFieldValue(UaEncoder encoder, StructureField field, JsonEleme
681681
JsonArray jsonArray = value.getAsJsonArray();
682682

683683
Object hint = getHint(field);
684-
if (hint instanceof BuiltinDataType) {
685-
encodeBuiltinDataTypeArray(encoder, fieldName, (BuiltinDataType) hint, jsonArray);
684+
if (hint instanceof OpcUaDataType) {
685+
encodeBuiltinDataTypeArray(encoder, fieldName, (OpcUaDataType) hint, jsonArray);
686686
} else if (hint instanceof EnumHint) {
687687
JsonEnumWrapper[] enumValues = new JsonEnumWrapper[jsonArray.size()];
688688
for (int i = 0; i < jsonArray.size(); i++) {
@@ -724,26 +724,26 @@ private void encodeFieldValue(UaEncoder encoder, StructureField field, JsonEleme
724724
JsonArray jsonArray = value.getAsJsonArray();
725725

726726
Object hint = getHint(field);
727-
if (hint instanceof BuiltinDataType) {
728-
Object[] flatArray = encodeBuiltinDataTypeMatrix((BuiltinDataType) hint, jsonArray);
729-
var matrix = new Matrix(flatArray, getDimensions(jsonArray), (BuiltinDataType) hint);
727+
if (hint instanceof OpcUaDataType) {
728+
Object[] flatArray = encodeBuiltinDataTypeMatrix((OpcUaDataType) hint, jsonArray);
729+
var matrix = new Matrix(flatArray, getDimensions(jsonArray), (OpcUaDataType) hint);
730730
encoder.encodeMatrix(fieldName, matrix);
731731
} else if (hint instanceof EnumHint) {
732732
Object[] flatArray = encodeEnumMatrix(dataTypeId.expanded(), jsonArray);
733-
var matrix = new Matrix(flatArray, getDimensions(jsonArray), BuiltinDataType.Int32);
733+
var matrix = new Matrix(flatArray, getDimensions(jsonArray), OpcUaDataType.Int32);
734734
encoder.encodeEnumMatrix(fieldName, matrix);
735735
} else if (hint instanceof StructHint) {
736736
if (dataTypeId.equals(NodeIds.Structure) || fieldAllowsSubtyping(field)) {
737737
Object[] flatArray =
738738
encodeStructMatrix(encoder.getEncodingContext(), dataTypeTree, jsonArray, true);
739739
var matrix =
740-
new Matrix(flatArray, getDimensions(jsonArray), BuiltinDataType.ExtensionObject);
740+
new Matrix(flatArray, getDimensions(jsonArray), OpcUaDataType.ExtensionObject);
741741
encoder.encodeMatrix(fieldName, matrix);
742742
} else {
743743
Object[] flatArray =
744744
encodeStructMatrix(encoder.getEncodingContext(), dataTypeTree, jsonArray, false);
745745
var matrix =
746-
new Matrix(flatArray, getDimensions(jsonArray), BuiltinDataType.ExtensionObject);
746+
new Matrix(flatArray, getDimensions(jsonArray), OpcUaDataType.ExtensionObject);
747747
encoder.encodeStructMatrix(fieldName, matrix, dataTypeId);
748748
}
749749
} else {
@@ -755,7 +755,7 @@ private void encodeFieldValue(UaEncoder encoder, StructureField field, JsonEleme
755755
}
756756

757757
private void encodeBuiltinDataType(
758-
UaEncoder encoder, String fieldName, BuiltinDataType dataType, JsonElement value) {
758+
UaEncoder encoder, String fieldName, OpcUaDataType dataType, JsonElement value) {
759759
switch (dataType) {
760760
case Boolean:
761761
encoder.encodeBoolean(fieldName, JsonConversions.toBoolean(value));
@@ -837,7 +837,7 @@ private void encodeBuiltinDataType(
837837
}
838838

839839
private void encodeBuiltinDataTypeArray(
840-
UaEncoder encoder, String fieldName, BuiltinDataType dataType, JsonArray value) {
840+
UaEncoder encoder, String fieldName, OpcUaDataType dataType, JsonArray value) {
841841
switch (dataType) {
842842
case Boolean:
843843
{
@@ -1062,7 +1062,7 @@ private void encodeBuiltinDataTypeArray(
10621062
}
10631063
}
10641064

1065-
static Object[] encodeBuiltinDataTypeMatrix(BuiltinDataType dataType, JsonArray jsonArray) {
1065+
static Object[] encodeBuiltinDataTypeMatrix(OpcUaDataType dataType, JsonArray jsonArray) {
10661066
var elements = new ArrayList<>();
10671067

10681068
for (int i = 0; i < jsonArray.size(); i++) {
@@ -1155,8 +1155,8 @@ static int[] getDimensions(JsonArray array) {
11551155

11561156
for (StructureField f : fields) {
11571157
NodeId dataTypeId = f.getDataType();
1158-
if (BuiltinDataType.isBuiltin(dataTypeId)) {
1159-
map.put(f, BuiltinDataType.fromNodeId(dataTypeId));
1158+
if (OpcUaDataType.isBuiltin(dataTypeId)) {
1159+
map.put(f, OpcUaDataType.fromNodeId(dataTypeId));
11601160
} else if (dataTypeTree.isEnumType(dataTypeId)) {
11611161
map.put(f, new EnumHint());
11621162
} else if (dataTypeTree.isStructType(dataTypeId)) {

‎opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithAbstractMatrixFields.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
package org.eclipse.milo.opcua.test.types;
1212

1313
import java.util.StringJoiner;
14-
import org.eclipse.milo.opcua.stack.core.BuiltinDataType;
1514
import org.eclipse.milo.opcua.stack.core.NamespaceTable;
15+
import org.eclipse.milo.opcua.stack.core.OpcUaDataType;
1616
import org.eclipse.milo.opcua.stack.core.encoding.EncodingContext;
1717
import org.eclipse.milo.opcua.stack.core.encoding.GenericDataTypeCodec;
1818
import org.eclipse.milo.opcua.stack.core.encoding.UaDecoder;
@@ -174,15 +174,15 @@ public StructWithAbstractMatrixFields decodeType(EncodingContext context, UaDeco
174174
final Matrix att1;
175175
final Matrix att2;
176176
{
177-
Matrix matrix = decoder.decodeMatrix("Number", BuiltinDataType.Variant);
177+
Matrix matrix = decoder.decodeMatrix("Number", OpcUaDataType.Variant);
178178
number = matrix.transform(v -> ((Variant) v).getValue());
179179
}
180180
{
181-
Matrix matrix = decoder.decodeMatrix("ATT1", BuiltinDataType.ExtensionObject);
181+
Matrix matrix = decoder.decodeMatrix("ATT1", OpcUaDataType.ExtensionObject);
182182
att1 = matrix.transform(v -> ((ExtensionObject) v).decode(context));
183183
}
184184
{
185-
Matrix matrix = decoder.decodeMatrix("ATT2", BuiltinDataType.ExtensionObject);
185+
Matrix matrix = decoder.decodeMatrix("ATT2", OpcUaDataType.ExtensionObject);
186186
att2 = matrix.transform(v -> ((ExtensionObject) v).decode(context));
187187
}
188188
return new StructWithAbstractMatrixFields(number, att1, att2);

‎opc-ua-sdk/codec-json/src/test/java/org/eclipse/milo/opcua/test/types/StructWithBuiltinMatrixFields.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
package org.eclipse.milo.opcua.test.types;
1212

1313
import java.util.StringJoiner;
14-
import org.eclipse.milo.opcua.stack.core.BuiltinDataType;
1514
import org.eclipse.milo.opcua.stack.core.NamespaceTable;
15+
import org.eclipse.milo.opcua.stack.core.OpcUaDataType;
1616
import org.eclipse.milo.opcua.stack.core.encoding.EncodingContext;
1717
import org.eclipse.milo.opcua.stack.core.encoding.GenericDataTypeCodec;
1818
import org.eclipse.milo.opcua.stack.core.encoding.UaDecoder;
@@ -569,29 +569,29 @@ public StructWithBuiltinMatrixFields decodeType(EncodingContext context, UaDecod
569569
final Matrix localizedText;
570570
final Matrix dataValue;
571571
final Matrix variant;
572-
_boolean = decoder.decodeMatrix("Boolean", BuiltinDataType.Boolean);
573-
sByte = decoder.decodeMatrix("SByte", BuiltinDataType.SByte);
574-
_byte = decoder.decodeMatrix("Byte", BuiltinDataType.Byte);
575-
int16 = decoder.decodeMatrix("Int16", BuiltinDataType.Int16);
576-
uInt16 = decoder.decodeMatrix("UInt16", BuiltinDataType.UInt16);
577-
int32 = decoder.decodeMatrix("Int32", BuiltinDataType.Int32);
578-
uInt32 = decoder.decodeMatrix("UInt32", BuiltinDataType.UInt32);
579-
int64 = decoder.decodeMatrix("Int64", BuiltinDataType.Int64);
580-
uInt64 = decoder.decodeMatrix("UInt64", BuiltinDataType.UInt64);
581-
_float = decoder.decodeMatrix("Float", BuiltinDataType.Float);
582-
_double = decoder.decodeMatrix("Double", BuiltinDataType.Double);
583-
string = decoder.decodeMatrix("String", BuiltinDataType.String);
584-
dateTime = decoder.decodeMatrix("DateTime", BuiltinDataType.DateTime);
585-
guid = decoder.decodeMatrix("Guid", BuiltinDataType.Guid);
586-
byteString = decoder.decodeMatrix("ByteString", BuiltinDataType.ByteString);
587-
xmlElement = decoder.decodeMatrix("XmlElement", BuiltinDataType.XmlElement);
588-
nodeId = decoder.decodeMatrix("NodeId", BuiltinDataType.NodeId);
589-
expandedNodeId = decoder.decodeMatrix("ExpandedNodeId", BuiltinDataType.ExpandedNodeId);
590-
statusCode = decoder.decodeMatrix("StatusCode", BuiltinDataType.StatusCode);
591-
qualifiedName = decoder.decodeMatrix("QualifiedName", BuiltinDataType.QualifiedName);
592-
localizedText = decoder.decodeMatrix("LocalizedText", BuiltinDataType.LocalizedText);
593-
dataValue = decoder.decodeMatrix("DataValue", BuiltinDataType.DataValue);
594-
variant = decoder.decodeMatrix("Variant", BuiltinDataType.Variant);
572+
_boolean = decoder.decodeMatrix("Boolean", OpcUaDataType.Boolean);
573+
sByte = decoder.decodeMatrix("SByte", OpcUaDataType.SByte);
574+
_byte = decoder.decodeMatrix("Byte", OpcUaDataType.Byte);
575+
int16 = decoder.decodeMatrix("Int16", OpcUaDataType.Int16);
576+
uInt16 = decoder.decodeMatrix("UInt16", OpcUaDataType.UInt16);
577+
int32 = decoder.decodeMatrix("Int32", OpcUaDataType.Int32);
578+
uInt32 = decoder.decodeMatrix("UInt32", OpcUaDataType.UInt32);
579+
int64 = decoder.decodeMatrix("Int64", OpcUaDataType.Int64);
580+
uInt64 = decoder.decodeMatrix("UInt64", OpcUaDataType.UInt64);
581+
_float = decoder.decodeMatrix("Float", OpcUaDataType.Float);
582+
_double = decoder.decodeMatrix("Double", OpcUaDataType.Double);
583+
string = decoder.decodeMatrix("String", OpcUaDataType.String);
584+
dateTime = decoder.decodeMatrix("DateTime", OpcUaDataType.DateTime);
585+
guid = decoder.decodeMatrix("Guid", OpcUaDataType.Guid);
586+
byteString = decoder.decodeMatrix("ByteString", OpcUaDataType.ByteString);
587+
xmlElement = decoder.decodeMatrix("XmlElement", OpcUaDataType.XmlElement);
588+
nodeId = decoder.decodeMatrix("NodeId", OpcUaDataType.NodeId);
589+
expandedNodeId = decoder.decodeMatrix("ExpandedNodeId", OpcUaDataType.ExpandedNodeId);
590+
statusCode = decoder.decodeMatrix("StatusCode", OpcUaDataType.StatusCode);
591+
qualifiedName = decoder.decodeMatrix("QualifiedName", OpcUaDataType.QualifiedName);
592+
localizedText = decoder.decodeMatrix("LocalizedText", OpcUaDataType.LocalizedText);
593+
dataValue = decoder.decodeMatrix("DataValue", OpcUaDataType.DataValue);
594+
variant = decoder.decodeMatrix("Variant", OpcUaDataType.Variant);
595595
return new StructWithBuiltinMatrixFields(
596596
_boolean,
597597
sByte,

0 commit comments

Comments
 (0)