From 143c4152a1a8798e9fc9082d4418783e124745b3 Mon Sep 17 00:00:00 2001 From: Jimmy Tanagra Date: Fri, 23 Aug 2024 12:36:43 +1000 Subject: [PATCH] Rename parameter of ChannelHandler Signed-off-by: Jimmy Tanagra --- .../thing/binding/generic/ChannelHandler.java | 2 +- .../AbstractTransformingChannelHandler.java | 6 +++--- ...AbstractTransformingItemConverterTest.java | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/ChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/ChannelHandler.java index 3887d2dfd19..81bb6a83126 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/ChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/ChannelHandler.java @@ -47,7 +47,7 @@ public interface ChannelHandler { @FunctionalInterface interface Factory { ChannelHandler create(Consumer updateState, Consumer postCommand, - @Nullable Consumer sendHttpValue, ChannelTransformation stateTransformations, + @Nullable Consumer sendValue, ChannelTransformation stateTransformations, ChannelTransformation commandTransformations, ChannelValueConverterConfig channelConfig); } } diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingChannelHandler.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingChannelHandler.java index 4b48e46c917..61bac4817dc 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingChannelHandler.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingChannelHandler.java @@ -74,9 +74,9 @@ public void process(@Nullable ChannelHandlerContent content) { @Override public void send(Command command) { - Consumer sendHttpValue = this.sendValue; - if (sendHttpValue != null && channelConfig.mode != ChannelMode.READONLY) { - commandTransformations.apply(toString(command)).ifPresent(sendHttpValue); + Consumer sendValue = this.sendValue; + if (sendValue != null && channelConfig.mode != ChannelMode.READONLY) { + commandTransformations.apply(toString(command)).ifPresent(sendValue); } else { throw new IllegalStateException("Read-only channel"); } diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingItemConverterTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingItemConverterTest.java index 8011d7eff8f..770d23bf5f4 100644 --- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingItemConverterTest.java +++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingItemConverterTest.java @@ -48,7 +48,7 @@ public class AbstractTransformingItemConverterTest { @Mock - private @NonNullByDefault({}) Consumer sendHttpValue; + private @NonNullByDefault({}) Consumer sendValue; @Mock private @NonNullByDefault({}) Consumer updateState; @@ -76,7 +76,7 @@ public void close() throws Exception { @Test public void undefOnNullContentTest() { - TestChannelHandler realConverter = new TestChannelHandler(updateState, postCommand, sendHttpValue, + TestChannelHandler realConverter = new TestChannelHandler(updateState, postCommand, sendValue, stateChannelTransformation, commandChannelTransformation, false); TestChannelHandler converter = spy(realConverter); @@ -84,7 +84,7 @@ public void undefOnNullContentTest() { // make sure UNDEF is send as state update verify(updateState, only()).accept(UnDefType.UNDEF); verify(postCommand, never()).accept(any()); - verify(sendHttpValue, never()).accept(any()); + verify(sendValue, never()).accept(any()); // make sure no other processing applies verify(converter, never()).toState(any()); @@ -94,7 +94,7 @@ public void undefOnNullContentTest() { @Test public void commandIsPostedAsCommand() { - TestChannelHandler converter = new TestChannelHandler(updateState, postCommand, sendHttpValue, + TestChannelHandler converter = new TestChannelHandler(updateState, postCommand, sendValue, stateChannelTransformation, commandChannelTransformation, true); converter.process(new ChannelHandlerContent("TEST".getBytes(StandardCharsets.UTF_8), "", null)); @@ -106,12 +106,12 @@ public void commandIsPostedAsCommand() { // check only postCommand is applied verify(updateState, never()).accept(any()); verify(postCommand, only()).accept(new StringType("TEST")); - verify(sendHttpValue, never()).accept(any()); + verify(sendValue, never()).accept(any()); } @Test public void updateIsPostedAsUpdate() { - TestChannelHandler converter = new TestChannelHandler(updateState, postCommand, sendHttpValue, + TestChannelHandler converter = new TestChannelHandler(updateState, postCommand, sendValue, stateChannelTransformation, commandChannelTransformation, false); converter.process(new ChannelHandlerContent("TEST".getBytes(StandardCharsets.UTF_8), "", null)); @@ -123,12 +123,12 @@ public void updateIsPostedAsUpdate() { // check only updateState is called verify(updateState, only()).accept(new StringType("TEST")); verify(postCommand, never()).accept(any()); - verify(sendHttpValue, never()).accept(any()); + verify(sendValue, never()).accept(any()); } @Test public void sendCommandSendsCommand() { - TestChannelHandler converter = new TestChannelHandler(updateState, postCommand, sendHttpValue, + TestChannelHandler converter = new TestChannelHandler(updateState, postCommand, sendValue, stateChannelTransformation, commandChannelTransformation, false); converter.send(new StringType("TEST")); @@ -137,10 +137,10 @@ public void sendCommandSendsCommand() { verify(stateChannelTransformation, never()).apply(any()); verify(commandChannelTransformation).apply(any()); - // check only sendHttpValue is applied + // check only sendValue is applied verify(updateState, never()).accept(any()); verify(postCommand, never()).accept(any()); - verify(sendHttpValue, only()).accept("TEST"); + verify(sendValue, only()).accept("TEST"); } private static class TestChannelHandler extends AbstractTransformingChannelHandler {