From ac6fd556ab57f8d736fd6b289989cbae4ec36703 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 28 Nov 2024 14:34:33 +0100 Subject: [PATCH] Fix variable naming Sonar is right to complain about variable naming, fix that up. Change-Id: Ib80598914ec6ef911d94fdb9af28cfefdbf49df3 Signed-off-by: Robert Varga --- .../impl/LeafrefSerializeDeserializeTest.java | 8 ++--- .../data/codec/gson/AnyXmlSupportTest.java | 36 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/binding/binding-data-codec-dynamic/src/test/java/org/opendaylight/yangtools/binding/data/codec/impl/LeafrefSerializeDeserializeTest.java b/binding/binding-data-codec-dynamic/src/test/java/org/opendaylight/yangtools/binding/data/codec/impl/LeafrefSerializeDeserializeTest.java index 29f377c95a..57188fb844 100644 --- a/binding/binding-data-codec-dynamic/src/test/java/org/opendaylight/yangtools/binding/data/codec/impl/LeafrefSerializeDeserializeTest.java +++ b/binding/binding-data-codec-dynamic/src/test/java/org/opendaylight/yangtools/binding/data/codec/impl/LeafrefSerializeDeserializeTest.java @@ -28,10 +28,10 @@ public class LeafrefSerializeDeserializeTest extends AbstractBindingCodecTest { final var fromYangInstanceIdentifier = codecContext.fromYangInstanceIdentifier(contYII); assertNotNull(fromYangInstanceIdentifier); - final var BA_II_CONT = DataObjectIdentifier.builder(Cont.class).build(); + final var baII = DataObjectIdentifier.builder(Cont.class).build(); final var refVal = new Ref("myvalue"); final var data = new ContBuilder().setRef(refVal).build(); - final var normalizedNode = codecContext.toNormalizedDataObject(BA_II_CONT, data); + final var normalizedNode = codecContext.toNormalizedDataObject(baII, data); assertNotNull(normalizedNode); final var fromNormalizedNode = codecContext.fromNormalizedNode(contYII, normalizedNode.node()); @@ -46,10 +46,10 @@ public class LeafrefSerializeDeserializeTest extends AbstractBindingCodecTest { final var fromYangInstanceIdentifier = codecContext.fromYangInstanceIdentifier(contYII); assertNotNull(fromYangInstanceIdentifier); - final var BA_II_CONT = DataObjectIdentifier.builder(ContInt32.class).build(); + final var baII = DataObjectIdentifier.builder(ContInt32.class).build(); final var refVal = new RefUnionInt32(Uint32.valueOf(5)); final var data = new ContInt32Builder().setRefUnionInt32(refVal).build(); - final var normalizedNode = codecContext.toNormalizedDataObject(BA_II_CONT, data); + final var normalizedNode = codecContext.toNormalizedDataObject(baII, data); assertNotNull(normalizedNode); final var fromNormalizedNode = codecContext.fromNormalizedNode(contYII, normalizedNode.node()); diff --git a/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java b/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java index 3b995fcafd..17532929d9 100644 --- a/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java +++ b/codec/yang-data-codec-gson/src/test/java/org/opendaylight/yangtools/yang/data/codec/gson/AnyXmlSupportTest.java @@ -54,19 +54,19 @@ class AnyXmlSupportTest extends AbstractComplexJsonTest { assertNotNull(transformedInput); // lf12-any check - final var Lf12AnyActualValue = getParsedAnyXmlValue(transformedInput, LF12_ANY); - final var Lf12AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf12-any", "100.5"); - verifyTransformedAnyXmlNodeValue(Lf12AnyExpectedValue, Lf12AnyActualValue); + final var lf12AnyActualValue = getParsedAnyXmlValue(transformedInput, LF12_ANY); + final var lf12AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf12-any", "100.5"); + verifyTransformedAnyXmlNodeValue(lf12AnyExpectedValue, lf12AnyActualValue); // lf13-any check - final var Lf13AnyActualValue = getParsedAnyXmlValue(transformedInput, LF13_ANY); - final var Lf13AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf13-any", "true"); - verifyTransformedAnyXmlNodeValue(Lf13AnyExpectedValue, Lf13AnyActualValue); + final var lf13AnyActualValue = getParsedAnyXmlValue(transformedInput, LF13_ANY); + final var lf13AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf13-any", "true"); + verifyTransformedAnyXmlNodeValue(lf13AnyExpectedValue, lf13AnyActualValue); // lf14-any check - final var Lf14AnyActualValue = getParsedAnyXmlValue(transformedInput, LF14_ANY); - final var Lf14AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf14-any", "null"); - verifyTransformedAnyXmlNodeValue(Lf14AnyExpectedValue, Lf14AnyActualValue); + final var lf14AnyActualValue = getParsedAnyXmlValue(transformedInput, LF14_ANY); + final var lf14AnyExpectedValue = createAnyXmlSimpleValue("ns:complex:json", "lf14-any", "null"); + verifyTransformedAnyXmlNodeValue(lf14AnyExpectedValue, lf14AnyActualValue); final var serializationResult = normalizedNodesToJsonString(transformedInput, schemaContext); @@ -85,18 +85,18 @@ class AnyXmlSupportTest extends AbstractComplexJsonTest { assertNotNull(transformedInput); // lf12-any check - final var Lf12AnyActualValue = getParsedAnyXmlValue(transformedInput, LF12_ANY); - final var Lf12AnyExpectedValue = createLf12AnyXmlCompositeValue("ns:complex:json", "lf12-any"); - verifyTransformedAnyXmlNodeValue(Lf12AnyExpectedValue, Lf12AnyActualValue); + final var lf12AnyActualValue = getParsedAnyXmlValue(transformedInput, LF12_ANY); + final var lf12AnyExpectedValue = createLf12AnyXmlCompositeValue("ns:complex:json", "lf12-any"); + verifyTransformedAnyXmlNodeValue(lf12AnyExpectedValue, lf12AnyActualValue); // lf13-any check - final var Lf13AnyActualValue = getParsedAnyXmlValue(transformedInput, LF13_ANY); - final var Lf13AnyExpectedValue = createLf13AnyXmlCompositeValue("ns:complex:json", "lf13-any"); - verifyTransformedAnyXmlNodeValue(Lf13AnyExpectedValue, Lf13AnyActualValue); + final var lf13AnyActualValue = getParsedAnyXmlValue(transformedInput, LF13_ANY); + final var lf13AnyExpectedValue = createLf13AnyXmlCompositeValue("ns:complex:json", "lf13-any"); + verifyTransformedAnyXmlNodeValue(lf13AnyExpectedValue, lf13AnyActualValue); // lf14-any check - final var Lf14AnyActualValue = getParsedAnyXmlValue(transformedInput, LF14_ANY); - final var Lf14AnyExpectedValue = createLf14AnyXmlCompositeValue("ns:complex:json", "lf14-any"); - verifyTransformedAnyXmlNodeValue(Lf14AnyExpectedValue, Lf14AnyActualValue); + final var lf14AnyActualValue = getParsedAnyXmlValue(transformedInput, LF14_ANY); + final var lf14AnyExpectedValue = createLf14AnyXmlCompositeValue("ns:complex:json", "lf14-any"); + verifyTransformedAnyXmlNodeValue(lf14AnyExpectedValue, lf14AnyActualValue); // serialization final var serializationResult = normalizedNodesToJsonString(transformedInput, schemaContext); -- 2.36.6