Skip to content

Commit 4806dd3

Browse files
committed
Address copilot review comments
Signed-off-by: Kai Kreuzer <kai@openhab.org>
1 parent 4ce987c commit 4806dd3

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

bundles/org.openhab.binding.matter/src/main/java/org/openhab/binding/matter/internal/controller/devices/converter/ContactStateConverter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
package org.openhab.binding.matter.internal.controller.devices.converter;
1414

1515
import static org.openhab.binding.matter.internal.MatterBindingConstants.CHANNEL_CONTACT_STATEVALUE;
16-
import static org.openhab.binding.matter.internal.MatterBindingConstants.CHANNEL_ID_CONTACT_STATEVALUE;
16+
import static org.openhab.binding.matter.internal.MatterBindingConstants.CHANNEL_ID_BOOLEANSTATE_STATEVALUE;
1717

1818
import java.util.Collections;
1919
import java.util.Map;
@@ -49,7 +49,7 @@ public ContactStateConverter(BooleanStateCluster cluster, MatterBaseThingHandler
4949
@Override
5050
public Map<Channel, @Nullable StateDescription> createChannels(ChannelGroupUID channelGroupUID) {
5151
Channel channel = ChannelBuilder
52-
.create(new ChannelUID(channelGroupUID, CHANNEL_ID_CONTACT_STATEVALUE), CoreItemFactory.CONTACT)
52+
.create(new ChannelUID(channelGroupUID, CHANNEL_ID_BOOLEANSTATE_STATEVALUE), CoreItemFactory.CONTACT)
5353
.withType(CHANNEL_CONTACT_STATEVALUE).build();
5454
return Collections.singletonMap(channel, null);
5555
}
@@ -59,7 +59,7 @@ public void onEvent(AttributeChangedMessage message) {
5959
switch (message.path.attributeName) {
6060
case BooleanStateCluster.ATTRIBUTE_STATE_VALUE -> {
6161
if (message.value instanceof Boolean booleanValue) {
62-
updateState(CHANNEL_ID_CONTACT_STATEVALUE,
62+
updateState(CHANNEL_ID_BOOLEANSTATE_STATEVALUE,
6363
booleanValue ? OpenClosedType.CLOSED : OpenClosedType.OPEN);
6464
}
6565
}
@@ -69,7 +69,7 @@ public void onEvent(AttributeChangedMessage message) {
6969

7070
@Override
7171
public void initState() {
72-
updateState(CHANNEL_ID_CONTACT_STATEVALUE,
72+
updateState(CHANNEL_ID_BOOLEANSTATE_STATEVALUE,
7373
initializingCluster.stateValue ? OpenClosedType.CLOSED : OpenClosedType.OPEN);
7474
}
7575
}

bundles/org.openhab.binding.matter/src/test/java/org/openhab/binding/matter/internal/controller/devices/converter/ContactStateConverterTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void testCreateChannels() {
5959
Map<Channel, @Nullable StateDescription> channels = contactConverter.createChannels(thingUID);
6060
assertEquals(1, channels.size());
6161
Channel channel = channels.keySet().iterator().next();
62-
assertEquals("matter:node:test:12345:1#contact-statevalue", channel.getUID().toString());
62+
assertEquals("matter:node:test:12345:1#booleanstate-statevalue", channel.getUID().toString());
6363
assertEquals("Contact", channel.getAcceptedItemType());
6464
}
6565

@@ -70,7 +70,7 @@ void testOnEventWithBooleanValueTrue() throws Exception {
7070
message.path.attributeName = "stateValue";
7171
message.value = true;
7272
contactConverter.onEvent(message);
73-
verify(mockHandler, times(1)).updateState(eq(1), eq("contact-statevalue"), eq(OpenClosedType.CLOSED));
73+
verify(mockHandler, times(1)).updateState(eq(1), eq("booleanstate-statevalue"), eq(OpenClosedType.CLOSED));
7474
}
7575

7676
@Test
@@ -80,13 +80,13 @@ void testOnEventWithBooleanValueFalse() throws Exception {
8080
message.path.attributeName = "stateValue";
8181
message.value = false;
8282
contactConverter.onEvent(message);
83-
verify(mockHandler, times(1)).updateState(eq(1), eq("contact-statevalue"), eq(OpenClosedType.OPEN));
83+
verify(mockHandler, times(1)).updateState(eq(1), eq("booleanstate-statevalue"), eq(OpenClosedType.OPEN));
8484
}
8585

8686
@Test
8787
void testInitState() throws Exception {
8888
mockCluster.stateValue = true;
8989
contactConverter.initState();
90-
verify(mockHandler, times(1)).updateState(eq(1), eq("contact-statevalue"), eq(OpenClosedType.CLOSED));
90+
verify(mockHandler, times(1)).updateState(eq(1), eq("booleanstate-statevalue"), eq(OpenClosedType.CLOSED));
9191
}
9292
}

0 commit comments

Comments
 (0)