Skip to content

Commit afabecd

Browse files
committed
remove default method implementation
1 parent 854370a commit afabecd

13 files changed

+15
-28
lines changed

src/Components/Components/src/CascadingValue.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterI
140140
|| string.Equals(requestedName, Name, StringComparison.OrdinalIgnoreCase); // Also match on name
141141
}
142142

143-
object? ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo parameterInfo)
143+
object? ICascadingValueSupplier.GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
144144
{
145145
return Value;
146146
}

src/Components/Components/src/CascadingValueSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterI
149149
|| string.Equals(requestedName, _name, StringComparison.OrdinalIgnoreCase); // Also match on name
150150
}
151151

152-
object? ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo parameterInfo)
152+
object? ICascadingValueSupplier.GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
153153
{
154154
if (_initialValueFactory is not null)
155155
{

src/Components/Components/src/ICascadingValueSupplier.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ internal interface ICascadingValueSupplier
1111

1212
bool CanSupplyValue(in CascadingParameterInfo parameterInfo);
1313

14-
object? GetCurrentValue(in CascadingParameterInfo parameterInfo);
15-
16-
object? GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo) => GetCurrentValue(parameterInfo);
14+
object? GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo);
1715

1816
void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo);
1917

src/Components/Components/src/Routing/SupplyParameterFromQueryValueProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal sealed class SupplyParameterFromQueryValueProvider(NavigationManager na
2323
public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
2424
=> parameterInfo.Attribute is SupplyParameterFromQueryAttribute;
2525

26-
public object? GetCurrentValue(in CascadingParameterInfo parameterInfo)
26+
public object? GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
2727
{
2828
TryUpdateUri();
2929

src/Components/Components/src/SupplyParameterFromPersistentComponentStateValueProvider.cs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,6 @@ internal sealed class SupplyParameterFromPersistentComponentStateValueProvider(P
2929
public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
3030
=> parameterInfo.Attribute is SupplyParameterFromPersistentComponentStateAttribute;
3131

32-
[UnconditionalSuppressMessage(
33-
"ReflectionAnalysis",
34-
"IL2026:RequiresUnreferencedCode message",
35-
Justification = "JSON serialization and deserialization might require types that cannot be statically analyzed.")]
36-
[UnconditionalSuppressMessage(
37-
"Trimming",
38-
"IL2072:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.",
39-
Justification = "JSON serialization and deserialization might require types that cannot be statically analyzed.")]
40-
public object? GetCurrentValue(in CascadingParameterInfo parameterInfo) =>
41-
throw new InvalidOperationException("Using this provider requires a key.");
42-
4332
[UnconditionalSuppressMessage(
4433
"ReflectionAnalysis",
4534
"IL2026:RequiresUnreferencedCode message",

src/Components/Components/test/CascadingParameterStateTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ public void FindCascadingParameters_CanOverrideNonNullValueWithNull()
352352
{
353353
Assert.Equal(nameof(ComponentWithCascadingParams.CascadingParam1), match.ParameterInfo.PropertyName);
354354
Assert.Same(states[1].Component, match.ValueSupplier);
355-
Assert.Null(match.ValueSupplier.GetCurrentValue(match.ParameterInfo));
355+
Assert.Null(match.ValueSupplier.GetCurrentValue(null, match.ParameterInfo));
356356
});
357357
}
358358

@@ -486,7 +486,7 @@ class SupplyParameterWithSingleDeliveryComponent(bool isFixed) : ComponentBase,
486486
public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
487487
=> parameterInfo.Attribute is SupplyParameterWithSingleDeliveryAttribute;
488488

489-
public object GetCurrentValue(in CascadingParameterInfo parameterInfo)
489+
public object GetCurrentValue(object key, in CascadingParameterInfo parameterInfo)
490490
=> throw new NotImplementedException();
491491

492492
public void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)

src/Components/Components/test/CascadingParameterTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
885885
public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
886886
=> parameterInfo.Attribute is SingleDeliveryCascadingParameterAttribute;
887887

888-
public object GetCurrentValue(in CascadingParameterInfo parameterInfo)
888+
public object GetCurrentValue(object key, in CascadingParameterInfo parameterInfo)
889889
=> new SingleDeliveryValue(Text);
890890

891891
public void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)
@@ -1053,7 +1053,7 @@ bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterI
10531053
return true;
10541054
}
10551055

1056-
object ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo cascadingParameterState)
1056+
object ICascadingValueSupplier.GetCurrentValue(object key, in CascadingParameterInfo cascadingParameterState)
10571057
{
10581058
return Value;
10591059
}

src/Components/Components/test/ParameterViewTest.Assignment.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
790790
throw new NotImplementedException();
791791
}
792792

793-
public object GetCurrentValue(in CascadingParameterInfo parameterInfo)
793+
public object GetCurrentValue(object key, in CascadingParameterInfo parameterInfo)
794794
{
795795
return _value;
796796
}

src/Components/Components/test/ParameterViewTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ public TestCascadingValue(object value)
609609
public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
610610
=> throw new NotImplementedException();
611611

612-
public object GetCurrentValue(in CascadingParameterInfo parameterInfo)
612+
public object GetCurrentValue(object key, in CascadingParameterInfo parameterInfo)
613613
=> _value;
614614

615615
public void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)

src/Components/Web/src/Forms/Editor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected override void OnParametersSet()
5656
bool ICascadingValueSupplier.CanSupplyValue(in CascadingParameterInfo parameterInfo) =>
5757
parameterInfo.PropertyType == typeof(HtmlFieldPrefix);
5858

59-
object? ICascadingValueSupplier.GetCurrentValue(in CascadingParameterInfo parameterInfo)
59+
object? ICascadingValueSupplier.GetCurrentValue(object? key, in CascadingParameterInfo parameterInfo)
6060
{
6161
return ((ICascadingValueSupplier)this).CanSupplyValue(parameterInfo) ? _value : null;
6262
}

0 commit comments

Comments
 (0)