Skip to content

Commit 60331d1

Browse files
authored
[YAML thing] Allow "configuration" in syntax as alternative to "config" (#5332)
For thing and channel. Signed-off-by: Laurent Garnier <lg.hc@free.fr>
1 parent 759d6b2 commit 60331d1

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/things/YamlChannelDTO.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import org.openhab.core.thing.type.ChannelKind;
2424
import org.openhab.core.thing.type.ChannelTypeUID;
2525

26+
import com.fasterxml.jackson.annotation.JsonAlias;
27+
2628
/**
2729
* The {@link YamlChannelDTO} is a data transfer object used to serialize a channel in a YAML configuration file.
2830
*
@@ -36,6 +38,7 @@ public class YamlChannelDTO {
3638
public String itemDimension;
3739
public String label;
3840
public String description;
41+
@JsonAlias("configuration")
3942
public Map<@NonNull String, @NonNull Object> config;
4043

4144
public YamlChannelDTO() {

bundles/org.openhab.core.model.yaml/src/main/java/org/openhab/core/model/yaml/internal/things/YamlThingDTO.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import org.openhab.core.thing.ChannelUID;
2626
import org.openhab.core.thing.ThingUID;
2727

28+
import com.fasterxml.jackson.annotation.JsonAlias;
29+
2830
/**
2931
* The {@link YamlThingDTO} is a data transfer object used to serialize a thing in a YAML configuration file.
3032
*
@@ -38,6 +40,7 @@ public class YamlThingDTO implements YamlElement, Cloneable {
3840
public String bridge;
3941
public String label;
4042
public String location;
43+
@JsonAlias("configuration")
4144
public Map<@NonNull String, @NonNull Object> config;
4245
public Map<@NonNull String, @NonNull YamlChannelDTO> channels;
4346

0 commit comments

Comments
 (0)