demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Rename parameter of ChannelHandler (#4361)

Browse Source 
Signed-off-by: Jimmy Tanagra <jcode@tanagra.id.au>
This commit is contained in:
jimtng 2024-08-24 18:58:19 +10:00 committed by GitHub
parent b63fa473b3
commit 17ad247519
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/binding/generic/ChannelHandler.java
View File

@ -47,7 +47,7 @@ public interface ChannelHandler {
@FunctionalInterface
interface Factory {
ChannelHandler create(Consumer<State> updateState, Consumer<Command> postCommand,
@Nullable Consumer<String> sendHttpValue, ChannelTransformation stateTransformations,
@Nullable Consumer<String> sendValue, ChannelTransformation stateTransformations,
ChannelTransformation commandTransformations, ChannelValueConverterConfig channelConfig);
}
}

6
bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingChannelHandler.java
View File

@ -74,9 +74,9 @@ public abstract class AbstractTransformingChannelHandler implements ChannelHandl
@Override
public void send(Command command) {
Consumer<String> sendHttpValue = this.sendValue;
if (sendHttpValue != null && channelConfig.mode != ChannelMode.READONLY) {
commandTransformations.apply(toString(command)).ifPresent(sendHttpValue);
Consumer<String> sendValue = this.sendValue;
if (sendValue != null && channelConfig.mode != ChannelMode.READONLY) {
commandTransformations.apply(toString(command)).ifPresent(sendValue);
} else {
throw new IllegalStateException("Read-only channel");
}

20
bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/internal/binding/generic/converter/AbstractTransformingItemConverterTest.java
View File

@ -48,7 +48,7 @@ import org.openhab.core.types.UnDefType;
public class AbstractTransformingItemConverterTest {
@Mock
private @NonNullByDefault({}) Consumer<String> sendHttpValue;
private @NonNullByDefault({}) Consumer<String> sendValue;
@Mock
private @NonNullByDefault({}) Consumer<State> updateState;
@ -76,7 +76,7 @@ public class AbstractTransformingItemConverterTest {
@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 class AbstractTransformingItemConverterTest {
// 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 class AbstractTransformingItemConverterTest {
@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 class AbstractTransformingItemConverterTest {
// 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 class AbstractTransformingItemConverterTest {
// 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 class AbstractTransformingItemConverterTest {
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 {