Skip to content

Commit 4c6fb49

Browse files
kevinherronkevinherron
committed
~ formatting
1 parent 36d8311 commit 4c6fb49

File tree

1 file changed

+83
-78
lines changed

1 file changed

+83
-78
lines changed

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

Lines changed: 83 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -286,20 +286,20 @@ private static JsonElement decodeBuiltinDataType(
286286
JsonConversions.fromExtensionObject(decoder.decodeExtensionObject(fieldName));
287287
case DataValue -> JsonConversions.fromDataValue(decoder.decodeDataValue(fieldName));
288288
case Variant -> {
289-
Variant variant = decoder.decodeVariant(fieldName);
289+
Variant variant = decoder.decodeVariant(fieldName);
290290

291-
if (variant.getValue() instanceof ExtensionObject xo) {
292-
try {
293-
JsonStruct jsonStruct = (JsonStruct) xo.decode(decoder.getEncodingContext());
291+
if (variant.getValue() instanceof ExtensionObject xo) {
292+
try {
293+
JsonStruct jsonStruct = (JsonStruct) xo.decode(decoder.getEncodingContext());
294294

295-
yield jsonStruct.getJsonObject();
296-
} catch (Exception e) {
297-
yield JsonConversions.fromVariant(variant);
298-
}
299-
} else {
300-
yield JsonConversions.fromVariant(variant);
301-
}
302-
}
295+
yield jsonStruct.getJsonObject();
296+
} catch (Exception e) {
297+
yield JsonConversions.fromVariant(variant);
298+
}
299+
} else {
300+
yield JsonConversions.fromVariant(variant);
301+
}
302+
}
303303
default -> JsonNull.INSTANCE;
304304
};
305305
}
@@ -476,81 +476,85 @@ private static JsonElement decodeBuiltinDataTypeArray(
476476
return array;
477477
}
478478
case ExtensionObject:
479-
{ var array = new JsonArray();
480-
for (ExtensionObject value : decoder.decodeExtensionObjectArray(fieldName)) {
481-
array.add(JsonConversions.fromExtensionObject(value));
482-
}
483-
return array;
484-
}
485-
case DataValue: {
486-
var array = new JsonArray();
487-
for (DataValue value : decoder.decodeDataValueArray(fieldName)) {
488-
array.add(JsonConversions.fromDataValue(value));
489-
}
490-
return array;
491-
}
492-
case Variant: {
493-
var array = new JsonArray();
494-
495-
for (Variant variant : decoder.decodeVariantArray(fieldName)) {
496-
if (variant.getValue() instanceof ExtensionObject xo) {
497-
try {
498-
JsonStruct jsonStruct = (JsonStruct) xo.decode(decoder.getEncodingContext());
499-
500-
array.add(jsonStruct.getJsonObject());
501-
} catch (Exception e) {
502-
array.add(JsonConversions.fromVariant(variant));
503-
}
504-
} else {
505-
array.add(JsonConversions.fromVariant(variant));
506-
}
507-
}
479+
{
480+
var array = new JsonArray();
481+
for (ExtensionObject value : decoder.decodeExtensionObjectArray(fieldName)) {
482+
array.add(JsonConversions.fromExtensionObject(value));
483+
}
484+
return array;
485+
}
486+
case DataValue:
487+
{
488+
var array = new JsonArray();
489+
for (DataValue value : decoder.decodeDataValueArray(fieldName)) {
490+
array.add(JsonConversions.fromDataValue(value));
491+
}
492+
return array;
493+
}
494+
case Variant:
495+
{
496+
var array = new JsonArray();
508497

509-
return array;
498+
for (Variant variant : decoder.decodeVariantArray(fieldName)) {
499+
if (variant.getValue() instanceof ExtensionObject xo) {
500+
try {
501+
JsonStruct jsonStruct = (JsonStruct) xo.decode(decoder.getEncodingContext());
502+
503+
array.add(jsonStruct.getJsonObject());
504+
} catch (Exception e) {
505+
array.add(JsonConversions.fromVariant(variant));
506+
}
507+
} else {
508+
array.add(JsonConversions.fromVariant(variant));
510509
}
510+
}
511+
512+
return array;
513+
}
511514
case DiagnosticInfo:
512515
default:
513516
return JsonNull.INSTANCE;
514517
}
515518
}
516519

517520
static JsonElement decodeBuiltinDataTypeMatrix(EncodingContext context, Matrix matrix) {
518-
return matrix.getBuiltinDataType()
519-
.map(dataType ->
520-
decodeBuiltinDataTypeMatrix(context, matrix.getElements(), dataType, matrix.getDimensions(), 0)
521-
)
522-
.orElse(JsonNull.INSTANCE);
523-
}
521+
return matrix
522+
.getBuiltinDataType()
523+
.map(
524+
dataType ->
525+
decodeBuiltinDataTypeMatrix(
526+
context, matrix.getElements(), dataType, matrix.getDimensions(), 0))
527+
.orElse(JsonNull.INSTANCE);
528+
}
524529

525-
private static JsonElement decodeBuiltinDataTypeMatrix(
526-
EncodingContext context,
527-
Object flatArray,
528-
BuiltinDataType dataType,
529-
int[] dimensions,
530-
int offset
531-
) {
530+
private static JsonElement decodeBuiltinDataTypeMatrix(
531+
EncodingContext context,
532+
Object flatArray,
533+
BuiltinDataType dataType,
534+
int[] dimensions,
535+
int offset) {
532536

533-
var jsonArray = new JsonArray();
537+
var jsonArray = new JsonArray();
534538

535539
if (dimensions.length == 1) {
536540
for (int i = 0; i < dimensions[0]; i++) {
537541
if (dataType == BuiltinDataType.Variant) {
538-
try {
539-
Variant variant = (Variant) Array.get(flatArray, offset + i);
540-
541-
if (variant.getValue() instanceof ExtensionObject xo) {
542-
JsonStruct jsonStruct = (JsonStruct) xo.decode(context);
543-
544-
jsonArray.add(jsonStruct.getJsonObject());
545-
} else {
546-
jsonArray.add(JsonConversions.fromVariant(variant));
547-
}
548-
} catch (Exception e) {
549-
jsonArray.add(JsonConversions.from(Array.get(flatArray, offset + i), dataType));
550-
}
551-
} else {
552-
jsonArray.add(JsonConversions.from(Array.get(flatArray, offset + i), dataType));
553-
}
542+
try {
543+
Variant variant = (Variant) Array.get(flatArray, offset + i);
544+
545+
if (variant.getValue() instanceof ExtensionObject xo) {
546+
JsonStruct jsonStruct = (JsonStruct) xo.decode(context);
547+
548+
jsonArray.add(jsonStruct.getJsonObject());
549+
} else {
550+
jsonArray.add(JsonConversions.fromVariant(variant));
551+
}
552+
} catch (Exception e) {
553+
jsonArray.add(JsonConversions.from(Array.get(flatArray, offset + i), dataType));
554+
}
555+
} else {
556+
jsonArray.add(JsonConversions.from(Array.get(flatArray, offset + i), dataType));
557+
}
554558
}
555559
} else {
556560
int[] dimensionsTail = Arrays.copyOfRange(dimensions, 1, dimensions.length);
@@ -559,10 +563,10 @@ private static JsonElement decodeBuiltinDataTypeMatrix(
559563
JsonElement e =
560564
decodeBuiltinDataTypeMatrix(
561565
context,
562-
flatArray,
563-
dataType,
564-
dimensionsTail,
565-
offset + i * Arrays.stream(dimensionsTail).reduce(1, (a, b) -> a * b));
566+
flatArray,
567+
dataType,
568+
dimensionsTail,
569+
offset + i * Arrays.stream(dimensionsTail).reduce(1, (a, b) -> a * b));
566570
jsonArray.add(e);
567571
}
568572
}
@@ -571,8 +575,9 @@ private static JsonElement decodeBuiltinDataTypeMatrix(
571575
}
572576

573577
static JsonElement decodeEnumMatrix(EncodingContext context, Matrix matrix) {
574-
return decodeBuiltinDataTypeMatrix(context, matrix.getElements(), BuiltinDataType.Int32, matrix.getDimensions(), 0);
575-
}
578+
return decodeBuiltinDataTypeMatrix(
579+
context, matrix.getElements(), BuiltinDataType.Int32, matrix.getDimensions(), 0);
580+
}
576581

577582
static JsonElement decodeStructMatrix(EncodingContext context, Matrix matrix, boolean subtyped) {
578583
return decodeStructMatrix(context, matrix.getElements(), subtyped, matrix.getDimensions(), 0);

0 commit comments

Comments
 (0)