Skip to content

Commit

Permalink
[yamahareceiver] Fix ChannelTypeProvider (openhab#16278)
Browse files Browse the repository at this point in the history 
* [yamahareceiver] Fix ChannelTypeProvider
* [yamaha] Fix remaining ChannelTypeProvider (openhab#23)

Also-by: Florian Hotze <florianh_dev@icloud.com>
Signed-off-by: Jan N. Klug <github@klug.nrw>
Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
  • Loading branch information
@J-N-K @austvik
J-N-K authored and austvik committed Mar 27, 2024
1 parent b8b3235 commit e8d308e
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 25 deletions.
21 changes: 12 additions & 9 deletions ...java/org/openhab/binding/yamahareceiver/internal/ChannelsTypeProviderAvailableInputs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,35 @@
ChannelTypeProvider.class })
@NonNullByDefault
public class ChannelsTypeProviderAvailableInputs implements ChannelTypeProvider, ThingHandlerService {
private @NonNullByDefault({}) ChannelType channelType;
private @NonNullByDefault({}) ChannelTypeUID channelTypeUID;
private @NonNullByDefault({}) YamahaZoneThingHandler handler;
private @Nullable ChannelType channelType;
private @Nullable ChannelTypeUID channelTypeUID;
private @Nullable YamahaZoneThingHandler handler;

@Override
public Collection<ChannelType> getChannelTypes(@Nullable Locale locale) {
return Set.of(channelType);
ChannelType channelType = this.channelType;
return channelType == null ? Set.of() : Set.of(channelType);
}

@Override
public @Nullable ChannelType getChannelType(ChannelTypeUID channelTypeUID, @Nullable Locale locale) {
if (this.channelTypeUID.equals(channelTypeUID)) {
if (channelTypeUID.equals(this.channelTypeUID)) {
return channelType;
} else {
return null;
}
}

public ChannelTypeUID getChannelTypeUID() {
public @Nullable ChannelTypeUID getChannelTypeUID() {
return channelTypeUID;
}

private void createChannelType(StateDescriptionFragment state) {
channelType = ChannelTypeBuilder.state(channelTypeUID, "Input source", "String")
.withDescription("Select the input source of the AVR").withStateDescriptionFragment(state).build();
ChannelTypeUID channelTypeUID = this.channelTypeUID;
if (channelTypeUID != null) {
channelType = ChannelTypeBuilder.state(channelTypeUID, "Input source", "String")
.withDescription("Select the input source of the AVR").withStateDescriptionFragment(state).build();
}
}

private StateDescriptionFragment getDefaultStateDescription() {
Expand Down Expand Up @@ -128,7 +132,6 @@ public void changeAvailableInputs(Map<String, String> availableInputs) {
.withOptions(options).build());
}

@NonNullByDefault({})
@Override
public void setThingHandler(ThingHandler handler) {
this.handler = (YamahaZoneThingHandler) handler;
Expand Down
23 changes: 13 additions & 10 deletions ...src/main/java/org/openhab/binding/yamahareceiver/internal/ChannelsTypeProviderPreset.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,26 @@
@Component(scope = ServiceScope.PROTOTYPE, service = { ChannelsTypeProviderPreset.class, ChannelTypeProvider.class })
@NonNullByDefault
public class ChannelsTypeProviderPreset implements ChannelTypeProvider, ThingHandlerService {
private @NonNullByDefault({}) ChannelType channelType;
private @NonNullByDefault({}) ChannelTypeUID channelTypeUID;
private @NonNullByDefault({}) YamahaZoneThingHandler handler;
private @Nullable ChannelType channelType;
private @Nullable ChannelTypeUID channelTypeUID;
private @Nullable YamahaZoneThingHandler handler;

@Override
public Collection<ChannelType> getChannelTypes(@Nullable Locale locale) {
return Set.of(channelType);
ChannelType channelType = this.channelType;
return channelType == null ? Set.of() : Set.of(channelType);
}

@Override
public @Nullable ChannelType getChannelType(ChannelTypeUID channelTypeUID, @Nullable Locale locale) {
if (this.channelTypeUID.equals(channelTypeUID)) {
if (channelTypeUID.equals(this.channelTypeUID)) {
return channelType;
} else {
return null;
}
}

public ChannelTypeUID getChannelTypeUID() {
public @Nullable ChannelTypeUID getChannelTypeUID() {
return channelTypeUID;
}

Expand All @@ -83,12 +84,14 @@ public void changePresetNames(List<PresetInfoState.Preset> presets) {
}

private void createChannelType(StateDescriptionFragment state) {
channelType = ChannelTypeBuilder.state(channelTypeUID, "Preset", "Number")
.withDescription("Select a saved channel by its preset number").withStateDescriptionFragment(state)
.build();
ChannelTypeUID channelTypeUID = this.channelTypeUID;
if (channelTypeUID != null) {
channelType = ChannelTypeBuilder.state(channelTypeUID, "Preset", "Number")
.withDescription("Select a saved channel by its preset number").withStateDescriptionFragment(state)
.build();
}
}

@NonNullByDefault({})
@Override
public void setThingHandler(ThingHandler handler) {
this.handler = (YamahaZoneThingHandler) handler;
Expand Down
21 changes: 15 additions & 6 deletions ...main/java/org/openhab/binding/yamahareceiver/internal/handler/YamahaZoneThingHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
import org.openhab.core.thing.binding.BaseThingHandler;
import org.openhab.core.thing.binding.ThingHandlerService;
import org.openhab.core.thing.binding.builder.ChannelBuilder;
import org.openhab.core.thing.type.ChannelTypeUID;
import org.openhab.core.types.Command;
import org.openhab.core.types.RefreshType;
import org.slf4j.Logger;
Expand Down Expand Up @@ -755,8 +756,12 @@ public void availableInputsChanged(AvailableInputState msg) {
// Remove the old channel and add the new channel. The channel will be requested from the
// yamahaChannelTypeProvider.
ChannelUID inputChannelUID = new ChannelUID(thing.getUID(), CHANNEL_GROUP_ZONE, CHANNEL_INPUT);
Channel channel = ChannelBuilder.create(inputChannelUID, "String")
.withType(channelsTypeProviderAvailableInputs.getChannelTypeUID()).build();
ChannelTypeUID channelTypeUID = channelsTypeProviderAvailableInputs.getChannelTypeUID();
if (channelTypeUID == null) {
logger.warn("ChannelTypeUID is null, this should not happen.");
return;
}
Channel channel = ChannelBuilder.create(inputChannelUID, "String").withType(channelTypeUID).build();
updateThing(editThing().withoutChannel(inputChannelUID).withChannel(channel).build());
}

Expand Down Expand Up @@ -795,11 +800,15 @@ public void presetInfoUpdated(PresetInfoState msg) {

// Remove the old channel and add the new channel. The channel will be requested from the
// channelsTypeProviderPreset.
ChannelUID inputChannelUID = new ChannelUID(thing.getUID(), CHANNEL_GROUP_PLAYBACK,
ChannelUID presetChannelUID = new ChannelUID(thing.getUID(), CHANNEL_GROUP_PLAYBACK,
CHANNEL_PLAYBACK_PRESET);
Channel channel = ChannelBuilder.create(inputChannelUID, "Number")
.withType(channelsTypeProviderPreset.getChannelTypeUID()).build();
updateThing(editThing().withoutChannel(inputChannelUID).withChannel(channel).build());
ChannelTypeUID channelTypeUID = channelsTypeProviderPreset.getChannelTypeUID();
if (channelTypeUID == null) {
logger.warn("ChannelTypeUID is null, this should not happen.");
return;
}
Channel channel = ChannelBuilder.create(presetChannelUID, "Number").withType(channelTypeUID).build();
updateThing(editThing().withoutChannel(presetChannelUID).withChannel(channel).build());
}

updateState(grpPlayback(CHANNEL_PLAYBACK_PRESET), new DecimalType(msg.presetChannel));
Expand Down

0 comments on commit e8d308e

Please sign in to comment.