openhab-jrubyscripting 5.0.0.rc4 → 5.0.0.rc6

data/lib/openhab/dsl/rules/name_inference.rb

@@ -18,6 +18,7 @@ module OpenHAB
           "core.ItemCommandTrigger",
           "core.ItemStateChangeTrigger",
           "core.ItemStateUpdateTrigger",
+          "core.SystemStartlevelTrigger",
           Triggers::Cron::CRON_TRIGGER_MODULE_ID
         ].freeze
         private_constant :KNOWN_TRIGGER_TYPES
@@ -61,6 +62,8 @@ module OpenHAB
               infer_rule_name_from_channel_link_trigger(trigger)
             when :thing_added, :thing_removed, :thing_updated
               infer_rule_name_from_thing_trigger(trigger)
+            when :on_start
+              infer_rule_name_from_on_start_trigger(items)
             end
           end
 
@@ -110,7 +113,7 @@ module OpenHAB
 
           # formulate a readable rule name from a channel link trigger
           def infer_rule_name_from_channel_link_trigger(trigger)
-            trigger == :channel_linked ? "Channel linked to item" : "Channel unlinked from item"
+            (trigger == :channel_linked) ? "Channel linked to item" : "Channel unlinked from item"
           end
 
           # formulate a readable rule name from a thing added/updated/remove trigger
@@ -122,6 +125,22 @@ module OpenHAB
             }[trigger]
           end
 
+          # formulate a readable rule name from an on_start trigger
+          def infer_rule_name_from_on_start_trigger(levels)
+            levels = levels.map { |level| "#{level} (#{start_level_description(level)})" }
+            levels = format_array(levels)
+            "System Start Level reached #{levels}"
+          end
+
+          def start_level_description(level)
+            klass = org.openhab.core.service.StartLevelService.java_class
+            start_level_type = klass.declared_field("STARTLEVEL_OSGI").type
+            klass.declared_fields
+                 .select { |field| field.type == start_level_type && field.name.start_with?("STARTLEVEL_") }
+                 .find { |field| field.get_int(klass) == level }
+                 .name.split("_", 2).last.downcase
+          end
+
           # format an array of words that will be the beginning of a sentence
           def format_beginning_of_sentence_array(array)
             result = format_array(array)
@@ -146,7 +165,7 @@ module OpenHAB
             return array[0] if array.length == 1
             return "#{array[0]} or #{array[1]}" if array.length == 2
 
-            "any of #{array.join(", ")}"
+            "#{array[0..-2].join(", ")}, or #{array[-1]}"
           end
         end
       end

data/lib/openhab/dsl/rules/rule_triggers.rb

@@ -10,7 +10,7 @@ module OpenHAB
   module DSL
     module Rules
       #
-      # Rule configuration for OpenHAB Rules engine
+      # Rule configuration for openHAB Rules engine
       #
       # @!visibility private
       class RuleTriggers
@@ -39,7 +39,7 @@ module OpenHAB
         # @param [Map] config map describing trigger configuration
         # @param [Object] attach object to be attached to the trigger
         #
-        # @return [Trigger] OpenHAB trigger
+        # @return [org.openhab.core.automation.Trigger] openHAB trigger
         #
         def append_trigger(type:, config:, attach: nil, conditions: nil)
           config.transform_keys!(&:to_s)
@@ -57,7 +57,7 @@ module OpenHAB
         # @param [String] type of trigger
         # @param [Map] config map
         #
-        # @return [OpenHAB Trigger] configured by type and supplied config
+        # @return [org.openhab.core.automation.Trigger] configured by type and supplied config
         #
         def self.trigger(type:, config:)
           logger.trace("Creating trigger of type '#{type}' config: #{config}")

data/lib/openhab/dsl/rules/terse.rb

@@ -56,6 +56,7 @@ module OpenHAB
         def_terse_rule(:thing_updated)
         def_terse_rule(:thing_removed)
         def_terse_rule(:updated)
+        def_terse_rule(:on_start)
       end
     end
   end

data/lib/openhab/dsl/rules/triggers/changed.rb

@@ -16,13 +16,13 @@ module OpenHAB
           #
           # Create the trigger
           #
-          # @param [Object] item item to create trigger for
-          # @param [Item State] from state to restrict trigger to
-          # @param [Item State] to state to restrict trigger to
-          # @param [Duration, nil] duration ruration to delay trigger until to state is met
+          # @param [Core::Items::Item, Core::Items::GroupItem::Members] item item to create trigger for
+          # @param [Core::Types::State, Array<Core::Types::State>, Range, Proc] from state to restrict trigger to
+          # @param [Core::Types::State, Array<Core::Types::State>, Range, Proc] to state to restrict trigger to
+          # @param [Duration, nil] duration duration to delay trigger until to state is met
           # @param [Object] attach object to be attached to the trigger
           #
-          # @return [Trigger] OpenHAB triggers
+          # @return [org.openhab.core.automation.Trigger] openHAB triggers
           #
           def trigger(item:, from:, to:, duration:, attach:)
             if duration
@@ -50,17 +50,19 @@ module OpenHAB
           #
           # Create a TriggerDelay for for an item or group that is changed for a specific duration
           #
-          # @param [Object] item to create trigger delay for
+          # @param [Core::Items::Item, Core::Items::GroupItem::Members] item to create trigger delay for
           # @param [Duration] duration to delay trigger for until condition is met
-          # @param [Item State] to OpenHAB Item State item or group needs to change to
-          # @param [Item State] from OpenHAB Item State item or group needs to be coming from
+          # @param [Core::Types::State, Array<Core::Types::State>, Range, Proc] to
+          #   State item or group needs to change to
+          # @param [Core::Types::State, Array<Core::Types::State>, Range, Proc] from
+          #   State item or group needs to be coming from
           # @param [Object] attach object to be attached to the trigger
           #
-          # @return [Trigger] OpenHAB trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def wait_trigger(item:, duration:, to: nil, from: nil, attach: nil)
             item_name = item.respond_to?(:name) ? item.name : item.to_s
-            logger.trace("Creating Changed Wait Change Trigger for Item(#{item_name}) Duration(#{duration}) "\
+            logger.trace("Creating Changed Wait Change Trigger for Item(#{item_name}) Duration(#{duration}) " \
                          "To(#{to}) From(#{from}) Attach(#{attach})")
             conditions = Conditions::Duration.new(to: to, from: from, duration: duration)
             changed_trigger(item: item, to: nil, from: nil, attach: attach, conditions: conditions)
@@ -68,11 +70,11 @@ module OpenHAB
 
           #
           # Creates a trigger with a range condition on either 'from' or 'to' field
-          # @param [Object] item to create changed trigger on
-          # @param [Object] from state to restrict trigger to
-          # @param [Object] to state restrict trigger to
+          # @param [Core::Items::Item, Core::Items::GroupItem::Members] item to create changed trigger on
+          # @param [Range] from state to restrict trigger to
+          # @param [Range] to state restrict trigger to
           # @param [Object] attach object to be attached to the trigger
-          # @return [Trigger] OpenHAB trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def range_trigger(item:, from:, to:, attach:)
             from, to = Conditions::Proc.range_procs(from, to)
@@ -81,11 +83,11 @@ module OpenHAB
 
           #
           # Creates a trigger with a proc condition on either 'from' or 'to' field
-          # @param [Object] item to create changed trigger on
-          # @param [Object] from state to restrict trigger to
-          # @param [Object] to state restrict trigger to
+          # @param [Core::Items::Item, Core::Items::GroupItem::Members] item to create changed trigger on
+          # @param [Proc] from state to restrict trigger to
+          # @param [Proc] to state restrict trigger to
           # @param [Object] attach object to be attached to the trigger
-          # @return [Trigger] OpenHAB trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def proc_trigger(item:, from:, to:, attach:)
             # swap from/to w/ nil if from/to is a proc
@@ -100,10 +102,11 @@ module OpenHAB
           #
           # Create a changed trigger
           #
-          # @param [Object] item to create changed trigger on
-          # @param [Object] from state to restrict trigger to
-          # @param [Object] to state restrict trigger to
+          # @param [Core::Items::Item, Core::Items::GroupItem::Members] item to create changed trigger on
+          # @param [Core::Items::State, Array<Core::Items::State>] from state to restrict trigger to
+          # @param [Core::Items::State, Array<Core::Items::State>] to state restrict trigger to
           # @param [Object] attach object to be attached to the trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def changed_trigger(item:, from:, to:, attach: nil, conditions: nil)
             type, config = case item
@@ -121,7 +124,7 @@ module OpenHAB
           #
           # Create a changed trigger for a thing
           #
-          # @param [Thing] thing to detected changed states on
+          # @param [Core::Things::Thing] thing to detected changed states on
           # @param [String] from state to restrict trigger to
           # @param [String] to state to restrict trigger to
           #
@@ -152,7 +155,7 @@ module OpenHAB
           #
           # Create a changed trigger for group items
           #
-          # @param [Group] group to detected changed states on
+          # @param [GroupItem] group to detected changed states on
           # @param [String] from state to restrict trigger to
           # @param [String] to to restrict trigger to
           #
@@ -160,7 +163,7 @@ module OpenHAB
           #  second element is a Hash configuring trigger
           #
           def group(group:, from:, to:)
-            config = { "groupName" => group.group.name }
+            config = { "groupName" => group.name }
             config["state"] = to.to_s if to
             config["previousState"] = from.to_s if from
             [GROUP_STATE_CHANGE, config]

data/lib/openhab/dsl/rules/triggers/command.rb

@@ -18,7 +18,7 @@ module OpenHAB
           # @param [Object] command to check against
           # @param [Object] attach object to be attached to the trigger
           #
-          # @return [Trigger] OpenHAB triggers
+          # @return [org.openhab.core.automation.Trigger]
           #
           def trigger(item:, command:, attach:)
             case command
@@ -31,9 +31,9 @@ module OpenHAB
           #
           # Creates a trigger with a range condition on the 'command' field
           # @param [Object] item to create changed trigger on
-          # @param [Object] command to restrict trigger to
+          # @param [Range] command to restrict trigger to
           # @param [Object] attach object to be attached to the trigger
-          # @return [Trigger] OpenHAB trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def range_trigger(item:, command:, attach:)
             command_range, * = Conditions::Proc.range_procs(command)
@@ -45,7 +45,7 @@ module OpenHAB
           # @param [Object] item to create changed trigger on
           # @param [Object] command to restrict trigger to
           # @param [Object] attach object to be attached to the trigger
-          # @return [Trigger] OpenHAB trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def proc_trigger(item:, command:, attach:)
             conditions = Conditions::Proc.new(command: command)
@@ -58,6 +58,7 @@ module OpenHAB
           # @param [Object] item to create trigger for
           # @param [String] command to create trigger for
           # @param [Object] attach object to be attached to the trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def command_trigger(item:, command:, attach: nil, conditions: nil)
             type, config = if item.is_a?(GroupItem::Members)
@@ -92,7 +93,7 @@ module OpenHAB
           #
           # Create trigger for group items
           #
-          # @param [Group] group to create trigger for
+          # @param [GroupItem::Members] group to create trigger for
           #
           # @return [Array<Hash,Trigger>] first element is hash of trigger config properties
           #   second element is trigger type

data/lib/openhab/dsl/rules/triggers/conditions/duration.rb

@@ -24,7 +24,7 @@ module OpenHAB
               @conditions = Conditions::Proc.new(to: to, from: from)
               @duration = duration
               @timer = nil
-              logger.trace "Created Duration Condition To(#{to}) From(#{from}) "\
+              logger.trace "Created Duration Condition To(#{to}) From(#{from}) " \
                            "Conditions(#{@conditions}) Duration(#{@duration})"
             end
 
@@ -57,7 +57,7 @@ module OpenHAB
             #
             # Check if trigger guards prevent rule execution
             #
-            # @param [Map] inputs OpenHAB map object describing rule trigger
+            # @param [java.util.Map] inputs map object describing rule trigger
             #
             # @return [true,false] True if the rule should execute, false if trigger guard prevents execution
             #
@@ -70,7 +70,7 @@ module OpenHAB
             # Rerieve the newState and oldState, alternatively newStatus and oldStatus
             # from the input map
             #
-            # @param [Map] inputs OpenHAB map object describing rule trigger
+            # @param [java.util.Map] inputs map object describing rule trigger
             #
             # @return [Array] An array of the values for [newState, oldState] or [newStatus, oldStatus]
             #

data/lib/openhab/dsl/rules/triggers/cron/cron.rb

@@ -33,7 +33,7 @@ module OpenHAB
             }.freeze
           private_constant :CRON_EXPRESSION_MAP
 
-          # @return [Hash] Map of days of the week from symbols to to OpenHAB cron strings
+          # @return [Hash] Map of days of the week from symbols to to openHAB cron strings
           DAY_OF_WEEK_MAP = {
             monday: "MON",
             tuesday: "TUE",
@@ -134,7 +134,7 @@ module OpenHAB
           #
           # @param [Map] map of cron expression
           #
-          # @return [String] OpenHAB cron string
+          # @return [String] openHAB cron string
           #
           def self.map_to_cron(map)
             %i[second minute hour dom month dow year].map { |field| map.fetch(field) }.join(" ")

data/lib/openhab/dsl/rules/triggers/cron/cron_handler.rb

@@ -12,7 +12,7 @@ module OpenHAB
         #
         module CronHandler
           # Cron Trigger Handler that provides trigger IDs
-          # Unfortunatly because the CronTriggerHandler in OpenHAB core is marked internal
+          # Unfortunatly because the CronTriggerHandler in openHAB core is marked internal
           # the entire thing must be recreated here
           class CronTriggerHandler < org.openhab.core.automation.handler.BaseTriggerModuleHandler
             include org.openhab.core.scheduler.SchedulerRunnable
@@ -22,7 +22,7 @@ module OpenHAB
             field_accessor :callback
 
             # Creates a new CronTriggerHandler
-            # @param [Trigger] trigger OpenHAB trigger associated with handler
+            # @param [org.openhab.core.automation.Trigger] trigger openHAB trigger associated with handler
             #
             def initialize(trigger)
               @trigger = trigger
@@ -79,8 +79,8 @@ module OpenHAB
           class CronTriggerHandlerFactory
             include org.openhab.core.automation.module.script.rulesupport.shared.factories.ScriptedTriggerHandlerFactory
 
-            # Invoked by the OpenHAB core to get a trigger handler for the supllied trigger
-            # @param [Trigger] trigger OpenHAB trigger
+            # Invoked by openHAB core to get a trigger handler for the supllied trigger
+            # @param [org.openhab.core.automation.Trigger] trigger
             #
             # @return [WatchTriggerHandler] trigger handler for supplied trigger
             def get(trigger)
@@ -92,7 +92,7 @@ module OpenHAB
             private
 
             #
-            # Creates trigger types and trigger type factories for OpenHAB
+            # Creates trigger types and trigger type factories for openHAB
             #
             def add_script_cron_handler
               Core.automation_manager.add_trigger_handler(
@@ -105,7 +105,7 @@ module OpenHAB
             end
 
             #
-            # Creates trigger types and trigger type factories for OpenHAB
+            # Creates trigger types and trigger type factories for openHAB
             #
             def cron_trigger_type
               org.openhab.core.automation.type.TriggerType.new(

data/lib/openhab/dsl/rules/triggers/updated.rb

@@ -18,7 +18,7 @@ module OpenHAB
           # @param [Item State] to state to restrict trigger to
           # @param [Object] attach object to be attached to the trigger
           #
-          # @return [Trigger] OpenHAB triggers
+          # @return [org.openhab.core.automation.Trigger]
           #
           def trigger(item:, to:, attach:)
             case to
@@ -44,7 +44,7 @@ module OpenHAB
           # @param [Object] item to create changed trigger on
           # @param [Object] to state restrict trigger to
           # @param [Object] attach object to be attached to the trigger
-          # @return [Trigger] OpenHAB trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def range_trigger(item:, to:, attach:)
             to, * = Conditions::Proc.range_procs(to)
@@ -56,7 +56,7 @@ module OpenHAB
           # @param [Object] item to create changed trigger on
           # @param [Object] to state restrict trigger to
           # @param [Object] attach object to be attached to the trigger
-          # @return [Trigger] OpenHAB trigger
+          # @return [org.openhab.core.automation.Trigger]
           #
           def proc_trigger(item:, to:, attach:)
             conditions = Conditions::Proc.new(to: to)
@@ -70,7 +70,7 @@ module OpenHAB
           # @param [State] to state restriction on trigger
           # @param [Object] attach object to be attached to the trigger
           #
-          # @return [Trigger] OpenHAB triggers
+          # @return [org.openhab.core.automation.Trigger]
           #
           def update_trigger(item:, to:, attach: nil, conditions: nil)
             type, config = case item
@@ -103,7 +103,7 @@ module OpenHAB
           #
           # Create an update trigger for a group
           #
-          # @param [Item] item to create trigger for
+          # @param [GroupItem::Members] item to create trigger for
           # @param [State] to optional state restriction for target
           #
           # @return [Array<Hash,String>] first element is a String specifying trigger type

data/lib/openhab/dsl/rules/triggers/watch/watch_handler.rb

@@ -10,7 +10,7 @@ module OpenHAB
         #
         module WatchHandler
           #
-          # Creates trigger types and trigger type factories for OpenHAB
+          # Creates trigger types and trigger type factories for openHAB
           #
           private_class_method def self.watch_trigger_type
             org.openhab.core.automation.type.TriggerType.new(
@@ -27,7 +27,7 @@ module OpenHAB
           # Trigger ID for Watch Triggers
           WATCH_TRIGGER_MODULE_ID = "jsr223.jruby.WatchTrigger"
 
-          # Extends the OpenHAB watch service to watch directories
+          # Extends the openHAB watch service to watch directories
           #
           # Must match java method name style
           # rubocop:disable Naming/MethodName
@@ -75,12 +75,12 @@ module OpenHAB
           end
           # rubocop:enable Naming/MethodName
 
-          # Implements the OpenHAB TriggerHandler interface to process Watch Triggers
+          # Implements the openHAB TriggerHandler interface to process Watch Triggers
           class WatchTriggerHandler
             include org.openhab.core.automation.handler.TriggerHandler
 
             # Creates a new WatchTriggerHandler
-            # @param [Trigger] trigger OpenHAB trigger associated with handler
+            # @param [org.openhab.core.automation.Trigger] trigger
             #
             def initialize(trigger)
               @trigger = trigger
@@ -94,21 +94,20 @@ module OpenHAB
             # Create a lambda to use to invoke rule engine when file watch notification happens
             # @param [String] glob to match for notification events
             #
-            # @return [Lambda] lambda to execute on notification events
+            # @return [Proc] lambda to execute on notification events
             #
             def watch_event_handler(glob)
-              lambda { |watch_event|
+              lambda do |watch_event|
                 if watch_event.path.fnmatch?(glob)
                   logger.trace("Received event(#{watch_event})")
                   @rule_engine_callback&.triggered(@trigger, { "event" => watch_event })
                 else
                   logger.trace("Event #{watch_event} did not match glob(#{glob})")
                 end
-              }
+              end
             end
 
-            # Called by OpenHAB to set the rule engine to invoke when triggered
-            # Must match java method name style
+            # Called by openHAB to set the rule engine to invoke when triggered
             def setCallback(callback) # rubocop:disable Naming/MethodName
               @rule_engine_callback = callback
             end
@@ -126,8 +125,8 @@ module OpenHAB
           class WatchTriggerHandlerFactory
             include org.openhab.core.automation.module.script.rulesupport.shared.factories.ScriptedTriggerHandlerFactory
 
-            # Invoked by the OpenHAB core to get a trigger handler for the supllied trigger
-            # @param [Trigger] trigger OpenHAB trigger
+            # Invoked by openHAB core to get a trigger handler for the supllied trigger
+            # @param [org.openhab.core.automation.Trigger] trigger
             #
             # @return [WatchTriggerHandler] trigger handler for supplied trigger
             def get(trigger)
@@ -136,7 +135,7 @@ module OpenHAB
           end
 
           #
-          # Creates trigger types and trigger type factories for OpenHAB
+          # Creates trigger types and trigger type factories for openHAB
           #
           def self.add_watch_handler
             Core.automation_manager.add_trigger_handler(

data/lib/openhab/dsl/things/builder.rb

@@ -6,14 +6,36 @@ module OpenHAB
     # Contains extensions to simplify working with {Core::Things::Thing Thing}s.
     #
     module Things
-      # A thing builder allows you to dynamically create OpenHAB thing at runtime.
+      # A thing builder allows you to dynamically create openHAB things at runtime.
       # This can be useful either to create things as soon as the script loads,
       # or even later based on a rule executing.
       #
-      # @example
+      # @example Create a Thing from the Astro Binding
       #   things.build do
       #     thing "astro:sun:home", "Astro Sun Data", config: { "geolocation" => "0,0" }
       #   end
+      #
+      # @example Create a Thing with Channels
+      #   thing_config = {
+      #     availabilityTopic: "my-switch/status",
+      #     payloadAvailable: "online",
+      #     payloadNotAvailable: "offline"
+      #   }
+      #   things.build do
+      #     thing("mqtt:topic:my-switch", "My Switch", bridge: "mqtt:bridge:mosquitto", config: thing_config) do
+      #       channel("switch1", "switch", config: {
+      #         stateTopic: "stat/my-switch/switch1/state", commandTopic="cmnd/my-switch/switch1/command"
+      #       })
+      #       channel("button1", "string", config: {
+      #         stateTopic: "stat/my-switch/button1/state", commandTopic="cmnd/my-switch/button1/command"
+      #       })
+      #     end
+      #   end
+      #
+      # @see ThingBuilder#initialize ThingBuilder#initialize for #thing's parameters
+      # @see ChannelBuilder#initialize ChannelBuilder#initialize for #channel's parameters
+      # @see Items::Builder
+      #
       class Builder
         # @return [org.openhab.core.things.ManagedThingProvider]
         attr_reader :provider
@@ -96,6 +118,26 @@ module OpenHAB
           end
         end
 
+        #
+        # Constructor for ThingBuilder
+        #
+        # @param [String] uid The ThingUID for the created Thing.
+        #   This can consist one or more segments separated by a colon. When the uid contains:
+        #   - One segment: When the uid contains one segment, `binding` or `bridge` id must be provided.
+        #   - Two segments: `typeid:thingid` The `binding` or `bridge` id must be provided.
+        #   - Three or more segments: `bindingid:typeid:[bridgeid...]:thingid`. The `type` and `bridge` can be omitted
+        # @param [String] label The Thing's label.
+        # @param [String] binding The binding id. When this argument is not provided,
+        #   the binding id must be deducible from the `uid`, `type`, or `bridge`.
+        # @param [String] type The type id. When this argument is not provided,
+        #   it will be deducible from the `uid` if it contains two or more segments.
+        #   To create a Thing with a blank type id, use one segment for `uid` and provide the binding id.
+        # @param [String, BridgeBuilder] bridge The bridge uid, if the Thing should belong to a bridge.
+        # @param [String, Item] location The location of this Thing.
+        #   When given an Item, use the item's label as the location.
+        # @param [Hash] config The Thing's configuration, as required by the binding. The key can be strings or symbols.
+        # @param [true,false] enabled Whether the Thing should be enabled or disabled.
+        #
         def initialize(uid, label = nil, binding: nil, type: nil, bridge: nil, location: nil, config: {}, enabled: nil)
           @channels = []
           uid = uid.to_s
@@ -117,13 +159,18 @@ module OpenHAB
             @bridge_uid = org.openhab.core.thing.ThingUID.new(*bridge_segments)
           end
 
-          @uid = org.openhab.core.thing.ThingUID.new(*[binding, type, @bridge_uid&.id,
-                                                       uid_segments.last].compact)
+          thinguid = if uid_segments.length > 2
+                       [binding, type, uid_segments.last].compact
+                     else
+                       [binding, type, @bridge_uid&.id, uid_segments.last].compact
+                     end
+
+          @uid = org.openhab.core.thing.ThingUID.new(*thinguid)
           @thing_type_uid = org.openhab.core.thing.ThingTypeUID.new(*@uid.all_segments[0..1])
           @label = label
           @location = location
-          @location = location.label if location.is_a?(GenericItem)
-          @config = config
+          @location = location.label if location.is_a?(Item)
+          @config = config.transform_keys(&:to_s)
           @enabled = enabled
         end
 
@@ -132,7 +179,7 @@ module OpenHAB
         def channel(*args, **kwargs, &block)
           channel = ChannelBuilder.new(*args, thing: self, **kwargs)
           channel.instance_eval(&block) if block
-          @channels << channel
+          @channels << channel.build
         end
 
         # @!visibility private
@@ -190,9 +237,22 @@ module OpenHAB
       # The ChannelBuilder DSL allows you to customize a channel
       class ChannelBuilder
         attr_accessor :label
-        attr_reader :uid, :parameters
+        attr_reader :uid, :config, :type
 
-        def initialize(uid, type, label, thing:, group: nil, **parameters)
+        #
+        # Constructor for ChannelBuilder
+        #
+        # This class is instantiated by the {ThingBuilder#channel #channel} method inside a {Builder#thing} block.
+        #
+        # @param [String] uid The channel's ID.
+        # @param [String, ChannelTypeUID, :trigger] type The concrete type of the channel.
+        # @param [String] label The channel label.
+        # @param [thing] thing The thing associated with this channel.
+        #   This parameter is not needed for the {ThingBuilder#channel} method.
+        # @param [String] group The group name.
+        # @param [Hash] config Channel configuration. The keys can be strings or symbols.
+        #
+        def initialize(uid, type, label = nil, thing:, group: nil, config: {})
           @thing = thing
 
           uid = uid.to_s
@@ -207,13 +267,12 @@ module OpenHAB
             uid_segments[-1] = group_segments.join(org.openhab.core.thing.ChannelUID::CHANNEL_GROUP_SEPARATOR)
           end
           @uid = org.openhab.core.thing.ChannelUID.new(thing.uid, uid_segments.last)
-          unless type.is_a?(org.openhab.core.thing.ChannelTypeUID)
-            type = org.openhab.core.thing.ChannelTypeUID.new(thing.uid.binding_id,
-                                                             type)
+          unless type.is_a?(org.openhab.core.thing.type.ChannelTypeUID)
+            type = org.openhab.core.thing.type.ChannelTypeUID.new(thing.uid.binding_id, type)
           end
           @type = type
           @label = label
-          @parameters = parameters
+          @config = config.transform_keys(&:to_s)
         end
 
         # @!visibility private
@@ -221,7 +280,7 @@ module OpenHAB
           org.openhab.core.thing.binding.builder.ChannelBuilder.create(uid)
              .with_kind(kind)
              .with_type(type)
-             .with_configuration(org.openhab.core.config.core.Configuration.new(parameters))
+             .with_configuration(org.openhab.core.config.core.Configuration.new(config))
              .build
         end
 

data/lib/openhab/dsl/version.rb

@@ -2,8 +2,8 @@
 
 module OpenHAB
   module DSL
-    # Version of OpenHAB helper libraries
+    # Version of openHAB helper libraries
     # @return [String]
-    VERSION = "5.0.0.rc4"
+    VERSION = "5.0.0.rc6"
   end
 end