From 61da41b6cd75a39a60832852a6c36d0f4c0fe87a Mon Sep 17 00:00:00 2001 From: Jasper Date: Mon, 8 Jun 2026 10:19:37 +0200 Subject: [PATCH] Using sp for service provider naming --- .../CompositeLightTransitionCycleConfigurator.cs | 6 +++--- .../Cycle/LightTransitionCycleConfigurator.cs | 4 ++-- ...sitionPipelineConfigurator.Reactive.Toggle.cs | 2 +- ...LightTransitionPipelineConfigurator.Switch.cs | 12 ++++++------ ...tTransitionPipelineConfigurator.SwitchWhen.cs | 10 +++++----- ...LightTransitionReactiveNodeConfigurator.On.cs | 10 +++++----- ...LightTransitionReactiveNodeConfigurator.On.cs | 16 ++++++++-------- .../Switch/LightTransitionSwitchConfigurator.cs | 10 +++++----- .../LightTransitionSwitchFalseConfigurator.cs | 10 +++++----- .../Toggle/LightTransitionToggleConfigurator.cs | 12 ++++++------ 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/CodeCasa.AutomationPipelines.Lights/Cycle/CompositeLightTransitionCycleConfigurator.cs b/src/CodeCasa.AutomationPipelines.Lights/Cycle/CompositeLightTransitionCycleConfigurator.cs index f823d07..37a1662 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/Cycle/CompositeLightTransitionCycleConfigurator.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/Cycle/CompositeLightTransitionCycleConfigurator.cs @@ -36,7 +36,7 @@ public ILightTransitionCycleConfigurator Add(LightParameters lightParame public ILightTransitionCycleConfigurator Add(Func lightParametersFactory, Func matchesNodeState) { - return Add(c => lightParametersFactory(c)?.AsTransition(), matchesNodeState); + return Add(sp => lightParametersFactory(sp)?.AsTransition(), matchesNodeState); } public ILightTransitionCycleConfigurator Add(Func lightParametersFactory, Func matchesNodeState) @@ -56,12 +56,12 @@ public ILightTransitionCycleConfigurator Add(LightTransition lightTransi public ILightTransitionCycleConfigurator Add(Func lightTransitionFactory, Func matchesNodeState) { - return Add(c => new StaticLightTransitionNode(lightTransitionFactory(c), c.GetRequiredService()), matchesNodeState); + return Add(sp => new StaticLightTransitionNode(lightTransitionFactory(sp), sp.GetRequiredService()), matchesNodeState); } public ILightTransitionCycleConfigurator Add(Func lightTransitionFactory, Func matchesNodeState) { - return Add(c => new FactoryNode(t => lightTransitionFactory(c, t)), matchesNodeState); + return Add(sp => new FactoryNode(t => lightTransitionFactory(sp, t)), matchesNodeState); } public ILightTransitionCycleConfigurator Add(Func matchesNodeState) where TNode : IPipelineNode diff --git a/src/CodeCasa.AutomationPipelines.Lights/Cycle/LightTransitionCycleConfigurator.cs b/src/CodeCasa.AutomationPipelines.Lights/Cycle/LightTransitionCycleConfigurator.cs index cdfb250..9f0a172 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/Cycle/LightTransitionCycleConfigurator.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/Cycle/LightTransitionCycleConfigurator.cs @@ -36,12 +36,12 @@ public ILightTransitionCycleConfigurator Add(LightParameters lightParame public ILightTransitionCycleConfigurator Add(Func lightParametersFactory, Func matchesNodeState) { - return Add(c => lightParametersFactory(c)?.AsTransition(), matchesNodeState); + return Add(sp => lightParametersFactory(sp)?.AsTransition(), matchesNodeState); } public ILightTransitionCycleConfigurator Add(Func lightParametersFactory, Func matchesNodeState) { - return Add((c, t) => lightParametersFactory(c, t)?.AsTransition(), matchesNodeState); + return Add((sp, t) => lightParametersFactory(sp, t)?.AsTransition(), matchesNodeState); } public ILightTransitionCycleConfigurator Add(LightTransition lightTransition, IEqualityComparer? comparer = null) diff --git a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.Reactive.Toggle.cs b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.Reactive.Toggle.cs index 1f4a9c5..b97e69a 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.Reactive.Toggle.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/CompositeLightTransitionPipelineConfigurator.Reactive.Toggle.cs @@ -90,6 +90,6 @@ public ILightTransitionPipelineConfigurator AddToggle(IObservable public ILightTransitionPipelineConfigurator AddToggle(IObservable triggerObservable, Action configure) { - return AddToggle(triggerObservable, (Action>)(c => c.AddTimeline(configure))); + return AddToggle(triggerObservable, c => c.AddTimeline(configure)); } } \ No newline at end of file diff --git a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.Switch.cs b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.Switch.cs index 0e8b29b..cddf090 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.Switch.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.Switch.cs @@ -31,14 +31,14 @@ public ILightTransitionPipelineConfigurator Switch(IObservable obs public ILightTransitionPipelineConfigurator Switch(Func trueLightParametersFactory, Func falseLightParametersFactory) where TObservable : IObservable { - return Switch(c => falseLightParametersFactory(c)?.AsTransition(), c => trueLightParametersFactory(c)?.AsTransition()); + return Switch(sp => falseLightParametersFactory(sp)?.AsTransition(), c => trueLightParametersFactory(c)?.AsTransition()); } /// public ILightTransitionPipelineConfigurator Switch(IObservable observable, Func trueLightParametersFactory, Func falseLightParametersFactory) { - return Switch(observable, c => trueLightParametersFactory(c)?.AsTransition(), c => falseLightParametersFactory(c)?.AsTransition()); + return Switch(observable, sp => trueLightParametersFactory(sp)?.AsTransition(), c => falseLightParametersFactory(c)?.AsTransition()); } /// @@ -60,8 +60,8 @@ public ILightTransitionPipelineConfigurator Switch(Func falseLightTransitionFactory) where TObservable : IObservable { return Switch( - c => new StaticLightTransitionNode(trueLightTransitionFactory(c), c.GetRequiredService()), - c => new StaticLightTransitionNode(falseLightTransitionFactory(c), c.GetRequiredService())); + sp => new StaticLightTransitionNode(trueLightTransitionFactory(sp), sp.GetRequiredService()), + sp => new StaticLightTransitionNode(falseLightTransitionFactory(sp), sp.GetRequiredService())); } /// @@ -70,8 +70,8 @@ public ILightTransitionPipelineConfigurator Switch(IObservable obs { return Switch( observable, - c => new StaticLightTransitionNode(trueLightTransitionFactory(c), c.GetRequiredService()), - c => new StaticLightTransitionNode(falseLightTransitionFactory(c), c.GetRequiredService())); + sp => new StaticLightTransitionNode(trueLightTransitionFactory(sp), sp.GetRequiredService()), + sp => new StaticLightTransitionNode(falseLightTransitionFactory(sp), sp.GetRequiredService())); } /// diff --git a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.SwitchWhen.cs b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.SwitchWhen.cs index 4f90646..bea74e8 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.SwitchWhen.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/Pipeline/LightTransitionPipelineConfigurator.SwitchWhen.cs @@ -47,8 +47,8 @@ public ILightTransitionPipelineConfigurator SwitchWhen(IObservable Func falseLightParametersFactory) { return SwitchWhen(whenObservable, switchObservable, - c => trueLightParametersFactory(c)?.AsTransition(), - c => falseLightParametersFactory(c)?.AsTransition()); + sp => trueLightParametersFactory(sp)?.AsTransition(), + sp => falseLightParametersFactory(sp)?.AsTransition()); } /// @@ -106,8 +106,8 @@ public ILightTransitionPipelineConfigurator SwitchWhen(IObservable Func falseLightTransitionFactory) { return SwitchWhen(whenObservable, switchObservable, - c => new StaticLightTransitionNode(trueLightTransitionFactory(c), c.GetRequiredService()), - c => new StaticLightTransitionNode(falseLightTransitionFactory(c), c.GetRequiredService())); + sp => new StaticLightTransitionNode(trueLightTransitionFactory(sp), sp.GetRequiredService()), + sp => new StaticLightTransitionNode(falseLightTransitionFactory(sp), sp.GetRequiredService())); } /// @@ -137,7 +137,7 @@ public ILightTransitionPipelineConfigurator SwitchWhen(IObservable Func> trueNodeFactory, Func> falseNodeFactory) { - return AddReactiveNode(c => c + return AddReactiveNode(sp => sp .SetHierarchyContext(HierarchyPath, "SwitchWhen", LoggingEnabled ?? false) .On(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => x), trueNodeFactory) .On(whenObservable.Where(x => x).CombineLatest(switchObservable, (_, s) => s).Where(x => !x), falseNodeFactory) diff --git a/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/CompositeLightTransitionReactiveNodeConfigurator.On.cs b/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/CompositeLightTransitionReactiveNodeConfigurator.On.cs index c8b39c1..ef95757 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/CompositeLightTransitionReactiveNodeConfigurator.On.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/CompositeLightTransitionReactiveNodeConfigurator.On.cs @@ -17,15 +17,15 @@ public ILightTransitionReactiveNodeConfigurator On(IObservable tri /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Func lightParametersFactory) - => On(triggerObservable, c => lightParametersFactory(c)?.AsTransition()); + => On(triggerObservable, sp => lightParametersFactory(sp)?.AsTransition()); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, LightTransition lightTransition) - => On(triggerObservable, c => new StaticLightTransitionNode(lightTransition, c.GetRequiredService())); + => On(triggerObservable, sp => new StaticLightTransitionNode(lightTransition, sp.GetRequiredService())); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Func lightTransitionFactory) - => On(triggerObservable, c => new StaticLightTransitionNode(lightTransitionFactory(c), c.GetRequiredService())); + => On(triggerObservable, sp => new StaticLightTransitionNode(lightTransitionFactory(sp), sp.GetRequiredService())); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable) where TNode : IPipelineNode @@ -110,13 +110,13 @@ public ILightTransitionReactiveNodeConfigurator TurnOnWhen(IObservabl /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Dictionary timeline, TimeSpan? transitionTimeForTimelineState = null) - => On(triggerObservable, c => new TimelineNode(timeline, c.GetRequiredService(), transitionTimeForTimelineState)); + => On(triggerObservable, sp => new TimelineNode(timeline, sp.GetRequiredService(), transitionTimeForTimelineState)); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Func> timelineFactory, TimeSpan? transitionTimeForTimelineState = null) - => On(triggerObservable, c => new TimelineNode(timelineFactory(c), c.GetRequiredService(), transitionTimeForTimelineState)); + => On(triggerObservable, sp => new TimelineNode(timelineFactory(sp), sp.GetRequiredService(), transitionTimeForTimelineState)); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, diff --git a/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/LightTransitionReactiveNodeConfigurator.On.cs b/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/LightTransitionReactiveNodeConfigurator.On.cs index ffdc3d7..87abbcf 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/LightTransitionReactiveNodeConfigurator.On.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/ReactiveNode/LightTransitionReactiveNodeConfigurator.On.cs @@ -19,24 +19,24 @@ public ILightTransitionReactiveNodeConfigurator On(IObservable tri /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Func lightParametersFactory) - => On(triggerObservable, c => lightParametersFactory(c)?.AsTransition()); + => On(triggerObservable, sp => lightParametersFactory(sp)?.AsTransition()); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, LightTransition lightTransition) => - On(triggerObservable, c => new StaticLightTransitionNode(lightTransition, c.GetRequiredService())); + On(triggerObservable, sp => new StaticLightTransitionNode(lightTransition, sp.GetRequiredService())); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Func lightTransitionFactory) - => On(triggerObservable, c => new StaticLightTransitionNode(lightTransitionFactory(c), c.GetRequiredService())); + => On(triggerObservable, sp => new StaticLightTransitionNode(lightTransitionFactory(sp), sp.GetRequiredService())); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable) where TNode : IPipelineNode => AddNodeSource(triggerObservable.Select(_ => - new Func?>(c => - ActivatorUtilities.CreateInstance(c)))); + new Func?>(sp => + ActivatorUtilities.CreateInstance(sp)))); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, @@ -47,7 +47,7 @@ public ILightTransitionReactiveNodeConfigurator On(IObservable tri public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Action> pipelineConfigurator, InstantiationScope _ = InstantiationScope.Shared) { return On(triggerObservable, - s => s.GetRequiredService().CreateLightPipeline(ServiceProvider, Light, pipelineConfigurator.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false))); + sp => sp.GetRequiredService().CreateLightPipeline(ServiceProvider, Light, pipelineConfigurator.ApplyHierarchySettings(HierarchyPath, LoggingEnabled ?? false))); } /// @@ -80,13 +80,13 @@ public ILightTransitionReactiveNodeConfigurator TurnOnWhen(IObservabl /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Dictionary timeline, TimeSpan? transitionTimeForTimelineState = null) - => On(triggerObservable, c => new TimelineNode(timeline, c.GetRequiredService(), transitionTimeForTimelineState)); + => On(triggerObservable, sp => new TimelineNode(timeline, sp.GetRequiredService(), transitionTimeForTimelineState)); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, Func> timelineFactory, TimeSpan? transitionTimeForTimelineState = null) - => On(triggerObservable, c => new TimelineNode(timelineFactory(c), c.GetRequiredService(), transitionTimeForTimelineState)); + => On(triggerObservable, sp => new TimelineNode(timelineFactory(sp), sp.GetRequiredService(), transitionTimeForTimelineState)); /// public ILightTransitionReactiveNodeConfigurator On(IObservable triggerObservable, diff --git a/src/CodeCasa.AutomationPipelines.Lights/Switch/LightTransitionSwitchConfigurator.cs b/src/CodeCasa.AutomationPipelines.Lights/Switch/LightTransitionSwitchConfigurator.cs index 5852d12..3cdb364 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/Switch/LightTransitionSwitchConfigurator.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/Switch/LightTransitionSwitchConfigurator.cs @@ -20,10 +20,10 @@ public ILightTransitionSwitchFalseConfigurator WhenTrue(LightTransition => WhenTrue(_ => lightTransition); public ILightTransitionSwitchFalseConfigurator WhenTrue(Func lightParametersFactory) - => WhenTrue(c => lightParametersFactory(c)?.AsTransition()); + => WhenTrue(sp => lightParametersFactory(sp)?.AsTransition()); public ILightTransitionSwitchFalseConfigurator WhenTrue(Func lightTransitionFactory) - => WhenTrue(c => new StaticLightTransitionNode(lightTransitionFactory(c), c.GetRequiredService())); + => WhenTrue(sp => new StaticLightTransitionNode(lightTransitionFactory(sp), sp.GetRequiredService())); public ILightTransitionSwitchFalseConfigurator WhenTrue(Func> nodeFactory) { @@ -33,16 +33,16 @@ public ILightTransitionSwitchFalseConfigurator WhenTrue(Func WhenTrue() where TNode : IPipelineNode - => WhenTrue(c => ActivatorUtilities.CreateInstance(c)); + => WhenTrue(sp => ActivatorUtilities.CreateInstance(sp)); public ILightTransitionSwitchFalseConfigurator WhenTrue(Dictionary timeline, TimeSpan? transitionTimeForTimelineState = null) - => WhenTrue(c => new TimelineNode(timeline, c.GetRequiredService(), transitionTimeForTimelineState)); + => WhenTrue(sp => new TimelineNode(timeline, sp.GetRequiredService(), transitionTimeForTimelineState)); public ILightTransitionSwitchFalseConfigurator WhenTrue( Func> timelineFactory, TimeSpan? transitionTimeForTimelineState = null) - => WhenTrue(c => new TimelineNode(timelineFactory(c), c.GetRequiredService(), transitionTimeForTimelineState)); + => WhenTrue(sp => new TimelineNode(timelineFactory(sp), sp.GetRequiredService(), transitionTimeForTimelineState)); public ILightTransitionSwitchFalseConfigurator WhenTrue(Action configure) { diff --git a/src/CodeCasa.AutomationPipelines.Lights/Switch/LightTransitionSwitchFalseConfigurator.cs b/src/CodeCasa.AutomationPipelines.Lights/Switch/LightTransitionSwitchFalseConfigurator.cs index db502ec..041d759 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/Switch/LightTransitionSwitchFalseConfigurator.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/Switch/LightTransitionSwitchFalseConfigurator.cs @@ -22,10 +22,10 @@ public void WhenFalse(LightTransition lightTransition) => WhenFalse(_ => lightTransition); public void WhenFalse(Func lightParametersFactory) - => WhenFalse(c => lightParametersFactory(c)?.AsTransition()); + => WhenFalse(sp => lightParametersFactory(sp)?.AsTransition()); public void WhenFalse(Func lightTransitionFactory) - => WhenFalse(c => new StaticLightTransitionNode(lightTransitionFactory(c), c.GetRequiredService())); + => WhenFalse(sp => new StaticLightTransitionNode(lightTransitionFactory(sp), sp.GetRequiredService())); public void WhenFalse(Func> nodeFactory) { @@ -33,15 +33,15 @@ public void WhenFalse(Func> nod } public void WhenFalse() where TNode : IPipelineNode - => WhenFalse(c => ActivatorUtilities.CreateInstance(c)); + => WhenFalse(sp => ActivatorUtilities.CreateInstance(sp)); public void WhenFalse(Dictionary timeline, TimeSpan? transitionTimeForTimelineState = null) - => WhenFalse(c => new TimelineNode(timeline, c.GetRequiredService(), transitionTimeForTimelineState)); + => WhenFalse(sp => new TimelineNode(timeline, sp.GetRequiredService(), transitionTimeForTimelineState)); public void WhenFalse(Func> timelineFactory, TimeSpan? transitionTimeForTimelineState = null) - => WhenFalse(c => new TimelineNode(timelineFactory(c), c.GetRequiredService(), transitionTimeForTimelineState)); + => WhenFalse(sp => new TimelineNode(timelineFactory(sp), sp.GetRequiredService(), transitionTimeForTimelineState)); public void WhenFalse(Action configure) { diff --git a/src/CodeCasa.AutomationPipelines.Lights/Toggle/LightTransitionToggleConfigurator.cs b/src/CodeCasa.AutomationPipelines.Lights/Toggle/LightTransitionToggleConfigurator.cs index 0ddfdd8..8dfa47d 100644 --- a/src/CodeCasa.AutomationPipelines.Lights/Toggle/LightTransitionToggleConfigurator.cs +++ b/src/CodeCasa.AutomationPipelines.Lights/Toggle/LightTransitionToggleConfigurator.cs @@ -54,7 +54,7 @@ public ILightTransitionToggleConfigurator Add(LightParameters lightParam public ILightTransitionToggleConfigurator Add(Func lightParametersFactory) { - return Add(c => lightParametersFactory(c)?.AsTransition()); + return Add(sp => lightParametersFactory(sp)?.AsTransition()); } public ILightTransitionToggleConfigurator Add(Func lightParametersFactory) @@ -69,17 +69,17 @@ public ILightTransitionToggleConfigurator Add(LightTransition lightTrans public ILightTransitionToggleConfigurator Add(Func lightTransitionFactory) { - return Add(c => new StaticLightTransitionNode(lightTransitionFactory(c), c.GetRequiredService())); + return Add(sp => new StaticLightTransitionNode(lightTransitionFactory(sp), sp.GetRequiredService())); } public ILightTransitionToggleConfigurator Add(Func lightTransitionFactory) { - return Add(c => new FactoryNode(t => lightTransitionFactory(c, t))); + return Add(sp => new FactoryNode(t => lightTransitionFactory(sp, t))); } public ILightTransitionToggleConfigurator Add() where TNode : IPipelineNode { - return Add(c => ActivatorUtilities.CreateInstance(c)); + return Add(sp => ActivatorUtilities.CreateInstance(sp)); } public ILightTransitionToggleConfigurator Add(Func> nodeFactory) @@ -95,12 +95,12 @@ public ILightTransitionToggleConfigurator AddPassThrough() public ILightTransitionToggleConfigurator AddTimeline(Dictionary timeline, TimeSpan? transitionTimeForTimelineState = null) { - return Add(c => new TimelineNode(timeline, c.GetRequiredService(), transitionTimeForTimelineState)); + return Add(sp => new TimelineNode(timeline, sp.GetRequiredService(), transitionTimeForTimelineState)); } public ILightTransitionToggleConfigurator AddTimeline(Func> timelineFactory, TimeSpan? transitionTimeForTimelineState = null) { - return Add(c => new TimelineNode(timelineFactory(c), c.GetRequiredService(), transitionTimeForTimelineState)); + return Add(sp => new TimelineNode(timelineFactory(sp), sp.GetRequiredService(), transitionTimeForTimelineState)); } public ILightTransitionToggleConfigurator AddTimeline(Action configure)