Sitelet https://github.com/Altinn/app-lib-dotnet/commit/2fb14e2993010a6e74b2dc5d606a1fb587686ddf
Skip to content

Commit 2fb14e2

Browse files
TomasEngTomasEng
committed
Fix Sonar issues
1 parent 5c9c571 commit 2fb14e2

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎src/Altinn.App.Core/Internal/Expressions/ExpressionValue.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ _ when value.GetType().BaseType?.Name == "Object" => value
216216
JsonValueKind.False => false,
217217
JsonValueKind.String => String,
218218
JsonValueKind.Number => Number,
219-
JsonValueKind.Object => Object,
219+
JsonValueKind.Object => Dictionary,
220220
JsonValueKind.Array => Array,
221221
_ => throw new InvalidOperationException("Invalid value kind"),
222222
};
@@ -264,7 +264,7 @@ _ when value.GetType().BaseType?.Name == "Object" => value
264264
};
265265

266266
/// <summary>Get the value as an object (or throw if it isn't an object ValueKind)</summary>
267-
public Dictionary<string, ExpressionValue> Object =>
267+
public Dictionary<string, ExpressionValue> Dictionary =>
268268
ValueKind switch
269269
{
270270
JsonValueKind.Object => _objectValue ?? throw new UnreachableException($"{this} is not an object"),
@@ -295,7 +295,7 @@ public override string ToString() =>
295295
JsonValueKind.False => "false",
296296
JsonValueKind.String => JsonSerializer.Serialize(String, _unsafeSerializerOptionsForSerializingDates),
297297
JsonValueKind.Number => Number.ToString(CultureInfo.InvariantCulture),
298-
JsonValueKind.Object => JsonSerializer.Serialize(Object),
298+
JsonValueKind.Object => JsonSerializer.Serialize(Dictionary),
299299
JsonValueKind.Array => JsonSerializer.Serialize(Array),
300300
_ => throw new InvalidOperationException($"Invalid value kind {ValueKind}"),
301301
};
@@ -317,7 +317,7 @@ public override string ToString() =>
317317
JsonValueKind.False => "false",
318318
JsonValueKind.String => String,
319319
JsonValueKind.Number => Number.ToString(CultureInfo.InvariantCulture),
320-
JsonValueKind.Object => JsonSerializer.Serialize(Object),
320+
JsonValueKind.Object => JsonSerializer.Serialize(Dictionary),
321321
JsonValueKind.Array => JsonSerializer.Serialize(Array),
322322
_ => throw new InvalidOperationException($"Invalid value kind {ValueKind}"),
323323
};
@@ -345,7 +345,7 @@ public override string ToString() =>
345345
{ } sValue => sValue,
346346
},
347347
JsonValueKind.Number => Number.ToString(CultureInfo.InvariantCulture),
348-
JsonValueKind.Object => JsonSerializer.Serialize(Object),
348+
JsonValueKind.Object => JsonSerializer.Serialize(Dictionary),
349349
JsonValueKind.Array => JsonSerializer.Serialize(Array),
350350
_ => throw new NotImplementedException($"ToStringForEquals not implemented for {ValueKind}"),
351351
};
@@ -701,7 +701,7 @@ public override void Write(Utf8JsonWriter writer, ExpressionValue value, JsonSer
701701
writer.WriteNumberValue(value.Number);
702702
break;
703703
case JsonValueKind.Object:
704-
JsonSerializer.Serialize(writer, value.Object, options);
704+
JsonSerializer.Serialize(writer, value.Dictionary, options);
705705
break;
706706
case JsonValueKind.Array:
707707
JsonSerializer.Serialize(writer, value.Array, options);

‎src/Altinn.App.Core/Models/Expressions/ExpressionFunction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,5 +230,5 @@ public enum ExpressionFunction
230230
list,
231231

232232
/// <summary>Create a dictionary from the arguments, which must be alternating keys and values.</summary>
233-
@object,
233+
@object, // NOSONAR
234234
}

‎test/Altinn.App.Core.Tests/LayoutExpressions/ExpressionEvaluatorTests/ExpressionValueTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public void TestUndefined()
186186
Assert.Throws<InvalidCastException>(() => undefinedValue.Number);
187187
Assert.Throws<InvalidCastException>(() => undefinedValue.String);
188188
Assert.Throws<InvalidCastException>(() => undefinedValue.Array);
189-
Assert.Throws<InvalidCastException>(() => undefinedValue.Object);
189+
Assert.Throws<InvalidCastException>(() => undefinedValue.Dictionary);
190190

191191
Assert.Equal("null", JsonSerializer.Serialize(undefinedValue));
192192
Assert.Throws<NotImplementedException>(() => undefinedValue.GetHashCode());
@@ -204,7 +204,7 @@ public void NullThrowsWhenAccessedAsDifferentType()
204204
Assert.Throws<InvalidCastException>(() => _ = nullValue.Number);
205205
Assert.Throws<InvalidCastException>(() => _ = nullValue.String);
206206
Assert.Throws<InvalidCastException>(() => _ = nullValue.Array);
207-
Assert.Throws<InvalidCastException>(() => _ = nullValue.Object);
207+
Assert.Throws<InvalidCastException>(() => _ = nullValue.Dictionary);
208208
}
209209

210210
[Fact]

‎test/Altinn.App.Core.Tests/PublicApiTests.PublicApi_ShouldNotChange_Unintentionally.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3234,8 +3234,8 @@ namespace Altinn.App.Core.Internal.Expressions
32343234
public ExpressionValue(System.Collections.Generic.Dictionary<string, Altinn.App.Core.Internal.Expressions.ExpressionValue> value) { }
32353235
public Altinn.App.Core.Internal.Expressions.ExpressionValue[] Array { get; }
32363236
public bool Bool { get; }
3237+
public System.Collections.Generic.Dictionary<string, Altinn.App.Core.Internal.Expressions.ExpressionValue> Dictionary { get; }
32373238
public double Number { get; }
3238-
public System.Collections.Generic.Dictionary<string, Altinn.App.Core.Internal.Expressions.ExpressionValue> Object { get; }
32393239
public string String { get; }
32403240
public System.Text.Json.JsonValueKind ValueKind { get; }
32413241
public static Altinn.App.Core.Internal.Expressions.ExpressionValue False { get; }

0 commit comments

Comments
 (0)